diff --git a/app-admin/glance/ChangeLog b/app-admin/glance/ChangeLog
index 073245319c9a..e7a3de63f08c 100644
--- a/app-admin/glance/ChangeLog
+++ b/app-admin/glance/ChangeLog
@@ -421,3 +421,17 @@
 
   Package-Manager: portage-2.3.0
 
+*glance-13.0.0 (06 Oct 2016)
+
+  06 Oct 2016; Matthew Thode <prometheanfire@gentoo.org>
+  +glance-13.0.0.ebuild:
+  NEWTON :D
+
+  Package-Manager: portage-2.3.0
+
+  06 Oct 2016; Matthew Thode <prometheanfire@gentoo.org>
+  -files/cve-2016-0757-stable-liberty.patch:
+  cleanup
+
+  Package-Manager: portage-2.3.0
+
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index ab57763654d3..4906b03f9d40 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -1,9 +1,10 @@
-AUX cve-2016-0757-stable-liberty.patch 16299 SHA256 16ca229f29ed35c96570fde27a8f08cde1ce4d42dbde87c5373fab2225f0dea3 SHA512 f647a393b733c5e520e6032455f1d9ab8a6530909bc3f04e1ae1e54f52c0ea7a212203f461dc94b5f51eb29bc3a7c8178f67ccbbc99c5134cf72ab64d51591a9 WHIRLPOOL a4c0cf8491c49490955f668f8678c8508ed06b077c5238b24af1c8edd915190a3dad7a26dc70f3fd1123c609bd7ff3bcbbf6a19462740c55663c89f2f5b6de26
 AUX glance.initd 549 SHA256 b017ff96ee7e0b96abdc53fbf3226fa8ca752542c0d9bd0d9bc246aeef3dad4b SHA512 f14606066a1913dc82961015b17ec3bb5c8ee78cd43c3b8a4c7f1899b600898d46c5c447ca11e39bd10630c94b2c345fbce2629f7296ea631f02201f5c06eb05 WHIRLPOOL ea91ad14f9e2f90808324fc9ebc3138689b192a2b055ba6f67c04482f38a71b8ec825c8321a8cf54303da2035e2fa17930fd8244cab42dbc5c6eeaaa2fb1de73
 DIST glance-12.0.0.tar.gz 1746851 SHA256 42213a4cd59bbcaa5f34d09ff48494a4d9831de9f27fc8541726a685a4c4f509 SHA512 c0a4327bb091dca52a125dbc314c8fe13b2914ed0191ee8a39a36a7ccc5324fc8910f4c2af5a615f7783e3acee0f46a9a5370de278af53f80ce45b08c15ace48 WHIRLPOOL 1a23d1629f1be1b13b2c45ff77b7777d9cd011c01c45e1e6e5457d12b7b5cf6dcdfc757a36fde4cc84d34872be3fb1941e8cd158e2734215cab4f753f154a78e
+DIST glance-13.0.0.tar.gz 1742124 SHA256 3ef3594018469ba36425afafa61ae31487b6025e6f8d9d14febcedfa7136160f SHA512 2f49af5c462a10f8132bb50ad62a45026e77db1324384299551cfe2097b166ccb6fab82eacb092ab6c157f27cdb7253062e62881af795b15d8fd400c1fa096d8 WHIRLPOOL 0c859bbe9e87d2658118bdc111fd052ef088489d83d30574ec07271a50674d18b93d80de05a6282f7d43a8630d980340445b7eeee926bda84572df40086e5e5c
 EBUILD glance-12.0.0.ebuild 4607 SHA256 943db2925ad5aef242565b6ce43b7e3ce8397c3032ebf78abdce8e380dedad7d SHA512 7904135d3404079d18ebbfe1749085eacc3f1cf8c4f33c970437950b1933605fe8e7fdab5dcaa7a6d87b33a45e9c12ae94d7c25a46ce94b249c6f935645a2b6f WHIRLPOOL 54d3cde8abbe6bd6bd122cbc7b9b99fb18e9e84ea50e8e3ff06aa8715a1188e8e99f648ab5ee0b7b329270d5c22d2abacc76c48a90aaa771fb2f0564d2dd6ec2
+EBUILD glance-13.0.0.ebuild 4873 SHA256 51f9509bf17674a45e1c3472acde02613ce2865ee86482d7776167582cb67f9c SHA512 a87cc7d896105c4e30338d7212eb53a9cfb10a005f5552dbbded0bda0f31b4ac398191bd4be939a26e0398d0562c9fc28b2d264e1542f73722a5fb31235e1ab4 WHIRLPOOL 35eff6e3f74839994a59df6d0a473de61811f03d3b16ac432283d78e58cc2b2fae1a5575c694173549ced831b6a00f899eed425454f9547d1122c1e761a14dbc
 EBUILD glance-2016.1.9999.ebuild 4623 SHA256 f1fcd021189b401a87a2f918ed6de84a5dbe4e4c639477b36c91bdbdc1808fff SHA512 d8d4eafc4829ed8a1b70a1089ac94cd1b1fde213a94a1b67a84510bfce53d6356a011b27f52a9684be8dd520363d7fe47d5ea1dae4cfa34077134584d83e74b1 WHIRLPOOL d0b30985f454f632f9d8015cd40266ad292a945711e794d149aec44b0976c4559b0b26b215350e9243660c4ee0b008ef8035c898c80a8b618908dca22f4c7281
 EBUILD glance-2016.2.9999.ebuild 4887 SHA256 35b45fbc5d1e9ea0eb99915d7e70aa17a59cdc277f725ec24d423119b9a2faec SHA512 f88f00b018ac726ae9461aa3949ab55d873ada296d2f77770ac489d4173f1dc419647bf0e53cb065b2475021c3238620e6f844135ec9ea80e00a84d2ddcd312d WHIRLPOOL 6f99cb85345457b4a4398f869be86ddb01878cbc1ca0a98f1961fab4d0b2634c68fa5b23850eba4312acbe89ea98d6ad9a77c6b9a5b60daf6d06391907b94789
-MISC ChangeLog 12843 SHA256 c83fd6591dff5701ad164528b7b593978ff75b4d7db5218f2f8bc07555a6b89c SHA512 092cf750729d000d782172b86d805acb9252db1c8c4f2dff814f2afa9b4e8bbf540f3829826a1e6ec587a35d806e8d3143497a7a2099bc25795332a405352b7c WHIRLPOOL 25000d1f616d2cc6f817dc043336940e7f26fba695a7e27bad054c16082602a76f3f931719c2e1e00740218fcffade85e4eff85a8c67104cacbf935c137df047
+MISC ChangeLog 13149 SHA256 ef7ef185961d3e85e577c463e615bcaabc387fb63675aa716b92a2814e558c1c SHA512 18b2b933ea3e5fcf54f73af51ffdd8c888b0d83e5f8c99ff6112a5531c6945c43c0064d7acc13a7725a2d8fe2d858146fead2c7817dfef53f0ad9c8df02ba970 WHIRLPOOL 656b2ae98ce6c30821a64c2097bf35024771f71e0d7872601a09c2a435050cfbca8ed279f61b79d93d613e255abc16f334eb9f21243e990dfad0400c8dd11897
 MISC ChangeLog-2015 15177 SHA256 bafe483a76a229fc0871d1fe42837b5ec1cb2640500be46515bc0fdc2008fea7 SHA512 5435ed84455f1f0adbc16eb3d10042992163c9b5847f60d4c04aa92933708965a01b573b2ce3ed1058e7d333e247db1eec8f30f675a0d1005b21fc5d4103977a WHIRLPOOL 7fc94722861301a399626010b664431558dd52e472a39431d2d47f78999b7611fde66fc119181c53c3be486888d3798db7a6fcf098052eae30386c455ae8ad22
 MISC metadata.xml 786 SHA256 1126c78ab935c6af0877edbf65a74375cee8a0e4035a083c96fe5bd050e3a45b SHA512 eed1ca2a7e15b1844de0a3a35453ab5890622cf161407df5ccb9d21ab2634691c94237496ddc8ab02881a687e16f8378f37817b20705112e11ee55d2a813f99a WHIRLPOOL ec6c41e7a8be936052e02bf1c74831639d75c05be892e3d58d2f94520cdbbbf5eb5cbdc3438a7d19976a1f6dd103731a36cb6d80560a8b12070021ee1e7eccae
diff --git a/app-admin/glance/files/cve-2016-0757-stable-liberty.patch b/app-admin/glance/files/cve-2016-0757-stable-liberty.patch
deleted file mode 100644
index 19c8365eb018..000000000000
--- a/app-admin/glance/files/cve-2016-0757-stable-liberty.patch
+++ /dev/null
@@ -1,332 +0,0 @@
-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/glance-13.0.0.ebuild b/app-admin/glance/glance-13.0.0.ebuild
new file mode 100644
index 000000000000..6ec38e2a21ee
--- /dev/null
+++ b/app-admin/glance/glance-13.0.0.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+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 ~arm64 ~x86"
+IUSE="doc mysql postgres +sqlite +swift"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-1.6.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+
+#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-1.0.10[sqlite,${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${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.3[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/futurist-0.11.0[${PYTHON_USEDEP}]
+	!~dev-python/futurist-0.15.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/keystonemiddleware-4.1.0[${PYTHON_USEDEP}]
+	!~dev-python/keystonemiddleware-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/WSME-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8.0[${PYTHON_USEDEP}]
+	dev-python/paste[${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-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.10.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-db-4.13.1[${PYTHON_USEDEP}]
+	!~dev-python/oslo-db-4.13.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/glance_store-0.18.0[${PYTHON_USEDEP}]
+	>=dev-python/semantic_version-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/cursive-0.1.1[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
+"
+
+#PATCHES=(
+#)
+
+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_install() {
+	distutils-r1_python_install
+
+	for svc in api glare 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 -r etc/*.ini etc/*.conf etc/*.sample etc/*.json etc/meta*
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/app-editors/mg/Manifest b/app-editors/mg/Manifest
index cdb1e1cead17..98577dd5d8fe 100644
--- a/app-editors/mg/Manifest
+++ b/app-editors/mg/Manifest
@@ -1,11 +1,11 @@
 DIST mg-20150323.tar.gz 142105 SHA256 d71b24d47d3e1426f162e446d92dfa457df96dd47c1289419cba9fd14c2c3afb SHA512 747a04c203509cdbe84d9cea6c5be93585cdd5cb855b556ea5dee273a2923a4a68bee3f952cf92d584fcdd682049cb4442c21888304ba036851127174457351f WHIRLPOOL bdba74b62034a6613434fc3efea7b56fa1599b6059ab97dbd760b013be7dc50ab13dfcee3f5fb1f41f4c26c3f0146583680134d3809ec7977a14a28cb345c6db
 DIST mg-20160421.tar.gz 145187 SHA256 b5dd8fbecb8a0ff0f32588c448f22f25fafcbfb297857e76d2883598a3e63a9a SHA512 7a4fb9d8958952a1b430bda88cafa251aab74691073d103941bfc2cce495ad3831b2c722db044791d61ae2aee9a5a9acaedde0090964129822c94745d89469ed WHIRLPOOL 9a040a69c9d57232c411da3859e80c84f2f250f2fd78cd2799cfb82243fdd9d01d374edb23de44d6eb94b9ab86009458b3c7c4cf34b738c45d4622e6c67dc99b
-DIST mg-20160905.tar.gz 144991 SHA256 72c14476f98e341a01520f09ab8dfdd52663498d9dc14d0831c31697a08b8349 SHA512 7ee51739ef15c70e28e81b8da70d9d85534c6f5d7ddf3c8530dad8b9be73c6b519c002b219cdc782e8080fbe4cc5c09a33e6eb88b1e7b4e6771b2f5d5cff9213 WHIRLPOOL b7f17f91f366e63ae3da002af245eb66ee682748df9d7bdb53fb14cd474b44593d0e0e4f73ed26f727ec71dd39e4f3385e6bac9670b094e38fb4486f79398c09
 DIST mg-20160912.tar.gz 145176 SHA256 0b050456b78d767d13839486e01705de6acf407f27052c204505e166eb698176 SHA512 6a4c8fd28c71eec27191f664fe8dcc13a2d9b05bb43677579ddb84fec016cbb91bacea1998c3c15bfc87a455a8fc31abc3c633ce7d334e433ce0768ab8e9b737 WHIRLPOOL f20a62e81b33c606f34ef6e9d30dd7a6b9223728734b4c518370b6af330f454954748903fe3962f5c2b7cda5f6e5deb567be91588895c61a2b362a43c6b5b8d9
+DIST mg-20161005.tar.gz 140797 SHA256 b7fcb5136a6783ca24c8463ab0852fc1f26bdb2bb1c24759b2c51ccfc46c5e61 SHA512 3ec2e10d0cd427f9543818690fdd469b64e6eb5d061a221eb7b18566dfb1965ee68cea7c83e4e4ae9b2d6027a0803aacfc815390571ac550bc0b7004b46972ae WHIRLPOOL 4cfb72313b8181acc40b1cd06269f2162198302d2e088a7b04263af4b127071adbe9725aed2ecdf6cd3854a9e9c9df9173a75bf7a83cf2492a644448df9d297d
 EBUILD mg-20150323.ebuild 1203 SHA256 579e7c9e92a9f979e010ce93d3ca2fd205e58dba16d0eea29fdfd5292eb9b1ae SHA512 3a5c9a717cc4230da1f740d8a6892200ecdce1d735223e3dc0dbb60c9aa18f50699eed371e308dddd580e7145a92d0ea6e0b1c1cdffa5a06b77c38153ec8078b WHIRLPOOL 41fa6386e0bfd9707618fd9072e0b234252cc79bc2a61c51a0f3bc0db73a66efd370f697a83bfa8a69b338fd5484b5ed5cb124d41aae2bbea69e673e9b81e652
 EBUILD mg-20160421.ebuild 1199 SHA256 691ec5d930095dbb408787e68cce6f3f4846498f19d67735a5c260decbd7b0cb SHA512 7b0770ee930ed1200d920b30cea25465ab39aa7744afb8b5c22c0aec5a946fe75740d40a23de7678deeb607b44f89ac4236e2651f86c14612499890953261ecd WHIRLPOOL 0cbae7f208f470f515102e4a74897ad77996a1e500dc21d71caed7b9b1fd712aadd34ffc4f6fcb64962608c8756ff7e9428d823056f66ca6d66f3afeb6842405
-EBUILD mg-20160905.ebuild 1182 SHA256 a98ab7d2bfd6eab8b103630293d532c21cdd773059c3dba58a91a6209587d230 SHA512 f57c7de46329c925edd61582d781c541d05a380973435638a3386bc9a1a0ad6d0c455913baaa52616864a1bd7b395d24c87c5f356fd1a4a89de06f6c055d44df WHIRLPOOL e621906fca78ce2db66ece357428240c1f5ea01d08c7db868522bda2c00ac59a26108979a01d43e96cb7c3f49fdc35859a6f476519d4b982fbece59021555c30
 EBUILD mg-20160912.ebuild 1182 SHA256 a98ab7d2bfd6eab8b103630293d532c21cdd773059c3dba58a91a6209587d230 SHA512 f57c7de46329c925edd61582d781c541d05a380973435638a3386bc9a1a0ad6d0c455913baaa52616864a1bd7b395d24c87c5f356fd1a4a89de06f6c055d44df WHIRLPOOL e621906fca78ce2db66ece357428240c1f5ea01d08c7db868522bda2c00ac59a26108979a01d43e96cb7c3f49fdc35859a6f476519d4b982fbece59021555c30
+EBUILD mg-20161005.ebuild 1059 SHA256 31e2947185254734a273c824ca252099c968fa338a816ae9632e0c26f47086ea SHA512 cceb4f126be2c3c75597691fe1980d87a535b657787e10076d50eaa187051b75e40b06e0c69c203b2d9c7df2a5aa7a01a4b91ad78135af6d8a22197e2221c6e0 WHIRLPOOL 1238e9fe4aefbbd578c228e540b4868e6e9b95109f42738d76b7a09abb1781c5332c350df01ec0cd068b7976f95378c474645c80e2d8afe3318c8b633206c264
 MISC ChangeLog 4695 SHA256 6406b4083ca52753b038b5d7d9914f72821412a784d7d7aeab21eba2186a9791 SHA512 ade930b8adf3ac8954aeeb5a1bba6906897527294a9fc7de185820ab7ec6fa386af632e74645936c5a4fe1a34d6c37a6c3f56b17398cf6891333f1b8864ae860 WHIRLPOOL 361588ae466a5287780636589bc9163f909842c0074086dd4d2a7e1090ccd80690dbcac2ebea953142d3f0bba7ee49ae58f55bf5d73d40c6794a9e56bd762f8f
 MISC ChangeLog-2015 13105 SHA256 cace27ac64a502179a77766381bf98b078859762af50daa67b9d131d2d75d4f7 SHA512 057a9507201db1602e4fd0df06332ea74582c318102efafcc8a2750aa6f17157ce82288cb0e03b5cb62c04f812dd55e0e5158598d7dce98c37e04d891385662e WHIRLPOOL dbb8b7881a97248ed45ac6ab4fcbf09df44bd5dd91ba630dd2b883ea82ec62614c2ce979cd5de329e8a76b7b1d6a52661b2f4a0583b11830984f41b5730f0b79
 MISC metadata.xml 384 SHA256 3ad78578cf5ca1e761ef628698f06d12a55ebf532e40985aa62ad7f7176d44b3 SHA512 70e2db47bef37d81a3842797ea0e12081e697b6e06bd25fbecfb64acf58b80e60a0c31508bf1c93879734af0921a47654fd489f08301b2517757741e0c6d25cf WHIRLPOOL add3c462182b70d77d8fff5a47fc2f428e8ec6a3ed9f23053d5a63fb01c7e0533db07f08671de6f56a3bf9fa3306a927fa39637ece186453440610060e80b86d
diff --git a/app-editors/mg/mg-20160905.ebuild b/app-editors/mg/mg-20161005.ebuild
similarity index 89%
rename from app-editors/mg/mg-20160905.ebuild
rename to app-editors/mg/mg-20161005.ebuild
index b22196990621..ff162ce36dfe 100644
--- a/app-editors/mg/mg-20160905.ebuild
+++ b/app-editors/mg/mg-20161005.ebuild
@@ -21,10 +21,6 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
-	# remove OpenBSD specific easter egg
-	sed -i -e 's/theo\.o//' GNUmakefile || die
-	sed -i -e '/theo_init/d' main.c || die
-
 	# fix path to tutorial in man page
 	sed -i -e "s:doc/mg/:doc/${PF}/:" mg.1 || die
 
diff --git a/app-emulation/cloud-init/ChangeLog b/app-emulation/cloud-init/ChangeLog
index 6b6f7f8bdaed..2aece1bbc8c5 100644
--- a/app-emulation/cloud-init/ChangeLog
+++ b/app-emulation/cloud-init/ChangeLog
@@ -154,3 +154,23 @@
 
   Package-Manager: portage-2.2.28
 
+*cloud-init-0.7.8 (06 Oct 2016)
+
+  06 Oct 2016; Matthew Thode <prometheanfire@gentoo.org>
+  +cloud-init-0.7.8.ebuild, +files/cloud-init-0.7.8-gentooinit.patch:
+  bump
+
+  Package-Manager: portage-2.3.0
+
+  06 Oct 2016; Matthew Thode <prometheanfire@gentoo.org>
+  cloud-init-0.7.8.ebuild:
+  fast stable to fix broken networking
+
+  Package-Manager: portage-2.3.0
+
+  06 Oct 2016; Matthew Thode <prometheanfire@gentoo.org>
+  cloud-init-9999.ebuild:
+  updating 9999
+
+  Package-Manager: portage-2.3.0
+
diff --git a/app-emulation/cloud-init/Manifest b/app-emulation/cloud-init/Manifest
index 340b52cd444a..726132003bbe 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -1,16 +1,19 @@
 AUX cloud-init-0.7.6-gentoo.patch 2569 SHA256 11e177a66511a27c8bed12237365e16d1b8d3a3376f687ec964e86b5e9bedc90 SHA512 5de2fe7632162bd5b527bda21a6f8c96122bdb2a9cb4ae40e8d73e48a303b56ae479a06985b8c1807829f53dd859e59d053b3613d6e2e446e5506b310d5e2eb5 WHIRLPOOL a2be7408066ceb091aaedeae7458ac41ae83b259f1d6c84d59aaf966b62b49be3b2ae649fef9d800a601f213dc3e0e16db12a8dc33a824c0d84434dcfe9f0c9e
 AUX cloud-init-0.7.6_p1212-gentoo.patch 1521 SHA256 d51e5ad00b28bf697cb040c16499f641d0d28ba1405da5fba61d1c3dc6bb2991 SHA512 e364bc88b8a41dc109d0e44ac7045d2de9312bbc27afa0668cfc31f6cdc60456ca39b08e23669eb36da8dc71e72e8360a113179f1524ab0646665749e7a9cd5e WHIRLPOOL ef522c89840573a9caf659a3f103bca593fc51a501aa361710f2087e759ad2fe018fbb6786e5519a870d2a7aef121015b3c43324db5b2cd06f7b06ea5a72671f
 AUX cloud-init-0.7.7-gentooinit.patch 2066 SHA256 6bb15613c1b9fdf95dfad3b51afd566c7d9bfe2a05d47f588f867e660012940f SHA512 2846c04f65d37f8dd981c5feb445ebb3ba1c437ac4e7fae12557a49cc12bc369e0e46acf3977a8fc2890f3675480a47f504b6a69b79e61307f6c82f17bf00c47 WHIRLPOOL 1a49203a037fa18b202242df59bbc1ab3ba9b66c173afc55c8d454bba9a901bcb1c777d1c99eb5564c37233c55eb1b12e0379d75964b552532af87bf1b9dfbde
+AUX cloud-init-0.7.8-gentooinit.patch 468 SHA256 4f115cdd8693b5a8d4c024d78ede36e5890748a3a9271d397882fb39407c7207 SHA512 07538a07a494c752b49ca357b448b4ae012ae855751886c4368e95d7a152a65afcc7c243eae428b670ae5f5802fbaeedeebf5a07d3a470bdc74d33c1f5f8ca02 WHIRLPOOL 725bc5babdec0a45c536a39b5f3edd67ded7f1ed03d973a006948d024439f93226bd8fad51b5065d9e0e5f58476575902df84b150bc31795206bfeffff74f0b7
 AUX cloud.cfg 1815 SHA256 e2eecea357864a080ff8c757f4282b9ae6373acef4e6ed604b071f9c622cd7bd SHA512 ff9a978befebdc177000ce50252a89d2b9adf4e2ab92c7c87300c54cebe5ff160fd6619dd56f0432a6ec8a819a4f948aa3e99c06e37dc6650ed41fdce16daeb3 WHIRLPOOL 97a2dcfd07860920cad70e28641853272e3ff927ed7cdc6075a26065bbb2a017d94f2b39795ecdfa5c1ec70587fc6a7b88fd281b2f702cc3ddbf7d1475a1bba0
 AUX hosts.gentoo.tmpl 920 SHA256 a7d1a6e160bb05928bbb9f2b8cfcbc1fa60c3a33cd034b06f3f92ffe1126df37 SHA512 39e6bcdf40bd842a1d2e4ccd1c993b432016f7b3c4d5455b71896a16ee87a5d698e214919172f0a7e2f647156f5efe0964fed999dd193e4f16c944efdcc0f9c5 WHIRLPOOL 89ad898aa4479b9bc3dc3efc9a10d7be81c302e490e8548f3752af9d50cd688ef0f3202d2efeadf2e034fcf5ef39ef3a5e78f9ebfa308f79684dd0342686e94d
 DIST cloud-init-0.7.6.tar.gz 515670 SHA256 9e8fd22eb7f6e40ae6a5f66173ddc3cc18f65ee406c460a728092b37db2f3ed7 SHA512 aa2397328afda8e77ed6d642e7642f41a4b4b5bcd3d0e87056aa8c88b56624ec65c57cfc66b0d13ccc235f1840baf1d577316974902a0439cf2f2eb0f8eef36d WHIRLPOOL 639a556e51b4b4b180951f9e481f9a0dcd45067d1d5760ce7e871ceea8bbb4e195258d96273d3ef88c7e2f2520318e9172c3ad0cb23d6ad0ae1835e17087e3a5
 DIST cloud-init-0.7.6_p1212.tar.gz 451717 SHA256 d213ee72a62cef5ef63369737a52c0ce0c2034ca1ae230925b6679f4335e685d SHA512 25c5d1cc7c8fa887859624b4f28416d455063c278e3f00bfb3561ab0c99aa708d9fa431ff17c42994aba43eb985538982e5175bf0531857cc18fd8e724ef1fd3 WHIRLPOOL d6608c750370fd470d6aae0e88125e9e56b424c40a5b1131b610cb675808b1f7e0657169273db29c4e994d3dce12f6076566eccbac6deee8c4277ffd33ceae38
 DIST cloud-init-0.7.7.tar.gz 477287 SHA256 d7b75e314ecdb99619014f21f3b622294a6c3bde248887dfb5e9cedb927ad0b0 SHA512 06cd2bba67da9668204416073af771145668db43777d6f183dcb54e8e1d9d12471fe3bfc99dfbc03a81814c5614347ff7d6acc5dbe117e1206d7fc2041ae4b62 WHIRLPOOL 9fccfba02aacc138dc62a6be9547fa1e5bd6959a96eef9b7f6f1ac86112049b36751882d954ac0e8d7aa5bf9580c5e27ec9abfdc2ef542628af448c00c468a09
+DIST cloud-init-0.7.8.tar.gz 508777 SHA256 4a4f1f7fb9dd0987a02aa7cd6f609910294fce8f9724dcebc0cd88630b4f1fd6 SHA512 ff6c3837afe702359879f0ae1d7443247b0ed97d60ecf0cbe85fc364dc833e553962aae221f48becb104ad3f951a28cbd742a3b8521ef25dfb8fd19439759447 WHIRLPOOL 1881cc41ee85e69cf5169115c7449ff581f927def51aaf3df986b8e8c29baeace658bb24bc5b98fd6eab6fdb5f05ab4555ba4081b7758402089a35fe20595876
 EBUILD cloud-init-0.7.6-r1.ebuild 2592 SHA256 d476c69cc8f48e2db82d24bedb1e79fefad9ea77ee99de8b2eabcdff2f363f97 SHA512 b86d21f987dd0663f34bdbafe541e1be07f81cb05c5fdfb7663b196bff513f3c16cd9871002188e3edf630fb3179e2b83b6262a024214433d090b3dcdc59dbaa WHIRLPOOL e3a1203242904281225907130a0e6dcd87a15b2748282bd282b4a23830fdfe19d05ad8ff880315f9fac42b1cd2328086915b36060ab0ff15c745e31ff9e7f2da
 EBUILD cloud-init-0.7.6-r2.ebuild 1923 SHA256 dfbad5510b2ed6c3b439910cf67625dcd5fbbb6a5a7a562e98d34aeecd4c9464 SHA512 e41aab4a8cf25e934d9e86d54d03879d925d50f246f905f00bd89d9e943997f27ffa94292bcd05941d811a51006f8f9200a3ec01c5f2288f628f3f46d3bc6deb WHIRLPOOL 6b390b2d7ec8b037abaa28e8a14bb8437421218b48dfdf7d7d35406d1900c04a4c8abcf7eafcf4cd3729ee48f07f7680a26582331e0533e2c51c260ddaeda048
 EBUILD cloud-init-0.7.6_p1212.ebuild 1958 SHA256 7ee21d127fd8dd10ba546147ec58ee9917632ce86502946dd48e92e392f023f1 SHA512 b394e4de59ee5f65a97910851a71ccd19f595b4cca302b2b6b14aa358a046bacb0f6e3cc64b4efd2be302ea5dc8461f3f5c1bf11a08156341d8e8b7df98c782d WHIRLPOOL 58eb51808d173b27f796fe67f81d161d324c40e815a9e5fb7ec37a85d6f95bdd447f422ce9cd0b4c6f7e46d334a4be4b3a47714a905cde8d319ef17b8bfd8ff9
 EBUILD cloud-init-0.7.7.ebuild 2405 SHA256 90b6a5ef913fc0e4b9e6a325005fc5b47df42df800f2133357356bc3d02800b1 SHA512 8f32b96be14e35af4a0db8dd4a839291859fca1dc75d4b4f9ebf276179f8fe379c9a4a18bdd67098aadba97e7badf1815ae4704cb415313d9267746fddeaed23 WHIRLPOOL 106d7b15c7b39f49a294d71ebce0c32f129c52cd7d80cd271e45f85c537f27b30e5b7d889bff2b3c7f2a056042444ee1b5d6a2b3e1d0b97f4ded36c09004deb6
-EBUILD cloud-init-9999.ebuild 2271 SHA256 48f821cbc102a724dfebd70e0810376637a494daf1a4666408655f82fd051665 SHA512 1d9b913d1b2a34b94db51f872d1b5ffce956370a5caa84362839530dcfd292d463f85e7824506eeb63006e1559c39af9c93f8d39aeee22c9be0af7d08f2e5d30 WHIRLPOOL 2033f7de67f5b9e07c2790fb2bd7c25ee0b3c68b168ec2a3a53c946d5618d73348f746e8d5648013fff598fb2d8899a0e2e6a4df199b847fae362e4cfcff0604
-MISC ChangeLog 5434 SHA256 90a36bb3be4134b629e7de44ee7e75bddd708d73806336489a8f999fa5ca9391 SHA512 8fe233bedbc5cb3e18cf7b18b683aba5d27a9fe5558237bc368fb864513d033dcb8d64795fa76109c1a0244df280c252f05f3f31ed5bbbb93da6c7f8514c5242 WHIRLPOOL cebdf6f728bdc13783e71d27dcad17152ef44406d6afb7118f8d167962a61270e354214e6242efd4ca53072b8d7b5ee184fd783de42ba3cf8b492a222598cefb
+EBUILD cloud-init-0.7.8.ebuild 2180 SHA256 590a6a95301bf486e0a9f6db82d2156f379faa9019547e43d03d42e0927bef02 SHA512 b36fffc3576ebb98f9a0a4d3006c8a71d60a7dbfea615c1c1194273a1b95aa042bd5454e52dd68958798e29ac0ecdb85576b64a6a182735ee261beea8378cfa4 WHIRLPOOL c7888825ab5127ff5b310c2668f7dc3c68560757b69f66953d70ebf1a5c2abf840d064c8ff37728d73e911b04983107a515b4482f1d28db658f594ec4ec99623
+EBUILD cloud-init-9999.ebuild 2226 SHA256 2095569f04b58438552a097ba15ad422118a977a035985b130d77ad84a136906 SHA512 b4202d565e651412f85f750e620b0467b7a28a71f6663bdfe81750647e867c4185a029c4aecfa2edf73ff5ba9dd89d524b341ca24d400f5cf0a61523922b0302 WHIRLPOOL 441a6ba5580952abd895fb0f7ff61b2885ccd33b24c785647f5ea9ae394854f5769fbca821d34d92ea8067037f026c55421b548281fedd28992b52a7e1be0bc0
+MISC ChangeLog 5928 SHA256 f1e6ee5d5ba95c750e94f9aecc789ebe279a90feeae6c5c497dcf04342678a84 SHA512 04a932fb01e58eccdae6640d8aed7e251031ded160ae33e1fca860c5ae5e367ddf743c5df043a8067dfd63812f3de29875d612443e644c6b5f1a44e33e1976fa WHIRLPOOL 57e496ff428cdced765c74cdfb2d3ffbfb34717ec45449b2da2f686929b2b949b9efc891a1a669d924dc34633d7eb0b905bb80cd5e912677e9d31a14f279b890
 MISC ChangeLog-2015 3361 SHA256 be1943a0d510b5b544b7e31cb630149f23093559da96b30c3933c073021b0bb7 SHA512 c2eea40c0d70371003e10986f5d674026dc325862d17793c60af3588ec81f6f54ba2d0402467e35f3c78c67d71203198029a2a1918fd028b36505277cb02c9ad WHIRLPOOL 711132a9e69fcb065186b293d3ceaef3febe8e0456466dff0d84ed497ed209ea1d144b6f20fa5b4982a5bb5eb9998c34b8ffb6f49ba23304cc35949b0015cb49
 MISC metadata.xml 662 SHA256 67e6f93e82f5ebd25c0c913568c1928e25135a7dc3badf967e4f54d6d0ad37d6 SHA512 c2a5eaa8c03116d4c91aaf8faaa5e5d0db354459241fed422cf54e4aab65fd987ee0649358bdd497ee831a468768cb76bd86f559308a34dadb6be1e55ac99f3a WHIRLPOOL ea923e925d0e8a4d10118ac284ceaec86de1ccbc87d1dfc1766dd3f7745ad1492ba9ce2fb0b028bdc80f23aec1a1cd2f2dfff851fd578c7b1bb00a74156c9db7
diff --git a/app-emulation/cloud-init/cloud-init-0.7.8.ebuild b/app-emulation/cloud-init/cloud-init-0.7.8.ebuild
new file mode 100644
index 000000000000..2a4ecb74e34d
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-0.7.8.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
+
+inherit distutils-r1 eutils multilib systemd
+
+DESCRIPTION="cloud initialisation magic"
+HOMEPAGE="https://launchpad.net/cloud-init"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="test"
+
+CDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/configobj[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	dev-python/oauthlib[${PYTHON_USEDEP}]
+	dev-python/prettytable[${PYTHON_USEDEP}]
+	dev-python/pyserial[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${CDEPEND}
+		>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-python/pep8[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+		dev-python/hacking[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	sys-apps/iproute2
+	sys-fs/growpart
+	virtual/logger
+"
+
+PATCHES=( "${FILESDIR}/cloud-init-0.7.8-gentooinit.patch" )
+
+python_prepare_all() {
+	sed -i '/^argparse/d' requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	emake test
+}
+
+python_install() {
+	distutils-r1_python_install "--init-system=sysvinit_openrc"
+}
+
+python_install_all() {
+	keepdir /etc/cloud
+
+	distutils-r1_python_install_all
+
+	chmod +x "${D}"/etc/init.d/cloud-config
+	chmod +x "${D}"/etc/init.d/cloud-final
+	chmod +x "${D}"/etc/init.d/cloud-init
+	chmod +x "${D}"/etc/init.d/cloud-init-local
+
+	insinto /etc/cloud/templates
+	doins "${FILESDIR}/hosts.gentoo.tmpl"
+	insinto /etc/cloud
+	doins "${FILESDIR}/cloud.cfg"
+
+	systemd_dounit "${S}"/systemd/cloud-config.service
+	systemd_dounit "${S}"/systemd/cloud-config.target
+	systemd_dounit "${S}"/systemd/cloud-final.service
+	systemd_dounit "${S}"/systemd/cloud-init-local.service
+	systemd_dounit "${S}"/systemd/cloud-init.service
+}
diff --git a/app-emulation/cloud-init/cloud-init-9999.ebuild b/app-emulation/cloud-init/cloud-init-9999.ebuild
index 1d41994e1d08..b7bd6bf6d99b 100644
--- a/app-emulation/cloud-init/cloud-init-9999.ebuild
+++ b/app-emulation/cloud-init/cloud-init-9999.ebuild
@@ -9,8 +9,7 @@ inherit distutils-r1 eutils git-r3 multilib systemd
 
 DESCRIPTION="cloud initialisation magic"
 HOMEPAGE="https://launchpad.net/cloud-init"
-EGIT_REPO_URI="https://github.com/prometheanfire/cloud-init.git"
-EGIT_BRANCH="gentoo-integration"
+EGIT_REPO_URI="https://git.launchpad.net/cloud-init"
 
 LICENSE="GPL-3"
 SLOT="0"
@@ -48,7 +47,7 @@ RDEPEND="
 	virtual/logger
 "
 
-PATCHES=( "${FILESDIR}/cloud-init-0.7.7-gentooinit.patch" )
+PATCHES=( "${FILESDIR}/cloud-init-0.7.8-gentooinit.patch" )
 
 python_prepare_all() {
 	sed -i 's/version=get_version(),/version=9999,/g' setup.py || die
diff --git a/app-emulation/cloud-init/files/cloud-init-0.7.8-gentooinit.patch b/app-emulation/cloud-init/files/cloud-init-0.7.8-gentooinit.patch
new file mode 100644
index 000000000000..b80a60a47b7f
--- /dev/null
+++ b/app-emulation/cloud-init/files/cloud-init-0.7.8-gentooinit.patch
@@ -0,0 +1,13 @@
+diff --git a/setup.py b/setup.py
+index bbadd7b..1578a3d 100755
+--- a/setup.py
++++ b/setup.py
+@@ -205,7 +207,7 @@ setuptools.setup(
+     author='Scott Moser',
+     author_email='scott.moser@canonical.com',
+     url='http://launchpad.net/cloud-init/',
+-    packages=setuptools.find_packages(exclude=['tests']),
++    packages=setuptools.find_packages(exclude=['tests.*', 'tests']),
+     scripts=['tools/cloud-init-per'],
+     license='GPLv3',
+     data_files=data_files,
diff --git a/dev-java/netbeans-apisupport/ChangeLog b/dev-java/netbeans-apisupport/ChangeLog
index 2dbe58651b58..b140ce3847d6 100644
--- a/dev-java/netbeans-apisupport/ChangeLog
+++ b/dev-java/netbeans-apisupport/ChangeLog
@@ -83,3 +83,9 @@
 
   Package-Manager: portage-2.3.1
 
+  06 Oct 2016; Miroslav Šulc <fordfrog@gentoo.org>
+  netbeans-apisupport-8.2.ebuild:
+  fixed eapi 6 issue
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-java/netbeans-apisupport/Manifest b/dev-java/netbeans-apisupport/Manifest
index 445f9b99c373..726d0853e75a 100644
--- a/dev-java/netbeans-apisupport/Manifest
+++ b/dev-java/netbeans-apisupport/Manifest
@@ -7,6 +7,6 @@ DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17f
 EBUILD netbeans-apisupport-8.0.2.ebuild 3315 SHA256 4163632e459b2809b0278fc56a278ac0bb52a079eb8c097bf2ce489375bd1cdb SHA512 fdfc3fb9bd482e2950a421c623050de6204c97cc0de313b91c0156f6ad63681ac8f9472bb4f3470ee9fb838abd96420e59bbe4c05475e7158b34d2b78a2378d8 WHIRLPOOL 2d483f4ff34b9809d7db85eb4b44ba346235bbc4b2f12dbb015600a254cff1db8120c2d9b0276ff060934cdc8da6d88bbb688a64ba25cf6696994b7f62e07408
 EBUILD netbeans-apisupport-8.1.ebuild 3340 SHA256 6a438a7b393e0ee5740510fd8d34edaacf45f0e07862e174f47ac135c740e694 SHA512 8d4067becd904e598c59a2f275bea64f601544846f2b748a3f1fcd6efba9f46ef472f8017da40714f20b92d3d17064ca22f1e520712ee27824c466ac4e65234c WHIRLPOOL 0e91614eba4be05c8bed57b72c0090f8ccad85c55715c8c830658fe11cb0a3885f1e394c07e4f6edd2551ddc5b6c32f82fbac1aca329f6afc6f620d5ae464268
 EBUILD netbeans-apisupport-8.2.ebuild 3059 SHA256 605b99cf2fe6fd30b28053ef3a3e6dfbed6189f97c20728c41e00ae08b766edd SHA512 876916d7591bc518c9ba63d8335391a41bbb89809828dfb44c3eb4edefddf7393c143825e8731de2b8cf6e6a1aafdbe274ac1d7456a982d3846b43a2d16adc8f WHIRLPOOL 329046fd8eb19229567f85d19e6fef0f0636bc6efb5ad1b84c102c3dc7119ea8672a8f4ad7937f837b4a43537725cea7e137d88ea01ea9fafb34cbebb9b0ec56
-MISC ChangeLog 3054 SHA256 1db2816d7b84bbe493f951687ed3797a1e8515aca0e073e4ee3d8007d13f0a92 SHA512 2646a8a2eb5571f76e860e8b25663f13d808c3ce3b458dfc51181a6aeed2380d2787450d7985e43ebad5e20b0c01de9baa2335ecf80c9d92e28bd504c7778ba1 WHIRLPOOL e5c2d574496f30754e5d8938a01c5e2d2d89482307fbc48fc4ac2a3ac7421280b04d590823484852f458f84c4280cbc3efd0cf6fc4a7af16ee48f8005bfbc86d
+MISC ChangeLog 3196 SHA256 3b8a1855c25f1b99fec945223b74b7c5f0c1a169d91aab5f604be43c2ce96127 SHA512 bde99f7764d0ddc94e8ad51ac3f1670499340af38302871e1f4b379c27c62e09a9ae4ce02bb44c852bb9e5853493eb1ff149ed8ca6425e41ba975165811831a2 WHIRLPOOL d7fa52f9fc2634ffcdc0934f36a06eddf26959c3dfb9ea8cf945533ac54a11df28e05e4c495ae884488208d8f0478b92812ee21989dcaa34a392a1721696cdda
 MISC ChangeLog-2015 4031 SHA256 7c26c9d611d0ed8e68a45d59f4190d5bed0c3b3e577f50c103cb56920f6448fc SHA512 37dfb1da17ae2e4ce31fd296eb96682b99a50e7fd92e447eb61c63f44e36cf2ee6fbd8cd3769ce1e3557daf7055a6def1d4c2d98ee12f7e247d38b06b52a0585 WHIRLPOOL 61239bcf9ce2314126bb29b95cb177e485200b5aca15c0d8f6caffe550cc49b5da36c6a18250d522c038a4526635aa0a5b254e7127ec142e125dc5197343a11c
 MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
diff --git a/dev-java/netbeans-cnd/ChangeLog b/dev-java/netbeans-cnd/ChangeLog
index dea4b2efa915..fccca8fee898 100644
--- a/dev-java/netbeans-cnd/ChangeLog
+++ b/dev-java/netbeans-cnd/ChangeLog
@@ -81,3 +81,8 @@
 
   Package-Manager: portage-2.3.1
 
+  06 Oct 2016; Miroslav Šulc <fordfrog@gentoo.org> netbeans-cnd-8.2.ebuild:
+  fixed eapi 6 issue
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-java/netbeans-cnd/Manifest b/dev-java/netbeans-cnd/Manifest
index dea3b7c9a052..bc6fc30cd87e 100644
--- a/dev-java/netbeans-cnd/Manifest
+++ b/dev-java/netbeans-cnd/Manifest
@@ -18,6 +18,6 @@ DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17f
 EBUILD netbeans-cnd-8.0.2.ebuild 4511 SHA256 30611e246c38a54eed8534846b88c3a6039ccd0dba6b170f32778e161e805212 SHA512 f9160e6c2a7246083f122272342e74ff03894e9418660afa7232fb3d5c0b9fcf6036350e9aa4eb171582504fc2e52b3237900fee91beaec790785dbbfda45cec WHIRLPOOL 73cff79769de45c227cf7de8c835028b9874fd67e4cca4715438639b386b9ffc4f94a14e64f7e5d9149ce542220088bc1b2683d24709ded9c1c70ac8d95d8f81
 EBUILD netbeans-cnd-8.1.ebuild 4746 SHA256 96728e4c6718d8f1071f49d1935949814551e4d6a45a94691ea9dcf5bd7b9b2f SHA512 8c4a1946992424f619923ac13c02ec40f0b8efc9788a2989d5f72b7505cc393306952c63b55aa91d5fb58c19ecff6fbbbae59211edccedf33ff23e486b06baf2 WHIRLPOOL 3ddc351893ec5da02b99e01053780d37ba7d5dd14e3145c56dc6ea7a747e3a4e78090c8f446e82bff0376ff6ce2a72985961e0486f47071cf936e5094c33f101
 EBUILD netbeans-cnd-8.2.ebuild 4465 SHA256 e5268b1872a0ba3f39dfbd8d49fddd9938900bbbc96e432fa1807ee0b6c36fbb SHA512 6c30daf1aea9d0d598d16903facbbc4a02660821dd6ab5b98c940305adc3dbe41d5410bfad7c1afe4adb33b45056730c95eb9fe2462b5fff26449a7814202bce WHIRLPOOL f60d88d6cd35594ff406fbef4e181abb02a3699d442450f19da173e802576fbad7c891efeff236e3d02d7a217f4685650bd2d57aa6ea17e29f550ede9ac13d06
-MISC ChangeLog 2980 SHA256 bfad767f9f61c06115f89db2046d465c5e8ee54ccef7b41b24b301e679eae8c0 SHA512 f3878b1753fc1281ae72adee52dadebded3234b1c197a221dd3538b30db7ea2e4fa92d5c88d1ec78074434b016ca617d41f41c15f9b226de36d92cdf5333ad1f WHIRLPOOL ecc2c8f612fc435a656f65a9307cb35c808db066c7b1edb888609fc6f81a5bcdfd41afe8a6b7877aa25b44e667da847e43a3976926d12173aaefcd3a3edd1584
+MISC ChangeLog 3113 SHA256 68bbeba3600a048c67b47af56b97d39ef064c3ea3603992924b9b1007b4dadd7 SHA512 c69cbaae1bb85eef85de0cd6b8cde097b1abb0273483aac01ad693c8143e8d2bc1ae15724e351d3163229f3c4fe2884715cc123f561e7b06c87afa9567a33d1d WHIRLPOOL d288f98490c9610a2e9f29f0f1248fcdc458094e7fa9f11274078164c8cff29d26ac9cf212d3e5e203739f1d5973a40a85a2c7e4a1ab2b3db2b770ed2c479e67
 MISC ChangeLog-2015 3982 SHA256 fa50598f6eca568ea17186f2bb38b74877052f4e41ff82ba9ee443a8d7659e16 SHA512 d3f881f99adae3e1f2e9e47051425158e68426b13ed79c99f8724551e22d45199c94ebee62459f7bfe638b5fffbdab5a76f92bbad2d93d1ccbe461344bd77583 WHIRLPOOL c4a666bf2f16b51ef14b5454e707c07b3d6657d5d03423bec1bad8c56720d529f923dc00432b119b80ab70a573ce2fe44bc25c2333733a8f2d176eaf72ff8566
 MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
diff --git a/dev-java/netbeans-dlight/ChangeLog b/dev-java/netbeans-dlight/ChangeLog
index ed68094d2923..a2190131ad33 100644
--- a/dev-java/netbeans-dlight/ChangeLog
+++ b/dev-java/netbeans-dlight/ChangeLog
@@ -83,3 +83,8 @@
 
   Package-Manager: portage-2.3.1
 
+  06 Oct 2016; Miroslav Šulc <fordfrog@gentoo.org> netbeans-dlight-8.2.ebuild:
+  fixed eapi 6 issue
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-java/netbeans-dlight/Manifest b/dev-java/netbeans-dlight/Manifest
index 6ce304a58715..78a751726b7e 100644
--- a/dev-java/netbeans-dlight/Manifest
+++ b/dev-java/netbeans-dlight/Manifest
@@ -10,6 +10,6 @@ DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17f
 EBUILD netbeans-dlight-8.0.2.ebuild 2899 SHA256 11833cfe5c8e224d591c2a381c51139da4ac7aa92a17cbcf7f2ae2df243dec58 SHA512 d8b055a6b6aa9e89f6d803e6513baf69f9fe169f7fa6815cbe62cdc5827ea46f9324ea6cbd5f2064bc20bd158a948a73852277ae58d09c94e9f88e3f7478fb0e WHIRLPOOL 3b755b311a0a684e635d7c37734e3becc6d1d7d0d46bf18f76d49d656867162b16766e7204359c0656386acdf8287f58d47a5558e53f4c770934370acd16109d
 EBUILD netbeans-dlight-8.1.ebuild 2924 SHA256 4939cb0d541c33ab01a63e394b0b7cdc2a45e1fe9145f88d5662c89c7c6f46da SHA512 0945b4aafa8402c6dea9b84738f57f51870ff7dd50d4d4b5b1fdfa52aad54f51161a83f9123bfaf6a0746e5bf47641f1732a5799a176dbd19ec7e1eeabd0e452 WHIRLPOOL abb4f6664dfcde67e6bd8f0481bfe6105ac798cd9d306f94176a5b091bf6f71a9171ebaa35072cf86f6647a3eb36174a93884cd511e293bfbcf18331bde6e9f7
 EBUILD netbeans-dlight-8.2.ebuild 2643 SHA256 0608962b0d5b55245c0197d9d3611dce2abbda380cce67c72c5df8922367658c SHA512 fc46e711046fd751f358771c5fa08050bbd9fe51d81fc7f696c3ff7d597b5401a06fc1395c77baf33f8b8d5271e3f8dacf91a94f3a223af383a5596b227d9736 WHIRLPOOL 7a9d758015d16fb389b9a0e3e2a666508fa7079ddcf3fe36d967aeac73f5078f90ae72a90ddf28587337a1906b458034cd648cf75b71ef1a0fef52d168fa5192
-MISC ChangeLog 3014 SHA256 28d8e1c6731b1fe37ef340a5f627090d61bb42bf4577111de5ae1a0b36a7c4bf SHA512 58ec0baebd61962faf97df4167c3cd5401c4b01b3280bcef862e1dd1f6fba26c1759fc293d764a209005c135b9e63dd5cf03c1c7e0bf7fb6a00455a4dd0e203c WHIRLPOOL 0218324a78898086aaa0beb3936f58f04617815a01c9f4d7481c262885476e1f011a6596dac281f19c03d81d7115cffba1e6a736eab981bcecf292b79f7d4c8f
+MISC ChangeLog 3150 SHA256 aab8791ef647d297ebb042fcc09e515f36964c479374b958160cd96651ee18cd SHA512 a04fd4b717b2b68c8466661d5aac4b3f8cb0e90cdd5e87d738142d963396a52a588105ffa4badd1efe2f6b3057f27545102889f4191867cf57b85bb44a1190ac WHIRLPOOL 1654a79920b6cf502d60841ac2f1ddd9ec94503fbff6011f056f1c33ea39c129133f7be5ff7e06833a4f40a865a9c109a9cff100921f2b7cba6fe257a6e78c27
 MISC ChangeLog-2015 3829 SHA256 828ec14a04f62d266bc79e3ca67b56808dc58f40c65f4ecec77e24cf8d206711 SHA512 cb72faea72ab04bc1847b075989af24f2be79213d9ee40d79593a72d2e0f230a115e369589eb9d25b7dae5d42e96e1e169ea8775e62b9efa384c9e86caad2d9e WHIRLPOOL cd74eb2d393dbb2442196ba0cf9ab7872b1d9cdbf72438fc5a744764c14363b82dec72de6faf71a8847da5d6f94066cbb80d75e344f9613b9543881448ed09fb
 MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
diff --git a/dev-java/netbeans-enterprise/ChangeLog b/dev-java/netbeans-enterprise/ChangeLog
index 6a826376e70c..d91ea51e3e1a 100644
--- a/dev-java/netbeans-enterprise/ChangeLog
+++ b/dev-java/netbeans-enterprise/ChangeLog
@@ -111,3 +111,9 @@
 
   Package-Manager: portage-2.3.1
 
+  06 Oct 2016; Miroslav Šulc <fordfrog@gentoo.org>
+  netbeans-enterprise-8.2.ebuild:
+  fixed eapi 6 issue
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-java/netbeans-enterprise/Manifest b/dev-java/netbeans-enterprise/Manifest
index 5b63f9b09d0f..88ef5b991804 100644
--- a/dev-java/netbeans-enterprise/Manifest
+++ b/dev-java/netbeans-enterprise/Manifest
@@ -39,6 +39,6 @@ DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17f
 EBUILD netbeans-enterprise-8.0.2-r1.ebuild 15075 SHA256 da305deb0debb09c2d814247e08c4ac87992e7be0b0ea3c0588eb7ebb8335927 SHA512 91ae02db4a2315d6226fea1c8f2ad45c56a28569ea60d5b91c6732cfaf8550c3546d526db9fe6ca9504aef1037df47e36123229d966f0d792e26c665f99dc10c WHIRLPOOL fd650812d3a52a9bad14f9832b4079c6d84c01265db78a4dee4ad2b039f506010f951789460b4e521c6fb1e6e5f029d0940cc955b55394f7db0d15dbcd6ccf32
 EBUILD netbeans-enterprise-8.1-r1.ebuild 15890 SHA256 8ab10c1023da972fa7bc1bcb4f26039058f24b0e8a433b38ee17907152cffe47 SHA512 0fd1e3b8837feb4611e181ef793266470bb92fc2b3153c60dc019233ac36bef695eb27a33abe705e2f1823752871f0219436c2424196ee8169db81d41ed17e92 WHIRLPOOL 3d20bac4708b795759a4db05b120747db1d50de638870e9da3a34103579b1f5996d6a2ab2079e3864c154e24e2c3b8412e1af9f43b600a33ab0c7ee270ebccbc
 EBUILD netbeans-enterprise-8.2.ebuild 15500 SHA256 c873137315dbae5c4e106ebb8e45c4f0f393b827c1f780c7b0bb8b1fb9acaf1b SHA512 b5c42aef845bc6095652f0fdc0cc09decd06603d7564de0b579018719127df108632f7c123b17477985adc5e06f53711221f62a50845f1e1163df5a8b5489cff WHIRLPOOL 802f4dbbfb9f49bcd3f82203612e5fee8ed41974f8d879388239fa019ad9336ac58c98620f2482d0de8e9fb19989ff77ff93130ae2b0b4c027fc3e4073704cf8
-MISC ChangeLog 3873 SHA256 a6c2cf30b57e704aaa68b8af42639536be896996cf45fb6f233df87d35604c70 SHA512 86daa608b97aea6ab424437d2e0e568a1df39d7af97a5f657046cce64185b5f7341e8ab0f87dff64e98421b21bcbb998405fa7033f4a7cfe54b1df399b169cf8 WHIRLPOOL 7f2e5e30d29df32a135884613ac7ef5ef678b46f9b26cf1ccc51d4179c6871211514b007dce8d83356856a0533d88a0f0751f99cca214b809928fbe35d0db32f
+MISC ChangeLog 4015 SHA256 637c7fe30937c9e5a127ed0cc0a78e8e94914aef9bd43723977f8cff181d4404 SHA512 a9bc25bbfa7044064c8933e0e4523a89dfc708b4b129dcf69b68759e9e260d653c1faa56277057f0650b3344f75dc5f0abc1d2dd98b3b4825790cfbc0a2f168c WHIRLPOOL af3c4cef2fd2f3a606c648eb93382ad74704b8d7cf569815b8c80d58d9c8367cb798d0ebf3e07aff9409d694b5aed916e66922f7c56a858a8296b4deee2f9866
 MISC ChangeLog-2015 4031 SHA256 745c5cb5eac548e10092d43c5f04ccbe5001c3c6d4d0e79a5543160619ba871b SHA512 8cf0fd58d2a1c5ee2f50c6d5e8b73dd437a02b01751f67ccd1d1811f804e6511a4b71ab2f9ec129a4479b861c8fcdf5ed638d7fcb8efada5940e06a7c0c55184 WHIRLPOOL b9dfd4354f4e8857711b251aa01a2268cc00663ff676a06e5fff936efed85c501b60cfff106abec10ab71b047b60e9b919faebd144c9b7ef99def2d7fc398ede
 MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
diff --git a/dev-java/netbeans-ergonomics/ChangeLog b/dev-java/netbeans-ergonomics/ChangeLog
index 405b598b4616..3bfbc375b17c 100644
--- a/dev-java/netbeans-ergonomics/ChangeLog
+++ b/dev-java/netbeans-ergonomics/ChangeLog
@@ -83,3 +83,9 @@
 
   Package-Manager: portage-2.3.1
 
+  06 Oct 2016; Miroslav Šulc <fordfrog@gentoo.org>
+  netbeans-ergonomics-8.2.ebuild:
+  fixed eapi 6 issue
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-java/netbeans-ergonomics/Manifest b/dev-java/netbeans-ergonomics/Manifest
index 5e82a489bf9b..a82a73239ec9 100644
--- a/dev-java/netbeans-ergonomics/Manifest
+++ b/dev-java/netbeans-ergonomics/Manifest
@@ -7,6 +7,6 @@ DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17f
 EBUILD netbeans-ergonomics-8.0.2.ebuild 2844 SHA256 74db43746d6a4f2b2c0a5b88c8b8798d31fdf6d3f063a78acb2491fdd1fbe293 SHA512 cdca71febb286ab5c7a2a2d04f629bf3a751ad43bd3d5bac71b98a39422571ec16f5525ecfd4e02b89c9978f39584d495e1e69c566d8412712ed60d202d247d9 WHIRLPOOL 6b046ec9f6febe3ffa85e1011d303c7995ab8c3de0ee76bdbf11574ada2cac4b79eee3746b94097f0b4513fa0e0b66991a10694b68d9e53a717b24c7cc894ee0
 EBUILD netbeans-ergonomics-8.1.ebuild 2869 SHA256 91206b9d5ae9cb65cf00ff6ef961c798772fc2b86bbba703040b2cfa6920bbe3 SHA512 74376b2ccd605ef3e0f54c0ae75bc52b434b908a9cdd0e21ac256585368bb3e57a8bbf61ec4b30492ddde96cca8a7d9b58ba9919de6be81fdade4ce029214b10 WHIRLPOOL 0924d3eeb60fdb64b0da39ffce3104293b3bb4f0ce2be5e1f3677bb8ea2aa5d85cd10b466a3702f050deb57b894c7b9bdbb326e570d1b84995a78ea07917edd2
 EBUILD netbeans-ergonomics-8.2.ebuild 2588 SHA256 68db901e9ef42508812495dd42af7afc5c85398b3b6a4585dea23c5423ea9c50 SHA512 f79370f1568ce6125e366d023f008799036a0b4c4b6e97ab4fd0e52270d0526710edfe0a979e703dd668796c56e4d9a8ea32fcccf9ca49993eca9a0f5fe5dd2f WHIRLPOOL 769da617620b71da2c5dac7901a352b76939fcdfc12e3d2d2014fe209e0e1c6666a01f185b9543ca800d4e201ad1467afc054e5dd1fd5a7187224b669547c834
-MISC ChangeLog 3054 SHA256 257866e26c189dfc9b2475a2d58da1863120ecbda44cf297cde1fa75ef3776f0 SHA512 dbf5ef9531215361d4d38cda6af6e66dafc8ce2837a38f179e4d8efd21427945a6e25bc78af41d4711134b310c3d7e5757f450cfaacfe07c025ae974c52808cb WHIRLPOOL 3c5bca4400855ac276e411f166e0ab3804451a60782d31b16b7544f318ed8a8f845699fc169a031ccf4a0e60a2bea6610fa556893e379c2a71169c8286b9a01f
+MISC ChangeLog 3196 SHA256 ae66591b030e09674099b2557fce9dfef3dc24f9330915c73d4234196d52fa2d SHA512 549259d9d0310101abaf90a81eca9cb72918681dbec30ca9eb97e03cc7d9d9600000f11e2f57401136686f794157a115b382d7deef1391137f7a385542d264dc WHIRLPOOL 7c79b0633ab3a44a5d9751ddafe390479f145f4a7ff95c5f9b67dec1b9db53170288b628ce423ae9ffe5a9e43d75c3b7ec990af7cd88ce4b3acde35aa6f15348
 MISC ChangeLog-2015 4031 SHA256 cbd5e8eefe9e40be9c1e9625a36e056936bd3295e066e7de152b0023434bb645 SHA512 4c078eb208f7ae793fe6301aa9d59e9b8067a08b74407203d2b61099bcc87887ea4a6cd002baa936139b92fd528f23a2951b0ce4b5fdb09429f4f098ee4a02ff WHIRLPOOL 2e9612205a00033659bae7ab8de010b3302c1ab3a44548b0f45165bd59fc1c6c13ff1d3db0dfa83d986f623a8ed9d8bc2b2086d676a6b9060a1da0fa507a9dbf
 MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
diff --git a/dev-java/netbeans-extide/ChangeLog b/dev-java/netbeans-extide/ChangeLog
index 3bf653e0cc73..a1fbe2a5c587 100644
--- a/dev-java/netbeans-extide/ChangeLog
+++ b/dev-java/netbeans-extide/ChangeLog
@@ -83,3 +83,8 @@
 
   Package-Manager: portage-2.3.1
 
+  06 Oct 2016; Miroslav Šulc <fordfrog@gentoo.org> netbeans-extide-8.2.ebuild:
+  fixed eapi 6 issue
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-java/netbeans-extide/Manifest b/dev-java/netbeans-extide/Manifest
index e61c9495c4d1..a491e26bf750 100644
--- a/dev-java/netbeans-extide/Manifest
+++ b/dev-java/netbeans-extide/Manifest
@@ -11,6 +11,6 @@ DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17f
 EBUILD netbeans-extide-8.0.2.ebuild 3308 SHA256 2bcc6a1fb253cafa4635947c8c235a646c33d1d495c59a41795bbf6f5aea3189 SHA512 a6a51e6794ead95893bf74432dece9fcdae00665764586d0cd70055ff5deba696afeb59d9bbaa3c2b882b751b7010148461326f73174a0ba331324315993c9df WHIRLPOOL 9f0add3f7dae9fdda4756e1efa0c49cece2b335c392f0bb0fc3a5e6e1ba1788df5a2651b4db0b3b14dbcd0b1e8409f676c8eeda24b1d7e2ac9a10c17d03df989
 EBUILD netbeans-extide-8.1.ebuild 3333 SHA256 f36b9e1f9f1f325a5d3068de164572b06b02d725b441fdf3293dcf0198e265c0 SHA512 59f60389934f048d3bc4c4c31c327c85ef577caa82ecce7aa63bd11a0dd9d67c659b3d3335c1752f297d354681d542e43260280de9cc28a8304d0b257d8e51e7 WHIRLPOOL 12fd993a03bd22f03c813eb74f9ee6a06dfc51ea61b281d2949ff3f1fc0803b02ef7d043deb5e4fe97fdfcc314da206e041739fa80d957303c2839e8a37f9b89
 EBUILD netbeans-extide-8.2.ebuild 3052 SHA256 f02128c23e03f164a7dae35617012088d766fb7300808f0283916a95df8599fd SHA512 02b2646836ada4d32ba11d6acca442a9b261f27d1d2cbc0996b046bc6a9b32399a3a826bffaab1c1e688d0c96fce4e02499337fb02beb6a9be67cce0b80039e4 WHIRLPOOL 75ba6170663f260e5e8b67b1a1a2df6aa56db67674c84c64348acd0389647bdc1b310bd5202af9e2e280a442caf82aa64b9424a8d0830ac48f7a23665365bcd2
-MISC ChangeLog 3014 SHA256 892ad7936e5f60eb9988613e8dc9de5367efe3e2cc8d7c3858e8b1e3cf76b39e SHA512 16e1196a07dfee2c57ddc9215ba702c042eb8abb38fa9ac752ebf506630eaf07dd982bf61655344cdc06adad646f50628e1e9f1ef33ab03f17665675864f244a WHIRLPOOL 9140435930f7b5b549cda05e92d9c59b7f28acdb94d45ebf936225995c894291de060642da2d7e143a962facf751d9ba54f03bf96e45c61a15a550927462ff1a
+MISC ChangeLog 3150 SHA256 0b22341041b89713463421f89b8601754834547727e3a4cffc8e0cffe0c7156c SHA512 21cfa391dfb1911c487ab74dd1c187d93e068e642a672227a2e4b9a58a67b4e4d68b3594b7c4d0659213069f635c25283eed54569cf23978c640538cf2247d72 WHIRLPOOL 6e8743ca26756e70dc04ba5790a463f78315957a0edb69b9882c44f3e4538bb199c827d58af1750305e25c73e1c4c3ae5aa0f6a4af66e88bc3ffb29e2dceeee7
 MISC ChangeLog-2015 1173 SHA256 277bf459f38175c8c93687575e3dcb7fad09998310277b3ac094c178ee170b70 SHA512 6c5df9bd83f84abc353b172091482db4664daf01c9b4f0ed6351392fd396cfd3e1e2f0e9d720a19432218f73e62c3fc90cc6982c67cf58af785e31654b508cf9 WHIRLPOOL e4bb6d59825843baf9ca0257de117d45866c280d53608eb754cbc6a769a075bb7edb723a32d607eb6015f561f68083325a02a361b809f3364c5d3d8839657318
 MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
diff --git a/dev-java/netbeans-groovy/ChangeLog b/dev-java/netbeans-groovy/ChangeLog
index db044f6f4cd9..b8280a370858 100644
--- a/dev-java/netbeans-groovy/ChangeLog
+++ b/dev-java/netbeans-groovy/ChangeLog
@@ -83,3 +83,8 @@
 
   Package-Manager: portage-2.3.1
 
+  06 Oct 2016; Miroslav Šulc <fordfrog@gentoo.org> netbeans-groovy-8.2.ebuild:
+  fixed eapi 6 issue
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-java/netbeans-groovy/Manifest b/dev-java/netbeans-groovy/Manifest
index e535e28934cb..5bc145d9e73b 100644
--- a/dev-java/netbeans-groovy/Manifest
+++ b/dev-java/netbeans-groovy/Manifest
@@ -9,6 +9,6 @@ DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17f
 EBUILD netbeans-groovy-8.0.2.ebuild 3347 SHA256 2e2e13103e7358b9a43e3b078d890dfb1c53fc01de4077e1c149cdc2cfac7499 SHA512 c9f1ef8082efe2ef2063ffab0f3b37dcbd7d23d518df5a40981e8343fa293e84a80aa9b189aa1fbf32c807ca183109897d0cc43ffad2b018302d7e9dc21a9831 WHIRLPOOL 2ced784c843bb338dca3c57a1fb7426710f8d65733d8b03653e6d7a305afa104652cc0cd6ae29a4349b55f9b48cbfa7110b5d004e49a0eac7b8dfc923dece4d0
 EBUILD netbeans-groovy-8.1.ebuild 3372 SHA256 67903ce2b5598f26ded37130724f4f001fb5c2279fb90d3b0869342e5c80d5cd SHA512 7c95196f5f9991d4a636ef5025665f4e08028d649e66c30b1dec91bc69d7d115bfcfbbd7e10ca47590a5232e3dd23c49c1f1b2df05a992bd3d38a095098055bf WHIRLPOOL 03329fd4e9d3159bfbfbf5b67a0714125516f4c017ada7b7274f384c117edadc4770dcb0bc5e04f3daa6a59e7bc1fa339fe01bdf4219b56a1f79da88cd608006
 EBUILD netbeans-groovy-8.2.ebuild 3091 SHA256 874191c03509577bc4a4bf7e54730eaa185a29620f09d1e44633fcddcefb08e1 SHA512 72d80927284126809760da993a3008cb7a45bb91f83781435c3199a51c5e2fbf5e85f39883322134c44dd1070d1b7274fa357b9187fd9ebc7cbcac98a5be925e WHIRLPOOL d12be4d592e12846bcd5e87e541170d0f27f4cb8fa21656dcc9294e4893cd0fe6bc4098ace1aed25bffa1faa5aaf260995395e29c3a2fc950c88727899337255
-MISC ChangeLog 3014 SHA256 bb465f089e7b93c583283eae8e364bfb42cf56a2124a7502aa7686758a08d596 SHA512 929ad3296a12a5dc41de8a710d7e9a047309840979e074d96ce09ecac9b73622ba192edd025abcf359a210f370eaa47aae0c00e97facfb91a65a84638fc8e36f WHIRLPOOL 9f2d4f67c0e0b8aee27729a5ac21e37bb0479cdc7afaafdfc28492b27b0448e700c0300989d340263fae048fef7f0bb971f432f00b06f6dd5cbf05c4cc402f2f
+MISC ChangeLog 3150 SHA256 b40a4a96cb3fab209e42a3dc30465da4be9ea4a4ad810f8555c51879218a96bb SHA512 640d9710c88e6584736f2fef1e962f1e5f4736ce8ad6f52b3fd4e7a01fd8c8a17709abecbdc1d4f86532fc1fbf145f1989b30e4a138cae468498e3b4f6ed169f WHIRLPOOL a0fe7e3982436314d85094913915f877ebf6f3d7a176c5d8702db658497d5232fd8f18a69e9205d9b0eee741d69483a98b0a19ec6ae23088e21e5087d1ebe7fd
 MISC ChangeLog-2015 3829 SHA256 0e98c01b542fc619da02a3fa1bda531b4f739b39ae478b8d245b292186f46ec1 SHA512 76e9134d99f44821fed89c09f7a002b026473b2f3248ffa6d7679d17e30d0e19c0a241f7e7714fc7a7636864c97418afde9aac0743bc836ca43342faa3ae7e66 WHIRLPOOL 2de02e937233676cc1fb48b8c3e3af312cf1b34635aa367a4632868cccb4ce9e776f949f27ca424ff6b6d5aafe610cb65de4d750a5f5518ef3875c8a0e7979b3
 MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
diff --git a/dev-java/netbeans-harness/ChangeLog b/dev-java/netbeans-harness/ChangeLog
index 0e01e516d1e3..ad3c59a5505f 100644
--- a/dev-java/netbeans-harness/ChangeLog
+++ b/dev-java/netbeans-harness/ChangeLog
@@ -83,3 +83,9 @@
 
   Package-Manager: portage-2.3.1
 
+  06 Oct 2016; Miroslav Šulc <fordfrog@gentoo.org>
+  netbeans-harness-8.2.ebuild:
+  fixed eapi 6 issue
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-java/netbeans-harness/Manifest b/dev-java/netbeans-harness/Manifest
index 0705fe1ec610..9697437c20e6 100644
--- a/dev-java/netbeans-harness/Manifest
+++ b/dev-java/netbeans-harness/Manifest
@@ -12,6 +12,6 @@ DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17f
 EBUILD netbeans-harness-8.0.2.ebuild 4056 SHA256 5db48c33d85f91daa508787e42c9d5cf3e218aedf7df4a1498c86757a9d1d7e3 SHA512 35089876b4fb8e459dd4cda5024103d59f3429f175f138d135329a3b3ba188096ea17dd90808f1f9796f9dedca457f8491816c3b851dd30ebc5feadc2233e40e WHIRLPOOL 4fab1236c94e693f42acbf9ecc5576003b35ff690de2fb1bbc520794b5b87888df92850a433ba3f8ba425613f0f5715e9db052c4bfd31e4ae6a1e3f870b52ba5
 EBUILD netbeans-harness-8.1.ebuild 4081 SHA256 2c0bb28a6b8508b50edd3667c89151c9dee3ff237ba9fdbfc85264c9df87ac46 SHA512 2dba73883579ce841e9eefbf2fe92d25467521df5f8457a35e96e212bcd0e889e544be4b5fdccce7d2c3b65c9ee527cc7cc5d1f90d679df0c00129ce1d98c688 WHIRLPOOL fcffbe7c6ecf61a74e904bdad32ced37cd20515341ce8f0b2380075e68f9ae5b892ade50cfb0bf74c16d9fec291c7726d086d2343bc450e40bbb0a973c3325ed
 EBUILD netbeans-harness-8.2.ebuild 3801 SHA256 fb8e3c76ee96cbe6d36c5dbabb49f4baf444dc3f879ac319c0bec693484684e2 SHA512 5ac59770e25f2ce3ebcd0af36c895060a1b1f3e38dfc2b8efbd8aa8d7d0cd09d9c88794a7d1a40bc69dc6afd2fa820f7add7fabc55e3cf064702bb8bf5903f3b WHIRLPOOL 7ac28d024972c33545f8163d3375d80defe3d1e6890a118e497a7fc6177b4d35e065a7283dcc7a04dda8a56687f18d55711018df168c302624800c80d68949fb
-MISC ChangeLog 3024 SHA256 77430ba86d56c1bb00fe5fd444622f23f18789145564d9ba16dfb5495a3146c7 SHA512 7774ca4cb297c1814c39f50257c0e922c963f49e58331302f73447ab60c23080d8d15b12f355dc8087e77ddf75b5708675110ede2777dfae519c51fad724490b WHIRLPOOL aefcb7ebbec50d0187ed686b8127f82f793bc96a4f271cd7e427f4508a0e73e1a8626228d6aba76c2b1c6413b8fad96c680d6389fcb16753d0fe726a661e1424
+MISC ChangeLog 3163 SHA256 f1a23cc8daf2cae24f26a6d4770d8862cf7a97e4ed82b4e273f433dfa754c1f1 SHA512 fef41faf1d23127f7c664c92484f6af551d288fc87010b7fac1648ec1ff4eb9a5de348927986a885171bce487b7c0855a83efb527b7212fbbfbd74e795466f1f WHIRLPOOL 274415c85473097190c06383e3cd6804782a75f426602bbd4010b9d7668c6ce035bd22a6b351a7057e977fe2b06655d5e3d7114420d5a82c6252fdf6996fb27b
 MISC ChangeLog-2015 3877 SHA256 fdf3d6bec24f7c621c00ce5348358ba6d63b756c94dbfc7bcf6dc51759002882 SHA512 094385d35e2022821c4fc8d62fc373aba6a2de2df115dc8a029c8b89c59c7e8208c5f868e3caa0e34d7cf320e0437ee3a7177200ccc06d3e9955cc98fcf7d6f2 WHIRLPOOL 06179eba4a330f6652e02fdde46bcb907f384886a72ef39f695627d016ee00ef69e1749af7f3ec80867db069509e8980028e4c5693b4c6225abbdf7ccd2cadee
 MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
diff --git a/dev-java/netbeans-ide/ChangeLog b/dev-java/netbeans-ide/ChangeLog
index 86bb39ff7138..e3c1bd91dc6d 100644
--- a/dev-java/netbeans-ide/ChangeLog
+++ b/dev-java/netbeans-ide/ChangeLog
@@ -114,3 +114,8 @@
 
   Package-Manager: portage-2.3.1
 
+  06 Oct 2016; Miroslav Šulc <fordfrog@gentoo.org> netbeans-ide-8.2.ebuild:
+  fixed eapi 6 issue
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-java/netbeans-ide/Manifest b/dev-java/netbeans-ide/Manifest
index 85c5c74ec095..b546bfab9804 100644
--- a/dev-java/netbeans-ide/Manifest
+++ b/dev-java/netbeans-ide/Manifest
@@ -146,6 +146,6 @@ DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17f
 EBUILD netbeans-ide-8.0.2-r2.ebuild 29330 SHA256 6aa91df6cc57734b485b3b8a7ef449b6ebd369040028626822dbeb628224987e SHA512 c4ff8cc9c7a6bc2e0fc31dfc2ff57dcfbbff26b226a607eabe480efeb4830813c9b1c8f165f6bc9e0a1ebe6891a5718405d6c9b6622822a83815623d97c230ea WHIRLPOOL ccd93c87262aa64c54e2a9f5ba2890adc2a31fa41b3acef2b79a37117feb8648464c565a9c2fb672aa2a7caa6147ba54721bddc3f4e1029580d2237a30c0f45f
 EBUILD netbeans-ide-8.1-r2.ebuild 30303 SHA256 189cf1d363bf95a52eac33c7d3c0ba37282fbbc2586dd240043c31e8ec25aa3f SHA512 0828a4c27d5f86fd9623e038cf0547f17507e9c2310ca42fd993b17ba661a66b2ff19cd64489f666fd0bd0075a64fec8427e67d20afd79aa67cf8508e4b096a8 WHIRLPOOL be412cf0f61cfcf3c1f2932a0429dfdf715ff90a3e39b91dfbf03024a1bcf4f7b0a82b27ec286a0efd43402584b0953eb91a4043339bac44eacfb6c10a4521ca
 EBUILD netbeans-ide-8.2.ebuild 29524 SHA256 7e4c7dacab0363a0c3966a3c8004737f80405dc39bf7948fa9c06291527277e8 SHA512 1be3123690f9dd1a6fc1b21ab383ff6b3e39e43e32982bcccc41dfea25db9203dca09832eb016ad60a90e1360cfa12e2a85d2c5d644ba1206816b6c1df633d1b WHIRLPOOL 1e69d13e029b656b95fab996956f8349275caa90e1ed05205aaad0a9ea4df9c1e535d6e98adc30313c96ae8706b3ecf75e449ed16941e434c9f98fef339f9002
-MISC ChangeLog 3950 SHA256 d187bcd90ab2b0d07f44eaf2e7d7511a74f3afec705e734970cca1c3ed59e81b SHA512 1e66886c0e9129903f0ba1caf83152b79ad5f564726cb1e7b9221a5fa403078f69b690b63236957ef1be2b6cc033d3c9310ba4960a969ccb0a52cd3e04ee81cc WHIRLPOOL c7d69363661046621d908e2d4b327bd984fb16597eaf8d9d0344cee9c4d7d85b777bd854c7d087a3d491fbf9098467e15477c0a84c2c4cc77c98ba3b53d4de92
+MISC ChangeLog 4083 SHA256 a6df9ac0d85536f94067149c6dbe55b110281c27adc6ca669dd40f78cc03bdfa SHA512 1e8735a83d8b23b75e32eeac4bd5c9be4674ecb2d5268ec7a52f20b1141f49edd2478900e9a4bf982c796282fd973316e06998e0be3ab3e1582b699b55c78d16 WHIRLPOOL ddc268cc5b8ee4de62b00f8e1f7c849fbd79289f384a75f22ef11ac26e8aba6e4a654ebc5a91e4a67ac33c38224bde4331c5c79b0c481f766b27eef18cd4c7a7
 MISC ChangeLog-2015 4395 SHA256 444dc2b61db813c6d2699b104f92d65563ba7dfeefca3cb09dede3288dfdf496 SHA512 c6c9c4d63be442a69759c467e5db91bfdd05e91b33b25c69f27537a7c20e20f2a82d1fe9b530f3bae2773d4c128ae30a60b2cf16f4e97a86253341b9a31ad8cf WHIRLPOOL e40df361cd0a457a961e804995dcc2d724e75276f48f1bd12016a24476a7dfed283444fc46c2543ba9a81c6c8b21caacc7c4b0256b7fc93af3c3f60f7b17ef85
 MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
diff --git a/dev-java/netbeans-java/ChangeLog b/dev-java/netbeans-java/ChangeLog
index ddcf272a9d4b..069729650bbf 100644
--- a/dev-java/netbeans-java/ChangeLog
+++ b/dev-java/netbeans-java/ChangeLog
@@ -129,3 +129,8 @@
 
   Package-Manager: portage-2.3.1
 
+  06 Oct 2016; Miroslav Šulc <fordfrog@gentoo.org> netbeans-java-8.2.ebuild:
+  fixed eapi 6 issue
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-java/netbeans-java/Manifest b/dev-java/netbeans-java/Manifest
index df483461a53f..f6dd22382e9d 100644
--- a/dev-java/netbeans-java/Manifest
+++ b/dev-java/netbeans-java/Manifest
@@ -40,6 +40,6 @@ DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17f
 EBUILD netbeans-java-8.0.2-r5.ebuild 13337 SHA256 6ae0ecc8b8ebaa40e12b4b76bb050fd6bb1aa15d3ac42bdf84ed35161b51bee7 SHA512 44aad6f99617fecbfe6f35da6179a5d03d072d3680b0a3ab03731bf62d51175d27e89f4081f3bd2e1dfe072f57093202fb60c080f570cb3b4485e11b265e7f20 WHIRLPOOL 841f6ce30c155f5eac0ff02dede7eaa1ca31024c1b3ea6c367c9547a1bc90103dccf3dc3b1612054b2635568441f74561d78a59842b59a828d4bc37f3e04133b
 EBUILD netbeans-java-8.1-r2.ebuild 14816 SHA256 da485f6ed90832d7a1a9c6af2196e0c9828c3f2674fb3fb4a24ebbf2ab2ca530 SHA512 7a2c539fa51fcde273727716ab59c63f88616b1a9cbbdb177ed8dc0b69fa9c298968561b8d43ecab35a6faf37eaef036b6d5468ecd447c48091a3a988aaa9489 WHIRLPOOL c0fd7e3e927185b5fa9a0a978c6df5fb31238e71fda985d44f349c69901d15558d4f64341586e956444c60f37249852c256475ed476a49f4a3a6d5b825e21b72
 EBUILD netbeans-java-8.2.ebuild 15331 SHA256 c35725f6dee4e634e4de474617a307e2aaa6434a9569bffd9566304501adc9d5 SHA512 259c16a255409df4d0519bf7bddd4200ccaefdcbae4436fb321c33b215b757910c8cd807c8f142e8ae42ab4bd59478436ecee8c4d3d38615e8bbf110c265e950 WHIRLPOOL 07b86ee0c402eaed18f3a640ec5a447bbb781154e477db93ca51ee8034b991be39d8203c88ed0119bd785091cd82ae41367477e902dfb96ad41ca97410f5f41d
-MISC ChangeLog 4492 SHA256 fdc96fe158cd9f67b80d020727a2d043542a2892230ed66548ab288b3b25b12b SHA512 c2e8ff93e7645bdb60b9a000c55df25a49fde3151ea7824ae912a312a69a01f535f718d4dbd9d27ff53427f48fec6d36202d37697040709d071016e31a01ec68 WHIRLPOOL a297ace28269be0c3cdf628fbd00d7b119440e98168660a21c7c689524cde63ca6f724832499dadd6f62bfc36b2e7dd8b0c98f4817216ad162371d5d9f825bee
+MISC ChangeLog 4626 SHA256 7ab0a830bc8774bfce14c175ebfdcafe1d64b9f4effef2d0e04bcd3ebda23b6b SHA512 1763fecbfec0111624cf43dd0b7af3dd8df4d59674b8cc29e9600423e91d8e0faa670f2ba5ddc95d0e6dd551235a6514f4008a2ecb91463fb2f2261b4697953f WHIRLPOOL 154b2d905f2565fa2ac0d405784358caa190391b9242ad2743db3d5592550a98006a67154d017a9200ef55cbfb2ec0d34487c1cfffe0a4ffecbacc02a26f933d
 MISC ChangeLog-2015 5473 SHA256 517226d6b36840eae48ee8fd7120a9e11d5324c080eedc8adb01afefde3ead51 SHA512 43d674cf6aaf0effc21bb6a38fcb16b8b44173f48241594b326e3855c3f2f7ccd787b3495ea619879ea285838037ca6aa79a1bfa5e092ed43b043c0f45ef0860 WHIRLPOOL 57012511ec3331e429ab574c9bc0385566f886feec8f789179c762b6dbf7d31fcd61ae97ef8ec7e6447865c64231abbcfca01dbe481abc2c7b791cc77c2a1680
 MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
diff --git a/dev-java/netbeans-javacard/ChangeLog b/dev-java/netbeans-javacard/ChangeLog
index 61f0aa4810db..d463390546aa 100644
--- a/dev-java/netbeans-javacard/ChangeLog
+++ b/dev-java/netbeans-javacard/ChangeLog
@@ -83,3 +83,9 @@
 
   Package-Manager: portage-2.3.1
 
+  06 Oct 2016; Miroslav Šulc <fordfrog@gentoo.org>
+  netbeans-javacard-8.2.ebuild:
+  fixed eapi 6 issue
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-java/netbeans-javacard/Manifest b/dev-java/netbeans-javacard/Manifest
index dca6a9f33d54..120c08815ced 100644
--- a/dev-java/netbeans-javacard/Manifest
+++ b/dev-java/netbeans-javacard/Manifest
@@ -10,6 +10,6 @@ DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17f
 EBUILD netbeans-javacard-8.0.2.ebuild 4907 SHA256 bb1e1296306353364306b30f4d115377c42fb33f09881dc62e8a5d77584a3f05 SHA512 e76cb26daf286466070a1b1aa5bd5341c8202b853c89fe4822ed5d11015d3df3a9e6d82f651c0d8b8266145b4a283acc55699884a0e1a257c5ee5bf6f45ec751 WHIRLPOOL bc5377f3f5c52ea53b2ed682fb0c8fe6f093737d229d8fcc20e0df007bbd280d372c923ea45a0efceab6c65f511e59574aac1a40d3156234ab927a2065e51db9
 EBUILD netbeans-javacard-8.1.ebuild 4932 SHA256 f39ff2bdc54189a092e83bfce95882e69fc9ff339cb5a045102598c19f1c43ab SHA512 b6189d17d11f46b30dbb5257cc8a44534c1bb4615f32e79542b2a43215424eb5368de34f348fd08bf7c83ffbed46ffb6bab77fee488a8cb93e0e60868e8b664b WHIRLPOOL 28ba0aa6d0623238f14ba7bcb3cf17968b398c74b8e89dbab09e534daa4b3b5e64b63f3dba9ca25873f07a6bd485a0b83f9b3de6bf3d9518768ab74142703a24
 EBUILD netbeans-javacard-8.2.ebuild 4646 SHA256 3eb779b4872b425a8f9ac0b2eb78984eba38c614d784be47af32a3fc90b8b2fc SHA512 361cb549efbb2835509d9a6aba409832173a4f3731e1ae31016a286faa9e8da94a206ec876109f1a1095fd1f7e9d73f3360c5c385802268314e93aed1f187218 WHIRLPOOL ff13272370d4782a140484c0d4967c3b2d16a2687c9fba444637577ac3560ac4cd23a67699debc539b884049a61feefe4cc91af842c3c0243ee9077a2b6b9c4f
-MISC ChangeLog 3034 SHA256 4a5c520256eda59fa2e2a5b3b503c4f61a689a204ef2e5ebbc0da3831d512e41 SHA512 72fc1f52ddd59f79e8d5289477b66c1f2d2c8ccd7bd134968e655a32a45e4873cb94d2627ca907864d6f67bd771ec337e6795e1b7d83858d479ca79b80cf3060 WHIRLPOOL 0071470e82c04ef601cc145f63cdc56058f4b660282304832200acfa58563276226bb020e779d192b46dea1b9cdda61fab47fc91f982c72c4a3193745d72435b
+MISC ChangeLog 3174 SHA256 104b510c0aa14d1ca2d3d93988c84d55896923b3b13ae07c2aadec9246bf52a9 SHA512 08537fb58ecc3bdfd656d2137240f3d792f9e0fbe6eb810dea328fcf2628ec35a35c882a84bf6208fa89b377d4b0a6de28b5f6d7cba12385905faf1f6dbce831 WHIRLPOOL 2f8360898886a6508ed9e4025e0dae2a2da2344f55292d437b40a048b0ce8a031ed806d369764f25440cfd427b40f769672fa664f5eab933060a663a0b302093
 MISC ChangeLog-2015 3929 SHA256 0c976c564b5f55ed58948115c321e2b280b168b946bfed0c1e9da34c9419327d SHA512 7326b6e358e4a91dded1da056a5e24f25391f32ab6dc425a2ada1434e936474fe15fb7c67a7a23d06a4642fb14dbc30e07344fad6d64ef82df7666e53da15a69 WHIRLPOOL ca85da6cd28235c56b2ede8310cb8e7b37acf3b52e92e458706fd1d490e44097f56a438ac76c135bd84464c90fa8e3714c69d41b93b3346a47cbc4b2bc61c888
 MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
diff --git a/dev-java/netbeans-javadoc/ChangeLog b/dev-java/netbeans-javadoc/ChangeLog
index 8f704e19fefd..249cadfb3c5f 100644
--- a/dev-java/netbeans-javadoc/ChangeLog
+++ b/dev-java/netbeans-javadoc/ChangeLog
@@ -89,3 +89,9 @@
 
   Package-Manager: portage-2.3.1
 
+  06 Oct 2016; Miroslav Šulc <fordfrog@gentoo.org>
+  netbeans-javadoc-8.2.ebuild:
+  fixed eapi 6 issue
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-java/netbeans-javadoc/Manifest b/dev-java/netbeans-javadoc/Manifest
index 99f8774083a5..373b2e9c5747 100644
--- a/dev-java/netbeans-javadoc/Manifest
+++ b/dev-java/netbeans-javadoc/Manifest
@@ -9,6 +9,6 @@ DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17f
 EBUILD netbeans-javadoc-8.0.2.ebuild 5994 SHA256 cd170031a060547dde281f222d75d9aa8469ee5d6b02169d7e98f156d324e9f0 SHA512 f428038ee3d10593d17064748a68119729f7816ccbea5d8046cfc9005a748035ba5549c31e872dc84731d811c93de84fd8472f64df4e0d49cef2856b50971645 WHIRLPOOL 2602fc07093287d0d738b4d5b10167e97a08ca0715c6eb86aac5c045c43a15f9fa6a04d5a5de4905d7ad29782fee1fd6563f53fc103e99deac4eaaabc9ef6099
 EBUILD netbeans-javadoc-8.1.ebuild 6249 SHA256 6c07c0276702adf293081e1a179daa327743fc011785b2f9ad5092c05ad05f35 SHA512 17de9e5848c7b9ae72fe7e4449a828cae1e3068d99f25d1a1576bbe65103c6042c5673b137a1f1202f72d5024ec1aef23442b27641133d4a8505101a531da2ce WHIRLPOOL aa7f8ca1d38937b7a69d3210fbfbef014c994f0aca3582f4461010b8d64d35017e116add92aca3abf28c032bbf2f4db2df5de11c938df0f15301473f30cce246
 EBUILD netbeans-javadoc-8.2.ebuild 5947 SHA256 1f1c2aab9b63d0e87c93339f5457515573248c09532f2596ad272001605d096a SHA512 d133bfe2588f9a766ef4d5f01f8f0aacd683813ee93815af11f4560b2a7a9d7c48e919d36f002e667aec6ac978f02e07bbaf67a26512b69cd965a8f238b2f60b WHIRLPOOL f5e83670d013e22d4448d70bfdf38ca28adf99b2418446aa3018a59b5fcb75d43ed932659e222e6383e75a56de2340b4f939066631efdfa98ab016e438bcfcd1
-MISC ChangeLog 3181 SHA256 8a298c25bc8b7cc2407c5c117811db92518f510e5c87d68b3ef62e9d1c13a177 SHA512 817cf02f7032dd8bf698a444da16596eb040866a9dd484045efe575b74cc5360052838ebb59d57e5e6f2354875a6d5805fb3927fdecac960af59deaa15c1406e WHIRLPOOL 80e8f6e33797875a1cbc479577e6e821855ebfa6a3ca41f37b54b7d85ad82862bac3a64f21df32c41c07504777146d5c23a9e46a77e9aff7dfea431ace603e6e
+MISC ChangeLog 3320 SHA256 5981aaad4c0a4586871f941c21f5fb45c3f786f524e224045a339d95624b57f3 SHA512 d9259c5e48ed39084b6d2ad2fe40b9e4c2101238b481237637b2ad326a520247c0a67fb23b004ca4f73f39289d0ba9f45bd74c0c0020653f0dfbc0d4183ec4b0 WHIRLPOOL f79ec1b9668750d0af4781f340d7c78d82610991f20c751cf422d2107ffa88046a1f635636f694a5cc44edb67b9d96dc6b78b1ace8e65607f29d99d05a4d5e9f
 MISC ChangeLog-2015 3992 SHA256 d58203ea02b4ee78ebc5a24f9e7c2cb5a1ffb4cf9b7dffc943b54e1ef3e524cd SHA512 7986044d652f23f658d03f4065b1bc48ea840837694733019b0e9f4d81867350fb2390d752d2c6924795b53da2d6e80bea6a09b23674cd7cc500b1858a7fded9 WHIRLPOOL bfd549eed6995ca8cc741196adf1dff8970c703c8a3ec7bc7ac3bc7fedad8dd76fcda7f7068eb1e33127fcb2776d4215d2c6a1541b3aed7753abc81e0af56b2b
 MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
diff --git a/dev-java/netbeans-javafx/ChangeLog b/dev-java/netbeans-javafx/ChangeLog
index 48096b6b3799..b2e109301164 100644
--- a/dev-java/netbeans-javafx/ChangeLog
+++ b/dev-java/netbeans-javafx/ChangeLog
@@ -83,3 +83,8 @@
 
   Package-Manager: portage-2.3.1
 
+  06 Oct 2016; Miroslav Šulc <fordfrog@gentoo.org> netbeans-javafx-8.2.ebuild:
+  fixed eapi 6 issue
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-java/netbeans-javafx/Manifest b/dev-java/netbeans-javafx/Manifest
index 827e6fc4d61c..7cef621b1db0 100644
--- a/dev-java/netbeans-javafx/Manifest
+++ b/dev-java/netbeans-javafx/Manifest
@@ -15,6 +15,6 @@ DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17f
 EBUILD netbeans-javafx-8.0.2.ebuild 4648 SHA256 55f975b6ed9c7fb38c3390c4062d5f453a901f2dd2c1c3640b1d32d0129e522a SHA512 3e7442aa08fb9a79249426cef02a5738ec26412110a7b3933746e23f3bdad45fba6dc82342afdac9bf4371d6664ba2bc7ddd6b20279855f64505823bad969dd1 WHIRLPOOL 17d30f0cb6274fd10c770491ddcb05ef2e96788ec4ee2030ee477af5b4da245c80b5437c14d456c284e3d74db6de195bdd3f7fd0aa1d455d15c92feca58d5d90
 EBUILD netbeans-javafx-8.1.ebuild 4673 SHA256 3058c908857396c7761d2309e785820d949ff946d83a07db5e3251e0c8727881 SHA512 bbe6c898a024e7d842574457ac88283f719540ec93c9f0547e849a5f519b2d3e4a7ce24a17732819e98ba62eb1317dbb0c833dda6368afa055f6d7a0ddf270cd WHIRLPOOL 900d1ac71fb70a625eb592fd333f1eab08801bcb9b76820f361b4bd12b7191d29a3eb73c93126de0d6a7f31b2a7c1e9d69cb3a00e87a696a432ef5b0b7bf1dfc
 EBUILD netbeans-javafx-8.2.ebuild 4392 SHA256 8f8d1cb51f4071d00fd550a3cbcf48df0e1f3ccc8906bb43d7c384adf3ac2764 SHA512 4b4f347d25f758fb8c3f9ece13f831ca2365e510b895f6cf71b8063213a8db6cbc83f4cc4c3173e3778a536e425e969e7810df79ceaa453ea57b502d5080b239 WHIRLPOOL 73f50442c2d03473d0e3075c6c90f6dde8900faea51ed19974445db7a6a2abba6f525511ddc58d9da03e011e851e5a58539b73fe6e1c5b408b3d000318ce5630
-MISC ChangeLog 3014 SHA256 924daa92865160e061a6e7ea137bf1edd4b63e83ccef42bd8e9bf0b63a498ff1 SHA512 92a0509c6077fc9e29b49afe021f4d5fed13b957ec2d20b4e25f66820ef89b6cbd9335e155c7e0b89a1f90ffc8067d396795635b23765e27a1421b0ad7dd0f50 WHIRLPOOL 57a7e62f8f225d8e50b7ecd6ca3139eeaa0c1bb8c4a17b64df5bd2e60ae2e05d1ea23d53fd072926f8155eaf6862c4552f3fc718dafa408c0f90e3dccf858098
+MISC ChangeLog 3150 SHA256 b6a3106da50be5e1636634f9f1ac8f2b42622146e48f1e6f1efbb67c59dba425 SHA512 ba2bb27a62acd6c05c1de1e0bfaeb1f09c698bfeb6ffe73aede3a09f71454dc766295f5cc0964f1c4e692e3c024f3d9c4f20e31b8cd6139ae83d6e63b16df2ba WHIRLPOOL e9e39f7fbdf50ba63c8d968f3e5ec90901b5435c0148c9178b8945b70f63056385e274d904bd79f94232b9b095dc3a16a17cefb2c8c70e85d89bde24e358b628
 MISC ChangeLog-2015 2753 SHA256 a7c06008d2d3d1b4b6b10e4555188976691a086af6640f4c60d550da70fc00c1 SHA512 a6660b3744e7d360ec7ba2f5d1705e917ca9a9489b3aef37bd5d2aefc52d60dafe7070a0ea3467c34bacb492e92dffb6367a0d901c6c07c146dfb7569ca28bc2 WHIRLPOOL e4f099254828f727fdd5aa7480c2af59254460b322859f397a0f7ad64fa7edc546ef675070add841e6e76dbc644171c8ee120ceb1280a95344b4ca60feaff5ba
 MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
diff --git a/dev-java/netbeans-mobility/ChangeLog b/dev-java/netbeans-mobility/ChangeLog
index bb1712644175..a4a94354e23c 100644
--- a/dev-java/netbeans-mobility/ChangeLog
+++ b/dev-java/netbeans-mobility/ChangeLog
@@ -83,3 +83,9 @@
 
   Package-Manager: portage-2.3.1
 
+  06 Oct 2016; Miroslav Šulc <fordfrog@gentoo.org>
+  netbeans-mobility-8.2.ebuild:
+  fixed eapi 6 issue
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-java/netbeans-mobility/Manifest b/dev-java/netbeans-mobility/Manifest
index 65969b367982..5489115ce55b 100644
--- a/dev-java/netbeans-mobility/Manifest
+++ b/dev-java/netbeans-mobility/Manifest
@@ -7,6 +7,6 @@ DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17f
 EBUILD netbeans-mobility-8.0.2.ebuild 4343 SHA256 15cff2c9f92805d982805eb0b3f53873da0ef4af61a99426d9c0e3470670d8cf SHA512 e675768e896b5f3063884b2b8e59068fedde54bf2b6def394dd9e46d1265af7162030b996bc24460fcd3b400205d1d92477389a6a8446049552a0e5e1a5c4b46 WHIRLPOOL 843e1fcbc5b2a93d926b2d375b13e3c6090acdc9ad790378f61ea22a4fe783119c9a20fe3ec0acb224f47105f1767cc1b1e5ab18658be59cd6965f7819bb27c2
 EBUILD netbeans-mobility-8.1.ebuild 4368 SHA256 8f7391450c3dc6381a42044c811384d14498ad16d1efc11897f6bd36e5f344f9 SHA512 f5373214fc018846238efc72d0a238068b465b320771141275fd54d705ffd0d67a72944b6848755f1393e90000ae6e6906dfd7e8bec4a026ea7dcf416bc7aca9 WHIRLPOOL 9890edcf2afa8ac9af5be16e1436cff25c055b5920d38c93cdd5526476ff5427933fe2e163347a36cf97076bbaaa3cece4b0ef315b58edd73d37578b9c9c899d
 EBUILD netbeans-mobility-8.2.ebuild 4087 SHA256 38f5fef1c2f2ff5030842622999f12ca02d8978eea528a38a6bb3c0705e46344 SHA512 2b6c00f2f2003b336e25f6c4a524be1835c2565302ed43f3eade9cfb251d368eb94ad5fed01578561684e8a1ed37f3368c78b0b9d00ea6c794abf200f007525d WHIRLPOOL b990976000d451d23144bbf1378365ad019252601e261558750fe38821abbf293fb40ccd5a966890a688162aa05bb34fe69b78519fa2b09fef0a539a482bd5dd
-MISC ChangeLog 3034 SHA256 967ed83ff9e134dba7019ca5969e4b341084c72c070eb41995dcdf37785736e1 SHA512 61bb91ff8e0f2d4b0d30b4a8ede3291f35e5c375400f1e9e6eeacd10ae016d93454b700aab89b644503251c33a2095b00ef9fb6e23609784ca019ea9960e1b14 WHIRLPOOL 82762d191ded4a484fe6c2ae3ad0bfbce37d24e6a893c2473f70295e0bab3ce074b3521487936e1cd8d07eb63509c7038f0819e2c89061e297c6e4a5f27dce9d
+MISC ChangeLog 3174 SHA256 f558338a6741557d0888af11ea143fe26b34255f559bfeddfe3e934767094a33 SHA512 14ae091a8c61d11b86e62ec24bed7a8b3c8a01f966a1a716ff5277d18f98975564a3660147d2c6501be4d3cd1bda708b865c2331507e5f876879d2b59c017df3 WHIRLPOOL 2b90b2d2f2d53895b94de69686b51ad017a8351d55c013b92718218e38ae3e34b1bc5861c3bfa400a536ae4cb4ffaff43d5eb5be15359572b3af4de27059072d
 MISC ChangeLog-2015 3929 SHA256 f875addf5c40d01c93fac1199a7a78662a7171829bb940f21e95c2fb9dd63be5 SHA512 0ef39d00bdc0c8b167efed98ac9e58bcaa0cf054870571d5ef5304a94ad21cc12a49ef2de79786e92809d436a76bfa5ce3cde656551c9be55bd2dc0a6bef09e6 WHIRLPOOL 4135c5a3a2a5824fe9ea96f56c8516c291eaf5c2fbf93c1145dd5610a8effe73caf2c925ce850b32aef0d395994e754345a3c0d0027e54aaf67e057655c81ad0
 MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
diff --git a/dev-java/netbeans-nb/ChangeLog b/dev-java/netbeans-nb/ChangeLog
index 515790745837..d1d1ef621664 100644
--- a/dev-java/netbeans-nb/ChangeLog
+++ b/dev-java/netbeans-nb/ChangeLog
@@ -82,3 +82,8 @@
 
   Package-Manager: portage-2.3.1
 
+  06 Oct 2016; Miroslav Šulc <fordfrog@gentoo.org> netbeans-nb-8.2.ebuild:
+  fixed eapi 6 issue
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-java/netbeans-nb/Manifest b/dev-java/netbeans-nb/Manifest
index 65e45ee2267b..2c68473eb75f 100644
--- a/dev-java/netbeans-nb/Manifest
+++ b/dev-java/netbeans-nb/Manifest
@@ -10,6 +10,6 @@ DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17f
 EBUILD netbeans-nb-8.0.2.ebuild 4929 SHA256 63583783ae33431ba18ebfefc853b56280eb8a768654182475b1e36b5203f290 SHA512 7d2ada37b67d4d0381713f2cd43854faffae7a53d313f387c9a90edcc35e4761e2912dd628f08dde4cddf9f1b778a22274605e720237e84db3a68f966e9bd70e WHIRLPOOL 215ac271c4b2eb5f8d555fb080142ae5cd41cfc32043ae71e4574bb96b2963d4c71f4ced517b8048c98509913cb89cb2435de16a1fb8ed39581622ee6407a58a
 EBUILD netbeans-nb-8.1.ebuild 4067 SHA256 44c70a83a223fd9040ea3815ba359578f0dd38ab914b28af8ae4813a05d5d545 SHA512 14f3b370161f8c7543d36ebb0e27f3949d24aa0c83d4d63ce3c8596727fec9b4b47d1b0194c7c3df79aafe7fd899a0735786ddd25a3270c8ae71196a4779b65f WHIRLPOOL 19acd65ca0d722469b38ee49f40c633bd9e8bfdf0f426dbfb1af1829ec2f43c826819db8a7513ba1df2774b9857a7d99c0a3f2a6dc065aeaf44ba07035e68f90
 EBUILD netbeans-nb-8.2.ebuild 3786 SHA256 52734d6772f8851119fd367429d69e4b2a1396cdaf0145cf5969a2532ecd2ec9 SHA512 52494c0b0b6988461d0ae2b730f2dce5a4ba7477851f3076637c4d4bba01525efa2ccd869db7f59827c201f47cdd933c25430fd441282bc6be41991f26af8370 WHIRLPOOL ca58b3abfe895c4c68b8b2bb60388924181fd9f44832281ec43d5561c36936ec13f189046bd9e6e12d17c80199a7692758ceabd903e839fd57c6776e3da21898
-MISC ChangeLog 3042 SHA256 a4067fd5db4a79657bec913036253d88db4ab782169570950a639c1c7ff418da SHA512 44b10f4085e35c773eeef3cfc3c528cd3aa3d4265c7a39a8d559c2731f5938b3d87eb8c174949dc84680ad0925f0168503a65646a86562aaaf2256a44d93bec1 WHIRLPOOL be47987cf2b9d575f3ade304c872f7c409da78b7c5855b7b14d1a473895a7ce1f72ec5a2f32aede5b76d769c7c9bee8bcf7a627b0e928b7b2eea0df6921b0575
+MISC ChangeLog 3174 SHA256 031c689806813e6b3757605a4489ee7fd8362a0712e67c7ede92ac23861d946c SHA512 caefc37d8db046c31f1d3925224553abbeb3cfcfad092ab100c37f9f2481321669594119ac22d09ebac83d26f554311bd9dee0b6bcfaeb3c2fa0f3b076098611 WHIRLPOOL 4909fe92c4ce97447ab80474a423ae31f9645973f854d0d4fc10faa3950d82dd7b0d5c195ed1290d063611f300a8517b2712d5a8d19e66ab220b9f83175fbf3f
 MISC ChangeLog-2015 4319 SHA256 3ea595001b0742b1969fbd5cbb5df9daabb1a9541e8856d4c4a4d7a9cfe46ace SHA512 cbe5c1dfef3a1464c8c3b8e25b805bd373ac54aa1128f0c88a4561ed62fb69351750ee1ae6b0eb3ca803c699ca7ca13510fe84bbded3efc411f2f19a44fbbdb0 WHIRLPOOL ab21108eade861a95357fd6e0c7823c5f489a7adfb25e02788f32d24bf9a527c141bdcdb7b606232bd1f842513700b27eb1d655de5806701b1c3fbc09887b5f9
 MISC metadata.xml 487 SHA256 6bde8ce12366190a06d47a858c48f89b2eccf095b9f2f8e0771cb5aa8d7d04e1 SHA512 3adb6a12417f68d9c6807560509bcc4e7f803b5f65229131a9958ebef55ec1d11bc3950db909a8ce0e6c691f95ca889167f9dc94871cf67ccb6293e5fbb34543 WHIRLPOOL 8d3c7d442637c70ff9386a6bb22026b404adbcddc9ccaca20c6238657d4432fce3f03d2052f045eaa49b1dd1c13670da9bd9f0898d9bc5f7f3433a7e758c3131
diff --git a/dev-java/netbeans-php/ChangeLog b/dev-java/netbeans-php/ChangeLog
index e90fa2f7183f..3ad25c2fe8b7 100644
--- a/dev-java/netbeans-php/ChangeLog
+++ b/dev-java/netbeans-php/ChangeLog
@@ -81,3 +81,8 @@
 
   Package-Manager: portage-2.3.1
 
+  06 Oct 2016; Miroslav Šulc <fordfrog@gentoo.org> netbeans-php-8.2.ebuild:
+  fixed eapi 6 issue
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-java/netbeans-php/Manifest b/dev-java/netbeans-php/Manifest
index 1c7018b4eda8..41eccba61028 100644
--- a/dev-java/netbeans-php/Manifest
+++ b/dev-java/netbeans-php/Manifest
@@ -12,6 +12,6 @@ DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17f
 EBUILD netbeans-php-8.0.2.ebuild 4348 SHA256 c508f17e8033566432a0dfa936d06ae908a799e9f26e7740b34a3adaf53ce97d SHA512 a4815cebbfcf01af1f98ebe4341c0acdf678bec5d177bd160a479df15ff55e896ba9b90a6b0de947593501867c2a918da3119beabbff2d2fc0fcab7bd74d8d98 WHIRLPOOL 8c15a89a46197ca5e37df31a2c6a8ed16d02d388be3c0afca8454ed0a0599bbcf1de8559240372b5feae674f113312bb87f904e5fea77ac56e3d85a9e5bf58dc
 EBUILD netbeans-php-8.1.ebuild 4373 SHA256 ca3acd0cbef3860b8a4792fe5b8e3d06b0331ca132943a29ab119b0b0ad23792 SHA512 f33c7ed685a966f1634c53a554113fa069146f9784964f7ae8fccaa678ea6e1f02028ae461f87e82d941b22efd5e2dfa7c65c2c0fd3c9d2120be4e14ec2a9784 WHIRLPOOL cdcdd431064f0c97c16ba47eac972de4efdf84d9a6d530545cb8382cf4e091221e0436e336d67d3c1d455ffc664ca277176d15d986ce351d377165302ed36a35
 EBUILD netbeans-php-8.2.ebuild 4093 SHA256 849571671ca312e7c0f800927c355cc43497e2c1f0608ca59fc24a6e1c27700a SHA512 ce37abd91c8bed53c0ec17a71491c1ae734e973f1d537e8163e1ad49ef4ef7b7e26b9a5c8d58d9b43875f8d265e05664b9029841797e2207c9d8ff95467a573e WHIRLPOOL 3f1207f96c384836bd834ccc5287954b8767d8569cb1e0184d48da740de4c241d182d8016e53c6133f9c23788bdc168d4ce601141e88488329b299ce23e64e39
-MISC ChangeLog 2980 SHA256 448ecb455dfc701acd35e2b2fff286a8f10cb9b41210a85fe12985fc7c64df06 SHA512 873271037edcb04d001ea8c83ec932c41aa81779e816cda1f9c6d5b6ef3273156fe4820d595dd9d73ee0208dc31a85946140ade9a684b8907fbef3837486bdd7 WHIRLPOOL d330994fec49421a8fbd1c474e859cb90c94549219c3ef56ee69e724d801e5172c1a01109ff09acd4c19be52181cd0662f00fc5a01b7696524411fd65184430a
+MISC ChangeLog 3113 SHA256 5c613440a1ecfda71c2ba392732a96639148d1eee1e35689ec86cbae39c1a491 SHA512 7e0b17170d48860ac53412502e3a3ec2e59fe9e00ce043915366ed180a165dcf58320c66ce3290d5e02c7ad7fe0a7255ccfee11fb748dbfe673d369de3f11cde WHIRLPOOL 69c9170952d497fe28c6128ea2ef76cd698892b5dede8a965bb9a47593202f6b9e1943063399a452656ff17ca9ab9e07b02fec2548cf34db2c4386c55935c7ba
 MISC ChangeLog-2015 3657 SHA256 86c50fb738507a9b772e7054be8a45beea891d898af8f701b449d61eeb4b2bf1 SHA512 39de3024929bce4147b075546861c093bff25f87cf5c178b9b97528e18eac78810b84249465cc08c086aeefd5cc073fd3ea0418197b0e49fde3172422c7bf9ee WHIRLPOOL 177a8a1c27aa69d9991872ab3d93908940d0889eeaf16270499a83421004368fec2aaff9703e95708491a9e2b901b786914deca8981c7248b168b2315a1ca09f
 MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
diff --git a/dev-java/netbeans-platform/ChangeLog b/dev-java/netbeans-platform/ChangeLog
index 0844990883d2..9c8a3b4eabbc 100644
--- a/dev-java/netbeans-platform/ChangeLog
+++ b/dev-java/netbeans-platform/ChangeLog
@@ -89,3 +89,9 @@
 
   Package-Manager: portage-2.3.1
 
+  06 Oct 2016; Miroslav Šulc <fordfrog@gentoo.org>
+  netbeans-platform-8.2.ebuild:
+  fixed eapi 6 issue
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-java/netbeans-platform/Manifest b/dev-java/netbeans-platform/Manifest
index d57266eec8e5..deb6089c178b 100644
--- a/dev-java/netbeans-platform/Manifest
+++ b/dev-java/netbeans-platform/Manifest
@@ -33,6 +33,6 @@ DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17f
 EBUILD netbeans-platform-8.0.2.ebuild 5407 SHA256 21100e44afc8ad342e0476371bf5b5b8a4453cbe19bef7176f44c88a27771159 SHA512 3ebe3cf9e3f5a0fcc32dfa7298c0fd6c2c19869a906d4350adabb250fda37006cb4e4c43c50c95d1856005e6ca472e8db5cedb939e703de016b0538032c03df3 WHIRLPOOL 10d2daeb72fc0fc77c96b331feca75bc50f167c405205d0b0c5b1ab940b50ad1062bec2fe29ee02666f3e3b012326b33eab6712c60c2282f0d69cd97856d173d
 EBUILD netbeans-platform-8.1.ebuild 9322 SHA256 1e969ddce738700e8221cc6ce6d4dedd03e8c49d6c1c36cad1cd5562abc3d90c SHA512 78f7dc67299d47494da722eb72480df331ab7ec53b457d42d1557094029b049249f1ecf9758d876aea828fb005f4bb2085b690ae89030d846327e8951e771e38 WHIRLPOOL 8f7102e9ab49ba1739f35f40049698262633f588847bf627adeddcd2ab264fa6c28e687d25e2e2d75e5bf1ec1303fa3b90e8c3534400564e4abf0c2244f8ab42
 EBUILD netbeans-platform-8.2.ebuild 9195 SHA256 6d0332d7983992e46c28840c56a9e2d2fd3fe7cde121f7b3b0fd861c2c2fe87b SHA512 3b62b7a2c35d6a4f124e17724a60145a673464d406d93925de616db07413d585b69a8dc6725c6c3e3ecb0f5ef89a9153c7d527b0d9e9c2922488f73f65123ae0 WHIRLPOOL dc00da4b290ae6148e7cd1636703207903688fc4f5a9d3593ed904aabf327358cac670b739e68ebf4514edf6d4d9ae5079082b84d3c11aafdbd586d5c15bc8d6
-MISC ChangeLog 3192 SHA256 84fff37d0fc2c54e860852a2493cea3eaebccfeb48ded21ba451b73e320b8f83 SHA512 5541e924fd924a39cce0fd33fe7b68c7b8ef1789c49e148ead094f37fdbc54d2fe29c31f5aa1eccb92cd463d99285717831a58cf388d9355163bdabcb36a2a45 WHIRLPOOL 0306e26ddcaa9b891bb385165971f62c64798df65506a2d7d637d95c3d05a34af5aaf84797ba4b743b756a03736b223f597a4154a7f4c5e3aedd5c2bb9756e0b
+MISC ChangeLog 3332 SHA256 415229cdb80e0cd02b97648b59d938fd6bcf51db241c971ae077cd15dc0499fb SHA512 bff49530f816e17bb35b9ec6e651fb6709b226ea81a6c03d7cc6537e5b14ac97eae2bdfff0706a813c0e79191487efdca7994159e446defa2a3c1ea70b1df996 WHIRLPOOL 6c5af4d18dfa45e19a50e8113498ecd986454eb3819f977c997e19aee6eef0e97abd17247edb53ae29f9b3223b33eca46c3bb83872d7671d44b182c9d86bc0df
 MISC ChangeLog-2015 4258 SHA256 bea17f6a4a63aaff0a5aadbfd4a597a99be14185651a01124a794b9a454a13ac SHA512 d9363aca761b97dd3e5e508dd364d7d12b8e72c2fe9b61cf6773be9321a5849ea91a7e80e7e06ac614b60c633891e5f2e91b106e1a73cb2f2b10b9b06cfb6f42 WHIRLPOOL c6db3fce9d4745a226be1174a22357c8e95204d234af6891de8283afb4f7e5c2a0f49e6e352bbb28d92ea4ff6cbe69477ea9df6a6be677b2371fba7c42325b05
 MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
diff --git a/dev-java/netbeans-profiler/ChangeLog b/dev-java/netbeans-profiler/ChangeLog
index 4301b7e2301d..8eb069bb0610 100644
--- a/dev-java/netbeans-profiler/ChangeLog
+++ b/dev-java/netbeans-profiler/ChangeLog
@@ -83,3 +83,9 @@
 
   Package-Manager: portage-2.3.1
 
+  06 Oct 2016; Miroslav Šulc <fordfrog@gentoo.org>
+  netbeans-profiler-8.2.ebuild:
+  fixed eapi 6 issue
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-java/netbeans-profiler/Manifest b/dev-java/netbeans-profiler/Manifest
index bce50a05ca3f..0ff0b13349e4 100644
--- a/dev-java/netbeans-profiler/Manifest
+++ b/dev-java/netbeans-profiler/Manifest
@@ -7,6 +7,6 @@ DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17f
 EBUILD netbeans-profiler-8.0.2.ebuild 3403 SHA256 496e44540a793ed37d8c8c89d935c975cb6ec8143864c6801758db928eb12e28 SHA512 3b06cbf3cd962ca8a1a812234439060914752df8e3b59507106ace041fc340d0721f831ba853175d0e6e48de9eff584f692694f29dc83dfcf9b222a288865af4 WHIRLPOOL 3d23df030095b4f80425700cdfa23f1b95224e4071e9760696f065fa92e931b118dea5e8a8f2add8eab47102769bf126acb9083501ff6c13376aaeef127db12b
 EBUILD netbeans-profiler-8.1.ebuild 3428 SHA256 b45d4fafad47c37be5f354fd275082ae1acdaf78f8fbda03731551bdc6ade5a2 SHA512 b241b4a8fd23c133ae247475364facc7073a4438656e780e230967d29e3d021adf95713527922066bfeb3ff59645eb974bac177f78dfcbfc39a7f461b904c0fe WHIRLPOOL 71ee6d1882fc424c4ea1adbbd414ec442c7c3cef1bf07b672fa8bea27a97f4633dd4570cafe3eb7a1697b1ba64c018195b3b703cd1cf60e22549ea5799ab1506
 EBUILD netbeans-profiler-8.2.ebuild 3147 SHA256 74556e56694578c6645cae3aa5257abe399a984e11d9982e49051731f1f1cf95 SHA512 3f4e0998aca161292f813d50e0e6420225b24e2020812011d5cb28e9465514855766bd9d4508b8739c9a38c9fb3d8cc652a69f722470bfeda968fae453183b10 WHIRLPOOL 3dc0441cb0fadae8cfc315c11826ae020d4242e0fa0901fa147a90777a9b2dc33c6081f2f251b5b2ac9f9fd32f03ad87cf999956dcdabe4fe339ee1b48976849
-MISC ChangeLog 3034 SHA256 d17b85af0d4b446dab149db1a0e9ded17ff4dc5328edcd3a5a3e4cf46416017f SHA512 af2d0efad7469cc5f432b2156d2e51a294d3c4a68179bbc19e54122712285e6c9093e15e96bd8bc9af69d03e41daa9ef5197cadb0e1f76059abf6c4d2a8a5e70 WHIRLPOOL ab8e67a50ff5eaaf6226e9274412c9c2725d42b2ed83c0dd7611cc352e7377b79dce4ed0794af581be016c2b7f157b66cbdfc624f04b38d5ae4ed769ae1637d3
+MISC ChangeLog 3174 SHA256 940db4f8a502434b715159e6edc6409d9923c5e6ce3c40048d0b736fba36e161 SHA512 23602cfd00e2769934bb11c1a2943b1f47c3fb75c768037712d55f93ffb9462a1702ad80e4a2d023dbdab804136a717ba592e46a9f0f34ff9388665e2d510ebd WHIRLPOOL ed0e315c14bf78904f0188756017782dedc2e4e04372239a1b61888e3be291d7709d6efaabd8d94b3e2d349d67eb5657b16dc5b24756991e2b1248e66f152028
 MISC ChangeLog-2015 4033 SHA256 36d6f73e2b206e41ee46282df7148ba88ea4062dbd83af2285d71d7e4425151c SHA512 aeafe55bd5c622573decad02fffed138aa81fb388e9efed063c86c71bbf75280b69b487242144585d6049be15cd346b08a8f5b955a74d8e0e26bab0d38c8add4 WHIRLPOOL 1a3ce9055fbe42173704f858b02a0be02be5d0436cfba15095aaf6f88312e95127c28eacc198c4fc5c7717e4145e22e0374966a584923f1898a14fd23d63ae15
 MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
diff --git a/dev-java/netbeans-webcommon/ChangeLog b/dev-java/netbeans-webcommon/ChangeLog
index ae10840c78c0..9395b6b5dc58 100644
--- a/dev-java/netbeans-webcommon/ChangeLog
+++ b/dev-java/netbeans-webcommon/ChangeLog
@@ -83,3 +83,9 @@
 
   Package-Manager: portage-2.3.1
 
+  06 Oct 2016; Miroslav Šulc <fordfrog@gentoo.org>
+  netbeans-webcommon-8.2.ebuild:
+  fixed eapi 6 issue
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-java/netbeans-webcommon/Manifest b/dev-java/netbeans-webcommon/Manifest
index b8012ac69328..6074f3139603 100644
--- a/dev-java/netbeans-webcommon/Manifest
+++ b/dev-java/netbeans-webcommon/Manifest
@@ -26,6 +26,6 @@ DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17f
 EBUILD netbeans-webcommon-8.0.2.ebuild 4724 SHA256 89a29fa84872ebf5f05a3c628815bf25f305e6bc21e9e677048c0a7e9153bf66 SHA512 45610a2d346a3d95712663c300f465d94014f2e7c275f03ac3ddb29d7592aef9e8d36a034dabe54fd1add44368b3db8a41f6e9c01960708b54720f1408577054 WHIRLPOOL 66ad87677a0044163e2bbb7e53c3eda75fd61feab4687a9e0edcc75bbf0c774f09d4ecb9b49e1d2378002d959c9d273ccd33149d7eb93a0e9091766d9f9f5fb0
 EBUILD netbeans-webcommon-8.1.ebuild 4947 SHA256 9cd58e5a8944803c71479d1c515ce74659a1d0c6d93e628a979c052777488517 SHA512 3c3664a9a2dc6b136868f4357e8d6830a18a214d3cef79342459ae2ff7225a18725bbab0b31ea733da110bb0a323e5f3b29bfa34a756bd1bf485f8daea857e66 WHIRLPOOL c005826e82be2d6e71b67a5f237adab0f024559e6bc01143f58cbdd8f90769f02d8ca6a54fc6a9d422011e0606f9ffda69b2e5f626a7ad245dc27e3979aac585
 EBUILD netbeans-webcommon-8.2.ebuild 5917 SHA256 c035b5efd55709fe58822548a97119768f99f33d025869d97da3d895c0e8e9a0 SHA512 5a5d6273239984590791ca40d4caaefee9f30c8ea44a4ec2d5abc07f087bcf4f4f35df444944badb7f7d80604d146f6768dcef5de911ac90b9b44891c6a02a9b WHIRLPOOL af8d1d6c692b206b90bbb81d54d839a486a9cbec1f38e6fb09b5745aef87a5c3de3961f0512f731e63abd8fc3fb54e03a70449034095173c2541ea7a12bdf389
-MISC ChangeLog 3044 SHA256 155ad723f223f930ad6d1d5f35f41be9ae4e3a7f7994c1ed5c6e7dab0f8091f9 SHA512 82201d382ee48ea789dae7fbd5238753cfdf35bd91249349f418df0ae48df53d885a09679f1b30f1d0bfe587f31039d03c700e5004c2c05042c700f20f1a898f WHIRLPOOL 4a7a3c54ffdc72beb3d5c312eb3f82cfc9e27aeb0d3c88df673f5d232056115e8f7a1a7df6077a778a77d522c8ed44726495275f33c6c275d4a38b469451e211
+MISC ChangeLog 3185 SHA256 ba1a056fd2e1800502a77e44ea4890d17e43d1b8b96adb99518d7d56a7d7844a SHA512 b5347fe41d993b9a2f824b9fda0dd8ee83abdc6fbd876518edc3549b8088cdd1b32109bd2b5b4565199194e7ecd224eda238aeaf144e5ee09201d42adc9ec705 WHIRLPOOL 4e73edeb38bae7234857141ae9b45f80e94c36026ed0cec8ebe7f187225cdd7f75fbadf0e034b9067be23fdb5cf7c6cb077abdc7709de49a592de2e0ae71d4b0
 MISC ChangeLog-2015 1826 SHA256 45cc333a921604e8a0cb7701f30593ccb8ad7ff91b2429bfed519c4ae2ea1a0e SHA512 ca024b1dd8eb36e4397088c2cfef8c4479e1d72d015edea256b1472169b585552914e14bf02c0f1bd473689fe5965e1e0f2c2af5dd11e8b52412848e44ae1288 WHIRLPOOL 81ceb1fa62ff6f6878e3d90a031c3a86b3f4197462b3acad63df96ffddd0d28af623996c2bd6af30330309eae297a4c3ed3013ea6af8503dd4bf57025ed18b4f
 MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
diff --git a/dev-java/netbeans-websvccommon/ChangeLog b/dev-java/netbeans-websvccommon/ChangeLog
index 4f4e28183149..9d4990321f1d 100644
--- a/dev-java/netbeans-websvccommon/ChangeLog
+++ b/dev-java/netbeans-websvccommon/ChangeLog
@@ -83,3 +83,9 @@
 
   Package-Manager: portage-2.3.1
 
+  06 Oct 2016; Miroslav Šulc <fordfrog@gentoo.org>
+  netbeans-websvccommon-8.2.ebuild:
+  fixed eapi 6 issue
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-java/netbeans-websvccommon/Manifest b/dev-java/netbeans-websvccommon/Manifest
index 90fb1171d5ed..3655ac8ea913 100644
--- a/dev-java/netbeans-websvccommon/Manifest
+++ b/dev-java/netbeans-websvccommon/Manifest
@@ -7,6 +7,6 @@ DIST netbeans-8.2-build.xml.patch.bz2 2678 SHA256 d0b395111c04e82aeae2bf99eea17f
 EBUILD netbeans-websvccommon-8.0.2.ebuild 2652 SHA256 020413245f340f2390ed9a3afaff58c1457009a6eca26651de60650f6c98b0bd SHA512 8a9111183a7ad4df4f2511f44908103d62264924497c49e7330203c36c2fb660b3fa01f176a9cc511817c2a0c8e465b4eb2122194374e30d3327a28c5c8dc4c4 WHIRLPOOL febd4c8890deaa17a052a5a1d948229dcf8d82236b9a746477cf705c8db45f4f5b8f3022cde9bc2686b27d67fa1f3e8584f3285593beb3049e2d48e507d831b9
 EBUILD netbeans-websvccommon-8.1.ebuild 2677 SHA256 ec86c921a790926dcd0e3a417f137ecfa3a42783802a05cbdc0c80021f46b586 SHA512 f11d2c7feb1ba7b8ca7274e75174c47966d0fc315999dc3ba0fded902d9683e5dcff5fbaf3f5de7c40daa968d120a31c62910050eb514152f5025d7600acd4dc WHIRLPOOL 3b4059effbbf24afbeea94875cdc3779766225accf3768dd5751b62e64e9ba8e548ef0f5a6da9cc139e57475e6dd96741cc2c0482506ed6f690b80f22189e085
 EBUILD netbeans-websvccommon-8.2.ebuild 2396 SHA256 a015f50a9fcebf084d42a550d5a654e80129a5d92d2bec7cfd543d065a4c32e2 SHA512 cf4fd6fcb2ea088be645a79009205a84588c9c7f1b7e5ceeb9c95552ffba860d211e3d6b4fe95196e652f5c3c5665638ee95f1ca8f2f5b938d2b09100dc186aa WHIRLPOOL aa37154ee5fdb6ff7892e3bc1218c37b45fcbfc7a4da81c8cada6d9b50a1bbbc51c685b00389d1114f3d0ae84d5a06d9e10ba0e9101f385e6cb59358eef3e59c
-MISC ChangeLog 3074 SHA256 f64dcb46853889b85d80bf27f78eca9fc368217feff3cca726f60b85c2e83ffe SHA512 f923c86af12c3672488c69be5ed06b4859593f5b5a5ee60a7fdad35777364428a16711c4994fff6a4e2cbaf2dd2f88525c9ff5bd1444f49b681839fbc66250a3 WHIRLPOOL 4c5fc1b21a7881cefa12739f6dec73d90493b20ef23484b8b359efa968442e23e106e47671180b3a75fef26393e92aa56584bad0f49f9910d0e4db2347562f29
+MISC ChangeLog 3218 SHA256 ab275d6b05432277ab168bef0435c16d13407a73a1f45f69bf094bc874c377f9 SHA512 84792730b7ff171dd2cb48d56b96f2707e0889b46671a6d14fb2a062ca5832372e3e6fb3d23dc31738c87ee3dbd17b94322ebf1616697222dce4e70bf387d0b5 WHIRLPOOL df2d4a1ee2556a5aa84b93bc2e63134e581f39f37cbdd855d179647ce96cf3a819e5babb22e0318ba12176487e70097c076619147fecbd7c3ff600f8dd2bbc0c
 MISC ChangeLog-2015 4436 SHA256 5f8676927c84199a40c7cb15e9c5861d5af1d110dac2f7209c34f2e4723b6cb4 SHA512 67c2b38cdcae119032415aabf1b62dde133a818707f7614b1424bb3f51dbd20ed90ea369ffd625c0696ccd4265e4f23a4fe2eb840949440584e52a2bcc8e267e WHIRLPOOL 08f609265b59bd5caca5d6e61e2ca77072642fafebb38a4ae6fb9303142fc2b257a7d950041eb4de8c95a1e465b984ce3fde91583b2b574d9d1f77249d6a3e6a
 MISC metadata.xml 342 SHA256 d73bf5e0c12eca1d883dda7c037ccb446d7e565175670ab04916763366b8ba07 SHA512 6bac4f54bded8acf009eadd47ecc2dbd4fa644fa5d590da30e442489313735dfd8a3f96d1621aea82e2bb820d1c0bf14bd7b276542f767cc321aaed20f4e57e3 WHIRLPOOL e6001c31ba2e7edad63d08ec6854b13fe9dcb73a2fde7715f13fc83a4eba943444ef0343c632facb9a0e4d5d74f05371e08c8b32f5893171fa85dc95b6bc36e6
diff --git a/dev-java/tomcat-native/ChangeLog b/dev-java/tomcat-native/ChangeLog
index 6e6075d3f930..e4c69754e4fb 100644
--- a/dev-java/tomcat-native/ChangeLog
+++ b/dev-java/tomcat-native/ChangeLog
@@ -220,3 +220,11 @@
 
   Package-Manager: portage-2.2.28
 
+*tomcat-native-1.2.10 (06 Oct 2016)
+
+  06 Oct 2016; Miroslav Šulc <fordfrog@gentoo.org>
+  +tomcat-native-1.2.10.ebuild:
+  version bump
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 61db1002de82..78dabdeac414 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -6,6 +6,6 @@ EBUILD tomcat-native-1.2.10.ebuild 1179 SHA256 bb981a74a6b93a7546ead7bffe25b9893
 EBUILD tomcat-native-1.2.4.ebuild 1177 SHA256 3df444f661551ea6fbf43288e3e67570b3866dd82911b41d20ef309c0fa3e155 SHA512 0c961b109407bcda791cbcb5b33090388610cda6ccccd2756ee5d99b9d451ca03b75076137118327efa73135abc0a1fab6ca67a73574252eb564c7d8e661c581 WHIRLPOOL 63dd9a3aa5ef613ec965f05467576ea0c6e633b994074a89b7c89887662f2c03abaa8327b4204ca92c3d51472fcc996791696921f18c9bc22fb84cfc1f72dec2
 EBUILD tomcat-native-1.2.7.ebuild 1179 SHA256 bb981a74a6b93a7546ead7bffe25b98930dd66d3686e5b6d54b74fbefd312d4d SHA512 a2293093dd193336e4f884c9dc49d9e3b26d0efff91d309862e360425ea5492ebbeae2aaa7f87402632c4f755a782c48456bfb3c82213181e90f6e374e60e55e WHIRLPOOL 453d639fabaf1062aeee9aee0d9b97c71876fccf9d85046d0b10e1419e423e5c5121c8c45d052dbf386cbb134f5100a673f50e33d2004e7e96c6a98a5017bdde
 EBUILD tomcat-native-1.2.8.ebuild 1178 SHA256 833ff6f35a70dc88422e1e15e0a318bab4ba61895dca350c5ac4b6c1e45425ca SHA512 d8cb8217e53d80d1f96772353d17d1eb35081c46f951f12209dc7f7d520c0690231afe457c6340569bb97fd21ae469cf7e34ea0994d6003dbf7d4ed3d93cf44e WHIRLPOOL f5b1493ed285bde507813923411bf824af0534917fb2f4fa34dd0f2d069397523a0e42e7bc1a209086617df4de4690f6d0a59f66bde22a09d5d739255cb8cdbc
-MISC ChangeLog 6758 SHA256 5d57576e2886c279120abae82352c8b9803d7964db7dd86440223c8a0f3419d7 SHA512 fe346a40429ddf8876e7dba76cab29e608190beb0c58e5dcbd79b89f414c22f17cfa984cd728d5c73509d52561a30f1a8ffc6c43a7b11ec5c739ef0d86abb607 WHIRLPOOL 583d238c477904aa33c9ca3477d102a62a272efc3e7c6ffe55321168770012afa9028e81b29cf1eecd6aeea374d35728883bce986c5a22b8cdf4ae02361c332c
+MISC ChangeLog 6929 SHA256 95d86d981106c6606ecabd70f5f082306de41978263349f2a0e2b700af26cdf4 SHA512 99a2581d6eabaf7b5996770063302b440f83fb4590c824a9575e62687ca6a4a0ad14423674454be707148b0b369e709a390ef6371ebd0aacb591ab4199163e71 WHIRLPOOL 5b053e0d807720f120647fa0ffa7c430ec7dde1ff8d93bafdd6b22fe2f503885d8a385da66a1650ac7f4ff7ffb49e2ccf52df0e33a0b7691676e7f0eb409ddf6
 MISC ChangeLog-2015 7720 SHA256 cf13dc8c45663bcc5a1946327d80c199e37b986ac9443f176ebd11efe02e75ae SHA512 3803e85c890bf9ad5b33b4fa4e5bfae54a215d685731ab76cddcf29802b44f830b37841f5289d3102cb9dfdc75335b2eea0c8ec64e955b9aff16706e8ced4d14 WHIRLPOOL 3511836113cb4912defd1ff0df1ffe1452596973732a2269b1ff920fdc82f08055bef0d65c1432a657dc653c494a0158bcb6fa42f2712663a15d62da6a84f26a
 MISC metadata.xml 798 SHA256 c361944adf7216c36e444513a1c164d891a7617817deea94b578a672f5903259 SHA512 4074e9797b397fe24ee0ad0c56e7ba3504212a008a2d595a96cf4495dbaec38ebbb9ac4d48a55bbcf7b28d97951dde2a2ee2eeb135419114096aa4892ccb2269 WHIRLPOOL 449b363947655c6dba2b09bd189df9df87d7c70ada5d304a84c29815740d5328e83b01b15508bec78715347a0ce8c8f7002ca5f2e907bb10102232cb8a82a2b1
diff --git a/dev-lang/nim/ChangeLog b/dev-lang/nim/ChangeLog
index 59dbc1138c63..114b5fb78768 100644
--- a/dev-lang/nim/ChangeLog
+++ b/dev-lang/nim/ChangeLog
@@ -29,3 +29,17 @@
 
   Package-Manager: portage-2.3.1
 
+*nim-0.15.0-r1 (06 Oct 2016)
+
+  06 Oct 2016; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/nim-0.15.0-fix-mips-build.patch, -nim-0.15.0.ebuild,
+  +nim-0.15.0-r1.ebuild:
+  drop MAP_ANONYMOUS constant
+
+  Fixes build failure on mipsel
+
+  Bug: https://github.com/nim-lang/Nim/pull/4853
+  Reported-by: der@2-47.ru
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest
index e3940a7fd4a6..048dd37c4a4d 100644
--- a/dev-lang/nim/Manifest
+++ b/dev-lang/nim/Manifest
@@ -1,6 +1,7 @@
+AUX nim-0.15.0-fix-mips-build.patch 808 SHA256 537521a85ea520e9f75f7d174fc3ebe95d1fc75bc71c8d581d56e3a6178d932c SHA512 618f552da1fc9578047a91651cf6352aea893cfd711cfab5792c7ed18d579323d4dd5ddb08aaaba7150ded0bcaf25a1c43f9392db297b19443d2f06f0ad71474 WHIRLPOOL 849e57ef27729755a1056c75bcb771172b4969c79cab3f7ec754837f1d4e6834247337f0ad711cb0d3029392267adcb616c2814fb12ce8e6c91f4f9006ddf951
 DIST nim-0.14.2.tar.xz 4778444 SHA256 8f8d38d70ed57164795fc55e19de4c11488fcd31dbe42094e44a92a23e3f5e92 SHA512 34afd07fafd066f6b4acc423c21e1cc275dce00f575d01f0d1edc147946930cf13c772abe0c4a081e2e0091ad41f6ae5cead20cc4d9a7cb3bc628ad7469f6459 WHIRLPOOL 7109f28fd8e0e83a386e9a26b46a3fbb2ad9cc0c8736107fe7eb573c301768d0c3d149407657478431f8107a539cb18bb6db5ce0e0de6e96e25769dfec43a2df
 DIST nim-0.15.0.tar.xz 3786260 SHA256 c514535050b2b2156147bbe6e23aafe07cd996b2afa2c81fa9a09e1cd8c669fb SHA512 b115ed08e888a1a92fca601ca5580815ed7c1e8baf158a4bc6d351933f99a06fb4725983feae2fded50ce46c46c5b3ca6485671e66eb71962dc2a2956bc83fd8 WHIRLPOOL 15312851dbeda771dfa6f9a061d6a8358e847668efba2a31f8506c4b9398bd96d02d587c55bab0955714d6894877c3cbf7be9625e4802ca17a150c678b5b245a
 EBUILD nim-0.14.2.ebuild 1149 SHA256 77df39cf9cc9d265a1790fa49d7544915c893df945d69684d3a718f916fe5f8f SHA512 6a9b07e7378720585ee57aff9b17e7e170d204e0bc15487a3d0ec20189969f951c7d7f97336cf5565079f40f88066789923300ce422f727c29976bc5e7266418 WHIRLPOOL ecbe307f51f76d7392b9ae5a35c3405fd229a17994519bb7cd958ef31a7ea04549ae42821b44faf034bc3a567840ae96a3ac5b257a9603421a14a96d16adb3c4
-EBUILD nim-0.15.0.ebuild 1149 SHA256 77df39cf9cc9d265a1790fa49d7544915c893df945d69684d3a718f916fe5f8f SHA512 6a9b07e7378720585ee57aff9b17e7e170d204e0bc15487a3d0ec20189969f951c7d7f97336cf5565079f40f88066789923300ce422f727c29976bc5e7266418 WHIRLPOOL ecbe307f51f76d7392b9ae5a35c3405fd229a17994519bb7cd958ef31a7ea04549ae42821b44faf034bc3a567840ae96a3ac5b257a9603421a14a96d16adb3c4
-MISC ChangeLog 799 SHA256 c3ec8fe8522efd2d4b91f45530f907b5b61b1f63cb61d89e252f2a8b629a8c57 SHA512 7b794a248eec477aaac079c10e76effa3c26a866d246dbfab7cede221b1d76d219fa47cf25883eb222123d326eee58277bf240a5b809edfd3eb48b4af9eb222a WHIRLPOOL c36a2365e7fda233727ffd87dec270c130dbadaad0c141db82ab78dac0abb646fc6dcda9a69fce54154df9ed653b91e90b9a501f93dae1363e824895ca7ba723
+EBUILD nim-0.15.0-r1.ebuild 1200 SHA256 a2a478fe9bb897d23ab758438ae953b3ea9da912c929d8fa614c28ccbad329b6 SHA512 bb50a679ff3428638565bbf39d13b1757e05d5b3d61d51b5e11a9ba594df3cc629af098f2611136d607dca8c1dd54be29af2a82ce2e48338d682b7ede6358730 WHIRLPOOL 31ae9cecefa5dbabcb9814bd90b047206ff4c3bfcc42b6509816ae8843dd49363c6e54fab5a0b386cbf903af8c63d394710c5dfc9643e51e0478fc17542051bf
+MISC ChangeLog 1145 SHA256 68bcb8e1181eab67378f8a70534b88e76b873b73091c3e5c058b2474e4a67ded SHA512 8d9ccac7134a4f8f871b4d044a6269ee8ad7d39a92783a06e5b9edcbc6a784f99481a4a9d725daf835a775449397ddbafde5e84ac13f8c102536fa4cb93d3df6 WHIRLPOOL 9975716c1e8bb5ac502622badd685e893a76e2e9b272d54e70fbf7e48f893218966b0be340b1c96ca95ed5b7cafa423f1eaae7209f720caf15ffbd0e84cbd36a
 MISC metadata.xml 328 SHA256 110942af57f721784c3129b5e046355911d5719317c9cd116fa50c946b49b5f5 SHA512 bf02bc0a8c25d6e157b7ab1ef87c2eac3241d42bc4cf0632a159dcb5d429051018848be81d0cbce228124660ced8694f5de48d64fe10bc7ff5b536b7e7579e49 WHIRLPOOL af5d8781cd4df0734cfa581467f61f4b6c28eb21fde84e54744220ea9a0cc5b9930689b007b57a0cb2bfa9b37fd647fd20b358d5e21416ee49ff61dda79023b0
diff --git a/dev-lang/nim/files/nim-0.15.0-fix-mips-build.patch b/dev-lang/nim/files/nim-0.15.0-fix-mips-build.patch
new file mode 100644
index 000000000000..467b55ecdfd4
--- /dev/null
+++ b/dev-lang/nim/files/nim-0.15.0-fix-mips-build.patch
@@ -0,0 +1,26 @@
+From fe362543de00806a3d69ddd0de33caf0cae2e57e Mon Sep 17 00:00:00 2001
+From: GaveUp <gaveup@gaveup.net>
+Date: Tue, 4 Oct 2016 10:56:07 -0500
+Subject: [PATCH] Revert change to osalloc.nim from commit 8d7a45f.
+
+Change caused MAP_ANONYMOUS to have an incorrect value when compiling
+for mipsel.
+
+Fixes #4852.
+---
+ lib/system/osalloc.nim | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/lib/system/osalloc.nim b/lib/system/osalloc.nim
+index b07a362..316dd74 100644
+--- a/lib/system/osalloc.nim
++++ b/lib/system/osalloc.nim
+@@ -87,8 +87,6 @@ elif defined(posix):
+     const MAP_ANONYMOUS = 0x1000
+   elif defined(solaris):
+     const MAP_ANONYMOUS = 0x100
+-  elif defined(linux):
+-    const MAP_ANONYMOUS = 0x20
+   else:
+     var
+       MAP_ANONYMOUS {.importc: "MAP_ANONYMOUS", header: "<sys/mman.h>".}: cint
diff --git a/dev-lang/nim/nim-0.15.0.ebuild b/dev-lang/nim/nim-0.15.0-r1.ebuild
similarity index 95%
rename from dev-lang/nim/nim-0.15.0.ebuild
rename to dev-lang/nim/nim-0.15.0-r1.ebuild
index 1e4b18501e42..092c19f84466 100644
--- a/dev-lang/nim/nim-0.15.0.ebuild
+++ b/dev-lang/nim/nim-0.15.0-r1.ebuild
@@ -21,6 +21,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=("${FILESDIR}"/${P}-fix-mips-build.patch)
+
 nim_use_enable() {
 	[[ -z $2 ]] && die "usage: nim_use_enable <USE flag> <compiler flag>"
 	use $1 && echo "-d:$2"
diff --git a/dev-lang/yap/ChangeLog b/dev-lang/yap/ChangeLog
index f6ab9aeb0eec..1bbf9f3d1e9b 100644
--- a/dev-lang/yap/ChangeLog
+++ b/dev-lang/yap/ChangeLog
@@ -124,3 +124,8 @@
 
   Package-Manager: portage-2.2.26
 
+  06 Oct 2016; Keri Harris <keri@gentoo.org> yap-6.3.3.ebuild:
+  disable outdated gecode bindings. Closes #590960
+
+  Package-Manager: portage-2.3.0
+
diff --git a/dev-lang/yap/Manifest b/dev-lang/yap/Manifest
index 90ec1c31c079..9f6e4d980b01 100644
--- a/dev-lang/yap/Manifest
+++ b/dev-lang/yap/Manifest
@@ -6,7 +6,7 @@ DIST yap-6.3.3-gentoo-patchset-9.tar.gz 5430 SHA256 0ca819cc5df0b0d3f5c7aa390359
 DIST yap-6.3.3.tar.gz 7879301 SHA256 aee3b449b1669af07a8291ce6e7fb0a9b35e1343e2ab96fadb1a37552397fa78 SHA512 4ef45277ec84b6e072fa54afc7d6c18f11c3a0cdf477e35e35a0ce2181c9ff2e693f8735f63a1899373f6baf79ce0a972b37e1ae6ed8271bec60663f477bbe80 WHIRLPOOL 3b4095ff9ecbd532d2211e9158f6bd400248b43386027894c08754aadc14712a60325aeb950b361f14b2bc105053ff8a70b025e305fb79003a68f4226a39b724
 EBUILD yap-6.2.2.ebuild 2565 SHA256 a2e3ae185b3864e6e9e9a3f60f5c071b4f7abd14e7e84eceea54a11f0b7004e8 SHA512 56c7d657a73c6150e9032a31d48fc2e2d58fb416b994c5f6a1f47e542563ebfd9d2682108da45a4d3189811c150047508d84c1ecbdafcd262bfb714c47a2f42e WHIRLPOOL a79c848bb3dc98c1cfde1a2f697511b30d4d6805ea8416e98a40e4e6888fe227fc62d6513b28c3a58b411b15ad502ebeef14b281fe04a8524069b6b6c442a79e
 EBUILD yap-6.3.2.ebuild 2691 SHA256 326c368a6b6e7a02865599dd7ae5c325c82491202543a5e3cb7869836fd53dea SHA512 a6b8073240ffc1a5c21d521683d37d52d08d75e19e7e5884b8cc7a01406f4ee25e0a6964d20e7b9b79ed50788e8bba5b8949cfb380e8025f0dbe74acf3ee55b0 WHIRLPOOL 891e9f146f1fbc7351ab1c580d32f5eb686b759cdd1a44eb099e519ebb0d2c10d2043aa4a8cc7dcea3c43974a523c7a5c835120304f7b425497246eff952ddb9
-EBUILD yap-6.3.3.ebuild 2860 SHA256 163b5e369113a8a9f29c6e7bfd51cf5d3d6ee1abe3b3bfd53eea92623b06a304 SHA512 516d2fc3808b938a5cfbaa8a4b07fa5a0b171749498aea5c2f24c236345ac755577c3c1d7de87cbdd6d11c1973cc57899e674191b40121f1fae32b7ad6e51721 WHIRLPOOL 487c58f6ff0169574f97e7c6281986afcc327a4eea58d6e15eb0713205bed4a40a1fa40c5b6c52170f6efa0791b9632d2a41d18c5f6da278410e34cf299b3029
-MISC ChangeLog 4458 SHA256 27d55072b264fa8431ffef6618af31687259cc691ffd9ef92d10806c6f1ac2bd SHA512 4ae383458c739db809acb77bf95e772c3a7ce437884d19b0ccdcc28bbc3c8118658f03fa8d2ab0266724c1d5bc40f3ceae1174ff9205db68f59ef131217f2094 WHIRLPOOL 9799ba5ac94997d97fab9d96193f29419ce970a24b6e8dbbbf637d866dd7213c0aeb601add82fd7e7785d9b98a0ec258ea65a1bf646599153753404395e812c6
+EBUILD yap-6.3.3.ebuild 2881 SHA256 a2b21820890144730d5861636011a29727198189aaf8f900d0a445c6be99dbf4 SHA512 af436d7fa9cd5f51de49a2762c7044ec6cd90d4b03554e5483659a82c6ffcd76644fbccd69a01d1edf91452a7a0916c2959456aa6b752f157fd93f1068463479 WHIRLPOOL 5fd48d2e20cba92ed25752cbeae0c50bd9753bd9bf76fe1757974452294f5066865b44d2766d52c96ba6c55714f9481eee0f6a0e9614f1f798018cea0565ce19
+MISC ChangeLog 4607 SHA256 28a232f2e102437fb36c0914fff8229f46708cdb4191e3d071e76bda7b6433e8 SHA512 0a4f7f0a296b5bf5400ca1e5757b8d23fa892b716479e7a989a2c7511fd28f0da25ca66fbae4d1c62ce3a315ba09e588595aec0b1333d7ceae6844d41dac6976 WHIRLPOOL 3da8e578d8e1d4852c2034c51915b21a27f49f9bd82d65fcdb31d9502633a5fac61df2096ee75004415c1ecab166eebf77d994568aec1d4e61bcea6413d5d496
 MISC ChangeLog-2015 14586 SHA256 3d183f058c32da3eaeff2f477e99fde50a075cb4899672e01b32df532b86d437 SHA512 aac0aacfe3daa1d40d1e1276f798cf17433123a2e10981879e5fbeac618af80d95d50fb56839b497844f0a30574d9cd4b31bd476630c11c1daeae3e5a013ccd9 WHIRLPOOL 78a9d8caa9943bd821747a297551068e8e65f9ccfa6121db65e6d10c90ae87204f0197fc868bbd1e5291adc6de28c1c7bcecf04b995f0ecae457ebe4a05fafcf
 MISC metadata.xml 314 SHA256 44d6bdd0313b208fb098303a77c67d1a7e256c8b4b1c4c5ab52d763e321c7ab4 SHA512 c5bd279aec3b80e6c08dfaa85cf091cbfcbf9380f1e5a8a0fcd6f27297368b92906340ae9dfd5176f37d36e4fb61ca772448c0248121d8e302c181bf670e57bc WHIRLPOOL 86738261d862a8b38930083a104ddd65f58669e4a8c869f2598db6cf7bcf16d108e8288ea3ee649ce5ddb7818880c4bb10019fd684a2132cae9fcf94c77a253d
diff --git a/dev-lang/yap/yap-6.3.3.ebuild b/dev-lang/yap/yap-6.3.3.ebuild
index bb5284cbd6db..9d4061e2d3cd 100644
--- a/dev-lang/yap/yap-6.3.3.ebuild
+++ b/dev-lang/yap/yap-6.3.3.ebuild
@@ -57,6 +57,7 @@ src_configure() {
 	econf \
 		--libdir=/usr/$(get_libdir) \
 		--disable-prism \
+		--disable-gecode \
 		$(use_enable !static dynamic-loading) \
 		$(use_enable threads) \
 		$(use_enable threads pthread-locking) \
diff --git a/dev-libs/boost/ChangeLog b/dev-libs/boost/ChangeLog
index 480aa761577b..d8cec1ecefd0 100644
--- a/dev-libs/boost/ChangeLog
+++ b/dev-libs/boost/ChangeLog
@@ -285,3 +285,10 @@
   +boost-1.62.0-r1.ebuild:
   Use correct upstream distfile, #596220
 
+  06 Oct 2016; David Seifert <soap@gentoo.org> boost-1.62.0-r1.ebuild:
+  Correct find command to delete non-empty dirs, #2
+
+  Gentoo-bug: 596216
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-libs/boost/Manifest b/dev-libs/boost/Manifest
index 50aac67a3e0e..a5b0b6e92f89 100644
--- a/dev-libs/boost/Manifest
+++ b/dev-libs/boost/Manifest
@@ -27,7 +27,7 @@ EBUILD boost-1.59.0.ebuild 12183 SHA256 5733c158846be244d80af273f8a5bdb576c830e9
 EBUILD boost-1.60.0.ebuild 12298 SHA256 73ecb047f2802e991e6ca36a9a456db9baa1656a9898fdd68a1391c654e3468e SHA512 570d964f77e9818942efcec22e8e84878ed8aff08ca8b78421edd5e158ba26d881302b3b2cb2a9279f5809b8d293ba8a9ef1f90acee0983d8b5277d316e8c32e WHIRLPOOL 3cddc2cbe3961588aee549caf5a11a851add12120d0e279dc95cc9c5a71db5f1f5b25107948f330d6d10a790e108ffa2711042477c1ce1808732d9dd63ac4931
 EBUILD boost-1.61.0-r1.ebuild 12128 SHA256 e0fc39fe8f0aa26cdf70d47973b7b13f66ad6efa9662365d6a03ad215fc4a9e1 SHA512 a8fb9fe748e304ddb3b32a6f0ea0b953aa7d9a6dcf3857ffa4c5b1e073a450fb84648f92e6279dc79d8cba7ad83d4ea589afd48de873bca1aa81e5c8cdea72d3 WHIRLPOOL 994f8dac6e4d118ceb3822db36fdb7d337f703df6ab0f8a57bc224bf7b8b450c827c2a7f5c2ae75824b1e8dab13a2278588b59ad39aeeb4afda811865c97b79c
 EBUILD boost-1.61.0.ebuild 12251 SHA256 90c54156f2b7408246c566e75694acc6ca772760466cd3fabba574b21fa1ae24 SHA512 8a94a476986be0e4964cf917e9fe611fa202cc0c2f119bf5db00ba0f404afdfe17d1bf106b01bd56da791f6191785eb276c773eba0be8450f05d5da8a7975aa4 WHIRLPOOL 9172da01ad7d6545a1204ba84e23c658360691bd19f8a391bc39d1cd85f6c9a05d471f1c188f890d27767b1b235dfd49467a5d56f0064cd9109f731a204a565c
-EBUILD boost-1.62.0-r1.ebuild 12374 SHA256 78b569a17ebb331707fd15ea1f1d8b219d781cf95fb60f094513615a909e8e80 SHA512 e2adab37d9db9ca482842185833284b202911c39893af0229c8f04588bfb83d2dbd5956c94099939957219b46adef7baa8359147b7054c7f94abca077fcde822 WHIRLPOOL eb91260345adb8dfd63202ec6abe9169313d01d675456db6c5ae8347086bc0770c86fc2e9898d72845d9e2fc3ef1dcc3c2ea9d77ae839d99bcb33c367e1d130f
-MISC ChangeLog 9639 SHA256 77cdb7e54df98251134261d6a0f78cadb384ab03105e4a319662f28df52bbeb6 SHA512 819012c85eab766c95dac207851987fca6b5ea48cef42914c74c1d640e8021c47cee36eea292f5f8b4ff7d8d633e8aa6c4aecd81691608490231593ec475a38a WHIRLPOOL 1b56bd3daf0e990637c7f24b299f106b05d6cfc9d66321ee4849623798e122e66679e480466dec257abe5d4443a19c57e77e7b69ce43322d57b08bb3a17170a3
+EBUILD boost-1.62.0-r1.ebuild 12510 SHA256 244a486fe2ea972509a2d54fbd6d2cae1717602e152e9595bbdc6024192a6a1e SHA512 2a85c75024422877461fad49c503a73b289de95ed267827eff66d5eec576ad93b40375e5044d7e8fef12f39b3f3c5a9832771e9133377dbb767b90495b5af8fa WHIRLPOOL 292c411e2d6d44f293389560857296be4b4876021e54708727121da709ed0b108a853d7253d2e2bdb40a082cedda628314a4e8e459a835867b508bcb0a4654ec
+MISC ChangeLog 9819 SHA256 863193175949916846506468355f48cf5a040a5a014bd2a84893f541fb480177 SHA512 f737d5adc134abfa2a2e881d646d17fdbaf82d338a2b17c7335d94d9406e3908dbc39cc1fd93855f6a4b5ddd5381db6a4ef8e066b759d8111db2a6ed61b31217 WHIRLPOOL 7ab51482d36bee0913fd6ef498b30a14409c4217c9759d542bd9e8265008e955e8a41fd2dbe10e4ffbe0697dabb85ac2000a64f4a3facb46767fa59c86152587
 MISC ChangeLog-2015 60992 SHA256 f3b1d8b8c4ad6bd080f9b3d18ccb1cc360d47864f4afc95992e171d475d682a1 SHA512 6f29b95e625e1a8a8a7ea2578f07b543329e007443f3b4926e07c913ab21336e1b1332084b090354dcd9899b6f0aa9012b92e0cb5e0457733da4a47da86a818f WHIRLPOOL e11113ea0a8eda558457c7018283f274d10df473c116da67126640d56b49107e05326e0a8a3ef4f9043a22e2fc91f151c1cbed71bfe41cac52f5467e12a7e1d8
 MISC metadata.xml 1654 SHA256 aec7f8916bd76fc5c14a23487e21c9e091a5999ce137c9e054a9db4bbfd06d19 SHA512 13f013eeea54d202881c252764d52dc65e74b585e1aed15f79042f3efcfda7f00c0e6f9047cefbb5ef789aa936e7c231201caf0757ddfedb9f5ba060d810973a WHIRLPOOL 6b765cbe8bce0b84e5a8cfb36d840667cdfe9143da6ccc4d0fc3d250f98a4f3024e7e92549c806b53c02d0937d9378a0d0b35503fedaede1b861eb4edb872ba9
diff --git a/dev-libs/boost/boost-1.62.0-r1.ebuild b/dev-libs/boost/boost-1.62.0-r1.ebuild
index 03a15bcb42c5..690b792cdf31 100644
--- a/dev-libs/boost/boost-1.62.0-r1.ebuild
+++ b/dev-libs/boost/boost-1.62.0-r1.ebuild
@@ -107,12 +107,12 @@ __EOF__
 
 pkg_setup() {
 	# Bail out on unsupported build configuration, bug #456792
-	if [[ -f "${EROOT}etc/site-config.jam" ]]; then
-		grep -q gentoorelease "${EROOT}etc/site-config.jam" && grep -q gentoodebug "${EROOT}etc/site-config.jam" ||
+	if [[ -f "${EROOT%/}/etc/site-config.jam" ]]; then
+		grep -q gentoorelease "${EROOT%/}/etc/site-config.jam" && grep -q gentoodebug "${EROOT%/}/etc/site-config.jam" ||
 		(
-			eerror "You are using custom ${EROOT}etc/site-config.jam without defined gentoorelease/gentoodebug targets."
+			eerror "You are using custom ${EROOT%/}/etc/site-config.jam without defined gentoorelease/gentoodebug targets."
 			eerror "Boost can not be built in such configuration."
-			eerror "Please, either remove this file or add targets from ${EROOT}usr/share/boost-build/site-config.jam to it."
+			eerror "Please, either remove this file or add targets from ${EROOT%/}/usr/share/boost-build/site-config.jam to it."
 			die
 		)
 	fi
@@ -139,7 +139,7 @@ ejam() {
 
 src_configure() {
 	# Workaround for too many parallel processes requested, bug #506064
-	[ "$(makeopts_jobs)" -gt 64 ] && MAKEOPTS="${MAKEOPTS} -j64"
+	[[ "$(makeopts_jobs)" -gt 64 ]] && MAKEOPTS="${MAKEOPTS} -j64"
 
 	OPTIONS=(
 		$(usex debug gentoodebug gentoorelease)
@@ -294,9 +294,11 @@ multilib_src_install_all() {
 	fi
 
 	if use doc; then
-		find libs/*/* -depth \( -iname 'test' -o -iname 'src' \) -delete || die
-		find doc -depth \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -delete || die
-		find tools -depth \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -delete || die
+		# find extraneous files that shouldn't be installed
+		# as part of the documentation and remove them.
+		find libs/*/* \( -iname 'test' -o -iname 'src' \) -exec rm -rf '{}' + || die
+		find doc \( -name 'Jamfile.v2' -o -name 'build' -o -name '*.manifest' \) -exec rm -rf '{}' + || die
+		find tools \( -name 'Jamfile.v2' -o -name 'src' -o -name '*.cpp' -o -name '*.hpp' \) -exec rm -rf '{}' + || die
 
 		docinto html
 		dodoc *.{htm,html,png,css}
diff --git a/dev-python/dill/ChangeLog b/dev-python/dill/ChangeLog
index 1b283c893268..607739b87e90 100644
--- a/dev-python/dill/ChangeLog
+++ b/dev-python/dill/ChangeLog
@@ -11,3 +11,10 @@
 
   Package-Manager: portage-2.2.28
 
+  06 Oct 2016; Patrice Clement <monsieurp@gentoo.org> dill-0.2.5.ebuild:
+  keyword for ppc.
+
+  Gentoo-Bug: https://bugs.gentoo.org/594020
+
+  Package-Manager: portage-2.3.0
+
diff --git a/dev-python/dill/Manifest b/dev-python/dill/Manifest
index d63b78b26160..f8ccb3229570 100644
--- a/dev-python/dill/Manifest
+++ b/dev-python/dill/Manifest
@@ -1,6 +1,6 @@
 AUX dill-0.2.5-avoid-installation-binaries.patch 784 SHA256 94a022411360c089d0a6fe1bc7fc8b9680a8428399f6cedef3e1cd206dda490b SHA512 cb944c7e4699a99a5040140f2dd1cf6bbe3148b0fe098c536200cddd4ed835545c7e8328072a188fc9a5d70b9b4f5d3a138108f934734ee9c8021b3e95126cc4 WHIRLPOOL c1065f9fb6393268eabf7c1c31ede92c7037c916a58213c39fbc2bdc4e8cc963b66c7c2cc874bef92c903c61a74215af46f5f9f483abb46452801b9f09f3cc1d
 AUX dill-0.2.5-remove-install_requires.patch 906 SHA256 5e87b1f2e89303e346e67c9489e5f1efbf8b80462391ca3878ea8269cbaa14ac SHA512 f984248a8280a1cf97bca6a8ad90f8d648da106a74c67dfe29f62e5d8591d7cfcb608bf827729430f0463f6ad0846dba094a030b5c2c3e3f8f387f39803f737e WHIRLPOOL 706b9669111e6d97051308f34cfaf91c1f877f1aad19836cce20e688fde030e24808af8ee7d2b763432817f4c1b49e2d6b36c8bea8b13b08917ab98877a15f7c
 DIST dill-0.2.5.tgz 60572 SHA256 431c9d46e190dcdf1397234cf659d66e2e22e33b0474ed6ee2d0b16c9c0ea319 SHA512 94942a736b4c2e1558eb9475f9bafe3a24f88a976abf9880beec386497a2bc769cb9be6bbfd2baac006c92578c372f5dfcfa165c5649876ea5076a3b207de6fc WHIRLPOOL b0af3e279ad937f36450f25711412b7e48928515e4721fee3d91663c4ec629357b6d8f3c661f1ac56d3f7343a3bef717a368386bd8983991e06a4ce0f78ae1f9
-EBUILD dill-0.2.5.ebuild 538 SHA256 681ae94be1616d5a0b282f01b6732b74780cc8e9244b392c725c65dd76a55bdb SHA512 54e0f2509ff2fcdf581197c43a4b5435dd88eb33d4bac7bb33c3e08f938d00ce82ce320cc660b093fee655c3064f4c553e9111fb0ecbbb9dfb436f8012384e16 WHIRLPOOL de9c24524a186b0db9b1897c1d8ac5e502e54d0e6259e0c04e0414e864294e92daac7fdf17cd0bff32345bfc887c4dcc0e97203c4734ebf0e7c9286bdd40cb41
-MISC ChangeLog 411 SHA256 a34aa608d25bbec4e4f0bb0e55c774ca453937fd7548cf24c41945853c051386 SHA512 7c81268c804a75e5b2885750cee083ff402af8b94bfe47a80d00341069fa361c1f765a24a0163de826b4abe9b69edbaf6088a4c7d5175a8f87ac4b6a2aa3a435 WHIRLPOOL 9608f83e868217e8320c054eab2a93830f97c7f05001e468c656bc938bd8c4249e195eea7c18e7e3da2042a88f76e1ef9eed83216f3a5be6507096288a2c9be6
+EBUILD dill-0.2.5.ebuild 543 SHA256 3da250ededf7ef59c334a141a72415e8ea93df9aa35b1cfade7bfb371a76e3af SHA512 b6a0a2b0eb2410549c56adf589183d2f14b7297d04cc50c15211865441f7065a8b1602a532b18120e99d1ebf6562ee51dccc7780224c38b1c8d2fe169c83ab78 WHIRLPOOL ed504502540ecb6803473bd4d25f48f1056730cc53af02b166c6c6b9442bfa1f07af6fdf2b4a89152a20568ebcb5ed9a362c88b122865ed65ef1e08ac69e32ea
+MISC ChangeLog 584 SHA256 67faf3c55103290e2a9646ed06fdf87aa9bbb616421a15627b5fcf2fd9a282b0 SHA512 d61e9723a0bd2d1f30e9c3a9a08827da42938383a7db53e203fa0f33d78deab4130947d85687eff64ac42dd1a2558f7e0a0b78db31bb6416f4feb5534d27425d WHIRLPOOL 34aff99293e2d0089f48b56ec8197667d07e858a355ac0e6ec8f8fdde61d54cb197c479ac49b493c2ce8911e6cc0f3d9d645953abd7ad6f150d0e106b3bc13a3
 MISC metadata.xml 971 SHA256 ab1e928df07d5cb6379870e89c5c7543a42f132d0dd066a04f4a3794f82942c2 SHA512 6dbac6b4684df0f0ca183d998a8c8aaeaa5557d4f20652de04b263a9195b28e56adb7657ab12aebc63715efd2de242b55f3b17648a0337d689756fc4726e5094 WHIRLPOOL bb511abf04b29ac539657380fe2ae17d80fcda8a5e3e42ce074ad90970a18d00c5d8c3e0d051e601ddbab82796490a7a9647e4f2c1cc95f29f405f0e7c6e3a6b
diff --git a/dev-python/dill/dill-0.2.5.ebuild b/dev-python/dill/dill-0.2.5.ebuild
index 6ad1dd52d959..66904fa42044 100644
--- a/dev-python/dill/dill-0.2.5.ebuild
+++ b/dev-python/dill/dill-0.2.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~ppc ~amd64-linux ~x86-linux"
 IUSE=""
 
 PATCHES=(
diff --git a/dev-python/pygtkspellcheck/ChangeLog b/dev-python/pygtkspellcheck/ChangeLog
new file mode 100644
index 000000000000..5416c10c71d3
--- /dev/null
+++ b/dev-python/pygtkspellcheck/ChangeLog
@@ -0,0 +1,16 @@
+# ChangeLog for dev-python/pygtkspellcheck
+# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
+# (auto-generated from git log)
+
+*pygtkspellcheck-4.0.5 (06 Oct 2016)
+
+  06 Oct 2016; Patrice Clement <monsieurp@gentoo.org> +metadata.xml,
+  +pygtkspellcheck-4.0.5.ebuild:
+  Add pygtkspellcheck to the tree.
+
+  It is a spellchecking library for GTK written in python.
+
+  Signed-off-by: Henning Schild <henning@hennsch.de>
+  Closes: https://github.com/gentoo/gentoo/pull/2484
+  Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
+
diff --git a/dev-python/pygtkspellcheck/Manifest b/dev-python/pygtkspellcheck/Manifest
new file mode 100644
index 000000000000..04fc46844579
--- /dev/null
+++ b/dev-python/pygtkspellcheck/Manifest
@@ -0,0 +1,4 @@
+DIST pygtkspellcheck-4.0.5.tar.gz 184313 SHA256 5d7473de147ab2c8fb61de93f7275139c53b08d8cee6b43a2062d6c83a6b2987 SHA512 f2ea035093a4d8bd9ca3b04f7433808b1ea8c3723b3ea12b95f470d8eb003c9cf58114cb4f342f36732ae46e6156223db5185f16a8c4b27551a6b99bc28a45b9 WHIRLPOOL c7a891987c148ca3531b43ad245576efdff328ace04e10ba992efea99768ad84a35f9d94d20e98973c37ceffe6e242dcee635ff0e912192a4605cd07153514a4
+EBUILD pygtkspellcheck-4.0.5.ebuild 564 SHA256 f72d980e63ccb290427825c4df87750b7d1d47cddab1090318a254b605cd352b SHA512 5c0c3476f9685056f2f4a0596ecd688d206ce53f4e991fcb07860457213e2e19f49ad260f4bdddf731c376eb047474ad2fe815c2ea8e00fde29937e81dce415f WHIRLPOOL ffaea976694f9fcd0247606f8182e1a7a77da6e00f1fceabda278a85f9c31d0c7ede94c6cff4281588f0a736ab6b2264cc869075c75914bce8b693509447d75c
+MISC ChangeLog 545 SHA256 ecfcf4a8f0c16cff57c7a61cc14a70a4851868482a4a91751f9b38f59530a791 SHA512 3fa6f268b0bc21b4fc6df8485650fcac5e68e9bc9d47d2886fdd61b032de06291b3fcbb17eafa3998ae6c3c1acf2296259597b97adae07943f901e3ba91797e9 WHIRLPOOL c791924aab5f72450bd174634be98f3bdade5b584b6d4f5b3de0537768702295d0597f737433f4a08608153e87462474aff4f94ebf78c1e18c4d7c9810d77224
+MISC metadata.xml 381 SHA256 11a6ef60d00856e06235b7b8db96784a94a8cc960a328d2ed5d30399370c374d SHA512 da194ec55795437aca489e1f99bcc097234dc6a0d811f55bc216f3b49420a4da190c997da593da25fc259e6cdaf41feb44e8baebe7ceb55c82ca10bf571c41f8 WHIRLPOOL 11aa352eb7b87f3ffa5340c72b445b42e6b5f3a15d3e47fcb5357286ac1df3ca20e181d73da8c3909cb0dd02dc93bb868bed41adcdbdbd09da8738b81d8bd166
diff --git a/dev-python/pygtkspellcheck/metadata.xml b/dev-python/pygtkspellcheck/metadata.xml
new file mode 100644
index 000000000000..6666f980a131
--- /dev/null
+++ b/dev-python/pygtkspellcheck/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pygtkspellcheck</remote-id>
+		<remote-id type="github">koehlma/pygtkspellcheck</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pygtkspellcheck/pygtkspellcheck-4.0.5.ebuild b/dev-python/pygtkspellcheck/pygtkspellcheck-4.0.5.ebuild
new file mode 100644
index 000000000000..ac114f41af2b
--- /dev/null
+++ b/dev-python/pygtkspellcheck/pygtkspellcheck-4.0.5.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+PYTHON_REQ_USE="sqlite"
+inherit distutils-r1
+
+DESCRIPTION="a simple but quite powerful spellchecking library for GTK written in pure Python"
+HOMEPAGE="https://github.com/koehlma/pygtkspellcheck"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+DEPEND="dev-python/pyenchant[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
diff --git a/dev-python/selectors34/ChangeLog b/dev-python/selectors34/ChangeLog
index 5109e5d01ee3..0290a8cbbde4 100644
--- a/dev-python/selectors34/ChangeLog
+++ b/dev-python/selectors34/ChangeLog
@@ -12,3 +12,10 @@
 
   Package-Manager: portage-2.3.0
 
+  06 Oct 2016; Patrice Clement <monsieurp@gentoo.org> selectors34-1.1.ebuild:
+  keyword for ppc.
+
+  Gentoo-Bug: https://bugs.gentoo.org/594026
+
+  Package-Manager: portage-2.3.0
+
diff --git a/dev-python/selectors34/Manifest b/dev-python/selectors34/Manifest
index 28502b8c44f1..6807fb1ba902 100644
--- a/dev-python/selectors34/Manifest
+++ b/dev-python/selectors34/Manifest
@@ -1,4 +1,4 @@
 DIST selectors34-1.1.tar.gz 10525 SHA256 84b3743b9046461aebbcd13c15e79ab91e79acfb6e030b54a0ec6360ae0bbc52 SHA512 3c9cae461d7bc629a5ac2f17e7a5967d4a2865528b34e94e1164521e9d720381cca2c395ba62c0f67a4b9db34644dd031c2576a5017282bf4791c805c467408a WHIRLPOOL 67d07956c9c35e3a43e41033254b4ddff86271376f9d72a2503d9bc5e1f8ee5900384a5a71472a77c5c51e9025d7873d57c8f4797ab2035d7cd22e7ba99c0af8
-EBUILD selectors34-1.1.ebuild 501 SHA256 7a3d3afe7b65a1d79c1fa3a8209ea0a021bb7a8af19552dd88fbea87b0522acc SHA512 fd7509f9e32625cb0454e4594ffaeb0c0c993cc34288eda36d935bfa1300629bd1f588721a90cc529c8f9636f85c45e433f61f994f0b06cf80452bbdae506ff7 WHIRLPOOL 7470e6ada3f050a6e238b3667c8fd8a9eff7e7a581c431030aa55c83d473fa400ed366f70d9c7ac9b54f2442018cdceca5b0b76abd45561ffbf42861e1d5b67a
-MISC ChangeLog 381 SHA256 8e830982dc67e8ccf629d4323c603ed9ddb63f7c715c7d62788e047e9f40dfcb SHA512 42cd4b5ca402d6b62230b9f31fbfd827756c819ced7cf55807c6a1fb831c7bd274edd694557c149af0fc0f87ea455e78f1dc9db3c5b099b64b88f68dfbadae4f WHIRLPOOL a6ab4b79ce5a961d2e7afd4c506e0410207d26611762055146ea76c15680d918887b8fd488c3d22c08d5ea607fa03d88923026944e9757df44b79c12f383ac45
+EBUILD selectors34-1.1.ebuild 506 SHA256 e71dffb0b12375a2d1dfb05768f5b831d3062ac08ce7d12d45ffa03239233c70 SHA512 077712731b5be9fe3e6bf85fea0427f6d1f7f5176d07f6c695fc47fbe499c1b422af7db7bb3d49bb69111d4c326890570075a4102d8071fc7a33a46b7146c43b WHIRLPOOL edd27aa8f38476b9905722f7d196d2f250a1eab04493f4cbc75ad855f635a48fba641f4d2095f56cd4ca1cc85f7c98abaa34006ff6099f2155a3a7656f20fbf7
+MISC ChangeLog 559 SHA256 abb7476eb3e2546f1644df1d6a80bf1f5f7ad7af76de4688a2ca0639c1b39a94 SHA512 91eb242aea9540f6532ad9620917e51128c2f43869eaff1d569eb890dc713cb576ab9eea4493ecbf52d0990209e8ae573bf7a3402cbbe27d7a070b90f51c8660 WHIRLPOOL 46f6faaace9847431d5325c14f3738dcf78381e3a322632e772ac5973922e294a97f91f4a05cd5345fcbd5d70512f6279c0749b66c4df2f3db5b6625ccf823b2
 MISC metadata.xml 493 SHA256 b9383eb360f0010deb11e277d22755e6e0bb05c59f9c6b500772ec6a517f04b5 SHA512 cd40605757a0be68ed1ee74421e24ac6d5d7471deedec54b7843ba954cc347d3c9109c9d82bf64bbe1209746e632680494a30cbcdc8f8db18d980ef3e4003ab5 WHIRLPOOL f402784f6392046f73739d1eda5fb596da3ccb664878db0e6e9e28109aac7db57c04cdc1a80f689e2d20065989f87e65f52adcb1c542bbf44b564d7096d556bb
diff --git a/dev-python/selectors34/selectors34-1.1.ebuild b/dev-python/selectors34/selectors34-1.1.ebuild
index 61c7b2ce1004..e4ccec08b6ec 100644
--- a/dev-python/selectors34/selectors34-1.1.ebuild
+++ b/dev-python/selectors34/selectors34-1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~ppc ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/sepolgen/Manifest b/dev-python/sepolgen/Manifest
index d51a53616a38..98b5df6cab35 100644
--- a/dev-python/sepolgen/Manifest
+++ b/dev-python/sepolgen/Manifest
@@ -1,9 +1,9 @@
 AUX 0030-default-path-for-tests-also-needed-bug-467264.patch 891 SHA256 9e8627ca85ce1ff98933b9e8c8ab00c6ac320ecec3d082a91b790f9c1cebbf31 SHA512 d4e6cc6084bc76ac1394392a8107b2432ca885b88d8b3252507d28a192022e6252bce7d8a666edbc5a36362ceb76a2157008fc3a110a892964c40904607412b5 WHIRLPOOL b981c25dc65e63f72d7646eaff77b8de92589548c272906f73e1a729b7f54ecd57f0502ed453f95bbdf6d9e85a1a087728ec2c5ec3e2eeabc61bd36487fd4842
 DIST sepolgen-1.2.3.tar.gz 367644 SHA256 3ee1745257fa55301070219c77978c7c9eeb9aa595ce0b6b29c3baa4687d5cf0 SHA512 5fe023f983dc0fe1855da24835cb9bb466ac6c44d07fa939416740ca64968c039be2febff79b2a4c593e54c5ae81448dd06020e9160e4f84eea95d8c0d2b910f WHIRLPOOL 65c663a3398f1ae64e8bf233828701481ac2ee68fa75f2271596628c7dcc80c1193166cfb950f8faa86988c0b309cfbb59f15f38131a9f1f2680b754518bba11
-DIST sepolgen-2.6-rc1.tar.gz 367934 SHA256 5d1ee9a86d75f08b3443e4f17a9098bf3bdc7d2a77a64dcdd5d6230f6d4621cb SHA512 80fe7a3a30d632d0736ca69527ecacded1a35cc2115fcaab526f8eed56f12d77b453dc0eb7230790d5774631ee2d7c3fdae54fb734da30de46faea6fd9c96711 WHIRLPOOL 35d3d32e29f967e691658f8a30ce274c34d2e656bff3a1df04ba3b054631afe8e717f76dbd8524e91a0c9c45e64471b398af85b1ab20a4beac87f70ca62b3ca8
+DIST sepolgen-2.6-rc2.tar.gz 368014 SHA256 06c6e9d78b3628bfc056ace4a9f0aca4a5f62ea4283c3867e971cf485ebcb6cc SHA512 2d545f666db9c283643702863c022dde7dab9d1e15cd4895a07e6c20dba651d366ec1382f2319aff320c46fb15e928afe1619444ac95050e757916752715ba9b WHIRLPOOL 62cf9d3c0606d49263074adc205842a05a36b9147ae4434f6d612a18fee98dfbd87ec4afcb0e7308ea7ba5072328d8ec5f6c8b944bbb40eef8ca377d3b2684ab
 EBUILD sepolgen-1.2.3.ebuild 2246 SHA256 868d4d28f7af14014a450b53227ca9df2884dad09e0267bd059b88a5eb50f0cd SHA512 2e0a8e9f139006d4fa9b3031b4b54f4cf6535a5be2b1ec8afc9b3500b98f0590022b992d644fefebabd4b14cb068c6dc988d3c3a3caaf13d0e364b8189ca9c87 WHIRLPOOL ea712d627c67a6b22d1dea83d65149301efde4d06860ac7fcf462e8a0b746c136b892ef4ea7cd1fd7989de616ecb3248a60a54f47c486040cf77416eb86cef85
-EBUILD sepolgen-2.6_rc1.ebuild 2249 SHA256 dbbd09789211d6d6fa9a36e42da94243895cf5a8cb5c9d0656df796631b2a04c SHA512 68d690e22c6c0a98c0968da8a355f75e276ab8f50e0168ac95796924db5949e64b41dedadbfe2a523c49ed231a17b44372f3464cc2724a758828b236ba76b43a WHIRLPOOL a9a99b0e8cd0cb8ddc23fbccd2ba1d126087ceb44240b4b494c9d59168c9bd2919c25b072d36c48df89c479b7b6e4e9a4aac0c144647a2c0235ee186ece1b1c5
-EBUILD sepolgen-9999.ebuild 2249 SHA256 dbbd09789211d6d6fa9a36e42da94243895cf5a8cb5c9d0656df796631b2a04c SHA512 68d690e22c6c0a98c0968da8a355f75e276ab8f50e0168ac95796924db5949e64b41dedadbfe2a523c49ed231a17b44372f3464cc2724a758828b236ba76b43a WHIRLPOOL a9a99b0e8cd0cb8ddc23fbccd2ba1d126087ceb44240b4b494c9d59168c9bd2919c25b072d36c48df89c479b7b6e4e9a4aac0c144647a2c0235ee186ece1b1c5
+EBUILD sepolgen-2.6_rc2.ebuild 2249 SHA256 fcb567c71fe64331b9b6d258326c8d55e68f5cfdad60a55c7159ca935a693436 SHA512 28039ad3b783066927422daf02ba779b8038e327b521eb65a9cd34c125da26a79a45d4cbbf7db00ad9fb07a5f5b5c02697da61e7ec55592f4deb29d3a30198ef WHIRLPOOL 20e26bd9399f7b08f077e2216fb033bb8e75995a32d5eb918867ceb6f75a35ddb8740e019c713775f12f8eeb9f8412525212d9bee1c4660ae4ef143c44c18454
+EBUILD sepolgen-9999.ebuild 2249 SHA256 fcb567c71fe64331b9b6d258326c8d55e68f5cfdad60a55c7159ca935a693436 SHA512 28039ad3b783066927422daf02ba779b8038e327b521eb65a9cd34c125da26a79a45d4cbbf7db00ad9fb07a5f5b5c02697da61e7ec55592f4deb29d3a30198ef WHIRLPOOL 20e26bd9399f7b08f077e2216fb033bb8e75995a32d5eb918867ceb6f75a35ddb8740e019c713775f12f8eeb9f8412525212d9bee1c4660ae4ef143c44c18454
 MISC ChangeLog 3729 SHA256 e8bc0fefddca59146166184743875971f604b549a2d96d34dafa6eee3915c25c SHA512 6d998d56b4b48fd55ed6e9bada6b358231f50466420ad7bd980694b42a0e3bf797bbfa97af9e11361643c07df1389809ef17e2f4228defc34a5f5844cfc2bd87 WHIRLPOOL b2c7f8803cca315de2a6328a9a8abd01617e91a135e72bd1f21f7abb9f2a24d54785b63e15deda32a86e309df9ca087e18347f835c93a843490e7d4d52849ea2
 MISC ChangeLog-2015 8639 SHA256 4c6103f1923127d465b15fda2927907b2558b7bee67afe7ae17e7132aa581b21 SHA512 ab752e0207cbf5b70f07b8d05439133bf5b85ac46dfe6c0777c830585d5ead4168a96c179e0ea15206b735b093a4328aea540abfc975974c4499be195e1e4f1b WHIRLPOOL cccf452218908955e52e694acadbc0d1b368730096071f190430b820ada3bdeb328bbc6331a8654f2392eb36b0d5bbc0a7693b9d39183655620a058d81df94c9
 MISC metadata.xml 407 SHA256 9757a59cd9286acd8db9ab5750934a37f023c04308e035d76ac6698790a9d008 SHA512 576b46fd09a9a48f19132f006edf0ed27d864d0095415121db0e0ef64013fe6d35b220d305e6042cfb10f51cb05317cea7ea739905675126ed8191a752eb610e WHIRLPOOL 1f14482a8b658937bb20fc6c1a75d8b880564ec5ac66febb8a797827258211eefab8b8f55ba5697a50381b06c0b5b4a423e5545e270bc1a38db36f67bd04d9ea
diff --git a/dev-python/sepolgen/sepolgen-2.6_rc1.ebuild b/dev-python/sepolgen/sepolgen-2.6_rc2.ebuild
similarity index 98%
rename from dev-python/sepolgen/sepolgen-2.6_rc1.ebuild
rename to dev-python/sepolgen/sepolgen-2.6_rc2.ebuild
index d829a841eebb..37d54b6c1398 100644
--- a/dev-python/sepolgen/sepolgen-2.6_rc1.ebuild
+++ b/dev-python/sepolgen/sepolgen-2.6_rc2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit python-r1
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20160930"
+MY_RELEASEDATE="20161006"
 
 DESCRIPTION="SELinux policy generation library"
 HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
diff --git a/dev-python/sepolgen/sepolgen-9999.ebuild b/dev-python/sepolgen/sepolgen-9999.ebuild
index d829a841eebb..37d54b6c1398 100644
--- a/dev-python/sepolgen/sepolgen-9999.ebuild
+++ b/dev-python/sepolgen/sepolgen-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit python-r1
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20160930"
+MY_RELEASEDATE="20161006"
 
 DESCRIPTION="SELinux policy generation library"
 HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
diff --git a/dev-ros/clear_costmap_recovery/ChangeLog b/dev-ros/clear_costmap_recovery/ChangeLog
index 0141faf8bfb5..2bf353f9bb43 100644
--- a/dev-ros/clear_costmap_recovery/ChangeLog
+++ b/dev-ros/clear_costmap_recovery/ChangeLog
@@ -56,3 +56,20 @@
 
   Package-Manager: portage-2.3.0_rc1
 
+  06 Oct 2016; Alexis Ballier <aballier@gentoo.org>
+  -clear_costmap_recovery-1.13.0.ebuild,
+  -clear_costmap_recovery-1.13.1.ebuild:
+  remove old
+
+  Package-Manager: portage-2.3.1
+
+*clear_costmap_recovery-1.14.0-r1 (06 Oct 2016)
+
+  06 Oct 2016; Alexis Ballier <aballier@gentoo.org>
+  -clear_costmap_recovery-1.14.0.ebuild,
+  +clear_costmap_recovery-1.14.0-r1.ebuild,
+  clear_costmap_recovery-9999.ebuild:
+  add missing dep on boost
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-ros/clear_costmap_recovery/Manifest b/dev-ros/clear_costmap_recovery/Manifest
index f7c3acc00782..fd785c2e598e 100644
--- a/dev-ros/clear_costmap_recovery/Manifest
+++ b/dev-ros/clear_costmap_recovery/Manifest
@@ -1,9 +1,5 @@
-DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd
-DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb
 DIST navigation-1.14.0.tar.gz 340196 SHA256 3974bb52af21cf0a6e4da8eb231b3101b4c5da700793bdac1cdc97e69d6e5cac SHA512 8ac2048be6d06be1f137aab2e73c5c724e794b9e6125fa70e2283df3790200f7b5203bae12c46e0796523ae58a4f8ede79fd0c1afc09a306a99f450576c7b11a WHIRLPOOL 12e8b7f5043a9473033df772021c3ebae1cdf87bde52988874489e490e7dfdcb07623c588ffd1297fbbd3fc336813fc6f4e9ae812dc80dfcad3062cceb82ef0b
-EBUILD clear_costmap_recovery-1.13.0.ebuild 591 SHA256 41c483a23162747e7d61f3b42ec21c252727a33c5a94e65a616e8d9542ec00b9 SHA512 d96fee3a50a82a3aeea6a565f828f26ff20d0b4243dbaff06acd8e9a56387540ec0c5fa5b588586a51ee42ac798322270af750a554e5b916a9919785c220bba3 WHIRLPOOL 0cca10ff8f26d715e3481520fb582d95b80cbf0463cfa5184c96d01c9570c6025cc63ebf1de12d3d5340d5ada7b5f49a13c4c916de330682c51c2786623ebc43
-EBUILD clear_costmap_recovery-1.13.1.ebuild 600 SHA256 e6000a8c55610fc8ef47b1cdf35a8653744698e2ad87ae3078934d0dbedb2b9a SHA512 b653a3b82717b3d6a23fd40c2d276ff22df5e29a46e6cbc64d24b1ee3f2eb385c7e9c1b6256505f6ec13704aac9f128d3c1c3abf8967b4db1be685812580d95d WHIRLPOOL d59dc6c4aa4767a8733ab2ac3585d91b16f7b83cd0d5b09054fee240db2f80fbe172d922a9492665358958ef978219d7e73808f67edee06d9fa2208fafc013c6
-EBUILD clear_costmap_recovery-1.14.0.ebuild 600 SHA256 0143164e0c16f515b8e69024fe0c41e2b40a1f71d8f98a4335f21189d96365c0 SHA512 6537930fc6c9365d805db40fded2933143d27fba827ba5272dc52e59727faf7240d0ba47e0d624bd841aa813e97a8d520640447438b65251efe2fb9a8784435e WHIRLPOOL 056030f18a3c60bb7a8dfd509ac8e4347f8f82e2d5aadb75d2f3dcba46282fe6122d5b4bebde56c08aa1fe8d9b0b6f8ec275e68459b44be77f4da71e55ce16af
-EBUILD clear_costmap_recovery-9999.ebuild 600 SHA256 e6000a8c55610fc8ef47b1cdf35a8653744698e2ad87ae3078934d0dbedb2b9a SHA512 b653a3b82717b3d6a23fd40c2d276ff22df5e29a46e6cbc64d24b1ee3f2eb385c7e9c1b6256505f6ec13704aac9f128d3c1c3abf8967b4db1be685812580d95d WHIRLPOOL d59dc6c4aa4767a8733ab2ac3585d91b16f7b83cd0d5b09054fee240db2f80fbe172d922a9492665358958ef978219d7e73808f67edee06d9fa2208fafc013c6
-MISC ChangeLog 1931 SHA256 e2ea1a3841db8250b1d8e397a233dd44cddd5f29407c17a8d94736ade786369d SHA512 f741c7fc02f5dc9697b85ec2e34c92bcfb90434716a33c97f875c8f494637eeffbe6917cfd6243c8db013cb64278ffd271d094031547cafbbf1de60dab996a3a WHIRLPOOL 55b59f93b5e965203ac6f953586d9632f1adf230126d7165f10e0ad08ec404cbb3c74f1c8e57ccae23eef7a06f6ba264ba4bba622e0e47cc1bd1f43a9540a384
+EBUILD clear_costmap_recovery-1.14.0-r1.ebuild 627 SHA256 a588b5f032954de41987b23a00eb76967ce346a4750cd5f094fd35a4c7bdc2f9 SHA512 53264464e1289915a2402c1d10258dd399ca1a4ad330adede8b8c63d770ce29a0110f41478707ab13b8999a18fa549913b762ccfc3cecf75efbd4636727ecbdb WHIRLPOOL 002f796ed1b584c015fd62abe9f9aa48d4e0d3bc92b4b770c24afc17a1f7a387cd610f02ef06387e7bb95f6afc78c9709b3e945479335bb5212c6921dd6b383a
+EBUILD clear_costmap_recovery-9999.ebuild 627 SHA256 a588b5f032954de41987b23a00eb76967ce346a4750cd5f094fd35a4c7bdc2f9 SHA512 53264464e1289915a2402c1d10258dd399ca1a4ad330adede8b8c63d770ce29a0110f41478707ab13b8999a18fa549913b762ccfc3cecf75efbd4636727ecbdb WHIRLPOOL 002f796ed1b584c015fd62abe9f9aa48d4e0d3bc92b4b770c24afc17a1f7a387cd610f02ef06387e7bb95f6afc78c9709b3e945479335bb5212c6921dd6b383a
+MISC ChangeLog 2399 SHA256 65e7c930d3f11b3a18b708b994925d588d8daa5111501334ae6b0e2deef35923 SHA512 a6afcbc6f29bf6a5e632d575410e843bf622eff16db14c909352291ac84c05208c660c4180479d0f52640b5928cea5f1fc8eb70be0d0ecbb967a06f80419bf8f WHIRLPOOL 8e2b33cb09d13629014d50dd6f89d46fa25e052f71a9213a4acf487fda8ac4d9aaf14698324173ccf0592e35baa3524f570790b9b6696f7861fa74e5a260853c
 MISC metadata.xml 337 SHA256 a90ded2c003033ad4057df2eba71c9fc0a76a721e3f998dc578c29eef4ada1f1 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e WHIRLPOOL a0198030c632c4ed9a5b5d09027e0a463b5ecfee3f2cfbb1c7f5ebd18f77e9f9600c1f8d30f456c27b3866b8170348c96203a734a0e844a593369f0f92501e79
diff --git a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.13.0.ebuild b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.13.0.ebuild
deleted file mode 100644
index 2a32da63e50d..000000000000
--- a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.13.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Recovery behavior that attempts to clear space by reverting the costmaps to the static map"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/costmap_2d
-	dev-ros/nav_core
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-cpp/eigen:3
-	sci-libs/pcl
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	test? ( dev-ros/rostest dev-cpp/gtest )
-"
diff --git a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.13.1.ebuild b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.13.1.ebuild
deleted file mode 100644
index 5e3fc2c93e9c..000000000000
--- a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.13.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-
-inherit ros-catkin
-
-DESCRIPTION="Recovery behavior that attempts to clear space by reverting the costmaps to the static map"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/costmap_2d-1.13.1
-	dev-ros/nav_core
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-cpp/eigen:3
-	sci-libs/pcl
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules
-	test? ( dev-ros/rostest dev-cpp/gtest )
-"
diff --git a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.14.0.ebuild b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.14.0-r1.ebuild
similarity index 95%
rename from dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.14.0.ebuild
rename to dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.14.0-r1.ebuild
index 6ff2d9653dee..53805d203643 100644
--- a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.14.0.ebuild
+++ b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.14.0-r1.ebuild
@@ -22,6 +22,7 @@ RDEPEND="
 	dev-ros/tf
 	dev-cpp/eigen:3
 	sci-libs/pcl
+	dev-libs/boost:=[threads]
 "
 DEPEND="${RDEPEND}
 	dev-ros/cmake_modules
diff --git a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild
index 5e3fc2c93e9c..53805d203643 100644
--- a/dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild
+++ b/dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.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$
 
@@ -22,6 +22,7 @@ RDEPEND="
 	dev-ros/tf
 	dev-cpp/eigen:3
 	sci-libs/pcl
+	dev-libs/boost:=[threads]
 "
 DEPEND="${RDEPEND}
 	dev-ros/cmake_modules
diff --git a/dev-ros/gazebo_ros_control/ChangeLog b/dev-ros/gazebo_ros_control/ChangeLog
index bb8b87d421ff..1244a07e3164 100644
--- a/dev-ros/gazebo_ros_control/ChangeLog
+++ b/dev-ros/gazebo_ros_control/ChangeLog
@@ -104,3 +104,18 @@
 
   Package-Manager: portage-2.3.0
 
+  06 Oct 2016; Alexis Ballier <aballier@gentoo.org>
+  -gazebo_ros_control-2.5.7-r1.ebuild:
+  remove old
+
+  Package-Manager: portage-2.3.1
+
+*gazebo_ros_control-2.6.0-r1 (06 Oct 2016)
+
+  06 Oct 2016; Alexis Ballier <aballier@gentoo.org>
+  -gazebo_ros_control-2.6.0.ebuild, +gazebo_ros_control-2.6.0-r1.ebuild,
+  gazebo_ros_control-9999.ebuild:
+  add missing dep on boost
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-ros/gazebo_ros_control/Manifest b/dev-ros/gazebo_ros_control/Manifest
index 2d70f7ee3cf4..652befa31277 100644
--- a/dev-ros/gazebo_ros_control/Manifest
+++ b/dev-ros/gazebo_ros_control/Manifest
@@ -1,8 +1,6 @@
 AUX urdfdom1.patch 590 SHA256 b25beed991b6c5fda0f0b7ef1910431fed8bae0fe129fe4e79c0ea6a5e53edf3 SHA512 8476e9ba0a1f1977de88f299c5222f72361be8c334a37d1f4c7834c311f6a4cad2a49553d5fcee67ef5e9f2d164855dc89671958c2d069a7f6a301c3a43891dc WHIRLPOOL 5c17b703c8d84df9b148c772f00a27a3dacee30ac130d8c2f28d79a8da9e13b8113dd8f42f6bce0e2d1851e319115cb8d3c505d1490b6710169e1c7ae4f0628c
-DIST gazebo_ros_pkgs-2.5.7.tar.gz 1821656 SHA256 6a40c129d4b4d6c7c5d4608aac7314b84f815a4416cd905d71b2b98067c2aaa7 SHA512 13790eaa50d6a6b1be26236ce3dd118f6d09c1096b7c95fffbad99fe70d59546b8169597eda5fa774cce37c5b3f46ca61b3c66a8520b675fb8c020e36f002d94 WHIRLPOOL b94be63a019d4bd9fa175f6c8c24f96c2e034ebfdf9b4f96aad6e71476409cb57453c895d2bb14aa50ba1410fb89302147c0677c055544ef826b28425e0a1046
 DIST gazebo_ros_pkgs-2.6.0.tar.gz 1823899 SHA256 a2756e12a716ef1fa18b132a76b8ea552c5e41c4875bf0349e034988eef133e5 SHA512 14e3a82ce2d5a9d2f036a6234f12421513db4e53924dbbab60aedef3c3638f1e6b1c5abc2cb0094f19efaa764c76189bcc00217591c4b82e93fff965041c0fce WHIRLPOOL 5b4f44c10de4ef9b86ae37fe115b81ecfd1a991c470e3ade0159cf3bf77646b9a7576e29bdf2b5ecd12164e0a00b838e9d14807bf1153b0443bd52182384d040
-EBUILD gazebo_ros_control-2.5.7-r1.ebuild 672 SHA256 bbfc5886367097085238ae003b40f55e65814de157b3cac168fc6d47f015d6fe SHA512 ceb066744f9409f4e7dab7794c8825386bb7b28925a4910c5f6c055c4c91737c8220e9e1474271915d536953c4fccc3699092a11c4eeca0fba1e2ea8dd3bce0c WHIRLPOOL 047e5aaeda4f7661c972bde807ca09f88e8db760f36df05cd4fe6a558927c71b94643e11a418be552225ae6001fce83c670534513b79968a275b3a90fdd5c192
-EBUILD gazebo_ros_control-2.6.0.ebuild 672 SHA256 bbfc5886367097085238ae003b40f55e65814de157b3cac168fc6d47f015d6fe SHA512 ceb066744f9409f4e7dab7794c8825386bb7b28925a4910c5f6c055c4c91737c8220e9e1474271915d536953c4fccc3699092a11c4eeca0fba1e2ea8dd3bce0c WHIRLPOOL 047e5aaeda4f7661c972bde807ca09f88e8db760f36df05cd4fe6a558927c71b94643e11a418be552225ae6001fce83c670534513b79968a275b3a90fdd5c192
-EBUILD gazebo_ros_control-9999.ebuild 610 SHA256 90783ab1d2dfe907eb409d61b95b16520bb55dc07cdd04aada1d5f18ffea8fc2 SHA512 1954320cc9edf3dc2b9797eb7e13a6c1122a73957c8e4c91d55b0034f0cc014e68528ed032af88c87336ffcd9c9393f9d8e4a08c4fe0ec1116c890600bbc934c WHIRLPOOL cd5f666ded33cec41b3b25e44e4523c138d0f63771523fe2f6a81c2eb0b975e7ae0a2b982e0d8cb3ba2491abd739da6eb4d240f821a4d3c0cff49c3dcc44b2e4
-MISC ChangeLog 3241 SHA256 9fce4588b169dd33ec9406c45ef55fa623145cc0be2b00ab93ddd42665f6a339 SHA512 2c047e85a19de50ce7f12f5ee272965c4a1332ffc79c7a2e66058d3aedbc38c0806e66582321d68973dfa74f5b635b2b60b895d287d81117856fefdf0738aead WHIRLPOOL 9b74db4e0214232d7bb1f3cd2cfda4c697b5dcbba4f76b9d1b38d3b1dc65d548f5d1e08c7c73f11a229c8871ca66cb719e4611c4020530d66a16a213657a286a
+EBUILD gazebo_ros_control-2.6.0-r1.ebuild 699 SHA256 ace55e9697c264e12d4456beb69e99310035eb03641263b60bc880853fa0d2a3 SHA512 385b45d04b20d194f1c712c758d03a9f3c1c2ca70c7ec1f110633de09e0c2128627be21cfb8bae6e1f16bd881eb23e180dbe5dfeee704d3ca5f62ca3cd3b1d35 WHIRLPOOL 69dbef0aad3ac0dd789e09e48a1eb0a42ea59d03322649c2e6b1402a6a8cea9d4573704ddb2c3c75d61d677224fd13211c4d6e1051494b586cf90bdb9bb37efe
+EBUILD gazebo_ros_control-9999.ebuild 637 SHA256 c6afdfb6452b6d1fb0bbbeac4607ffb77a92f119c97356561a39302421f890a8 SHA512 826f654231b969308fd7151bf54950da784ebdd2fe58b231956438d4e425d3e2abc25e73a35abf16149d3368613a9010b1e39ed0ecf97e7602b121ed131c036f WHIRLPOOL d37fc8aabac9350fe445f2ad1ce62d1be1353de1fa46d0d69a612239f7cb410a4f5c8eaedea9201f6027ea6fc2ed91179dfd2349e12f3c79b688b91c16cdd119
+MISC ChangeLog 3645 SHA256 ea11765944f451b2a2d0a13046e04dd212d96bf24b736d03e58e4a1b933905d0 SHA512 dd4e30434cec667b242d01f3d62d639bfe205000a902dd08880de00cc3334c0bca5741144c1d0644b142ce7b1cde5e2120206539baad485bd916a6ad2629c38c WHIRLPOOL 74439d68b7a04d25a941fbe9a75f2d88a4659bc4b4800079a343bf1b9798a4e58c57f9d4a60b173360e282ef1d6edfd1bda7fcdb38d0dc9285809814a12f60cf
 MISC metadata.xml 344 SHA256 f5e01eabfb9055df59f1c8079b8ef0cad9041892fe2b4853ecadf3ce1a14718b SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d WHIRLPOOL 95bcc2bd5a88e1f205dc349076f7dd929355fbb4435281b50dac76d2542c2f9f7c74fa7e0965d9a9d644eeb212a0a272011fe4364107745a9dcc103ee5a16dc6
diff --git a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.5.7-r1.ebuild b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.5.7-r1.ebuild
deleted file mode 100644
index 8f80022535e9..000000000000
--- a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.5.7-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
-KEYWORDS="~amd64"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="ROS control plugins for gazebo"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/gazebo_ros
-	dev-ros/control_toolbox
-	dev-ros/controller_manager
-	dev-ros/hardware_interface
-	dev-ros/transmission_interface
-	dev-ros/pluginlib
-	>=dev-ros/joint_limits_interface-0.11.0
-	>=dev-ros/urdf-1.12.3-r1
-	dev-libs/urdfdom:=
-	sci-electronics/gazebo
-"
-DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/urdfdom1.patch" )
diff --git a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.6.0.ebuild b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.6.0-r1.ebuild
similarity index 96%
rename from dev-ros/gazebo_ros_control/gazebo_ros_control-2.6.0.ebuild
rename to dev-ros/gazebo_ros_control/gazebo_ros_control-2.6.0-r1.ebuild
index 8f80022535e9..3c8d579a7c14 100644
--- a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.6.0.ebuild
+++ b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.6.0-r1.ebuild
@@ -26,6 +26,7 @@ RDEPEND="
 	>=dev-ros/urdf-1.12.3-r1
 	dev-libs/urdfdom:=
 	sci-electronics/gazebo
+	dev-libs/boost:=[threads]
 "
 DEPEND="${RDEPEND}"
 PATCHES=( "${FILESDIR}/urdfdom1.patch" )
diff --git a/dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild b/dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild
index edf64680c22e..7011c6f13ceb 100644
--- a/dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild
+++ b/dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild
@@ -26,5 +26,6 @@ RDEPEND="
 	dev-ros/urdf
 	sci-electronics/gazebo
 	dev-libs/urdfdom:=
+	dev-libs/boost:=[threads]
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_cb_detector/ChangeLog b/dev-ros/image_cb_detector/ChangeLog
index a963911ca69e..29bc41dbac58 100644
--- a/dev-ros/image_cb_detector/ChangeLog
+++ b/dev-ros/image_cb_detector/ChangeLog
@@ -42,3 +42,18 @@
 
   Package-Manager: portage-2.2.28
 
+  06 Oct 2016; Alexis Ballier <aballier@gentoo.org>
+  -image_cb_detector-0.10.13.ebuild:
+  remove old
+
+  Package-Manager: portage-2.3.1
+
+*image_cb_detector-0.10.14-r1 (06 Oct 2016)
+
+  06 Oct 2016; Alexis Ballier <aballier@gentoo.org>
+  -image_cb_detector-0.10.14.ebuild, +image_cb_detector-0.10.14-r1.ebuild,
+  image_cb_detector-9999.ebuild:
+  add missing dep on boost
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-ros/image_cb_detector/Manifest b/dev-ros/image_cb_detector/Manifest
index 0ef47fd13047..21f88f5c004f 100644
--- a/dev-ros/image_cb_detector/Manifest
+++ b/dev-ros/image_cb_detector/Manifest
@@ -1,7 +1,5 @@
-DIST calibration-0.10.13.tar.gz 112305 SHA256 935755f9428e6b998d1a9ce10fcf11f3c119953ebe0b65eda855804ec8b8aea8 SHA512 95b5ea28428ea9726b6b1a8f24cd4c7cb84992e680761357c1a13dd92c362149a0a6104f6a44dbefad503db1a9c7a53135d9756b1ceea3a739b1baa14f9474eb WHIRLPOOL 94423d70268b053daee1da1b324582d2f8316c6feaa5c9291715b1861520cb2e67654daaa2156e8d15cd59ecb566bdd3cb76d42c7202b85680888bac3532002c
 DIST calibration-0.10.14.tar.gz 112475 SHA256 1e65e6d8f793e7a27d1975ec3c4b63bf5249c7ce859dd11187258560901d1c77 SHA512 5ef17cd21e04c134717859ecb12c4e7fc0086b044cf7d35d40bd43439a0f24e8ad41fe7b5fa37dcc8ec5e4abb2be8f64d86510706a3d97510cf1b92c2196ad40 WHIRLPOOL 5c1ea989d438198044933927acfd7eb8426c9f5f253710ac63117b2a20c526acfea568f4b7b4f1930a43024bbcf4033f0f04c9e48108dc7e1cc629fb9e3c127f
-EBUILD image_cb_detector-0.10.13.ebuild 831 SHA256 fc34c3941b255bbef91a91b98117bcc0f4c89c2912e3c1841ed37e4b9356fb66 SHA512 f212d5348f69447ab992a6d4688047c2c34ed0ebf5aeb8bb6a7f90355b33863d2347ada25101120d52808d11ca580992e6e28f447dbd031301a38b74177d0e61 WHIRLPOOL 7542f75f48d34d2436351e006ac3f444087012bcf2e96b698c6fb7b7b4a1d018c28257629bd87e0a46fdda51744c00a9973f2833a4ee7f06d9c42c0435c8982f
-EBUILD image_cb_detector-0.10.14.ebuild 831 SHA256 fc34c3941b255bbef91a91b98117bcc0f4c89c2912e3c1841ed37e4b9356fb66 SHA512 f212d5348f69447ab992a6d4688047c2c34ed0ebf5aeb8bb6a7f90355b33863d2347ada25101120d52808d11ca580992e6e28f447dbd031301a38b74177d0e61 WHIRLPOOL 7542f75f48d34d2436351e006ac3f444087012bcf2e96b698c6fb7b7b4a1d018c28257629bd87e0a46fdda51744c00a9973f2833a4ee7f06d9c42c0435c8982f
-EBUILD image_cb_detector-9999.ebuild 831 SHA256 fc34c3941b255bbef91a91b98117bcc0f4c89c2912e3c1841ed37e4b9356fb66 SHA512 f212d5348f69447ab992a6d4688047c2c34ed0ebf5aeb8bb6a7f90355b33863d2347ada25101120d52808d11ca580992e6e28f447dbd031301a38b74177d0e61 WHIRLPOOL 7542f75f48d34d2436351e006ac3f444087012bcf2e96b698c6fb7b7b4a1d018c28257629bd87e0a46fdda51744c00a9973f2833a4ee7f06d9c42c0435c8982f
-MISC ChangeLog 1519 SHA256 ea4aa7c4321a65c0f4818fb6bcf1aa0a3cfa04a2d6839595403086b1d658e352 SHA512 cc6e8ebd920c790c59fb132148a8a381b26c8088e4e54cb4f836db98787814c670217f859063b5de17dc2e575d5a193f3c10dd0ebc8816595593cdc2910094e6 WHIRLPOOL 452d7b2f86d54f7aa9d9296ce997c59e1761c1196129d076727e488efd58a2ba47917853b5533a6a61e29dd19cce4b15ae47f74758d453baa98f8881fc94cc15
+EBUILD image_cb_detector-0.10.14-r1.ebuild 858 SHA256 f548df380c9ee8c5935fea7f27cb80ef9b44c95c503696d3ffa51bffb4c81d51 SHA512 fde6c9dcdffe20f0afe0c79f344cce315ec3d681afa76c47160bae2f9e5956807fc1608927313a93c0be11310f9dd73908b88c35151363d83759abdcd811ddb0 WHIRLPOOL 349ecf4f336f24053ff0cf20704e65bc169da39ecfab7d0400127e0d1406dc7dd5bed1a36507cde46b23c769e6852d2bc317904eb3f8697ef29e3647ead0655d
+EBUILD image_cb_detector-9999.ebuild 858 SHA256 f548df380c9ee8c5935fea7f27cb80ef9b44c95c503696d3ffa51bffb4c81d51 SHA512 fde6c9dcdffe20f0afe0c79f344cce315ec3d681afa76c47160bae2f9e5956807fc1608927313a93c0be11310f9dd73908b88c35151363d83759abdcd811ddb0 WHIRLPOOL 349ecf4f336f24053ff0cf20704e65bc169da39ecfab7d0400127e0d1406dc7dd5bed1a36507cde46b23c769e6852d2bc317904eb3f8697ef29e3647ead0655d
+MISC ChangeLog 1923 SHA256 0cfcfe2af5bdb972a9ca1f78453c00b65f6b340b3d48419e8b4c8dac5a5a93f2 SHA512 dbdf61fb68411cc4ef0c186ed4df75ba43463f753e401d97f9c53ab3ea142306b0ee21cbaf50bd74722f37ddced897377200dc3b831cc2e8bfac3aedf49df478 WHIRLPOOL 24798af01736c62865d1af76940cf966ba389ce885114819476d255f3e4f9fea4309c0a9be300ef66960a86fba1a217eb94a2966f1b08113bbc6b455b2851303
 MISC metadata.xml 340 SHA256 678ba832ac98f8b0a18465056d6046bac6e86625e0d9c88087b65770e0a39bf7 SHA512 de7b08cf3292d6c46f7a6e954ece0a32c8e2f4d67bc5212ce755662b8abf50425d54c00e0601ba943a4a9835f32c3df63ef87d5655788510ed86f05dd485a963 WHIRLPOOL 14899b95b028a1d21e6fc62ca4e22675cf9a742003656f7ecbe174f2c9d3ce252fa1c76ab6b8880153d92d7a4edb97028909be69b5f0992a9b6a1220694fb64f
diff --git a/dev-ros/image_cb_detector/image_cb_detector-0.10.13.ebuild b/dev-ros/image_cb_detector/image_cb_detector-0.10.13.ebuild
deleted file mode 100644
index 5c19021411e3..000000000000
--- a/dev-ros/image_cb_detector/image_cb_detector-0.10.13.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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/calibration"
-CATKIN_HAS_MESSAGES=yes
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/actionlib_msgs dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Extracts checkerboard corners from ROS images"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/actionlib[${PYTHON_USEDEP}]
-	dev-ros/cv_bridge[${PYTHON_USEDEP}]
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_cb_detector/image_cb_detector-0.10.14.ebuild b/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild
similarity index 92%
rename from dev-ros/image_cb_detector/image_cb_detector-0.10.14.ebuild
rename to dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild
index 5c19021411e3..54172203fc68 100644
--- a/dev-ros/image_cb_detector/image_cb_detector-0.10.14.ebuild
+++ b/dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.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$
 
@@ -26,5 +26,6 @@ RDEPEND="
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-libs/boost:=[threads]
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild b/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild
index 5c19021411e3..54172203fc68 100644
--- a/dev-ros/image_cb_detector/image_cb_detector-9999.ebuild
+++ b/dev-ros/image_cb_detector/image_cb_detector-9999.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$
 
@@ -26,5 +26,6 @@ RDEPEND="
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
 	dev-ros/calibration_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-libs/boost:=[threads]
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/joint_limits_interface/ChangeLog b/dev-ros/joint_limits_interface/ChangeLog
index 19406c9d331a..3d16f57b1804 100644
--- a/dev-ros/joint_limits_interface/ChangeLog
+++ b/dev-ros/joint_limits_interface/ChangeLog
@@ -84,3 +84,12 @@
 
   Package-Manager: portage-2.3.0
 
+*joint_limits_interface-0.11.1-r1 (06 Oct 2016)
+
+  06 Oct 2016; Alexis Ballier <aballier@gentoo.org>
+  -joint_limits_interface-0.11.1.ebuild,
+  +joint_limits_interface-0.11.1-r1.ebuild:
+  forward port urdfdom1 patch again
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-ros/joint_limits_interface/Manifest b/dev-ros/joint_limits_interface/Manifest
index 8c5b43c1ae06..545b06436792 100644
--- a/dev-ros/joint_limits_interface/Manifest
+++ b/dev-ros/joint_limits_interface/Manifest
@@ -2,7 +2,7 @@ AUX urdfdom1.patch 1280 SHA256 daeda5cab584d8151e0c6ed7a526644e1901bfb046f29fcdc
 DIST ros_control-0.11.0.tar.gz 633993 SHA256 a21839b729459f752f9a37b73965e116dfbd36c6e9edc4e85a9791cdf469f16c SHA512 fe18a513c12db60a4e49a37ec9588a448e24acd618162930dd6772a2bdc9855d56e56a45d0ba4f2e2c1ce29551efb93e3db0f2232a1ddf4ca40c053cf5845fd5 WHIRLPOOL 47dfe7fd5b01fc47a5aa38a6389a046af92363ddc26226900d347aa44e0f3d56da585e7acd87a7256c2d472769976e51aceb052241afdbbf9e8ee7c4b485e665
 DIST ros_control-0.11.1.tar.gz 634118 SHA256 72cf017ce1de3a645e62c7f1c034c4acaa2d3bc1d81da73b9c3b6027f89a48e8 SHA512 2ac330025e0740637a3143e6a783d5fdaf33567314a48b50a736e9fbc032b2ea153d002b5a2e1aad8fe2e88ddc9b61f6f5bcbecbf63471cf325c3acdf0dd999f WHIRLPOOL 200717b61336c9fdf9aa9ac640789dbdd68f7da4b90c49390e95fe2dee4731bebea549ce3343a714c6593c097fee08e531a01a0b4b909aba1cb742860c5b80d5
 EBUILD joint_limits_interface-0.11.0-r1.ebuild 528 SHA256 5822e1347e7ae5b31c827be8801373403e25ff72a3f278223e7bbb807996b330 SHA512 83739d301693336797b443581766f20648cea3769871ea94773af1c930f3ec2062e62efad43ee762501f69634faa46563d3230539f53af0a952170955e31b1d8 WHIRLPOOL d0303d9ac5b270bdfe3b07e37a9fc91e4d459bca0a2a5c261a805a6405f46bb5142c89a6955e2a383de8b00b2704fe2453f9eaed552f2a8eae3ff592a0fc83bc
-EBUILD joint_limits_interface-0.11.1.ebuild 483 SHA256 1b3f69cbe72b92342a09524b7d3c50d13555b227873d8589b25f88555a8e55e7 SHA512 4dbb2aabcfb602a3a9066f9db563e8b123a3373032166bcbad500bc42a38ed1534b213ce06c5ce27191aff43f364772768fe9eadb012e9c1423f80dc5a97193c WHIRLPOOL fcf981fa292c4423645853456d2e179267062664ac5639514c05607a551f0e8357686b2956817fc63e49ed283f5644d97bdf317df9c81e319bcba1fb712be0b1
+EBUILD joint_limits_interface-0.11.1-r1.ebuild 528 SHA256 5822e1347e7ae5b31c827be8801373403e25ff72a3f278223e7bbb807996b330 SHA512 83739d301693336797b443581766f20648cea3769871ea94773af1c930f3ec2062e62efad43ee762501f69634faa46563d3230539f53af0a952170955e31b1d8 WHIRLPOOL d0303d9ac5b270bdfe3b07e37a9fc91e4d459bca0a2a5c261a805a6405f46bb5142c89a6955e2a383de8b00b2704fe2453f9eaed552f2a8eae3ff592a0fc83bc
 EBUILD joint_limits_interface-9999.ebuild 483 SHA256 7d894cc20ebe066ebe644fd9f1a7351e385ea1352025b4186c92a8b8564df80f SHA512 6a045f7a991e3a770c076d79a3a92e1afda984557638de7c9757f34fb9e124cbb83ea28ee364fd066d1ad6fe003b6eb1c67be8f1d6f7bf610fa18d2a623b3b42 WHIRLPOOL d7707e057ac522c56b7f15573dcf43f38b08066abc37beca454cffd72ab4beb53499eac5648bc589c97fead4e1b272bc90b03ba1ba3888e968be26e6b7674f52
-MISC ChangeLog 2727 SHA256 aec3f4b6db431773d4edd755719c957ec943b932a2a3ed39a023099fb8606795 SHA512 b38d634516aab9b4348956128243fcd712482877980275df011b595492081c9bf1f01d5704d3a023b3d7acf457e839554c70ab32f2a0957b0b6f9d6ad6bd5646 WHIRLPOOL e749ae36be1969d9fc01aa37e7a3d5ca488ba5ffbaf55c0c2d645ad1773eae8469fb9e9207ad0b8ef62a262448ff9b158d7f49d6ad5192c2801087b3129a6e44
+MISC ChangeLog 2984 SHA256 4130b89feaab5588daac5573af108be88f94f38ed1f1d552e482a27d39cca2c2 SHA512 387e71008083dfaa24db021392f24ce569410d885a460901e760b92d7361fc161f531d83e4203dffe10232ec3214c279816ea193a78e13605eb1e33dc6714f52 WHIRLPOOL 0bebf92e7ec64ea0f0aa991b34cc44b0e697048c6cd159d00e3bd5d958ccbaab883ee9c7c72ac813aec99934cd5f7157a69ccd259d65890fc53f0f09a557aee2
 MISC metadata.xml 338 SHA256 36b994e970003f63fc6e94ff020934d45d831b3ab7039b51f17c2e87e90b4d94 SHA512 7421fdc9a470e8ad0fa85cfece8dd02db2790e8718508de2e9e57c8788452c0323c5ac339b49c01c3478ebb35e134de9a2adaebc7744f1e61e66635fdb7edb10 WHIRLPOOL da488313fc78451dd5b629e71ad581dd92d1b1a6f85cb3474d7ebf26d7c73aa356718568a4d8d76ff5e79b5f34cb819effa1a5c12fbdb3bca8365951491b7fe3
diff --git a/dev-ros/joint_limits_interface/joint_limits_interface-0.11.1.ebuild b/dev-ros/joint_limits_interface/joint_limits_interface-0.11.1-r1.ebuild
similarity index 88%
rename from dev-ros/joint_limits_interface/joint_limits_interface-0.11.1.ebuild
rename to dev-ros/joint_limits_interface/joint_limits_interface-0.11.1-r1.ebuild
index 0f9aa3cf3703..2a65e6da8629 100644
--- a/dev-ros/joint_limits_interface/joint_limits_interface-0.11.1.ebuild
+++ b/dev-ros/joint_limits_interface/joint_limits_interface-0.11.1-r1.ebuild
@@ -18,7 +18,8 @@ IUSE=""
 RDEPEND="
 	dev-ros/roscpp
 	dev-ros/hardware_interface
-	dev-libs/urdfdom
+	>=dev-libs/urdfdom-1
 "
 DEPEND="${RDEPEND}
 	test? ( dev-ros/rostest dev-cpp/gtest )"
+PATCHES=( "${FILESDIR}/urdfdom1.patch" )
diff --git a/dev-ros/mavros_extras/ChangeLog b/dev-ros/mavros_extras/ChangeLog
index 1c5011398b27..8c5f7e440be4 100644
--- a/dev-ros/mavros_extras/ChangeLog
+++ b/dev-ros/mavros_extras/ChangeLog
@@ -164,3 +164,19 @@
 
   Package-Manager: portage-2.3.0
 
+  06 Oct 2016; Alexis Ballier <aballier@gentoo.org>
+  -mavros_extras-0.17.2.ebuild, -mavros_extras-0.17.3.ebuild,
+  -mavros_extras-0.18.1.ebuild, -mavros_extras-0.18.2.ebuild:
+  remove old
+
+  Package-Manager: portage-2.3.1
+
+*mavros_extras-0.18.3-r1 (06 Oct 2016)
+
+  06 Oct 2016; Alexis Ballier <aballier@gentoo.org>
+  -mavros_extras-0.18.3.ebuild, +mavros_extras-0.18.3-r1.ebuild,
+  mavros_extras-9999.ebuild:
+  add missing dep on boost
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-ros/mavros_extras/Manifest b/dev-ros/mavros_extras/Manifest
index e799e3acfad0..41471c854fe5 100644
--- a/dev-ros/mavros_extras/Manifest
+++ b/dev-ros/mavros_extras/Manifest
@@ -1,13 +1,5 @@
-DIST mavros-0.17.2.tar.gz 201320 SHA256 d968733575777efbb3e6c396967d5dd82a42cee18f4fd54e47aef2833ff6ebad SHA512 c174a3caeed406aa7778365ce96f410c32d5ce2ee3d4ff039d283e242392e71543daea175184b35f8cee7000aa1b0491a8696c11661c3b8af3f37e39ce0f50e2 WHIRLPOOL e9242e9ba28bc65c254e245375cfa143f33e3864ec916212088c87e86fedf0c7466e2b0c2febf7564e45dc05251dba186169cadd8cf8222668d0088ad34d2014
-DIST mavros-0.17.3.tar.gz 201861 SHA256 32da0be2d9f59f4eafb8a583ad9eba5aea44f776a47d5a54625f2915b0bb1aad SHA512 054e0268750ba6622e0af6ba2e60c9f71b10c7fc4836bed3f1037b9abc386beb9c21d5ee3abacfee7b5a7140f377a07d5414d612c5b744ae9bf5d0cec680b8d7 WHIRLPOOL afc195c8743cda6afed8ac8f5745599ecdddc988c3978349d3b18c7d34353e89b309a34e80422ff7f601830e88beda3d42e94453022210928692ebba730392a5
-DIST mavros-0.18.1.tar.gz 208459 SHA256 8c8c5560145b261276f9f129c55298d8a9772b96e1d5ffa082fcc1709515dccb SHA512 0567a098f6429f9a76c2e2d24daf4267e59af126df689eafa9fad7846b5af90511481b3e7de011cb6746a98490a34ae558cbe1edf195414479d548377cfc050b WHIRLPOOL 5909b5e558c98044dfadf8febe1072d1de6dc78e6d415e69dc26ef9ea3d8512647945cf68c590abd7242d6a222d04b0f15a6f5d894d0eb4e98b9ca4236166774
-DIST mavros-0.18.2.tar.gz 208727 SHA256 347f88483be19ea8fc7da1ecd32e49874e2eb92750958c8b001120164194d524 SHA512 d5f667f321f6d988224315e7cdd9f435c3c49e0b97dde0b5cd30c124e9778b48304edfbd51789cdd97e1ca449a9fda407c25d9530daa0f4e2f2df1088ced16ff WHIRLPOOL 515242aca0ae43e164150a661b97498d5e3f89ad622eb9bdedecf22ecffa5243032b483cfea1c8b0310c6c20a282cf442a1830fc71f5d7894f29f45f97892d30
 DIST mavros-0.18.3.tar.gz 209081 SHA256 dfe679d49fe31f25d373c877a8d6656c7eb90274b325715df691ace0d1f98654 SHA512 f4608ca150b21099259559afa264d852e5a066986c3c0bd9b02b327a58b0f5c0bf769f02fadfde3d37292426f4deab263e1f10b850085b47cde76290b08e18df WHIRLPOOL 3d20f8acb3bd5943414543cfb6dc904ff41d20ff248b04664337ddcf7ea8fe026d7a93ad4ac54221a95d553e00d58203cebe9b44c9462d6f79d5e6bace613356
-EBUILD mavros_extras-0.17.2.ebuild 861 SHA256 8101f202ac8d2255e750ad9ae9225df7ead85ac65277ccb6a5409b2e0167b7dd SHA512 12f7f20c4a01df65eead4923e04cfd03da383c53dbdcba3454e7b7618016f8fcfecb48b522bed70153fbbca9e8e85549cef8c10ad1a592fcd620111f21904537 WHIRLPOOL 520117456379465d376fc7c88f04e9612e152bebc1722d5e554bfb3e4c31b57a9c13431adb9e5bb328468be8fc1befc4e359ba7c6d64678e2a08a3edd42eeea8
-EBUILD mavros_extras-0.17.3.ebuild 861 SHA256 971398bfdc08ac1e870e528ea3aec109446e20e0f09e34792047bbee86178d54 SHA512 fa590c46881e7ecf6c3f6a7aca8a671b3c1fe6ddbe1d2e5e4a2392fb177fcfd09302d1732e704b8aff55895bc450d94814dbbbad1099f9de535463c8997ec844 WHIRLPOOL 15c4c88f5433fce5eebcb57d28b718cbaf9c06f907169dd24e0d0916c8e0dffb345cc001f241c0a95c4a532e072d4820a8977a26019afe1860bb720f514a5243
-EBUILD mavros_extras-0.18.1.ebuild 861 SHA256 971398bfdc08ac1e870e528ea3aec109446e20e0f09e34792047bbee86178d54 SHA512 fa590c46881e7ecf6c3f6a7aca8a671b3c1fe6ddbe1d2e5e4a2392fb177fcfd09302d1732e704b8aff55895bc450d94814dbbbad1099f9de535463c8997ec844 WHIRLPOOL 15c4c88f5433fce5eebcb57d28b718cbaf9c06f907169dd24e0d0916c8e0dffb345cc001f241c0a95c4a532e072d4820a8977a26019afe1860bb720f514a5243
-EBUILD mavros_extras-0.18.2.ebuild 861 SHA256 971398bfdc08ac1e870e528ea3aec109446e20e0f09e34792047bbee86178d54 SHA512 fa590c46881e7ecf6c3f6a7aca8a671b3c1fe6ddbe1d2e5e4a2392fb177fcfd09302d1732e704b8aff55895bc450d94814dbbbad1099f9de535463c8997ec844 WHIRLPOOL 15c4c88f5433fce5eebcb57d28b718cbaf9c06f907169dd24e0d0916c8e0dffb345cc001f241c0a95c4a532e072d4820a8977a26019afe1860bb720f514a5243
-EBUILD mavros_extras-0.18.3.ebuild 861 SHA256 971398bfdc08ac1e870e528ea3aec109446e20e0f09e34792047bbee86178d54 SHA512 fa590c46881e7ecf6c3f6a7aca8a671b3c1fe6ddbe1d2e5e4a2392fb177fcfd09302d1732e704b8aff55895bc450d94814dbbbad1099f9de535463c8997ec844 WHIRLPOOL 15c4c88f5433fce5eebcb57d28b718cbaf9c06f907169dd24e0d0916c8e0dffb345cc001f241c0a95c4a532e072d4820a8977a26019afe1860bb720f514a5243
-EBUILD mavros_extras-9999.ebuild 861 SHA256 8101f202ac8d2255e750ad9ae9225df7ead85ac65277ccb6a5409b2e0167b7dd SHA512 12f7f20c4a01df65eead4923e04cfd03da383c53dbdcba3454e7b7618016f8fcfecb48b522bed70153fbbca9e8e85549cef8c10ad1a592fcd620111f21904537 WHIRLPOOL 520117456379465d376fc7c88f04e9612e152bebc1722d5e554bfb3e4c31b57a9c13431adb9e5bb328468be8fc1befc4e359ba7c6d64678e2a08a3edd42eeea8
-MISC ChangeLog 4676 SHA256 b237251166deb1bd2537d6b2323d20825080261863ea641488c100b633743db3 SHA512 4fe4c26f71f366352e3e0de38f6e58a12d356e5c865fbd181ef078bc474d1596b9815d9c4f09e02fcb6c52305507e85e3d20e3afedf3ad585b317039b325ca5c WHIRLPOOL b320fe131f131a4ea8867650fa85f4d1d7a8d30f8af3cbc4e5d6605ecad293d14295f92325ae38861085173661853384017633f1bd2979725c8fa9c3920eab55
+EBUILD mavros_extras-0.18.3-r1.ebuild 879 SHA256 3da5021fe3eaeb15c0ec56733c1fb769b6be013275e70cae78d59c85a3090c67 SHA512 c4dad4d075e170918bf50ef5b3bca7893ea7a94828bffce70a9c3a59ea8c1db2307bdba5d299a6352114e56fe00b3312311580914b35f89ade88029b907e196c WHIRLPOOL 68f2916effa8fe0e1fb9b3b3613eb7141b78f1a2055e5954380af6fc1c9f63c43eb38238832c4e86c2cd23e4b7917c27a49d11600b102e036967066f07918a39
+EBUILD mavros_extras-9999.ebuild 879 SHA256 3da5021fe3eaeb15c0ec56733c1fb769b6be013275e70cae78d59c85a3090c67 SHA512 c4dad4d075e170918bf50ef5b3bca7893ea7a94828bffce70a9c3a59ea8c1db2307bdba5d299a6352114e56fe00b3312311580914b35f89ade88029b907e196c WHIRLPOOL 68f2916effa8fe0e1fb9b3b3613eb7141b78f1a2055e5954380af6fc1c9f63c43eb38238832c4e86c2cd23e4b7917c27a49d11600b102e036967066f07918a39
+MISC ChangeLog 5148 SHA256 dbbe907e032d555e39ed2d78e73dbea5ecbc5222dc3d6fd27867c38257c946e9 SHA512 9182bea1092717ef83b17779802d4aaee3f0f11c8d6b1ff5ea285f56c52b20e5cadce88ab8d50368a01df74d5a7ecd0c685f65b1e952d64227e1c7d1354f7aa5 WHIRLPOOL ea87310d6667938347dfb0da85cde01d1a75f49921e18900cede1cbe38b7547fcab5aec0024332da01948281fb6273879d726a66c44e83b2a7acaa4fd42aee16
 MISC metadata.xml 328 SHA256 7c83ca644dc16469397550eba7c71098074abbcb7a0226c2764324743c9f01b6 SHA512 a4d2ca220b3dea64853e31e188202fdde1e3533d50659e8c5b8593a1067bf88dcd7f6881e8691f91c99d8502e8739ffa13c5bcead139763109ff304736328b2e WHIRLPOOL 607322ded8c476fca21678a480dc17ea1f2d6d2e99c12cb9afc1c0175b2d5d4638603c211393fa31f8018719160b778bc19920df801833f2559be39a29611d7e
diff --git a/dev-ros/mavros_extras/mavros_extras-0.17.2.ebuild b/dev-ros/mavros_extras/mavros_extras-0.17.2.ebuild
deleted file mode 100644
index 562281398552..000000000000
--- a/dev-ros/mavros_extras/mavros_extras-0.17.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/mavlink/mavros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Extra nodes and plugins for mavros"
-LICENSE="GPL-3 LGPL-3 BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/image_transport
-	dev-ros/cv_bridge
-	dev-ros/mavros
-	dev-ros/roscpp
-	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/urdf
-	dev-cpp/eigen:3
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros_extras/mavros_extras-0.17.3.ebuild b/dev-ros/mavros_extras/mavros_extras-0.17.3.ebuild
deleted file mode 100644
index 8d253e3799a9..000000000000
--- a/dev-ros/mavros_extras/mavros_extras-0.17.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/mavlink/mavros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Extra nodes and plugins for mavros"
-LICENSE="GPL-3 LGPL-3 BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/image_transport
-	dev-ros/cv_bridge
-	dev-ros/mavros
-	dev-ros/roscpp
-	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/urdf
-	dev-cpp/eigen:3
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros_extras/mavros_extras-0.18.2.ebuild b/dev-ros/mavros_extras/mavros_extras-0.18.2.ebuild
deleted file mode 100644
index 8d253e3799a9..000000000000
--- a/dev-ros/mavros_extras/mavros_extras-0.18.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/mavlink/mavros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Extra nodes and plugins for mavros"
-LICENSE="GPL-3 LGPL-3 BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/image_transport
-	dev-ros/cv_bridge
-	dev-ros/mavros
-	dev-ros/roscpp
-	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/urdf
-	dev-cpp/eigen:3
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros_extras/mavros_extras-0.18.1.ebuild b/dev-ros/mavros_extras/mavros_extras-0.18.3-r1.ebuild
similarity index 97%
rename from dev-ros/mavros_extras/mavros_extras-0.18.1.ebuild
rename to dev-ros/mavros_extras/mavros_extras-0.18.3-r1.ebuild
index 8d253e3799a9..af9e276b62c6 100644
--- a/dev-ros/mavros_extras/mavros_extras-0.18.1.ebuild
+++ b/dev-ros/mavros_extras/mavros_extras-0.18.3-r1.ebuild
@@ -27,5 +27,6 @@ RDEPEND="
 	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/urdf
 	dev-cpp/eigen:3
+	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros_extras/mavros_extras-0.18.3.ebuild b/dev-ros/mavros_extras/mavros_extras-0.18.3.ebuild
deleted file mode 100644
index 8d253e3799a9..000000000000
--- a/dev-ros/mavros_extras/mavros_extras-0.18.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/mavlink/mavros"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Extra nodes and plugins for mavros"
-LICENSE="GPL-3 LGPL-3 BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/image_transport
-	dev-ros/cv_bridge
-	dev-ros/mavros
-	dev-ros/roscpp
-	dev-ros/mavros_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/urdf
-	dev-cpp/eigen:3
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/mavros_extras/mavros_extras-9999.ebuild b/dev-ros/mavros_extras/mavros_extras-9999.ebuild
index 562281398552..af9e276b62c6 100644
--- a/dev-ros/mavros_extras/mavros_extras-9999.ebuild
+++ b/dev-ros/mavros_extras/mavros_extras-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$
 
@@ -27,5 +27,6 @@ RDEPEND="
 	dev-ros/visualization_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/urdf
 	dev-cpp/eigen:3
+	dev-libs/boost:=
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/move_base/ChangeLog b/dev-ros/move_base/ChangeLog
index 82fd26f1b6b4..68812d0a22a0 100644
--- a/dev-ros/move_base/ChangeLog
+++ b/dev-ros/move_base/ChangeLog
@@ -59,3 +59,9 @@
 
   Package-Manager: portage-2.3.0_rc1
 
+  06 Oct 2016; Alexis Ballier <aballier@gentoo.org> -move_base-1.13.0.ebuild,
+  -move_base-1.13.1.ebuild:
+  remove old
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-ros/move_base/Manifest b/dev-ros/move_base/Manifest
index 0a3e3dd05e0f..d722ed253943 100644
--- a/dev-ros/move_base/Manifest
+++ b/dev-ros/move_base/Manifest
@@ -1,9 +1,5 @@
-DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd
-DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb
 DIST navigation-1.14.0.tar.gz 340196 SHA256 3974bb52af21cf0a6e4da8eb231b3101b4c5da700793bdac1cdc97e69d6e5cac SHA512 8ac2048be6d06be1f137aab2e73c5c724e794b9e6125fa70e2283df3790200f7b5203bae12c46e0796523ae58a4f8ede79fd0c1afc09a306a99f450576c7b11a WHIRLPOOL 12e8b7f5043a9473033df772021c3ebae1cdf87bde52988874489e490e7dfdcb07623c588ffd1297fbbd3fc336813fc6f4e9ae812dc80dfcad3062cceb82ef0b
-EBUILD move_base-1.13.0.ebuild 693 SHA256 96a2d28f11629461c26bcad176c2f024b296106ca62293363c98dc4326860bae SHA512 0b7079abe46ca2e71fd54d231db7ed13f282e46d76df92cfd28f95b2a23fe517f5d28e069ab4de1b9c44b0ce9ae01c50c0a72a064e69fef9c2ea9bcda0ceb5b4 WHIRLPOOL 2146486653a516b15ee1e18ac6394d9f977c8ba58c90dc1d86c30b8cc83f303a761777a6169d037f792af0a6891500261fd610e0511ef9ce4f433bea07c5921b
-EBUILD move_base-1.13.1.ebuild 722 SHA256 08d36556ba30d128ccf87d39de7e658150a14b002fffb50f530ea71d18889e89 SHA512 0122216df38d851d9e4f8eff9299fb2f03a04bf668633f62ac43aec36316bc5de8323f48fb44e543de07063a8c37f247226303260c45cb424eb6946b7a0f7ee8 WHIRLPOOL ee208d19dbe055f98bbab853638ca5af41b920e98011f8d7f74b59451cbaf7480898f831d59929c7acb70503fe7c23fa424281f06b3a382ac86dfb0f14460534
 EBUILD move_base-1.14.0.ebuild 722 SHA256 06829483539f4116cd635c8fc7b362adcaf03061adb039aef738144e8dc81907 SHA512 d5337d9c424766f3f93c11c604817278372701896ffc87d871ac69e100caf4b9f1f8a963fea6ca39c57bfc9526783f2c1794f57191b2056aee4bda65cf477ac2 WHIRLPOOL 6a493df0038bdcef991a5bc1ed52d89ddc2876e9d3048bb2ce221d5851413f7b7bc7402021dd74cbd90011a2e3f59b2c3418624d607b3426aeabb5cbb53baf33
 EBUILD move_base-9999.ebuild 722 SHA256 08d36556ba30d128ccf87d39de7e658150a14b002fffb50f530ea71d18889e89 SHA512 0122216df38d851d9e4f8eff9299fb2f03a04bf668633f62ac43aec36316bc5de8323f48fb44e543de07063a8c37f247226303260c45cb424eb6946b7a0f7ee8 WHIRLPOOL ee208d19dbe055f98bbab853638ca5af41b920e98011f8d7f74b59451cbaf7480898f831d59929c7acb70503fe7c23fa424281f06b3a382ac86dfb0f14460534
-MISC ChangeLog 1990 SHA256 8dc5c63d2640919e685d95388e93e3ae8ee6bd5132bc1d9462020c3eb978bfa3 SHA512 561bf8cb8785c6e39390c62c16ccf943841612311f24e14dbf73cf09d7f72461042a0c5cc87fa9129315b6c44b399251a439a1df53ce74c3638a873c7a2ec49c WHIRLPOOL f6d86300fd9926cf18cf8f76b093353c64d70bd1ec8fedbd84b4988fc2479e8843ed9af100ffcf07fc2bd7a9a23ce631c20ed4a539b4308b109433f3081119cc
+MISC ChangeLog 2144 SHA256 1d168f27ef3a8ce2378c918060ffa5c5832908b7c1454c5774087656992faf0c SHA512 20628e77be42c903a8834d0f111d5571e86aec2856504f4efd698a82a10513acee7694073ce888153b0478c5da27fc4bfec5f07a1aadef099241a09bd17f4571 WHIRLPOOL 86dd96a39ed938961a5197428b3c3a585158daa58f0bf30e08f59d59368acf5847cd346031f4ebf5e7a21f709791f6d074868a9fec93266412a66d2e796ca640
 MISC metadata.xml 337 SHA256 a90ded2c003033ad4057df2eba71c9fc0a76a721e3f998dc578c29eef4ada1f1 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e WHIRLPOOL a0198030c632c4ed9a5b5d09027e0a463b5ecfee3f2cfbb1c7f5ebd18f77e9f9600c1f8d30f456c27b3866b8170348c96203a734a0e844a593369f0f92501e79
diff --git a/dev-ros/move_base/move_base-1.13.0.ebuild b/dev-ros/move_base/move_base-1.13.0.ebuild
deleted file mode 100644
index 3a687a8c2c2e..000000000000
--- a/dev-ros/move_base/move_base-1.13.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Given a goal in the world, will attempt to reach it with a mobile base"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/pluginlib
-	dev-ros/actionlib
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/nav_core
-	dev-ros/tf
-	dev-ros/move_base_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules"
diff --git a/dev-ros/move_base/move_base-1.13.1.ebuild b/dev-ros/move_base/move_base-1.13.1.ebuild
deleted file mode 100644
index fec8a930b0c0..000000000000
--- a/dev-ros/move_base/move_base-1.13.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Given a goal in the world, will attempt to reach it with a mobile base"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-ros/costmap_2d-1.13.1
-	dev-ros/roscpp
-	dev-ros/pluginlib
-	dev-ros/actionlib
-	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
-	dev-ros/nav_core
-	dev-ros/tf
-	dev-ros/move_base_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-cpp/eigen:3
-"
-DEPEND="${RDEPEND}
-	dev-ros/cmake_modules"
diff --git a/dev-ros/navfn/ChangeLog b/dev-ros/navfn/ChangeLog
index 568c2bc0c5f4..63d40f1b52ec 100644
--- a/dev-ros/navfn/ChangeLog
+++ b/dev-ros/navfn/ChangeLog
@@ -61,3 +61,16 @@
 
   Package-Manager: portage-2.3.0_rc1
 
+  06 Oct 2016; Alexis Ballier <aballier@gentoo.org> -navfn-1.13.1-r1.ebuild:
+  remove old
+
+  Package-Manager: portage-2.3.1
+
+*navfn-1.14.0-r1 (06 Oct 2016)
+
+  06 Oct 2016; Alexis Ballier <aballier@gentoo.org> -navfn-1.14.0.ebuild,
+  +navfn-1.14.0-r1.ebuild, navfn-9999.ebuild:
+  add missing dep on boost
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-ros/navfn/Manifest b/dev-ros/navfn/Manifest
index 47061ae166c9..3e6b6a0908dc 100644
--- a/dev-ros/navfn/Manifest
+++ b/dev-ros/navfn/Manifest
@@ -1,8 +1,6 @@
 AUX pgm_h_location.patch 900 SHA256 8b40ca6e9933b2c9e04144b21801783ac95e15f0fe63be3564c0573fd1a5eb17 SHA512 4c3286e18d922d292858e8fc574cc440c344ae182133539efca93cb25e16dc78149efe521499024751a46f2b4d1b63516276f1e0510028114357520d4a560d81 WHIRLPOOL 2d90a8f20d6879f5aeae03e8c7ff8665f0d8ae9d75bd0f5b3f98c526632b58076a372155f68a358797de8f3e843fbe22bf6325a5687239b03b240aa9e0e09e42
-DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb
 DIST navigation-1.14.0.tar.gz 340196 SHA256 3974bb52af21cf0a6e4da8eb231b3101b4c5da700793bdac1cdc97e69d6e5cac SHA512 8ac2048be6d06be1f137aab2e73c5c724e794b9e6125fa70e2283df3790200f7b5203bae12c46e0796523ae58a4f8ede79fd0c1afc09a306a99f450576c7b11a WHIRLPOOL 12e8b7f5043a9473033df772021c3ebae1cdf87bde52988874489e490e7dfdcb07623c588ffd1297fbbd3fc336813fc6f4e9ae812dc80dfcad3062cceb82ef0b
-EBUILD navfn-1.13.1-r1.ebuild 866 SHA256 b21ef764d595b2d1edf6825a6665ce405ab1d686ab061e27769810fa1f04e611 SHA512 203a46d6bd7127e53bfb14863cdf3ce4847a4782e6192062aa89ad081b5d0e1f9faae560528cf1d95a7ebd46a1396ea98715b895d3a19cdb57bd2e23e5c60e5f WHIRLPOOL f97785fa2f081f68bda4bd0234241c47fdfaca2ee5c170c534787010f988012ab79fae7e34cb6876c016dbaeb958a5a5b4a2ba9ddd609ef108ddb45b25425749
-EBUILD navfn-1.14.0.ebuild 866 SHA256 fbf179020463b6c8685f2ae77915ab0eaf654aceeb78e499b81fc83288838a92 SHA512 72196068b67babfb65adb3b74007c28a4fb7bdd40d95fc79040ba74b8a8e15b10cf8d61e1be0541befb61c38aaf90002a17e1412f04417870a899e7e6014b144 WHIRLPOOL 4707f80323fe76792880ed618c1ff87330cdcb8639fe7f8602c9976fd8a8089f005879cdb2232cd148062cfe482492623d5424e2ab03625932b31ebf8b91595b
-EBUILD navfn-9999.ebuild 866 SHA256 b21ef764d595b2d1edf6825a6665ce405ab1d686ab061e27769810fa1f04e611 SHA512 203a46d6bd7127e53bfb14863cdf3ce4847a4782e6192062aa89ad081b5d0e1f9faae560528cf1d95a7ebd46a1396ea98715b895d3a19cdb57bd2e23e5c60e5f WHIRLPOOL f97785fa2f081f68bda4bd0234241c47fdfaca2ee5c170c534787010f988012ab79fae7e34cb6876c016dbaeb958a5a5b4a2ba9ddd609ef108ddb45b25425749
-MISC ChangeLog 1982 SHA256 ee9140e190b03892eee2304719f1faf5d026c024c9ef4510261d89966aa50fbf SHA512 d5d1f2081bd810f320e50c11213ce60a799da7964c63575f9192f1cc8e2168a20d688d3f2fe58824a52f10906b66e18cbb337a6786d49f54e221bb137ce3af7a WHIRLPOOL f1db9a5861e736cf6cda6e9310c46fc044d7afbafbf436aea0be975c849c908e47a9e6751015c78d87abd0b31e7865e9e25a78a24a72595e4e727ed173fc6855
+EBUILD navfn-1.14.0-r1.ebuild 893 SHA256 44990d2ae89bfa66cb187423ac151ea0d165b27439db42009d835ae30d1c0b77 SHA512 59690ee7df857b3c41f3b7de0d5d2d5c8bf9bbfcb57ef05c77df83542ac1610c678934bb4b022bdb3280e61b55518213a405d7e6002c5364b202414290edf2a2 WHIRLPOOL 2cce53a956785ac2fae188d89b1a76a295d19d05abb96d56aa7911816e65f48682c0e62cddc679b8be761e9ab8d5198e89a2677302f4a68409dc8841e70953d3
+EBUILD navfn-9999.ebuild 893 SHA256 44990d2ae89bfa66cb187423ac151ea0d165b27439db42009d835ae30d1c0b77 SHA512 59690ee7df857b3c41f3b7de0d5d2d5c8bf9bbfcb57ef05c77df83542ac1610c678934bb4b022bdb3280e61b55518213a405d7e6002c5364b202414290edf2a2 WHIRLPOOL 2cce53a956785ac2fae188d89b1a76a295d19d05abb96d56aa7911816e65f48682c0e62cddc679b8be761e9ab8d5198e89a2677302f4a68409dc8841e70953d3
+MISC ChangeLog 2321 SHA256 f62cee732fafbfee78296fe37bf62962e17e87dce77d1ed77eef5edc8824c7fd SHA512 c24c9d23770d5631a07ddbff4f31a0cb397fba9670c08a77d9070ce3c9a8a303fea3a0456e7167715e811371ce6657a573c5d59998ee384ab3d2606dc874b4c6 WHIRLPOOL 993da1ca2a0c6dd1b6f202855380dad98732ae5c5a5675a417b6c4065208c54367d4c44db4e8dfc6defde14c0970f6a98c6c38b22290fd1dfb9510aafb548abb
 MISC metadata.xml 337 SHA256 a90ded2c003033ad4057df2eba71c9fc0a76a721e3f998dc578c29eef4ada1f1 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e WHIRLPOOL a0198030c632c4ed9a5b5d09027e0a463b5ecfee3f2cfbb1c7f5ebd18f77e9f9600c1f8d30f456c27b3866b8170348c96203a734a0e844a593369f0f92501e79
diff --git a/dev-ros/navfn/navfn-1.13.1-r1.ebuild b/dev-ros/navfn/navfn-1.13.1-r1.ebuild
deleted file mode 100644
index 134e9c8c59f5..000000000000
--- a/dev-ros/navfn/navfn-1.13.1-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs dev-ros/nav_msgs"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="Fast interpolated navigation function that can be used to create plans for a mobile base"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/costmap_2d
-	dev-ros/nav_core
-	dev-ros/pcl_conversions
-	dev-ros/pcl_ros
-	dev-ros/pluginlib
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/visualization_msgs
-	dev-cpp/eigen:3
-	sci-libs/pcl
-	x11-libs/fltk
-	media-libs/netpbm
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-	dev-ros/cmake_modules"
-
-PATCHES=( "${FILESDIR}/pgm_h_location.patch" )
diff --git a/dev-ros/navfn/navfn-1.14.0.ebuild b/dev-ros/navfn/navfn-1.14.0-r1.ebuild
similarity index 96%
rename from dev-ros/navfn/navfn-1.14.0.ebuild
rename to dev-ros/navfn/navfn-1.14.0-r1.ebuild
index aed266a40880..a570be09eba7 100644
--- a/dev-ros/navfn/navfn-1.14.0.ebuild
+++ b/dev-ros/navfn/navfn-1.14.0-r1.ebuild
@@ -30,6 +30,7 @@ RDEPEND="
 	sci-libs/pcl
 	x11-libs/fltk
 	media-libs/netpbm
+	dev-libs/boost:=[threads]
 "
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )
diff --git a/dev-ros/navfn/navfn-9999.ebuild b/dev-ros/navfn/navfn-9999.ebuild
index 134e9c8c59f5..a570be09eba7 100644
--- a/dev-ros/navfn/navfn-9999.ebuild
+++ b/dev-ros/navfn/navfn-9999.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$
 
@@ -30,6 +30,7 @@ RDEPEND="
 	sci-libs/pcl
 	x11-libs/fltk
 	media-libs/netpbm
+	dev-libs/boost:=[threads]
 "
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest )
diff --git a/dev-ros/pcl_ros/ChangeLog b/dev-ros/pcl_ros/ChangeLog
index 73f4e9e39668..18b256f9aa7a 100644
--- a/dev-ros/pcl_ros/ChangeLog
+++ b/dev-ros/pcl_ros/ChangeLog
@@ -77,3 +77,11 @@
 
   Package-Manager: portage-2.3.0
 
+*pcl_ros-1.4.1-r2 (06 Oct 2016)
+
+  06 Oct 2016; Alexis Ballier <aballier@gentoo.org> -pcl_ros-1.4.1-r1.ebuild,
+  +pcl_ros-1.4.1-r2.ebuild, pcl_ros-9999.ebuild:
+  add missing dep on boost
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-ros/pcl_ros/Manifest b/dev-ros/pcl_ros/Manifest
index afb576990e63..56f9ea64a07c 100644
--- a/dev-ros/pcl_ros/Manifest
+++ b/dev-ros/pcl_ros/Manifest
@@ -1,5 +1,5 @@
 DIST perception_pcl-1.4.1.tar.gz 66440 SHA256 7400179978c8314210bb770979246e7583274229044085452a20d6cc22507776 SHA512 550300f1bd7bb718371b9725f9d48f4337e6d7175bdfc4a8a116a17da24609a363c804f11224efde6c9f62a6cca648425872017e9a90371a34f808c305f50f50 WHIRLPOOL 46eb7d4234471b6c63f4d4dd195dfcd6b3615ff308386bc9c0dda7cc2c50daebc9019aa0411521594ab1381b83ea32a6a5bbcc76470e7b3e7d09b554f63f91af
-EBUILD pcl_ros-1.4.1-r1.ebuild 874 SHA256 73d5bfb620b98fa14326cef1423cb85c5dc195c094f32dc98ffe59eace99b83f SHA512 fa47ee22fa5dc88bb163bdf7bca25517bcdb03989717689ea596f6928847bf68606a75b453449d9ac1aea5f24325ee3555f2fb82a7fc1df21b845f0645cefa29 WHIRLPOOL 02487d926f701ac23b7282c6a54ee93ae0b617eb43551b913f156d8703d50c592a2abf55a63fbe780adb3893cdf73e4bb44eb3cd2c1eb44b7b2b5f0d60d7aa07
-EBUILD pcl_ros-9999.ebuild 874 SHA256 73d5bfb620b98fa14326cef1423cb85c5dc195c094f32dc98ffe59eace99b83f SHA512 fa47ee22fa5dc88bb163bdf7bca25517bcdb03989717689ea596f6928847bf68606a75b453449d9ac1aea5f24325ee3555f2fb82a7fc1df21b845f0645cefa29 WHIRLPOOL 02487d926f701ac23b7282c6a54ee93ae0b617eb43551b913f156d8703d50c592a2abf55a63fbe780adb3893cdf73e4bb44eb3cd2c1eb44b7b2b5f0d60d7aa07
-MISC ChangeLog 2404 SHA256 d9bcb5ad76c34a020f179d4421f219c29cd7a17f45bb08523e0e6a88c6a538f0 SHA512 74f71e9ffb61ee9a2c8ba835eaa95c92e9b809fdc8c7b1951457d459b66c120eccf36ecffbb13c7fc8b450bf0752c02167a44feee26f3c3f392f0e6fcc565082 WHIRLPOOL 6ce3a05c7cc35f8b308f18e029df0966cea1474551744d0b9e0a86bae0b26e12e7e34182cb65a8d5ca77c0a45c6fee082b90c835d7233d743aa326845b6b2394
+EBUILD pcl_ros-1.4.1-r2.ebuild 901 SHA256 37c710579367bd95cea07969e398f666ee73d96f62ee6f42cde54c908e629986 SHA512 5ee091dfbf99f45bf6ee29e11b53f13fee7d8ae5b6e5bb0b4ea35a89089c3ad9dddc41a98fbc3060d8d6a3eb18fa1dcc972195d390cf43278789fa65ee7fbf3f WHIRLPOOL bcf1b70757a75b1c9bc12a57fa2fbfcfcd4db2ee14f749df59b3d8ba6a2740bb11827ae6f573e663fe00405d0ec2ad2637b620cf363498204b81bb6d1a12eddd
+EBUILD pcl_ros-9999.ebuild 901 SHA256 37c710579367bd95cea07969e398f666ee73d96f62ee6f42cde54c908e629986 SHA512 5ee091dfbf99f45bf6ee29e11b53f13fee7d8ae5b6e5bb0b4ea35a89089c3ad9dddc41a98fbc3060d8d6a3eb18fa1dcc972195d390cf43278789fa65ee7fbf3f WHIRLPOOL bcf1b70757a75b1c9bc12a57fa2fbfcfcd4db2ee14f749df59b3d8ba6a2740bb11827ae6f573e663fe00405d0ec2ad2637b620cf363498204b81bb6d1a12eddd
+MISC ChangeLog 2626 SHA256 863cef0f609cd0718a2e2781cc47f87bb22eda7bccfd942faa4cb934d7575693 SHA512 03d99db9ba60b71cadfe2345f9df04656b39012aa2d58c902347860d1ea3b3d8a623c97bd094210444071266399f896d7b7d2916c974fa626165403e0e986610 WHIRLPOOL 2af9ee5205fedcb0237b17a83644665e3e63a9436f06f7e4d225efc0c2b52c7cbebe46dc302c12b11684ccecaa9e3c82f7f4cbfd0a61f87a8fd6fa2ef3b93179
 MISC metadata.xml 343 SHA256 42e9676686a81b22b8d8b4525d9029687227e1e84b3a6eab0e974a15d4de7c15 SHA512 43909c26691d29a183729bab2d2e9a9639d779a5b23816705064083d11275e687097e8da8c33d952312a1eaeed42a24d4a0bfd74a9ccae08a199acec0ca4a585 WHIRLPOOL ecf5be81202d0b5af7d20b95ac40437bb0be5b147b7e4f305b20e0ce1c13f8075b1260ca4322eddfdbb72927b57c8f361d87c1d92d2cb2c0312d79eacbdd0739
diff --git a/dev-ros/pcl_ros/pcl_ros-1.4.1-r1.ebuild b/dev-ros/pcl_ros/pcl_ros-1.4.1-r2.ebuild
similarity index 97%
rename from dev-ros/pcl_ros/pcl_ros-1.4.1-r1.ebuild
rename to dev-ros/pcl_ros/pcl_ros-1.4.1-r2.ebuild
index b9567e837bb7..c3bb11b08d0e 100644
--- a/dev-ros/pcl_ros/pcl_ros-1.4.1-r1.ebuild
+++ b/dev-ros/pcl_ros/pcl_ros-1.4.1-r2.ebuild
@@ -31,6 +31,7 @@ RDEPEND="
 	dev-ros/nodelet_topic_tools
 	sci-libs/pcl:=[qhull]
 	>=dev-ros/pcl_conversions-0.2.1-r1
+	dev-libs/boost:=[threads]
 	dev-ros/pcl_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
diff --git a/dev-ros/pcl_ros/pcl_ros-9999.ebuild b/dev-ros/pcl_ros/pcl_ros-9999.ebuild
index b9567e837bb7..c3bb11b08d0e 100644
--- a/dev-ros/pcl_ros/pcl_ros-9999.ebuild
+++ b/dev-ros/pcl_ros/pcl_ros-9999.ebuild
@@ -31,6 +31,7 @@ RDEPEND="
 	dev-ros/nodelet_topic_tools
 	sci-libs/pcl:=[qhull]
 	>=dev-ros/pcl_conversions-0.2.1-r1
+	dev-libs/boost:=[threads]
 	dev-ros/pcl_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
diff --git a/dev-ros/robot_pose_ekf/ChangeLog b/dev-ros/robot_pose_ekf/ChangeLog
index 3959ac1aaa33..b60149654073 100644
--- a/dev-ros/robot_pose_ekf/ChangeLog
+++ b/dev-ros/robot_pose_ekf/ChangeLog
@@ -49,3 +49,15 @@
 
   Package-Manager: portage-2.3.0_rc1
 
+  06 Oct 2016; Alexis Ballier <aballier@gentoo.org>
+  -robot_pose_ekf-1.13.0.ebuild, -robot_pose_ekf-1.13.1.ebuild:
+  remove old
+
+  Package-Manager: portage-2.3.1
+
+  06 Oct 2016; Alexis Ballier <aballier@gentoo.org>
+  robot_pose_ekf-1.14.0.ebuild, robot_pose_ekf-9999.ebuild:
+  add missing dep on boost
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-ros/robot_pose_ekf/Manifest b/dev-ros/robot_pose_ekf/Manifest
index 3652ba117dda..4ad04213aee6 100644
--- a/dev-ros/robot_pose_ekf/Manifest
+++ b/dev-ros/robot_pose_ekf/Manifest
@@ -1,9 +1,5 @@
-DIST navigation-1.13.0.tar.gz 336419 SHA256 5ef288325a0de4accfb4ef0cc37d9e9c4106a05d98b0ae5757f6c4823abada97 SHA512 1b686d4d1e930901dcf899fb73c8609855c3bb6d797322f6f3b9ea7ccb349f98802870b44e0fcbee4e68abebeecbaff57d453dc790fbc908cd23b8afda22e1af WHIRLPOOL 096103d8b774205995a12d294c820187fb89302285b363f6e6b9a4bb1e30a2edf9b33a451effc00b8aeec4d8f40664f61266314d389b9c668c0d7cf2152f70dd
-DIST navigation-1.13.1.tar.gz 335568 SHA256 aaafdc6ee41ce79f44c03710076a105411b96dfcf35a7816607cbd0f48c8e8bc SHA512 969ce141dacc3ec8c249769a861c44a8d061bfb24c1fc63bd2873b589b11581f93e3faf3292f4db5daff89100859e05451d38278f859cb527adf55405d8f536e WHIRLPOOL f4161eb7e357384cebd2f40ead98ac559d16b055a81aee1898bfa23259d42fc88978abec195af62f4a227030b200a5a9ca79079693ebc6f3a3eb1a9d5cfb7dbb
 DIST navigation-1.14.0.tar.gz 340196 SHA256 3974bb52af21cf0a6e4da8eb231b3101b4c5da700793bdac1cdc97e69d6e5cac SHA512 8ac2048be6d06be1f137aab2e73c5c724e794b9e6125fa70e2283df3790200f7b5203bae12c46e0796523ae58a4f8ede79fd0c1afc09a306a99f450576c7b11a WHIRLPOOL 12e8b7f5043a9473033df772021c3ebae1cdf87bde52988874489e490e7dfdcb07623c588ffd1297fbbd3fc336813fc6f4e9ae812dc80dfcad3062cceb82ef0b
-EBUILD robot_pose_ekf-1.13.0.ebuild 790 SHA256 d68c8fc144683f966f15ccd64dc7a4531891c227eef65c758c02eb8113aadb5b SHA512 2290b115b5f14a503c3338c4a9cba4e89c724fb1391ac0ee5431d85e1af44d4578b834fdb72bc8c858b1cf9e52d3b2260e5ca1ad495879f03d7a09b302e0b659 WHIRLPOOL 6356db38b353c524f56484ac28077d69a873e8e5b2db3d3302bc21dc2e211094845e74093f0324996b1faece9b15936138e90e162f2364ef93f6dd660236c13f
-EBUILD robot_pose_ekf-1.13.1.ebuild 790 SHA256 d68c8fc144683f966f15ccd64dc7a4531891c227eef65c758c02eb8113aadb5b SHA512 2290b115b5f14a503c3338c4a9cba4e89c724fb1391ac0ee5431d85e1af44d4578b834fdb72bc8c858b1cf9e52d3b2260e5ca1ad495879f03d7a09b302e0b659 WHIRLPOOL 6356db38b353c524f56484ac28077d69a873e8e5b2db3d3302bc21dc2e211094845e74093f0324996b1faece9b15936138e90e162f2364ef93f6dd660236c13f
-EBUILD robot_pose_ekf-1.14.0.ebuild 790 SHA256 7da495dace1f60590b200e8fa89782c579e470f72c19ca80bd97fae580dfbeb4 SHA512 b645cf148f6ee97be17fcb89ff3c5eed0fbbbfcebd369a88b5f6d6654e39fd6f3d39a381040646f27323d25f535269dea8848234f75fd51600140a78ab5b0d45 WHIRLPOOL af08595b619d3912697a7871e177a4d3cd274e8d099216f3b3a2ce6f5dc273d17602bbde4090597e37e7441bc707236f20d2bea5365165e38f4bd4220672e6fc
-EBUILD robot_pose_ekf-9999.ebuild 790 SHA256 d68c8fc144683f966f15ccd64dc7a4531891c227eef65c758c02eb8113aadb5b SHA512 2290b115b5f14a503c3338c4a9cba4e89c724fb1391ac0ee5431d85e1af44d4578b834fdb72bc8c858b1cf9e52d3b2260e5ca1ad495879f03d7a09b302e0b659 WHIRLPOOL 6356db38b353c524f56484ac28077d69a873e8e5b2db3d3302bc21dc2e211094845e74093f0324996b1faece9b15936138e90e162f2364ef93f6dd660236c13f
-MISC ChangeLog 1671 SHA256 1ce4c54fa1eaf53390807b5b0d3e8c83753863ce369ffa400030cc987f2b1317 SHA512 adddad141edeb05601fcc35400b718b9a3c5e710ed2f0e4fa56e0b7cb4dff6e432e655450a20d52414b1e657b70098b310538d727dd4081a13b5d0097259249c WHIRLPOOL c7515a375c384c96e6a3bc379f5cab3f44a6f846f658e496d92eb76b4e5e2611f309858605bc4f281fe63e94544bbde210621ff0431d96a9119b453ee3cd47be
+EBUILD robot_pose_ekf-1.14.0.ebuild 817 SHA256 5f442804d2359ee8f04225b27fb71f50f7bed36ec8c5eb67968f37f593da4386 SHA512 47ab3095446c6cb2551860055063b6d6853321aabc40f99c26d93ddbc1c0bd5141523e19f49575da125c1121795d90ad45988d1c12ddd99cbdac4c981fb8f4ec WHIRLPOOL 8ffd9ead9c94a3f457fd1d15c05f6da5d221b58588a3b5700271f821b96fa0ad5c5fa0676d6ca84d6adfa4e31dfd13d4723bc4daff64addbbf83e0313132e743
+EBUILD robot_pose_ekf-9999.ebuild 817 SHA256 5f442804d2359ee8f04225b27fb71f50f7bed36ec8c5eb67968f37f593da4386 SHA512 47ab3095446c6cb2551860055063b6d6853321aabc40f99c26d93ddbc1c0bd5141523e19f49575da125c1121795d90ad45988d1c12ddd99cbdac4c981fb8f4ec WHIRLPOOL 8ffd9ead9c94a3f457fd1d15c05f6da5d221b58588a3b5700271f821b96fa0ad5c5fa0676d6ca84d6adfa4e31dfd13d4723bc4daff64addbbf83e0313132e743
+MISC ChangeLog 2009 SHA256 6992941b5c92dd9dfa703973db5aadff86c69eac4f9142fa0e6752c40cd3770d SHA512 f5c7922a2c39e984da67d7b512ebf3edd3a35288a10bb04fe05814d8f0e22ded83f6d907693d514031341158c373fb8e3faf71d8d4b43224cbd1ca0c46a6fb9d WHIRLPOOL 2926a2abab6ae27308f649ba1cbeaab69141944d51341b21d9b22f117d028e8fbcde17db754009203024920769b121f7d48e74b08e7c89bb202541e7a664605d
 MISC metadata.xml 337 SHA256 a90ded2c003033ad4057df2eba71c9fc0a76a721e3f998dc578c29eef4ada1f1 SHA512 f5df7464100fa15a3d2ad11cc620007500a5cb5ea7be67ac45819a541dd4ae53ce476231d475acf4dfe7e7bf0c31281325dc4e003867d1cc01a29353bb5ea09e WHIRLPOOL a0198030c632c4ed9a5b5d09027e0a463b5ecfee3f2cfbb1c7f5ebd18f77e9f9600c1f8d30f456c27b3866b8170348c96203a734a0e844a593369f0f92501e79
diff --git a/dev-ros/robot_pose_ekf/robot_pose_ekf-1.13.0.ebuild b/dev-ros/robot_pose_ekf/robot_pose_ekf-1.13.0.ebuild
deleted file mode 100644
index a2c43b164175..000000000000
--- a/dev-ros/robot_pose_ekf/robot_pose_ekf-1.13.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Estimate the 3D pose of a robot, based on (partial) pose measurements coming from different sources"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	sci-libs/orocos-bfl
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )
-	virtual/pkgconfig"
diff --git a/dev-ros/robot_pose_ekf/robot_pose_ekf-1.13.1.ebuild b/dev-ros/robot_pose_ekf/robot_pose_ekf-1.13.1.ebuild
deleted file mode 100644
index a2c43b164175..000000000000
--- a/dev-ros/robot_pose_ekf/robot_pose_ekf-1.13.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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/navigation"
-ROS_SUBDIR=${PN}
-KEYWORDS="~amd64 ~arm"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Estimate the 3D pose of a robot, based on (partial) pose measurements coming from different sources"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/roscpp
-	dev-ros/tf
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	sci-libs/orocos-bfl
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )
-	virtual/pkgconfig"
diff --git a/dev-ros/robot_pose_ekf/robot_pose_ekf-1.14.0.ebuild b/dev-ros/robot_pose_ekf/robot_pose_ekf-1.14.0.ebuild
index ca5764768460..2fb12aad305e 100644
--- a/dev-ros/robot_pose_ekf/robot_pose_ekf-1.14.0.ebuild
+++ b/dev-ros/robot_pose_ekf/robot_pose_ekf-1.14.0.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	sci-libs/orocos-bfl
+	dev-libs/boost:=[threads]
 "
 DEPEND="${RDEPEND}
 	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )
diff --git a/dev-ros/robot_pose_ekf/robot_pose_ekf-9999.ebuild b/dev-ros/robot_pose_ekf/robot_pose_ekf-9999.ebuild
index a2c43b164175..2fb12aad305e 100644
--- a/dev-ros/robot_pose_ekf/robot_pose_ekf-9999.ebuild
+++ b/dev-ros/robot_pose_ekf/robot_pose_ekf-9999.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$
 
@@ -24,6 +24,7 @@ RDEPEND="
 	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	sci-libs/orocos-bfl
+	dev-libs/boost:=[threads]
 "
 DEPEND="${RDEPEND}
 	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )
diff --git a/dev-ros/stereo_image_proc/ChangeLog b/dev-ros/stereo_image_proc/ChangeLog
index 95b41e9c45be..a8a097183aab 100644
--- a/dev-ros/stereo_image_proc/ChangeLog
+++ b/dev-ros/stereo_image_proc/ChangeLog
@@ -67,3 +67,19 @@
 
   Package-Manager: portage-2.3.0
 
+*stereo_image_proc-1.12.19-r1 (06 Oct 2016)
+
+  06 Oct 2016; Alexis Ballier <aballier@gentoo.org>
+  -stereo_image_proc-1.12.19.ebuild, +stereo_image_proc-1.12.19-r1.ebuild,
+  stereo_image_proc-9999.ebuild:
+  add missing dep on boost
+
+  Package-Manager: portage-2.3.1
+
+  06 Oct 2016; Alexis Ballier <aballier@gentoo.org>
+  -stereo_image_proc-1.12.14.ebuild, -stereo_image_proc-1.12.15.ebuild,
+  -stereo_image_proc-1.12.16.ebuild, -stereo_image_proc-1.12.18.ebuild:
+  remove old
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-ros/stereo_image_proc/Manifest b/dev-ros/stereo_image_proc/Manifest
index 32be5c91e65f..61747f9487c0 100644
--- a/dev-ros/stereo_image_proc/Manifest
+++ b/dev-ros/stereo_image_proc/Manifest
@@ -1,13 +1,5 @@
-DIST image_pipeline-1.12.14.tar.gz 118296 SHA256 8e3b756932a821b4387b7f86ca9fc5233ebb2a13541b220b866e42ea6f92b17f SHA512 724b6d20edab1436c51a05f4399b852cabab74c5e04dea97f53a256fb512b4dbfc97fd6e7d74d41bfd7d92fe183aa86a993a39b8687c27dc7b7f85d1a1c81b94 WHIRLPOOL 394343ddf299f6c7e26c0a2f45e49edc2c4047a0ccd15885a998fa902bb7373fa44181f06adc222483a285f32df800e0b268485cb2fd98e54956929056868d5d
-DIST image_pipeline-1.12.15.tar.gz 122012 SHA256 d9660a5929b69b7801b3a05e092c7a4a5543d45084c9198fdaa9c8a0210db76c SHA512 184805f99020332ad74899ec47abc56144aceef8d4eabf877a4dc85f30befdc78b209407e1be624ba151be3a71be1fafdbd87c771137bee7c080c24935f6c6fa WHIRLPOOL d9ceff4b34767e33fe8eae49076fae133dd8146c2b09fb3ce42c0c902c6d95a06cb990e5f543dfb0215a18b0592193d65c782a45301c18e4f8a34fb35e509449
-DIST image_pipeline-1.12.16.tar.gz 126407 SHA256 af0d7e43de48457ca591c4908d5771c116d2838b4bc64fbe49efaa371f44b5b4 SHA512 2e1b77a6267fef2925396b36c8d3fdabcf8c0e61043bbeb066f0923bba867c3f63a9da4a9829d26c502af70ad7ab3dcda6cca14628accc472010af8df4b1153e WHIRLPOOL b746861c95475cadf64a7e0f70f9cad62148a4d6ed8616347812c433244ef6df367bf122089794bf4669b23707dd1718961002fa46516e7ff1ce8ebe3da1b2a2
-DIST image_pipeline-1.12.18.tar.gz 127899 SHA256 7f356c7a020d4acf5acd2973180cf356329186606586bd37f8103597a0312b05 SHA512 9a9d671d31d3c6a9343836fa8c7a5566fb9e032330dbc57adeab35510263aca0482a8a8413716e79c49e2e187c3892ab200c92435e8797d4b69e3332771b64da WHIRLPOOL eed95a909a7a9b99cf313ceea4417a80d433f6b6d24053e4f6705993899d5c2b9fd14ef7ad2b07bf584c79a83f45b232b259f3cd8e3eeedcd61d17449667fe47
 DIST image_pipeline-1.12.19.tar.gz 130635 SHA256 fc3073428fc930523efd6ed4a86d838ab0f0ff04a312eb4188c72a854d300e97 SHA512 f0677e4a811622ffc19792af828f4766408b6a051d271950a8a096d064b043dae1457b2a6f2d59fe5c2971795db04e7abf5e0878ead1428a4da19033693829ba WHIRLPOOL ecb1cdcc07109d3781bb82e88c0fe7e91754b2dfac0bfc7f5d053e6df9ce78b95b4131a9b65715fbce1b44b0acab6f833bd9c0d4f2fb68718fee4f4bfd586c63
-EBUILD stereo_image_proc-1.12.14.ebuild 698 SHA256 2b39f6784e404250afa7ce0142e1caacc2860e05a00ed1ec7193cf94f10d0902 SHA512 08ecc4a5aa0d575df3260c7be12da71db16150f3e336af9c60a86c77a61e99d7dfb45eda5b8e687454f7619508ce0b8ef0a13fd91fc0333990c80bdd9f0e4e10 WHIRLPOOL 9e443f82f798c81444c77186f0b16c10069ab8dcd6f16e8562e50c0ab273d32c316a02b6cf3f34e80e305340592d87a17944f37dc4be98be7286421cca0b5f24
-EBUILD stereo_image_proc-1.12.15.ebuild 698 SHA256 2b39f6784e404250afa7ce0142e1caacc2860e05a00ed1ec7193cf94f10d0902 SHA512 08ecc4a5aa0d575df3260c7be12da71db16150f3e336af9c60a86c77a61e99d7dfb45eda5b8e687454f7619508ce0b8ef0a13fd91fc0333990c80bdd9f0e4e10 WHIRLPOOL 9e443f82f798c81444c77186f0b16c10069ab8dcd6f16e8562e50c0ab273d32c316a02b6cf3f34e80e305340592d87a17944f37dc4be98be7286421cca0b5f24
-EBUILD stereo_image_proc-1.12.16.ebuild 698 SHA256 2b39f6784e404250afa7ce0142e1caacc2860e05a00ed1ec7193cf94f10d0902 SHA512 08ecc4a5aa0d575df3260c7be12da71db16150f3e336af9c60a86c77a61e99d7dfb45eda5b8e687454f7619508ce0b8ef0a13fd91fc0333990c80bdd9f0e4e10 WHIRLPOOL 9e443f82f798c81444c77186f0b16c10069ab8dcd6f16e8562e50c0ab273d32c316a02b6cf3f34e80e305340592d87a17944f37dc4be98be7286421cca0b5f24
-EBUILD stereo_image_proc-1.12.18.ebuild 698 SHA256 305b57f19c51f17257fe664cedc235c9abd1b9d985e807c84c07c773d81e1003 SHA512 6b458241a5f491a7a9d472ce6c74eb686586185d2a9f777408b922aeb66f4d14239923d32bc547d3ae6e2ef524d8687b1cd74cf001f7b6174f209f38acbe6232 WHIRLPOOL c42f113faf21a3533bc6e9a4e2e5657b59b75e4986334e68ce52ce035de05ad46ceb83b451e6fb835c6cd12e800c052f47f71dc39e05bf316a6a51252078eaae
-EBUILD stereo_image_proc-1.12.19.ebuild 698 SHA256 305b57f19c51f17257fe664cedc235c9abd1b9d985e807c84c07c773d81e1003 SHA512 6b458241a5f491a7a9d472ce6c74eb686586185d2a9f777408b922aeb66f4d14239923d32bc547d3ae6e2ef524d8687b1cd74cf001f7b6174f209f38acbe6232 WHIRLPOOL c42f113faf21a3533bc6e9a4e2e5657b59b75e4986334e68ce52ce035de05ad46ceb83b451e6fb835c6cd12e800c052f47f71dc39e05bf316a6a51252078eaae
-EBUILD stereo_image_proc-9999.ebuild 698 SHA256 2b39f6784e404250afa7ce0142e1caacc2860e05a00ed1ec7193cf94f10d0902 SHA512 08ecc4a5aa0d575df3260c7be12da71db16150f3e336af9c60a86c77a61e99d7dfb45eda5b8e687454f7619508ce0b8ef0a13fd91fc0333990c80bdd9f0e4e10 WHIRLPOOL 9e443f82f798c81444c77186f0b16c10069ab8dcd6f16e8562e50c0ab273d32c316a02b6cf3f34e80e305340592d87a17944f37dc4be98be7286421cca0b5f24
-MISC ChangeLog 2181 SHA256 cc3506949f04623a7c1ad593da87f94285eb5dc95bf86acb12d19c7267eec175 SHA512 bb928042d0a33bbc51adf2990c07713df6d25dacd3d6d181dbdb651b144f8eff7c10bc02070e808e52a71a9968bddfd19e573baa3f5a2f6c6cb4d15950178bdc WHIRLPOOL 6beb76556061914c99909d7a06cc20fa00e1204217838e13cfb63834fd419659b23fbdc3be7dc54b558d51c52794086a5866830a1053b6acaa1d1a42e01e0101
+EBUILD stereo_image_proc-1.12.19-r1.ebuild 725 SHA256 20b29a0facad89238ba4212d38811fc37ad7854e94030e84d5c4d5f3e51a0541 SHA512 2b179ec9ab245df3bcc3b38db1a0675517c0d9b288cdae84044963610ebe1e2f9f0fe010603aca17b3c8fd5b41f54daa0cfe06223d699c80604db15fe2855113 WHIRLPOOL 477d30b21d1e519d33026b26881d3303ab5fa4987eb90a3fc617e7a824d58fd899dd335532bc55069a64c819786febb885c2f7789f5b83a5191d680d05d66381
+EBUILD stereo_image_proc-9999.ebuild 725 SHA256 20b29a0facad89238ba4212d38811fc37ad7854e94030e84d5c4d5f3e51a0541 SHA512 2b179ec9ab245df3bcc3b38db1a0675517c0d9b288cdae84044963610ebe1e2f9f0fe010603aca17b3c8fd5b41f54daa0cfe06223d699c80604db15fe2855113 WHIRLPOOL 477d30b21d1e519d33026b26881d3303ab5fa4987eb90a3fc617e7a824d58fd899dd335532bc55069a64c819786febb885c2f7789f5b83a5191d680d05d66381
+MISC ChangeLog 2692 SHA256 ff4495d9f076e6161948893f18b3caa50534ee384c7b04bc564cb5860f2a077c SHA512 102d215a60c469f3e71ea928089652e77f6f06b1425542c8aba87a34f9a39bcabe15c12db7e29b5a0569fcfa474d422c180931a2deb5378863a1658ae02f129e WHIRLPOOL cd990a3a1d3edf149476fe7c31aaf651d6c373f30dc0c684a326a943a304e5f0719df57085f324b0fba3a57d21ce877fe58c42e6cf9699e1cf5199bc7d7e8b41
 MISC metadata.xml 343 SHA256 b288e9937c65e8042a7bb2d292b33d8e74b88a2e06f9d802819a8ccbe4143f0f SHA512 c16dd878a20c747d32f8445c8eb454b51ffaf8543c1f722cca0e6508d849107e89a2cda92b0d206ef618ae1075d51e542c4178e903f3cb35efd285a5fff0cfcb WHIRLPOOL 612f7cca04475ed4e748c66fedf993d68e4c06849a10574e2b405afe940c2aff53cc846779e6ebdc80dfec5cf827276d35478a227941f0ddc7058f09fa2141d5
diff --git a/dev-ros/stereo_image_proc/stereo_image_proc-1.12.14.ebuild b/dev-ros/stereo_image_proc/stereo_image_proc-1.12.14.ebuild
deleted file mode 100644
index 2cb657c09b27..000000000000
--- a/dev-ros/stereo_image_proc/stereo_image_proc-1.12.14.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Stereo and single image rectification and disparity processing"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure
-	dev-ros/image_geometry
-	dev-ros/image_proc
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	media-libs/opencv
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/stereo_image_proc/stereo_image_proc-1.12.15.ebuild b/dev-ros/stereo_image_proc/stereo_image_proc-1.12.15.ebuild
deleted file mode 100644
index 2cb657c09b27..000000000000
--- a/dev-ros/stereo_image_proc/stereo_image_proc-1.12.15.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Stereo and single image rectification and disparity processing"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure
-	dev-ros/image_geometry
-	dev-ros/image_proc
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	media-libs/opencv
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/stereo_image_proc/stereo_image_proc-1.12.16.ebuild b/dev-ros/stereo_image_proc/stereo_image_proc-1.12.16.ebuild
deleted file mode 100644
index 2cb657c09b27..000000000000
--- a/dev-ros/stereo_image_proc/stereo_image_proc-1.12.16.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Stereo and single image rectification and disparity processing"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure
-	dev-ros/image_geometry
-	dev-ros/image_proc
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	media-libs/opencv
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/stereo_image_proc/stereo_image_proc-1.12.18.ebuild b/dev-ros/stereo_image_proc/stereo_image_proc-1.12.19-r1.ebuild
similarity index 96%
rename from dev-ros/stereo_image_proc/stereo_image_proc-1.12.18.ebuild
rename to dev-ros/stereo_image_proc/stereo_image_proc-1.12.19-r1.ebuild
index 710fa4083263..a180aaa9d27a 100644
--- a/dev-ros/stereo_image_proc/stereo_image_proc-1.12.18.ebuild
+++ b/dev-ros/stereo_image_proc/stereo_image_proc-1.12.19-r1.ebuild
@@ -26,5 +26,6 @@ RDEPEND="
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	media-libs/opencv
+	dev-libs/boost:=[threads]
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/stereo_image_proc/stereo_image_proc-1.12.19.ebuild b/dev-ros/stereo_image_proc/stereo_image_proc-1.12.19.ebuild
deleted file mode 100644
index 710fa4083263..000000000000
--- a/dev-ros/stereo_image_proc/stereo_image_proc-1.12.19.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-ROS_REPO_URI="https://github.com/ros-perception/image_pipeline"
-KEYWORDS="~amd64 ~arm"
-PYTHON_COMPAT=( python2_7 )
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="Stereo and single image rectification and disparity processing"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/cv_bridge
-	dev-ros/dynamic_reconfigure
-	dev-ros/image_geometry
-	dev-ros/image_proc
-	dev-ros/image_transport
-	dev-ros/message_filters
-	dev-ros/nodelet
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	media-libs/opencv
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/stereo_image_proc/stereo_image_proc-9999.ebuild b/dev-ros/stereo_image_proc/stereo_image_proc-9999.ebuild
index 2cb657c09b27..a180aaa9d27a 100644
--- a/dev-ros/stereo_image_proc/stereo_image_proc-9999.ebuild
+++ b/dev-ros/stereo_image_proc/stereo_image_proc-9999.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$
 
@@ -26,5 +26,6 @@ RDEPEND="
 	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/stereo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	media-libs/opencv
+	dev-libs/boost:=[threads]
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2/ChangeLog b/dev-ros/tf2/ChangeLog
index 5e5c164ad5e1..abbf2357cea9 100644
--- a/dev-ros/tf2/ChangeLog
+++ b/dev-ros/tf2/ChangeLog
@@ -41,3 +41,8 @@
   Package-Manager: portage-2.2.27
   Signed-off-by: Alexis Ballier <aballier@gentoo.org>
 
+  06 Oct 2016; Alexis Ballier <aballier@gentoo.org> -tf2-0.5.12.ebuild:
+  remove old
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-ros/tf2/Manifest b/dev-ros/tf2/Manifest
index 20e236e316f6..dd373adaa2c6 100644
--- a/dev-ros/tf2/Manifest
+++ b/dev-ros/tf2/Manifest
@@ -1,7 +1,5 @@
-DIST geometry_experimental-0.5.12.tar.gz 131234 SHA256 430115ef4a3352e8b00596ff7406e6cb14fc1720250cf164754cf724c7f371c3 SHA512 1a1a33db529d0810661c020552642d914de01a14e5b17b611fb7743a795c47e3f68d480ee4544b4ad86f7b1c947ea8b23cda09535ce046fdc45da1c40fc34711 WHIRLPOOL fd894a43e0110eeab1f085faa32a339a72d922d57ae68ee82c2b54f73c246090f3537483f1ca68147f5b7b7a5c7502f9fd4ab733da150c68af94ea2d87859ab1
 DIST geometry_experimental-0.5.13.tar.gz 134107 SHA256 20ad7d3b610c70e8c666937d6a29ef53dac9181025427ee6d0664c67ff94b43f SHA512 5b31a2ec2c8f852934c1c9a6aa0127c96b8f334f178742111c673195562a240649ac11ddde8d9738defae99184bdd83a57430fe6f17eb4cbd08ae600bfa7d43d WHIRLPOOL 06da030383725aaeda8626f36b56911cc05c025b538904f33cdc69975027f610113945a3479d85fe83df841fcb1f4902b8927cae2a2272e44f59b86c97d844fc
-EBUILD tf2-0.5.12.ebuild 540 SHA256 39cd7ed8cc3e8c7aad5e00cbf1fc2a76c5eed2d8e2e770709d985bc7dbc83ebe SHA512 df547059adafcc8d07d4133a879854a544c99b212966f4e33b3153d5fa9e1de347e0f5ee76a325d82c90e6e7e37e19b7bccac0deaf58a4b46099168b7add3536 WHIRLPOOL fc4f570e78459cca9a79e7cd1ed9a7527a3af36dbd94587d55748c1a08c09ec6518b207f95335c123273dd8ed3219e398af38ec11a290f8430cb80bcfd6983e5
 EBUILD tf2-0.5.13.ebuild 540 SHA256 39cd7ed8cc3e8c7aad5e00cbf1fc2a76c5eed2d8e2e770709d985bc7dbc83ebe SHA512 df547059adafcc8d07d4133a879854a544c99b212966f4e33b3153d5fa9e1de347e0f5ee76a325d82c90e6e7e37e19b7bccac0deaf58a4b46099168b7add3536 WHIRLPOOL fc4f570e78459cca9a79e7cd1ed9a7527a3af36dbd94587d55748c1a08c09ec6518b207f95335c123273dd8ed3219e398af38ec11a290f8430cb80bcfd6983e5
 EBUILD tf2-9999.ebuild 540 SHA256 39cd7ed8cc3e8c7aad5e00cbf1fc2a76c5eed2d8e2e770709d985bc7dbc83ebe SHA512 df547059adafcc8d07d4133a879854a544c99b212966f4e33b3153d5fa9e1de347e0f5ee76a325d82c90e6e7e37e19b7bccac0deaf58a4b46099168b7add3536 WHIRLPOOL fc4f570e78459cca9a79e7cd1ed9a7527a3af36dbd94587d55748c1a08c09ec6518b207f95335c123273dd8ed3219e398af38ec11a290f8430cb80bcfd6983e5
-MISC ChangeLog 1466 SHA256 16b882987bb47665486e31c66a9666030d5bfa0f65ff659645f0645bcca91901 SHA512 fad0268ac5c833beac9aa1573aa42da421622f417ea2c5610a02e2f32e6f4b2f4baed88cbe100347bf96d8f33cd11b9092e300d24c71670768ebbf62ad293cca WHIRLPOOL c209041420021d473e2c685f2d0268af7f6777d8a1ca894e6b641067b2e0d77ae8c3ef7c6257dedcd7c61001d35edf5c06ecd627c210a2884497dad0469d835d
+MISC ChangeLog 1586 SHA256 078a1fabe2ac044abdb8fe246e944e2528ec6ab406ff9f1079a457bf4de9b639 SHA512 468cd3320267a712e4a9c01f633584517ec33c00cac99aefb4868c4a5700a91b3a2cf8289187130c785b4e0c360a4f3a773054916755ba8d88c9b834c7064ad5 WHIRLPOOL 9c0cc9c2c5ccf7e1ee21f9ccfa14c588eb7ed34af03596c05f2e77f57e67439b76dbae1b4d76f68e7529c6c220a91b5d2fb7fa81c8ea9a7dc6bc9638d57ec935
 MISC metadata.xml 339 SHA256 0d38a857b1dbc1a7c4dc149e52cf1fc3ed197f39ddf672f9b4de44e6db0881f6 SHA512 70bde02b98edb10a9340db05de2bac26828bafd43be3fe2796a4cc8c115b409eac13c0eecd0ecb038f49f6eaa2bd6588671afff450fef02c0301356323216d51 WHIRLPOOL 8d9ebb45a28ee3532531f25f24da05baf5a24e447a64aea77987fd005bf51d912b0f18e1cbc46a6550ffeaf698ddb208b8647d3dc93456b6106a05cdff08dc40
diff --git a/dev-ros/tf2/tf2-0.5.12.ebuild b/dev-ros/tf2/tf2-0.5.12.ebuild
deleted file mode 100644
index 932df2ccb859..000000000000
--- a/dev-ros/tf2/tf2-0.5.12.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# 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/geometry_experimental"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-
-inherit ros-catkin
-
-DESCRIPTION="The second generation Transform Library in ROS"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/console_bridge
-	dev-ros/rostime
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-libs/boost:=[threads]
-"
-DEPEND="${RDEPEND}"
diff --git a/dev-ros/tf2_ros/ChangeLog b/dev-ros/tf2_ros/ChangeLog
index 25ae0dd693ff..e55a5a94d028 100644
--- a/dev-ros/tf2_ros/ChangeLog
+++ b/dev-ros/tf2_ros/ChangeLog
@@ -41,3 +41,16 @@
   Package-Manager: portage-2.2.27
   Signed-off-by: Alexis Ballier <aballier@gentoo.org>
 
+  06 Oct 2016; Alexis Ballier <aballier@gentoo.org> -tf2_ros-0.5.12.ebuild:
+  remove old
+
+  Package-Manager: portage-2.3.1
+
+*tf2_ros-0.5.13-r1 (06 Oct 2016)
+
+  06 Oct 2016; Alexis Ballier <aballier@gentoo.org> -tf2_ros-0.5.13.ebuild,
+  +tf2_ros-0.5.13-r1.ebuild, tf2_ros-9999.ebuild:
+  add missing dep on boost
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-ros/tf2_ros/Manifest b/dev-ros/tf2_ros/Manifest
index 252e9ab281ce..c458d7bf9a71 100644
--- a/dev-ros/tf2_ros/Manifest
+++ b/dev-ros/tf2_ros/Manifest
@@ -1,7 +1,5 @@
-DIST geometry_experimental-0.5.12.tar.gz 131234 SHA256 430115ef4a3352e8b00596ff7406e6cb14fc1720250cf164754cf724c7f371c3 SHA512 1a1a33db529d0810661c020552642d914de01a14e5b17b611fb7743a795c47e3f68d480ee4544b4ad86f7b1c947ea8b23cda09535ce046fdc45da1c40fc34711 WHIRLPOOL fd894a43e0110eeab1f085faa32a339a72d922d57ae68ee82c2b54f73c246090f3537483f1ca68147f5b7b7a5c7502f9fd4ab733da150c68af94ea2d87859ab1
 DIST geometry_experimental-0.5.13.tar.gz 134107 SHA256 20ad7d3b610c70e8c666937d6a29ef53dac9181025427ee6d0664c67ff94b43f SHA512 5b31a2ec2c8f852934c1c9a6aa0127c96b8f334f178742111c673195562a240649ac11ddde8d9738defae99184bdd83a57430fe6f17eb4cbd08ae600bfa7d43d WHIRLPOOL 06da030383725aaeda8626f36b56911cc05c025b538904f33cdc69975027f610113945a3479d85fe83df841fcb1f4902b8927cae2a2272e44f59b86c97d844fc
-EBUILD tf2_ros-0.5.12.ebuild 855 SHA256 02cbe4a1c95098b9b29a2dca4570829ae891256876aa94f4746278e3d58224a7 SHA512 5f82417c94ffb41e0efa587f3fa3520d4fd262c9a277195c510935b41c9e3a0128a2cf372e3a4d5ed0341dcfb0dc1c4dc28155b30f66faf6c27e58ada882b4af WHIRLPOOL 26e2bee8719ca7a8514e19af4f5d5c448a9cc5b79234c23fcf334f70b8bc87e73af71ff5148a0dfcbb3043570402da3021d680355b3263db06e1bc1bfc34126b
-EBUILD tf2_ros-0.5.13.ebuild 855 SHA256 02cbe4a1c95098b9b29a2dca4570829ae891256876aa94f4746278e3d58224a7 SHA512 5f82417c94ffb41e0efa587f3fa3520d4fd262c9a277195c510935b41c9e3a0128a2cf372e3a4d5ed0341dcfb0dc1c4dc28155b30f66faf6c27e58ada882b4af WHIRLPOOL 26e2bee8719ca7a8514e19af4f5d5c448a9cc5b79234c23fcf334f70b8bc87e73af71ff5148a0dfcbb3043570402da3021d680355b3263db06e1bc1bfc34126b
-EBUILD tf2_ros-9999.ebuild 855 SHA256 02cbe4a1c95098b9b29a2dca4570829ae891256876aa94f4746278e3d58224a7 SHA512 5f82417c94ffb41e0efa587f3fa3520d4fd262c9a277195c510935b41c9e3a0128a2cf372e3a4d5ed0341dcfb0dc1c4dc28155b30f66faf6c27e58ada882b4af WHIRLPOOL 26e2bee8719ca7a8514e19af4f5d5c448a9cc5b79234c23fcf334f70b8bc87e73af71ff5148a0dfcbb3043570402da3021d680355b3263db06e1bc1bfc34126b
-MISC ChangeLog 1494 SHA256 27bd0cacf4f883ea32a8a63f9fe41c1b4c8d09c569ae4cbfe79387114056f0d7 SHA512 14d4542a7ec97b1ee3bf8be6c01117ad9e002561be9a2cb6e0ff0ceef1b673de04b13c539b084393ab86ae6675a9b8246e0de4829c4e44b6d0e1fd5e3ce43627 WHIRLPOOL 1223e080c27ab83fc674640fa850b3be521d7fed6bdcc738b5ab0b3c8984b072cf0f9b0ee439997880427209b535221251a54f0805f6676fd852580cf4e48a73
+EBUILD tf2_ros-0.5.13-r1.ebuild 882 SHA256 0768060e2ef8afbf4b106a2dba08386f15d6ac240eefebdaeba7bd6589ffcca7 SHA512 292c4b3e2983f80419afb12b2813b3affd7f2a4b22ef6d047442deaa342e24ac5f9eeb3aea2fc47220c87137b9ffc7f2b4417c9fa42ad70603bae9a475f29c1c WHIRLPOOL 0149cc29a8bfd35f4cd20cb432bf01d1b868888e213002d5390831faab6b7d271ed75ddf89091962ec762c1d2f18f0bd7cc77cc7b14b4e700701bc98f0ab0506
+EBUILD tf2_ros-9999.ebuild 882 SHA256 0768060e2ef8afbf4b106a2dba08386f15d6ac240eefebdaeba7bd6589ffcca7 SHA512 292c4b3e2983f80419afb12b2813b3affd7f2a4b22ef6d047442deaa342e24ac5f9eeb3aea2fc47220c87137b9ffc7f2b4417c9fa42ad70603bae9a475f29c1c WHIRLPOOL 0149cc29a8bfd35f4cd20cb432bf01d1b868888e213002d5390831faab6b7d271ed75ddf89091962ec762c1d2f18f0bd7cc77cc7b14b4e700701bc98f0ab0506
+MISC ChangeLog 1840 SHA256 5ddfc304ab2cbe3fcef5f9a7ffa8ebc2d68ff3407fb0d4fcc950c2bcea3a07cc SHA512 1113c7017053f0c1174dbe2d28488b96a0bfe6f383b048e56eaa42b70c9c999ee936d8b9ed1d3a52c37b82c63022191427995f5b83f7277260392605e1317b0b WHIRLPOOL d4eacf50bed71e3a3404d54ccc0d37228ada0b75938a901cab2eda27b45fd7603cfccf88a0094da15532a71a171beef74081388507c7567e9eed31a6352f0e48
 MISC metadata.xml 339 SHA256 0d38a857b1dbc1a7c4dc149e52cf1fc3ed197f39ddf672f9b4de44e6db0881f6 SHA512 70bde02b98edb10a9340db05de2bac26828bafd43be3fe2796a4cc8c115b409eac13c0eecd0ecb038f49f6eaa2bd6588671afff450fef02c0301356323216d51 WHIRLPOOL 8d9ebb45a28ee3532531f25f24da05baf5a24e447a64aea77987fd005bf51d912b0f18e1cbc46a6550ffeaf698ddb208b8647d3dc93456b6106a05cdff08dc40
diff --git a/dev-ros/tf2_ros/tf2_ros-0.5.12.ebuild b/dev-ros/tf2_ros/tf2_ros-0.5.12.ebuild
deleted file mode 100644
index 248dddf79d08..000000000000
--- a/dev-ros/tf2_ros/tf2_ros-0.5.12.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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/geometry_experimental"
-KEYWORDS="~amd64 ~arm"
-ROS_SUBDIR=${PN}
-PYTHON_COMPAT=( python2_7 )
-
-inherit ros-catkin
-
-DESCRIPTION="ROS bindings for the tf2 library, for both Python and C++"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/actionlib[${PYTHON_USEDEP}]
-	dev-ros/message_filters
-	dev-ros/roscpp
-	dev-ros/rosgraph
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_py[${PYTHON_USEDEP}]
-	dev-ros/actionlib_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP},${CATKIN_MESSAGES_CXX_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-ros/rostest[${PYTHON_USEDEP}] )"
diff --git a/dev-ros/tf2_ros/tf2_ros-0.5.13.ebuild b/dev-ros/tf2_ros/tf2_ros-0.5.13-r1.ebuild
similarity index 92%
rename from dev-ros/tf2_ros/tf2_ros-0.5.13.ebuild
rename to dev-ros/tf2_ros/tf2_ros-0.5.13-r1.ebuild
index 248dddf79d08..4916e4caecad 100644
--- a/dev-ros/tf2_ros/tf2_ros-0.5.13.ebuild
+++ b/dev-ros/tf2_ros/tf2_ros-0.5.13-r1.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$
 
@@ -20,6 +20,7 @@ RDEPEND="
 	dev-ros/message_filters
 	dev-ros/roscpp
 	dev-ros/rosgraph
+	dev-libs/boost:=[threads]
 	dev-ros/rospy[${PYTHON_USEDEP}]
 	dev-ros/tf2
 	dev-ros/tf2_py[${PYTHON_USEDEP}]
diff --git a/dev-ros/tf2_ros/tf2_ros-9999.ebuild b/dev-ros/tf2_ros/tf2_ros-9999.ebuild
index 248dddf79d08..4916e4caecad 100644
--- a/dev-ros/tf2_ros/tf2_ros-9999.ebuild
+++ b/dev-ros/tf2_ros/tf2_ros-9999.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$
 
@@ -20,6 +20,7 @@ RDEPEND="
 	dev-ros/message_filters
 	dev-ros/roscpp
 	dev-ros/rosgraph
+	dev-libs/boost:=[threads]
 	dev-ros/rospy[${PYTHON_USEDEP}]
 	dev-ros/tf2
 	dev-ros/tf2_py[${PYTHON_USEDEP}]
diff --git a/dev-util/boost-build/ChangeLog b/dev-util/boost-build/ChangeLog
index 5171b4071e57..9eb2a86fec3c 100644
--- a/dev-util/boost-build/ChangeLog
+++ b/dev-util/boost-build/ChangeLog
@@ -181,3 +181,9 @@
 
   Package-Manager: portage-2.3.1
 
+*boost-build-1.62.0-r1 (06 Oct 2016)
+
+  06 Oct 2016; Michał Górny <mgorny@gentoo.org> -boost-build-1.62.0.ebuild,
+  +boost-build-1.62.0-r1.ebuild:
+  Use correct upstream distfile, #596220
+
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index 1f7542e0b0db..5f8b4f56d391 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -21,6 +21,6 @@ EBUILD boost-build-1.59.0.ebuild 3947 SHA256 896a2e18b2280f50f59a2fb6b06992196af
 EBUILD boost-build-1.60.0.ebuild 3947 SHA256 896a2e18b2280f50f59a2fb6b06992196af5a0786abcd9ed3bcf0edcad54dc3a SHA512 ad9e1dff9322b1eb644ddb10e825f40520b5bb974bb7d1f2d1d4f02eb006980aa89d556195076ca2747cf168455d48024325acb0fc5cb7a5f0f93fc0cd4ba534 WHIRLPOOL 7b8f6289f4068834f386d104eea57267cc7dcd6585fa05d5433af090f39589006365b43e9940327ff2226dea8cd0c474b978b776edd573525ab8d77bdd7c7fbf
 EBUILD boost-build-1.61.0.ebuild 3923 SHA256 c67f179c37b9d0511cb05b59a78ac9bae2e1609ace7b9011169bd6c8a7cbee76 SHA512 42fa7cfd2da40994c97278bd895191b668d75cb1b83a2f1923d8b5ac30d370b29e7db71cf378308f595c1cd3f398c510cae6733118cac8080d52ed2ca44cd7b2 WHIRLPOOL 62b4829865c47549d964e35e062c4f6dab5c014e7c690138ec1afb62762cca972474f20281bfc5822b24b8db256f617c41f1648785f9bd8096d1b41bacde0942
 EBUILD boost-build-1.62.0-r1.ebuild 3967 SHA256 3f969453e87a7750cca052c0c3740290590569a5bb29640e6be046df76ebdf8e SHA512 e34d14052a836c288d4c4a3a578a36003c9e82e17876ab86f45575af9a81118b38937f7d00df8838f95cc4c7efdb63482c03cf83f11d7352847a143bedf7ee3c WHIRLPOOL abdc4a824fc2d81e1bf3675dcfe29240773035053b9544adb1df6f274460c1814e4b797153bfb8f079a7035a1835f8bd282ae27a7ec79c727e9583baa6de513b
-MISC ChangeLog 6513 SHA256 851bc5bad36ca0957d99dbbb102c6362dd6556c1676f7b839ef0055487d15d2f SHA512 0eaaf788d30bac3e5e6eb1f3db4dfe60add481c8a1d1ed87099732456583767ac903f364924723a9e1adba12e6b3a9ade59b9e78e4128adcfc75590f70d7300c WHIRLPOOL 1cfdcfee65fd888a231c31ac9424dbee2574ef2b5836ca6dd294a5c7786db08d2889cb26bf3c86dd9c7cf6a1bfa224f3d01d3aebeacfe5779e8dbf550e566add
+MISC ChangeLog 6704 SHA256 3cd7921c4abc3d8e4010bf591bd2636006b93da51ca051ab1a28a29fcfea9ebf SHA512 d5f464efd0414ede17bd309e87a30c3decb134da8bc7a415900e0deff726bd180fd24273fbfc379189ca4481f0dda0b6d2790dc2bbd1693eb0036ba506dd2329 WHIRLPOOL 77bf23a53911c1676a745a34985a5ea4e8e1ebb67c894e3407594162fc719331825c316c411ae2041110261dc4572c715683d97aa7518a1bf5aeea2c78c8d8a6
 MISC ChangeLog-2015 22458 SHA256 8341068142b55bc555677104798816b8c9a9e135b924faf03d03e6a371003f1f SHA512 b6eee67178faa003cbbee237311dfd302b9544d7c8cfb397a4a26234e6db628e91f3fa802a37dc8df68c88bfd3d5bd156c16e0c33f57e35cb55cd6bfc4513e46 WHIRLPOOL eae5386edd1e2275e2656bf4fba0edfa3adfaa3ecd7cf889eb65177895a91ff1ff31a7e52d2f70b9c3bb7017fffec8045bc607a7ecacd6fca32a9d3b1c1bb33a
 MISC metadata.xml 334 SHA256 247038e2c8e01feb3d58a507761974ec2d1904fedd028be5bf1d1627be82d9d5 SHA512 bc1fa12d69f5711c380a938546914a325ac9dee1b35b2b75136144bbf90190fdc7e113a8eedf26a5c23d1564baf71f936141d71ad715ad6f212f32226601706e WHIRLPOOL e5413e89efb623ebfff8259965a51ed6c6c8d207eeaa6f6ad691b6001945664a72cb9e4dc501c0ee0d560cabc0fdc20d3181b5212e031ee15e357c0ccc72a985
diff --git a/dev-util/netbeans/ChangeLog b/dev-util/netbeans/ChangeLog
index 07d19ec102ad..65216d7c4e26 100644
--- a/dev-util/netbeans/ChangeLog
+++ b/dev-util/netbeans/ChangeLog
@@ -104,3 +104,8 @@
 
   Package-Manager: portage-2.3.1
 
+  06 Oct 2016; Miroslav Šulc <fordfrog@gentoo.org> netbeans-8.2.ebuild:
+  fixed eapi 6 issue and reverted l10n changes
+
+  Package-Manager: portage-2.3.1
+
diff --git a/dev-util/netbeans/Manifest b/dev-util/netbeans/Manifest
index ed209b0a04f7..9dfd1a648041 100644
--- a/dev-util/netbeans/Manifest
+++ b/dev-util/netbeans/Manifest
@@ -10,6 +10,6 @@ DIST netbeans-l10n-8.2-20160920.tar.bz2 12723797 SHA256 90d09843d2e0256f3196f4ea
 EBUILD netbeans-8.0.2.ebuild 6637 SHA256 85628ddcdd4d7f888b58742947c3984a37d592f894cd6a0998f192c538a03c3e SHA512 d6c94c1a6d65c4c8e6ccb7397ee17065dd0c873be63db602fe646103294d74646de82af245fd9c530e05fe73837d95af04fe49323e92cb5e67bbb20321ab0f39 WHIRLPOOL 3dd0a394b46235278bb72a971e387cf43675475daa4b6a61370a778d795a201f6bff3a633c53a3c68e3472cbca2c30d969ee62aea40e81a8a4cbf2944b4d0277
 EBUILD netbeans-8.1.ebuild 6633 SHA256 e891ac4ec16e0a6eedf50ca3cea94c964c58457302d8977dd4ce41a9adabd0a9 SHA512 5569bbfb1fe62c1505009e37c317ffca2104c0a805c22c5ebe808d1706368ae6b1db9b04e0e6ec5fad3d4319e3d4e44b7413045a8e4622f741f11bfe1d82a06e WHIRLPOOL 74440ed792865f628e02c1fa2df8e813554fc49a21432417995ed67c1ab71c1edfb2c63c3b086ef9d676e69cca2e769946cc3b79c1e7990dfc844cd0e87ca2ce
 EBUILD netbeans-8.2.ebuild 6152 SHA256 ddb5db62422e635ff3aee1137e93bb45cdee59adf1d6444d3291659846810d0c SHA512 f20b5fce0a14233796ebf4bc2a6669bb6d9f429fecc05564bc2170a8577c1c7dd64c027a4c8f3ab929e12d1e258fc5718f073050efc6ecccb01b1bbc33f8903e WHIRLPOOL 017adf9ee69bc95e291a73419d2c043acb3d1c67ecbd73c8e2f924e408562c46b5c9eb0ef58a6f02562a879dd5aa0080ed84ac16bd5502f361c925d1db3aaac5
-MISC ChangeLog 3445 SHA256 6ad82c356623054591c22c56649b37f5a416a787429b773c115957b00dacfd88 SHA512 1b066bbf1a605c6c526edf0245a696bb89b8734f783e16beac9d364bbfd2963749a226287f41d39a0e65a93fc64284b0610a5babf0d5c33df6a6c6dea80b25cb WHIRLPOOL 0389a517bbd887eaa2ec3c9776d03a34bbe6191eab7fe32ed7efbf17ebbdb8d507eddd3c2f76ded90b84ef8280f6f0823d4337591f116cbb06ec86035d94b824
+MISC ChangeLog 3600 SHA256 22ca6f78d44fc826c118af5bc57ead832b98d3f228ece08434633b6cd7b80e16 SHA512 24f445f998b7e9c9271e787efd821433df40517d3d12ab0d00f28a79649e43313815f95b0e6522095eedbcdcb89ce19d3da9eb0c1e310e0f2e5c080d7c01ff52 WHIRLPOOL acc42c3ec5422cfdcbc93cbf6d23067ae40d48b43abb06ea6621521a51befecdd050b3ea0ce2236b79e53f4a5b7e2aaac42a9a3dd8d11dc82c8b68452ccbae28
 MISC ChangeLog-2015 33263 SHA256 eb573b7d83d4081c431c496b3c5860eb43239174bc6d7d81ec5144f607a85eda SHA512 86b09da142928591e3d2944af87c274330e86731e3968644feaf3a08a52287622b3358638f69e9e2bd5fa51daceac76ca7d5ba493007735bb502c39b901bbd98 WHIRLPOOL 4bf32905a550856debfb89aaf551ff031f790ddbac5d77875dc5cadd7be1b846c724b606b6de2a55acb073a66598083ddb216d772596745df024b235af31fd16
 MISC metadata.xml 1290 SHA256 d54b681b8f87f6e87256f8093479a34034d7dd063c053abeb10aea192732fe6a SHA512 10b6897bd10823d399937aaf3e09c1231a6c67072723cea8a9aff002b275b76d74a62260f8416e17cc53bc6a87fa0c19d00cb428ecff4052c1c8e278211ebe70 WHIRLPOOL 5becc9cb059d11ee610f4e5096ea0296c0586c66d92de24396c607dd241b9b87252a6748946dec15dd0174075afdc05e7b1144123a9b099360135e50cd87a14c
diff --git a/games-emulation/mgba/ChangeLog b/games-emulation/mgba/ChangeLog
index 0eec21c1f566..e0a6bc691ff6 100644
--- a/games-emulation/mgba/ChangeLog
+++ b/games-emulation/mgba/ChangeLog
@@ -14,3 +14,11 @@
   Package-Manager: portage-2.3.1
   Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
 
+*mgba-0.5.1 (06 Oct 2016)
+
+  06 Oct 2016; Lars Wendler <polynomial-c@gentoo.org> +mgba-0.5.1.ebuild:
+  Bump to version 0.5.1
+
+  Package-Manager: portage-2.3.1
+  Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+
diff --git a/games-emulation/mgba/Manifest b/games-emulation/mgba/Manifest
index 69a14a568db9..93121b7c5037 100644
--- a/games-emulation/mgba/Manifest
+++ b/games-emulation/mgba/Manifest
@@ -1,4 +1,6 @@
 DIST mgba-0.5.0.tar.gz 5360529 SHA256 0efcd1e4f8c8d34d0384919ea19fa625fa2585d35d102c00b31930196c1f49bc SHA512 974b5cf3a0a112e7681d6117e09acaeffe44d72a0a74fddf9068b6c027a0c140d0f762fd97988d26c42e0a282806874870e2e2c1f1f277cb30a0c756f220f533 WHIRLPOOL ae8e975e38c7ab7370f4f20ea274d7e962f6556f0d12e107fc9ee5662e0b0d9680f9fb5358c319071d5b5d0e39c83786a90d41cb28c846cf9dd94597b0530626
+DIST mgba-0.5.1.tar.gz 5342416 SHA256 d2173fbe69065ae1bd0abb323dcc3459d73c48ddc3d6934ef216cc50d1a0835d SHA512 a4c982028036d8bfb26053219421bcbfecd907cde102f5087076082dcf8f3c7d48aee0b22c22e7449708c3ad9886c3978556dba21cbfba46168ff5495ddd8354 WHIRLPOOL a079b7540f6692e006a1cc8d32e85182389758ee75167d1bc46416a91d78496cc5f86cabea57a65fcdf669affe5376f6a2f1c2e39b6a102cb4f8dca26612c82a
 EBUILD mgba-0.5.0.ebuild 2010 SHA256 617e080e63b95b36e356d965678e48668ba37b2f93a9bd6b47e58375c3252bfa SHA512 8ff46ed2affd8a84e6b070d1ab47785197d1c3954372004abae2c8249a7e97274b2f5b25489be0da4ee7376ff03c0ef874fadaed6b7bf7f50395b979a04a9939 WHIRLPOOL 15b56c4e94cf1e628d6421a1709525971c832b7ef326cdcf6e9afe481031cd6934070f6b5f26a6def0d4a5e5300554113b9d46dfbe2e6044a7e8f808bfcc6919
-MISC ChangeLog 463 SHA256 e940bf108d1430abd3a4bcc952d04a3c0450b7de464ea17c00a5099923c24046 SHA512 61a4caaf275c5649ac1990b33d8a323493e3ff2dd4a236ea198599a8f0e6870caae9c70da5c51d4651e05bcdd7f442c4381cf98e76b2a65d8f401135dcfed353 WHIRLPOOL 136535c28e438462ad43c9d19a711521ff125e3ce8bd91ee76ded733db86b179f91ab93e67ba4276f6b4d3d3694a0eed2b4c9cb5a4c6ac3e4e31c553cd3617f8
+EBUILD mgba-0.5.1.ebuild 2010 SHA256 617e080e63b95b36e356d965678e48668ba37b2f93a9bd6b47e58375c3252bfa SHA512 8ff46ed2affd8a84e6b070d1ab47785197d1c3954372004abae2c8249a7e97274b2f5b25489be0da4ee7376ff03c0ef874fadaed6b7bf7f50395b979a04a9939 WHIRLPOOL 15b56c4e94cf1e628d6421a1709525971c832b7ef326cdcf6e9afe481031cd6934070f6b5f26a6def0d4a5e5300554113b9d46dfbe2e6044a7e8f808bfcc6919
+MISC ChangeLog 679 SHA256 073cedf0d8110ad7a1d6b7169d357fdf94bc7007b33d6ade700a31970c99f44a SHA512 73a7f435d382b0ed0a1c7c10b170c992b073c99cbbdb9674d1084992d7084bfc7ae99a1365c1760a732dfc53a411974d96f196f0bbf37be6b7bfe389e7a55df6 WHIRLPOOL c6f3725a19438a47986160f3ec9fd298830cf69fe2250796cacbd81b9da6e931a29639ceff3522cac947059a1bf8c9519291695be949a778f22ce3e7eb512195
 MISC metadata.xml 339 SHA256 df391f543467bfd72a6034ef0d2e6fdd0bf3161722c949f807d80124ff7391ca SHA512 33798a7a9145daff0c4f0e31cbd6ac05e49632edbec02709f51952716af659a7f3e76f378e9432c15e5bda68619816318a1d2fbfa27b4a5ef136970241ebfa03 WHIRLPOOL 3f9cf544a70b137890c6f84b0fbf0bc84bf975feac0e78c8bc9cafa81e21aee9e842dadf8d23007ea172c1e831b4665f66386d482cc46dda5a68271fa0e78a7a
diff --git a/games-emulation/mgba/mgba-0.5.1.ebuild b/games-emulation/mgba/mgba-0.5.1.ebuild
new file mode 100644
index 000000000000..9e9e9fe6241e
--- /dev/null
+++ b/games-emulation/mgba/mgba-0.5.1.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit fdo-mime gnome2-utils cmake-utils
+
+DESCRIPTION="A new Game Boy Advance emulator written in C."
+HOMEPAGE="https://mgba.io"
+SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ffmpeg imagemagick opengl qt5 +sdl"
+REQUIRED_USE="|| ( qt5 sdl )
+		qt5? ( opengl )"
+
+RDEPEND="
+	media-libs/libpng:0=
+	sys-libs/zlib[minizip]
+	ffmpeg? ( virtual/ffmpeg )
+	imagemagick? ( media-gfx/imagemagick:= )
+	opengl? ( virtual/opengl )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtwidgets:5
+		opengl? ( dev-qt/qtopengl:5 )
+	)
+	sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] )"
+DEPEND="${RDEPEND}
+	>=dev-util/cmake-3.2.2"
+
+src_prepare() {
+	default
+
+	# Get rid of any bundled stuff we don't want
+	for pkg in libpng lzma zlib ; do
+		rm -r "${S}"/src/third-party/${pkg} || die
+	done
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_GL="$(usex opengl)"
+		-DBUILD_QT="$(usex qt5)"
+		-DBUILD_SDL="$(usex sdl)"
+		-DUSE_FFMPEG="$(usex ffmpeg)"
+		-DUSE_MAGICK="$(usex imagemagick)"
+		-DUSE_EPOXY=OFF
+		-DUSE_LIBZIP=OFF
+		-DUSE_LZMA=OFF
+		-DUSE_MINIZIP=ON
+		-DM_CORE_GB=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	if use qt5 ; then
+		for size in 16 24 32 48 64 96 128 256; do
+			newicon -s ${size} res/${PN}-${size}.png ${PN}.png
+		done
+		doman doc/${PN}-qt.6
+		domenu res/${PN}-qt.desktop
+		dobin ../${P}_build/qt/${PN}-qt
+	fi
+	if use sdl ; then
+		doman doc/${PN}.6
+		newbin ../${P}_build/sdl/${PN} ${PN}-sdl
+	fi
+
+	dolib.so ../${P}_build/lib${PN}.so*
+}
+
+pkg_preinst() {
+	if use qt5 ; then
+		gnome2_icon_savelist
+	fi
+}
+
+pkg_postinst() {
+	if use qt5 ; then
+		fdo-mime_desktop_database_update
+		gnome2_icon_cache_update
+	fi
+}
+
+pkg_postrm() {
+	if use qt5 ; then
+		fdo-mime_desktop_database_update
+		gnome2_icon_cache_update
+	fi
+}
diff --git a/kde-apps/kdepimlibs/ChangeLog b/kde-apps/kdepimlibs/ChangeLog
index 493b40f77599..05042edb5acc 100644
--- a/kde-apps/kdepimlibs/ChangeLog
+++ b/kde-apps/kdepimlibs/ChangeLog
@@ -84,3 +84,15 @@
   kdepimlibs-4.14.10.ebuild, kdepimlibs-4.14.11_pre20160211.ebuild:
   kde-apps: drop ~ppc/~ppc64 keyword
 
+*kdepimlibs-4.14.11_pre20160211-r1 (06 Oct 2016)
+*kdepimlibs-4.14.10-r1 (06 Oct 2016)
+
+  06 Oct 2016; Michael Palimaka <kensington@gentoo.org>
+  +files/kdepimlibs-CVE-2016-7966.patch, +kdepimlibs-4.14.10-r1.ebuild,
+  +kdepimlibs-4.14.11_pre20160211-r1.ebuild:
+  backport patch from upstream for CVE-2016-7966
+
+  Gentoo-bug: 596224
+
+  Package-Manager: portage-2.3.1
+
diff --git a/kde-apps/kdepimlibs/Manifest b/kde-apps/kdepimlibs/Manifest
index f89c42569a74..728cb00ec308 100644
--- a/kde-apps/kdepimlibs/Manifest
+++ b/kde-apps/kdepimlibs/Manifest
@@ -1,8 +1,11 @@
 AUX kdepimlibs-4.14.11-boostincludes.patch 938 SHA256 bf1bcb1cc5d27d555342e320a9deae5522934ada7b0b249efc3fa5f554ddcb21 SHA512 9b7e1f5c118c45308a52708a61f50f81d1e6b55f366b658ec37ea0e7ab07d7bf3157d78829b964773e370f406b07e5d42e2fa9cdcc0abbd2887231e7695e1b6f WHIRLPOOL 47d7a105f1952e1010b8f413f79bdb83f6056f6cec0d469fadd7a74eb25262528da4c66c0e927118b4f2b1ef4f36b87374a46c9c4cf57c1e10aacfd3345aba57
 AUX kdepimlibs-4.9.1-boostincludes.patch 934 SHA256 2c4659c63b231662c3b6cae1205e46d9214240616f0c47591cf63a147a25f610 SHA512 61066f97d1fd2906bb96e4dc26dfa9aa2d758b5bea4198af5775c488c7390b17e77214d1ce1371587e4fb1c608b905bbaab0d3daf1b99de968e720a00bdac10f WHIRLPOOL cbc8de75304342ef2c6ae3956ae670975e42dfaeedd4c48bb23928edfd86f5638dd629a2487aefa1fd9fc92905aa4b65f42a99ab207d227ba42c9976ab7ee8b9
+AUX kdepimlibs-CVE-2016-7966.patch 3189 SHA256 6ee25613f82f4d8fcf474b0b57e69d20fa510c50c767a60f734a73b063351025 SHA512 7d3a75371dca0f32f3397bfd2b2dd3431a2ef28db29de4e79e62e0a7f3ae8a19b7eaf2b78f2b0ecd9f010913bf0ed24195661e2eb97bf8173b06b6b51c010481 WHIRLPOOL b3481f0d0d253ba6c335343d40948a736fce2cf108b4c4ef505bf6a1ccd6e4c0ebefa85697cce08a03ea089a3098b3861d168d1d1a030c3cfcf800d1dd9e85bf
 DIST kdepimlibs-4.14.10.tar.xz 2831160 SHA256 c8cc9694add6ecf121bda050235ffa68d8307a82c85fbdffe69a8eab5be584c2 SHA512 64f396957ae1f70a19ba689fabc0850aed04e4e4bce58a4bbc27af2b5cfa27b50472614b4096d8424ee6b4463faaed37d98e6cccfe36d208e9193ba20dc6766a WHIRLPOOL b9123e702f5d4f696cd09d3e7932dbc796f4d8e09feace56a49a96ddb64478bf8cd237bcac9c438d77491822cd655f3f44b76e657f6dbb09b8deb96ab90da52a
 DIST kdepimlibs-4.14.11_pre20160211.tar.gz 4300730 SHA256 3c2559987871761ac13185b0ffa9f7575fe0a5c2e00950b433b25edea7ec47fd SHA512 d0977a5387b0937d850fb3adc8c0bc8086ddb0894d238272f0586e53cc8a157a50b7e6d4aeb97a7fb944521de4f8978a23f172a6bf1b8e6afbbba5a183832b1c WHIRLPOOL 28bdf9c93de2c500fe2c1264c8dff42cc816d414d6b15820bc6c6aaaafc0fe67008ce13b678e0c41ac6780863e94eccb43ab18beb4c052230cad312f4530f58d
+EBUILD kdepimlibs-4.14.10-r1.ebuild 1561 SHA256 fa117c1da834cf8519c7b823bcf022a0493a53b4d3230c8251801fae01bd546d SHA512 6a4555e1558e1c785524ff6cf5644f52ef2b6d86dd605d8a39ce9d4c99b7d728ca38bfb14ad53c4dbfcbd1d9d02d26ecf644e8908a994e9010a8c0497313aec4 WHIRLPOOL 9260dabcc89666f89d5e01e28dbb591a04ed17eb589582b69bb19ab870588170307590d86098582dba61c6c42bf6670448cbec77ceb68b64d68b25a2de8c004b
 EBUILD kdepimlibs-4.14.10.ebuild 1517 SHA256 ac41ca09a1af327d14607bb0a56f2e67049c701360fd26b9694d910ae988257f SHA512 a7aa98acd1fd13264335e311c77aacb6505b9cdc08b6011a5761bdafbd83ad9c6d103abacaea6f90bfe2e4d00dee234edef6fbb443a4ca6bb930645423efe42c WHIRLPOOL 489037d2925fbfedc5441aad42b7b345c97d804cd111403d2ac51e8ffc2cc681f912fe1e754f7769168f57f485264ea3a82d43e11e7b13771b4f1af8b5b1a5c2
+EBUILD kdepimlibs-4.14.11_pre20160211-r1.ebuild 1684 SHA256 8b668e568f12d082fe0924924c0fab8176405838804b55775201fbd35b062108 SHA512 4b9c0aecdcc7244184e0003fa3e082cd4e9d3fce99e817197e9e454eb6a5f94f60cf1a3920515406dada936c34905d8234227b3f2a71b807d361f6985d73d7e4 WHIRLPOOL ff7175084305874dbcd2a9a40237624968b9ae5a1d2220e14d9e875ca8416e68dd12dce059fa45820f0f73d3f5c23bf454609e1d00a4a3ad43360462a31116ad
 EBUILD kdepimlibs-4.14.11_pre20160211.ebuild 1640 SHA256 5028ac41f9dd2b3b0091eb6c43cee16636a912d3f9d06448d557406c23b67b50 SHA512 6a90d7662e6436a61dd3929945755ad542f8b2400b99e888b83736c1259dd94d55fd36105a9301d27f4d60c81c6e7a9e131784bf3fe203e98916c767dc90c169 WHIRLPOOL 47407c7116a9e0c4296206b708478cbcee8dbdce4fe9e81cac1c3e2f461947db2490c0d5132bd5a738b55c8b6c0f46360673259e9f9547849fda7e768bf70b80
-MISC ChangeLog 2752 SHA256 9347bb57f19a2cc4302aaa20a3015327b216e586a48ab9ecd7eb9551e4bdbfe3 SHA512 600906fa8bdbcdb2046554021125030c0f5d9ce61ce46a1c12115a2b6d82fb98b06633baa65b8e13fee23d21641eb4e2e60da4a7b89555058c666eabe90d3a74 WHIRLPOOL 121cda39d8c30204aae33c2f1491cbd6d283465d11bc38888be613a9c8711e7de091737601e7cf735900c28f70673ca81669ab01d4e0539a7676384d7f173605
+MISC ChangeLog 3118 SHA256 fd0cfcfa6e433867cd57665964d3e06be8e3563b8802eed3b484c1fb3a436656 SHA512 f4db69db8b424b94d4ea8177cd92a955fd613e975486a5caaad5de7d9e3bdeadcbee5a263cd255c88b56fee8994a04cd64183ee4bb7867c1588e096e2ac63c77 WHIRLPOOL 0b68afe7b2044c114ae61c53e51b569daf53127bbefdc35ca65ce92e9cf2a0858c6bae10e7a9257c2940156796b7e81e5b3e442b1f8a86b22263c0e508a2815c
 MISC metadata.xml 332 SHA256 8f5dc82d1c6c91120fc7985f9b21e270b5de3185a76fa55d230939a06d960dbe SHA512 710c8736b03ae58d887d1cb9d1163b7dc2a7542594e5ca36640e70f73ab320154ca2297f0ecc00901dfe1f8f87dd3060b590cbf5812e9901cc4213abdd3f89e8 WHIRLPOOL 97e3d95ffefa9ab54ad30165413d55843192859cdec4d13ebe1f51e62e1da180228135a221080e9f155eb2e941a64bfab9e081ba5b258a4774aa699c42447931
diff --git a/kde-apps/kdepimlibs/files/kdepimlibs-CVE-2016-7966.patch b/kde-apps/kdepimlibs/files/kdepimlibs-CVE-2016-7966.patch
new file mode 100644
index 000000000000..b6f278a6b0a4
--- /dev/null
+++ b/kde-apps/kdepimlibs/files/kdepimlibs-CVE-2016-7966.patch
@@ -0,0 +1,94 @@
+From 176fee25ca79145ab5c8e2275d248f1a46a8d8cf Mon Sep 17 00:00:00 2001
+From: Montel Laurent <montel@kde.org>
+Date: Fri, 30 Sep 2016 15:55:35 +0200
+Subject: [PATCH] Backport avoid to transform as a url when we have a quote
+
+---
+ kpimutils/linklocator.cpp | 30 +++++++++++++++++++++++++++---
+ kpimutils/linklocator.h   |  3 ++-
+ 2 files changed, 29 insertions(+), 4 deletions(-)
+
+diff --git a/kpimutils/linklocator.cpp b/kpimutils/linklocator.cpp
+index f5d9afd..f30e8fc 100644
+--- a/kpimutils/linklocator.cpp
++++ b/kpimutils/linklocator.cpp
+@@ -95,6 +95,12 @@ int LinkLocator::maxAddressLen() const
+ 
+ QString LinkLocator::getUrl()
+ {
++    return getUrlAndCheckValidHref();
++}
++
++
++QString LinkLocator::getUrlAndCheckValidHref(bool *badurl)
++{
+   QString url;
+   if ( atUrl() ) {
+     // NOTE: see http://tools.ietf.org/html/rfc3986#appendix-A and especially appendix-C
+@@ -129,13 +135,26 @@ QString LinkLocator::getUrl()
+ 
+     url.reserve( maxUrlLen() );  // avoid allocs
+     int start = mPos;
++    bool previousCharIsADoubleQuote = false;
+     while ( ( mPos < (int)mText.length() ) &&
+             ( mText[mPos].isPrint() || mText[mPos].isSpace() ) &&
+             ( ( afterUrl.isNull() && !mText[mPos].isSpace() ) ||
+               ( !afterUrl.isNull() && mText[mPos] != afterUrl ) ) ) {
+       if ( !mText[mPos].isSpace() ) {   // skip whitespace
+-        url.append( mText[mPos] );
+-        if ( url.length() > maxUrlLen() ) {
++          if (mText[mPos] == QLatin1Char('>') && previousCharIsADoubleQuote) {
++              //it's an invalid url
++              if (badurl) {
++                  *badurl = true;
++              }
++              return QString();
++          }
++          if (mText[mPos] == QLatin1Char('"')) {
++              previousCharIsADoubleQuote = true;
++          } else {
++              previousCharIsADoubleQuote = false;
++          }
++          url.append( mText[mPos] );
++          if ( url.length() > maxUrlLen() ) {
+           break;
+         }
+       }
+@@ -367,7 +386,12 @@ QString LinkLocator::convertToHtml( const QString &plainText, int flags,
+     } else {
+       const int start = locator.mPos;
+       if ( !( flags & IgnoreUrls ) ) {
+-        str = locator.getUrl();
++        bool badUrl = false;
++        str = locator.getUrlAndCheckValidHref(&badUrl);
++        if (badUrl) {
++            return locator.mText;
++        }
++
+         if ( !str.isEmpty() ) {
+           QString hyperlink;
+           if ( str.left( 4 ) == QLatin1String("www.") ) {
+diff --git a/kpimutils/linklocator.h b/kpimutils/linklocator.h
+index 3049397..375498d 100644
+--- a/kpimutils/linklocator.h
++++ b/kpimutils/linklocator.h
+@@ -107,6 +107,7 @@ class KPIMUTILS_EXPORT LinkLocator
+       @return The URL at the current scan position, or an empty string.
+     */
+     QString getUrl();
++    QString getUrlAndCheckValidHref(bool *badurl = 0);
+ 
+     /**
+       Attempts to grab an email address. If there is an @ symbol at the
+@@ -155,7 +156,7 @@ class KPIMUTILS_EXPORT LinkLocator
+     */
+     static QString pngToDataUrl( const QString & iconPath );
+ 
+-  protected:
++protected:
+     /**
+       The plaintext string being scanned for URLs and email addresses.
+     */
+-- 
+2.7.3
+
diff --git a/kde-apps/kdepimlibs/kdepimlibs-4.14.10-r1.ebuild b/kde-apps/kdepimlibs/kdepimlibs-4.14.10-r1.ebuild
new file mode 100644
index 000000000000..4275aaa123b6
--- /dev/null
+++ b/kde-apps/kdepimlibs/kdepimlibs-4.14.10-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+CPPUNIT_REQUIRED="optional"
+EGIT_BRANCH="KDE/4.14"
+inherit kde4-base
+
+DESCRIPTION="Common library for KDE PIM apps"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+LICENSE="LGPL-2.1"
+IUSE="debug ldap prison"
+
+# some akonadi tests timeout, that probaly needs more work as its ~700 tests
+RESTRICT="test"
+
+DEPEND="
+	!kde-misc/akonadi-social-utils
+	>=app-crypt/gpgme-1.1.6
+	>=app-office/akonadi-server-1.12.90[qt4(+)]
+	>=dev-libs/boost-1.35.0-r5:=
+	dev-libs/libgpg-error
+	>=dev-libs/libical-0.48-r2:=
+	dev-libs/cyrus-sasl
+	>=dev-libs/qjson-0.8.1
+	media-libs/phonon[qt4]
+	x11-misc/shared-mime-info
+	prison? ( media-libs/prison:4 )
+	ldap? ( net-nds/openldap )
+"
+# boost is not linked to, but headers which include it are installed
+# bug #418071
+RDEPEND="${DEPEND}
+	!=kde-apps/kdepim-runtime-4.10*
+	!=kde-apps/kdepim-runtime-4.11*
+	!<kde-apps/kdepim-runtime-4.4.11.1-r2:4
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.9.1-boostincludes.patch"
+	"${FILESDIR}/${PN}-CVE-2016-7966.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_build handbook doc)
+		$(cmake-utils_use_find_package ldap)
+		$(cmake-utils_use_find_package prison)
+	)
+
+	kde4-base_src_configure
+}
+
+src_install() {
+	kde4-base_src_install
+	rm "${ED}"/usr/share/apps/cmake/modules/FindQtOAuth.cmake #Collides with net-im/choqok
+
+	# contains constants/defines only
+	QA_DT_NEEDED="$(find "${ED}" -type f -name 'libakonadi-kabc.so.*' -printf '/%P\n')"
+}
diff --git a/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r1.ebuild b/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r1.ebuild
new file mode 100644
index 000000000000..15b49c9f77e3
--- /dev/null
+++ b/kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="optional"
+CPPUNIT_REQUIRED="optional"
+EGIT_BRANCH="KDE/4.14"
+inherit kde4-base
+
+DESCRIPTION="Common library for KDE PIM apps"
+COMMIT_ID="a791b69599c3571ff2f4b1cc9033d8fb30f1bc33"
+SRC_URI="https://quickgit.kde.org/?p=kdepimlibs.git&a=snapshot&h=${COMMIT_ID}&fmt=tgz -> ${P}.tar.gz"
+S=${WORKDIR}/${PN}
+
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+LICENSE="LGPL-2.1"
+IUSE="debug ldap prison"
+
+# some akonadi tests timeout, that probaly needs more work as its ~700 tests
+RESTRICT="test"
+
+DEPEND="
+	>=app-crypt/gpgme-1.1.6
+	>=app-office/akonadi-server-1.12.90[qt4(+)]
+	>=dev-libs/boost-1.35.0-r5:=
+	dev-libs/libgpg-error
+	>=dev-libs/libical-0.48-r2:=
+	dev-libs/cyrus-sasl
+	>=dev-libs/qjson-0.8.1
+	media-libs/phonon[qt4]
+	x11-misc/shared-mime-info
+	prison? ( media-libs/prison:4 )
+	ldap? ( net-nds/openldap )
+"
+# boost is not linked to, but headers which include it are installed
+# bug #418071
+RDEPEND="${DEPEND}
+	!<kde-apps/kdepim-runtime-4.4.11.1-r2:4
+	!kde-misc/akonadi-social-utils
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.14.11-boostincludes.patch"
+	"${FILESDIR}/${PN}-CVE-2016-7966.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_doc=$(usex handbook)
+		$(cmake-utils_use_find_package ldap Ldap)
+		$(cmake-utils_use_find_package prison Prison)
+	)
+
+	kde4-base_src_configure
+}
+
+src_install() {
+	kde4-base_src_install
+
+	# Collides with net-im/choqok
+	rm "${ED}"usr/share/apps/cmake/modules/FindQtOAuth.cmake || die
+
+	# contains constants/defines only
+	QA_DT_NEEDED="$(find "${ED}" -type f -name 'libakonadi-kabc.so.*' -printf '/%P\n')"
+}
diff --git a/kde-frameworks/kcoreaddons/ChangeLog b/kde-frameworks/kcoreaddons/ChangeLog
index 9bd7b6dd864a..fe5cd5e1d0cb 100644
--- a/kde-frameworks/kcoreaddons/ChangeLog
+++ b/kde-frameworks/kcoreaddons/ChangeLog
@@ -296,3 +296,21 @@
 
   Package-Manager: portage-2.3.1
 
+*kcoreaddons-5.26.0-r1 (06 Oct 2016)
+
+  06 Oct 2016; Michael Palimaka <kensington@gentoo.org>
+  +files/kcoreaddons-5.26.0-CVE-2016-7966.patch,
+  +kcoreaddons-5.26.0-r1.ebuild:
+  backport patch from upstream for CVE-2016-7966
+
+  Gentoo-bug: 596224
+
+  Package-Manager: portage-2.3.1
+
+  06 Oct 2016; Michael Palimaka <kensington@gentoo.org>
+  -files/kcoreaddons-5.26.0-CVE-2016-7966.patch,
+  -kcoreaddons-5.26.0-r1.ebuild:
+  revert failing patch
+
+  This reverts commit bd38ebeaf7ab220314d81699d0176c0be1600447.
+
diff --git a/kde-frameworks/kcoreaddons/Manifest b/kde-frameworks/kcoreaddons/Manifest
index 877f26a1b62e..01b3670f4b36 100644
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@@ -2,6 +2,6 @@ DIST kcoreaddons-5.23.0.tar.xz 316040 SHA256 57940b097858007c014bda5c4917455cbda
 DIST kcoreaddons-5.26.0.tar.xz 330764 SHA256 1fab3ca827cf74f0fdadd30d8b9b3fe53d4ba2d1afe7f23a90f3ff55f3c77982 SHA512 79b586a52e8a2ed5c804d25a2d97bd0ac5d4f8f60cd06496611fbef255d95ffe1a5a8c44d349e6bab7bee233481346b349f0ce5cf11942c43fffe32a54de7cc0 WHIRLPOOL 9e19dcc3335e956a8be2286a4ad3fbb2ffd74c3d6d8a1565f7ba5ac38eeb6e9f499ecf0612faebc4d7853d201936309c9e877fbcc3024d4e44ae14989b153e58
 EBUILD kcoreaddons-5.23.0.ebuild 615 SHA256 adb30079c1222c8ca2c8d753ce38852bbc7377067a97a8ba873cc5efe3eafe8c SHA512 2bd59bf1889abe363711b5848ee8c49139ac97e7a385d313f71fa375460a2aa16f282e6756cb5c04d878fe039e3718ab272bc7c6a6b16a973355955ac142e64f WHIRLPOOL 1f082f1ceb38f7c2cbbe383023dcb16069f5f0056e266db59edcdee9f313e62c5f0d8d5f94ce87aa1d35882967d0de44b1e3292a6fd3501625d86b1d9938c6c9
 EBUILD kcoreaddons-5.26.0.ebuild 617 SHA256 19a4c80af9a7270ace8bad5b26eaf67115d551d6ffd6a77db068579047cc31ee SHA512 7f7f86e247c237bcc4332e25296c65fa34acac51890134c35580bf867c92878a4e7a0afc5d7144ad35d50ed082f003e075bcf60e78b47ab33f8edeedcc1c9240 WHIRLPOOL ef5eec717db8c9e9aee527fe6f48223f9ec41409ba7903b228a25b611252e1a4115bb360eb7ba865faacbb51b94e577cddf5f41fe72ef06ee0ec5a37f1a15909
-MISC ChangeLog 8737 SHA256 44f03d825790f796db1e8ad57908aad8ea0787a5595ad7fe2199c57e263227d0 SHA512 5cf4e9e4096b58505f766c54272fd8eb499bad483a3624b11e7a182c457b115f8b8e5444f76cdd0506aefb6cf8217f365f8d8d939a714e9da5d069a7899ac105 WHIRLPOOL 7eaf9b8cfd0e92f4e748bd1ff00d31792b3d59f58a8a77b393d226c8edf5d1b6499d8562979d35a1fa012feb565d6a4ece8514daa1306f07b5bd7159add71088
+MISC ChangeLog 9246 SHA256 1dbfaa6ee3c50d2cae0c43ae84dccee1db96719cd7dc4f4b895627ce00584db2 SHA512 1ca387cad76e384e3b2de50e6f33b25be4f627fa8786c2c93da783132d69b54f54b4e79b8ad90b0559cfe1e633868657a473c949554b842721dd951ff4607dab WHIRLPOOL 6f5d7940dd0a92169fa4e7a9b5efbc6fdf95a004c94d27af541b9c459b5022200bbf64c590b96d3b81b1ef56199fdb66eb6fe9d2c71a0b9859a5f83a7d6e2677
 MISC ChangeLog-2015 2414 SHA256 66e757aa0a1ee81e8ca8ac85632eccdf1c91036dc0fe372d346a38d90ad90963 SHA512 a9a0c9599bed5070a4868952aeb06fb8e3c13e6ad6d46a61094654a60aee44e901fc6372c86f57c7d931c94befbcb9746e0c8d1ffde8b605e6b97ed546c65fcb WHIRLPOOL ba92f3200af999e2a62b8b6bd80edfdef7cb3891c6ee1dbafba66104e347f99cbc3255e842a7d938bde9e0020932fddf9c35428b6f852ba7cf6ee610aaab2d18
 MISC metadata.xml 249 SHA256 584f1dcf51866dc24a9abf7a89bfba0fad11dde81ae1c1b715da41770d233c99 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 WHIRLPOOL 200c07a8bf7c55b11b7936d5cd30e991a511684913334e72f59def66c0ced5fed0b4a8754e2d98bffbab631cb90d4e17fcccc59d5dcc5a8e988f69e47c85518c
diff --git a/mail-client/thunderbird-bin/ChangeLog b/mail-client/thunderbird-bin/ChangeLog
index d2768a4886e7..149be91297c9 100644
--- a/mail-client/thunderbird-bin/ChangeLog
+++ b/mail-client/thunderbird-bin/ChangeLog
@@ -287,3 +287,13 @@
 
   Package-Manager: portage-2.2.28
 
+*thunderbird-bin-45.4.0 (06 Oct 2016)
+
+  06 Oct 2016; Ian Stakenvicius <axs@gentoo.org>
+  -thunderbird-bin-45.3.0.ebuild, +thunderbird-bin-45.4.0.ebuild:
+  version bump for security vulns
+
+  Bumped directly to stable by maintainer
+
+  Package-Manager: portage-2.3.0
+
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index 88974c3e11d6..5d6623463f03 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -111,71 +111,71 @@ DIST thunderbird-38.8.0-uk.xpi 509600 SHA256 1b21957c28cfe9b196bd768bbfceb329bf0
 DIST thunderbird-38.8.0-vi.xpi 519843 SHA256 ddaaab4ba689ccc0221f18b34aae2ce0dabed51e61c1776b4c108e7794426c86 SHA512 cbcecbd6dc3a151ecf36b5c8dbfb37068a4ceac2ebf9c18116a08cf4b1646dde0051c958882e57903e27c44c3cfd26d755908572a365df8bccebed50d055c57c WHIRLPOOL f53296869d069a940690b33d7c22c0b6da3a534a947a09fdbd2d681d07398af810c4b424f5a4e41188eee712d9e8786f441f417ed712657bebbe48386e562d5b
 DIST thunderbird-38.8.0-zh-CN.xpi 466412 SHA256 4f9a4ff54f5aff408abfe9fc90da63d70e74eb5695d358ae22c7fa8a76e411f2 SHA512 076ef74d3c495d5b3b626007c423855318ed53a2c124b23c32013e336da277457372bce6973878ef77813e0e01d4bbb31583dc2537d73fa2b57fccbe1a82f847 WHIRLPOOL e8c7fbc57f92d83a84f9096c11ad21afef80ef4ae953e905fce5346b239b4e7da32960b5bb73807e4689a45fa9832704694333f75ac9f9c862b680db59e35e5d
 DIST thunderbird-38.8.0-zh-TW.xpi 466661 SHA256 8ff0bc45973a73f6b3225c063c33c8dccda31ee6a385150984a1b4851214004e SHA512 8952fe0f9131c61b11d995ec69f7c0de42ddc42f11f99bd268c7e400b765a55047865a0463834b61e7a7917caffe0909ba62608b5fdae548fd55e53b8f8c18ec WHIRLPOOL e8452eb437fd1f414d776bd558511929f0d133fac4e756fc846219700f7e445f01eb5493e12a6d2cf7b8df4718dfff7524d5219655e709dcc47d7fa35900e38e
-DIST thunderbird-45.3.0-ar.xpi 490775 SHA256 14e8349dd5c9d44870b31c12831878c41b3346065aef9dfa0b1e53afa01b86d3 SHA512 c4fb9cac062925a07e2790e66a1ec86fec217be2c518715c884e6cfaa1471c83738d50a183c34aab0a4829b3d4d19c7d7a55c738a23260a69f38dad7d1821a67 WHIRLPOOL 0415605844fc8de1faeef9a795dc4f3158374d0bc1d1ad12d385f7c3f21042a8e1f012e4c3c6e7fbdf95a9dab74e0becc8e85cb7eef44ad2d610f0f25f999474
-DIST thunderbird-45.3.0-ast.xpi 428059 SHA256 b029c48931513e7983c6f031b2d9f68e1d2a8b0265807af914c598ed35e69247 SHA512 fc3b549cf3bcc761bdc310459c794aedeb5ea1969ec44bbaf3c4868d9dd7052ccd42ad801d286f8699bcdfa013ff68295d202aabce37597355064a298d382f39 WHIRLPOOL d6ec61863348a054921d789558df329d003a95485a4a6ab88264cede1dd7421a0cc4d210aa653f33982120fdf617205c835956e48c20f735e0f2e8cee176eebe
-DIST thunderbird-45.3.0-be.xpi 469096 SHA256 6a2690f13e4182de6aaae74f27acf40d77b0a478e361aad34de838a7f959641f SHA512 34d469b9eaa50fe6ba75d4585f388e47ba9ffc3e23f8c68ed9d178d6760e0fcad29591e8139e1000a4c70abf8630957ed14e52edc613297373973d64746e0231 WHIRLPOOL 9f1c4f5b61144fd70776ae23d108f80dcb6c197dab918c7871b7abdaa12d25ca1487c9772a44d109608781765e2f85c3b5a1947c0e39e2fc0a17ed79184dd294
-DIST thunderbird-45.3.0-bg.xpi 524299 SHA256 4ab4c475533f96bc68e2e01a9963fbcc64ca8908d2803d849eaec9dd6e3833b7 SHA512 dcda0aa7d52ccf859fcdb06f32b121d451d1e76c069d59860c478f7bda205dff5a19fc85c3a9229eac2c25be21ddeb84696d5c6c933a09cf11d66eb5551985d9 WHIRLPOOL 19dbf4787cc172b5c407b222ec69487203dbd8308bb880f8c9ffa4ff1004556ac50244b98f8d65dd8859253c61a2e3aa55d9abf85e914fd4116b352103e10bb5
-DIST thunderbird-45.3.0-bn-BD.xpi 581438 SHA256 499f06af305abcbbffa82eed89b986d0322ea221839d438109caf0a5144f3d20 SHA512 12248ec248444adc6c86aec9c9f20406d0abe9dbec15643893fed52e17c4764fc1629d4825ef5eb08094342911378577b6723cfd1a391c964d25a34fccfb03cb WHIRLPOOL fc918ce5a410be6790a57de27634c519286a0bc8444af8320f28fcad14b1a50af6b606b8862dea53cde50431502bb2e9e27a2fab3320a3ffb2934ad14b688d91
-DIST thunderbird-45.3.0-br.xpi 465999 SHA256 fab61235a4808ca07de9cc91193dc1d9a2ae4d0f461bb8df6bcc51436506eba8 SHA512 a1f48689a2e18c3d687052ef789084d01fcd4115d9a77959b22c903553de9079a18a0808089adb3b0158a61dd386a99d91b7f3c9d794201ca4f35bf8699b1480 WHIRLPOOL 501d0dd0332c8b8054f47ccfe747b3b021d1b47d06868cff688caee9e7a00854bb1e5731bc12a5a1a77e173dae17dd669f07d307089f2fede68547513bb9c1ff
-DIST thunderbird-45.3.0-ca.xpi 467980 SHA256 95ecc9a3189c1cb80debaa00270ce59175c8517d3a69ed26f53f66ccfc8a5a50 SHA512 d6c85c084f4a993cde8e60956619e76a1fd2bcec88e20b681dd405f6712a64b24a262a8237d451a2b66cacb9cda69a5a9deb71529a3ecf2e79b8565c76055ce1 WHIRLPOOL 92740d084523dfd160dad5c5f7426474ced33f476eb7aecc079ccd6969d11b04fad1fc78b723579cab8c71e9a2b99bebe1728419227e45b1df7b0e404afb1011
-DIST thunderbird-45.3.0-cs.xpi 474328 SHA256 89b1fa9550587167d23cd24c6c5eafd3425dda60d0c3beeb930820eb492d70ca SHA512 72337152c55e7f3710da57a1b47657e2a6f8f88a93e97edc00fa1da94e75afe480edbaaf6e55650255ce1e3433389af6d15c396aca27b8be6bd2075c977437af WHIRLPOOL 64e0e03610b1611223a5a906e512c671b4253e6e3f8cc61f60147d7cda7eb6a35b792c85d46a92453f202d88c994eff6d2238f30eb00fa89e3dc58aa2dbb96d4
-DIST thunderbird-45.3.0-cy.xpi 456120 SHA256 47e089e89d005b7bea32e02bcffeac9792f1758fc66217bf6b3acffd38e031fd SHA512 87dc1f7ba9c0fe9d287926196b6472e2e5e643b36af9dda3865eb35c981cb241c0354e20f939d792a3b066f2d02125c6dd23123bf5ae42a2b79cbc3034f454b2 WHIRLPOOL 7476692133d435d5728dd8d21d57334baa0f5141d7db9ca26eafad570c7910613f8dc5f0f4f7a244be962ca5d7e8fd6096841c44d1aec3a53147aeb4fd05a5e2
-DIST thunderbird-45.3.0-da.xpi 445595 SHA256 ae4bc970266f6b889a004e73f77ba9633f4657e51eae26cb51d2a5b4164b4818 SHA512 98b3e081acb05da7dbb23fd275397b4f369b7b9273b57f14608e8c8290de33e1922f3ab75914c70d3ebf41b43661a8e478faef2d45b05d57c370f5fb0d66d580 WHIRLPOOL adf496c221cc41dd7705c021007abe0908530a0d0f76a23cedde6c737e9a0feb6e5d64e541982447fae96828e5fe8dc2c0eafdfb8e654d89894653d7490f2562
-DIST thunderbird-45.3.0-de.xpi 451956 SHA256 661eb6b901f1a28b9c00862413768482443bd45a148d6bbe47dd52b832a63b29 SHA512 01fb865969eb3e25b6c7da1d01e34712bc0ae4d0f90787c8ca8980fd7e70bae3f4f2bcb52329a87a40cec106f299be78d2c1cfbbf4d27f3177d7d8fd2d02c1b4 WHIRLPOOL 99e855cb952cd4ee4328242f120316ffacd120e426ce0a6c297646503f1da34cea7a5d9341055dbe45921f7bfd6cbfae9ad753c2825be7d3f9eb7e97b2b95fce
-DIST thunderbird-45.3.0-el.xpi 514358 SHA256 8a8ba1b597e0da878dea8f97338137b252c907cf7a44b14ba702e332b3db370d SHA512 e691a8bf36dc348b2bb7155d7ac7c02fe5e6b273dcf32972a8a59dd8395e0b5bbd2b1592f702d44d44ea44e64f23f85eec9d9bc6c72cc2ea01c747002ec49be0 WHIRLPOOL 4f6fb3f0144e379db246f0c9ab4c94d4ebc771725f9a1a7d7ac826fe16b4b5e4b4e41be087c59f914df0e670936115f81109d54e6d0a961d9cf99ccb1ba16e07
-DIST thunderbird-45.3.0-en-GB.xpi 437603 SHA256 710e441f1c0c89069a1c7f81a07d1a71dfb95bae1969ba0848d07dd1c9171abb SHA512 572921ec1b33b41b6926a90c23fb3acf57bf2d50d16346a18da8fb1158f7d2dba7a334403d358f1e18c0e1b117a8525c947384f4b11b0b678ad59f20bcc4b17b WHIRLPOOL f0a2f88624a891841ce674a551572d2d7ec90f1dc256e3ab764b95278cbc3538a8aaf9438bd0c61b4d4a29908a1f4698fb2b400ef8d599871dec56aac1492daa
-DIST thunderbird-45.3.0-es-AR.xpi 464684 SHA256 ab48d70b5cd131fe3603857bc1df424b8b65e6c5644512ec53e0f685565ac83b SHA512 6e3c24418e57aa7fc1255b4409eba7d08bc1a7f0bc0fbae09fa2866d13708ef92b9ee363aa02207ee46bffaa5b7100cf8bcc3f34720c245383d2a75aee33ab79 WHIRLPOOL d53f7a2f4584f1b9fd185e970b2da74a708f9beb09b41a2138424a24209953529fd7bd6b34bb117baa3ff68acf894a60c80bbcbea5442e258ff3553eab80cd9a
-DIST thunderbird-45.3.0-es-ES.xpi 388000 SHA256 a2273d1a286c4a8d079306060171a930fb16185852ae8392cb42838227e0863a SHA512 7d33bd1ce31756a75e1b907104198c2514b2252e336ce27d0b69bae6ae303338b5ac99a79d6bb059b00281de89a466716d4525440ef6983965cc3f3f437d9f8a WHIRLPOOL 71ce1bc4802f9d16ce60b0006feb35c5ae0af34c96dbf01af57508af44755739678c0c08628f418290f4163e77ab0f6885cebe8de63170348b2e32d78e7bac86
-DIST thunderbird-45.3.0-et.xpi 458418 SHA256 b7a399f8b8503da2dfcee62f9bc842a0e7564881fa80a82b036c6dd5fbdb1f33 SHA512 3bc4c7e669d6c801be604f129579aae95ca5babda1fc20cf23aa25539c7a75b25763a060daea0b4c54e4c13d14cc22aa9e650f5f442346ea47e0a6c3d7f73ca1 WHIRLPOOL 7fa9ae5b3ed5d6591e7462645d1f7f4827e008969c439c12b28e5ca527ec69b33be6be04a0a530e56a7fa9ce94c395977a4ba16d3062ce691ca03168b26dc2c2
-DIST thunderbird-45.3.0-eu.xpi 456708 SHA256 d5ae34ab7078242c839ed4e3dd686b2a99db0b6469803195fdd9b76dc7d146dd SHA512 2e01b774e900cdcce4bac4496c26ca6626d01053a7f790822f7af3bbed374b82aee428df4e0fda78317aa6af160926ef21e433e6c500109f8dffe8c3ff937956 WHIRLPOOL 36396c1ad6d8291811ceda5370b0a849fa1d86f887f9f201dc026b950345553df171132262857613ee058e3d4cc2f1423b02e98d94c4fb22ec70cbad29e2fd29
-DIST thunderbird-45.3.0-fi.xpi 458335 SHA256 be29bac660dc23679e2b7170a9ad6cf41f0e4de7fac1b00b499cb1e3d7da7f11 SHA512 33a52acc81e8e13317894aff426243c66e235105a9834b4e216dd938e0dc794a29fe4b67d605b1608403f469612a4aa97d9197a81c0b4ac98ea62131d223f5b7 WHIRLPOOL 005e20f712776cf1af593804c850d9a5125185dfc965778c7c0dbb0614e5c5d8eac2aaf1f87696969e893aac40e79dbcedf5d2bc56e16d4efc844398192a44bd
-DIST thunderbird-45.3.0-fr.xpi 475465 SHA256 809106596fbdb70f5d1b078504b90a99a8fe47e6b149a6b44939087d575ef9df SHA512 2ec14dc8637f5acb7f63a1f440eeea65b3d62aa3ac6e7b412e92195989b44935b23330b8b7b45a20ebecbe5f20a0b3a0372c4a1f4808ec32f2f0df7878edab75 WHIRLPOOL 60e778b4e110faf208b8a657975c3246b2444f5a629d2607e272e82ff357846194b45c53fb0f433480553d100de57589dbabc2465e0b1e258eaf1183f80799b6
-DIST thunderbird-45.3.0-fy-NL.xpi 464757 SHA256 edd06a5b3a09a96559fb3b598579d738e725045e47be97e3a1ec4c2a864680f0 SHA512 82ac204e7acd7191691316720a1360671ff5aff8e339ef167e432b086d9d2e007f9dcf9548ef2c9174303760c2a52f3c646abbdbd77eb6fb2ea6b21ed31a3f94 WHIRLPOOL 08061cd03da5e5c64868204c4ab10b3ab295f9d935a8cd486aa13d16b93d592e676a96c128e269ee258ec99919400b605836882784dd74cc9d00bf44f0d29b49
-DIST thunderbird-45.3.0-ga-IE.xpi 480316 SHA256 88fe8fd6460aeff54d873b0ef8ee3be276e4b2b9ae484a418a615523c484c9ff SHA512 36f4c5a58f86ae8547dcb3592a9f45909ab35259470dfdb8c54e8de83b3db0a4753531a04f1793f278e9964d26a4bc756fda336d291ea081b33c490bee543294 WHIRLPOOL a11b91aa80c50c583ddb45cc997e8d474b9260cc95a23b0810ff74ce3cc003c8d65602ff115f730d666b00240c347ad21b81914f0ad42723167316da26de317e
-DIST thunderbird-45.3.0-gd.xpi 478296 SHA256 c5412c25359a46887a29d6139cf7fd2295ff5aea03411d1eb54e517b8df096c0 SHA512 abb9578ed8609ec2edb9bbee1fcae60bcbe05bb1ee37a2d470b3969363a22ecdb396c4f68f7626f8fb5e4a81a507ac2c815a4d78b589291ee90f03445946ff93 WHIRLPOOL c8c9a3e6a76314dd67aacc5e5ccbf71a394c8149e90408cc5c8a2c3b188eb26db9699f48c718ca8a393fa8a05b1f4de5e53bba8f2a069f6de54f5175eaa8545d
-DIST thunderbird-45.3.0-gl.xpi 478580 SHA256 2b560084c1ea28d68073990689dc519c0a87c5c9a3e97e651c65017c4ad027ec SHA512 c6b4397cfcbe9e6754dbeccddea7b2865625a28164282195595aac5f345568b53427f953b47def344cdef1398948a7720645e69ffc0ec2fe252b61109e4fb849 WHIRLPOOL 5aa208e4b17e8b51ebe47d2744a29914dac26b1bcff071a0de6714a979a4728ac187eca9bd337e58ac23702f14ddcf2ea2f5bc0f5de24fd6b958b4044414e67e
-DIST thunderbird-45.3.0-he.xpi 497962 SHA256 e2885e37ca31ece37f80f0aabaf9cb9d4c343ae6493f5a74933d0101b25931d4 SHA512 5705cdb2abad6ade51f71fbf4edc3cbea17dff8ffe75a055fb09aaf993ab144444828aebbb9bd82139607ea4d781c4c58339868d6a37cc5d835aa7e48004b979 WHIRLPOOL b8303194ccddf473cabfb89f711547ed4a0b10419523525669188bfc54a286994da30708265319940b03387dab83a4e8950405a0fe218ccb73825cdb8b64df36
-DIST thunderbird-45.3.0-hr.xpi 463959 SHA256 9f2f6d27922fb18bc973637ff16ff8bfee13260846124eded83e9bd4ac259386 SHA512 d023f0e8efa65a00cd0e8786a2be1c313f45520062ed15b0bbcb6aeb6aecadef395b27fe0bc96144e313d6a908bd0314afd37e0aba7249fb30cd72899be2ef21 WHIRLPOOL 3c8e222d39452d542cf0d0eb7f4c2dbc5f17b836b71254bb2db4034f0383f13f76a3f2396a39dbd79774a090634ffa4c1170081fded6669b8eda5470eccd5280
-DIST thunderbird-45.3.0-hsb.xpi 479414 SHA256 aa962ab31211f26cadcab83cf53b4702d36ec0aaf254f90501bc61dece171207 SHA512 9677e61a152f04a30a75ecaeebc436d9ba970113e4fe5e7ea58a009d9f8c61a045dbeefe2a3f9781409d7c77176d90166e17b1e4109560a2bb8cc28fa9b9e839 WHIRLPOOL cc6464d5bb34c14c3564c75e7841ae993065fcb2061da3c9c2aabb004819ea249d3c045dfe2d5b3b6e450939fd754e4ef6842bea9ee6c7cba41e2356a1d90f4b
-DIST thunderbird-45.3.0-hu.xpi 479584 SHA256 31d83972095cb91b2f800d425d86898c1267734cdd130c4f5b6dee508b7f74af SHA512 62d75a315a2f33b3263bda327c039f0e599dbed07a7d43c3454a262c7be761c57a72256a6f294599e86a620646b6bd9f6f8beeb4405a0af6e925aeb7b8b94e69 WHIRLPOOL fa32ced7e9b98ee44747df58489f45373dab62a802e3f3d58473ce4d4549facd9befdd656fe707e70571f03b4cf43f2a5db07f1a3d2a8f4663369c26f3e1f675
-DIST thunderbird-45.3.0-hy-AM.xpi 518883 SHA256 519cc05757b2c3d1b5469cd41b7ca8509061f5ff1a0cce3c172905fc22e414f3 SHA512 a253db2431fdd3d4e852ef86825bf3158a2f80eaf6e11a786a518dbb7b5932129f59a68d03f5bfb45e52c86faff1fbeb9c4d314b4e9ff4f41797df9fa589c4a8 WHIRLPOOL cb861b7530b05ea8c2883241fe8f775b3906efbeceadb838295b2458a949180396ac960c2932a60d082b237e00875d781cb8478f01f95371ce870b4fcde997db
-DIST thunderbird-45.3.0-id.xpi 499981 SHA256 ca5fadd3bd46423dfea5c8311b53a2e0ee5c13ababf46d7f403c0db1dcc11ebb SHA512 1b03ca67d53556225c12bb6bcedfcd64ea5ded8e74d1dc8735f82ed3b5c9aae8f909d0f08cfbd65cc513d3e4018259c1ba7a7fe73b8317dda9c73b4e4a09f1ac WHIRLPOOL f7ecd59339ea117cda5732d119bb1daf19a406050ab4437fe94be1f867bf7c4ebc75b790ce38e55db13ba7d7476b0c33d468dbae1189225d5031156027a6c337
-DIST thunderbird-45.3.0-is.xpi 462190 SHA256 1e2d34ea4eb7aedadcaa19f78fd181fd300bbde09d77acef22d3d98cedfc4eef SHA512 584bf838303a1d80ee5332559b41836457d40972852066efd6db9cea22e78b78b9b3f8134918c3c0f3005a608be0e8c6db5a78ab30525753bfc4c1fca3e030a3 WHIRLPOOL d42ccbdb29cb32061b238bcf526ee5f8124873c475a3cd3af8fb2769b54d017568d5b7ee625805f2b3b4f6477381dd40d509134aa68f0f960c0d43658bb5d3d7
-DIST thunderbird-45.3.0-it.xpi 376889 SHA256 cec2d6d74a6009fac0ae32a003eeecaf92764ef64e04cabaab9991f4df0e3f8a SHA512 8f455e45bd132b05d4714156ff4aa5a948a4489c2a8d713baf5cc7b1ae0a6c752bcc02a52e9312c58f058b62155f37ba02a02dedf5bafc5579584af513263bb9 WHIRLPOOL 72378c3752bac75b60a18118f43fedf6c27ad075cea2ad66bca98df8b56eeb220d84d7f1c4143704b76c259d24e6f0e1060c6398d76c965af5afb7e2c7361124
-DIST thunderbird-45.3.0-ja.xpi 519552 SHA256 12c51b7609d66aca80ae5ad182e9f9c7f53b858710e8984c2719bbb3d5fb7424 SHA512 18695fbd8cf9eb34bcec3b05f21d9ea1021ecb3276cd2adf09a2487871eb20076ad8498b8c67df0cd441d7c0240f2ad7b211e9b82a187500af8cbb2099aea261 WHIRLPOOL 9bab7165d0c3eb429d8e3d417f056fb69ec20d390d011e9bb0b98d86714c6930dfc89f1a08dd8a9adcb6ea686b324c42483837a135926728d2adb8b992f6d8e1
-DIST thunderbird-45.3.0-ko.xpi 487417 SHA256 bd0136777a199afdc65ba973824a331c73fb179cb48ac97145e6b765e4cc7804 SHA512 42cea2eb970581907d5aaf5258d26b680c99ab3e3f3d5cd2ebbdd84dc108ea042c7ca49660386f579bff959f807fc464dff4c24842cfdb1edc071b09bc1ceff4 WHIRLPOOL 691f30f54105b3c08536dbd292c22abf0bed989f0576f29831615b0a9f17a5a3599211bd36b74bb8d69a29c4465d3b55c97714bae029cb5e3822558e3f2a53dc
-DIST thunderbird-45.3.0-lt.xpi 477736 SHA256 b58979478eb925bfb89c8bd5af244d4cf7e00f6f6552d502e46d798d78b52c8e SHA512 e44e1e4e1928089d80f2a37227a035df1048a2c624633eecc48b415bef40f2b6757221f7b5e6be6ed1de80a641f712ba35472d8d899edc71cec7555c831a0278 WHIRLPOOL bd0ece68a81552f0a8359ce4d47852df9cf1b418523eb8610837874b6462edb6d3372e290583692c616501c02ef679ffed6e74b4e9f028b3385d7ec2334244e7
-DIST thunderbird-45.3.0-nb-NO.xpi 460011 SHA256 e4ab9385fce486a3db941d7bcdb940c30aec48799fd99f8c4bd5b49d912e18a4 SHA512 693749f775ff7a5131389e9a5ab750dbc4eb0bc2386611b56113bbf7b3fc78d0151d1c13cea056cc26d77b2fc28fa2241109e80a6a591fd266630c1c60c62ce5 WHIRLPOOL 7eac8ea62c3f55d132a16068c7de2197a0035947d414d30d7c3ce4a1c9966e08fbb8f75232228ba4ec4c4c150f15903903ca188ba5eb5b37de38c2c76c5f713c
-DIST thunderbird-45.3.0-nl.xpi 456664 SHA256 500fa2ff7d7383c0d177e6ac2d6dcfd6bfabe60f691c9c6eb4f38c5a04f74f6a SHA512 68db9e7694911ac6bfff7cdf1ea4e741f30902a2305661c4be02b8766ddbb66ce52b3feb8eef40f165afa4cb377a8e26d2997375847ec3d3c4c64ce176f40c02 WHIRLPOOL 1d340b10af310dae0febc9ed5b4810d0d8c3296ac37996962fe6642a8897349995a3038d6c9c8cc5b741d8add0f4cc419228ac6282836b785eddcc7d6ea0557c
-DIST thunderbird-45.3.0-nn-NO.xpi 460880 SHA256 0bd32c709071e81e057eabec5c0c5bf5a5eba916b78ce09f093427dcb7900ab8 SHA512 c5384e20f9ed76d3690e15d7d06cc70704c3e3be7c5e603926352a33e0ff893898a5362857eb78c355a1b7ada7f96f8f02f06fc2d79f5bd76834bdc2ac5ad88b WHIRLPOOL b2380eb7b10676ec48c8b67e10ad8ca39320780511a217d5d19b1304090a0b543c5f31283ce43bc64eed743f8b156922140e983da02ead882ef7c6de614e103d
-DIST thunderbird-45.3.0-pa-IN.xpi 551067 SHA256 ac6f3f94d26f9476f994f40079093e2f40fad8a224821685145b15a7cabd45fd SHA512 720de265086dff8782ea2d8a35988c90d24e24acae37a3421dd0143d3654d5a0b784d0154930838cf5b5c21cdcddfa7924c732e587790623b968199e7616e248 WHIRLPOOL 8162aab2e52daa8a88861e3ba0992ab9bee9e44ebf1306d7fe733ebd01d48da632e2c16cdfcfb91a5b703d7dbc0f21cb5e1e1f2bcede2d53986f69ff5b61769b
-DIST thunderbird-45.3.0-pl.xpi 423867 SHA256 cb3ce60d3a7a1b99f7f63e39de4e136aef86d23b2a32d444c2830389237f3110 SHA512 cde9cfaf77f0c3a620ddae6962f6f63ae60a75502e3f95bd278c652a7e3f4e7cf286515da64fe0606b3a551fd84f7e828b8adddd9a1ccb9a4032dc6d767367f9 WHIRLPOOL 1471c79843b4636823562e82b9b19f09e40b0ba54fab641b39980ed77f8387a68a0bdea2c994c0d97e04042a6a94b11d4eba721f58c8ee7a4e94eb5f4b109eca
-DIST thunderbird-45.3.0-pt-BR.xpi 464682 SHA256 97a55b58a2d9e174a3a09c817cbb269efd45857b0a44ffd495acd7128f8c8e83 SHA512 172f138eaa34a30ef6c228b30e4edcc97f082f62b592437e40b99e4109d0f12d32833498f81620e33b4a77d31a27c23c7553748cce2f3749f4db88026615c387 WHIRLPOOL dff34f2702578df378cdf25c734c713f13652497705493c0b067e8f72737b12b58a5a3d8257f42c03137ce5e3260c8ff61f71bf938b05b1316fb99c929458fbe
-DIST thunderbird-45.3.0-pt-PT.xpi 463751 SHA256 35a3e8a67a58da58ba21c6e5788ba408ff42706998becbfe2fc2919981a11e9b SHA512 7f858f29953e6b81286df21a03c28d333f44f70a85c9c657e1e7a7669f3c6762268701d8ba6ecabbee431c49c864feb787d8abdad51f91167314c80ec521448b WHIRLPOOL f1f89ecbf3a14bf06856c9992d0d07c6932997bcf803c0c7ee756a9c47de5b041851b974bfd4478edbe982437cb5fef922f96420a9a9151e939eac00d45b6bd7
-DIST thunderbird-45.3.0-rm.xpi 462650 SHA256 76400f0ca680672b3dda2a7471cbd153ed012f46f25772476b26cd5133b8f196 SHA512 e5cf6b519701b72260f78c0b96c63e996e9ab3f5172c18a7198ad737507ce780606b613f416edd521bc3212174c6d0457c524681b389f9b879fb5c9a49a306f0 WHIRLPOOL 540757a6c9b55249086eee434f8d03a4f5586d9a69566c4970aee8231d516bcb750d41d8875fdcb02238d132c6c83651da76b338d3b9bee27c5b3dff212e3123
-DIST thunderbird-45.3.0-ro.xpi 468518 SHA256 339dcae1301575b2e80f62513ff0a7fa80bda0bbd2e1768a4b46b0967ed68cbe SHA512 5e43c95fa68fda8ae0cef3b372cf3ec5c7e5c560778777fb2a0205ad67798b8cf36b7fab091007752eb18fa98ce24cb2809b1af2968365ee451f9b50fbcb1c37 WHIRLPOOL 0ec56340681987a4ad946a62332a379f023956826916f3f4df052ded691ea681079f9e6cdfdd774110727a5e8e296dbaf3909c052e5353930de18e0172e08907
-DIST thunderbird-45.3.0-ru.xpi 463891 SHA256 a9f177a77be928bdf6b766f28a318c59059952a9eaa255d301487e04011e0ea4 SHA512 891a422a7889603fa71d8f96808079e59f87bdf3e752e20479499b6b20d07a9b58e5f9bf4ad91e9e5b8db67f738d3a1f4e7f00a7f0efd5256f626c26feee7557 WHIRLPOOL bd40699a91da198c71a6ba2f65f69e5c20ec0bb7ee9377be46f95439c0d49e29a19ec638d678d9a0db7b598e231824a0a97fc70f3f10495bfe9d44a37878fd6a
-DIST thunderbird-45.3.0-si.xpi 555995 SHA256 6220c44dfc6063c40b31bcbb38d3ba631af1cb8ce83ab56a6650d233a8224273 SHA512 0b4edf14eedb347a13f4c4ee2f3348d6e9fcf9b43c6c6704f5de071ff8007b8f631447502347aaf67b0ef785676f7af2bd4cbd67b00db75428bf3b6175e27211 WHIRLPOOL 039393016b3115f9242dca15d04a4ad4e7c0ddb150032585e45284a155273f340fb907bce8c7e641a5516a968bf38afa05bbef3a667b4ab1269d4e3676258160
-DIST thunderbird-45.3.0-sk.xpi 481492 SHA256 e3dcc38d2fb6f99bdb61c05b668a8ac9f9edafd39367f7187beb6de0c0fbc6b9 SHA512 94603e45e738531177f5a202375923ea9fc36b2361f5fc4bdbfe0fcf49097fc0414b3270e97fd93964bf1e95e65cc50ac04a9839e5da147e4876183013fdc730 WHIRLPOOL 696022c9319c8d390baf7237d33d8da956449e64dba474ef87268d77b749e7a98d21174bfef60d0d6ab3027159e193f95da03c7570d248b85a818e5fe4e479a9
-DIST thunderbird-45.3.0-sl.xpi 462777 SHA256 634e6cc802bb959161605d3debce6e42a788f123d8fcb553a5d31710c1905afb SHA512 7b8f17551e61d77c5b1aed2847ce42f5037e3d7f575b34f07c89a27d347e39095a7d2de0a82db6abff8f83b30806391cfd21c75bd01a16c36f4c2cbab8bc7341 WHIRLPOOL ba5cf84761664b7a6cff27716ef2aaf2425ae30a69760d6aa6ee202b6b4adca4501be156acb3de0e797c2d0728778915f433d36cf211d1f9897dd1f0f317a852
-DIST thunderbird-45.3.0-sq.xpi 469534 SHA256 e5a979709fa05c77b317c314d4cd4480fb4ebc515edae875741240c9ca776d7e SHA512 2e97a8705925d51597c690e5877a695e6ff9c9477f0f68139b4ecf48eaa30c124a724fdd9681195fd0692f08eb8f07277473cfd5b62405851449aec1cec7f3ae WHIRLPOOL c4b32a133a531024334c6fabc41130ecb923f4be26e5577508038c9fb9493e65e7d967f3f33a4f30644f14d9546fd8686d57ce46d9f367450bb76ce879f1e47f
-DIST thunderbird-45.3.0-sr.xpi 565465 SHA256 ed293a2e16420aa71783d0e100696a0ad80d5c901647073703df9f9e04eac89d SHA512 c65e4265f044130b7c2a6fd3556f98eadcf3913a203b01fc55c76223d0efa215ba0f17ccdc33e54b00466c497c67dbe3994122f0c23e80f38ef3d0bd511eeaaf WHIRLPOOL 687217ac2d61a1b5b6542f8bc5b365cfd6654bd75e91334c7ba0c78ed0bf695eb40fc5705007dfeada9261dfc7a6f8bb94adc11848c47f8df4b064de50390048
-DIST thunderbird-45.3.0-sv-SE.xpi 465433 SHA256 a02ae56d7fd8918f018724d08af56f095a0e7f9dd5caf2dabbf09b811d807c8f SHA512 276a666c8c07ce615718efb112250e126ac406960ac6deef65f631ac9546826754455187362481d25ebf64ba750f5bdf5e02ba8841890b13a5824903adc9b56d WHIRLPOOL f206764739d02bf1973537b8e4d6c0bced36bdcb70f8655ec56a7f09c060f3842b1e03ffb95dc458fbc3bdb407a23b72dead6891e54743bb513851f85c76db73
-DIST thunderbird-45.3.0-ta-LK.xpi 579219 SHA256 981f7d8ebe94e3333340b1b87b4f58d8616df0961ce3593fd22b070372f6da70 SHA512 84cc49cbb29f608b78c1774d568d0623855fd560429f0b1438a2ab2ccfd74d438e56f05c5c564b0f16c3fdfb8a7eaacd1caad3c1cea918366c26515c77807b36 WHIRLPOOL eacedef61653b52aac580035c638892369e7cefac4f15881b7d7f59099e94dc52e11851701bdd9c9384c42f9e5719f7706682971827118f42ea248bccb5407e0
-DIST thunderbird-45.3.0-tr.xpi 467622 SHA256 afe590afdb4c4b82a4bce715f06dacd2b67ec748b173ee164b046711128f2a8a SHA512 d4d6164c68cc9a260d9e3f9ddd05adcfc88bc2f3e801f01728d83488aaca70a51657c410a655bcd025be54143cbd8e1d0be6cffd1a41517ffcfc2384b3b0f1b9 WHIRLPOOL 1ccae75e8951ec75ec7a24cf7c1aaf375bf2c82508183d3ce8d50eb4242579e268e376d9b45e037b0dcf08a67a8b763f38da9909b8faa766f0fff77056987708
-DIST thunderbird-45.3.0-uk.xpi 536438 SHA256 521d71834e427f2e7302533f76290e7f3da4195955cb7a63f3fa193806856ff3 SHA512 76e215bb1a7c1cec10c706e702cd47b119ad2bf01a4448f2bffd22a87bd8ea2a6778cd98850fbcc76a6eb9a9460e724d11be00a73caea5d1ffa7fd2a91b5d83d WHIRLPOOL ea8a9b053b70722069c7628c53962503f2e204cb3fef83ced956f45d66f59677cc5513109604a263a23dadd3c87bf56dd27491bf8017a840d50c84195fef5e68
-DIST thunderbird-45.3.0-vi.xpi 540497 SHA256 36325c156df4a34a581fe8fc0e5c013364f40e4057cc2ba60701a02bdda7fe1e SHA512 779b009b1d197c60bb263a9a5ebd68808c9e6345cae0cf1acbc80b5bcb54119baf3497ebf29b6ec4ecc5a3c7f5107f73cbda3ee58122d274635a60906334c77b WHIRLPOOL 44a3d611807f797f84f52bf80dc7032a72fdc27aef4a24b7650ea344211048e288a8d5be6530d6aaca165992926d15c6601bc859bd11f545a867c91797a4b813
-DIST thunderbird-45.3.0-zh-CN.xpi 489209 SHA256 cf53c911e587360f7acf1756dc714d975b3691b3521f49d409b6a5f5b3b1b016 SHA512 2869f3cf67e02de76079361d66f91d4a21d183f2ef050d39d6f8582bf66de8b027fe627d9a596fb7b6351e1195a1fc0daba71a683d94ff4000ef9ee20b3f6d87 WHIRLPOOL 2bf513fe2f4049bebead2ce7d037667f9fd1c271d15fdc6d83eb890cfa728e1b6790e7e5b2e743b4beb8d0cfe53371453417b947edab9132a49de24fb2c4decb
-DIST thunderbird-45.3.0-zh-TW.xpi 490850 SHA256 0c2d483534b394fd27cf934e80537d0c789023b4f67eef87965679278d6a6e7c SHA512 180086ec0baa27595906f66c8c9ccd017e5578dd1ff8875f1e8a7ee3c83867950ce9309e3608ae382c84b02e80383bae6a6e21140de4aa90258e4d87672e8643 WHIRLPOOL 5382beeef82b920959eb37a21eca3af96a6dfb6078fafe7a6487c149f059e6c464e4a113c848c341788119e6644834027137eec5210ef0021fd7f1635066f8dd
+DIST thunderbird-45.4.0-ar.xpi 490775 SHA256 3742f91169a3b677f20deebf0a5303d67276952c217240123147fa33f2559f5c SHA512 8c27334e4fbf573eb31410b412fc16d8dd1aa56a4a9e0a7eaa2e55aa3678a2f98f60b30fbb72b384a6a804d75972e4ca1e078e673f5eb8eea04013bf714e38fe WHIRLPOOL 61f9890f2d26ebdbd472f7ae31d2e275ae2104af38723db35143139f2e0e0450500f1d10a0435557bf7126b867e302d2b7755c3014910fd92d6a2e4ae6d3bdf8
+DIST thunderbird-45.4.0-ast.xpi 428059 SHA256 115338fcb25bb536580969f683e0712f9325371c50fde1040db39e6646e1127b SHA512 d7497c8030324c4286263ba6c19c592ab30eeb4532a08958fa07f9d61a90e2dda319529c443cbbeba9dd436d2290114bd5aa08125c0503d1a1866e124553d4b2 WHIRLPOOL 1f2fd07c0677ccaf62e24af85e6f9cac06ab74c65f3958aff5f0335ada4d39746e29b0ac3024fb9d9f69e4d8d4aa83a5fd48f027f6facb2317cd7169343e626b
+DIST thunderbird-45.4.0-be.xpi 469096 SHA256 e6d238d0c183f3c3443632984937948f96da0ab646da7fdf9d0137cb9cb94d60 SHA512 bd236f78a2448788e6cbdfe18cb57573e18ebb86e0086db1ebb01e1c9a3f5c93ce135a39b6e0c9b33f0ed185e80a3b7ede7a98a2295e872864ff5ab890355364 WHIRLPOOL 41d0845258140e59986aad6e62f1643a7234ff29be852f99d3f489b72071d7d77714fa1a6acb7730ebd542e06c0fea89075d75a7d50eff6aba8ca81ffc508fc2
+DIST thunderbird-45.4.0-bg.xpi 524299 SHA256 78f052076fac13bad9a41bae8f731a00af15575ebfe9276638665d7544f607bd SHA512 f1ff590a3a9f64ceca07d74de398e776c458d548873f780135001181cc112202097b5d34e88cf7c7d18b5e458d985d4184ec0a9fb9ec61ed8c9862be52a40a34 WHIRLPOOL 2c717c4dec5804cabc482f22f208e50e68d21d056f6bc0d05a2e14d3a22e8aae3488d858139ecd34d080ed9810b45967346683998a38b5ec680ceaf0cfcd12be
+DIST thunderbird-45.4.0-bn-BD.xpi 581438 SHA256 6ece88bd01954cc52a10bf1b3fb537eb3e12c4a1cd5d93d9100f476cb2f80512 SHA512 264f5a9b34ad9e12b4f2bc2019d78d1429c07eb6cdec60a70c5ae83b81554acaf00a673afedcc83c149e323365cf51df35f082004993644d3c0785c5199043b6 WHIRLPOOL 7cbc0f564efc8a17e5ab86162445cad8343aefc9c8319245d9a00306a508641d2bc45e1b6d864aa2e508274f987a66d4c1a147793371c04559df32eb17fb8945
+DIST thunderbird-45.4.0-br.xpi 466000 SHA256 79a64fdb3c68269866224b5b9a47b6ccf13c4eb6870f58c8059541ba3aaf818b SHA512 595f0e93c668abbefa2f3d259181a363dac3a4787d71a5da35f7c4cbf750cee15e0ac7276b201ff1e363b9dbe8094338b13784a50865c05b3aa0e08abacbfa88 WHIRLPOOL 999e51ae89f24666dd4b732e59de87a5b6d93eee5fdaeb1678c5f212f1f24663816fad32da2a1bb733f34147951826503a0e3882705d97a0799c18b02087e0be
+DIST thunderbird-45.4.0-ca.xpi 467980 SHA256 850f9ed3e20b6fb2f82e12898892c0ff92cdfd14bff3b853b843cc3a3f62887b SHA512 373a17904b11064e507b1ddef1b89d9bc1ddef9a5b9d0a16dd4094d87f112db38b55d90416d891e9d585648cce46c3d27f9d1a987859f4b0fc20c3953d9300ec WHIRLPOOL 35bf654d928d9d075f779c261f7d231fafb34161da696e06c449aa90676348fd19e950d97bccf5f46a71c756c4badd9da81299da02cb066369be4d35ad087b1f
+DIST thunderbird-45.4.0-cs.xpi 474328 SHA256 01a18bc70d834c751f11b2eda248f239bad0f698631f668c3a691c0a992de6c1 SHA512 7ddc7b7de82fe916e4c3888fc3400414dfc21d5f3190de2c035809e494b7ce1ba64d16bff19b9f021c175ff87eae265edc131725b3c585a5e4d59cba345c42b8 WHIRLPOOL 4a013dc1e6bfbe9f11d1f1054a969a454807f33974bd77caec1ab70155c29873b840f1b0f03da8cb0495869f610f130d89c239e12b5f5a8ecd146f1485ce9ab1
+DIST thunderbird-45.4.0-cy.xpi 456120 SHA256 f2053a69135ced25c58e7afb65c05812a667d1097965e6cebc7d1d903897e03d SHA512 05950485c3673b82df38bcae20a4ea4fe10cccb43ff08e22dd4bebf6325fe1e8b19ca729c28f1b61016c9601d65bb6892a54ec93ae4dd5bde198759b9d04f8fc WHIRLPOOL 46e8b4e0938163c24c83f37053c54cf7b9f3f4bc77dcf821f78c1c05fcbad3d3efb2cb2da9a1b42b6a735c949f3c2f0ef834b444370f20d395650b74d232b0be
+DIST thunderbird-45.4.0-da.xpi 445594 SHA256 98669d0d53189e111b6766285702f0f2958112a2a1e72c250aa285de05a04253 SHA512 e8dada2025788a0f439e5ef3aa5136392b9066cebbf67a2878362e9868c15f405a569d83a3d7bc59664909019055c857dab29a4a18246efbcdd6d47b0e8ea488 WHIRLPOOL 94aadc2ed7ee2d895fd94056719762d9f8ce74b99ca2fcfeaae6e05d571911e208d8c342d89c8035bb1f832baf05a726fa8984af9981b06323a58d14ec71599c
+DIST thunderbird-45.4.0-de.xpi 451956 SHA256 0d899493efee990999f48260825eb19a9b3e840beb6e3d12eb76cd2abfea67a6 SHA512 6a9ace591d4d9f21137c151ea1decdd2aaedef29f8f57b209fbd7029df981ded0397ffa6e99851e781410fedb90fde010ad6cf02674211d95ad0934716c2b78a WHIRLPOOL 0f126f99e3a7fbdc29a7367edcc18441abfb5cbb507ae587a96fd7ff5005657e4777be21a3213870d4ee5d163edd7b089f1c602e839dc9b7fd9159f8789c3d88
+DIST thunderbird-45.4.0-el.xpi 514358 SHA256 ef0dc8ea71f43a06023a7cf0ce5ac4b2fc46977dadb027e4bee45c3a947be2c8 SHA512 e3858463f4defc9aa7bfa7215aa9e25fb3a4eb75ed6fafdd6c44bb3c775653209f2921a52acbd4e3bcaa6824e8e4615619729d10f4bc5fc45026c55e6907c05b WHIRLPOOL 7232be2511c86de5905e4fa94822c565cedba9e165614188a9d298d7c3872edf247ea54a5fa3fd260c2c61c8e9cc7d167bc91809bca592f4bc3c4bee9ca5c85b
+DIST thunderbird-45.4.0-en-GB.xpi 437602 SHA256 67d9b02860f07fd3b87690cb9bf7caf4f27b1c1f2076edbd55833721852df120 SHA512 036831c511b80b63422776e92762ee21532063b8a48dfecdf9e8c399cdfa25f43e3ab2f7570bc067dbc07022b40eeec46b789bfef08309565408cb12af94293c WHIRLPOOL 510ef714c440fa88011054c1339a9f43216ac578c9609817de8f29db1a65295df8d27d9c594646d5a9f9a604787ec9f381287833ab666ac9b19f6af769d3237d
+DIST thunderbird-45.4.0-es-AR.xpi 464684 SHA256 32fee60118f9616b08d6cc82a571886b181fbb3c0ed8e51fe66567cf98fa8dda SHA512 b507f7e45556df78dece20c2159dc6ce3df0a823a82157e66b8f7a5b18b2b5a014f816f8a52d7af7555af3637d00e42184596bb9edc8af6290023928a2d50045 WHIRLPOOL e3494dc2c2e303b6642e14448e1e1e0f14e9384dfb251da676761c18da48859c06d1c649d48fbe0b872bc19e5ae9a41ab221e7da0ce18a22b8a86ee3462178d4
+DIST thunderbird-45.4.0-es-ES.xpi 388000 SHA256 bc0ec66057808053025008a1cb0b2023d91e6536d9f64b2aac34dab6e1f35240 SHA512 5d09e83f12f81dec1e76dbb73b566e0402e1327241d8b5aa1a9109179fd5058e5958ed8bd161d1ed88e91f33dd03398d974ace26b1548d1cb3bcf6282dbfc987 WHIRLPOOL 2d301202f66aea9dd3ea3ff10d06cf7364e190f65d379c901e013e8667edeabf4e7e68829131ca62f462c3193b00237fd0efc48f77a6ecfddbcc1a1307feb94a
+DIST thunderbird-45.4.0-et.xpi 458419 SHA256 0e0321a4c04b707fb9d4a879eea38ff4f1df56ae6b1a0dceec724cfeb4a48031 SHA512 f61a47328acdcb5cf7c440b0dc1b5a811a8a172b40264463de056f65ca1f59a4d9f14d997ffa394c5aed494fcf21e09dac0c5f944ba1cd29d557498ad88169ef WHIRLPOOL 7d2504a85f0da0d3fa2a8fc7de2037a9bb9258f902283b5f898b958a517b41535c968ce4ac4369c04ceced03ddc58c8a7d048a7306b84091a8a4d930fe0276c7
+DIST thunderbird-45.4.0-eu.xpi 456708 SHA256 173862da12643d9ad5d0934e859081859a728cf604dd6d72f4b71de8e6d61865 SHA512 8afdccd41bcca3f9b96a8e5bf66b750b7dc55237704f49921fb15910e230613c0ca785f3443a12e3c12e85a2e35004d0bdd7806e6765e69dc28e93e724c36721 WHIRLPOOL 9f95c7760bb7784383f8f7dd359cfc2774f09c46d4089bbcdc7835cc61403e70c3e3628df40205ee70483eb774d0e0269ddcdfc3c2be42634383e2317c225a55
+DIST thunderbird-45.4.0-fi.xpi 458335 SHA256 73024f4eb37f2b48bec2e47f0fa6fa3e97ffe04400713e3b452143567f56b84d SHA512 40ec0abaeb7541fce4328ab7bb5dd30c94f2dc8d64b8133c5fbb362d86b36f583e524caa8d2d2334a0266cae1d19812cba8bd46b643c2e15a7d11bf0850d4228 WHIRLPOOL 6b53092b68b0c120508c70a0223b42f79b84b10f97fefea36f5ed870bdd5fefd2ae1459c504f422620c92f986828f6bd94008f344b92d9156ff9004b270b9f88
+DIST thunderbird-45.4.0-fr.xpi 475465 SHA256 0a6031d4535de002a0cc040cafb1e598e2df98ef670338c25f754a8e242eae55 SHA512 70064b499e9acf37d6fde2ce0323de19f65dd972aa4e589d4632dba8b68dcf2f3a3941fb05c0a776aeddbc196a6d7df17ed18a2f05ba97af4d5907707b06f8c4 WHIRLPOOL 5aa39bb24a19d39dbe966d96cd2507ae6d9abd5f18af2a89c3bdc2bd082ecdae96634dc5e6dfc09854e7f9c5c31cd9a964aa1bddfa2b3078169716ed2a908681
+DIST thunderbird-45.4.0-fy-NL.xpi 464757 SHA256 72091838b72a7483f59aaa8b0c830560a75e5f1884ea257843c8a8bb526c88ca SHA512 841d6916fc859be626edf06715f94381e46857184996855bad7bd7e81efb84dedc895d6ac3164b713f30d010f9584d9d61ab1feabdd1e1d131d226eb707f3589 WHIRLPOOL b00ef3c377922dad3d0978be546834c2b3d5258fc94a338fa4ce797bdf2c02a58aa99458680b471cb3ec5c37f0dd80d4286d7328cbadb719a8b9b8943d65b004
+DIST thunderbird-45.4.0-ga-IE.xpi 480316 SHA256 1f6fd5f118720491461ca51e342cf71af0aa6df5c92767ddee102fd35f14396f SHA512 4a71874900906285cc47ff28df998002118b053a4be1d9d0099b00c53630a7310e1426b74e7424e3c3caddba1d574f84cfffb2c0fba556fdc709ffb8a54a4b2c WHIRLPOOL f44e95623f0affc3063040c070d74003903ee2226588d3e10d89ba6c3ed80c3c2fe3bc3cef94abb2f93f02e781fdd06c0779a5d7a4958b740e4554c47c9db614
+DIST thunderbird-45.4.0-gd.xpi 478296 SHA256 1c2c3f6ef55aec121e981f78b3289beb53e0e11ad1fc4be969330eab2f3e28c6 SHA512 d37e1afe65491d5578b60d937b7a858cd8779cbeaa586803234b7a29ebf41a5a7f705ba4f04c6ecaaf1593b3561b4246d71ee83d9699f691caf717a48afb0ef7 WHIRLPOOL ed5f2df35e0166dc4872e54d6719b54cb8a0fb372869094d2b32fffeb0253a9ae3b0e5eae6e9952b0c3b141ef0d5d74f6ee9140a4e0359e72b27118cf92bbbc3
+DIST thunderbird-45.4.0-gl.xpi 478580 SHA256 6435b0ee04332a69c7284f221c58f0e5fac2208499f4f8850f5fe7f9c36cd8cb SHA512 9f28b5d46c4d997973b3b4e93cccfd604087a2b62a6b2759f6024a8b1f5f7b81dc51f5eed753cb7f9acfb23483ea5e228bfc884f6160e3b3282c84368efe3c09 WHIRLPOOL a4505bf429f263a8d45475633da346746dfb85bb277c39e8f95bdeb3072585e9076eb3a524f663dee0ef5800efaeb04ff1c5a7527d885b5c7f4d6860744aa5c6
+DIST thunderbird-45.4.0-he.xpi 497962 SHA256 1d63d030edb43a14fbeaaca01a048e5b7de6d001d9e1595efe2cdbbe32fc89cc SHA512 e62d835a4ccd7bca2eed4f5b46378c2214bb3a9a6d32492b77f59de8431a20d6d2c752a5103d42fcf33a131b2d0ab0849de71bc4a827da0c81aac3c607364130 WHIRLPOOL 6cb0c5ee7e607a2804e4f8c025bb14231f4ce89f50ffe2ea51e013caa218f6699097d7271c66ad3bec7a60518d79688fd7b6635e61457b7d574ebe33a7ffa525
+DIST thunderbird-45.4.0-hr.xpi 463959 SHA256 aa7eee8d4ec03bbee12414d8526549925d742416b120c591099a7b8f465bfe26 SHA512 f89df8b547cd3d4127e647549576cd29363cdbcdd4457b5b8f1468e8e154cf8743f0749364a0d633f3eb3452a4e2b03d5044b960c8997d1cbfbf9cde73b99cdb WHIRLPOOL d5504587eaf10ec51ef8da6276df9086c25d99b211b58c277977605d8fd97dbe2881b9c6a9b380bf4c00c83c4025ec634ce333a9e43bc9af5bfe11f0b01beb5c
+DIST thunderbird-45.4.0-hsb.xpi 479414 SHA256 e905d2c8b5b62ffd898876c5bf5b4f1ee62198730eee6ee7e76f90e12a73fbb6 SHA512 c6fd2b885599c32f5aed391136bc2d0ec3d68eecea2a3cd66d3fc05b5b977e60b236a04f27f61796e45e80642594f9d4b35075872f2d3ffe3a4e63474efed68b WHIRLPOOL a45c8d81938bf67801a805e7f6694421282436bde2ce5e5fa940d9a6267d8987d9bed1389546b7185fe2fefd9358d4e607f5c58f07b95046a5d29699ee91a90c
+DIST thunderbird-45.4.0-hu.xpi 479584 SHA256 bc66e42252f1e206ae63625dc9d9038403301acbf5a8f7f71a624322fc1008e9 SHA512 b8cb794db48570e776f04336dfe7637a419867f009f7a711c8c803379e77ae53e70f90dd14f34246c221ff43df00ddee1e06c522b6275ca8167f34e1975265a4 WHIRLPOOL 4568234c8599f3a00daaa0e25645726912c8ab664647ad898c7e89be6b86dd37819c44b6b106217e4133b391e945d0a4e854ffdd4d87b54e1933367df5a8598e
+DIST thunderbird-45.4.0-hy-AM.xpi 518883 SHA256 3f20eebddddd84b4da13b44335576c6bd541ec9286e7b6d3a2aaf5c50f7b5213 SHA512 dcc5e9fca05b9849863771bb6193a4b58fc2edcb9d3369feae4adf5c5be24cffd8aad69001b91419d84427dc9a4a3c8ddfeea56eb033dff7998f6d19858c6440 WHIRLPOOL 6f1d1bd6959430466f5282c86f95b88ef13cf642e860a08d86c083dffa27d0c993b1b9c49e3bf1854c822601dfa9bd1826c8f4354aab32cce0c46688919983bc
+DIST thunderbird-45.4.0-id.xpi 499981 SHA256 f504cc06e99c0c4d5ecc4b4bdb53f63cd620c9107714c3f8cc0155cefd2d2a8d SHA512 5029359631ef0980f57bd360d307bc7f5faf88ee6446882ad66f3ab4faf3536ea0661333724e6c259106eefa71e742de9ad3520d486ab75f69ef55a55b870b62 WHIRLPOOL 6c2fadcc27e313e1cc85c201b0c86703e20c698991a7fa23c0677ea748be683e60679f555cdc95089f85d19777cff5440e5c369dc897d9baef3ec51f69994b2b
+DIST thunderbird-45.4.0-is.xpi 462190 SHA256 b1d8415fb293c4f868306ac65e7ddadd06740ec473cb0477ccb4394e075467f0 SHA512 a2b72163b927a99504f9164cb3d0b7c51f0c6caad257576e69f51010d6ac513ae71142beddb320807fc94c18fa947e9a721fff505563b5c7f7d29cdcb13f1828 WHIRLPOOL 9cff322ffb33c89132185e4d873f77e3bf89972cb3223578c9a2b3853c162871cbfa4aaf40c77666332a38db83970bbcd12899d9968ab92860298ef2508b888a
+DIST thunderbird-45.4.0-it.xpi 376889 SHA256 f0b70688b8f3fdf3fe287f8d502249008fc3e8e5a79e2bc794d37fdd6d1a031e SHA512 b6e682c4cb8b56769b00e335f2ca815bd9ecfad2428060f1f6cff1e4f6f6f9ff8dc79cbf5f9e9477a9567ecb81a7bea431be801be257f682a16a02e7755c162f WHIRLPOOL 69680c7033738181fc14237b1c2a3726e005145c00787cf167e03fab7aa6d596cf98dfdc73ecfa4111a789ef53cfa06907efab0268b60c580a0c77ae5ec6e9e4
+DIST thunderbird-45.4.0-ja.xpi 519552 SHA256 4b637aadf553b85dcab6cb7c589093ec7f42a4bc3cf9ebc44a9347f7839dc6cf SHA512 d9c71969131e28d7d612b70acd0475d8a7c3d3a48eb230278361fc80a7ad91f5b75730685c9b1c727b253549a76100fa4bcc157e2abd7a2714a25e3ac80e73e3 WHIRLPOOL 4b6cdcccfca0184182f174a67bc0a29fa301eda5508603e8345ff30f5054eba2d7d910b6a2048bf728f4615b04fbaed2ba81587f21dca188463979cb105fdcff
+DIST thunderbird-45.4.0-ko.xpi 487417 SHA256 db0731e45fe914fc546f13c8c0e3dfe302333a8414b957abe01a8611b51d2d70 SHA512 0a6ed50ed53e719b21fdc16559f9c6b0242752e26829d5eb0ca8ba14523f099c0d070eab6ea4af6193cef3d3de13bfb4f6dae86839b5d53d2715e15f510e0559 WHIRLPOOL 2fb1f02a5646fc6431ec5b9d682a34277a32108c9732e607371b0d8e49414284b49c6b1d7188df1420b4801c651a8260fa6f3fe0f9a743b1a6b0e62cf2e95ce7
+DIST thunderbird-45.4.0-lt.xpi 477736 SHA256 280c80246c5d0ff505814d3104f9e967d50210b52a8b95d31b14e42f17a2a167 SHA512 095e5c4ecdd437e657ca1856f7fe6e5654c1280ff6ef51d66cdf72851044c9d82d9d2f652a2b3b3ae11db70f291a786e9b48da46c932515d7bfcb6df4ec05d7d WHIRLPOOL 2f62413542ad89a241012a3a898196c6dc9081f97e5d46947fbeba5df121dc19ebc3820228eafb43759e0b1f4c5f9721105966cf3fe997643663a50fc6d66784
+DIST thunderbird-45.4.0-nb-NO.xpi 460011 SHA256 41eb2dbc26bf555ef46b00bc60700bb93ffafa46f9fbebb91a7b46c34599b9d8 SHA512 1bc7b732fcb4574a8a1de8b849904f04dd7494bdbf74e8462812f34326539af56f39381aea9de0f188e79518978ed050bbb66b38130b0f8e900c9da5997fa06a WHIRLPOOL d7b6498ecd1cd30e798e793610074a5c6d45b85ebf78131b5e39929346f7a6c37e5b5da172c90b2208fd8a1858777fb7ecf4cd5f73d165fd6db85424c6f8c50e
+DIST thunderbird-45.4.0-nl.xpi 456664 SHA256 269f0821b14dbc2a07b9e211328a6dddf5dc60ab965e4c7716346486213401e7 SHA512 f36deb5a12b255f6bc69f043bfcf846a1d23ea4c55d79079f64b8837896240a547976ec708a99570681c9f878bb6cf4961a38d962ab2bf05356265e7a037bad7 WHIRLPOOL 62fb8ad7e2936f681687cb9bf5f40a1e992490af09688ec56a39172da5e0bfcee155130318e21ecdacbd4695630c7d88e820cd7f23d6b0d763707c0dbba6c3b0
+DIST thunderbird-45.4.0-nn-NO.xpi 460880 SHA256 8480a9a81980119e7e9e0fe02d0a5f5dc8a150f848245975d46072a9991a8001 SHA512 532d5700e135a8746c605ae100238a27ffaa5cc55e766f8440d6fbfc0fd33e536b5fa4a1e866ec9df4c4c5b60da4e883cf6dd0d0a0882a64b41148f77aebbc47 WHIRLPOOL 919461787a26d3955661ac0e3296d9b7d071e7961c3f171485987aa6dedcd09586dbb9b7fd7e13f4ab265f2f038cdeff212382662cfd3ba3fbc24554d85accd5
+DIST thunderbird-45.4.0-pa-IN.xpi 551067 SHA256 8fa60166d04fd0e8aa06c3ae0e47f6ffd7f8fd7c4488782df8f52b678be04b11 SHA512 2f09934739165c4714323132c44d7127ce67c31b2209d37b2f794cf1038ebb1dff7cbd1e41cba0a0e7d2a914339d5216151c7660ebac7c9347b7aab474dd9ee6 WHIRLPOOL 291b08c9f86bbabe51d8ffdee84a9786e62b1ad367da10656c958044c0e454fa2b2a6ba1791271253d0dddc5484109691157020e906b3e619dbb8063e7ece136
+DIST thunderbird-45.4.0-pl.xpi 423867 SHA256 b691c8758b8b85cfcd1c255f96b8b6bfb6f74748fdfe087b962283bc97746d43 SHA512 e2127274f7613968c4b24c9d4fbd0d44b29dabff2498c41c51647cd0c95e47a897ddd07bf6085c05058247d2457a34494126cf13cc849fe2aa43b6cb24edd707 WHIRLPOOL c8065a1299cd9e5830481ba38c3529803f347205f3d3a2fcaa63ecc1a892593cf7d4b16a1a60cf28166172afd414614e6c5452c8415fee67c1e26794c4ed5c43
+DIST thunderbird-45.4.0-pt-BR.xpi 464682 SHA256 c6b847c7275389d7ce2a95f9203088aab18213b3515fc2950f3c91a0e50364c1 SHA512 a9a33138f89fad6d7bdb3db71497c39992da866710141e18db281a8ccba00e052a5c490d5a791c227902b35c395175426505972cf6584ceaa39160137def5d28 WHIRLPOOL bac45c53f702fe9a0eb30ce6ae84d774227f16345f04422e69c955d976f8d8c1f94581d6d981bf7d675367e91b2859d958410219b58f1d08a3a1d9b6cb210ed0
+DIST thunderbird-45.4.0-pt-PT.xpi 463751 SHA256 d770f8ee181afff99bd5bc3200dad1c83bfd82589e62b7b486ac7f2309eba94a SHA512 7a9d500facf05b1918f3a2a04de2bbc788ae1689e1f348dd6fc5c9cb69c26847bc3612fe4bc6008f4b87c928500d8f2bc19f0ec174fe12fe9d7e8dfc6e0a28c2 WHIRLPOOL bfa42175e4e6108884dccbf7a2b5ffc192cba5bbe25f7d798add4f6146f17a33443f51503f03b4978879d518bdd1c446c7ee689396737b2ca8b5c09e68e26165
+DIST thunderbird-45.4.0-rm.xpi 462650 SHA256 a7e0770679dd02dd1afa356a03f51e1b217bef1b3864e19f106962a9fc69a2be SHA512 b69e51de8f8f9051c57410720e22c13da3fb1e724e8872214ca0ee3a28d7446ad5813486ef6310fa3f5d7f1c774f27dd861eb7e97c6692e7008ae6c612de99f9 WHIRLPOOL 1f83e69d7049f98adee912c999f76d071eeef7c42b16fddf3301ce87a777238c18a0b366396ac59feeb00e6af9a10c3bbff9c628f3db71d5dcb6a836b24915b4
+DIST thunderbird-45.4.0-ro.xpi 468518 SHA256 3f3664f5ad48e062ce73625aae545bfbf1860d8b247a1515b4d18f379291bde1 SHA512 904292bcc2f0acdd332b8bf389451a21d684e75a654cc35cd4d4be76a41417ce336735f9bfc3eacbe4f7f20f3de1db7411243d24d9af71a3c12d1060252e4e21 WHIRLPOOL 0845d144fa0ff0f785e76c85c05c7d9371792ba9bd7f32d3aef5243aaad815f13505d973fd76af3cb2722c81fe9b093c7d433561a9af397abcd910de676623e2
+DIST thunderbird-45.4.0-ru.xpi 463891 SHA256 18643265f02d7d0398e219c12a2be407db40bd8c34b6dc29c79342734cd8acaf SHA512 2ff043cf364f7b2874953236134a282e901b505a2124d99919c91e0b6684079c3f4c0e2b905d28bc8379361e07d65504a8adfb5d9261a2bae49c2c8b2a0b0556 WHIRLPOOL 4441eeed5d1c215b0ba46260b3d68d0a8e3f9cbb99d239c6d700a358a0eea74a6be9862c63216bad1460e24dcaf8ee32e6b613408063548b142073cc1012af12
+DIST thunderbird-45.4.0-si.xpi 555995 SHA256 5206e8b878183277c65d614377c154ebfab34b094c8aa76ab93fcd92157571e5 SHA512 83f572af7d6f16b8b3f4f4d6c4369067b3780ef9f8b9dee12523e62143bba1213475861b9fb7bfbabb6aa674b740fad74b4e954c63d0b3f13e02b08b0b82c52a WHIRLPOOL 874b27d6a0c39f074dd34fb058ef177ef73725dc287c6eb416f465b6dce7adba5c5812615ea9739de31fd16a8757f4557170c4a47880747669c55052e2e21980
+DIST thunderbird-45.4.0-sk.xpi 481492 SHA256 775d268775de1c547e32981546e7bfcd6d73da880ebdbb85eeea414d7017293f SHA512 cd2d3defe66604bcaa5c6b40d48e5d3fca71e0632830465d123fca521cf3c8adfc4b937e8b27355fe888188363f9e856e5e9f66aeac321567e3040e653faf698 WHIRLPOOL 81a027d18847a28add97593f9afdc51b4faa0206c9b131610c422bebb60dd80cc40b76351ef5f37bb064bc0fae035c0a6849212cb7beb044430352a9b8ccbcb5
+DIST thunderbird-45.4.0-sl.xpi 462777 SHA256 0715d18ca9585d7f36d771e22a02b3890216c70ed1e68f6ab586929e613c6e5a SHA512 5dbeb963f3fc02924ebb05f8119b3f41df82b8bdfdb0738a74b25d8fe95e1403279b1fc52329e20c1666444600757ede8fc8e0563fa4f6b93797ad560b2f6822 WHIRLPOOL a05aef6bea188da060e835c7a60578e394c50f53a4a1140c16121a0e3bae06c5b9a845dec5ee676032a64b72228590780db15cc6f680b5a53c4a5c9ee92b6a87
+DIST thunderbird-45.4.0-sq.xpi 469535 SHA256 1b3fa3df5140e934ea13906d5db934c365edd9573b1b0803902681a342bba08e SHA512 3d7330872b4c9e265d582bb9b58d7b7740d18185d8bbac13631cac36e40c27321f505a4d9ae5ff4cb4ce3cdca9924a9e16cb3021e04c9190eea95ceba211832d WHIRLPOOL a22f336a35ac2cdbaf8eda8d34dabcea7e663a289ade0ff0085505898f4829a154aafa41ac10555a07e39052ccc4e0e89e274811f32054f1c54d13334bb8c53a
+DIST thunderbird-45.4.0-sr.xpi 565465 SHA256 e8ec87ffdd35b598846b7389855145c702e763736f5481d180eabe90dee643e2 SHA512 4f0014a95b3c29ef4c56d0d2af7ff2336defe799a404cc4847c04fcf855cd270034dddedef61825bd2aacbf02a09338df90fc92b612a3b1ffb4e2eec02c12c81 WHIRLPOOL c39311e117ee7b9c9ecca394f296767e98e84d9538792dee09809562fc0d06afac74585fdb6feb29344a0e005f957caaaf956f62475f549ca9c4ae776d7b8be0
+DIST thunderbird-45.4.0-sv-SE.xpi 465434 SHA256 83e2cb632f8bc2ccf5e38ffe3a952741410451e3e92a7e2e928f62ac5806ee20 SHA512 6805d95faba6a1a725bc340b437c3e6a5cdad5b733481a9f4a0c62510b49b62054c692391dbb2758e27a72a6080eccd5783b7388df5b0cb5ff02798778152c78 WHIRLPOOL 80b7aa94be30a8ba7001db7af04109a7ab91ebdcf42a12a9d98018950672e77217834071c6eb1ceaf0d6a0a175678f715d610521313ddbcdb8c0f32984172dfe
+DIST thunderbird-45.4.0-ta-LK.xpi 579219 SHA256 6962a711d3e008f3e6d56b0e21bab1f877c9a94ab8b1bfc14fbd1461cbeb674c SHA512 b1f49b2c66157807ca656a717ef62d47ecec375108d4a9b3f3f309e1ff10fd798a9ee77f49ee4d73e871335947aa4c666dc5e73b3482d18534ac26062c2a6481 WHIRLPOOL 672e803b378431246ac319495c8b9ccf92bf2ab577078bd55dcade6df6464c4ef4ad3f5399817ecffed1469d79125b89aa76f627910035fc6ad7bc1190aac070
+DIST thunderbird-45.4.0-tr.xpi 467621 SHA256 a38156623205abff1865263dabdbebbf834ef64f19761bef698eb244c3456fdd SHA512 fe2d4cb5e5f017b2c30551c2a02a40c7965551cdb6b53873c222758442679c4c7593209b8a9a03ddea331f53aa9ee3f53a3b48fdcc817cc68eaa167bfff9d9dd WHIRLPOOL 8b30c11003bc6697f44a96c08bc863d33c1f82836a1fcca5554115bea21292a331ff7fc63cb0800c4d3f619bb7362c8306d97182ac2e9801ed0ac01292bc9d17
+DIST thunderbird-45.4.0-uk.xpi 536438 SHA256 2b23b35e01d2a5d9a32b1a6e96ab4a2ad6b8fffb0ecec2faf6d5ee9b49659a10 SHA512 1b961362f5b51dcfd027df1c05867f02d1bd527eb4a0212cd982d956364d4eb09209d28287c1d45360c3610b52c55d679fdddfcf49e72e8aa8d5d1c8116a17bf WHIRLPOOL 56b6023b8feb0db363da8acc1599a8172ffa46952b3d2771423879f313f119741f16455994d7d36fedb9b98475407a4e53104dcdba40442602a90f38fada7f2d
+DIST thunderbird-45.4.0-vi.xpi 540497 SHA256 35ea6857cbf496bf918756db414fb612a2817bf59c26134d57343207f2015072 SHA512 f33e5225e13f98c6150c1dc68a447ea68730186aaa639ed417cf95e118b6f97469cb623389df43e89bf2c3eaef6e1c439a9225436b82e82db095f32d0f18055f WHIRLPOOL c27450cf2c81a3cd40a947e49efa8325c0fdbb7d2d3068d80116836edae1a05e34a263e9facc024f9831c899c9ad76a9236452bb786a7c7e1967e7e837bbc00d
+DIST thunderbird-45.4.0-zh-CN.xpi 489209 SHA256 549174da246854c7826cb3047306d59c5e34cd6568d1091f07512e8a5557535d SHA512 a2e371bd81a6c02aa80ef7bf3bc9dba6c40a7b5ba0fd0bdf04a689ad97debac42e7a88406f3501d8bdddf1c689085838884ab92cb13cee3c6add4735b7f29098 WHIRLPOOL 9c53b83ea7d012b7def79cb225e3b8e48c94eb9f9531250979cdb8656ac4b8759e05db04455eb3c02136fed82780279984ef7943fee135427bd65b75676cfcc9
+DIST thunderbird-45.4.0-zh-TW.xpi 490850 SHA256 a865d3403db417a513e29fdc80ffaeecaeffc130eb6d4183a533f46676809d32 SHA512 7cd3dfae653d40a78be654028542fa1c5166eafc2ff8e7b0dbdb6c6a6c8a34948751ceda0e22d3657484a9d2f320e1a2f325a0b09c40bc9045b7f53d93d027cf WHIRLPOOL f9f0df688f7a41eeb8b197e0d61b6946b37fda8274767ba84355091aea659d8ad8be151cb71b93686c7221ab1bd84a1735cb8a093e7988473f780b285e8d091c
 DIST thunderbird-bin_i686-31.8.0.tar.bz2 36887073 SHA256 b0dae02046e97849d8e0136787b823a05ba38f85ac757b549f02f2672608407d SHA512 542d01ebbbf6c63c6d051e98964614aad628678ff9089382a080a8fecea8f84f8cf5b9bcc68e89fcd838c0c74cb9947de41eabf850be15b4363c94b35bb16e5e WHIRLPOOL fbe97109c8669a9aa7dca01942001ae59b7dd2af60394344428c26746d83d0e77205896faee1947c8054fe3180c8c2b1488263c6cfd2b9e33553ad66d007ad4f
 DIST thunderbird-bin_i686-38.8.0.tar.bz2 41994655 SHA256 943b6314c2ae37c38b9f88f5255c53545912b3a953cddbb4c62d771334c3355a SHA512 4cfe139451cb1146571a6171ab69834306e5379faad7d752b53d774400d585a605317aae302b28a702c68b9fbe4d72617e7717d0cf43e057ff27042e7155d114 WHIRLPOOL 57a0a8d14969b7bd1f66ddd60c92c923ed3b31f55461fbc3a145e238c590cfef844554cd2f4f9cc500567c5ad9158e5511ee129f5022e3d1b42196f3e3e248ff
-DIST thunderbird-bin_i686-45.3.0.tar.bz2 44158198 SHA256 421830311bc701759916ea6afeb0ba791bf4a94936ca6fde973d657b9fb70916 SHA512 bf1f75d614dc0e401981b81d84911f2e13a1c8fc668b8a7c531963162ac293f72d6252aceb4447c97c57cc3b632452de6475f294f82090751141c3f8f681b868 WHIRLPOOL 9160f1a6c1d6f78b63b8b1e6f62af2cf2ba035d13573e24e556d9b9ee0a33d3935315f46e90875bb36e46efcb7a81defea83b9c5e7d1fe002f88121c532b0d76
+DIST thunderbird-bin_i686-45.4.0.tar.bz2 44172292 SHA256 d3b3a6fec75b22e67bdc9d7ac4812ea3312195cc0a5fb4ffa500d7b896accb08 SHA512 7561111abeda21de3c4c9f585528ea9fc76409b15c0679b22743180f3b987aefac19ff45a682519511e347b0881e0f924f4efe35a782ceb4da9c6af05132fb78 WHIRLPOOL 3ef140dd27f0d06558b5dfaa14f06640e700ce53b0e41e6c068d1461a600b96bf42efb553da3a8b2b0f156cf30f43c28387cf506de3302961f94b0f9d7521017
 DIST thunderbird-bin_x86_64-31.8.0.tar.bz2 35851678 SHA256 5e2fc9deb0726f5d1b685bb64e28046401468a8f8249e599a6a0cd003b105d62 SHA512 ce81356925208b92c06211a1568dbdf2a494c5bb03c7d37e5c3d1d2a46a83b817725e6f2f3bd818a811ab3404885f44260a9b892b7143fc505d04f23470a584c WHIRLPOOL 585e8d6970d518ff1067fa149dc59762f2f70ba8b54e459c264213fcbf7b9e6d90b6ce8f5a8e465398b053604d484561ccdb61253e2b936f49e2527fa4e28855
 DIST thunderbird-bin_x86_64-38.8.0.tar.bz2 40879981 SHA256 a8d969c4a42ad1705d0523e8ebf2695e503a40d156695ffe5e58feb1b5909c7c SHA512 78c5c2dffef77b0a9d3e6b6b5cd17a677222708804cd4deef292a5708296e0f9821e9d1a073b4fc5a1de35671f1053d0990588e8e1cad8248bda8680125f7c75 WHIRLPOOL 211b8fe3493d56e50a6e8d51e6f0134129a03f05d1087e0a6957f04ea67da664c107f7118ab93ade6a004b9806ce90146e021a9248cc264e75a0019b75885bc8
-DIST thunderbird-bin_x86_64-45.3.0.tar.bz2 42822924 SHA256 f73951d690d79308b90eea196d6d311d36e2af27fc1262b91aaa0401fc37a2ec SHA512 5b7ba243783d5bd3eb1acc6cad872b5f2885cf289d33274932ceee2159295c84230f692a1338fc4c4c3e1947436917251ed54a6995922b4777bdee7e5303ec29 WHIRLPOOL 2c242a7ae5ae401d4bfe1535aaff0a3e8446d63e252b533e18f70eb7c3dd5fdd3c5061ea9835ab27f1eac0c1927f9c3224fd677f25c15f1380922377382c7f58
+DIST thunderbird-bin_x86_64-45.4.0.tar.bz2 42834625 SHA256 dfb0693dcc3ea0c8d16a99b90b46f4dd071bc6f05eccabc8859b0e36b4689d4e SHA512 2beacec69acea8bdc98b5a7df5111318c6b47bbe1bb4356d3f9a2ce3b783ce6fad01a3ef11658c9d24d89e5c3f3e5c71de6b6623e93187d1221c25d415dac3c4 WHIRLPOOL d257fa337d104471523298bc5838b0a70e8331d7f052141fc22f804ca06a1d2acd88110dfe79b75499bdbf9771900788d49607ab216d047b6208ee268177416f
 EBUILD thunderbird-bin-31.8.0.ebuild 3744 SHA256 e5c60080d0ce25360719626f2dd20ea574a24addc8d9495787c872d4d44490c9 SHA512 d0afd470a491924436847c89f65d142ea3942c31014ef9b29a9c0e187552f7c6ac9d94fa2d127a16d00b0a0ee119bbd64223863d9961cd5a1e29e400e6b9264e WHIRLPOOL ac7bdb5942717543eac4f990acfb084bbe3f64b75acd6055941a30cc4163884b989d4a2089a8af80a386442863148e299e58a5c6e84f7f40d51a85257e248ace
 EBUILD thunderbird-bin-38.8.0.ebuild 4777 SHA256 1e0026b548001b29750c7ddd93ac1b50ecf7890902aaacebf9204fcd3614e6f2 SHA512 bcc6337c0fcddf420b8509cb2cb621b45816b035c3019e7d672d9faf9b82a3b3976c263be769e2c78acc4370e9136d1bb1645fba0ccca622ee29545ea6987212 WHIRLPOOL 3263905efeddb817a721815460f0c80442a4656c5cf663bf9123ea26fcf079ce57a1feb500781baec9d7e36feb20339b317e64af9361c1ae416c6904c49e1c6a
-EBUILD thunderbird-bin-45.3.0.ebuild 4780 SHA256 3dd4d2a80201988eb3b14cf508777f8af3458e3d5528046dcede879408bf29e5 SHA512 c75717a39fcf4b90d4a32bf68f3dc1b7f07588e9d667894c3115299c5bcff6b10c7cd722d44532fcbe05338b34a41aa7d9a56b55827954b077ace6ff374cd08e WHIRLPOOL 6f97da84d4b6dfcd5aed24873849efd1c8124135ff35ec4cc35f693aa931bb1c299b3a2545aa884d7bfcaac84cc742e45fa2dfefd712e76f35d2ba29ce1db771
-MISC ChangeLog 8964 SHA256 4b94aba58016313268989b8e4e8afc81b7309b8ce487c3f1c84714585c0daff0 SHA512 af1c32d79c45bf3d7fcf3031b8a49791a4e5cd0672d2a640c3cb0c097c24abd3f68813265ed40c0717b37b20c1b6cab23f12bf9ca266c0bfdd8a7db32094bc66 WHIRLPOOL f27dd1901d303afeacbbccd0b91d44b7583eb87f47da816713216626b4b2698b3a09aceb9236472ce08333c0b783af30eb29a2dcd0ea2f518fd385164e140db5
+EBUILD thunderbird-bin-45.4.0.ebuild 4780 SHA256 3dd4d2a80201988eb3b14cf508777f8af3458e3d5528046dcede879408bf29e5 SHA512 c75717a39fcf4b90d4a32bf68f3dc1b7f07588e9d667894c3115299c5bcff6b10c7cd722d44532fcbe05338b34a41aa7d9a56b55827954b077ace6ff374cd08e WHIRLPOOL 6f97da84d4b6dfcd5aed24873849efd1c8124135ff35ec4cc35f693aa931bb1c299b3a2545aa884d7bfcaac84cc742e45fa2dfefd712e76f35d2ba29ce1db771
+MISC ChangeLog 9230 SHA256 ce7fd2758423e17d85e31e45dd1180138aaf16def52599ab7cca37f7b144e115 SHA512 1dc339196d76aa35385322ee675dfebecad4a2ed7aeddf06d21f5b83282c874925ed1af9957c4396e52f0aa5cb525c37ba6e131916def953622eac5962d4cf5d WHIRLPOOL 26e9cb9cad009edd12a4e639a2044ce1826659baa17bfe41a9ac3a4abea36367486dbabb9dcb1500a25f2b1e322d20263d8d31f526b188ab5c826031018c7bae
 MISC ChangeLog-2015 54731 SHA256 2dcf282507c8ea56836e60f55394c3c7452b66885b0c041ad42fad9e6a0170cf SHA512 01d7294295e536adfcd7e2e1b70a0daa7462fd81b20f4516808776b99c8675c2db7808f616d66080cc9799b6ca6aa0df23f0f4dca62e9025866952bb41fffbd6 WHIRLPOOL 4189df72a809ce1af228d7c0983eb06f311395d55bc8acc705ba94f3ff3f0c816c2f5e778667f6fd7b244cf5fa19242dab88171678b554f4fe536733a86ce437
 MISC metadata.xml 329 SHA256 072cf40f15f8d311aaa7c8b89ef67cc29f76de26c5ca58ef1c57e8a0ef8b953c SHA512 8710fdb1dc3db7de4980029b8c0e2e1b3b449505c3878c955e519b50715a5c82ed16a120e6e259a1e4a56e7e39162e7b009d5db8ef4d96e607e89d48161d1e7f WHIRLPOOL 5712c6f23a5ab408891e26e76692fccea7c08fd01c014f5e5474b1660f32c7af4fdc30509b75217cdebd4ee77c6e64f148678bf7f7cb880057735a98953854b5
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-45.3.0.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-45.4.0.ebuild
similarity index 100%
rename from mail-client/thunderbird-bin/thunderbird-bin-45.3.0.ebuild
rename to mail-client/thunderbird-bin/thunderbird-bin-45.4.0.ebuild
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 1ca0f703046a..39fdcab712ff 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 06 Oct 2016 11:40:37 +0000
+Fri, 07 Oct 2016 06:10:38 +0000
diff --git a/metadata/glsa/glsa-201610-01.xml b/metadata/glsa/glsa-201610-01.xml
new file mode 100644
index 000000000000..c7907aba64ed
--- /dev/null
+++ b/metadata/glsa/glsa-201610-01.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201610-01">
+  <title>Groovy: Arbitrary code execution</title>
+  <synopsis>Groovy is vulnerable to a remote execution of arbitrary code when
+    java serialization is used.
+  </synopsis>
+  <product type="ebuild">groovy</product>
+  <announced>October 06, 2016</announced>
+  <revised>October 06, 2016: 1</revised>
+  <bug>555470</bug>
+  <access>remote</access>
+  <affected>
+    <package name="dev-java/groovy" auto="yes" arch="*">
+      <unaffected range="ge">2.4.5</unaffected>
+      <vulnerable range="lt">2.4.5</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>A multi-faceted language for the Java platform</p>
+  </background>
+  <description>
+    <p>Groovy’s MethodClosure class, in runtime/MethodClosure.java, is
+      vulnerable to a crafted serialized object.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>Remote attackers could potentially execute arbitrary code, or cause
+      Denial of Service condition
+    </p>
+  </impact>
+  <workaround>
+    <p>A workaround exists by using a custom security policy file utilizing the
+      standard Java security manager, or do not rely on serialization to
+      communicate remotely.
+    </p>
+  </workaround>
+  <resolution>
+    <p>All Groovy users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=dev-java/groovy-2.4.5"
+    </code>
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-3253">CVE-2015-3253</uri>
+  </references>
+  <metadata tag="requester" timestamp="Tue, 15 Mar 2016 09:21:07 +0000">b-man</metadata>
+  <metadata tag="submitter" timestamp="Thu, 06 Oct 2016 14:32:23 +0000">b-man</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201610-02.xml b/metadata/glsa/glsa-201610-02.xml
new file mode 100644
index 000000000000..98bf17f1c561
--- /dev/null
+++ b/metadata/glsa/glsa-201610-02.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201610-02">
+  <title>Apache: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Apache, the worst of
+    which could allow HTTP request smuggling attacks or a Denial of Service
+    condition.
+  </synopsis>
+  <product type="ebuild"></product>
+  <announced>October 06, 2016</announced>
+  <revised>October 06, 2016: 1</revised>
+  <bug>524680</bug>
+  <bug>536684</bug>
+  <bug>554948</bug>
+  <bug>557198</bug>
+  <bug>583276</bug>
+  <bug>588138</bug>
+  <access>remote</access>
+  <affected>
+    <package name="www-servers/apache" auto="yes" arch="*">
+      <unaffected range="rgt">2.2.31</unaffected>
+      <unaffected range="ge">2.4.23</unaffected>
+      <vulnerable range="lt">2.4.23</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Apache HTTP Server is one of the most popular web servers on the
+      Internet.
+    </p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Apache HTTP Server.
+      Please review the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>Remote attackers could bypass intended access restrictions, conduct HTTP
+      request smuggling attacks, or cause a Denial of Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Apache users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=www-servers/apache-2.4.23"
+    </code>
+  </resolution>
+  <references>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2014-3581">CVE-2014-3581</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-3183">CVE-2015-3183</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-1546">CVE-2016-1546</uri>
+    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2016-4979">CVE-2016-4979</uri>
+  </references>
+  <metadata tag="requester" timestamp="Sun, 13 Sep 2015 13:17:03 +0000">
+    BlueKnight
+  </metadata>
+  <metadata tag="submitter" timestamp="Thu, 06 Oct 2016 17:20:25 +0000">b-man</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 1ca0f703046a..39fdcab712ff 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 06 Oct 2016 11:40:37 +0000
+Fri, 07 Oct 2016 06:10:38 +0000
diff --git a/metadata/md5-cache/app-admin/glance-13.0.0 b/metadata/md5-cache/app-admin/glance-13.0.0
new file mode 100644
index 000000000000..bf73dac931b0
--- /dev/null
+++ b/metadata/md5-cache/app-admin/glance-13.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Services for discovering, registering, and retrieving VM images
+EAPI=6
+HOMEPAGE=https://launchpad.net/glance
+IUSE=doc mysql postgres +sqlite +swift python_targets_python2_7 python_targets_python3_4
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) mysql? ( >=dev-python/pymysql-0.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/httplib2-0.7.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-3.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/futurist-0.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/futurist-0.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/taskflow-1.26.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystoneauth-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystonemiddleware-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/WSME-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/prettytable-0.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/prettytable-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/jsonschema-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-keystoneclient-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyopenssl-0.14[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-db-4.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-db-4.13.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-log-1.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-5.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-policy-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/glance_store-0.18.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/semantic_version-2.3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cryptography-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/cryptography-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cursive-0.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/monotonic-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://tarballs.openstack.org/glance/glance-13.0.0.tar.gz
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=e086bf631dd6b9e60e8fbc063e0a85df
diff --git a/metadata/md5-cache/app-editors/mg-20160905 b/metadata/md5-cache/app-editors/mg-20161005
similarity index 83%
rename from metadata/md5-cache/app-editors/mg-20160905
rename to metadata/md5-cache/app-editors/mg-20161005
index fe881d2be3e1..8c1a40d4cc81 100644
--- a/metadata/md5-cache/app-editors/mg-20160905
+++ b/metadata/md5-cache/app-editors/mg-20161005
@@ -8,6 +8,6 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
 LICENSE=public-domain
 RDEPEND=sys-libs/ncurses:0 !elibc_FreeBSD? ( >=dev-libs/libbsd-0.7.0 )
 SLOT=0
-SRC_URI=http://homepage.boetes.org/software/mg/mg-20160905.tar.gz
+SRC_URI=http://homepage.boetes.org/software/mg/mg-20161005.tar.gz
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=eb0bb44524f845e5629479af161d8b67
+_md5_=3fb31aaacbddc22e8dc9bf916148af65
diff --git a/metadata/md5-cache/app-emulation/cloud-init-0.7.8 b/metadata/md5-cache/app-emulation/cloud-init-0.7.8
new file mode 100644
index 000000000000..d47dc415a46d
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/cloud-init-0.7.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/jsonpatch[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/oauthlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/prettytable[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyserial[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/httpretty-0.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/unittest2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pep8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flake8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/hacking[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/pkgconfig
+DESCRIPTION=cloud initialisation magic
+EAPI=6
+HOMEPAGE=https://launchpad.net/cloud-init
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=amd64 x86
+LICENSE=GPL-3
+RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/configobj[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/jinja[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/jsonpatch[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/oauthlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/prettytable[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyserial[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sys-apps/iproute2 sys-fs/growpart virtual/logger python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://launchpad.net/cloud-init/trunk/0.7.8/+download/cloud-init-0.7.8.tar.gz
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=62c55a7972e0d9cdff54bceee4de49c3
diff --git a/metadata/md5-cache/app-emulation/cloud-init-9999 b/metadata/md5-cache/app-emulation/cloud-init-9999
index 6a0181f77b23..ecf4336d4120 100644
--- a/metadata/md5-cache/app-emulation/cloud-init-9999
+++ b/metadata/md5-cache/app-emulation/cloud-init-9999
@@ -9,4 +9,4 @@ RDEPEND=dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=648abd0ccb90dace6e33835d13dc2e23
+_md5_=b203a7df5d7965e69375abe27a0537f5
diff --git a/metadata/md5-cache/dev-lang/nim-0.15.0 b/metadata/md5-cache/dev-lang/nim-0.15.0-r1
similarity index 89%
rename from metadata/md5-cache/dev-lang/nim-0.15.0
rename to metadata/md5-cache/dev-lang/nim-0.15.0-r1
index 137d9fb95387..d22c52856a7d 100644
--- a/metadata/md5-cache/dev-lang/nim-0.15.0
+++ b/metadata/md5-cache/dev-lang/nim-0.15.0-r1
@@ -9,4 +9,4 @@ LICENSE=MIT
 RDEPEND=readline? ( sys-libs/readline:0= )
 SLOT=0
 SRC_URI=http://nim-lang.org/download/nim-0.15.0.tar.xz
-_md5_=76ff48626325ddcc80b8949b8c1719be
+_md5_=5e4168c3efe07497dcc130d9bd6037d8
diff --git a/metadata/md5-cache/dev-lang/yap-6.3.3 b/metadata/md5-cache/dev-lang/yap-6.3.3
index 5781bb33fac6..b7a6b9ee7fe9 100644
--- a/metadata/md5-cache/dev-lang/yap-6.3.3
+++ b/metadata/md5-cache/dev-lang/yap-6.3.3
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/zlib gmp? ( dev-libs/gmp:0 ) java? ( >=virtual/jdk-1.4:= ) mpi?
 SLOT=0
 SRC_URI=http://www.dcc.fc.up.pt/~vsc/Yap/yap-6.3.3.tar.gz mirror://gentoo/yap-6.3.3-gentoo-patchset-9.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	java-pkg-opt-2	40db73f27fc6458ec2105812a4f261c7	java-utils-2	9a25f292ff66f8c2c00100ac0b15c54f	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ed013214c544b5c871b49882a4f7be93
+_md5_=11ce7249750a49fb3ac10c4574fb4928
diff --git a/metadata/md5-cache/dev-libs/boost-1.62.0-r1 b/metadata/md5-cache/dev-libs/boost-1.62.0-r1
index c04053abb307..e7fe9d1b23a9 100644
--- a/metadata/md5-cache/dev-libs/boost-1.62.0-r1
+++ b/metadata/md5-cache/dev-libs/boost-1.62.0-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0/1.62.0
 SRC_URI=https://downloads.sourceforge.net/project/boost/boost/1.62.0/boost_1_62_0.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=20c4f2dc9734e89e760955bedd000028
+_md5_=6a61a9a98f2fcd87311f77d4f221ac3a
diff --git a/metadata/md5-cache/dev-python/dill-0.2.5 b/metadata/md5-cache/dev-python/dill-0.2.5
index 8c8a79bbc7e8..a7a63377da3c 100644
--- a/metadata/md5-cache/dev-python/dill-0.2.5
+++ b/metadata/md5-cache/dev-python/dill-0.2.5
@@ -4,11 +4,11 @@ DESCRIPTION=Serialize all of python (almost)
 EAPI=6
 HOMEPAGE=http://www.cacr.caltech.edu/~mmckerns/dill.htm
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~x86 ~ppc ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/d/dill/dill-0.2.5.tgz
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=022e726b51ed2cbcf1f4c56918ecfe1f
+_md5_=e8339360479c83d7a515d0b7baaedb13
diff --git a/metadata/md5-cache/dev-python/pygtkspellcheck-4.0.5 b/metadata/md5-cache/dev-python/pygtkspellcheck-4.0.5
new file mode 100644
index 000000000000..73f8fd709334
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pygtkspellcheck-4.0.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/pyenchant[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DESCRIPTION=a simple but quite powerful spellchecking library for GTK written in pure Python
+EAPI=6
+HOMEPAGE=https://github.com/koehlma/pygtkspellcheck
+IUSE=python_targets_python2_7 python_targets_python3_4
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=dev-python/pyenchant[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) python_targets_python3_4? ( dev-lang/python:3.4[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://github.com/koehlma/pygtkspellcheck/archive/4.0.5.tar.gz -> pygtkspellcheck-4.0.5.tar.gz
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=e0a3c440957c553f2c047b92d7a16a0f
diff --git a/metadata/md5-cache/dev-python/selectors34-1.1 b/metadata/md5-cache/dev-python/selectors34-1.1
index bb639ce19789..9b24f471588a 100644
--- a/metadata/md5-cache/dev-python/selectors34-1.1
+++ b/metadata/md5-cache/dev-python/selectors34-1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Backport of the selectors module from Python 3.4
 EAPI=5
 HOMEPAGE=https://github.com/berkerpeksag/selectors34
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_3
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~amd64 ~x86 ~ppc ~amd64-linux ~x86-linux
 LICENSE=PSF-2
 RDEPEND=python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_3 )
 SLOT=0
 SRC_URI=mirror://pypi/s/selectors34/selectors34-1.1.tar.gz
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=9b9cc64cf55d38d53d10182aa600b1ed
+_md5_=d0296797e04828b3b1a0b5fc38f9e0d4
diff --git a/metadata/md5-cache/dev-python/sepolgen-2.6_rc1 b/metadata/md5-cache/dev-python/sepolgen-2.6_rc2
similarity index 95%
rename from metadata/md5-cache/dev-python/sepolgen-2.6_rc1
rename to metadata/md5-cache/dev-python/sepolgen-2.6_rc2
index 22d7859d0d2f..22138c466893 100644
--- a/metadata/md5-cache/dev-python/sepolgen-2.6_rc1
+++ b/metadata/md5-cache/dev-python/sepolgen-2.6_rc2
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/libselinux-2.4[python] >=app-admin/setools-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160930/sepolgen-2.6-rc1.tar.gz
+SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161006/sepolgen-2.6-rc2.tar.gz
 _eclasses_=multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=437ae741f12c2d5cb1088ef02a1ec458
+_md5_=86aae0d96a445dc25a4a23201dde4bd5
diff --git a/metadata/md5-cache/dev-python/sepolgen-9999 b/metadata/md5-cache/dev-python/sepolgen-9999
index 2734937bd372..ba2c6cb3fde2 100644
--- a/metadata/md5-cache/dev-python/sepolgen-9999
+++ b/metadata/md5-cache/dev-python/sepolgen-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/libselinux-2.4[python] >=app-admin/setools-4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 SLOT=0
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=437ae741f12c2d5cb1088ef02a1ec458
+_md5_=86aae0d96a445dc25a4a23201dde4bd5
diff --git a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.13.0 b/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.13.0
deleted file mode 100644
index b583596d66e7..000000000000
--- a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.13.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/costmap_2d dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-cpp/eigen:3 sci-libs/pcl dev-ros/cmake_modules test? ( dev-ros/rostest dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin dev-python/empy
-DESCRIPTION=Recovery behavior that attempts to clear space by reverting the costmaps to the static map
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/clear_costmap_recovery
-IUSE=test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/costmap_2d dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-cpp/eigen:3 sci-libs/pcl dev-util/catkin dev-python/empy
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.13.0.tar.gz -> navigation-1.13.0.tar.gz
-_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=fec2558c6c979770295244eafd86f4a3
diff --git a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.13.1 b/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.13.1
deleted file mode 100644
index 02fecc1a674e..000000000000
--- a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.13.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/costmap_2d-1.13.1 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-cpp/eigen:3 sci-libs/pcl dev-ros/cmake_modules test? ( dev-ros/rostest dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin dev-python/empy
-DESCRIPTION=Recovery behavior that attempts to clear space by reverting the costmaps to the static map
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/clear_costmap_recovery
-IUSE=test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.13.1 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-cpp/eigen:3 sci-libs/pcl dev-util/catkin dev-python/empy
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.13.1.tar.gz -> navigation-1.13.1.tar.gz
-_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=feb75d5ac311ba7652c28ede7451b846
diff --git a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.14.0 b/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.14.0-r1
similarity index 79%
rename from metadata/md5-cache/dev-ros/clear_costmap_recovery-1.14.0
rename to metadata/md5-cache/dev-ros/clear_costmap_recovery-1.14.0-r1
index a39c3076d836..5209e805d45a 100644
--- a/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.14.0
+++ b/metadata/md5-cache/dev-ros/clear_costmap_recovery-1.14.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/costmap_2d-1.13.1 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-cpp/eigen:3 sci-libs/pcl dev-ros/cmake_modules test? ( dev-ros/rostest dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin dev-python/empy
+DEPEND=>=dev-ros/costmap_2d-1.13.1 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-cpp/eigen:3 sci-libs/pcl dev-libs/boost:=[threads] dev-ros/cmake_modules test? ( dev-ros/rostest dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin dev-python/empy
 DESCRIPTION=Recovery behavior that attempts to clear space by reverting the costmaps to the static map
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/clear_costmap_recovery
 IUSE=test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.13.1 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-cpp/eigen:3 sci-libs/pcl dev-util/catkin dev-python/empy
+RDEPEND=>=dev-ros/costmap_2d-1.13.1 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-cpp/eigen:3 sci-libs/pcl dev-libs/boost:=[threads] dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.14.0.tar.gz -> navigation-1.14.0.tar.gz
 _eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=8a396ca546dcb101b6b3e312c1ff58cf
+_md5_=56b86d9db20d34cf10e36d0dc0d93361
diff --git a/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999 b/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999
index 6fe6dabc8dfa..3a66b4514a04 100644
--- a/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999
+++ b/metadata/md5-cache/dev-ros/clear_costmap_recovery-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-ros/costmap_2d-1.13.1 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-cpp/eigen:3 sci-libs/pcl dev-ros/cmake_modules test? ( dev-ros/rostest dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin dev-python/empy
+DEPEND=>=dev-ros/costmap_2d-1.13.1 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-cpp/eigen:3 sci-libs/pcl dev-libs/boost:=[threads] dev-ros/cmake_modules test? ( dev-ros/rostest dev-cpp/gtest ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin dev-python/empy
 DESCRIPTION=Recovery behavior that attempts to clear space by reverting the costmaps to the static map
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/clear_costmap_recovery
 IUSE=test
 LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.13.1 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-cpp/eigen:3 sci-libs/pcl dev-util/catkin dev-python/empy
+RDEPEND=>=dev-ros/costmap_2d-1.13.1 dev-ros/nav_core dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-cpp/eigen:3 sci-libs/pcl dev-libs/boost:=[threads] dev-util/catkin dev-python/empy
 SLOT=0
 _eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	git-r3	00f60a84fc7b499c99edfe99caea9f95	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=feb75d5ac311ba7652c28ede7451b846
+_md5_=56b86d9db20d34cf10e36d0dc0d93361
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.5.7-r1 b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.5.7-r1
deleted file mode 100644
index 704b05cfb1ac..000000000000
--- a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.5.7-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin dev-python/empy
-DESCRIPTION=ROS control plugins for gazebo
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/gazebo_ros_control
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo dev-util/catkin dev-python/empy
-SLOT=0
-SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.5.7.tar.gz -> gazebo_ros_pkgs-2.5.7.tar.gz
-_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3939d1104f91da099312dd82cc879aed
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.6.0 b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.6.0-r1
similarity index 83%
rename from metadata/md5-cache/dev-ros/gazebo_ros_control-2.6.0
rename to metadata/md5-cache/dev-ros/gazebo_ros_control-2.6.0-r1
index 6fc68602f1c5..0e694efe056c 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.6.0
+++ b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.6.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin dev-python/empy
 DESCRIPTION=ROS control plugins for gazebo
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gazebo_ros_control
 IUSE=test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo dev-util/catkin dev-python/empy
+RDEPEND=dev-ros/roscpp dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo dev-libs/boost:=[threads] dev-util/catkin dev-python/empy
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.6.0.tar.gz -> gazebo_ros_pkgs-2.6.0.tar.gz
 _eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3939d1104f91da099312dd82cc879aed
+_md5_=269865bb24f63e496e6d2477159d02b7
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros_control-9999 b/metadata/md5-cache/dev-ros/gazebo_ros_control-9999
index 3d850669601b..1279ea5f8994 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros_control-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_ros_control-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-ros/joint_limits_interface dev-ros/urdf sci-electronics/gazebo dev-libs/urdfdom:= >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin dev-python/empy
+DEPEND=dev-ros/roscpp dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-ros/joint_limits_interface dev-ros/urdf sci-electronics/gazebo dev-libs/urdfdom:= dev-libs/boost:=[threads] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin dev-python/empy
 DESCRIPTION=ROS control plugins for gazebo
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gazebo_ros_control
 IUSE=test
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-ros/joint_limits_interface dev-ros/urdf sci-electronics/gazebo dev-libs/urdfdom:= dev-util/catkin dev-python/empy
+RDEPEND=dev-ros/roscpp dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-ros/joint_limits_interface dev-ros/urdf sci-electronics/gazebo dev-libs/urdfdom:= dev-libs/boost:=[threads] dev-util/catkin dev-python/empy
 SLOT=0
 _eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	git-r3	00f60a84fc7b499c99edfe99caea9f95	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a749e86a758977146fff7deea5677029
+_md5_=e526b46daa13da72288f15e66b395d56
diff --git a/metadata/md5-cache/dev-ros/image_cb_detector-0.10.13 b/metadata/md5-cache/dev-ros/image_cb_detector-0.10.13
deleted file mode 100644
index 96ecc82e3fff..000000000000
--- a/metadata/md5-cache/dev-ros/image_cb_detector-0.10.13
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/calibration_msgs[ros_messages_cxx(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-DESCRIPTION=Extracts checkerboard corners from ROS images
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/image_cb_detector
-IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/calibration_msgs[ros_messages_cxx(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.13.tar.gz -> calibration-0.10.13.tar.gz
-_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3a686e6190a4409db6624f5f2c1d5669
diff --git a/metadata/md5-cache/dev-ros/image_cb_detector-0.10.14 b/metadata/md5-cache/dev-ros/image_cb_detector-0.10.14
deleted file mode 100644
index a07fe52bf2a1..000000000000
--- a/metadata/md5-cache/dev-ros/image_cb_detector-0.10.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/calibration_msgs[ros_messages_cxx(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-DESCRIPTION=Extracts checkerboard corners from ROS images
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/image_cb_detector
-IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/calibration_msgs[ros_messages_cxx(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-SLOT=0
-SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
-_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3a686e6190a4409db6624f5f2c1d5669
diff --git a/metadata/md5-cache/dev-ros/image_cb_detector-0.10.14-r1 b/metadata/md5-cache/dev-ros/image_cb_detector-0.10.14-r1
new file mode 100644
index 000000000000..96045b364372
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/image_cb_detector-0.10.14-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/calibration_msgs[ros_messages_cxx(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Extracts checkerboard corners from ROS images
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/image_cb_detector
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/calibration_msgs[ros_messages_cxx(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+SLOT=0
+SRC_URI=https://github.com/ros-perception/calibration/archive/0.10.14.tar.gz -> calibration-0.10.14.tar.gz
+_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=b8871f4909d28b3a7ca08a52881fcb36
diff --git a/metadata/md5-cache/dev-ros/image_cb_detector-9999 b/metadata/md5-cache/dev-ros/image_cb_detector-9999
index 98e3fde752a7..3b683fe27197 100644
--- a/metadata/md5-cache/dev-ros/image_cb_detector-9999
+++ b/metadata/md5-cache/dev-ros/image_cb_detector-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/calibration_msgs[ros_messages_cxx(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/calibration_msgs[ros_messages_cxx(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Extracts checkerboard corners from ROS images
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/image_cb_detector
 IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
-RDEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/calibration_msgs[ros_messages_cxx(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+RDEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/cv_bridge[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_transport dev-ros/message_filters dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/calibration_msgs[ros_messages_cxx(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-libs/boost:=[threads] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/actionlib_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/actionlib_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 SLOT=0
 _eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3a686e6190a4409db6624f5f2c1d5669
+_md5_=b8871f4909d28b3a7ca08a52881fcb36
diff --git a/metadata/md5-cache/dev-ros/joint_limits_interface-0.11.1 b/metadata/md5-cache/dev-ros/joint_limits_interface-0.11.1
deleted file mode 100644
index 482954fae052..000000000000
--- a/metadata/md5-cache/dev-ros/joint_limits_interface-0.11.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom test? ( dev-ros/rostest dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Interface for enforcing joint limits
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/joint_limits_interface
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/hardware_interface dev-libs/urdfdom dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.1.tar.gz -> ros_control-0.11.1.tar.gz
-_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=ac28402c66a1be279b80bd650a7912f2
diff --git a/metadata/md5-cache/dev-ros/joint_limits_interface-0.11.1-r1 b/metadata/md5-cache/dev-ros/joint_limits_interface-0.11.1-r1
new file mode 100644
index 000000000000..090931681da0
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/joint_limits_interface-0.11.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/hardware_interface >=dev-libs/urdfdom-1 test? ( dev-ros/rostest dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Interface for enforcing joint limits
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/joint_limits_interface
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/hardware_interface >=dev-libs/urdfdom-1 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+SLOT=0
+SRC_URI=https://github.com/ros-controls/ros_control/archive/0.11.1.tar.gz -> ros_control-0.11.1.tar.gz
+_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=2518de6723810c21358b3f360ff1425d
diff --git a/metadata/md5-cache/dev-ros/mavros_extras-0.17.2 b/metadata/md5-cache/dev-ros/mavros_extras-0.17.2
deleted file mode 100644
index 55f0ebf106b5..000000000000
--- a/metadata/md5-cache/dev-ros/mavros_extras-0.17.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Extra nodes and plugins for mavros
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/mavros_extras
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=GPL-3 LGPL-3 BSD
-RDEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-cpp/eigen:3 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=https://github.com/mavlink/mavros/archive/0.17.2.tar.gz -> mavros-0.17.2.tar.gz
-_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3077e72f0b52008fe7e8947590767622
diff --git a/metadata/md5-cache/dev-ros/mavros_extras-0.17.3 b/metadata/md5-cache/dev-ros/mavros_extras-0.17.3
deleted file mode 100644
index 0dcda25b9c97..000000000000
--- a/metadata/md5-cache/dev-ros/mavros_extras-0.17.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Extra nodes and plugins for mavros
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/mavros_extras
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=GPL-3 LGPL-3 BSD
-RDEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-cpp/eigen:3 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=https://github.com/mavlink/mavros/archive/0.17.3.tar.gz -> mavros-0.17.3.tar.gz
-_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=76e0fe247fbfa7f7272cc8ed1e370a01
diff --git a/metadata/md5-cache/dev-ros/mavros_extras-0.18.1 b/metadata/md5-cache/dev-ros/mavros_extras-0.18.1
deleted file mode 100644
index 7aaed50e7a97..000000000000
--- a/metadata/md5-cache/dev-ros/mavros_extras-0.18.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Extra nodes and plugins for mavros
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/mavros_extras
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=GPL-3 LGPL-3 BSD
-RDEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-cpp/eigen:3 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=https://github.com/mavlink/mavros/archive/0.18.1.tar.gz -> mavros-0.18.1.tar.gz
-_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=76e0fe247fbfa7f7272cc8ed1e370a01
diff --git a/metadata/md5-cache/dev-ros/mavros_extras-0.18.2 b/metadata/md5-cache/dev-ros/mavros_extras-0.18.2
deleted file mode 100644
index dcf8d7b04b4f..000000000000
--- a/metadata/md5-cache/dev-ros/mavros_extras-0.18.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Extra nodes and plugins for mavros
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/mavros_extras
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=GPL-3 LGPL-3 BSD
-RDEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-cpp/eigen:3 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=https://github.com/mavlink/mavros/archive/0.18.2.tar.gz -> mavros-0.18.2.tar.gz
-_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=76e0fe247fbfa7f7272cc8ed1e370a01
diff --git a/metadata/md5-cache/dev-ros/mavros_extras-0.18.3 b/metadata/md5-cache/dev-ros/mavros_extras-0.18.3-r1
similarity index 72%
rename from metadata/md5-cache/dev-ros/mavros_extras-0.18.3
rename to metadata/md5-cache/dev-ros/mavros_extras-0.18.3-r1
index b8f5477295b9..d7ce697c2278 100644
--- a/metadata/md5-cache/dev-ros/mavros_extras-0.18.3
+++ b/metadata/md5-cache/dev-ros/mavros_extras-0.18.3-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-cpp/eigen:3 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-cpp/eigen:3 dev-libs/boost:= sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Extra nodes and plugins for mavros
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/mavros_extras
 IUSE=python_targets_python2_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=GPL-3 LGPL-3 BSD
-RDEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-cpp/eigen:3 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-cpp/eigen:3 dev-libs/boost:= dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 SRC_URI=https://github.com/mavlink/mavros/archive/0.18.3.tar.gz -> mavros-0.18.3.tar.gz
 _eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=76e0fe247fbfa7f7272cc8ed1e370a01
+_md5_=950487a5a73740784d509733f8069e9b
diff --git a/metadata/md5-cache/dev-ros/mavros_extras-9999 b/metadata/md5-cache/dev-ros/mavros_extras-9999
index 8ecafad69469..2a6f1b1f5cae 100644
--- a/metadata/md5-cache/dev-ros/mavros_extras-9999
+++ b/metadata/md5-cache/dev-ros/mavros_extras-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-cpp/eigen:3 >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-cpp/eigen:3 dev-libs/boost:= >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Extra nodes and plugins for mavros
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/mavros_extras
 IUSE=python_targets_python2_7 test
 LICENSE=GPL-3 LGPL-3 BSD
-RDEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-cpp/eigen:3 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=dev-ros/image_transport dev-ros/cv_bridge dev-ros/mavros dev-ros/roscpp dev-ros/mavros_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/visualization_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-cpp/eigen:3 dev-libs/boost:= dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3077e72f0b52008fe7e8947590767622
+_md5_=950487a5a73740784d509733f8069e9b
diff --git a/metadata/md5-cache/dev-ros/move_base-1.13.0 b/metadata/md5-cache/dev-ros/move_base-1.13.0
deleted file mode 100644
index 302eb2123907..000000000000
--- a/metadata/md5-cache/dev-ros/move_base-1.13.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/pluginlib dev-ros/actionlib dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/tf dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Given a goal in the world, will attempt to reach it with a mobile base
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/move_base
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/pluginlib dev-ros/actionlib dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/tf dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.13.0.tar.gz -> navigation-1.13.0.tar.gz
-_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5ab0d0027ae7b8c918f7004c202c5828
diff --git a/metadata/md5-cache/dev-ros/move_base-1.13.1 b/metadata/md5-cache/dev-ros/move_base-1.13.1
deleted file mode 100644
index 8778f82d2bac..000000000000
--- a/metadata/md5-cache/dev-ros/move_base-1.13.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-ros/costmap_2d-1.13.1 dev-ros/roscpp dev-ros/pluginlib dev-ros/actionlib dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/tf dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Given a goal in the world, will attempt to reach it with a mobile base
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/move_base
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=>=dev-ros/costmap_2d-1.13.1 dev-ros/roscpp dev-ros/pluginlib dev-ros/actionlib dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/nav_core dev-ros/tf dev-ros/move_base_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-cpp/eigen:3 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.13.1.tar.gz -> navigation-1.13.1.tar.gz
-_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=97d9ba6231b96fa437b3740123d1b60d
diff --git a/metadata/md5-cache/dev-ros/navfn-1.13.1-r1 b/metadata/md5-cache/dev-ros/navfn-1.13.1-r1
deleted file mode 100644
index 2585916b873b..000000000000
--- a/metadata/md5-cache/dev-ros/navfn-1.13.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/costmap_2d dev-ros/nav_core dev-ros/pcl_conversions dev-ros/pcl_ros dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/visualization_msgs dev-cpp/eigen:3 sci-libs/pcl x11-libs/fltk media-libs/netpbm test? ( dev-cpp/gtest ) dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-DESCRIPTION=Fast interpolated navigation function that can be used to create plans for a mobile base
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/navfn
-IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/costmap_2d dev-ros/nav_core dev-ros/pcl_conversions dev-ros/pcl_ros dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/visualization_msgs dev-cpp/eigen:3 sci-libs/pcl x11-libs/fltk media-libs/netpbm dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.13.1.tar.gz -> navigation-1.13.1.tar.gz
-_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3e881e24cc3367edfbdb49402623bebc
diff --git a/metadata/md5-cache/dev-ros/navfn-1.14.0 b/metadata/md5-cache/dev-ros/navfn-1.14.0
deleted file mode 100644
index 082295fef3c0..000000000000
--- a/metadata/md5-cache/dev-ros/navfn-1.14.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/costmap_2d dev-ros/nav_core dev-ros/pcl_conversions dev-ros/pcl_ros dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/visualization_msgs dev-cpp/eigen:3 sci-libs/pcl x11-libs/fltk media-libs/netpbm test? ( dev-cpp/gtest ) dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-DESCRIPTION=Fast interpolated navigation function that can be used to create plans for a mobile base
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/navfn
-IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/costmap_2d dev-ros/nav_core dev-ros/pcl_conversions dev-ros/pcl_ros dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/visualization_msgs dev-cpp/eigen:3 sci-libs/pcl x11-libs/fltk media-libs/netpbm dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.14.0.tar.gz -> navigation-1.14.0.tar.gz
-_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=00a7ebbe47e3d170d16d6599f47c20da
diff --git a/metadata/md5-cache/dev-ros/navfn-1.14.0-r1 b/metadata/md5-cache/dev-ros/navfn-1.14.0-r1
new file mode 100644
index 000000000000..213ec0049bbd
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/navfn-1.14.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/costmap_2d dev-ros/nav_core dev-ros/pcl_conversions dev-ros/pcl_ros dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/visualization_msgs dev-cpp/eigen:3 sci-libs/pcl x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) dev-ros/cmake_modules sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Fast interpolated navigation function that can be used to create plans for a mobile base
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/navfn
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/costmap_2d dev-ros/nav_core dev-ros/pcl_conversions dev-ros/pcl_ros dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/visualization_msgs dev-cpp/eigen:3 sci-libs/pcl x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+SLOT=0
+SRC_URI=https://github.com/ros-planning/navigation/archive/1.14.0.tar.gz -> navigation-1.14.0.tar.gz
+_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=09911cc227cbdd89fbae37d06fa45b10
diff --git a/metadata/md5-cache/dev-ros/navfn-9999 b/metadata/md5-cache/dev-ros/navfn-9999
index 6be37efbdbc7..51617c12fdf6 100644
--- a/metadata/md5-cache/dev-ros/navfn-9999
+++ b/metadata/md5-cache/dev-ros/navfn-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/costmap_2d dev-ros/nav_core dev-ros/pcl_conversions dev-ros/pcl_ros dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/visualization_msgs dev-cpp/eigen:3 sci-libs/pcl x11-libs/fltk media-libs/netpbm test? ( dev-cpp/gtest ) dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/costmap_2d dev-ros/nav_core dev-ros/pcl_conversions dev-ros/pcl_ros dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/visualization_msgs dev-cpp/eigen:3 sci-libs/pcl x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] test? ( dev-cpp/gtest ) dev-ros/cmake_modules >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Fast interpolated navigation function that can be used to create plans for a mobile base
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/navfn
 IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
-RDEPEND=dev-ros/costmap_2d dev-ros/nav_core dev-ros/pcl_conversions dev-ros/pcl_ros dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/visualization_msgs dev-cpp/eigen:3 sci-libs/pcl x11-libs/fltk media-libs/netpbm dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+RDEPEND=dev-ros/costmap_2d dev-ros/nav_core dev-ros/pcl_conversions dev-ros/pcl_ros dev-ros/pluginlib dev-ros/roscpp dev-ros/tf dev-ros/visualization_msgs dev-cpp/eigen:3 sci-libs/pcl x11-libs/fltk media-libs/netpbm dev-libs/boost:=[threads] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/nav_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/nav_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 SLOT=0
 _eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=3e881e24cc3367edfbdb49402623bebc
+_md5_=09911cc227cbdd89fbae37d06fa45b10
diff --git a/metadata/md5-cache/dev-ros/pcl_ros-1.4.1-r1 b/metadata/md5-cache/dev-ros/pcl_ros-1.4.1-r2
similarity index 61%
rename from metadata/md5-cache/dev-ros/pcl_ros-1.4.1-r1
rename to metadata/md5-cache/dev-ros/pcl_ros-1.4.1-r2
index 66120dbfd7e9..4b7a2136d66e 100644
--- a/metadata/md5-cache/dev-ros/pcl_ros-1.4.1-r1
+++ b/metadata/md5-cache/dev-ros/pcl_ros-1.4.1-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=PCL (Point Cloud Library) ROS interface stack
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pcl_ros
 IUSE=python_targets_python2_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 SRC_URI=https://github.com/ros-perception/perception_pcl/archive/1.4.1.tar.gz -> perception_pcl-1.4.1.tar.gz
 _eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1965b9abb52036a644e0650dd136e2e9
+_md5_=3ef060c99575f29020f98aa44c69c9c5
diff --git a/metadata/md5-cache/dev-ros/pcl_ros-9999 b/metadata/md5-cache/dev-ros/pcl_ros-9999
index 35f137b78d58..e4246d250692 100644
--- a/metadata/md5-cache/dev-ros/pcl_ros-9999
+++ b/metadata/md5-cache/dev-ros/pcl_ros-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=PCL (Point Cloud Library) ROS interface stack
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/pcl_ros
 IUSE=python_targets_python2_7 test
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=dev-ros/roscpp dev-ros/rosbag dev-ros/rosconsole dev-ros/roslib dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-cpp/eigen-3.2.5:3 dev-ros/pluginlib dev-ros/tf dev-ros/tf2 dev-ros/tf2_ros dev-ros/tf2_eigen dev-ros/nodelet dev-ros/nodelet_topic_tools sci-libs/pcl:=[qhull] >=dev-ros/pcl_conversions-0.2.1-r1 dev-libs/boost:=[threads] dev-ros/pcl_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1965b9abb52036a644e0650dd136e2e9
+_md5_=3ef060c99575f29020f98aa44c69c9c5
diff --git a/metadata/md5-cache/dev-ros/robot_pose_ekf-1.13.0 b/metadata/md5-cache/dev-ros/robot_pose_ekf-1.13.0
deleted file mode 100644
index 831c47a082b0..000000000000
--- a/metadata/md5-cache/dev-ros/robot_pose_ekf-1.13.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] sci-libs/orocos-bfl test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-DESCRIPTION=Estimate the 3D pose of a robot, based on (partial) pose measurements coming from different sources
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/robot_pose_ekf
-IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] sci-libs/orocos-bfl dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.13.0.tar.gz -> navigation-1.13.0.tar.gz
-_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9c4536be941283bdf17ac8066808107d
diff --git a/metadata/md5-cache/dev-ros/robot_pose_ekf-1.13.1 b/metadata/md5-cache/dev-ros/robot_pose_ekf-1.13.1
deleted file mode 100644
index 1fa2831ab277..000000000000
--- a/metadata/md5-cache/dev-ros/robot_pose_ekf-1.13.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] sci-libs/orocos-bfl test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-DESCRIPTION=Estimate the 3D pose of a robot, based on (partial) pose measurements coming from different sources
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/robot_pose_ekf
-IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] sci-libs/orocos-bfl dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-SLOT=0
-SRC_URI=https://github.com/ros-planning/navigation/archive/1.13.1.tar.gz -> navigation-1.13.1.tar.gz
-_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9c4536be941283bdf17ac8066808107d
diff --git a/metadata/md5-cache/dev-ros/robot_pose_ekf-1.14.0 b/metadata/md5-cache/dev-ros/robot_pose_ekf-1.14.0
index caa149dfaf80..a28fae4fbea1 100644
--- a/metadata/md5-cache/dev-ros/robot_pose_ekf-1.14.0
+++ b/metadata/md5-cache/dev-ros/robot_pose_ekf-1.14.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] sci-libs/orocos-bfl test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] sci-libs/orocos-bfl dev-libs/boost:=[threads] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Estimate the 3D pose of a robot, based on (partial) pose measurements coming from different sources
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/robot_pose_ekf
 IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] sci-libs/orocos-bfl dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] sci-libs/orocos-bfl dev-libs/boost:=[threads] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 SLOT=0
 SRC_URI=https://github.com/ros-planning/navigation/archive/1.14.0.tar.gz -> navigation-1.14.0.tar.gz
 _eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f06cfef0572661d0c64b8c17cda70824
+_md5_=b5caec9b2fd5791bb6b8310e271a15ad
diff --git a/metadata/md5-cache/dev-ros/robot_pose_ekf-9999 b/metadata/md5-cache/dev-ros/robot_pose_ekf-9999
index dd96195c3b41..c2f370370e59 100644
--- a/metadata/md5-cache/dev-ros/robot_pose_ekf-9999
+++ b/metadata/md5-cache/dev-ros/robot_pose_ekf-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] sci-libs/orocos-bfl test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] sci-libs/orocos-bfl dev-libs/boost:=[threads] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/pkgconfig >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Estimate the 3D pose of a robot, based on (partial) pose measurements coming from different sources
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/robot_pose_ekf
 IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] sci-libs/orocos-bfl dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+RDEPEND=dev-ros/roscpp dev-ros/tf dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] sci-libs/orocos-bfl dev-libs/boost:=[threads] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 SLOT=0
 _eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9c4536be941283bdf17ac8066808107d
+_md5_=b5caec9b2fd5791bb6b8310e271a15ad
diff --git a/metadata/md5-cache/dev-ros/stereo_image_proc-1.12.14 b/metadata/md5-cache/dev-ros/stereo_image_proc-1.12.14
deleted file mode 100644
index 6b5a4ccd41f1..000000000000
--- a/metadata/md5-cache/dev-ros/stereo_image_proc-1.12.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] media-libs/opencv sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Stereo and single image rectification and disparity processing
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/stereo_image_proc
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] media-libs/opencv dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.14.tar.gz -> image_pipeline-1.12.14.tar.gz
-_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=91afb6ffa6a8780f62d5877689b42ead
diff --git a/metadata/md5-cache/dev-ros/stereo_image_proc-1.12.15 b/metadata/md5-cache/dev-ros/stereo_image_proc-1.12.15
deleted file mode 100644
index d76d2e69158f..000000000000
--- a/metadata/md5-cache/dev-ros/stereo_image_proc-1.12.15
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] media-libs/opencv sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Stereo and single image rectification and disparity processing
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/stereo_image_proc
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] media-libs/opencv dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.15.tar.gz -> image_pipeline-1.12.15.tar.gz
-_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=91afb6ffa6a8780f62d5877689b42ead
diff --git a/metadata/md5-cache/dev-ros/stereo_image_proc-1.12.16 b/metadata/md5-cache/dev-ros/stereo_image_proc-1.12.16
deleted file mode 100644
index 3c07b3e35ddd..000000000000
--- a/metadata/md5-cache/dev-ros/stereo_image_proc-1.12.16
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] media-libs/opencv sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Stereo and single image rectification and disparity processing
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/stereo_image_proc
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] media-libs/opencv dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.16.tar.gz -> image_pipeline-1.12.16.tar.gz
-_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=91afb6ffa6a8780f62d5877689b42ead
diff --git a/metadata/md5-cache/dev-ros/stereo_image_proc-1.12.18 b/metadata/md5-cache/dev-ros/stereo_image_proc-1.12.18
deleted file mode 100644
index 333a389a6174..000000000000
--- a/metadata/md5-cache/dev-ros/stereo_image_proc-1.12.18
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] media-libs/opencv sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Stereo and single image rectification and disparity processing
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/stereo_image_proc
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] media-libs/opencv dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.18.tar.gz -> image_pipeline-1.12.18.tar.gz
-_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a43578251261e93da15bd2092278ae8e
diff --git a/metadata/md5-cache/dev-ros/stereo_image_proc-1.12.19 b/metadata/md5-cache/dev-ros/stereo_image_proc-1.12.19-r1
similarity index 65%
rename from metadata/md5-cache/dev-ros/stereo_image_proc-1.12.19
rename to metadata/md5-cache/dev-ros/stereo_image_proc-1.12.19-r1
index e8c037ec98ef..e0d3553ab8c6 100644
--- a/metadata/md5-cache/dev-ros/stereo_image_proc-1.12.19
+++ b/metadata/md5-cache/dev-ros/stereo_image_proc-1.12.19-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] media-libs/opencv sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] media-libs/opencv dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Stereo and single image rectification and disparity processing
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/stereo_image_proc
 IUSE=python_targets_python2_7 test
 KEYWORDS=~amd64 ~arm
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] media-libs/opencv dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] media-libs/opencv dev-libs/boost:=[threads] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 SRC_URI=https://github.com/ros-perception/image_pipeline/archive/1.12.19.tar.gz -> image_pipeline-1.12.19.tar.gz
 _eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=a43578251261e93da15bd2092278ae8e
+_md5_=9d65296fdfa5e71820926e1c8b760ca9
diff --git a/metadata/md5-cache/dev-ros/stereo_image_proc-9999 b/metadata/md5-cache/dev-ros/stereo_image_proc-9999
index 7046b12f60c2..b673cd22542d 100644
--- a/metadata/md5-cache/dev-ros/stereo_image_proc-9999
+++ b/metadata/md5-cache/dev-ros/stereo_image_proc-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] media-libs/opencv >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] media-libs/opencv dev-libs/boost:=[threads] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Stereo and single image rectification and disparity processing
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/stereo_image_proc
 IUSE=python_targets_python2_7 test
 LICENSE=BSD
-RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] media-libs/opencv dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=dev-ros/cv_bridge dev-ros/dynamic_reconfigure dev-ros/image_geometry dev-ros/image_proc dev-ros/image_transport dev-ros/message_filters dev-ros/nodelet dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/stereo_msgs[ros_messages_cxx(-)] media-libs/opencv dev-libs/boost:=[threads] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=91afb6ffa6a8780f62d5877689b42ead
+_md5_=9d65296fdfa5e71820926e1c8b760ca9
diff --git a/metadata/md5-cache/dev-ros/tf2-0.5.12 b/metadata/md5-cache/dev-ros/tf2-0.5.12
deleted file mode 100644
index 644082de9968..000000000000
--- a/metadata/md5-cache/dev-ros/tf2-0.5.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-libs/console_bridge dev-ros/rostime dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-libs/boost:=[threads] sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin dev-python/empy
-DESCRIPTION=The second generation Transform Library in ROS
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/tf2
-IUSE=test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/tf2_msgs[ros_messages_cxx(-)] dev-libs/console_bridge dev-ros/rostime dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-libs/boost:=[threads] dev-util/catkin dev-python/empy
-SLOT=0
-SRC_URI=https://github.com/ros/geometry_experimental/archive/0.5.12.tar.gz -> geometry_experimental-0.5.12.tar.gz
-_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1ee65e82f814e05c778ece5a405155f6
diff --git a/metadata/md5-cache/dev-ros/tf2_ros-0.5.12 b/metadata/md5-cache/dev-ros/tf2_ros-0.5.12
deleted file mode 100644
index 64b18b3e54d6..000000000000
--- a/metadata/md5-cache/dev-ros/tf2_ros-0.5.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=ROS bindings for the tf2 library, for both Python and C++
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/tf2_ros
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=https://github.com/ros/geometry_experimental/archive/0.5.12.tar.gz -> geometry_experimental-0.5.12.tar.gz
-_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b1f8040d680f08ca9abb6d04650a3228
diff --git a/metadata/md5-cache/dev-ros/tf2_ros-0.5.13 b/metadata/md5-cache/dev-ros/tf2_ros-0.5.13
deleted file mode 100644
index 98b60d892d97..000000000000
--- a/metadata/md5-cache/dev-ros/tf2_ros-0.5.13
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=ROS bindings for the tf2 library, for both Python and C++
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/tf2_ros
-IUSE=python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm
-LICENSE=BSD
-RDEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-SLOT=0
-SRC_URI=https://github.com/ros/geometry_experimental/archive/0.5.13.tar.gz -> geometry_experimental-0.5.13.tar.gz
-_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b1f8040d680f08ca9abb6d04650a3228
diff --git a/metadata/md5-cache/dev-ros/tf2_ros-0.5.13-r1 b/metadata/md5-cache/dev-ros/tf2_ros-0.5.13-r1
new file mode 100644
index 000000000000..a221db8a0677
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/tf2_ros-0.5.13-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=ROS bindings for the tf2 library, for both Python and C++
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/tf2_ros
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+SLOT=0
+SRC_URI=https://github.com/ros/geometry_experimental/archive/0.5.13.tar.gz -> geometry_experimental-0.5.13.tar.gz
+_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=5d2f535ea05b832f7a29579e8fba4393
diff --git a/metadata/md5-cache/dev-ros/tf2_ros-9999 b/metadata/md5-cache/dev-ros/tf2_ros-9999
index d8353e6486c1..8da069af3851 100644
--- a/metadata/md5-cache/dev-ros/tf2_ros-9999
+++ b/metadata/md5-cache/dev-ros/tf2_ros-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] test? ( dev-ros/rostest[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-2.8.12 dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=ROS bindings for the tf2 library, for both Python and C++
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/tf2_ros
 IUSE=python_targets_python2_7 test
 LICENSE=BSD
-RDEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=dev-ros/actionlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/message_filters dev-ros/roscpp dev-ros/rosgraph dev-libs/boost:=[threads] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/tf2 dev-ros/tf2_py[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/actionlib_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-ros/tf2_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),ros_messages_cxx(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/python-exec:2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 SLOT=0
 _eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	ros-catkin	8b7e3d7128bd81dfe56a947e63201e78	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b1f8040d680f08ca9abb6d04650a3228
+_md5_=5d2f535ea05b832f7a29579e8fba4393
diff --git a/metadata/md5-cache/games-emulation/mgba-0.5.1 b/metadata/md5-cache/games-emulation/mgba-0.5.1
new file mode 100644
index 000000000000..b9f70672d03a
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/mgba-0.5.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=media-libs/libpng:0= sys-libs/zlib[minizip] ffmpeg? ( virtual/ffmpeg ) imagemagick? ( media-gfx/imagemagick:= ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] ) >=dev-util/cmake-3.2.2 >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12
+DESCRIPTION=A new Game Boy Advance emulator written in C.
+EAPI=6
+HOMEPAGE=https://mgba.io
+IUSE=ffmpeg imagemagick opengl qt5 +sdl
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0
+RDEPEND=media-libs/libpng:0= sys-libs/zlib[minizip] ffmpeg? ( virtual/ffmpeg ) imagemagick? ( media-gfx/imagemagick:= ) opengl? ( virtual/opengl ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtwidgets:5 opengl? ( dev-qt/qtopengl:5 ) ) sdl? ( media-libs/libsdl2[X,sound,joystick,video,opengl?] )
+REQUIRED_USE=|| ( qt5 sdl ) qt5? ( opengl )
+SLOT=0
+SRC_URI=https://github.com/mgba-emu/mgba/archive/0.5.1.tar.gz -> mgba-0.5.1.tar.gz
+_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=e148e4772a42e0946a22266cb6b767d4
diff --git a/metadata/md5-cache/kde-apps/kdepimlibs-4.14.10-r1 b/metadata/md5-cache/kde-apps/kdepimlibs-4.14.10-r1
new file mode 100644
index 000000000000..6579783c00ec
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepimlibs-4.14.10-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=!kde-misc/akonadi-social-utils >=app-crypt/gpgme-1.1.6 >=app-office/akonadi-server-1.12.90[qt4(+)] >=dev-libs/boost-1.35.0-r5:= dev-libs/libgpg-error >=dev-libs/libical-0.48-r2:= dev-libs/cyrus-sasl >=dev-libs/qjson-0.8.1 media-libs/phonon[qt4] x11-misc/shared-mime-info prison? ( media-libs/prison:4 ) ldap? ( net-nds/openldap ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 test? ( dev-util/cppunit ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
+DESCRIPTION=Common library for KDE PIM apps
+EAPI=5
+HOMEPAGE=https://www.kde.org/
+IUSE=debug ldap prison test +handbook aqua
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=!kde-misc/akonadi-social-utils >=app-crypt/gpgme-1.1.6 >=app-office/akonadi-server-1.12.90[qt4(+)] >=dev-libs/boost-1.35.0-r5:= dev-libs/libgpg-error >=dev-libs/libical-0.48-r2:= dev-libs/cyrus-sasl >=dev-libs/qjson-0.8.1 media-libs/phonon[qt4] x11-misc/shared-mime-info prison? ( media-libs/prison:4 ) ldap? ( net-nds/openldap ) !=kde-apps/kdepim-runtime-4.10* !=kde-apps/kdepim-runtime-4.11* !<kde-apps/kdepim-runtime-4.4.11.1-r2:4 !kde-base/kdepimlibs:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
+RESTRICT=test
+SLOT=4/4.14
+SRC_URI=mirror://kde/Attic/applications/15.04.3/src/kdepimlibs-4.14.10.tar.xz
+_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	8a4cfd7f1a927a64f5dbcc8f3277ec51	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=4a0b2f7f055d341f375203adb7c2943d
diff --git a/metadata/md5-cache/kde-apps/kdepimlibs-4.14.11_pre20160211-r1 b/metadata/md5-cache/kde-apps/kdepimlibs-4.14.11_pre20160211-r1
new file mode 100644
index 000000000000..a053b554da5b
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kdepimlibs-4.14.11_pre20160211-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=app-crypt/gpgme-1.1.6 >=app-office/akonadi-server-1.12.90[qt4(+)] >=dev-libs/boost-1.35.0-r5:= dev-libs/libgpg-error >=dev-libs/libical-0.48-r2:= dev-libs/cyrus-sasl >=dev-libs/qjson-0.8.1 media-libs/phonon[qt4] x11-misc/shared-mime-info prison? ( media-libs/prison:4 ) ldap? ( net-nds/openldap ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.12 test? ( dev-util/cppunit ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
+DESCRIPTION=Common library for KDE PIM apps
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug ldap prison test +handbook aqua
+KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=>=app-crypt/gpgme-1.1.6 >=app-office/akonadi-server-1.12.90[qt4(+)] >=dev-libs/boost-1.35.0-r5:= dev-libs/libgpg-error >=dev-libs/libical-0.48-r2:= dev-libs/cyrus-sasl >=dev-libs/qjson-0.8.1 media-libs/phonon[qt4] x11-misc/shared-mime-info prison? ( media-libs/prison:4 ) ldap? ( net-nds/openldap ) !<kde-apps/kdepim-runtime-4.4.11.1-r2:4 !kde-misc/akonadi-social-utils !kde-base/kdepimlibs:4 kde-frameworks/oxygen-icons handbook? ( >=kde-base/kdelibs-4.14.3:4[aqua=,handbook] ) dev-lang/perl >=dev-qt/qt3support-4.8.5:4[accessibility] >=dev-qt/qtcore-4.8.5:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/designer-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsql-4.8.5:4[qt3support] >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 >=kde-base/kdelibs-4.14.22:4[aqua=]
+RESTRICT=test
+SLOT=4/4.14
+SRC_URI=https://quickgit.kde.org/?p=kdepimlibs.git&a=snapshot&h=a791b69599c3571ff2f4b1cc9033d8fb30f1bc33&fmt=tgz -> kdepimlibs-4.14.11_pre20160211.tar.gz
+_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	kde4-base	dd93ab23a8421a2802d4c139cd30a3c0	kde4-functions	8a4cfd7f1a927a64f5dbcc8f3277ec51	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	virtualx	86c9305a59b3e0459e7fbef3a5f30b96	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=740261bdb70bb54cfb17a1ca9780ed15
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-45.3.0 b/metadata/md5-cache/mail-client/thunderbird-bin-45.3.0
deleted file mode 100644
index d23e24f5048a..000000000000
--- a/metadata/md5-cache/mail-client/thunderbird-bin-45.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm preinst unpack
-DEPEND=app-arch/unzip >=sys-apps/sed-4 app-arch/unzip
-DESCRIPTION=Thunderbird Mail Client
-EAPI=5
-HOMEPAGE=http://www.mozilla.com/thunderbird
-IUSE=+crashreporter selinux l10n_ar l10n_ast l10n_be l10n_bg l10n_bn-BD l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_lt l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_ta-LK l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW
-KEYWORDS=-* amd64 x86
-LICENSE=MPL-2.0 GPL-2 LGPL-2.1
-RDEPEND=virtual/freedesktop-icon-theme dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 >=media-libs/alsa-lib-1.0.16 media-libs/fontconfig >=media-libs/freetype-2.4.10:2 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-thunderbird )
-RESTRICT=strip mirror
-SLOT=0
-SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/ar.xpi -> thunderbird-45.3.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/ast.xpi -> thunderbird-45.3.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/be.xpi -> thunderbird-45.3.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/bg.xpi -> thunderbird-45.3.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-45.3.0-bn-BD.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/br.xpi -> thunderbird-45.3.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/ca.xpi -> thunderbird-45.3.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/cs.xpi -> thunderbird-45.3.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/cy.xpi -> thunderbird-45.3.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/da.xpi -> thunderbird-45.3.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/de.xpi -> thunderbird-45.3.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/el.xpi -> thunderbird-45.3.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/en-GB.xpi -> thunderbird-45.3.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/es-AR.xpi -> thunderbird-45.3.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/es-ES.xpi -> thunderbird-45.3.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/et.xpi -> thunderbird-45.3.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/eu.xpi -> thunderbird-45.3.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/fi.xpi -> thunderbird-45.3.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/fr.xpi -> thunderbird-45.3.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-45.3.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-45.3.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/gd.xpi -> thunderbird-45.3.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/gl.xpi -> thunderbird-45.3.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/he.xpi -> thunderbird-45.3.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/hr.xpi -> thunderbird-45.3.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/hsb.xpi -> thunderbird-45.3.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/hu.xpi -> thunderbird-45.3.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-45.3.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/id.xpi -> thunderbird-45.3.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/is.xpi -> thunderbird-45.3.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/it.xpi -> thunderbird-45.3.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/ja.xpi -> thunderbird-45.3.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/ko.xpi -> thunderbird-45.3.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/lt.xpi -> thunderbird-45.3.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-45.3.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/nl.xpi -> thunderbird-45.3.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-45.3.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-45.3.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/pl.xpi -> thunderbird-45.3.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-45.3.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-45.3.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/rm.xpi -> thunderbird-45.3.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/ro.xpi -> thunderbird-45.3.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/ru.xpi -> thunderbird-45.3.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/si.xpi -> thunderbird-45.3.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/sk.xpi -> thunderbird-45.3.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/sl.xpi -> thunderbird-45.3.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/sq.xpi -> thunderbird-45.3.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/sr.xpi -> thunderbird-45.3.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-45.3.0-sv-SE.xpi ) l10n_ta-LK? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-45.3.0-ta-LK.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/tr.xpi -> thunderbird-45.3.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/uk.xpi -> thunderbird-45.3.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/vi.xpi -> thunderbird-45.3.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-45.3.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-45.3.0-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-x86_64/en-US/thunderbird-45.3.0.tar.bz2 -> thunderbird-bin_x86_64-45.3.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/45.3.0/linux-i686/en-US/thunderbird-45.3.0.tar.bz2 -> thunderbird-bin_i686-45.3.0.tar.bz2 ) https://dev.gentoo.org/~axs/distfiles/lightning-4.7.3.tar.xz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	mozextension	3d8ee4835f89ff39d4666656aa603433	mozlinguas-v2	6b4ff6f2fa6cbc2d5c9543324a7cb1fc	multilib	165fc17c38d1b11dac2008280dab6e80	nsplugins	bf5bfcef1d2f0adad7e6230455df8e91	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=5356d8e6b9a1d1dc211c74c0cb5f09bc
diff --git a/metadata/md5-cache/mail-client/thunderbird-bin-45.4.0 b/metadata/md5-cache/mail-client/thunderbird-bin-45.4.0
new file mode 100644
index 000000000000..e9590524db15
--- /dev/null
+++ b/metadata/md5-cache/mail-client/thunderbird-bin-45.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst unpack
+DEPEND=app-arch/unzip >=sys-apps/sed-4 app-arch/unzip
+DESCRIPTION=Thunderbird Mail Client
+EAPI=5
+HOMEPAGE=http://www.mozilla.com/thunderbird
+IUSE=+crashreporter selinux l10n_ar l10n_ast l10n_be l10n_bg l10n_bn-BD l10n_br l10n_ca l10n_cs l10n_cy l10n_da l10n_de l10n_el l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_hy l10n_id l10n_is l10n_it l10n_ja l10n_ko l10n_lt l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_si l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_ta-LK l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW
+KEYWORDS=-* amd64 x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=virtual/freedesktop-icon-theme dev-libs/atk >=sys-apps/dbus-0.60 >=dev-libs/dbus-glib-0.72 >=dev-libs/glib-2.26:2 >=media-libs/alsa-lib-1.0.16 media-libs/fontconfig >=media-libs/freetype-2.4.10:2 >=x11-libs/cairo-1.10[X] x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.18:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libXt >=x11-libs/pango-1.22.0 crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-thunderbird )
+RESTRICT=strip mirror
+SLOT=0
+SRC_URI=l10n_ar? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/ar.xpi -> thunderbird-45.4.0-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/ast.xpi -> thunderbird-45.4.0-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/be.xpi -> thunderbird-45.4.0-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/bg.xpi -> thunderbird-45.4.0-bg.xpi ) l10n_bn-BD? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-45.4.0-bn-BD.xpi ) l10n_br? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/br.xpi -> thunderbird-45.4.0-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/ca.xpi -> thunderbird-45.4.0-ca.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/cs.xpi -> thunderbird-45.4.0-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/cy.xpi -> thunderbird-45.4.0-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/da.xpi -> thunderbird-45.4.0-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/de.xpi -> thunderbird-45.4.0-de.xpi ) l10n_el? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/el.xpi -> thunderbird-45.4.0-el.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/en-GB.xpi -> thunderbird-45.4.0-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/es-AR.xpi -> thunderbird-45.4.0-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/es-ES.xpi -> thunderbird-45.4.0-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/et.xpi -> thunderbird-45.4.0-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/eu.xpi -> thunderbird-45.4.0-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/fi.xpi -> thunderbird-45.4.0-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/fr.xpi -> thunderbird-45.4.0-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-45.4.0-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-45.4.0-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/gd.xpi -> thunderbird-45.4.0-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/gl.xpi -> thunderbird-45.4.0-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/he.xpi -> thunderbird-45.4.0-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/hr.xpi -> thunderbird-45.4.0-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/hsb.xpi -> thunderbird-45.4.0-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/hu.xpi -> thunderbird-45.4.0-hu.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/hy-AM.xpi -> thunderbird-45.4.0-hy-AM.xpi ) l10n_id? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/id.xpi -> thunderbird-45.4.0-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/is.xpi -> thunderbird-45.4.0-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/it.xpi -> thunderbird-45.4.0-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/ja.xpi -> thunderbird-45.4.0-ja.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/ko.xpi -> thunderbird-45.4.0-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/lt.xpi -> thunderbird-45.4.0-lt.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-45.4.0-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/nl.xpi -> thunderbird-45.4.0-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-45.4.0-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-45.4.0-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/pl.xpi -> thunderbird-45.4.0-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-45.4.0-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-45.4.0-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/rm.xpi -> thunderbird-45.4.0-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/ro.xpi -> thunderbird-45.4.0-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/ru.xpi -> thunderbird-45.4.0-ru.xpi ) l10n_si? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/si.xpi -> thunderbird-45.4.0-si.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/sk.xpi -> thunderbird-45.4.0-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/sl.xpi -> thunderbird-45.4.0-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/sq.xpi -> thunderbird-45.4.0-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/sr.xpi -> thunderbird-45.4.0-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-45.4.0-sv-SE.xpi ) l10n_ta-LK? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-45.4.0-ta-LK.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/tr.xpi -> thunderbird-45.4.0-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/uk.xpi -> thunderbird-45.4.0-uk.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/vi.xpi -> thunderbird-45.4.0-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-45.4.0-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-45.4.0-zh-TW.xpi ) amd64? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-x86_64/en-US/thunderbird-45.4.0.tar.bz2 -> thunderbird-bin_x86_64-45.4.0.tar.bz2 ) x86? ( https://archive.mozilla.org/pub/thunderbird/releases/45.4.0/linux-i686/en-US/thunderbird-45.4.0.tar.bz2 -> thunderbird-bin_i686-45.4.0.tar.bz2 ) https://dev.gentoo.org/~axs/distfiles/lightning-4.7.3.tar.xz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	fdo-mime	92d07846ea8ea54172f8c0112a47ae3d	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	mozextension	3d8ee4835f89ff39d4666656aa603433	mozlinguas-v2	6b4ff6f2fa6cbc2d5c9543324a7cb1fc	multilib	165fc17c38d1b11dac2008280dab6e80	nsplugins	bf5bfcef1d2f0adad7e6230455df8e91	pax-utils	4c2654a34ebe732e85fda354f6ee642f	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=5356d8e6b9a1d1dc211c74c0cb5f09bc
diff --git a/metadata/md5-cache/net-misc/cmst-2016.10.03 b/metadata/md5-cache/net-misc/cmst-2016.10.03
new file mode 100644
index 000000000000..cc59d619a799
--- /dev/null
+++ b/metadata/md5-cache/net-misc/cmst-2016.10.03
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5
+DESCRIPTION=Qt GUI for Connman with system tray icon
+EAPI=6
+HOMEPAGE=https://github.com/andrew-bibb/cmst
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 net-misc/connman
+SLOT=0
+SRC_URI=https://github.com/andrew-bibb/cmst/archive/cmst-2016.10.03.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=0c226e34e3d004153b49e60c140b2364
diff --git a/metadata/md5-cache/net-misc/quagga-1.0.20160315-r2 b/metadata/md5-cache/net-misc/quagga-1.0.20160315-r2
deleted file mode 100644
index a8f6114caaf0..000000000000
--- a/metadata/md5-cache/net-misc/quagga-1.0.20160315-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=caps? ( sys-libs/libcap ) snmp? ( net-analyzer/net-snmp ) readline? ( sys-libs/readline:0 pam? ( sys-libs/pam ) ) !elibc_glibc? ( dev-libs/libpcre ) app-arch/xz-utils sys-apps/gawk sys-devel/libtool:2 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=A free routing daemon replacing Zebra supporting RIP, OSPF and BGP
-EAPI=6
-HOMEPAGE=http://quagga.net/
-IUSE=bgpclassless caps doc elibc_glibc ipv6 multipath ospfapi pam +readline snmp tcp-zebra
-KEYWORDS=alpha amd64 arm hppa ppc ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=caps? ( sys-libs/libcap ) snmp? ( net-analyzer/net-snmp ) readline? ( sys-libs/readline:0 pam? ( sys-libs/pam ) ) !elibc_glibc? ( dev-libs/libpcre ) sys-apps/iproute2
-SLOT=0
-SRC_URI=mirror://nongnu/quagga/quagga-1.0.20160315.tar.xz bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/ht-20040304-classless-bgp.patch )
-_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=45f563080c28333bf0951575b274efb1
diff --git a/metadata/md5-cache/net-misc/quagga-1.0.20160315-r3 b/metadata/md5-cache/net-misc/quagga-1.0.20160315-r3
index 42a6169c3058..8c8227727c61 100644
--- a/metadata/md5-cache/net-misc/quagga-1.0.20160315-r3
+++ b/metadata/md5-cache/net-misc/quagga-1.0.20160315-r3
@@ -4,10 +4,10 @@ DESCRIPTION=A free routing daemon replacing Zebra supporting RIP, OSPF and BGP
 EAPI=6
 HOMEPAGE=http://quagga.net/
 IUSE=bgpclassless caps doc elibc_glibc ipv6 multipath ospfapi pam +readline snmp tcp-zebra
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86
+KEYWORDS=alpha amd64 arm hppa ppc ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=caps? ( sys-libs/libcap ) snmp? ( net-analyzer/net-snmp ) readline? ( sys-libs/readline:0 pam? ( sys-libs/pam ) ) !elibc_glibc? ( dev-libs/libpcre ) sys-apps/iproute2
 SLOT=0
 SRC_URI=mirror://nongnu/quagga/quagga-1.0.20160315.tar.xz bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/ht-20040304-classless-bgp.patch )
 _eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	multilib	165fc17c38d1b11dac2008280dab6e80	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	readme.gentoo-r1	03878c06495db70bc36bd717383c09f7	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87
-_md5_=9ad1ae6e7a069d1f0181d95d737d52af
+_md5_=37f53627cf23f4da4b453931873b7aee
diff --git a/metadata/md5-cache/net-nds/rpcbind-0.2.3-r2 b/metadata/md5-cache/net-nds/rpcbind-0.2.3-r2
new file mode 100644
index 000000000000..ead2dabef737
--- /dev/null
+++ b/metadata/md5-cache/net-nds/rpcbind-0.2.3-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=net-libs/libtirpc-0.2.3:= systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=portmap replacement which supports RPC over various protocols
+EAPI=5
+HOMEPAGE=https://sourceforge.net/projects/rpcbind/
+IUSE=debug selinux systemd tcpd warmstarts
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=net-libs/libtirpc-0.2.3:= systemd? ( sys-apps/systemd:= ) tcpd? ( sys-apps/tcp-wrappers ) selinux? ( sec-policy/selinux-rpcbind )
+SLOT=0
+SRC_URI=mirror://sourceforge/rpcbind/rpcbind-0.2.3.tar.bz2
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	systemd	3165c885f3c71ffae7a867d931fb0e07	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=ddc5f9ef6bf182a9caa257182a9737dc
diff --git a/metadata/md5-cache/net-p2p/go-ethereum-1.4.16-r1 b/metadata/md5-cache/net-p2p/go-ethereum-1.4.16-r1
new file mode 100644
index 000000000000..088cb2c10e6d
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/go-ethereum-1.4.16-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-lang/go:=
+DESCRIPTION=Official golang implementation of the Ethereum protocol
+EAPI=6
+HOMEPAGE=https://github.com/ethereum/go-ethereum
+IUSE=evm
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ LGPL-3+
+RDEPEND=dev-lang/go:=
+SLOT=0
+SRC_URI=https://github.com/ethereum/go-ethereum/archive/v1.4.16.tar.gz -> go-ethereum-1.4.16.tar.gz
+_md5_=96b67598d828b7b3407c1ea6b62f3862
diff --git a/metadata/md5-cache/sci-electronics/gazebo-7.3.1 b/metadata/md5-cache/sci-electronics/gazebo-7.3.1
index ef81ad6e257e..ea10271e7b7e 100644
--- a/metadata/md5-cache/sci-electronics/gazebo-7.3.1
+++ b/metadata/md5-cache/sci-electronics/gazebo-7.3.1
@@ -10,4 +10,4 @@ RDEPEND==dev-libs/protobuf-2*:= virtual/opengl media-libs/openal net-misc/curl d
 SLOT=0
 SRC_URI=http://osrf-distributions.s3.amazonaws.com/gazebo/releases/gazebo-7.3.1.tar.bz2
 _eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	vcs-snapshot	2b65ecb2d0f91e4322c2ac8d673993bd	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=98e47e2a63847a428fc722f9fc46d427
+_md5_=a27561d1a2a7abaff4ba199234a0121d
diff --git a/metadata/md5-cache/sys-apps/checkpolicy-2.6_rc1 b/metadata/md5-cache/sys-apps/checkpolicy-2.6_rc2
similarity index 61%
rename from metadata/md5-cache/sys-apps/checkpolicy-2.6_rc1
rename to metadata/md5-cache/sys-apps/checkpolicy-2.6_rc2
index d2f6f5eb0596..1dfc99deb578 100644
--- a/metadata/md5-cache/sys-apps/checkpolicy-2.6_rc1
+++ b/metadata/md5-cache/sys-apps/checkpolicy-2.6_rc2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst
-DEPEND=>=sys-libs/libsepol-2.6_rc1 >=sys-libs/libsemanage-2.6_rc1 sys-devel/flex sys-devel/bison
+DEPEND=>=sys-libs/libsepol-2.6_rc2 >=sys-libs/libsemanage-2.6_rc2 sys-devel/flex sys-devel/bison
 DESCRIPTION=SELinux policy compiler
 EAPI=6
 HOMEPAGE=http://userspace.selinuxproject.org
 IUSE=debug
 KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
-RDEPEND=>=sys-libs/libsemanage-2.6_rc1
+RDEPEND=>=sys-libs/libsemanage-2.6_rc2
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160930/checkpolicy-2.6-rc1.tar.gz
+SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161006/checkpolicy-2.6-rc2.tar.gz
 _eclasses_=multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=5e478da90f7957ea18e00112973fe919
+_md5_=ca603d56cd681018e5ea730e48af2b00
diff --git a/metadata/md5-cache/sys-apps/checkpolicy-9999 b/metadata/md5-cache/sys-apps/checkpolicy-9999
index 6abcc4794a8a..81444b19dbed 100644
--- a/metadata/md5-cache/sys-apps/checkpolicy-9999
+++ b/metadata/md5-cache/sys-apps/checkpolicy-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/libsemanage-9999
 SLOT=0
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=5e478da90f7957ea18e00112973fe919
+_md5_=ca603d56cd681018e5ea730e48af2b00
diff --git a/metadata/md5-cache/sys-apps/openrc-0.22.2 b/metadata/md5-cache/sys-apps/openrc-0.22.2
new file mode 100644
index 000000000000..386618e8dedf
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/openrc-0.22.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst preinst prepare
+DEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) tools? ( dev-lang/perl ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils sys-libs/libselinux ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 virtual/os-headers ncurses? ( virtual/pkgconfig )
+DESCRIPTION=OpenRC manages the services, startup and shutdown of a host
+EAPI=6
+HOMEPAGE=https://github.com/openrc/openrc/
+IUSE=audit debug ncurses pam newnet prefix +netifrc selinux static-libs tools unicode kernel_linux kernel_FreeBSD
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=BSD-2
+PDEPEND=netifrc? ( net-misc/netifrc )
+RDEPEND=kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) ) ncurses? ( sys-libs/ncurses:0= ) pam? ( sys-auth/pambase virtual/pam ) tools? ( dev-lang/perl ) audit? ( sys-process/audit ) kernel_linux? ( sys-process/psmisc !<sys-process/procps-3.3.9-r2 ) selinux? ( sys-apps/policycoreutils sys-libs/libselinux ) !<sys-apps/baselayout-2.1-r1 !<sys-fs/udev-init-scripts-27 !prefix? ( kernel_linux? ( || ( >=sys-apps/sysvinit-2.86-r6 sys-process/runit ) ) kernel_FreeBSD? ( sys-freebsd/freebsd-sbin ) ) selinux? ( sec-policy/selinux-base-policy sec-policy/selinux-openrc )
+SLOT=0
+SRC_URI=https://github.com/openrc/openrc/archive/0.22.2.tar.gz -> openrc-0.22.2.tar.gz
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=18b225d627812b5c90d557cccad8dcd8
diff --git a/metadata/md5-cache/sys-apps/policycoreutils-2.6_rc1 b/metadata/md5-cache/sys-apps/policycoreutils-2.6_rc2
similarity index 83%
rename from metadata/md5-cache/sys-apps/policycoreutils-2.6_rc1
rename to metadata/md5-cache/sys-apps/policycoreutils-2.6_rc2
index 62d16b918056..a15201b63f96 100644
--- a/metadata/md5-cache/sys-apps/policycoreutils-2.6_rc1
+++ b/metadata/md5-cache/sys-apps/policycoreutils-2.6_rc2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile install postinst prepare unpack
-DEPEND=>=sys-libs/libselinux-2.6_rc1:=[python] >=sys-libs/glibc-2.4 >=sys-libs/libcap-1.10-r10:= >=sys-libs/libsemanage-2.6_rc1:=[python] sys-libs/libcap-ng:= >=sys-libs/libsepol-2.6_rc1:= >=app-admin/setools-4.0 sys-devel/gettext dev-python/ipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dbus? ( sys-apps/dbus dev-libs/dbus-glib:= ) audit? ( >=sys-process/audit-1.5.1 ) pam? ( sys-libs/pam:= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !<sec-policy/selinux-base-policy-2.20151208-r6
+DEPEND=>=sys-libs/libselinux-2.6_rc2:=[python] >=sys-libs/glibc-2.4 >=sys-libs/libcap-1.10-r10:= >=sys-libs/libsemanage-2.6_rc2:=[python] sys-libs/libcap-ng:= >=sys-libs/libsepol-2.6_rc2:= >=app-admin/setools-4.0 sys-devel/gettext dev-python/ipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dbus? ( sys-apps/dbus dev-libs/dbus-glib:= ) audit? ( >=sys-process/audit-1.5.1 ) pam? ( sys-libs/pam:= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !<sec-policy/selinux-base-policy-2.20151208-r6
 DESCRIPTION=SELinux core utilities
 EAPI=6
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
 IUSE=audit pam dbus python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
 KEYWORDS=~amd64 ~arm64 ~mips ~x86
 LICENSE=GPL-2
-RDEPEND=>=sys-libs/libselinux-2.6_rc1:=[python] >=sys-libs/glibc-2.4 >=sys-libs/libcap-1.10-r10:= >=sys-libs/libsemanage-2.6_rc1:=[python] sys-libs/libcap-ng:= >=sys-libs/libsepol-2.6_rc1:= >=app-admin/setools-4.0 sys-devel/gettext dev-python/ipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dbus? ( sys-apps/dbus dev-libs/dbus-glib:= ) audit? ( >=sys-process/audit-1.5.1 ) pam? ( sys-libs/pam:= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !<sec-policy/selinux-base-policy-2.20151208-r6 dev-python/sepolgen app-misc/pax-utils !<sys-apps/openrc-0.14
+RDEPEND=>=sys-libs/libselinux-2.6_rc2:=[python] >=sys-libs/glibc-2.4 >=sys-libs/libcap-1.10-r10:= >=sys-libs/libsemanage-2.6_rc2:=[python] sys-libs/libcap-ng:= >=sys-libs/libsepol-2.6_rc2:= >=app-admin/setools-4.0 sys-devel/gettext dev-python/ipy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dbus? ( sys-apps/dbus dev-libs/dbus-glib:= ) audit? ( >=sys-process/audit-1.5.1 ) pam? ( sys-libs/pam:= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !<sec-policy/selinux-base-policy-2.20151208-r6 dev-python/sepolgen app-misc/pax-utils !<sys-apps/openrc-0.14
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160930/policycoreutils-2.6-rc1.tar.gz https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-1.34.tar.bz2
+SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161006/policycoreutils-2.6-rc2.tar.gz https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-1.34.tar.bz2
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=3be7e692adaba3d60f3f1e866d6ade87
+_md5_=7fbe95787ff9d7012dc41a6aebf2582d
diff --git a/metadata/md5-cache/sys-apps/policycoreutils-9999 b/metadata/md5-cache/sys-apps/policycoreutils-9999
index 37e5255e0163..90a2d31325e1 100644
--- a/metadata/md5-cache/sys-apps/policycoreutils-9999
+++ b/metadata/md5-cache/sys-apps/policycoreutils-9999
@@ -9,4 +9,4 @@ RDEPEND=>=sys-libs/libselinux-9999:=[python] >=sys-libs/glibc-2.4 >=sys-libs/lib
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~perfinion/distfiles/policycoreutils-extra-1.34.tar.bz2
 _eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=ca0a39b09819a4fdd5c2654c1bc047bc
+_md5_=81048479709c5180c78dcb9f8f089c76
diff --git a/metadata/md5-cache/sys-apps/secilc-2.5 b/metadata/md5-cache/sys-apps/secilc-2.5
index 0e3933a2521d..916bec6d4dc1 100644
--- a/metadata/md5-cache/sys-apps/secilc-2.5
+++ b/metadata/md5-cache/sys-apps/secilc-2.5
@@ -3,11 +3,11 @@ DEPEND=app-text/xmlto >=sys-libs/libsepol-2.5
 DESCRIPTION=SELinux Common Intermediate Language (CIL) Compiler
 EAPI=5
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=>=sys-libs/libsepol-2.5
 RESTRICT=test
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160223/secilc-2.5.tar.gz
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=3a929b108e27e322109a1f688f7b9c6d
+_md5_=479eda14b4fd98107907b157577f4d6e
diff --git a/metadata/md5-cache/sys-apps/secilc-2.6_rc1 b/metadata/md5-cache/sys-apps/secilc-2.6_rc2
similarity index 59%
rename from metadata/md5-cache/sys-apps/secilc-2.6_rc1
rename to metadata/md5-cache/sys-apps/secilc-2.6_rc2
index 6b25f2ab6b64..c0b6754a6376 100644
--- a/metadata/md5-cache/sys-apps/secilc-2.6_rc1
+++ b/metadata/md5-cache/sys-apps/secilc-2.6_rc2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=-
-DEPEND=app-text/xmlto >=sys-libs/libsepol-2.6_rc1
+DEPEND=app-text/xmlto >=sys-libs/libsepol-2.6_rc2
 DESCRIPTION=SELinux Common Intermediate Language (CIL) Compiler
 EAPI=6
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=sys-libs/libsepol-2.6_rc1
+RDEPEND=>=sys-libs/libsepol-2.6_rc2
 RESTRICT=test
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160930/secilc-2.6-rc1.tar.gz
-_md5_=f2ae44b9dad23ab41fc7081f2dd01e5c
+SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161006/secilc-2.6-rc2.tar.gz
+_md5_=8d4553314430ff952354947128fb4da3
diff --git a/metadata/md5-cache/sys-apps/secilc-9999 b/metadata/md5-cache/sys-apps/secilc-9999
index f535441a48d4..02dc78d49ebf 100644
--- a/metadata/md5-cache/sys-apps/secilc-9999
+++ b/metadata/md5-cache/sys-apps/secilc-9999
@@ -8,4 +8,4 @@ RDEPEND=>=sys-libs/libsepol-9999
 RESTRICT=test
 SLOT=0
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=f2ae44b9dad23ab41fc7081f2dd01e5c
+_md5_=8d4553314430ff952354947128fb4da3
diff --git a/metadata/md5-cache/sys-auth/consolekit-1.1.0-r1 b/metadata/md5-cache/sys-auth/consolekit-1.1.0-r1
index afd76b3b8827..e2e1abd330fc 100644
--- a/metadata/md5-cache/sys-auth/consolekit-1.1.0-r1
+++ b/metadata/md5-cache/sys-auth/consolekit-1.1.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Framework for defining and tracking users, login sessions and seats
 EAPI=6
 HOMEPAGE=https://github.com/ConsoleKit2/ConsoleKit2 https://www.freedesktop.org/wiki/Software/ConsoleKit
 IUSE=acl cgroups debug doc kernel_linux pam pm-utils policykit selinux test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.40:2=[dbus] >=sys-devel/gettext-0.19 sys-apps/dbus sys-libs/zlib:= x11-libs/libX11:= acl? ( sys-apps/acl:= >=virtual/udev-200 ) cgroups? ( app-admin/cgmanager >=sys-libs/libnih-1.0.2[dbus] ) pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.110 ) kernel_linux? ( sys-apps/coreutils[acl?] ) pm-utils? ( sys-power/pm-utils ) selinux? ( sec-policy/selinux-consolekit )
 SLOT=0
 SRC_URI=https://github.com/ConsoleKit2/ConsoleKit2/releases/download/1.1.0/ConsoleKit2-1.1.0.tar.bz2
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	libtool	4890219c51da247200223277f993e054	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multilib	165fc17c38d1b11dac2008280dab6e80	pam	3ecd5b75e39b0bb05a3183c08fcdfdb4	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=1ed692bbad7fab94e32cc7e464d386b8
+_md5_=9d7343babba0bc7cc2a3ca9d4625a279
diff --git a/metadata/md5-cache/sys-auth/keystone-10.0.0 b/metadata/md5-cache/sys-auth/keystone-10.0.0
new file mode 100644
index 000000000000..a18b72f9f95f
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/keystone-10.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DESCRIPTION=The Openstack authentication, authorization, and service catalog
+EAPI=6
+HOMEPAGE=https://launchpad.net/keystone
+IUSE=+sqlite ldap memcached mongo mysql postgres test python_targets_python2_7 python_targets_python3_4
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cryptography-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/cryptography-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) mysql? ( >=dev-python/pymysql-0.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/passlib-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-keystoneclient-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystonemiddleware-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-5.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-db-4.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-db-4.13.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-log-1.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-policy-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-3.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oauthlib-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pysaml2-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/pysaml2-4.0.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/dogpile-cache-0.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/jsonschema-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pycadf-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/pycadf-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/msgpack-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] memcached? ( >=dev-python/python-memcached-1.56[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) mongo? ( >=dev-python/pymongo-3.0.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/pymongo-3.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) ldap? ( >=dev-python/pyldap-2.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/ldappool-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) || ( www-servers/uwsgi[python,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] www-apache/mod_wsgi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] www-servers/gunicorn[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://tarballs.openstack.org/keystone/keystone-10.0.0.tar.gz
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=5e3951f6b1a359c24cc93611f53c95fa
diff --git a/metadata/md5-cache/sys-cluster/cinder-2016.2.9999 b/metadata/md5-cache/sys-cluster/cinder-2016.2.9999
index 0f0b4ad74eaa..d6f2332500a4 100644
--- a/metadata/md5-cache/sys-cluster/cinder-2016.2.9999
+++ b/metadata/md5-cache/sys-cluster/cinder-2016.2.9999
@@ -3,11 +3,11 @@ DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3
 DESCRIPTION=Cinder is the OpenStack Block storage service, a spin out of nova-volumes
 EAPI=6
 HOMEPAGE=https://launchpad.net/cinder
-IUSE=+api +scheduler +volume infiniband iscsi lio lvm mysql +memcached postgres rdma sqlite +tcp test +tgt python_targets_python2_7 python_targets_python3_4
+IUSE=+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt python_targets_python2_7 python_targets_python3_4
 LICENSE=Apache-2.0
-RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/httplib2-0.7.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] virtual/python-ipaddress[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystoneauth-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystonemiddleware-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oauth2client-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.13.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-log-1.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-5.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-policy-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-privsep-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-rootwrap-5.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-3.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-versionedobjects-1.13.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/paramiko-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyparsing-2.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-barbicanclient-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-glanceclient-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-glanceclient-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-keystoneclient-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-novaclient-2.29.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-novaclient-2.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-swiftclient-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/taskflow-1.26.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/rtslib-fb-2.1.41[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) mysql? ( >=dev-python/pymysql-0.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) postgres? ( >=dev-python/psycopg-2.5.0 >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ~dev-python/suds-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-vmware-2.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-brick-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-win-0.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/tooz-1.28.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/google-api-python-client-1.4.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/castellan-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] iscsi? ( tgt? ( sys-block/tgt ) lio? ( sys-block/targetcli sys-block/lio-utils ) sys-block/open-iscsi ) lvm? ( sys-fs/lvm2 ) memcached? ( net-misc/memcached ) app-emulation/qemu sys-fs/sysfsutils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( mysql postgres sqlite ) iscsi? ( || ( tgt lio ) ) infiniband? ( rdma ) || ( python_targets_python2_7 python_targets_python3_4 )
+RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/httplib2-0.7.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] virtual/python-ipaddress[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystoneauth-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystonemiddleware-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oauth2client-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.13.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-log-1.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-5.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-policy-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-privsep-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-rootwrap-5.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-3.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-versionedobjects-1.13.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/paramiko-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyparsing-2.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-barbicanclient-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-glanceclient-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-glanceclient-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-keystoneclient-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-novaclient-2.29.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-novaclient-2.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-swiftclient-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/taskflow-1.26.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/rtslib-fb-2.1.41[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) mysql? ( >=dev-python/pymysql-0.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) postgres? ( >=dev-python/psycopg-2.5.0 >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ~dev-python/suds-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-vmware-2.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-brick-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-win-0.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/tooz-1.28.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/google-api-python-client-1.4.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/castellan-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] iscsi? ( tgt? ( sys-block/tgt ) sys-block/open-iscsi ) lvm? ( sys-fs/lvm2 ) memcached? ( net-misc/memcached ) app-emulation/qemu sys-fs/sysfsutils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma ) || ( python_targets_python2_7 python_targets_python3_4 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/newton/cinder.conf.sample -> newton-cinder.conf.sample https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/newton/policy.json -> newton-cinder-policy.json https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/newton/volume.filters -> newton-cinder-volume.filters
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=6a8822d4a169674d1f522c384ba51ea2
+_md5_=0a1eefd3d20a46c372e9587eb325a6ef
diff --git a/metadata/md5-cache/sys-cluster/cinder-9.0.0 b/metadata/md5-cache/sys-cluster/cinder-9.0.0
new file mode 100644
index 000000000000..5d030718fe6d
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/cinder-9.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Cinder is the OpenStack Block storage service, a spin out of nova-volumes
+EAPI=6
+HOMEPAGE=https://launchpad.net/cinder
+IUSE=+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt python_targets_python2_7 python_targets_python3_4
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/httplib2-0.7.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] virtual/python-ipaddress[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystoneauth-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystonemiddleware-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oauth2client-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.13.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-log-1.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-5.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-policy-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-privsep-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-rootwrap-5.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-3.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-versionedobjects-1.13.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/paramiko-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyparsing-2.0.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-barbicanclient-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-glanceclient-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-glanceclient-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-keystoneclient-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-novaclient-2.29.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-novaclient-2.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-swiftclient-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/taskflow-1.26.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/rtslib-fb-2.1.41[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/simplejson-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) mysql? ( >=dev-python/pymysql-0.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) postgres? ( >=dev-python/psycopg-2.5.0 >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ~dev-python/suds-0.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-vmware-2.11.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-brick-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-win-0.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/tooz-1.28.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/google-api-python-client-1.4.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/castellan-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] iscsi? ( tgt? ( sys-block/tgt ) sys-block/open-iscsi ) lvm? ( sys-fs/lvm2 ) memcached? ( net-misc/memcached ) app-emulation/qemu sys-fs/sysfsutils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma ) || ( python_targets_python2_7 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/newton/cinder.conf.sample -> newton-cinder.conf.sample https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/newton/policy.json -> newton-cinder-policy.json https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/newton/volume.filters -> newton-cinder-volume.filters https://tarballs.openstack.org/cinder/cinder-9.0.0.tar.gz
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=49448163ea1909c6d8c072ba5b3e65c8
diff --git a/metadata/md5-cache/sys-cluster/heat-7.0.0 b/metadata/md5-cache/sys-cluster/heat-7.0.0
new file mode 100644
index 000000000000..9660df0e4ad3
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/heat-7.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DESCRIPTION=A CloudFormation-compatible openstack-native cloud orchistration engine.
+EAPI=6
+HOMEPAGE=https://launchpad.net/heat
+IUSE=+mysql +memcached postgres sqlite python_targets_python2_7 python_targets_python3_4
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/croniter-0.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cryptography-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/cryptography-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/debtcollector-1.2.0 >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystoneauth-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystonemiddleware-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.13.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-log-1.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-5.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-policy-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-3.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-versionedobjects-1.13.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pastedeploy-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pycrypto-2.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/aodhclient-0.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-barbicanclient-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-ceilometerclient-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-cinderclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-cinderclient-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-cinderclient-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-designateclient-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-glanceclient-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-glanceclient-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-heatclient-1.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-keystoneclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-keystoneclient-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-magnumclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-manilaclient-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-mistralclient-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-monascaclient-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-neutronclient-5.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-novaclient-2.29.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-novaclient-2.33.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-openstackclient-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-senlinclient-0.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-swiftclient-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-troveclient-2.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-zaqarclient-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pytz-2013.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pyyaml-3.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) mysql? ( >=dev-python/pymysql-0.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) postgres? ( >=dev-python/psycopg-2.5.0 >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/yaql-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://tarballs.openstack.org/heat/heat-7.0.0.tar.gz
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=adde8fe367a62df6e8c7b7e00e6d0209
diff --git a/metadata/md5-cache/sys-cluster/neutron-2016.1.9999 b/metadata/md5-cache/sys-cluster/neutron-2016.1.9999
index c6dcfde0bcf9..8c166de75a1c 100644
--- a/metadata/md5-cache/sys-cluster/neutron-2016.1.9999
+++ b/metadata/md5-cache/sys-cluster/neutron-2016.1.9999
@@ -10,4 +10,4 @@ REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !my
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/mitaka/configs.tar.gz -> neutron-configs-2016.1.9999.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/mitaka/ml2_plugins.tar.gz -> neutron-ml2-plugins-2016.1.9999.tar.gz
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=07929a8301becdcacb7b4bbc86953858
+_md5_=e848923c5e564e262c2899b40722c50f
diff --git a/metadata/md5-cache/sys-cluster/neutron-2016.2.9999 b/metadata/md5-cache/sys-cluster/neutron-2016.2.9999
index cba580a6107c..8c85b3a08785 100644
--- a/metadata/md5-cache/sys-cluster/neutron-2016.2.9999
+++ b/metadata/md5-cache/sys-cluster/neutron-2016.2.9999
@@ -10,4 +10,4 @@ REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !my
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/newton/configs.tar.gz -> neutron-configs-2016.2.9999.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/newton/ml2_plugins.tar.gz -> neutron-ml2-plugins-2016.2.9999.tar.gz
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=864baa40e07604e76ce99a85d3a1b34e
+_md5_=6a6890517bcefa9938417dbcf0f91860
diff --git a/metadata/md5-cache/sys-cluster/neutron-8.2.0 b/metadata/md5-cache/sys-cluster/neutron-8.2.0
index 28613ad54f0d..33409c43f224 100644
--- a/metadata/md5-cache/sys-cluster/neutron-8.2.0
+++ b/metadata/md5-cache/sys-cluster/neutron-8.2.0
@@ -11,4 +11,4 @@ REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !my
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/neutron/neutron-8.2.0.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/mitaka/configs.tar.gz -> neutron-configs-8.2.0.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/mitaka/ml2_plugins.tar.gz -> neutron-ml2-plugins-8.2.0.tar.gz
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=57b6e2997bf9b94dcd005e477ac54675
+_md5_=fcd84d9f1bf5fca12f478043bd44c71f
diff --git a/metadata/md5-cache/sys-cluster/neutron-9.0.0 b/metadata/md5-cache/sys-cluster/neutron-9.0.0
new file mode 100644
index 000000000000..c7282b27273e
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/neutron-9.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile config configure install postinst prepare setup test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=A virtual network service for Openstack
+EAPI=6
+HOMEPAGE=https://launchpad.net/neutron
+IUSE=compute-only dhcp ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres python_targets_python2_7
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/paste[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/debtcollector-1.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pecan-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pecan-1.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pecan-1.0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pecan-1.0.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/httplib2-0.7.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keystonemiddleware-4.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !=dev-python/keystonemiddleware-4.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !=dev-python/keystonemiddleware-4.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/neutron-lib-0.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-neutronclient-5.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/retrying-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/retrying-1.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ryu-3.30[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/ryu-4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/ryu-4.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/ryu-4.2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/ryu-4.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] compute-only? ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) mysql? ( >=dev-python/pymysql-0.6.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) postgres? ( >=dev-python/psycopg-2.5.0 >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/keystoneauth-2.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/alembic-0.8.4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/stevedore-1.16.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-db-4.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-db-4.13.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/oslo-db-4.13.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-log-1.14.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-messaging-5.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-policy-1.9.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-rootwrap-5.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-utils-3.16.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oslo-versionedobjects-1.13.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/osprofiler-1.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/ovs-2.6.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-novaclient-2.29.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/python-novaclient-2.33.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-designateclient-1.5.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/python-singledispatch[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyudev[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-apps/iproute2 net-misc/bridge-utils net-firewall/ipset net-firewall/iptables net-firewall/ebtables net-firewall/conntrack-tools openvswitch? ( <=net-misc/openvswitch-2.6.9999 ) ipv6? ( net-misc/radvd >=net-misc/dibbler-1.0.1 ) dhcp? ( net-dns/dnsmasq[dhcp-tools] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server || ( openvswitch linuxbridge ) ) || ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/newton/configs.tar.gz -> neutron-configs-9.0.0.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/newton/ml2_plugins.tar.gz -> neutron-ml2-plugins-9.0.0.tar.gz https://tarballs.openstack.org/neutron/neutron-9.0.0.tar.gz
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=293b9e619fa0fad243386cf1b2b4fdd8
diff --git a/metadata/md5-cache/sys-cluster/nova-14.0.0 b/metadata/md5-cache/sys-cluster/nova-14.0.0
new file mode 100644
index 000000000000..219a46e55ff4
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/nova-14.0.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=dev-python/setuptools-16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Cloud computing fabric controller (main part of an IaaS system) in Python
+EAPI=6
+HOMEPAGE=https://launchpad.net/nova
+IUSE=+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite python_targets_python2_7 python_targets_python3_4
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] compute-only? ( >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sqlite? ( >=dev-python/sqlalchemy-1.0.10[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[sqlite,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) mysql? ( >=dev-python/pymysql-0.6.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/pymysql-0.7.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) postgres? ( >=dev-python/psycopg-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-1.0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/sqlalchemy-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-python/boto-2.32.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/decorator-3.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/eventlet-0.18.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jinja-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystonemiddleware-4.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/keystonemiddleware-4.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/lxml-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/routes-1.12.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/routes-2.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] !~dev-python/routes-2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cryptography-1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/cryptography-1.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/webob-1.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/greenlet-0.3.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pastedeploy-1.5.0-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/prettytable-0.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/prettytable-0.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/sqlalchemy-migrate-0.9.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/netaddr-0.7.13[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/netaddr-0.7.16[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/netifaces-0.10.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/paramiko-2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/Babel-2.3.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/iso8601-0.1.11[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/jsonschema-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/jsonschema-2.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/jsonschema-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-cinderclient-1.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-cinderclient-1.7.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-cinderclient-1.7.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/keystoneauth-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-neutronclient-5.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/python-glanceclient-2.3.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/python-glanceclient-2.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/requests-2.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/stevedore-1.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/setuptools-16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/setuptools-24.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/websockify-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-cache-1.5.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-concurrency-3.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-config-3.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-context-2.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-log-1.14.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-reports-0.6.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-serialization-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-utils-3.16.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-db-4.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-db-4.13.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] !~dev-python/oslo-db-4.13.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-rootwrap-5.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-messaging-5.2.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-policy-1.9.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-i18n-2.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-service-1.10.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/rfc3986-0.2.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-middleware-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/psutil-1.1.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] <dev-python/psutil-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/oslo-versionedobjects-1.13.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-brick-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-vif-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/os-win-0.2.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/castellan-0.4.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/microversion-parse-0.1.2[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/wsgiintercept-0.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/libvirt-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] app-emulation/libvirt[iscsi?] novncproxy? ( www-apps/novnc ) sys-apps/iproute2 openvswitch? ( <=net-misc/openvswitch-2.5.9999 ) rabbitmq? ( net-misc/rabbitmq-server ) memcached? ( net-misc/memcached >=dev-python/python-memcached-1.58 ) sys-fs/sysfsutils sys-fs/multipath-tools net-misc/bridge-utils compute? ( app-cdr/cdrkit sys-fs/dosfstools app-emulation/qemu ) iscsi? ( sys-fs/lsscsi >=sys-block/open-iscsi-2.0.873-r2 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=!compute-only? ( || ( mysql postgres sqlite ) ) compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite ) || ( python_targets_python2_7 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/newton/nova.conf.sample -> newton-nova.conf.sample https://tarballs.openstack.org/nova/nova-14.0.0.tar.gz
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	b83a2420b796f7c6eff682679d08fe25	linux-info	fd1e29abbb02cbc49f1a14299846e9c4	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	user	80aaa71614ced86f02ee1a513821dc87	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=6c367842a0064c0445b0f79506bd2510
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-3.9.0 b/metadata/md5-cache/sys-libs/libcxxabi-3.9.0
index 05f076c506f1..16aafb1e7f37 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-3.9.0
+++ b/metadata/md5-cache/sys-libs/libcxxabi-3.9.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/llvm-libunwind[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=sys-devel/llvm-3.9.0 test? ( >=sys-devel/clang-3.9.0 ~sys-libs/libcxx-3.9.0[libcxxabi(-)] || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.4.3
+DEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=sys-devel/llvm-3.9.0 test? ( >=sys-devel/clang-3.9.0 ~sys-libs/libcxx-3.9.0[libcxxabi(-)] || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.4.3
 DESCRIPTION=Low level support for a standard C++ library
 EAPI=6
 HOMEPAGE=http://libcxxabi.llvm.org/
 IUSE=libunwind +static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~x86
 LICENSE=|| ( UoI-NCSA MIT )
-RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/llvm-libunwind[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 SLOT=0
 SRC_URI=http://llvm.org/releases/3.9.0/libcxxabi-3.9.0.src.tar.xz http://llvm.org/releases/3.9.0/libcxx-3.9.0.src.tar.xz
 _eclasses_=cmake-multilib	273c15f5a0a06438a38bb5c3e98fa2db	cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=dfb640b6a02e57c387829112fdf8555b
+_md5_=f732dd62cb294a3cca5d2ed2598d6ca4
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-9999 b/metadata/md5-cache/sys-libs/libcxxabi-9999
index d0d0e68c2934..56053abb585d 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-9999
+++ b/metadata/md5-cache/sys-libs/libcxxabi-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/llvm-libunwind[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=sys-devel/llvm-3.9.0 test? ( >=sys-devel/clang-3.9.0 ~sys-libs/libcxx-9999[libcxxabi(-)] || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.4.3 >=dev-vcs/git-1.8.2.1
+DEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) >=sys-devel/llvm-3.9.0 test? ( >=sys-devel/clang-3.9.0 ~sys-libs/libcxx-9999[libcxxabi(-)] || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/lit[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.4.3 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Low level support for a standard C++ library
 EAPI=6
 HOMEPAGE=http://libcxxabi.llvm.org/
 IUSE=libunwind +static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 LICENSE=|| ( UoI-NCSA MIT )
-RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/llvm-libunwind[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
+RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
 SLOT=0
 _eclasses_=cmake-multilib	273c15f5a0a06438a38bb5c3e98fa2db	cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python-any-r1	1c20f9b800324335a8e3b137363362e8	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=5d8c4bb3632d2b90ec9c528c70285c60
+_md5_=f9dc8645c2659ba53e9dfe3b487babfc
diff --git a/metadata/md5-cache/sys-libs/libselinux-2.5-r1 b/metadata/md5-cache/sys-libs/libselinux-2.5-r1
index ed6f590667b0..654c0011f3fe 100644
--- a/metadata/md5-cache/sys-libs/libselinux-2.5-r1
+++ b/metadata/md5-cache/sys-libs/libselinux-2.5-r1
@@ -4,10 +4,10 @@ DESCRIPTION=SELinux userland library
 EAPI=6
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
 IUSE=python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~mips x86
 LICENSE=public-domain
 RDEPEND=>=sys-libs/libsepol-2.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) )
 SLOT=0
 SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160223/libselinux-2.5.tar.gz
 _eclasses_=multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=fdee1c3becf98440a5c7d561d587f074
+_md5_=a30dc3d2c54580f3550cb60177018d11
diff --git a/metadata/md5-cache/sys-libs/libselinux-2.6_rc1-r1 b/metadata/md5-cache/sys-libs/libselinux-2.6_rc2
similarity index 93%
rename from metadata/md5-cache/sys-libs/libselinux-2.6_rc1-r1
rename to metadata/md5-cache/sys-libs/libselinux-2.6_rc2
index 2f28334477cb..fa7e1760d801 100644
--- a/metadata/md5-cache/sys-libs/libselinux-2.6_rc1-r1
+++ b/metadata/md5-cache/sys-libs/libselinux-2.6_rc2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-libs/libsepol-2.6_rc1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) virtual/pkgconfig python? ( >=dev-lang/swig-2.0.9 )
+DEPEND=>=sys-libs/libsepol-2.6_rc2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ) virtual/pkgconfig python? ( >=dev-lang/swig-2.0.9 )
 DESCRIPTION=SELinux userland library
 EAPI=6
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
 IUSE=pcre2 python ruby static-libs ruby_targets_ruby21 ruby_targets_ruby22 ruby_targets_ruby23 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
 LICENSE=public-domain
-RDEPEND=>=sys-libs/libsepol-2.6_rc1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) )
+RDEPEND=>=sys-libs/libsepol-2.6_rc2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) )
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160930/libselinux-2.6-rc1.tar.gz
+SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161006/libselinux-2.6-rc2.tar.gz
 _eclasses_=multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=b7c29d56a7bc6cd5193bf299d53cdda6
+_md5_=6fa926426024e66c4136067dda2c7f13
diff --git a/metadata/md5-cache/sys-libs/libselinux-9999 b/metadata/md5-cache/sys-libs/libselinux-9999
index 0c1535d625a5..d3e66779b312 100644
--- a/metadata/md5-cache/sys-libs/libselinux-9999
+++ b/metadata/md5-cache/sys-libs/libselinux-9999
@@ -8,4 +8,4 @@ LICENSE=public-domain
 RDEPEND=>=sys-libs/libsepol-9999:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !pcre2? ( >=dev-libs/libpcre-8.33-r1:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pcre2? ( dev-libs/libpcre2:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) ruby? ( ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) )
 SLOT=0
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=818b91a4c4b263f49c06a6503d2b18c7
+_md5_=6fa926426024e66c4136067dda2c7f13
diff --git a/metadata/md5-cache/sys-libs/libsemanage-2.6_rc1-r1 b/metadata/md5-cache/sys-libs/libsemanage-2.6_rc2
similarity index 88%
rename from metadata/md5-cache/sys-libs/libsemanage-2.6_rc1-r1
rename to metadata/md5-cache/sys-libs/libsemanage-2.6_rc2
index 9c856683c4e6..57305791ba71 100644
--- a/metadata/md5-cache/sys-libs/libsemanage-2.6_rc1-r1
+++ b/metadata/md5-cache/sys-libs/libsemanage-2.6_rc2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-libs/libsepol-2.6_rc1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libselinux-2.6_rc1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-process/audit-2.2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/ustr-1.0.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/bison sys-devel/flex python? ( >=dev-lang/swig-2.0.4-r1 virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
+DEPEND=>=sys-libs/libsepol-2.6_rc2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libselinux-2.6_rc2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-process/audit-2.2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/ustr-1.0.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-devel/bison sys-devel/flex python? ( >=dev-lang/swig-2.0.4-r1 virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] )
 DESCRIPTION=SELinux kernel and policy management library
 EAPI=6
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
 IUSE=python python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
-RDEPEND=>=sys-libs/libsepol-2.6_rc1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libselinux-2.6_rc1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-process/audit-2.2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/ustr-1.0.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RDEPEND=>=sys-libs/libsepol-2.6_rc2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libselinux-2.6_rc2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-process/audit-2.2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/ustr-1.0.4-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 RESTRICT=test
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160930/libsemanage-2.6-rc1.tar.gz
+SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161006/libsemanage-2.6-rc2.tar.gz
 _eclasses_=multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=d8a05e865c1ceeb8c45e2b739cf8b91a
+_md5_=3d1ddd1e090cde17722007f87e9e2c9d
diff --git a/metadata/md5-cache/sys-libs/libsemanage-9999 b/metadata/md5-cache/sys-libs/libsemanage-9999
index 54786abe071d..d021cd41957a 100644
--- a/metadata/md5-cache/sys-libs/libsemanage-9999
+++ b/metadata/md5-cache/sys-libs/libsemanage-9999
@@ -9,4 +9,4 @@ RDEPEND=>=sys-libs/libsepol-9999[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,a
 RESTRICT=test
 SLOT=0
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=9424eeb0d294612176aed71416b54769
+_md5_=3d1ddd1e090cde17722007f87e9e2c9d
diff --git a/metadata/md5-cache/sys-libs/libsepol-2.6_rc1 b/metadata/md5-cache/sys-libs/libsepol-2.6_rc2
similarity index 87%
rename from metadata/md5-cache/sys-libs/libsepol-2.6_rc1
rename to metadata/md5-cache/sys-libs/libsepol-2.6_rc2
index 5acaa3625f51..3598d6c18eaa 100644
--- a/metadata/md5-cache/sys-libs/libsepol-2.6_rc1
+++ b/metadata/md5-cache/sys-libs/libsepol-2.6_rc2
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~mips ~x86
 LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
-SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20160930/libsepol-2.6-rc1.tar.gz
+SRC_URI=https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161006/libsepol-2.6-rc2.tar.gz
 _eclasses_=multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=294c6e4b8600b384b579b489691fa791
+_md5_=28e7bf1f56038b0c2f3047d399d6b135
diff --git a/metadata/md5-cache/sys-libs/libsepol-9999 b/metadata/md5-cache/sys-libs/libsepol-9999
index 3ae429b45e07..8a1f0173f73f 100644
--- a/metadata/md5-cache/sys-libs/libsepol-9999
+++ b/metadata/md5-cache/sys-libs/libsepol-9999
@@ -8,4 +8,4 @@ LICENSE=GPL-2
 RESTRICT=test
 SLOT=0
 _eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=294c6e4b8600b384b579b489691fa791
+_md5_=28e7bf1f56038b0c2f3047d399d6b135
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-3.9.0 b/metadata/md5-cache/sys-libs/llvm-libunwind-3.9.0-r1
similarity index 96%
rename from metadata/md5-cache/sys-libs/llvm-libunwind-3.9.0
rename to metadata/md5-cache/sys-libs/llvm-libunwind-3.9.0-r1
index c5f79ccee034..15e8b524722d 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-3.9.0
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-3.9.0-r1
@@ -10,4 +10,4 @@ RDEPEND=!sys-libs/libunwind
 SLOT=0
 SRC_URI=http://llvm.org/releases/3.9.0/libunwind-3.9.0.src.tar.xz
 _eclasses_=cmake-multilib	273c15f5a0a06438a38bb5c3e98fa2db	cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9623435f8e97b12008012ae03480cffc
+_md5_=6c810455aeca1d8a425b83a68d4a337a
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-9999 b/metadata/md5-cache/sys-libs/llvm-libunwind-9999
index cbedfd7996c3..d2353cbdb879 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-9999
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-9999
@@ -8,4 +8,4 @@ LICENSE=|| ( UoI-NCSA MIT )
 RDEPEND=!sys-libs/libunwind
 SLOT=0
 _eclasses_=cmake-multilib	273c15f5a0a06438a38bb5c3e98fa2db	cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6b33287fc8634766a7d4ee4998cb5166
+_md5_=c92892c00f2efbc7642fbe4c480b1c42
diff --git a/metadata/md5-cache/www-client/qupzilla-2.0.1 b/metadata/md5-cache/www-client/qupzilla-2.0.1
index 7a3ee0698642..7e5dec7415cd 100644
--- a/metadata/md5-cache/www-client/qupzilla-2.0.1
+++ b/metadata/md5-cache/www-client/qupzilla-2.0.1
@@ -3,11 +3,11 @@ DEPEND=>=dev-qt/qtconcurrent-5.6:5 >=dev-qt/qtcore-5.6:5 >=dev-qt/qtdeclarative-
 DESCRIPTION=A cross-platform web browser using QtWebEngine
 EAPI=6
 HOMEPAGE=http://www.qupzilla.com/
-IUSE=dbus debug gnome-keyring kde libressl nonblockdialogs linguas_ar_SA linguas_bg_BG linguas_ca_ES linguas_cs_CZ linguas_da_DK linguas_de_DE linguas_el_GR linguas_es_ES linguas_es_MX linguas_es_VE linguas_eu_ES linguas_fa_IR linguas_fi_FI linguas_fr_FR linguas_gl_ES linguas_he_IL linguas_hr_HR linguas_hu_HU linguas_id_ID linguas_it_IT linguas_ja_JP linguas_ka_GE linguas_lg linguas_lt linguas_lv_LV linguas_nl_NL linguas_nqo linguas_pl_PL linguas_pt_BR linguas_pt_PT linguas_ro_RO linguas_ru_RU linguas_sk_SK linguas_sr linguas_sr@ijekavian linguas_sr@ijekavianlatin linguas_sr@latin linguas_sv_SE linguas_tr_TR linguas_uk_UA linguas_uz@Latn linguas_zh_CN linguas_zh_TW
+IUSE=dbus debug gnome-keyring kde libressl nonblockdialogs
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
 RDEPEND=>=dev-qt/qtconcurrent-5.6:5 >=dev-qt/qtcore-5.6:5 >=dev-qt/qtdeclarative-5.6:5[widgets] >=dev-qt/qtgui-5.6:5 >=dev-qt/qtnetwork-5.6:5[ssl] >=dev-qt/qtprintsupport-5.6:5 >=dev-qt/qtsql-5.6:5[sqlite] >=dev-qt/qtwebchannel-5.6:5 >=dev-qt/qtwebengine-5.6:5[widgets] >=dev-qt/qtwidgets-5.6:5 >=dev-qt/qtx11extras-5.6:5 x11-libs/libxcb:= dbus? ( >=dev-qt/qtdbus-5.6:5 ) gnome-keyring? ( gnome-base/gnome-keyring ) kde? ( kde-frameworks/kwallet:5 ) libressl? ( dev-libs/libressl:= ) !libressl? ( dev-libs/openssl:0 )
 SLOT=0
 SRC_URI=https://github.com/QupZilla/qupzilla/releases/download/v2.0.1/QupZilla-2.0.1.tar.xz https://github.com/QupZilla/qupzilla-plugins/archive/c332d306c0f6cf645c75eaf198d2fc5e12339e9e.tar.gz -> qupzilla-plugins-2016.05.02.tar.gz
-_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	l10n	e26ea0642846685782f1813642e7ff0f	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
-_md5_=365b39de594b104f8ecd36db0698650f
+_eclasses_=eutils	b83a2420b796f7c6eff682679d08fe25	multilib	165fc17c38d1b11dac2008280dab6e80	qmake-utils	0a242e7177789b0028b4045f336dd4db	toolchain-funcs	6198c04daba0e1307bd844df7d37f423
+_md5_=7e1b0be066730d5005930a4689c3c972
diff --git a/metadata/md5-cache/x11-libs/qtermwidget-0.7.0 b/metadata/md5-cache/x11-libs/qtermwidget-0.7.0
new file mode 100644
index 000000000000..9ee50d2ce6a8
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/qtermwidget-0.7.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-devel/make >=dev-util/cmake-2.8.12
+DESCRIPTION=Qt terminal emulator widget
+EAPI=6
+HOMEPAGE=https://github.com/lxde/qtermwidget
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
+SLOT=0
+SRC_URI=https://github.com/lxde/qtermwidget/releases/download/0.7.0/qtermwidget-0.7.0.tar.xz
+_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=f989a96eb7e4fdb983ec71d7b318d529
diff --git a/metadata/md5-cache/x11-libs/qtermwidget-9999 b/metadata/md5-cache/x11-libs/qtermwidget-9999
index 10469c3f3e94..24ef77f8a681 100644
--- a/metadata/md5-cache/x11-libs/qtermwidget-9999
+++ b/metadata/md5-cache/x11-libs/qtermwidget-9999
@@ -1,12 +1,10 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=qt4? ( dev-qt/designer:4 dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sys-devel/make >=dev-util/cmake-2.8.12 >=dev-vcs/git-1.8.2.1
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-devel/make >=dev-util/cmake-2.8.12 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Qt terminal emulator widget
 EAPI=6
 HOMEPAGE=https://github.com/lxde/qtermwidget
-IUSE=qt4 qt5
 LICENSE=GPL-2+
-RDEPEND=qt4? ( dev-qt/designer:4 dev-qt/qtcore:4 dev-qt/qtgui:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
-REQUIRED_USE=|| ( qt4 qt5 )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5
 SLOT=0
-_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	git-r3	00f60a84fc7b499c99edfe99caea9f95	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=87b5675d653f859a9be2c3360979cb4c
+_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	git-r3	00f60a84fc7b499c99edfe99caea9f95	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=d86c057bce36a6d94d54003ec8d8977c
diff --git a/metadata/md5-cache/x11-misc/albert-0.8.11 b/metadata/md5-cache/x11-misc/albert-0.8.11
new file mode 100644
index 000000000000..30ca0a3b747b
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/albert-0.8.11
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-cpp/muParser dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 dev-qt/qtconcurrent:5 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4
+DESCRIPTION=Desktop agnostic launcher
+EAPI=6
+HOMEPAGE=https://github.com/manuelschneid3r/albert
+KEYWORDS=~amd64
+LICENSE=GPL-3+
+RDEPEND=dev-cpp/muParser dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11
+SLOT=0
+SRC_URI=https://github.com/manuelschneid3r/albert/archive/v0.8.11.tar.gz -> albert-0.8.11.tar.gz
+_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=22257242c156f948905f854c8a4a6b59
diff --git a/metadata/md5-cache/x11-misc/rednotebook-1.14 b/metadata/md5-cache/x11-misc/rednotebook-1.14
new file mode 100644
index 000000000000..7fdd63322d19
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/rednotebook-1.14
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/pyyaml-3.05[libyaml?,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygtk-2.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pywebkitgtk-1.1.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/chardet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] spell? ( dev-python/pygtkspellcheck[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Graphical journal with calendar, templates, tags and keyword searching
+EAPI=6
+HOMEPAGE=http://rednotebook.sourceforge.net
+IUSE=libyaml spell python_targets_python2_7
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-python/pyyaml-3.05[libyaml?,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygtk-2.16[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pywebkitgtk-1.1.5[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/chardet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] spell? ( dev-python/pygtkspellcheck[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/rednotebook/rednotebook-1.14.tar.gz
+_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	165fc17c38d1b11dac2008280dab6e80	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	1797277ea0e7cee5c7de7ce74cf8acd8	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=14ad316241a39d6594fcc89e2baad074
diff --git a/metadata/md5-cache/x11-terms/qterminal-0.7.0 b/metadata/md5-cache/x11-terms/qterminal-0.7.0
new file mode 100644
index 000000000000..abb767fcca03
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/qterminal-0.7.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 ~x11-libs/qtermwidget-0.7.0 sys-devel/make >=dev-util/cmake-2.8.12 >=sys-apps/sed-4
+DESCRIPTION=Qt-based multitab terminal emulator
+EAPI=6
+HOMEPAGE=https://github.com/lxde/qterminal
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 ~x11-libs/qtermwidget-0.7.0
+SLOT=0
+SRC_URI=https://github.com/lxde/qterminal/releases/download/0.7.0/qterminal-0.7.0.tar.xz
+_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=11f9bd4c73e3faee7adeeb346fb9e93e
diff --git a/metadata/md5-cache/x11-terms/qterminal-9999 b/metadata/md5-cache/x11-terms/qterminal-9999
index 12a94d89ef98..e572bee21b1c 100644
--- a/metadata/md5-cache/x11-terms/qterminal-9999
+++ b/metadata/md5-cache/x11-terms/qterminal-9999
@@ -1,11 +1,10 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=!qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 x11-libs/libqxt ~x11-libs/qtermwidget-9999[qt4] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ~x11-libs/qtermwidget-9999[qt5] ) qt5? ( dev-qt/linguist-tools:5 ) sys-devel/make >=dev-util/cmake-2.8.12 >=dev-vcs/git-1.8.2.1
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 ~x11-libs/qtermwidget-9999 sys-devel/make >=dev-util/cmake-2.8.12 >=dev-vcs/git-1.8.2.1 >=sys-apps/sed-4
 DESCRIPTION=Qt-based multitab terminal emulator
 EAPI=6
 HOMEPAGE=https://github.com/lxde/qterminal
-IUSE=qt5
 LICENSE=GPL-2+
-RDEPEND=!qt5? ( dev-qt/qtcore:4 dev-qt/qtgui:4 x11-libs/libqxt ~x11-libs/qtermwidget-9999[qt4] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ~x11-libs/qtermwidget-9999[qt5] )
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 x11-libs/libX11 ~x11-libs/qtermwidget-9999
 SLOT=0
-_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	git-r3	00f60a84fc7b499c99edfe99caea9f95	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b29fe2da80a5ed8dc91197abbfce74ee
+_eclasses_=cmake-utils	f3d38665b0a86e08ba3a5473cdbfafd3	eutils	b83a2420b796f7c6eff682679d08fe25	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	git-r3	00f60a84fc7b499c99edfe99caea9f95	gnome2-utils	c6dcdf3a2c22b578b16adb945dc85c35	multilib	165fc17c38d1b11dac2008280dab6e80	toolchain-funcs	6198c04daba0e1307bd844df7d37f423	versionator	99ae9d758cbe7cfed19170e7d48f5a9c	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=b875a9532141c7f3f66ab65327a9d4f8
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 1ca0f703046a..39fdcab712ff 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 06 Oct 2016 11:40:37 +0000
+Fri, 07 Oct 2016 06:10:38 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 3e459bc1cd88..8b13420e6456 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Oct  6 11:39:42 UTC 2016
+Fri Oct  7 06:09:44 UTC 2016
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 48f34a717e6c..54845492a0d8 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -513,9 +513,9 @@
 1610012311 ./app-editors/fte/fte-20110708-r1.ebuild
 1610012311 ./app-editors/fte/fte-20051115-r3.ebuild
 1607270959 ./app-editors/jext/jext-5.0-r2.ebuild
-1609051438 ./app-editors/mg/mg-20160905.ebuild
 1610011058 ./app-editors/mg/mg-20160421.ebuild
 1609122124 ./app-editors/mg/mg-20160912.ebuild
+1610070828 ./app-editors/mg/mg-20161005.ebuild
 1509201508 ./app-editors/mg/mg-20150323.ebuild
 1508090338 ./app-editors/hteditor/hteditor-2.0.22.ebuild
 1508090338 ./app-editors/hteditor/hteditor-2.1.0.ebuild
@@ -1814,7 +1814,7 @@
 1601201307 ./dev-libs/boost/boost-1.59.0.ebuild
 1601201053 ./dev-libs/boost/boost-1.58.0-r1.ebuild
 1608300022 ./dev-libs/boost/boost-1.61.0-r1.ebuild
-1610061155 ./dev-libs/boost/boost-1.62.0-r1.ebuild
+1610062115 ./dev-libs/boost/boost-1.62.0-r1.ebuild
 1604132206 ./dev-libs/boost/boost-1.60.0.ebuild
 1606012039 ./dev-libs/boost/boost-1.55.0-r2.ebuild
 1512131705 ./dev-libs/boost/boost-1.56.0-r1.ebuild
@@ -2961,8 +2961,8 @@
 1508090338 ./sys-apps/input-utils/input-utils-1.1.ebuild
 1508090338 ./sys-apps/input-utils/input-utils-0.0.1_pre20081014.ebuild
 1508090338 ./sys-apps/adjtime/adjtime-0.4-r2.ebuild
-1610031002 ./sys-apps/checkpolicy/checkpolicy-9999.ebuild
-1610031002 ./sys-apps/checkpolicy/checkpolicy-2.6_rc1.ebuild
+1610070718 ./sys-apps/checkpolicy/checkpolicy-9999.ebuild
+1610070718 ./sys-apps/checkpolicy/checkpolicy-2.6_rc2.ebuild
 1606211837 ./sys-apps/checkpolicy/checkpolicy-2.5.ebuild
 1601101417 ./sys-apps/flashrom/flashrom-0.9.6.1.ebuild
 1603150600 ./sys-apps/flashrom/flashrom-9999.ebuild
@@ -3023,9 +3023,9 @@
 1508090338 ./sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-2.ebuild
 1508090338 ./sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-4.ebuild
 1603141754 ./sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-5.ebuild
-1610031002 ./sys-apps/secilc/secilc-9999.ebuild
-1610031002 ./sys-apps/secilc/secilc-2.6_rc1.ebuild
-1603132246 ./sys-apps/secilc/secilc-2.5.ebuild
+1610070718 ./sys-apps/secilc/secilc-9999.ebuild
+1610070718 ./sys-apps/secilc/secilc-2.6_rc2.ebuild
+1610070720 ./sys-apps/secilc/secilc-2.5.ebuild
 1508090338 ./sys-apps/cpint/cpint-2.5.3.ebuild
 1508090338 ./sys-apps/cpint/cpint-1.1.6.ebuild
 1508260949 ./sys-apps/gptfdisk/gptfdisk-1.0.0.ebuild
@@ -3172,6 +3172,7 @@
 1604202241 ./sys-apps/systemd-sysv-utils/systemd-sysv-utils-215.ebuild
 1604202241 ./sys-apps/systemd-sysv-utils/systemd-sysv-utils-217.ebuild
 1609232337 ./sys-apps/openrc/openrc-9999.ebuild
+1610062031 ./sys-apps/openrc/openrc-0.22.2.ebuild
 1609160057 ./sys-apps/openrc/openrc-0.21.7.ebuild
 1606120723 ./sys-apps/openrc/openrc-0.19.1.ebuild
 1610022009 ./sys-apps/openrc/openrc-0.22.1.ebuild
@@ -3376,9 +3377,9 @@
 1607270959 ./sys-apps/fakeroot-ng/fakeroot-ng-0.17.ebuild
 1607270959 ./sys-apps/fakeroot-ng/fakeroot-ng-0.18.ebuild
 1607270959 ./sys-apps/fakeroot-ng/fakeroot-ng-0.18-r1.ebuild
+1610070718 ./sys-apps/policycoreutils/policycoreutils-2.6_rc2.ebuild
 1606011715 ./sys-apps/policycoreutils/policycoreutils-2.5.ebuild
-1610031023 ./sys-apps/policycoreutils/policycoreutils-2.6_rc1.ebuild
-1610031002 ./sys-apps/policycoreutils/policycoreutils-9999.ebuild
+1610070718 ./sys-apps/policycoreutils/policycoreutils-9999.ebuild
 1606282329 ./sys-apps/accountsservice/accountsservice-0.6.40.ebuild
 1610010349 ./sys-apps/accountsservice/accountsservice-0.6.42.ebuild
 1602042116 ./sys-apps/s6-linux-utils/s6-linux-utils-2.0.2.3.ebuild
@@ -4565,8 +4566,8 @@
 1511221138 ./dev-python/testtools/testtools-1.8.0.ebuild
 1511171403 ./dev-python/testtools/testtools-1.8.1.ebuild
 1602071523 ./dev-python/testtools/testtools-2.0.0.ebuild
-1610031002 ./dev-python/sepolgen/sepolgen-9999.ebuild
-1610031002 ./dev-python/sepolgen/sepolgen-2.6_rc1.ebuild
+1610070718 ./dev-python/sepolgen/sepolgen-9999.ebuild
+1610070718 ./dev-python/sepolgen/sepolgen-2.6_rc2.ebuild
 1606011715 ./dev-python/sepolgen/sepolgen-1.2.3.ebuild
 1608232314 ./dev-python/arpeggio/arpeggio-1.5.ebuild
 1609300643 ./dev-python/oslo-policy/oslo-policy-1.14.0.ebuild
@@ -5756,7 +5757,7 @@
 1508241435 ./dev-python/robotframework-sshlibrary/robotframework-sshlibrary-2.1.1.ebuild
 1608212156 ./dev-python/robotframework-sshlibrary/robotframework-sshlibrary-2.1.2.ebuild
 1511101354 ./dev-python/pythong/pythong-2.1.5-r2.ebuild
-1609170135 ./dev-python/selectors34/selectors34-1.1.ebuild
+1610070010 ./dev-python/selectors34/selectors34-1.1.ebuild
 1508241336 ./dev-python/vertex/vertex-0.3.0-r1.ebuild
 1602182343 ./dev-python/vertex/vertex-0.3.1-r1.ebuild
 1508241336 ./dev-python/vertex/vertex-0.3.1.ebuild
@@ -5977,6 +5978,7 @@
 1610032114 ./dev-python/python-magnumclient/python-magnumclient-2.3.0.ebuild
 1608300022 ./dev-python/pyformance/pyformance-0.3.2.ebuild
 1508241336 ./dev-python/django-oauth-plus/django-oauth-plus-2.2.8.ebuild
+1610061835 ./dev-python/pygtkspellcheck/pygtkspellcheck-4.0.5.ebuild
 1601241359 ./dev-python/pyx/pyx-0.14.1.ebuild
 1508090338 ./dev-python/pyx/pyx-0.13.ebuild
 1508090338 ./dev-python/pyx/pyx-0.14.ebuild
@@ -6621,7 +6623,7 @@
 1508090338 ./dev-python/XenAPI/XenAPI-1.2.ebuild
 1508241336 ./dev-python/zc-buildout/zc-buildout-2.3.1.ebuild
 1609250839 ./dev-python/zc-buildout/zc-buildout-2.5.3.ebuild
-1603230218 ./dev-python/dill/dill-0.2.5.ebuild
+1610070010 ./dev-python/dill/dill-0.2.5.ebuild
 1510311141 ./dev-python/versioneer/versioneer-0.15.ebuild
 1606122017 ./dev-python/versioneer/versioneer-0.16.ebuild
 1605260205 ./dev-python/subunit/subunit-1.2.0-r1.ebuild
@@ -6928,12 +6930,12 @@
 1610042209 ./dev-python/oslo-serialization/oslo-serialization-2.13.0.ebuild
 1508241641 ./sys-libs/libstdc++-v3/libstdc++-v3-3.3.6.ebuild
 1508241641 ./sys-libs/libstdc++-v3/libstdc++-v3-3.3.6-r1.ebuild
-1610031002 ./sys-libs/libsemanage/libsemanage-9999.ebuild
-1610040805 ./sys-libs/libsemanage/libsemanage-2.6_rc1-r1.ebuild
+1610070718 ./sys-libs/libsemanage/libsemanage-9999.ebuild
+1610070718 ./sys-libs/libsemanage/libsemanage-2.6_rc2.ebuild
 1606011715 ./sys-libs/libsemanage/libsemanage-2.5.ebuild
-1610031002 ./sys-libs/libselinux/libselinux-9999.ebuild
-1610051943 ./sys-libs/libselinux/libselinux-2.6_rc1-r1.ebuild
-1609151245 ./sys-libs/libselinux/libselinux-2.5-r1.ebuild
+1610070718 ./sys-libs/libselinux/libselinux-9999.ebuild
+1610070718 ./sys-libs/libselinux/libselinux-2.6_rc2.ebuild
+1610070723 ./sys-libs/libselinux/libselinux-2.5-r1.ebuild
 1609011938 ./sys-libs/libselinux/libselinux-2.5.ebuild
 1508241427 ./sys-libs/pwdb/pwdb-0.62.ebuild
 1508090338 ./sys-libs/csu/csu-85.ebuild
@@ -6972,8 +6974,8 @@
 1609291343 ./sys-libs/libnih/libnih-1.0.3-r3.ebuild
 1508090338 ./sys-libs/libstatgrab/libstatgrab-0.91.ebuild
 1508090338 ./sys-libs/libstatgrab/libstatgrab-0.17.ebuild
-1610051746 ./sys-libs/libcxxabi/libcxxabi-3.9.0.ebuild
-1610051638 ./sys-libs/libcxxabi/libcxxabi-9999.ebuild
+1610061629 ./sys-libs/libcxxabi/libcxxabi-3.9.0.ebuild
+1610061628 ./sys-libs/libcxxabi/libcxxabi-9999.ebuild
 1508090338 ./sys-libs/nss-usrfiles/nss-usrfiles-2.18.1.ebuild
 1607270959 ./sys-libs/openipmi/openipmi-2.0.21.ebuild
 1607270959 ./sys-libs/openipmi/openipmi-2.0.18-r1.ebuild
@@ -7036,9 +7038,9 @@
 1609281417 ./sys-libs/kpmcore/kpmcore-2.2.1.ebuild
 1609242055 ./sys-libs/libapparmor/libapparmor-2.10.1-r1.ebuild
 1605252049 ./sys-libs/libapparmor/libapparmor-2.10.1.ebuild
-1610031002 ./sys-libs/libsepol/libsepol-2.6_rc1.ebuild
+1610070718 ./sys-libs/libsepol/libsepol-2.6_rc2.ebuild
 1606011715 ./sys-libs/libsepol/libsepol-2.5.ebuild
-1610031002 ./sys-libs/libsepol/libsepol-9999.ebuild
+1610070718 ./sys-libs/libsepol/libsepol-9999.ebuild
 1508241641 ./sys-libs/libkudzu/libkudzu-1.2.57.1.ebuild
 1604231328 ./sys-libs/ntdb/ntdb-1.0-r1.ebuild
 1609191609 ./sys-libs/slang/slang-2.3.0.ebuild
@@ -7064,8 +7066,8 @@
 1606260013 ./sys-libs/libieee1284/libieee1284-0.2.11-r4.ebuild
 1508090338 ./sys-libs/libieee1284/libieee1284-0.2.11-r3.ebuild
 1508241349 ./sys-libs/lib-compat/lib-compat-1.4.2-r1.ebuild
-1609081705 ./sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild
-1609081705 ./sys-libs/llvm-libunwind/llvm-libunwind-3.9.0.ebuild
+1610061628 ./sys-libs/llvm-libunwind/llvm-libunwind-3.9.0-r1.ebuild
+1610061628 ./sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild
 1608020049 ./sys-libs/llvm-libunwind/llvm-libunwind-3.8.1.ebuild
 1605171312 ./sys-libs/gdbm/gdbm-1.12.ebuild
 1508241641 ./sys-libs/gdbm/gdbm-1.11.ebuild
@@ -9011,16 +9013,13 @@
 1604191607 ./dev-ros/laser_cb_detector/laser_cb_detector-0.10.14.ebuild
 1509231452 ./dev-ros/pointcloud_to_laserscan/pointcloud_to_laserscan-9999.ebuild
 1509231452 ./dev-ros/pointcloud_to_laserscan/pointcloud_to_laserscan-1.3.0.ebuild
-1605231201 ./dev-ros/robot_pose_ekf/robot_pose_ekf-1.14.0.ebuild
-1511011220 ./dev-ros/robot_pose_ekf/robot_pose_ekf-1.13.1.ebuild
-1509301503 ./dev-ros/robot_pose_ekf/robot_pose_ekf-1.13.0.ebuild
-1509301503 ./dev-ros/robot_pose_ekf/robot_pose_ekf-9999.ebuild
+1610061647 ./dev-ros/robot_pose_ekf/robot_pose_ekf-1.14.0.ebuild
+1610061647 ./dev-ros/robot_pose_ekf/robot_pose_ekf-9999.ebuild
 1509221806 ./dev-ros/roslisp/roslisp-1.9.19.ebuild
 1509221806 ./dev-ros/roslisp/roslisp-9999.ebuild
 1604211323 ./dev-ros/roslisp/roslisp-1.9.20.ebuild
-1607261218 ./dev-ros/gazebo_ros_control/gazebo_ros_control-2.5.7-r1.ebuild
-1607261218 ./dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild
-1608121147 ./dev-ros/gazebo_ros_control/gazebo_ros_control-2.6.0.ebuild
+1610061647 ./dev-ros/gazebo_ros_control/gazebo_ros_control-2.6.0-r1.ebuild
+1610061647 ./dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild
 1610031410 ./dev-ros/rosout/rosout-1.12.5.ebuild
 1509221736 ./dev-ros/rosout/rosout-1.11.14.ebuild
 1603141438 ./dev-ros/rosout/rosout-1.11.17.ebuild
@@ -9033,9 +9032,8 @@
 1604211207 ./dev-ros/rosout/rosout-1.12.1.ebuild
 1511021257 ./dev-ros/openni2_launch/openni2_launch-9999.ebuild
 1511021257 ./dev-ros/openni2_launch/openni2_launch-0.2.2.ebuild
-1509222004 ./dev-ros/tf2_ros/tf2_ros-9999.ebuild
-1509222004 ./dev-ros/tf2_ros/tf2_ros-0.5.12.ebuild
-1603071106 ./dev-ros/tf2_ros/tf2_ros-0.5.13.ebuild
+1610061551 ./dev-ros/tf2_ros/tf2_ros-9999.ebuild
+1610061551 ./dev-ros/tf2_ros/tf2_ros-0.5.13-r1.ebuild
 1602231836 ./dev-ros/pr2_description/pr2_description-1.11.14.ebuild
 1604211209 ./dev-ros/pr2_description/pr2_description-1.12.0.ebuild
 1602231836 ./dev-ros/pr2_description/pr2_description-9999.ebuild
@@ -9054,7 +9052,6 @@
 1604301718 ./dev-ros/controller_manager_tests/controller_manager_tests-9999.ebuild
 1509222004 ./dev-ros/tf2/tf2-9999.ebuild
 1603071106 ./dev-ros/tf2/tf2-0.5.13.ebuild
-1509222004 ./dev-ros/tf2/tf2-0.5.12.ebuild
 1509222157 ./dev-ros/collada_urdf/collada_urdf-9999.ebuild
 1607261806 ./dev-ros/collada_urdf/collada_urdf-1.12.3-r2.ebuild
 1608261959 ./dev-ros/collada_urdf/collada_urdf-1.12.4.ebuild
@@ -9459,9 +9456,8 @@
 1511100952 ./dev-ros/hector_pose_estimation/hector_pose_estimation-0.2.1.ebuild
 1509241153 ./dev-ros/hector_pose_estimation/hector_pose_estimation-9999.ebuild
 1606281656 ./dev-ros/hector_pose_estimation/hector_pose_estimation-0.3.0.ebuild
-1510111734 ./dev-ros/image_cb_detector/image_cb_detector-9999.ebuild
-1604191607 ./dev-ros/image_cb_detector/image_cb_detector-0.10.14.ebuild
-1510111734 ./dev-ros/image_cb_detector/image_cb_detector-0.10.13.ebuild
+1610061650 ./dev-ros/image_cb_detector/image_cb_detector-0.10.14-r1.ebuild
+1610061650 ./dev-ros/image_cb_detector/image_cb_detector-9999.ebuild
 1609221825 ./dev-ros/rosclean/rosclean-1.13.4.ebuild
 1509221452 ./dev-ros/rosclean/rosclean-9999.ebuild
 1603141438 ./dev-ros/rosclean/rosclean-1.13.1.ebuild
@@ -9469,12 +9465,8 @@
 1609191058 ./dev-ros/rosclean/rosclean-1.13.3.ebuild
 1609051221 ./dev-ros/rosclean/rosclean-1.13.2.ebuild
 1509221452 ./dev-ros/rosclean/rosclean-1.12.3.ebuild
-1607181513 ./dev-ros/stereo_image_proc/stereo_image_proc-1.12.18.ebuild
-1607261303 ./dev-ros/stereo_image_proc/stereo_image_proc-1.12.19.ebuild
-1509231504 ./dev-ros/stereo_image_proc/stereo_image_proc-1.12.14.ebuild
-1603241418 ./dev-ros/stereo_image_proc/stereo_image_proc-1.12.16.ebuild
-1601191503 ./dev-ros/stereo_image_proc/stereo_image_proc-1.12.15.ebuild
-1509231504 ./dev-ros/stereo_image_proc/stereo_image_proc-9999.ebuild
+1610061647 ./dev-ros/stereo_image_proc/stereo_image_proc-1.12.19-r1.ebuild
+1610061647 ./dev-ros/stereo_image_proc/stereo_image_proc-9999.ebuild
 1603071106 ./dev-ros/kdl_conversions/kdl_conversions-1.11.8.ebuild
 1509222004 ./dev-ros/kdl_conversions/kdl_conversions-1.11.7.ebuild
 1509222004 ./dev-ros/kdl_conversions/kdl_conversions-9999.ebuild
@@ -9502,8 +9494,6 @@
 1605171322 ./dev-ros/rqt_runtime_monitor/rqt_runtime_monitor-0.5.3.ebuild
 1603141438 ./dev-ros/rqt_runtime_monitor/rqt_runtime_monitor-0.4.3.ebuild
 1509231336 ./dev-ros/rqt_runtime_monitor/rqt_runtime_monitor-9999.ebuild
-1510061133 ./dev-ros/move_base/move_base-1.13.0.ebuild
-1511011243 ./dev-ros/move_base/move_base-1.13.1.ebuild
 1511011243 ./dev-ros/move_base/move_base-9999.ebuild
 1605231201 ./dev-ros/move_base/move_base-1.14.0.ebuild
 1509281553 ./dev-ros/hector_imu_attitude_to_tf/hector_imu_attitude_to_tf-0.3.3.ebuild
@@ -9587,17 +9577,14 @@
 1602251301 ./dev-ros/visualization_msgs/visualization_msgs-1.12.3.ebuild
 1610031411 ./dev-ros/visualization_msgs/visualization_msgs-1.12.5.ebuild
 1602251301 ./dev-ros/visualization_msgs/visualization_msgs-9999.ebuild
-1511021206 ./dev-ros/navfn/navfn-1.13.1-r1.ebuild
-1605231201 ./dev-ros/navfn/navfn-1.14.0.ebuild
-1511021206 ./dev-ros/navfn/navfn-9999.ebuild
+1610061647 ./dev-ros/navfn/navfn-9999.ebuild
+1610061647 ./dev-ros/navfn/navfn-1.14.0-r1.ebuild
 1607181513 ./dev-ros/rosserial_tivac/rosserial_tivac-0.7.2.ebuild
 1607181513 ./dev-ros/rosserial_tivac/rosserial_tivac-9999.ebuild
 1609221825 ./dev-ros/rosserial_tivac/rosserial_tivac-0.7.4.ebuild
 1608121134 ./dev-ros/rosserial_tivac/rosserial_tivac-0.7.3.ebuild
-1605231201 ./dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.14.0.ebuild
-1511011239 ./dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild
-1511011239 ./dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.13.1.ebuild
-1509301503 ./dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.13.0.ebuild
+1610061653 ./dev-ros/clear_costmap_recovery/clear_costmap_recovery-9999.ebuild
+1610061653 ./dev-ros/clear_costmap_recovery/clear_costmap_recovery-1.14.0-r1.ebuild
 1509301503 ./dev-ros/base_local_planner/base_local_planner-9999.ebuild
 1509301503 ./dev-ros/base_local_planner/base_local_planner-1.13.0.ebuild
 1511011219 ./dev-ros/base_local_planner/base_local_planner-1.13.1.ebuild
@@ -9740,8 +9727,8 @@
 1509231353 ./dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-9999.ebuild
 1509231353 ./dev-ros/rviz_plugin_tutorials/rviz_plugin_tutorials-0.9.2.ebuild
 1509231545 ./dev-ros/joint_limits_interface/joint_limits_interface-9999.ebuild
-1608210934 ./dev-ros/joint_limits_interface/joint_limits_interface-0.11.1.ebuild
 1607261218 ./dev-ros/joint_limits_interface/joint_limits_interface-0.11.0-r1.ebuild
+1610061647 ./dev-ros/joint_limits_interface/joint_limits_interface-0.11.1-r1.ebuild
 1509231354 ./dev-ros/rviz_python_tutorial/rviz_python_tutorial-9999.ebuild
 1509231354 ./dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.9.2.ebuild
 1604251156 ./dev-ros/rviz_python_tutorial/rviz_python_tutorial-0.10.1.ebuild
@@ -9827,12 +9814,8 @@
 1603191655 ./dev-ros/turtlesim/turtlesim-9999.ebuild
 1603191655 ./dev-ros/turtlesim/turtlesim-0.7.0.ebuild
 1509221742 ./dev-ros/turtlesim/turtlesim-0.6.1.ebuild
-1607111318 ./dev-ros/mavros_extras/mavros_extras-0.18.3.ebuild
-1511021252 ./dev-ros/mavros_extras/mavros_extras-9999.ebuild
-1605111046 ./dev-ros/mavros_extras/mavros_extras-0.17.2.ebuild
-1606281735 ./dev-ros/mavros_extras/mavros_extras-0.18.1.ebuild
-1607041048 ./dev-ros/mavros_extras/mavros_extras-0.18.2.ebuild
-1605241034 ./dev-ros/mavros_extras/mavros_extras-0.17.3.ebuild
+1610061655 ./dev-ros/mavros_extras/mavros_extras-0.18.3-r1.ebuild
+1610061655 ./dev-ros/mavros_extras/mavros_extras-9999.ebuild
 1509222004 ./dev-ros/tf/tf-9999.ebuild
 1603071106 ./dev-ros/tf/tf-1.11.8.ebuild
 1509222004 ./dev-ros/tf/tf-1.11.7.ebuild
@@ -9948,8 +9931,8 @@
 1602251257 ./dev-ros/nav_msgs/nav_msgs-1.12.3.ebuild
 1602251257 ./dev-ros/nav_msgs/nav_msgs-9999.ebuild
 1602251302 ./dev-ros/nav_msgs/nav_msgs-1.12.4.ebuild
-1606291136 ./dev-ros/pcl_ros/pcl_ros-9999.ebuild
-1606291136 ./dev-ros/pcl_ros/pcl_ros-1.4.1-r1.ebuild
+1610061647 ./dev-ros/pcl_ros/pcl_ros-9999.ebuild
+1610061647 ./dev-ros/pcl_ros/pcl_ros-1.4.1-r2.ebuild
 1603141438 ./dev-ros/roslang/roslang-1.13.1.ebuild
 1509221510 ./dev-ros/roslang/roslang-1.12.3.ebuild
 1510151425 ./dev-ros/roslang/roslang-1.12.5.ebuild
@@ -10584,6 +10567,7 @@
 1601101417 ./media-radio/tucnak2/tucnak2-2.48.ebuild
 1508090338 ./media-radio/adifmerg/adifmerg-31-r1.ebuild
 1607270959 ./net-nds/rpcbind/rpcbind-0.2.3-r1.ebuild
+1610070021 ./net-nds/rpcbind/rpcbind-0.2.3-r2.ebuild
 1607270959 ./net-nds/rpcbind/rpcbind-9999.ebuild
 1607270959 ./net-nds/rpcbind/rpcbind-0.2.0-r1.ebuild
 1607270959 ./net-nds/rpcbind/rpcbind-0.2.2-r1.ebuild
@@ -13498,7 +13482,7 @@
 1508090338 ./sci-electronics/geda/geda-1.8.2.ebuild
 1608120235 ./sci-electronics/geda/geda-1.9.2.ebuild
 1508090338 ./sci-electronics/puff/puff-20100127.ebuild
-1608041549 ./sci-electronics/gazebo/gazebo-7.3.1.ebuild
+1610061551 ./sci-electronics/gazebo/gazebo-7.3.1.ebuild
 1606171927 ./sci-electronics/gazebo/gazebo-7.2.0.ebuild
 1603031558 ./sci-electronics/quartus-prime-lite/quartus-prime-lite-15.1.0.185-r1.ebuild
 1512271308 ./sci-electronics/quartus-prime-lite/quartus-prime-lite-15.1.0.185.ebuild
@@ -23616,7 +23600,8 @@
 1508090338 ./x11-terms/hanterm/hanterm-3.1.6-r4.ebuild
 1508090338 ./x11-terms/hanterm/hanterm-3.1.6-r2.ebuild
 1605112126 ./x11-terms/qterminal/qterminal-0.6.0-r1.ebuild
-1605112146 ./x11-terms/qterminal/qterminal-9999.ebuild
+1610062009 ./x11-terms/qterminal/qterminal-9999.ebuild
+1610062009 ./x11-terms/qterminal/qterminal-0.7.0.ebuild
 1608201704 ./x11-terms/st/st-0.7.ebuild
 1608201704 ./x11-terms/st/st-0.6-r1.ebuild
 1608201704 ./x11-terms/st/st-9999.ebuild
@@ -24546,12 +24531,13 @@
 1508090338 ./sys-auth/pam_p11/pam_p11-0.1.5-r1.ebuild
 1609120306 ./sys-auth/keystone/keystone-2016.1.9999.ebuild
 1610041809 ./sys-auth/keystone/keystone-2016.2.9999.ebuild
+1610062104 ./sys-auth/keystone/keystone-10.0.0.ebuild
 1609120306 ./sys-auth/keystone/keystone-9.1.0.ebuild
 1609231740 ./sys-auth/keystone/keystone-9.2.0.ebuild
 1609291343 ./sys-auth/consolekit/consolekit-1.1.0.ebuild
 1609150929 ./sys-auth/consolekit/consolekit-9999.ebuild
 1604202241 ./sys-auth/consolekit/consolekit-0.4.6.ebuild
-1609150929 ./sys-auth/consolekit/consolekit-1.1.0-r1.ebuild
+1610070307 ./sys-auth/consolekit/consolekit-1.1.0-r1.ebuild
 1608021814 ./sys-auth/consolekit/consolekit-1.0.1.ebuild
 1508090338 ./sys-auth/pam_yubico/pam_yubico-2.19-r1.ebuild
 1609221352 ./sys-auth/pam_yubico/pam_yubico-2.23.ebuild
@@ -25305,8 +25291,8 @@
 1508090338 ./mail-client/alot/alot-0.3.6.ebuild
 1508090338 ./mail-client/pinepgp/pinepgp-0.18.0-r1.ebuild
 1508090338 ./mail-client/thunderbird-bin/thunderbird-bin-31.8.0.ebuild
-1608311805 ./mail-client/thunderbird-bin/thunderbird-bin-45.3.0.ebuild
 1605051757 ./mail-client/thunderbird-bin/thunderbird-bin-38.8.0.ebuild
+1610062247 ./mail-client/thunderbird-bin/thunderbird-bin-45.4.0.ebuild
 1610010342 ./app-crypt/seahorse/seahorse-3.20.0.ebuild
 1603071106 ./app-crypt/seahorse/seahorse-3.18.0.ebuild
 1508241641 ./app-crypt/pkcs11-data/pkcs11-data-0.7.4.ebuild
@@ -25777,6 +25763,8 @@
 1609151438 ./kde-apps/libkcddb/libkcddb-16.08.1.ebuild
 1608192151 ./kde-apps/libkcddb/libkcddb-16.04.3.ebuild
 1607072052 ./kde-apps/kdepimlibs/kdepimlibs-4.14.10.ebuild
+1610062133 ./kde-apps/kdepimlibs/kdepimlibs-4.14.10-r1.ebuild
+1610062133 ./kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211-r1.ebuild
 1607072052 ./kde-apps/kdepimlibs/kdepimlibs-4.14.11_pre20160211.ebuild
 1608192151 ./kde-apps/kiten/kiten-16.04.3.ebuild
 1609151438 ./kde-apps/kiten/kiten-16.08.1.ebuild
@@ -28084,8 +28072,7 @@
 1509012253 ./net-misc/ps3mediaserver/ps3mediaserver-1.90.1.ebuild
 1509012253 ./net-misc/ps3mediaserver/ps3mediaserver-1.90.0.ebuild
 1508090338 ./net-misc/ssh-askpass-fullscreen/ssh-askpass-fullscreen-1.0-r1.ebuild
-1608131016 ./net-misc/quagga/quagga-1.0.20160315-r3.ebuild
-1606202354 ./net-misc/quagga/quagga-1.0.20160315-r2.ebuild
+1610061457 ./net-misc/quagga/quagga-1.0.20160315-r3.ebuild
 1508090338 ./net-misc/balance/balance-3.54-r1.ebuild
 1508090338 ./net-misc/bwwhois/bwwhois-5.5.2-r2.ebuild
 1508090338 ./net-misc/leapcast/leapcast-0.1.3-r1.ebuild
@@ -28165,6 +28152,7 @@
 1605040316 ./net-misc/monmotha/monmotha-2.3.8-r1.ebuild
 1508090338 ./net-misc/sendfile/sendfile-2.1b-r1.ebuild
 1604272208 ./net-misc/cmst/cmst-2016.04.03.ebuild
+1610061829 ./net-misc/cmst/cmst-2016.10.03.ebuild
 1608062221 ./net-misc/freerdp/freerdp-9999.ebuild
 1608062221 ./net-misc/freerdp/freerdp-2.0.0_pre20160722.ebuild
 1511082044 ./net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild
@@ -28194,6 +28182,7 @@
 1508090338 ./net-p2p/ppcoin-qt/ppcoin-qt-0.4.0.ebuild
 1508090338 ./net-p2p/mktorrent/mktorrent-1.0-r1.ebuild
 1508241504 ./net-p2p/kmldonkey/kmldonkey-2.0.7.ebuild
+1610070102 ./net-p2p/go-ethereum/go-ethereum-1.4.16-r1.ebuild
 1508090338 ./net-p2p/multibit/multibit-0.5.18.ebuild
 1508090338 ./net-p2p/bittornado/bittornado-0.3.18-r2.ebuild
 1609261535 ./net-p2p/bittornado/bittornado-0.3.18-r4.ebuild
@@ -29900,6 +29889,7 @@
 1508090338 ./sys-cluster/pbs-python/pbs-python-4.3.3-r1.ebuild
 1610010512 ./sys-cluster/nova/nova-2016.2.9999.ebuild
 1609102055 ./sys-cluster/nova/nova-13.1.1.ebuild
+1610062125 ./sys-cluster/nova/nova-14.0.0.ebuild
 1604130829 ./sys-cluster/nova/nova-2016.1.9999.ebuild
 1508090338 ./sys-cluster/crmsh/crmsh-2.1.1.ebuild
 1508090338 ./sys-cluster/maui/maui-3.3.ebuild
@@ -29920,7 +29910,8 @@
 1510041121 ./sys-cluster/csync2/csync2-2.0.ebuild
 1508090338 ./sys-cluster/charmdebug/charmdebug-6.2.0-r1.ebuild
 1610010512 ./sys-cluster/cinder/cinder-2016.1.9999.ebuild
-1610032336 ./sys-cluster/cinder/cinder-2016.2.9999.ebuild
+1610062120 ./sys-cluster/cinder/cinder-2016.2.9999.ebuild
+1610062120 ./sys-cluster/cinder/cinder-9.0.0.ebuild
 1610010512 ./sys-cluster/cinder/cinder-8.1.0.ebuild
 1610010512 ./sys-cluster/cinder/cinder-8.1.1.ebuild
 1603171350 ./sys-cluster/keepalived/keepalived-1.2.19.ebuild
@@ -29928,9 +29919,10 @@
 1508090338 ./sys-cluster/keepalived/keepalived-1.2.2-r4.ebuild
 1606301650 ./sys-cluster/keepalived/keepalived-1.2.22.ebuild
 1508090338 ./sys-cluster/keepalived/keepalived-1.2.15.ebuild
-1610051619 ./sys-cluster/neutron/neutron-2016.2.9999.ebuild
-1604130606 ./sys-cluster/neutron/neutron-2016.1.9999.ebuild
-1609292059 ./sys-cluster/neutron/neutron-8.2.0.ebuild
+1610062134 ./sys-cluster/neutron/neutron-2016.2.9999.ebuild
+1610062134 ./sys-cluster/neutron/neutron-2016.1.9999.ebuild
+1610062134 ./sys-cluster/neutron/neutron-8.2.0.ebuild
+1610062134 ./sys-cluster/neutron/neutron-9.0.0.ebuild
 1603181708 ./sys-cluster/zookeepercli/zookeepercli-1.0.10.ebuild
 1610032336 ./sys-cluster/openstack-meta/openstack-meta-2016.2.9999.ebuild
 1610010512 ./sys-cluster/openstack-meta/openstack-meta-2016.1.9999.ebuild
@@ -29955,6 +29947,7 @@
 1609030127 ./sys-cluster/gasnet/gasnet-1.26.4.ebuild
 1609100134 ./sys-cluster/gasnet/gasnet-1.26.4-r1.ebuild
 1610032336 ./sys-cluster/heat/heat-2016.2.9999.ebuild
+1610062127 ./sys-cluster/heat/heat-7.0.0.ebuild
 1508090338 ./sys-cluster/ganglia/ganglia-3.7.1-r1.ebuild
 1508090338 ./sys-cluster/ganglia/ganglia-3.6.0-r1.ebuild
 1508090338 ./sys-cluster/ganglia/ganglia-3.5.0.ebuild
@@ -30751,7 +30744,7 @@
 1508090338 ./dev-lang/swig/swig-3.0.5.ebuild
 1508090338 ./dev-lang/rebol/rebol-9999.ebuild
 1607282342 ./dev-lang/nim/nim-0.14.2.ebuild
-1610011225 ./dev-lang/nim/nim-0.15.0.ebuild
+1610062354 ./dev-lang/nim/nim-0.15.0-r1.ebuild
 1508090338 ./dev-lang/mlton/mlton-20130715.ebuild
 1606021552 ./dev-lang/rakudo/rakudo-9999.ebuild
 1606021552 ./dev-lang/rakudo/rakudo-2016.05.ebuild
@@ -30910,7 +30903,7 @@
 1610020958 ./dev-lang/ruby/ruby-2.1.10.ebuild
 1610020958 ./dev-lang/ruby/ruby-2.2.5.ebuild
 1508090338 ./dev-lang/yap/yap-6.2.2.ebuild
-1607211929 ./dev-lang/yap/yap-6.3.3.ebuild
+1610061540 ./dev-lang/yap/yap-6.3.3.ebuild
 1603161627 ./dev-lang/yap/yap-6.3.2.ebuild
 1608110008 ./dev-lang/squirrel/squirrel-3.1.ebuild
 1608081141 ./dev-lang/squirrel/squirrel-2.2.4-r2.ebuild
@@ -31356,6 +31349,7 @@
 1508090338 ./games-emulation/zinc/zinc-1.1.ebuild
 1508090338 ./games-emulation/mekanix/mekanix-070.ebuild
 1609261341 ./games-emulation/mgba/mgba-0.5.0.ebuild
+1610061752 ./games-emulation/mgba/mgba-0.5.1.ebuild
 1508090338 ./games-emulation/openmsx/openmsx-0.9.1.ebuild
 1603311121 ./games-emulation/gngeo/gngeo-0.8.ebuild
 1508090338 ./games-emulation/vgba/vgba-4.8.ebuild
@@ -32313,7 +32307,8 @@
 1609141015 ./app-emulation/virtualbox-additions/virtualbox-additions-5.1.6.ebuild
 1604260217 ./app-emulation/cloud-init/cloud-init-0.7.6-r2.ebuild
 1604282033 ./app-emulation/cloud-init/cloud-init-0.7.6_p1212.ebuild
-1608220234 ./app-emulation/cloud-init/cloud-init-9999.ebuild
+1610061921 ./app-emulation/cloud-init/cloud-init-0.7.8.ebuild
+1610061927 ./app-emulation/cloud-init/cloud-init-9999.ebuild
 1602010347 ./app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild
 1608201944 ./app-emulation/cloud-init/cloud-init-0.7.7.ebuild
 1608212227 ./app-emulation/qemu/qemu-9999.ebuild
@@ -33836,6 +33831,7 @@
 1602021101 ./app-admin/qtpass/qtpass-1.1.0.ebuild
 1601041015 ./app-admin/qtpass/qtpass-1.0.5.ebuild
 1603280634 ./app-admin/glance/glance-2016.1.9999.ebuild
+1610062106 ./app-admin/glance/glance-13.0.0.ebuild
 1610050626 ./app-admin/glance/glance-2016.2.9999.ebuild
 1606050451 ./app-admin/glance/glance-12.0.0.ebuild
 1508090338 ./app-admin/diradm/diradm-2.9.7.1.ebuild
@@ -37916,6 +37912,7 @@
 1604202241 ./x11-misc/shared-mime-info/shared-mime-info-1.6.ebuild
 1604202241 ./x11-misc/shared-mime-info/shared-mime-info-1.4.ebuild
 1608221302 ./x11-misc/shutter/shutter-0.93.1-r1.ebuild
+1610061836 ./x11-misc/rednotebook/rednotebook-1.14.ebuild
 1603131652 ./x11-misc/rednotebook/rednotebook-1.8.0.ebuild
 1508090338 ./x11-misc/xfractint/xfractint-20.04_p12.ebuild
 1508090338 ./x11-misc/fbpanel/fbpanel-6.1-r2.ebuild
@@ -38031,6 +38028,7 @@
 1607270959 ./x11-misc/bbtime/bbtime-0.1.5.ebuild
 1601292305 ./x11-misc/lineakd/lineakd-0.9.0-r1.ebuild
 1607271846 ./x11-misc/albert/albert-0.8.10.ebuild
+1610061740 ./x11-misc/albert/albert-0.8.11.ebuild
 1608120812 ./x11-misc/mozo/mozo-1.12.0-r1.ebuild
 1607252136 ./x11-misc/mozo/mozo-1.10.1.ebuild
 1508090338 ./x11-misc/bbcd/bbcd-0.3.1-r1.ebuild
@@ -38327,7 +38325,7 @@
 1607270959 ./www-client/fetch/fetch-1.0-r1.ebuild
 1607270959 ./www-client/fetch/fetch-1.0-r2.ebuild
 1602141310 ./www-client/qupzilla/qupzilla-1.8.9.ebuild
-1606232108 ./www-client/qupzilla/qupzilla-2.0.1.ebuild
+1610062059 ./www-client/qupzilla/qupzilla-2.0.1.ebuild
 1604282259 ./www-client/qupzilla/qupzilla-2.0.0.ebuild
 1607181955 ./www-client/seamonkey/seamonkey-2.39.ebuild
 1607181955 ./www-client/seamonkey/seamonkey-2.40.ebuild
@@ -38674,7 +38672,8 @@
 1606162304 ./x11-libs/libyui/libyui-3.2.5.ebuild
 1508090338 ./x11-libs/libyui/libyui-3.0.13.ebuild
 1605112057 ./x11-libs/qtermwidget/qtermwidget-0.6.0-r1.ebuild
-1605112146 ./x11-libs/qtermwidget/qtermwidget-9999.ebuild
+1610062009 ./x11-libs/qtermwidget/qtermwidget-0.7.0.ebuild
+1610062009 ./x11-libs/qtermwidget/qtermwidget-9999.ebuild
 1607031933 ./x11-libs/goffice/goffice-0.10.31.ebuild
 1606112239 ./x11-libs/goffice/goffice-0.10.29.ebuild
 1610010350 ./x11-libs/goffice/goffice-0.10.32.ebuild
@@ -39835,7 +39834,6 @@
 1609240438 metadata/md5-cache/app-editors/retext-5.3.1
 1610010408 metadata/md5-cache/app-editors/gedit-plugins-3.20.0
 1609031439 metadata/md5-cache/app-editors/padre-0.980.0-r1
-1609051509 metadata/md5-cache/app-editors/mg-20160905
 1609031439 metadata/md5-cache/app-editors/nano-2.6.1
 1609031439 metadata/md5-cache/app-editors/gummi-0.6.6
 1609240438 metadata/md5-cache/app-editors/editra-0.7.20-r1
@@ -39946,6 +39944,7 @@
 1609031439 metadata/md5-cache/app-editors/emacs-vcs-25.0.50_pre20151113
 1609082338 metadata/md5-cache/app-editors/efte-1.1-r1
 1609202139 metadata/md5-cache/app-editors/vim-core-8.0.0005-r1
+1610070909 metadata/md5-cache/app-editors/mg-20161005
 1609240438 metadata/md5-cache/app-editors/atom-1.7.4-r4
 1609031439 metadata/md5-cache/app-editors/mlview-0.9.0-r1
 1609031439 metadata/md5-cache/app-editors/emacs-24.4-r4
@@ -40447,7 +40446,7 @@
 1609031443 metadata/md5-cache/dev-libs/wayland-9999
 1609031443 metadata/md5-cache/dev-libs/libmcal-0.7-r5
 1609031443 metadata/md5-cache/dev-libs/kpathsea-6.2.1_p20150521-r1
-1610061209 metadata/md5-cache/dev-libs/boost-1.62.0-r1
+1610062139 metadata/md5-cache/dev-libs/boost-1.62.0-r1
 1609031443 metadata/md5-cache/dev-libs/tvmet-1.7.2-r2
 1610010409 metadata/md5-cache/dev-libs/libpeas-1.18.0
 1609031443 metadata/md5-cache/dev-libs/gnulib-2009.03.03.14.07.45-r1
@@ -42095,7 +42094,6 @@
 1609031456 metadata/md5-cache/net-analyzer/postal-0.72
 1609031456 metadata/md5-cache/net-analyzer/check_mk-1.2.4_p5
 1508100528 metadata/md5-cache/sys-apps/apply-default-acl-0.0.4
-1610031039 metadata/md5-cache/sys-apps/checkpolicy-2.6_rc1
 1609031500 metadata/md5-cache/sys-apps/iotools-1.4
 1609031500 metadata/md5-cache/sys-apps/irqbalance-1.0.9
 1609031500 metadata/md5-cache/sys-apps/miscfiles-1.4.2-r1
@@ -42194,14 +42192,14 @@
 1609031500 metadata/md5-cache/sys-apps/lcdsplash-0.3
 1609240444 metadata/md5-cache/sys-apps/dbus-1.10.10
 1607271009 metadata/md5-cache/sys-apps/gscanbus-0.8
-1609031500 metadata/md5-cache/sys-apps/secilc-2.5
+1610070739 metadata/md5-cache/sys-apps/secilc-2.5
 1609031500 metadata/md5-cache/sys-apps/conspy-1.10
 1510091008 metadata/md5-cache/sys-apps/ethtool-4.2
 1609031500 metadata/md5-cache/sys-apps/hwloc-1.6.1
 1609082342 metadata/md5-cache/sys-apps/roccat-tools-5.1.0
 1609240444 metadata/md5-cache/sys-apps/gcp-0.1.3
 1609111009 metadata/md5-cache/sys-apps/dtc-9999
-1610031039 metadata/md5-cache/sys-apps/secilc-9999
+1610070739 metadata/md5-cache/sys-apps/secilc-9999
 1609031500 metadata/md5-cache/sys-apps/rescan-scsi-bus-1.57-r1
 1609031500 metadata/md5-cache/sys-apps/lmctfy-0.5.0-r1
 1609031500 metadata/md5-cache/sys-apps/lshw-02.17b-r1
@@ -42222,6 +42220,7 @@
 1508100528 metadata/md5-cache/sys-apps/collectl-3.7.4
 1609031500 metadata/md5-cache/sys-apps/qdiskusage-1.0.4
 1609031500 metadata/md5-cache/sys-apps/acl-2.2.52-r1
+1610070739 metadata/md5-cache/sys-apps/policycoreutils-2.6_rc2
 1609031500 metadata/md5-cache/sys-apps/memtest86-4.3.7
 1609031501 metadata/md5-cache/sys-apps/xinetd-2.3.15-r3
 1609031500 metadata/md5-cache/sys-apps/hwids-20160421
@@ -42332,7 +42331,6 @@
 1609031500 metadata/md5-cache/sys-apps/mount-gtk-1.4.2
 1609031500 metadata/md5-cache/sys-apps/modutils-2.4.27-r1
 1609031500 metadata/md5-cache/sys-apps/epoch-1.1.1
-1610031039 metadata/md5-cache/sys-apps/policycoreutils-2.6_rc1
 1609031500 metadata/md5-cache/sys-apps/fakeroot-1.20
 1610031809 metadata/md5-cache/sys-apps/apply-default-acl-0.0.6
 1609031500 metadata/md5-cache/sys-apps/fakeroot-1.19
@@ -42439,7 +42437,6 @@
 1609031500 metadata/md5-cache/sys-apps/gawk-4.1.4
 1609031500 metadata/md5-cache/sys-apps/iproute2-3.8.0
 1609031500 metadata/md5-cache/sys-apps/debianutils-4.7
-1610031039 metadata/md5-cache/sys-apps/secilc-2.6_rc1
 1609240444 metadata/md5-cache/sys-apps/bleachbit-1.11.2
 1609031500 metadata/md5-cache/sys-apps/net-tools-1.60_p20141019041918-r1
 1606212309 metadata/md5-cache/sys-apps/stroke-0.1.3-r1
@@ -42465,6 +42462,7 @@
 1609031500 metadata/md5-cache/sys-apps/sandbox-2.11-r2
 1609031500 metadata/md5-cache/sys-apps/ed-1.12
 1508241709 metadata/md5-cache/sys-apps/ethtool-3.12.1
+1610070739 metadata/md5-cache/sys-apps/checkpolicy-2.6_rc2
 1609031500 metadata/md5-cache/sys-apps/ucspi-proxy-0.97
 1609031500 metadata/md5-cache/sys-apps/groff-1.22.3
 1609031500 metadata/md5-cache/sys-apps/flashrom-0.9.9
@@ -42540,6 +42538,7 @@
 1609031500 metadata/md5-cache/sys-apps/duc-1.4.1-r1
 1609031500 metadata/md5-cache/sys-apps/cpuid-20130610
 1604070137 metadata/md5-cache/sys-apps/less-483-r1
+1610062109 metadata/md5-cache/sys-apps/openrc-0.22.2
 1509012338 metadata/md5-cache/sys-apps/mtree-1.0
 1609031500 metadata/md5-cache/sys-apps/elfix-0.9.2
 1609031500 metadata/md5-cache/sys-apps/lmctfy-0.5.0
@@ -42548,7 +42547,7 @@
 1609031500 metadata/md5-cache/sys-apps/grep-2.25
 1609060239 metadata/md5-cache/sys-apps/systemd-229
 1609031500 metadata/md5-cache/sys-apps/gawk-4.0.2
-1610031039 metadata/md5-cache/sys-apps/policycoreutils-9999
+1610070739 metadata/md5-cache/sys-apps/policycoreutils-9999
 1609031500 metadata/md5-cache/sys-apps/iotools-1.5
 1508241439 metadata/md5-cache/sys-apps/daemonize-1.7.4
 1609031500 metadata/md5-cache/sys-apps/daisydog-2014.05.30
@@ -42597,7 +42596,7 @@
 1609031500 metadata/md5-cache/sys-apps/iproute2-3.19.0
 1609031500 metadata/md5-cache/sys-apps/hardened-shadow-0.9.2
 1609031500 metadata/md5-cache/sys-apps/gptfdisk-1.0.0
-1610031039 metadata/md5-cache/sys-apps/checkpolicy-9999
+1610070739 metadata/md5-cache/sys-apps/checkpolicy-9999
 1609031500 metadata/md5-cache/sys-apps/rename-1.3-r1
 1609261609 metadata/md5-cache/sys-apps/biosdevname-0.7.2
 1609031500 metadata/md5-cache/sys-apps/moreutils-0.59
@@ -42645,6 +42644,7 @@
 1609031500 metadata/md5-cache/sys-apps/makedev-3.23.1
 1603080207 metadata/md5-cache/sys-apps/s6-2.2.4.3
 1609240444 metadata/md5-cache/sys-apps/portage-2.2.28
+1610070739 metadata/md5-cache/sys-apps/secilc-2.6_rc2
 1609031500 metadata/md5-cache/sys-apps/pcsc-tools-1.4.26
 1609031500 metadata/md5-cache/sys-apps/hwloc-1.8.1
 1609240444 metadata/md5-cache/sys-apps/file-5.25
@@ -42877,7 +42877,7 @@
 1609240440 metadata/md5-cache/dev-python/nnpy-1.2-r1
 1609240440 metadata/md5-cache/dev-python/markdown-2.6.4
 1609240439 metadata/md5-cache/dev-python/jsmin-2.2.0
-1609240441 metadata/md5-cache/dev-python/selectors34-1.1
+1610070139 metadata/md5-cache/dev-python/selectors34-1.1
 1609240439 metadata/md5-cache/dev-python/curtsies-0.1.23
 1609240440 metadata/md5-cache/dev-python/oauthlib-1.0.1
 1609240439 metadata/md5-cache/dev-python/d2to1-0.2.11
@@ -43490,6 +43490,7 @@
 1609240441 metadata/md5-cache/dev-python/rosdistro-0.4.5
 1609240439 metadata/md5-cache/dev-python/alembic-0.8.6
 1609240439 metadata/md5-cache/dev-python/flask-evolution-0.5-r1
+1610070739 metadata/md5-cache/dev-python/sepolgen-2.6_rc2
 1609240440 metadata/md5-cache/dev-python/python-ldap-2.4.19-r1
 1609240440 metadata/md5-cache/dev-python/numpydoc-0.4-r1
 1609240441 metadata/md5-cache/dev-python/zeroconf-0.17.4
@@ -43672,7 +43673,7 @@
 1609240440 metadata/md5-cache/dev-python/pillow-3.1.1
 1609240439 metadata/md5-cache/dev-python/cffi-1.8.2
 1609240439 metadata/md5-cache/dev-python/httpretty-0.8.12
-1610031039 metadata/md5-cache/dev-python/sepolgen-9999
+1610070739 metadata/md5-cache/dev-python/sepolgen-9999
 1609240440 metadata/md5-cache/dev-python/mock-1.0.1-r2
 1609240440 metadata/md5-cache/dev-python/pypy3-bin-2.4.0-r4
 1609240440 metadata/md5-cache/dev-python/ptpython-0.25
@@ -44068,6 +44069,7 @@
 1609240439 metadata/md5-cache/dev-python/dj-database-url-0.4.0
 1609240440 metadata/md5-cache/dev-python/pyflakes-1.2.3
 1609240439 metadata/md5-cache/dev-python/flask-evolution-0.6
+1610061939 metadata/md5-cache/dev-python/pygtkspellcheck-4.0.5
 1609240440 metadata/md5-cache/dev-python/mccabe-0.3.1
 1609240441 metadata/md5-cache/dev-python/testtools-1.8.0
 1609240439 metadata/md5-cache/dev-python/djangocms-link-1.7.1
@@ -44089,7 +44091,6 @@
 1609240441 metadata/md5-cache/dev-python/twisted-news-14.0.2
 1609240439 metadata/md5-cache/dev-python/attrdict-2.0.0
 1609240439 metadata/md5-cache/dev-python/distlib-0.2.1
-1610031039 metadata/md5-cache/dev-python/sepolgen-2.6_rc1
 1609240440 metadata/md5-cache/dev-python/pytables-3.2.2
 1609240441 metadata/md5-cache/dev-python/tabulate-0.7.5
 1609240440 metadata/md5-cache/dev-python/python-cdb-0.34-r1
@@ -44642,7 +44643,7 @@
 1609240440 metadata/md5-cache/dev-python/pycodestyle-2.0.0
 1609240440 metadata/md5-cache/dev-python/numba-0.22.1
 1609240441 metadata/md5-cache/dev-python/rsa-3.2.3-r1
-1609240439 metadata/md5-cache/dev-python/dill-0.2.5
+1610070139 metadata/md5-cache/dev-python/dill-0.2.5
 1609240440 metadata/md5-cache/dev-python/natgrid-0.2.1-r2
 1609240439 metadata/md5-cache/dev-python/aadict-0.2.2
 1609240441 metadata/md5-cache/dev-python/rebulk-9999
@@ -46266,11 +46267,12 @@
 1609240444 metadata/md5-cache/sys-libs/cracklib-2.9.1-r1
 1609031502 metadata/md5-cache/sys-libs/pam-1.2.1
 1609031502 metadata/md5-cache/sys-libs/newlib-2.2.0.20150423
+1610070739 metadata/md5-cache/sys-libs/libsemanage-2.6_rc2
 1609031502 metadata/md5-cache/sys-libs/db-1.85-r3
 1609201309 metadata/md5-cache/sys-libs/musl-1.1.15
 1609031502 metadata/md5-cache/sys-libs/ncurses-5.9-r4
 1609031502 metadata/md5-cache/sys-libs/gpm-1.20.7-r2
-1609240444 metadata/md5-cache/sys-libs/libselinux-2.5-r1
+1610070739 metadata/md5-cache/sys-libs/libselinux-2.5-r1
 1609031502 metadata/md5-cache/sys-libs/lwp-2.2
 1609051039 metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.3
 1609031502 metadata/md5-cache/sys-libs/glibc-2.19-r1
@@ -46278,19 +46280,19 @@
 1609031502 metadata/md5-cache/sys-libs/uclibc-ng-1.0.16
 1609301139 metadata/md5-cache/sys-libs/libomp-3.9.0
 1609031502 metadata/md5-cache/sys-libs/csu-85
-1609082342 metadata/md5-cache/sys-libs/llvm-libunwind-9999
+1610061639 metadata/md5-cache/sys-libs/llvm-libunwind-9999
 1609031502 metadata/md5-cache/sys-libs/db-5.3.28-r2
 1609031502 metadata/md5-cache/sys-libs/timezone-data-2016f
 1609031502 metadata/md5-cache/sys-libs/db-4.8.30-r2
 1609031502 metadata/md5-cache/sys-libs/readline-7.0_rc2
 1608061139 metadata/md5-cache/sys-libs/fortify-headers-9999
-1610051709 metadata/md5-cache/sys-libs/libcxxabi-9999
+1610061639 metadata/md5-cache/sys-libs/libcxxabi-9999
 1609031502 metadata/md5-cache/sys-libs/libservicelog-1.0.1
 1609031502 metadata/md5-cache/sys-libs/libutempter-1.1.6-r1
 1607271009 metadata/md5-cache/sys-libs/libvpd-2.1.3
 1609031502 metadata/md5-cache/sys-libs/libudev-compat-186
 1609031502 metadata/md5-cache/sys-libs/glibc-9999
-1610031039 metadata/md5-cache/sys-libs/libsemanage-9999
+1610070739 metadata/md5-cache/sys-libs/libsemanage-9999
 1609031502 metadata/md5-cache/sys-libs/ncurses-6.0
 1511090807 metadata/md5-cache/sys-libs/libstdc++-v3-bin-3.3.6
 1610030309 metadata/md5-cache/sys-libs/uclibc-ng-9999
@@ -46314,7 +46316,7 @@
 1609240444 metadata/md5-cache/sys-libs/openipmi-2.0.18-r1
 1609031502 metadata/md5-cache/sys-libs/libunwind-1.0.1
 1508100529 metadata/md5-cache/sys-libs/gwenhywfar-4.3.3
-1610031039 metadata/md5-cache/sys-libs/libselinux-9999
+1610070739 metadata/md5-cache/sys-libs/libselinux-9999
 1609031502 metadata/md5-cache/sys-libs/libaal-1.0.5
 1607311739 metadata/md5-cache/sys-libs/rvm-1.17-r1
 1609240444 metadata/md5-cache/sys-libs/tdb-1.3.10
@@ -46330,7 +46332,6 @@
 1609031502 metadata/md5-cache/sys-libs/libseccomp-2.2.3
 1609031502 metadata/md5-cache/sys-libs/libunwind-1.0.1-r1
 1609031502 metadata/md5-cache/sys-libs/newlib-2.3.0.20160104
-1610031039 metadata/md5-cache/sys-libs/libsepol-2.6_rc1
 1511090807 metadata/md5-cache/sys-libs/libxcrypt-2.0
 1609031502 metadata/md5-cache/sys-libs/newlib-2.2.0
 1609031502 metadata/md5-cache/sys-libs/libsepol-2.5
@@ -46376,7 +46377,7 @@
 1609031502 metadata/md5-cache/sys-libs/libhx-3.16
 1609031502 metadata/md5-cache/sys-libs/e2fsprogs-libs-1.43.1
 1607271009 metadata/md5-cache/sys-libs/libavc1394-0.5.3
-1610051809 metadata/md5-cache/sys-libs/libcxxabi-3.9.0
+1610061639 metadata/md5-cache/sys-libs/libcxxabi-3.9.0
 1610051739 metadata/md5-cache/sys-libs/libcxx-9999
 1609031502 metadata/md5-cache/sys-libs/libcxx-3.8.0
 1609031502 metadata/md5-cache/sys-libs/openhpi-3.0.0
@@ -46385,7 +46386,6 @@
 1609031502 metadata/md5-cache/sys-libs/libservicelog-1.1.15
 1609031502 metadata/md5-cache/sys-libs/libraw1394-2.1.1
 1609240444 metadata/md5-cache/sys-libs/ldb-1.1.27-r1
-1610040839 metadata/md5-cache/sys-libs/libsemanage-2.6_rc1-r1
 1609240444 metadata/md5-cache/sys-libs/cracklib-2.9.6
 1609031502 metadata/md5-cache/sys-libs/db-4.7.25_p4
 1609031502 metadata/md5-cache/sys-libs/db-5.1.29-r1
@@ -46398,7 +46398,7 @@
 1609240444 metadata/md5-cache/sys-libs/ldb-1.1.27
 1609240444 metadata/md5-cache/sys-libs/ldb-1.1.24
 1609031502 metadata/md5-cache/sys-libs/musl-1.1.14-r2
-1610031039 metadata/md5-cache/sys-libs/libsepol-9999
+1610070739 metadata/md5-cache/sys-libs/libsepol-9999
 1605111309 metadata/md5-cache/sys-libs/gwenhywfar-4.15.3
 1609031502 metadata/md5-cache/sys-libs/libstatgrab-0.91
 1609031502 metadata/md5-cache/sys-libs/db-6.1.26
@@ -46410,7 +46410,6 @@
 1609240444 metadata/md5-cache/sys-libs/talloc-2.1.5
 1609031502 metadata/md5-cache/sys-libs/glibc-2.23-r2
 1508140908 metadata/md5-cache/sys-libs/fortify-headers-0.7
-1609082342 metadata/md5-cache/sys-libs/llvm-libunwind-3.9.0
 1609031502 metadata/md5-cache/sys-libs/argp-standalone-1.3-r1
 1610012239 metadata/md5-cache/sys-libs/compiler-rt-sanitizers-9999
 1609031502 metadata/md5-cache/sys-libs/db-6.2.23
@@ -46456,8 +46455,10 @@
 1609082342 metadata/md5-cache/sys-libs/libomp-3.8.1
 1609291409 metadata/md5-cache/sys-libs/libnih-1.0.3-r3
 1609031502 metadata/md5-cache/sys-libs/binutils-libs-2.25.1-r2
+1610070739 metadata/md5-cache/sys-libs/libselinux-2.6_rc2
 1609031502 metadata/md5-cache/sys-libs/glibc-2.17
 1609031502 metadata/md5-cache/sys-libs/pam-1.3.0
+1610061639 metadata/md5-cache/sys-libs/llvm-libunwind-3.9.0-r1
 1508100529 metadata/md5-cache/sys-libs/gwenhywfar-4.12.0_beta
 1609031502 metadata/md5-cache/sys-libs/system-config-base-1-r1
 1609082342 metadata/md5-cache/sys-libs/nss_wrapper-1.1.3
@@ -46468,8 +46469,8 @@
 1609031502 metadata/md5-cache/sys-libs/glibc-2.23-r1
 1609031502 metadata/md5-cache/sys-libs/freeipmi-1.5.3
 1609031502 metadata/md5-cache/sys-libs/openhpi-2.12.0
-1610052009 metadata/md5-cache/sys-libs/libselinux-2.6_rc1-r1
 1609031502 metadata/md5-cache/sys-libs/libunwind-1.1-r1
+1610070739 metadata/md5-cache/sys-libs/libsepol-2.6_rc2
 1609031502 metadata/md5-cache/sys-libs/suacomp-9999
 1609240444 metadata/md5-cache/sys-libs/openipmi-2.0.22
 1609240444 metadata/md5-cache/sys-libs/tdb-1.3.8
@@ -48314,7 +48315,6 @@
 1609240442 metadata/md5-cache/dev-ros/rqt_publisher-0.3.13
 1609082339 metadata/md5-cache/dev-ros/image_transport-1.11.10
 1609240442 metadata/md5-cache/dev-ros/rqt_msg-0.4.1
-1609240441 metadata/md5-cache/dev-ros/image_cb_detector-0.10.13
 1609240442 metadata/md5-cache/dev-ros/roslz4-1.12.1
 1609082339 metadata/md5-cache/dev-ros/hector_imu_tools-0.3.5
 1609240442 metadata/md5-cache/dev-ros/rosserial_tivac-0.7.2
@@ -48323,6 +48323,7 @@
 1609240442 metadata/md5-cache/dev-ros/rqt_controller_manager-0.9.3
 1609082339 metadata/md5-cache/dev-ros/collada_parser-1.12.4
 1609240442 metadata/md5-cache/dev-ros/tf2_tools-9999
+1610061709 metadata/md5-cache/dev-ros/pcl_ros-1.4.1-r2
 1609240441 metadata/md5-cache/dev-ros/qt_gui-0.2.29
 1609240441 metadata/md5-cache/dev-ros/controller_manager-0.10.1
 1609240441 metadata/md5-cache/dev-ros/control_msgs-9999
@@ -48462,7 +48463,7 @@
 1609082339 metadata/md5-cache/dev-ros/self_test-1.8.9
 1609240441 metadata/md5-cache/dev-ros/genlisp-0.4.15
 1609240441 metadata/md5-cache/dev-ros/qt_gui_app-0.3.3
-1609082339 metadata/md5-cache/dev-ros/gazebo_ros_control-9999
+1610061708 metadata/md5-cache/dev-ros/gazebo_ros_control-9999
 1609240442 metadata/md5-cache/dev-ros/sound_play-0.3.1
 1609240442 metadata/md5-cache/dev-ros/rqt_moveit-0.5.4
 1609082339 metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.9.4
@@ -48506,7 +48507,6 @@
 1610031438 metadata/md5-cache/dev-ros/rosout-1.12.5
 1609240441 metadata/md5-cache/dev-ros/python_qt_binding-9999
 1609240442 metadata/md5-cache/dev-ros/test_rospy-1.11.17
-1609240441 metadata/md5-cache/dev-ros/move_base-1.13.1
 1609240442 metadata/md5-cache/dev-ros/rqt_rviz-0.4.2
 1609240442 metadata/md5-cache/dev-ros/rosmsg-1.11.15
 1609240442 metadata/md5-cache/dev-ros/rqt_shell-9999
@@ -48543,7 +48543,6 @@
 1609240441 metadata/md5-cache/dev-ros/joint_state_publisher-1.11.9
 1609240442 metadata/md5-cache/dev-ros/visp_hand2eye_calibration-9999
 1609240441 metadata/md5-cache/dev-ros/image_geometry-9999
-1609240442 metadata/md5-cache/dev-ros/stereo_image_proc-1.12.18
 1609082339 metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.3
 1609240442 metadata/md5-cache/dev-ros/test_roslaunch-1.11.17
 1609240441 metadata/md5-cache/dev-ros/controller_manager-9999
@@ -48573,7 +48572,6 @@
 1609240442 metadata/md5-cache/dev-ros/rqt_service_caller-0.3.12
 1609240442 metadata/md5-cache/dev-ros/rqt_graph-9999
 1609240442 metadata/md5-cache/dev-ros/rosparam-1.12.0
-1609240442 metadata/md5-cache/dev-ros/robot_pose_ekf-1.13.0
 1609240442 metadata/md5-cache/dev-ros/test_roslib_comm-1.11.14
 1609240442 metadata/md5-cache/dev-ros/rqt_py_common-0.3.13
 1609240442 metadata/md5-cache/dev-ros/turtlesim-0.6.1
@@ -48583,7 +48581,6 @@
 1609082340 metadata/md5-cache/dev-ros/urdf_tutorial-9999
 1609082339 metadata/md5-cache/dev-ros/audio_capture-0.2.12
 1609240442 metadata/md5-cache/dev-ros/rqt_robot_dashboard-9999
-1609240442 metadata/md5-cache/dev-ros/stereo_image_proc-1.12.16
 1609240442 metadata/md5-cache/dev-ros/rospack-2.3.0
 1609240442 metadata/md5-cache/dev-ros/smach-2.0.0
 1609240442 metadata/md5-cache/dev-ros/rqt_py_common-0.4.0
@@ -48600,7 +48597,6 @@
 1610031438 metadata/md5-cache/dev-ros/rostest-1.12.5
 1609240441 metadata/md5-cache/dev-ros/camera_calibration-9999
 1610031439 metadata/md5-cache/dev-ros/topic_tools-1.12.5
-1609082339 metadata/md5-cache/dev-ros/clear_costmap_recovery-1.13.1
 1609240442 metadata/md5-cache/dev-ros/urg_node-0.1.9
 1609082339 metadata/md5-cache/dev-ros/message_to_tf-0.2.0
 1609240442 metadata/md5-cache/dev-ros/rostest-9999
@@ -48642,7 +48638,6 @@
 1609240441 metadata/md5-cache/dev-ros/hector_nav_msgs-0.3.3
 1609240442 metadata/md5-cache/dev-ros/rosbridge_server-0.7.13-r2
 1609240442 metadata/md5-cache/dev-ros/rqt_controller_manager-0.11.0
-1609240441 metadata/md5-cache/dev-ros/mavros_extras-0.17.2
 1609082339 metadata/md5-cache/dev-ros/libmavconn-0.18.3
 1609082339 metadata/md5-cache/dev-ros/image_transport-9999
 1609240442 metadata/md5-cache/dev-ros/rqt_top-0.4.1
@@ -48671,7 +48666,6 @@
 1609240442 metadata/md5-cache/dev-ros/tf-9999
 1609240441 metadata/md5-cache/dev-ros/diagnostic_common_diagnostics-1.8.9
 1609082340 metadata/md5-cache/dev-ros/urg_c-1.0.404
-1609082339 metadata/md5-cache/dev-ros/clear_costmap_recovery-1.14.0
 1609240441 metadata/md5-cache/dev-ros/mavros_msgs-0.18.2
 1609240441 metadata/md5-cache/dev-ros/nav_msgs-1.12.3
 1609240441 metadata/md5-cache/dev-ros/laser_assembler-9999
@@ -48683,7 +48677,6 @@
 1609082339 metadata/md5-cache/dev-ros/test_diagnostic_aggregator-9999
 1609240441 metadata/md5-cache/dev-ros/gazebo_msgs-2.5.3
 1609082339 metadata/md5-cache/dev-ros/roslisp-1.9.19
-1609240441 metadata/md5-cache/dev-ros/joint_limits_interface-0.11.1
 1609281438 metadata/md5-cache/dev-ros/polled_camera-1.11.11
 1609240441 metadata/md5-cache/dev-ros/global_planner-9999
 1609240442 metadata/md5-cache/dev-ros/rosserial_python-9999
@@ -48730,7 +48723,6 @@
 1609240441 metadata/md5-cache/dev-ros/pr2_dashboard_aggregator-1.11.11
 1609082339 metadata/md5-cache/dev-ros/audio_play-0.3.1
 1609240441 metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.9.2-r1
-1609082339 metadata/md5-cache/dev-ros/gazebo_ros_control-2.5.7-r1
 1609082339 metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.8.10
 1609082339 metadata/md5-cache/dev-ros/self_test-1.8.8
 1609240441 metadata/md5-cache/dev-ros/openni2_camera-0.2.6
@@ -48759,7 +48751,6 @@
 1609240441 metadata/md5-cache/dev-ros/nav_msgs-9999
 1609082339 metadata/md5-cache/dev-ros/rosserial_server-9999
 1609240441 metadata/md5-cache/dev-ros/costmap_2d-1.14.0-r1
-1609240441 metadata/md5-cache/dev-ros/mavros_extras-0.18.1
 1609240442 metadata/md5-cache/dev-ros/rosmaster-1.12.1
 1610031439 metadata/md5-cache/dev-ros/visualization_msgs-1.12.5
 1609240442 metadata/md5-cache/dev-ros/smclib-1.7.17
@@ -48767,7 +48758,6 @@
 1609240442 metadata/md5-cache/dev-ros/rqt_bag-0.3.13
 1609240442 metadata/md5-cache/dev-ros/rqt_plot-0.4.1
 1609082339 metadata/md5-cache/dev-ros/nav_core-9999
-1609240442 metadata/md5-cache/dev-ros/tf2_ros-0.5.12
 1609082339 metadata/md5-cache/dev-ros/eigen_stl_containers-0.1.5
 1609240442 metadata/md5-cache/dev-ros/rosservice-1.12.4
 1609240442 metadata/md5-cache/dev-ros/test_rosmaster-1.12.0
@@ -48786,7 +48776,7 @@
 1609082339 metadata/md5-cache/dev-ros/roslang-9999
 1609240442 metadata/md5-cache/dev-ros/roslaunch-1.12.2
 1609240441 metadata/md5-cache/dev-ros/cv_bridge-9999
-1609240441 metadata/md5-cache/dev-ros/mavros_extras-9999
+1610061709 metadata/md5-cache/dev-ros/mavros_extras-9999
 1609240442 metadata/md5-cache/dev-ros/test_rosgraph-1.11.14
 1609240441 metadata/md5-cache/dev-ros/gazebo_plugins-9999
 1609240441 metadata/md5-cache/dev-ros/compressed_depth_image_transport-1.9.3
@@ -48844,7 +48834,7 @@
 1609240442 metadata/md5-cache/dev-ros/rqt_tf_tree-0.5.4
 1609240442 metadata/md5-cache/dev-ros/tf-1.11.8
 1609082339 metadata/md5-cache/dev-ros/rosbash-9999
-1609240441 metadata/md5-cache/dev-ros/image_cb_detector-9999
+1610061708 metadata/md5-cache/dev-ros/image_cb_detector-9999
 1609240442 metadata/md5-cache/dev-ros/visp_hand2eye_calibration-0.9.1
 1609240442 metadata/md5-cache/dev-ros/test_roslib_comm-9999
 1609240441 metadata/md5-cache/dev-ros/image_geometry-1.12.1
@@ -48897,7 +48887,6 @@
 1609082339 metadata/md5-cache/dev-ros/hector_imu_attitude_to_tf-0.3.5
 1609240442 metadata/md5-cache/dev-ros/trajectory_msgs-1.12.3
 1609082339 metadata/md5-cache/dev-ros/roscpp_traits-0.5.6
-1609240441 metadata/md5-cache/dev-ros/mavros_extras-0.17.3
 1610031438 metadata/md5-cache/dev-ros/test_rosbag-1.12.5
 1609082339 metadata/md5-cache/dev-ros/rviz_plugin_tutorials-0.10.1
 1609240442 metadata/md5-cache/dev-ros/test_rosmaster-1.12.2
@@ -48917,8 +48906,9 @@
 1609240442 metadata/md5-cache/dev-ros/rosclean-1.13.4
 1609240441 metadata/md5-cache/dev-ros/polled_camera-1.11.8
 1609082339 metadata/md5-cache/dev-ros/hector_pose_estimation_core-0.2.1
-1609240442 metadata/md5-cache/dev-ros/robot_pose_ekf-1.13.1
+1610061708 metadata/md5-cache/dev-ros/joint_limits_interface-0.11.1-r1
 1609281439 metadata/md5-cache/dev-ros/camera_info_manager-1.11.11
+1610061709 metadata/md5-cache/dev-ros/navfn-1.14.0-r1
 1609240441 metadata/md5-cache/dev-ros/image_proc-1.12.19
 1609240442 metadata/md5-cache/dev-ros/rviz_python_tutorial-0.10.1
 1609082339 metadata/md5-cache/dev-ros/cpp_common-0.6.1
@@ -48928,7 +48918,6 @@
 1609240442 metadata/md5-cache/dev-ros/test_rosgraph-1.12.2
 1609240442 metadata/md5-cache/dev-ros/rosservice-1.11.17
 1609240441 metadata/md5-cache/dev-ros/gazebo_plugins-2.5.3
-1609082340 metadata/md5-cache/dev-ros/tf2-0.5.12
 1609082339 metadata/md5-cache/dev-ros/rosout-1.11.16
 1609240442 metadata/md5-cache/dev-ros/rosunit-1.13.2
 1610031439 metadata/md5-cache/dev-ros/test_rosmaster-1.12.5
@@ -48991,6 +48980,7 @@
 1609240442 metadata/md5-cache/dev-ros/test_roscpp-1.12.4
 1609240441 metadata/md5-cache/dev-ros/fake_localization-1.14.0
 1609082339 metadata/md5-cache/dev-ros/class_loader-0.3.3
+1610061709 metadata/md5-cache/dev-ros/stereo_image_proc-1.12.19-r1
 1609240441 metadata/md5-cache/dev-ros/camera_calibration-1.12.19
 1609240441 metadata/md5-cache/dev-ros/gazebo_ros-2.5.6
 1609082339 metadata/md5-cache/dev-ros/carrot_planner-1.13.1
@@ -49028,6 +49018,7 @@
 1609240441 metadata/md5-cache/dev-ros/octomap_msgs-0.3.2
 1609082339 metadata/md5-cache/dev-ros/rosbag_storage-1.11.16
 1609240442 metadata/md5-cache/dev-ros/rostopic-9999
+1610061708 metadata/md5-cache/dev-ros/gazebo_ros_control-2.6.0-r1
 1609240441 metadata/md5-cache/dev-ros/image_rotate-1.12.14
 1609082340 metadata/md5-cache/dev-ros/urdf_parser_plugin-9999
 1609082339 metadata/md5-cache/dev-ros/rqt_gui_cpp-9999
@@ -49058,7 +49049,6 @@
 1609240442 metadata/md5-cache/dev-ros/tf2_geometry_msgs-0.5.12
 1609240441 metadata/md5-cache/dev-ros/image_view-1.12.16
 1609082339 metadata/md5-cache/dev-ros/hardware_interface-0.9.3
-1609240441 metadata/md5-cache/dev-ros/move_base-1.13.0
 1609082339 metadata/md5-cache/dev-ros/openslam_gmapping-9999
 1609240442 metadata/md5-cache/dev-ros/topic_tools-1.11.15
 1609082339 metadata/md5-cache/dev-ros/audio_capture-9999
@@ -49069,7 +49059,6 @@
 1609082339 metadata/md5-cache/dev-ros/test_diagnostic_aggregator-1.8.9
 1609240442 metadata/md5-cache/dev-ros/rosserial_xbee-0.7.2
 1609082339 metadata/md5-cache/dev-ros/hector_compressed_map_transport-0.3.4
-1609082339 metadata/md5-cache/dev-ros/gazebo_ros_control-2.6.0
 1609082339 metadata/md5-cache/dev-ros/rostime-0.6.1
 1609082339 metadata/md5-cache/dev-ros/librviz_tutorial-0.9.2
 1609240442 metadata/md5-cache/dev-ros/rosparam-1.12.1
@@ -49094,12 +49083,12 @@
 1609240442 metadata/md5-cache/dev-ros/rqt_pose_view-0.5.2
 1609221909 metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.9.6
 1609240442 metadata/md5-cache/dev-ros/test_roslaunch-1.12.0
-1609240442 metadata/md5-cache/dev-ros/robot_pose_ekf-9999
+1610061708 metadata/md5-cache/dev-ros/robot_pose_ekf-9999
 1609240441 metadata/md5-cache/dev-ros/message_filters-1.12.4
 1609240442 metadata/md5-cache/dev-ros/turtlesim-0.7.0
 1609240442 metadata/md5-cache/dev-ros/tf2_kdl-0.5.12
-1609240442 metadata/md5-cache/dev-ros/stereo_image_proc-9999
-1609240441 metadata/md5-cache/dev-ros/pcl_ros-9999
+1610061709 metadata/md5-cache/dev-ros/stereo_image_proc-9999
+1610061709 metadata/md5-cache/dev-ros/pcl_ros-9999
 1609240441 metadata/md5-cache/dev-ros/kdl_parser-9999
 1609240442 metadata/md5-cache/dev-ros/test_tf2-9999
 1609240442 metadata/md5-cache/dev-ros/test_rosservice-1.12.0
@@ -49113,7 +49102,6 @@
 1609240441 metadata/md5-cache/dev-ros/controller_manager-0.11.0
 1609240442 metadata/md5-cache/dev-ros/rqt_dep-0.4.0
 1609082339 metadata/md5-cache/dev-ros/hector_geotiff-0.3.3
-1609240441 metadata/md5-cache/dev-ros/navfn-1.14.0
 1609240442 metadata/md5-cache/dev-ros/rqt_rviz-9999
 1609082339 metadata/md5-cache/dev-ros/nodelet_topic_tools-1.9.3
 1609240442 metadata/md5-cache/dev-ros/qt_gui_cpp-0.3.2
@@ -49138,6 +49126,7 @@
 1609240442 metadata/md5-cache/dev-ros/rosserial_xbee-0.7.3
 1609082339 metadata/md5-cache/dev-ros/hector_pose_estimation-0.3.0
 1609240442 metadata/md5-cache/dev-ros/rqt_srv-9999
+1610061609 metadata/md5-cache/dev-ros/tf2_ros-0.5.13-r1
 1609240442 metadata/md5-cache/dev-ros/roslaunch-1.11.17
 1609240442 metadata/md5-cache/dev-ros/rqt_robot_dashboard-0.5.2
 1609240441 metadata/md5-cache/dev-ros/geometry_msgs-1.12.4
@@ -49146,7 +49135,6 @@
 1609240442 metadata/md5-cache/dev-ros/rosserial_msgs-0.7.1
 1609240442 metadata/md5-cache/dev-ros/rqt_msg-0.3.12
 1609240441 metadata/md5-cache/dev-ros/control_toolbox-1.14.0
-1609240442 metadata/md5-cache/dev-ros/tf2_ros-0.5.13
 1609082339 metadata/md5-cache/dev-ros/hector_map_server-9999
 1609240441 metadata/md5-cache/dev-ros/opencv_apps-1.11.10
 1609240442 metadata/md5-cache/dev-ros/rosapi-0.7.13
@@ -49195,7 +49183,7 @@
 1609240442 metadata/md5-cache/dev-ros/theora_image_transport-9999
 1609240442 metadata/md5-cache/dev-ros/test_rosbag-1.12.2
 1609240442 metadata/md5-cache/dev-ros/rqt_graph-0.4.0
-1609082339 metadata/md5-cache/dev-ros/clear_costmap_recovery-9999
+1610061708 metadata/md5-cache/dev-ros/clear_costmap_recovery-9999
 1609240442 metadata/md5-cache/dev-ros/rostopic-1.12.2
 1609240442 metadata/md5-cache/dev-ros/qt_gui_py_common-0.2.30
 1609240442 metadata/md5-cache/dev-ros/rqt_bag_plugins-0.3.13
@@ -49254,6 +49242,7 @@
 1609082339 metadata/md5-cache/dev-ros/test_nodelet_topic_tools-1.9.3
 1609240441 metadata/md5-cache/dev-ros/combined_robot_hw_tests-9999
 1610031438 metadata/md5-cache/dev-ros/test_roscpp-1.12.5
+1610061708 metadata/md5-cache/dev-ros/image_cb_detector-0.10.14-r1
 1609082339 metadata/md5-cache/dev-ros/test_rosbag_storage-9999
 1609082339 metadata/md5-cache/dev-ros/rotate_recovery-1.13.1
 1609082339 metadata/md5-cache/dev-ros/rostime-9999
@@ -49330,11 +49319,9 @@
 1609240441 metadata/md5-cache/dev-ros/diagnostic_msgs-1.12.3
 1609240441 metadata/md5-cache/dev-ros/global_planner-1.13.1
 1609240442 metadata/md5-cache/dev-ros/rqt_topic-0.4.0
-1609240441 metadata/md5-cache/dev-ros/image_cb_detector-0.10.14
 1609240442 metadata/md5-cache/dev-ros/rqt_nav_view-0.5.3
 1609240442 metadata/md5-cache/dev-ros/test_roscpp-1.12.2
 1609240442 metadata/md5-cache/dev-ros/rosmsg-1.12.2
-1609240441 metadata/md5-cache/dev-ros/pcl_ros-1.4.1-r1
 1609240441 metadata/md5-cache/dev-ros/combined_robot_hw_tests-0.11.0
 1609240442 metadata/md5-cache/dev-ros/rosservice-9999
 1609240442 metadata/md5-cache/dev-ros/qt_gui_py_common-0.3.1
@@ -49351,7 +49338,6 @@
 1609240442 metadata/md5-cache/dev-ros/unique_id-9999
 1610031438 metadata/md5-cache/dev-ros/shape_msgs-1.12.5
 1609240441 metadata/md5-cache/dev-ros/genmsg-9999
-1609082339 metadata/md5-cache/dev-ros/clear_costmap_recovery-1.13.0
 1609240442 metadata/md5-cache/dev-ros/tf_conversions-9999
 1609240441 metadata/md5-cache/dev-ros/pluginlib-9999
 1609082339 metadata/md5-cache/dev-ros/pr2_machine-1.11.13
@@ -49363,6 +49349,7 @@
 1609191109 metadata/md5-cache/dev-ros/roslang-1.13.3
 1609240442 metadata/md5-cache/dev-ros/rosmsg-1.11.16
 1609240441 metadata/md5-cache/dev-ros/amcl-9999
+1610061708 metadata/md5-cache/dev-ros/clear_costmap_recovery-1.14.0-r1
 1609240441 metadata/md5-cache/dev-ros/qt_gui-0.3.3
 1609240442 metadata/md5-cache/dev-ros/realtime_tools-1.9.1
 1609240442 metadata/md5-cache/dev-ros/rosbag-1.12.0
@@ -49379,7 +49366,6 @@
 1609240442 metadata/md5-cache/dev-ros/stereo_msgs-1.12.3
 1609082339 metadata/md5-cache/dev-ros/hector_geotiff_plugins-0.3.5
 1609240441 metadata/md5-cache/dev-ros/polled_camera-9999
-1609240442 metadata/md5-cache/dev-ros/stereo_image_proc-1.12.14
 1609240441 metadata/md5-cache/dev-ros/nodelet-1.9.4
 1609240442 metadata/md5-cache/dev-ros/stereo_msgs-1.12.4
 1609240442 metadata/md5-cache/dev-ros/rosserial_arduino-0.7.2
@@ -49406,10 +49392,9 @@
 1609240442 metadata/md5-cache/dev-ros/rosmake-1.13.3
 1609082339 metadata/md5-cache/dev-ros/octomap_ros-0.4.0-r1
 1609082339 metadata/md5-cache/dev-ros/rosbuild-1.12.3
-1609240442 metadata/md5-cache/dev-ros/stereo_image_proc-1.12.19
 1609240442 metadata/md5-cache/dev-ros/rqt_bag-0.4.2
 1609240442 metadata/md5-cache/dev-ros/visp_tracker-0.9.1
-1609240442 metadata/md5-cache/dev-ros/tf2_ros-9999
+1610061609 metadata/md5-cache/dev-ros/tf2_ros-9999
 1609240442 metadata/md5-cache/dev-ros/qt_gui_app-9999
 1609240441 metadata/md5-cache/dev-ros/moveit_msgs-0.8.3
 1609240442 metadata/md5-cache/dev-ros/rqt_reconfigure-9999
@@ -49431,12 +49416,12 @@
 1609240442 metadata/md5-cache/dev-ros/rospy_tutorials-0.7.0
 1609082339 metadata/md5-cache/dev-ros/pluginlib_tutorials-0.1.8
 1609240442 metadata/md5-cache/dev-ros/test_rosbag-1.11.15
+1610061709 metadata/md5-cache/dev-ros/mavros_extras-0.18.3-r1
 1609240441 metadata/md5-cache/dev-ros/message_filters-1.12.0
 1609082339 metadata/md5-cache/dev-ros/eigen_conversions-1.11.7
 1609240441 metadata/md5-cache/dev-ros/gencpp-0.5.3
 1609082339 metadata/md5-cache/dev-ros/rosconsole_bridge-0.4.4
 1609240442 metadata/md5-cache/dev-ros/rosboost_cfg-1.13.2
-1609240442 metadata/md5-cache/dev-ros/stereo_image_proc-1.12.15
 1609240442 metadata/md5-cache/dev-ros/roscreate-9999
 1609082339 metadata/md5-cache/dev-ros/test_nodelet_topic_tools-9999
 1609240442 metadata/md5-cache/dev-ros/rosmake-9999
@@ -49492,7 +49477,6 @@
 1609240442 metadata/md5-cache/dev-ros/rosserial_tivac-9999
 1609240442 metadata/md5-cache/dev-ros/rosbag-9999
 1609240441 metadata/md5-cache/dev-ros/base_local_planner-1.14.0
-1609240441 metadata/md5-cache/dev-ros/navfn-1.13.1-r1
 1609240442 metadata/md5-cache/dev-ros/rosbridge_library-0.7.16
 1609082339 metadata/md5-cache/dev-ros/random_numbers-0.3.1
 1609082339 metadata/md5-cache/dev-ros/geometric_shapes-0.4.3
@@ -49536,7 +49520,6 @@
 1609240442 metadata/md5-cache/dev-ros/test_tf2-0.5.13
 1609082340 metadata/md5-cache/dev-ros/tf2_eigen-9999
 1609240442 metadata/md5-cache/dev-ros/rqt_graph-0.4.1
-1609240441 metadata/md5-cache/dev-ros/mavros_extras-0.18.2
 1609240442 metadata/md5-cache/dev-ros/roswtf-1.12.2
 1609240442 metadata/md5-cache/dev-ros/rosmsg-1.11.17
 1609240441 metadata/md5-cache/dev-ros/controller_manager_tests-0.11.1
@@ -49590,7 +49573,7 @@
 1609082339 metadata/md5-cache/dev-ros/hector_slam_launch-0.3.5
 1609240441 metadata/md5-cache/dev-ros/global_planner-1.14.0
 1609082339 metadata/md5-cache/dev-ros/test_rosbag_storage-1.12.0
-1609240441 metadata/md5-cache/dev-ros/navfn-9999
+1610061709 metadata/md5-cache/dev-ros/navfn-9999
 1609240442 metadata/md5-cache/dev-ros/rqt_pose_view-0.4.3
 1610031438 metadata/md5-cache/dev-ros/roslaunch-1.12.5
 1609240442 metadata/md5-cache/dev-ros/std_srvs-1.11.1
@@ -49620,7 +49603,6 @@
 1609082339 metadata/md5-cache/dev-ros/librviz_tutorial-9999
 1609082339 metadata/md5-cache/dev-ros/hector_pose_estimation-0.2.0
 1609240442 metadata/md5-cache/dev-ros/roswtf-9999
-1609240441 metadata/md5-cache/dev-ros/mavros_extras-0.18.3
 1609240442 metadata/md5-cache/dev-ros/rosgraph-1.11.15
 1609082339 metadata/md5-cache/dev-ros/controller_interface-9999
 1609082339 metadata/md5-cache/dev-ros/hector_marker_drawing-0.3.4
@@ -49655,7 +49637,7 @@
 1609082339 metadata/md5-cache/dev-ros/rosbag_storage-1.12.0
 1609240442 metadata/md5-cache/dev-ros/rqt_rviz-0.5.3
 1609082339 metadata/md5-cache/dev-ros/message_to_tf-9999
-1609240442 metadata/md5-cache/dev-ros/robot_pose_ekf-1.14.0
+1610061709 metadata/md5-cache/dev-ros/robot_pose_ekf-1.14.0
 1609240442 metadata/md5-cache/dev-ros/test_rospy-1.11.14
 1609240441 metadata/md5-cache/dev-ros/move_base_msgs-9999
 1609240442 metadata/md5-cache/dev-ros/rqt_publisher-0.4.2
@@ -49939,6 +49921,7 @@
 1609031457 metadata/md5-cache/net-nds/shelldap-1.3.1
 1609031457 metadata/md5-cache/net-nds/smbldap-tools-0.9.9
 1609031457 metadata/md5-cache/net-nds/ldapvi-1.7_p20101214
+1610070139 metadata/md5-cache/net-nds/rpcbind-0.2.3-r2
 1606062239 metadata/md5-cache/net-nds/gss-proxy-0.5.0
 1609300139 metadata/md5-cache/net-nds/openldap-2.4.43-r1
 1609031457 metadata/md5-cache/net-nds/ldapvi-1.7-r1
@@ -52738,7 +52721,7 @@
 1609031458 metadata/md5-cache/sci-electronics/qucs-0.0.17.130503
 1609240444 metadata/md5-cache/sci-electronics/kicad-4.0.2-r1
 1609031458 metadata/md5-cache/sci-electronics/systemc-2.3.0
-1609082342 metadata/md5-cache/sci-electronics/gazebo-7.3.1
+1610061609 metadata/md5-cache/sci-electronics/gazebo-7.3.1
 1609240444 metadata/md5-cache/sci-electronics/pulseview-0.2.0-r1
 1609031458 metadata/md5-cache/sci-electronics/geda-1.9.1
 1609291509 metadata/md5-cache/sci-electronics/cirkuit-0.4.3-r1
@@ -62941,7 +62924,7 @@
 1609031504 metadata/md5-cache/x11-terms/mrxvt-0.5.4
 1609240444 metadata/md5-cache/x11-terms/guake-0.8.5
 1609240444 metadata/md5-cache/x11-terms/guake-9999
-1609082342 metadata/md5-cache/x11-terms/qterminal-9999
+1610062039 metadata/md5-cache/x11-terms/qterminal-9999
 1508241539 metadata/md5-cache/x11-terms/terminology-0.8.0
 1609031504 metadata/md5-cache/x11-terms/eterm-0.9.5
 1609240444 metadata/md5-cache/x11-terms/valaterm-0.6-r1
@@ -62953,6 +62936,7 @@
 1609072039 metadata/md5-cache/x11-terms/xfce4-terminal-0.6.92
 1609031504 metadata/md5-cache/x11-terms/lilyterm-0.9.9.4-r1
 1609031504 metadata/md5-cache/x11-terms/roxterm-2.6.3
+1610062039 metadata/md5-cache/x11-terms/qterminal-0.7.0
 1508100531 metadata/md5-cache/x11-terms/lilyterm-0.9.9.4
 1609031504 metadata/md5-cache/x11-terms/mate-terminal-1.10.2
 1609031504 metadata/md5-cache/x11-terms/aterm-1.0.1-r2
@@ -63933,7 +63917,7 @@
 1609031501 metadata/md5-cache/sys-auth/skey-1.1.5-r10
 1609031501 metadata/md5-cache/sys-auth/pam_ssh-1.97-r2
 1609240444 metadata/md5-cache/sys-auth/sssd-1.13.0
-1609151011 metadata/md5-cache/sys-auth/consolekit-1.1.0-r1
+1610070339 metadata/md5-cache/sys-auth/consolekit-1.1.0-r1
 1609221409 metadata/md5-cache/sys-auth/pam_yubico-2.23
 1608291209 metadata/md5-cache/sys-auth/munge-0.5.10-r1
 1607252109 metadata/md5-cache/sys-auth/polkit-pkla-compat-0.1
@@ -63957,6 +63941,7 @@
 1609031501 metadata/md5-cache/sys-auth/pam_skey-1.1.5-r5
 1609031501 metadata/md5-cache/sys-auth/thinkfinger-0.3-r3
 1609031501 metadata/md5-cache/sys-auth/pam_ldap-186
+1610062139 metadata/md5-cache/sys-auth/keystone-10.0.0
 1609031501 metadata/md5-cache/sys-auth/pambase-20150213
 1609031501 metadata/md5-cache/sys-auth/pam_radius-1.3.17-r1
 1609031501 metadata/md5-cache/sys-auth/yubikey-personalization-gui-3.1.24
@@ -64635,7 +64620,7 @@
 1609031453 metadata/md5-cache/mail-client/pinepgp-0.18.0-r1
 1609031453 metadata/md5-cache/mail-client/nail-12.4-r2
 1609031453 metadata/md5-cache/mail-client/novell-groupwise-client-8.0.2.96933
-1609031453 metadata/md5-cache/mail-client/thunderbird-bin-45.3.0
+1610062309 metadata/md5-cache/mail-client/thunderbird-bin-45.4.0
 1609031453 metadata/md5-cache/mail-client/nail-12.4
 1609031439 metadata/md5-cache/app-crypt/aescrypt-3.0.6b
 1609031439 metadata/md5-cache/app-crypt/shash-0.2.6-r2
@@ -65094,6 +65079,7 @@
 1609291509 metadata/md5-cache/kde-apps/zeroconf-ioslave-16.04.3
 1610052209 metadata/md5-cache/kde-apps/libkgeomap-16.04.3
 1610052209 metadata/md5-cache/kde-apps/libksane-16.08.1
+1610062209 metadata/md5-cache/kde-apps/kdepimlibs-4.14.10-r1
 1610052209 metadata/md5-cache/kde-apps/klettres-16.08.1
 1610052209 metadata/md5-cache/kde-apps/ksystemlog-16.04.3
 1610052209 metadata/md5-cache/kde-apps/kdenetwork-meta-16.04.3
@@ -65465,6 +65451,7 @@
 1609291509 metadata/md5-cache/kde-apps/konqueror-16.08.1
 1610052209 metadata/md5-cache/kde-apps/kapptemplate-16.08.1
 1609291509 metadata/md5-cache/kde-apps/ktouch-16.08.1
+1610062209 metadata/md5-cache/kde-apps/kdepimlibs-4.14.11_pre20160211-r1
 1610052209 metadata/md5-cache/kde-apps/korganizer-16.08.1
 1609291509 metadata/md5-cache/kde-apps/kdebase-desktoptheme-16.04.3
 1610052208 metadata/md5-cache/kde-apps/blinken-16.08.1
@@ -66810,7 +66797,6 @@
 1609240443 metadata/md5-cache/net-misc/gns3-server-1.5.1
 1609031457 metadata/md5-cache/net-misc/l7-filter-userspace-0.11
 1610060009 metadata/md5-cache/net-misc/wicd-1.7.4-r1
-1609031457 metadata/md5-cache/net-misc/quagga-1.0.20160315-r2
 1609240443 metadata/md5-cache/net-misc/dropbox-cli-1.6.0
 1609240443 metadata/md5-cache/net-misc/switzerland-0.1.0
 1609031457 metadata/md5-cache/net-misc/vpnc-0.5.3_p550
@@ -66911,7 +66897,7 @@
 1609031457 metadata/md5-cache/net-misc/elliptics-eblob-0.0.1
 1609240443 metadata/md5-cache/net-misc/openconnect-7.06-r4
 1609031457 metadata/md5-cache/net-misc/vinagre-3.18.2
-1609031457 metadata/md5-cache/net-misc/quagga-1.0.20160315-r3
+1610061509 metadata/md5-cache/net-misc/quagga-1.0.20160315-r3
 1609240443 metadata/md5-cache/net-misc/gsutil-4.20
 1609082341 metadata/md5-cache/net-misc/cocaine-core-0.11.3.2
 1609031457 metadata/md5-cache/net-misc/asterisk-11.22.0
@@ -67329,6 +67315,7 @@
 1609031457 metadata/md5-cache/net-misc/dhcp-4.3.4
 1604060207 metadata/md5-cache/net-misc/ndppd-0.2.3
 1609031457 metadata/md5-cache/net-misc/netkit-fingerd-0.17-r3
+1610061939 metadata/md5-cache/net-misc/cmst-2016.10.03
 1609240443 metadata/md5-cache/net-misc/livestreamer-1.11.1
 1609082341 metadata/md5-cache/net-misc/freerdp-2.0.0_pre20160722
 1609151409 metadata/md5-cache/net-misc/networkmanager-sstp-1.2.0
@@ -67641,6 +67628,7 @@
 1609031457 metadata/md5-cache/net-p2p/ed2k_hash-0.4.0-r1
 1609031457 metadata/md5-cache/net-p2p/dclib-0.3.23
 1609031457 metadata/md5-cache/net-p2p/bitcoin-cli-0.10.2
+1610070139 metadata/md5-cache/net-p2p/go-ethereum-1.4.16-r1
 1609090509 metadata/md5-cache/net-p2p/i2p-0.9.26
 1511090807 metadata/md5-cache/net-p2p/ctcs-1.4.1
 1609031457 metadata/md5-cache/net-p2p/tvrss-1.8_beta
@@ -69240,6 +69228,7 @@
 1609031501 metadata/md5-cache/sys-cluster/resource-agents-1.0.4-r2
 1609031501 metadata/md5-cache/sys-cluster/libquo-1.2.2
 1609271439 metadata/md5-cache/sys-cluster/openmpi-1.10.3-r1
+1610062139 metadata/md5-cache/sys-cluster/cinder-9.0.0
 1609031501 metadata/md5-cache/sys-cluster/drbd-8.4.0
 1609031501 metadata/md5-cache/sys-cluster/rgmanager-agents-3.9.2
 1609031501 metadata/md5-cache/sys-cluster/keepalived-1.2.19
@@ -69254,6 +69243,7 @@
 1609240444 metadata/md5-cache/sys-cluster/charm-6.6.0
 1609031501 metadata/md5-cache/sys-cluster/keepalived-1.2.2-r4
 1609240444 metadata/md5-cache/sys-cluster/pacemaker-1.1.12-r2
+1610062209 metadata/md5-cache/sys-cluster/neutron-9.0.0
 1609031501 metadata/md5-cache/sys-cluster/mvapich2-1.6
 1609031501 metadata/md5-cache/sys-cluster/sx-2.0
 1609031501 metadata/md5-cache/sys-cluster/drbd-8.3.8.1-r1
@@ -69288,7 +69278,7 @@
 1609031501 metadata/md5-cache/sys-cluster/corosync-2.3.5
 1609031501 metadata/md5-cache/sys-cluster/ganglia-web-3.5.8-r1
 1609031501 metadata/md5-cache/sys-cluster/drbd-8.4.3
-1609292109 metadata/md5-cache/sys-cluster/neutron-8.2.0
+1610062209 metadata/md5-cache/sys-cluster/neutron-8.2.0
 1609031501 metadata/md5-cache/sys-cluster/torque-2.5.13-r1
 1609031501 metadata/md5-cache/sys-cluster/drbd-utils-8.9.6
 1609031501 metadata/md5-cache/sys-cluster/mpich-3.1.4
@@ -69308,6 +69298,7 @@
 1609031501 metadata/md5-cache/sys-cluster/dlm-lib-2.03.09
 1609031501 metadata/md5-cache/sys-cluster/maui-3.2.6_p16
 1508241439 metadata/md5-cache/sys-cluster/native-mpi-0
+1610062139 metadata/md5-cache/sys-cluster/heat-7.0.0
 1609031501 metadata/md5-cache/sys-cluster/hpl-2.0-r3
 1609100209 metadata/md5-cache/sys-cluster/gasnet-1.26.4-r1
 1609240444 metadata/md5-cache/sys-cluster/polysh-0.4-r1
@@ -69333,16 +69324,17 @@
 1609031501 metadata/md5-cache/sys-cluster/drbd-8.3.15
 1609031501 metadata/md5-cache/sys-cluster/vzctl-4.9.1
 1609031501 metadata/md5-cache/sys-cluster/rgmanager-2.03.09
+1610062139 metadata/md5-cache/sys-cluster/nova-14.0.0
 1609031501 metadata/md5-cache/sys-cluster/dlm-2.03.09
 1609031501 metadata/md5-cache/sys-cluster/ocfs-1.0.14
 1609031501 metadata/md5-cache/sys-cluster/mpich-3.0.4
 1609031501 metadata/md5-cache/sys-cluster/knem-1.1.1
 1609031501 metadata/md5-cache/sys-cluster/openais-1.1.4-r1
-1610040009 metadata/md5-cache/sys-cluster/cinder-2016.2.9999
+1610062139 metadata/md5-cache/sys-cluster/cinder-2016.2.9999
 1609031501 metadata/md5-cache/sys-cluster/libcman-3.1.5
 1609031501 metadata/md5-cache/sys-cluster/drbd-8.4.3-r1
 1609031501 metadata/md5-cache/sys-cluster/keepalived-1.2.23
-1610051639 metadata/md5-cache/sys-cluster/neutron-2016.2.9999
+1610062209 metadata/md5-cache/sys-cluster/neutron-2016.2.9999
 1609240444 metadata/md5-cache/sys-cluster/glusterfs-3.6.5
 1609031501 metadata/md5-cache/sys-cluster/galera-25.3.15
 1511090807 metadata/md5-cache/sys-cluster/onesis-2.0.2
@@ -69387,7 +69379,7 @@
 1609240444 metadata/md5-cache/sys-cluster/glusterfs-3.7.4
 1610040009 metadata/md5-cache/sys-cluster/heat-2016.2.9999
 1609031501 metadata/md5-cache/sys-cluster/libccs-3.1.5
-1609240444 metadata/md5-cache/sys-cluster/neutron-2016.1.9999
+1610062209 metadata/md5-cache/sys-cluster/neutron-2016.1.9999
 1609031501 metadata/md5-cache/sys-cluster/csync2-2.0
 1609031501 metadata/md5-cache/sys-cluster/maui-3.3.1-r2
 1609240444 metadata/md5-cache/sys-cluster/pbs-python-4.3.3-r1
@@ -69938,7 +69930,6 @@
 1609031442 metadata/md5-cache/dev-lang/rust-bin-1.5.0
 1609240439 metadata/md5-cache/dev-lang/rust-1.11.0
 1609031442 metadata/md5-cache/dev-lang/bff-1.0.3.1
-1610011339 metadata/md5-cache/dev-lang/nim-0.15.0
 1609031442 metadata/md5-cache/dev-lang/ocaml-4.02.3-r1
 1609031442 metadata/md5-cache/dev-lang/erlang-17.5
 1609031442 metadata/md5-cache/dev-lang/mono-2.10.9-r2
@@ -70198,7 +70189,7 @@
 1609031442 metadata/md5-cache/dev-lang/yap-6.3.2
 1609031442 metadata/md5-cache/dev-lang/ekopath-6.0.855_p20160629-r1
 1609031442 metadata/md5-cache/dev-lang/tcl-8.5.17-r100
-1609031442 metadata/md5-cache/dev-lang/yap-6.3.3
+1610061609 metadata/md5-cache/dev-lang/yap-6.3.3
 1609140109 metadata/md5-cache/dev-lang/ghc-7.8.3
 1609031442 metadata/md5-cache/dev-lang/luajit-2.0.4
 1609240439 metadata/md5-cache/dev-lang/hy-0.10.1
@@ -70240,6 +70231,7 @@
 1508100513 metadata/md5-cache/dev-lang/swig-1.3.40-r2
 1609031442 metadata/md5-cache/dev-lang/rubinius-3.43
 1609031442 metadata/md5-cache/dev-lang/maude-2.7
+1610070009 metadata/md5-cache/dev-lang/nim-0.15.0-r1
 1609031442 metadata/md5-cache/dev-lang/rakudo-2016.05
 1609072309 metadata/md5-cache/dev-lang/spidermonkey-1.7.0-r3
 1606190739 metadata/md5-cache/dev-lang/swig-3.0.10
@@ -70677,6 +70669,7 @@
 1609240442 metadata/md5-cache/games-emulation/gfceux-2.1.1-r1
 1609031451 metadata/md5-cache/games-emulation/virtualjaguar-2.1.2-r2
 1609031451 metadata/md5-cache/games-emulation/openmsx-0.9.1
+1610061809 metadata/md5-cache/games-emulation/mgba-0.5.1
 1609031451 metadata/md5-cache/games-emulation/virtualjaguar-2.1.2-r1
 1609082340 metadata/md5-cache/games-emulation/ppsspp-9999
 1609031451 metadata/md5-cache/games-emulation/mupen64plus-video-glide64mk2-2.5
@@ -71777,7 +71770,7 @@
 1609031439 metadata/md5-cache/app-emulation/softgun-0.21
 1609031439 metadata/md5-cache/app-emulation/virt-what-1.12
 1609240438 metadata/md5-cache/app-emulation/virtualbox-5.1.6
-1609240438 metadata/md5-cache/app-emulation/cloud-init-9999
+1610061939 metadata/md5-cache/app-emulation/cloud-init-9999
 1609082338 metadata/md5-cache/app-emulation/dynamips-0.2.14-r1
 1609240438 metadata/md5-cache/app-emulation/openstack-guest-agents-unix-1.39.1
 1609031439 metadata/md5-cache/app-emulation/vmware-player-12.1.0.3272444-r2
@@ -71805,6 +71798,7 @@
 1609282009 metadata/md5-cache/app-emulation/docker-1.12.2_rc1
 1609240438 metadata/md5-cache/app-emulation/virtualbox-4.3.40
 1609031439 metadata/md5-cache/app-emulation/vmware-workstation-12.1.0.3272444-r2
+1610061939 metadata/md5-cache/app-emulation/cloud-init-0.7.8
 1610020209 metadata/md5-cache/app-emulation/docker-compose-1.8.1
 1609031439 metadata/md5-cache/app-emulation/fuse-1.0.0
 1609070139 metadata/md5-cache/app-emulation/wine-1.9.17
@@ -73192,6 +73186,7 @@
 1609031438 metadata/md5-cache/app-admin/gamin-0.1.10-r1
 1609031438 metadata/md5-cache/app-admin/fleet-0.11.1
 1509071738 metadata/md5-cache/app-admin/restart_services-0.13.0-r1
+1610062139 metadata/md5-cache/app-admin/glance-13.0.0
 1609181909 metadata/md5-cache/app-admin/puppetdb-4.2.2
 1609240438 metadata/md5-cache/app-admin/github-backup-utils-2.7.0
 1609031438 metadata/md5-cache/app-admin/consul-template-0.9.0-r1
@@ -76996,6 +76991,7 @@
 1609031504 metadata/md5-cache/x11-misc/xkbd-0.8.15-r1
 1610011609 metadata/md5-cache/x11-misc/xkeyboard-config-2.19
 1609031503 metadata/md5-cache/x11-misc/lineak-xosdplugin-0.9.0-r1
+1610061809 metadata/md5-cache/x11-misc/albert-0.8.11
 1604202332 metadata/md5-cache/x11-misc/xdg-utils-1.1.0_rc2
 1609031503 metadata/md5-cache/x11-misc/i3lock-2.8
 1609031504 metadata/md5-cache/x11-misc/xsensors-0.70
@@ -77076,6 +77072,7 @@
 1609031504 metadata/md5-cache/x11-misc/xdotool-3.20150503.1
 1609031503 metadata/md5-cache/x11-misc/util-macros-1.18.0
 1508241439 metadata/md5-cache/x11-misc/efax-gtk-3.2.9
+1610061939 metadata/md5-cache/x11-misc/rednotebook-1.14
 1609082342 metadata/md5-cache/x11-misc/synergy-1.6.3
 1609031503 metadata/md5-cache/x11-misc/pcmanfm-1.1.2
 1609031504 metadata/md5-cache/x11-misc/xdotool-3.20150503.1-r1
@@ -77720,7 +77717,7 @@
 1609031502 metadata/md5-cache/www-client/jumanji-0.0.0_p20150527
 1609031502 metadata/md5-cache/www-client/jumanji-9999
 1609031502 metadata/md5-cache/www-client/vimb-2.9
-1609031502 metadata/md5-cache/www-client/qupzilla-2.0.1
+1610062109 metadata/md5-cache/www-client/qupzilla-2.0.1
 1609031502 metadata/md5-cache/www-client/links-2.8-r1
 1609031502 metadata/md5-cache/www-client/links-2.12
 1609290509 metadata/md5-cache/www-client/chromium-55.0.2873.0
@@ -77916,6 +77913,7 @@
 1609031503 metadata/md5-cache/x11-libs/gnome-pty-helper-0.40.2
 1609031503 metadata/md5-cache/x11-libs/wxGTK-3.0.2.0-r300
 1609031503 metadata/md5-cache/x11-libs/libXaw-1.0.13
+1610062039 metadata/md5-cache/x11-libs/qtermwidget-0.7.0
 1609031503 metadata/md5-cache/x11-libs/gtksourceview-2.10.5-r3
 1610060839 metadata/md5-cache/x11-libs/libXrender-0.9.10
 1609031503 metadata/md5-cache/x11-libs/glamor-0.6.0-r1
@@ -77991,7 +77989,7 @@
 1609082342 metadata/md5-cache/x11-libs/gdk-pixbuf-loader-webp-20160328234507
 1609031503 metadata/md5-cache/x11-libs/libXdmcp-1.1.1-r1
 1609031503 metadata/md5-cache/x11-libs/libXfontcache-1.0.5-r1
-1609082342 metadata/md5-cache/x11-libs/qtermwidget-9999
+1610062039 metadata/md5-cache/x11-libs/qtermwidget-9999
 1609031503 metadata/md5-cache/x11-libs/vte-0.40.2
 1609031503 metadata/md5-cache/x11-libs/cairo-1.14.2-r1
 1609031503 metadata/md5-cache/x11-libs/vte-0.42.5
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 1339a9dc16e8..b7648c623cbf 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 06 Oct 2016 12:00:01 +0000
+Fri, 07 Oct 2016 06:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 7a4c641f67b8..b9bfafb7091b 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1475754001 Thu 06 Oct 2016 11:40:01 AM UTC
+1475820601 Fri 07 Oct 2016 06:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 1ca0f703046a..39fdcab712ff 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Thu, 06 Oct 2016 11:40:37 +0000
+Fri, 07 Oct 2016 06:10:38 +0000
diff --git a/net-im/skypeforlinux/ChangeLog b/net-im/skypeforlinux/ChangeLog
index 878ad6e564fd..02d26d491df1 100644
--- a/net-im/skypeforlinux/ChangeLog
+++ b/net-im/skypeforlinux/ChangeLog
@@ -40,3 +40,8 @@
 
   Signed-off-by: David Seifert <soap@gentoo.org>
 
+  06 Oct 2016; Göktürk Yüksek <gokturk@gentoo.org> metadata.xml:
+  remove redundant <description> from the metadata
+
+  Package-Manager: portage-2.3.0
+
diff --git a/net-im/skypeforlinux/Manifest b/net-im/skypeforlinux/Manifest
index 71c1a81df0a0..3a1c595279f0 100644
--- a/net-im/skypeforlinux/Manifest
+++ b/net-im/skypeforlinux/Manifest
@@ -1,4 +1,4 @@
 DIST skypeforlinux_1.9.0.2-1.x86_64.rpm 62767691 SHA256 9b838d5c0aa72287a96a5a11b150dbf647c50fe65aa2a386be8af7002e477e61 SHA512 9390c60f0cd7e643e8806596b6a1cdadffb45086fc456218f59361ffe74adb2adfbba4893d3276b59f1435067146d90becd1c644008932c6efcc978bd4288c8c WHIRLPOOL 631b471593e590aa7f2642e410c58971b07dd42f6c1bd8447c070c9b29dd18514f4d38f73c63e296d3e449d8a12ac5fb088f38ecdd6e81d922fd0b173c969d42
 EBUILD skypeforlinux-1.9.0.2.ebuild 3345 SHA256 a2c44c305225edbdd876580c0e97bc597ae8de1f7e8fe3d81cc540ea0b43fef7 SHA512 535b4327a02c88f0ccee45aacfed893b6b7d936d332bfd6d843b94bfc50cdd3112f2f77fe6e37ffa89fa98ea63d08587bad48434e792d357428f42d346a30977 WHIRLPOOL 671a3858586805e5b54c073d177965a5fa744f5974e5c31d6ba50e423316b324b2f6a1b6eec4eb6cc74ef86903364a520c19363e0e3bdb5712fb02807a5e852b
-MISC ChangeLog 1265 SHA256 82a805ff0e687fe9a1e574f136677b4e342b670f5aee3a9df87b82598016f01a SHA512 c1b826d5a527b169471f77b89098eb538fdabcabea0a02fbfdde495137b026458ab5e53673fb2785cda658002aac4d468fdec00d99899536cd3cc10e62e59cfd WHIRLPOOL 198d7e2e28c2937a17ec4d2f94096ca9b917bd570857c315868f71094d397a415ce97f708a3a5231d095fd87507eedbb54eec08182c5902088ea4e3eba0faa46
+MISC ChangeLog 1419 SHA256 4e1b49a00884df7d99940be985afdca79f65434b05607f52230339f74aa17a28 SHA512 2a7bbb30a08667647c41bd78c4d6700d065e14dca5cc455364fd557c8ab5d49249414f00f6f4f41248494818130d8366d92d97434ac080d921883d93304efd5a WHIRLPOOL 662e19afde8eea823a1df21d64b928d41d3ddfe4fbc2e543161ca3e73339b2b692a8c412f00fa70c932e95e68055c39bc0d815597b15d505eed8810ed5948154
 MISC metadata.xml 587 SHA256 af0ca539e2a03d5887a5f5f6c311cf04b07af72be69e010f47713a0fdb009707 SHA512 490d64a6eb30a787f08e4d49172c37839978c2ff9f8b239d21b543cbcc0057585ad05e9013f2d3293179b42f9d8faf6f856d34453e8a94748e6532dabd422f56 WHIRLPOOL 45e45cd84b54c73a3b0c5fa2c10f5ad935a440356a2abaededb500a2f0828460c4e976f137a38250dab957d00f2492741ed0ec949c9585d14b8a7f6080dd5d7d
diff --git a/net-misc/cmst/ChangeLog b/net-misc/cmst/ChangeLog
index 05116824acc9..f5e9acd3d846 100644
--- a/net-misc/cmst/ChangeLog
+++ b/net-misc/cmst/ChangeLog
@@ -99,3 +99,13 @@
 
   Package-Manager: portage-2.3.0_rc1
 
+*cmst-2016.10.03 (06 Oct 2016)
+
+  06 Oct 2016; Michael Palimaka <kensington@gentoo.org>
+  +cmst-2016.10.03.ebuild:
+  version bump
+
+  Gentoo-bug: 596262
+
+  Package-Manager: portage-2.3.1
+
diff --git a/net-misc/cmst/Manifest b/net-misc/cmst/Manifest
index 4841e56d5cd0..26850af02e7e 100644
--- a/net-misc/cmst/Manifest
+++ b/net-misc/cmst/Manifest
@@ -1,5 +1,7 @@
 DIST cmst-2016.04.03.tar.gz 2551685 SHA256 c3d7ba9b3d06a3bdf8476224b7e30b4ea41005d719ae4f01897c188d56c716a1 SHA512 22f1cb2c3a8b06b3c92bf446ea6c5511c4589445747e4f615aa5a4a1c4c9933a320447077060c317e446f312e645ce887e98c80c27fdbf16f76513bd18d487f1 WHIRLPOOL ae405ae6e99d2588fae005411976b0c7ce1b72db896a905ee1c91e7cf3aed5d2ee09609241191dfe00d1ab20c81a7d8e77a06c3166951f66383a417c25df1823
+DIST cmst-2016.10.03.tar.gz 2553113 SHA256 6292c126e19992d22e193e99d814fec55c463babe1a1b0dc31fcd117e4bd619c SHA512 98097f456e17a00cec88f26e6916f2757ed2de5d1ec54a30a593973891c53651d2009f66f0731d9074872dbdb5bea27aa26267bf23a68c89d76396f1f2a1f847 WHIRLPOOL 7826d1b24801563342689d310e02e9a9196ca957dbf5265e61c4b2c1e6fcc982d50e45bf07c87b2208b9c18e790b47242d46d81c5040ba99a2630c5fb2e8e913
 EBUILD cmst-2016.04.03.ebuild 689 SHA256 247c2b57e8b3fef79da1de03371ff6dc120016de0df452d3044ec89853186f27 SHA512 18bf7115dcca44e30e39b4481c1d54589a33f5fd14e732285d0b5f26c3f3f2ccf9f21da177b7df0c755bf85c97802fdb121f14e06db04f6eda6eb77aaa349250 WHIRLPOOL d46ea30bc8804576bab0a280175382ba00c80b6dec5f551599b31274d8680f837bd6e720006946e92099cf4b4f8f98996e8ad9c70d6bf39969f6e1f337b90732
-MISC ChangeLog 3182 SHA256 219c2ea4e53186d0762b7c4a8b0dd64e5d7830d2f2332a7b8f89bd3d5e39c37b SHA512 eeaf547ebe5ac375c24fffab519318f19c76955a68e5846c99fb2c1f8b2591ab3eff54ea11f2993315034c3f30283479ea415818de274d76a7917df52f8a7518 WHIRLPOOL 87b89fb99a83396222a3f5eb2fb40ef766a763f78efe280b70939d791bd416a93c708b869cb5a519344e2da805836060d8dd0932fe0326b5044e91f9274de3ea
+EBUILD cmst-2016.10.03.ebuild 689 SHA256 247c2b57e8b3fef79da1de03371ff6dc120016de0df452d3044ec89853186f27 SHA512 18bf7115dcca44e30e39b4481c1d54589a33f5fd14e732285d0b5f26c3f3f2ccf9f21da177b7df0c755bf85c97802fdb121f14e06db04f6eda6eb77aaa349250 WHIRLPOOL d46ea30bc8804576bab0a280175382ba00c80b6dec5f551599b31274d8680f837bd6e720006946e92099cf4b4f8f98996e8ad9c70d6bf39969f6e1f337b90732
+MISC ChangeLog 3369 SHA256 6127498ea77ff556913b04e1a924f2af31317d72a179b7020d30f2f62c504470 SHA512 788f24d76697ffd9dd03eab03a3881d846cbc150579e1d7f8d076193fcd72307804e442775b8ad633431e4edaf032b3b3f5d165e7363d89ab7e12ed192108726 WHIRLPOOL bfd8bd6f87e8dda711c6bd462a58eed32744ac6a5dff5eeb503eb4cffd2e9fe18bbd23b99c16f4f2213425ee89cab1f5cb20934f3919dd9bec852644a6469a4f
 MISC ChangeLog-2015 358 SHA256 a0680921eceacdf9b299585bc565eb563940cc7dcd84633e1dc183b8dbb23e83 SHA512 5e647b2147e742cd972bfa5cfb912e811c040eb7401528d4c76feaec5bbbe9240192d2a3e3c14410135148599299285b91710ea9ad942a7b9b3d248713661fbb WHIRLPOOL c4a2b05908a95d83951dbd6adc878b957a6d4a017596f38986b715d300c852c92da64f5533ad0874f3c16a30ca9b930dc3913550073539ce781a1c4180e78e86
 MISC metadata.xml 392 SHA256 a22f7be3c08263d075321a35283454aa37cdce92f51e297836c38509ce30869e SHA512 c6858ace643af313f0d47a863cbf117261f7ef419b02c874c34b3a8c64269570f6a9d4f004ee4645cc6eb673d2f5448f5fdbb291d51c322eaf806e28227ff2cd WHIRLPOOL 1cb1a9b06670d51a74a2bdf5cbf9051762ce5e258896acd6cf68f36a40e4258659778398b9f176551eb315b06c02be8ea08f14e46d1a3d10aac35e5bc92a9250
diff --git a/net-misc/cmst/cmst-2016.10.03.ebuild b/net-misc/cmst/cmst-2016.10.03.ebuild
new file mode 100644
index 000000000000..142e2645f640
--- /dev/null
+++ b/net-misc/cmst/cmst-2016.10.03.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit qmake-utils
+
+DESCRIPTION="Qt GUI for Connman with system tray icon"
+HOMEPAGE="https://github.com/andrew-bibb/cmst"
+SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}
+	net-misc/connman
+"
+
+S="${WORKDIR}/${PN}-${P}"
+
+src_configure() {
+	export USE_LIBPATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
+	eqmake5
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	rm -r "${D}"/usr/share/licenses || die
+}
diff --git a/net-misc/quagga/ChangeLog b/net-misc/quagga/ChangeLog
index 5d95ad1b5bd8..2fa8197bbf70 100644
--- a/net-misc/quagga/ChangeLog
+++ b/net-misc/quagga/ChangeLog
@@ -193,3 +193,11 @@
 
   Package-Manager: portage-2.3.0
 
+  06 Oct 2016; Sergey Popov <pinkbyte@gentoo.org>
+  -quagga-1.0.20160315-r2.ebuild, quagga-1.0.20160315-r3.ebuild:
+  stabilize new revision
+
+  Transfer stable keywords from previous revision, drop old
+
+  Package-Manager: portage-2.2.28
+
diff --git a/net-misc/quagga/Manifest b/net-misc/quagga/Manifest
index 4b5b3c6f1c52..ea0a4f901581 100644
--- a/net-misc/quagga/Manifest
+++ b/net-misc/quagga/Manifest
@@ -16,8 +16,7 @@ AUX systemd/ripngd.service 363 SHA256 84931b7364e7ad98d87ec123eb13f28c574cba41aa
 AUX systemd/zebra.service 354 SHA256 495eb109bc513784eff1028dbd8759cd583f37c7d07b083e4c3bb8a627e93713 SHA512 d02a801a421c143cefb63abc3448b162505fb9063130523f939f1e6ad33c4b39f113d00e6d0c4ea7f53616fffa1aa2333bf33660b5ccb4d7fd9d4f048c5a979a WHIRLPOOL 2e277d14608dd1b59c549b0046075bad22cf7fc531e7e9838de59aeb8349cd6048bf720622a51086a24a3c8c00c3076fde2de0e02573809f611677513879160f
 DIST ht-20040304-classless-bgp.patch 1581 SHA256 39993890f9e31d662ed0564c732fb22392a901beb45b64261ffeadd9edf27887 SHA512 3df102d8ab88aaee1f109a2310602d6f734f2268252e5e42df752df7db7abeac526e969289481c4abfe905dcd41c35dee65196c48ac320fe9d083305451476e8 WHIRLPOOL cef99d64d52ab8c28bd672fb93dfbd8d716a31c76a5403496a6d104a5ff39531d6085134124d41fe4ff7adf895fa001cbe77b6e42846d849d6c108c81583d04e
 DIST quagga-1.0.20160315.tar.xz 1819488 SHA256 d284af5dd875dbba90ab875d40db5d68fdc9ede17a76f2af525f85344be56767 SHA512 ad633d189017a2cef68cf1653b85e082a0dc4fe146720a985da8cdf2aa4c61f2df8a8339419c986e9d74aa88f7f7109bc6d0c13d9ff4904a23852cee3e112edc WHIRLPOOL 6f0ac5da5fef382cf7a462f8d2c139bb0d8068e7b772cd48b63aa0752098515d6b5eb9a10a4e1fc7021085e0635248f6075d937901c6207d51bd0f284388541c
-EBUILD quagga-1.0.20160315-r2.ebuild 3664 SHA256 bb16b0db45faae846e47bb690c96268a27d8f2f68b5410b53010e906e25721f6 SHA512 5164a7836ab81103f5b32ce9e5074b080b4d6e3a94fbed62535fddaae90554e5966945a97a2d53f2932d40e3db654754a22ebf707f52d2a989fcdec9769ddfe1 WHIRLPOOL a0572183814fbbf1ddf251ca904c164fbc331feb7812363bb2e0447206b11e2d58aba1bd571b5f21a1693f106a3bc145eb8310ebb7d55188eb0f200329109fa5
-EBUILD quagga-1.0.20160315-r3.ebuild 3714 SHA256 a7e23d8603bcd5be0238f57ce54030ad70f83343ca0695cfcbbf72624a479d9e SHA512 680a5cb20ee794b76b9e04600ba91ff6cef3a16842972d774ce9e135f084d1f50da3d7028d68b41463c531c7ab5da70ad5f82dbabf7a95742f882be151e8eed7 WHIRLPOOL b58dd504a9532b8b3479377db2c3346e2aeb0e58371e6921ea42b5a73a82f1c91af853b3b8fef5a2d4de9baafde59ada190b8e88f3e54bd1a83be92571f7a963
-MISC ChangeLog 6419 SHA256 2f04a6f975906a22fa7bf46980f26e7fad37f41cc0e9decb8424a888f720e759 SHA512 1854d3f145b83eb93c4cdee862b6d6acf5006bf5db8e25a5d7902290e56bf5ab9bedbb8879cadbacbee2be81354e233ab0846fd17461cd14ee5abcb6e7b77511 WHIRLPOOL 38474223308b2474ba62c50e9d057c0fc1b96374f5596caac1fb1190c3272496fb88f04ac8c1ba171498c380b200e194b9aa02a04aa2c7e2c3cfb7895a0b8c9c
+EBUILD quagga-1.0.20160315-r3.ebuild 3707 SHA256 efb75a23b45bcdcf387df3ddb55febc92203f62e663fe1694a1e41b7459c2450 SHA512 c94facd5cba9ba0e5f2c39e7532a8dae4a3b65c565037a89d45462543dc5979d2312d1855cac317caccfc9898f1340e6d8f600df1954913a5a84a64d414ad588 WHIRLPOOL c071a11eccded32ffe4bff38b9ec0e66068936be46c83010e9f382331a44b927d2ffebec10ff2cc8e18c8c1bae512a69414c20f09e019ba070919f5af088ff77
+MISC ChangeLog 6656 SHA256 7c63157b17e9f96aa7f8be8c980c33d4594da2b1ae2763b07cf6afd9ded4e992 SHA512 91e2a5e0bf9ca18c95c9423d080cc0dd755e8e02c66ffdc9e4781b8e1d341bc7ccb018dbc63837cf123c5ec955e908dfa0bf80887f7a717eff2f405c68b901a1 WHIRLPOOL 1c0cf020481d631461629f75ac4beee06933bc2dce4422af313ddcb5825383d5dc3e2e41666ce3d7f484b6c0e1b5f711a870b089d6060a8d679c56c55fdc403a
 MISC ChangeLog-2015 28261 SHA256 e4bdcf9343224b679e2e98e00e508ecaf40d06645a838b0e3e22ba567027a4cb SHA512 907689f10f73cbd3b9b5efb8a690002ed6548daa283cc61211f75df8eb369762c869a4c3774c8a3c9ac8db7ba3297f705f02e3765fb5c250c7f3e0113ad094a9 WHIRLPOOL 5a1eb4bf5ae04311b58e67557bd966e0addbf25e11a7e3d25a428d18bc1940885f9e3f65d12fce85547ce1b9d06ada6a1d8099dea60a85046b4c3e698d0076f1
 MISC metadata.xml 2139 SHA256 07014730746a4df7e9578e6fc74669482a583752a8cc6bfec2ca4221e59c12b4 SHA512 53fc9568b3ee696efa18b7cb2cbe7928ce27ce8a105c9b0903ed6734ad8456ff5d99247c97b74a783b6b00cce939a6a1f930c38d9ac60a937a64b73b3b964f58 WHIRLPOOL 7852011b22c1452c736c50686f1c4ec660e19660023b3cc6de1cb1dfe55f507d92157a5bc9121648ef4b0f05ab352ff53bee3d7cf5b916a0227ef1280c97d3dc
diff --git a/net-misc/quagga/quagga-1.0.20160315-r2.ebuild b/net-misc/quagga/quagga-1.0.20160315-r2.ebuild
deleted file mode 100644
index cdf60d6e5141..000000000000
--- a/net-misc/quagga/quagga-1.0.20160315-r2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-CLASSLESS_BGP_PATCH=ht-20040304-classless-bgp.patch
-
-inherit autotools eutils flag-o-matic multilib pam readme.gentoo-r1 systemd user
-
-DESCRIPTION="A free routing daemon replacing Zebra supporting RIP, OSPF and BGP"
-HOMEPAGE="http://quagga.net/"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz
-	bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/${CLASSLESS_BGP_PATCH} )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ~s390 sparc x86"
-
-IUSE="bgpclassless caps doc elibc_glibc ipv6 multipath ospfapi pam +readline snmp tcp-zebra"
-
-COMMON_DEPEND="
-	caps? ( sys-libs/libcap )
-	snmp? ( net-analyzer/net-snmp )
-	readline? (
-		sys-libs/readline:0
-		pam? ( sys-libs/pam )
-	)
-	!elibc_glibc? ( dev-libs/libpcre )"
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	sys-apps/gawk
-	sys-devel/libtool:2"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.99.22.4-ipctl-forwarding.patch"
-	"${FILESDIR}/${P}-ripd-null-pointer-fix.patch"
-	"${FILESDIR}/${P}-ospfd-dangling-pointer-fix.patch"
-)
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="Sample configuration files can be found in /usr/share/doc/${PF}/samples
-You have to create config files in /etc/quagga before
-starting one of the daemons.
-
-You can pass additional options to the daemon by setting the EXTRA_OPTS
-variable in their respective file in /etc/conf.d"
-
-pkg_setup() {
-	enewgroup quagga
-	enewuser quagga -1 -1 /var/empty quagga
-}
-
-src_prepare() {
-	# Classless prefixes for BGP
-	# http://hasso.linux.ee/doku.php/english:network:quagga
-	use bgpclassless && eapply -p0 "${DISTDIR}/${CLASSLESS_BGP_PATCH}"
-
-	epatch ${PATCHES[@]}
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	append-flags -fno-strict-aliasing
-
-	# do not build PDF docs
-	export ac_cv_prog_PDFLATEX=no
-	export ac_cv_prog_LATEXMK=no
-
-	econf \
-		--enable-exampledir=/usr/share/doc/${PF}/samples \
-		--enable-irdp \
-		--enable-isisd \
-		--enable-isis-topology \
-		--enable-pimd \
-		--enable-user=quagga \
-		--enable-group=quagga \
-		--enable-vty-group=quagga \
-		--with-cflags="${CFLAGS}" \
-		--with-pkg-extra-version="-gentoo" \
-		--sysconfdir=/etc/quagga \
-		--localstatedir=/run/quagga \
-		--disable-static \
-		$(use_enable caps capabilities) \
-		$(usex snmp '--enable-snmp' '' '' '') \
-		$(use_enable !elibc_glibc pcreposix) \
-		$(use_enable tcp-zebra) \
-		$(use_enable doc) \
-		$(usex multipath $(use_enable multipath) '' '=0' '') \
-		$(usex ospfapi '--enable-opaque-lsa --enable-ospf-te --enable-ospfclient' '' '' '') \
-		$(use_enable readline vtysh) \
-		$(use_with pam libpam) \
-		$(use_enable ipv6 ripngd) \
-		$(use_enable ipv6 ospf6d) \
-		$(use_enable ipv6 rtadv)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-	readme.gentoo_create_doc
-
-	keepdir /etc/quagga
-	fowners root:quagga /etc/quagga
-	fperms 0770 /etc/quagga
-
-	# Path for PIDs before first reboot should be created here, bug #558194
-	dodir /run/quagga
-	fowners quagga:quagga /run/quagga
-	fperms 0770 /run/quagga
-
-	# Install systemd-related stuff, bug #553136
-	systemd_dotmpfilesd "${FILESDIR}/systemd/quagga.conf"
-	systemd_dounit "${FILESDIR}/systemd/zebra.service"
-
-	# install zebra as a file, symlink the rest
-	newinitd "${FILESDIR}"/quagga-services.init.3 zebra
-
-	for service in bgpd isisd ospfd pimd ripd $(use ipv6 && echo ospf6d ripngd); do
-		dosym zebra /etc/init.d/${service}
-		systemd_dounit "${FILESDIR}/systemd/${service}.service"
-	done
-
-	use readline && use pam && newpamd "${FILESDIR}/quagga.pam" quagga
-
-	insinto /etc/logrotate.d
-	newins redhat/quagga.logrotate quagga
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/net-misc/quagga/quagga-1.0.20160315-r3.ebuild b/net-misc/quagga/quagga-1.0.20160315-r3.ebuild
index 5af09feee406..c1d3e7cd5e6d 100644
--- a/net-misc/quagga/quagga-1.0.20160315-r3.ebuild
+++ b/net-misc/quagga/quagga-1.0.20160315-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="alpha amd64 arm hppa ppc ~s390 sparc x86"
 
 IUSE="bgpclassless caps doc elibc_glibc ipv6 multipath ospfapi pam +readline snmp tcp-zebra"
 
diff --git a/net-nds/rpcbind/ChangeLog b/net-nds/rpcbind/ChangeLog
index c5390879ed9c..8a8180fbc475 100644
--- a/net-nds/rpcbind/ChangeLog
+++ b/net-nds/rpcbind/ChangeLog
@@ -152,3 +152,11 @@
   rpcbind-0.2.3-r1.ebuild, rpcbind-9999.ebuild:
   sourceforge: switch to https:// URIs
 
+*rpcbind-0.2.3-r2 (06 Oct 2016)
+
+  06 Oct 2016; Anthony G. Basile <blueness@gentoo.org>
+  +files/rpcbind-0.2.3-remove-P-macro.patch, +rpcbind-0.2.3-r2.ebuild:
+  remove _P() macro, bug #589666
+
+  Package-Manager: portage-2.2.28
+
diff --git a/net-nds/rpcbind/Manifest b/net-nds/rpcbind/Manifest
index 89ba8a8d12c7..046b1825cba4 100644
--- a/net-nds/rpcbind/Manifest
+++ b/net-nds/rpcbind/Manifest
@@ -2,6 +2,7 @@ AUX rpcbind-0.2.0-no-nss.patch 901 SHA256 be144a4e4c4a4ab771b9ccd1a81da886613aca
 AUX rpcbind-0.2.0-pkgconfig.patch 2193 SHA256 8cf1f8dc8a6d75e081ecd50d2b09c51e69d85f54038f7cf09c00121c56917c90 SHA512 50883bd656da48e52cf01254fd5f7d8953681ce57eb6c129981c98b6243c54c7cf42f7a12645543e37dca96d42af8aebde41b9c1ee54fb020d6f8edf631852ed WHIRLPOOL 5a06dc4a72f5bd4d4d4d58625a81d4bc68b7c68dd1f1f2e9d52123a50fb034b0626c806cce6b7a6941c1a8139f833f68472890d0ad79e779d384091afa256f49
 AUX rpcbind-0.2.3-libtirpc.patch 1154 SHA256 8f4e2499eccf96b0e49b040f23fffa06ce5cf11ffad39af07fa91a577eafa32e SHA512 2172e18c02bf4111de59110b00798c423f89620b2576dd2fa2de7530ab1a091e4e7f60a9d18d610778110a965e551bc447c1c2566d131c3b18642fb408c7a4b8 WHIRLPOOL 06006bc418ac3c36b51758b4ef9d04929bec29b9ad8492c362fd0ac5f9feed71784a0edb22c292f5e66c74129705b929585f5f8c6ec67ec669127171fb2060df
 AUX rpcbind-0.2.3-mem-corrupt.patch 2831 SHA256 5960af91ee3e716326f121811f3f3372cf0956e3bb0449404de67eb15321ac03 SHA512 3423067b552e7ea76fe783eb3cd8f4299887312509a6cbdcd56fc20c5bcb28f3737f04b79d63876d1218cc1fcb9c5385806e203d937feb140d16a9c67e8fe263 WHIRLPOOL 63ce4676b2f8f4d870e803e20ca6f93f7a6a03393fde4a22e28f6c9f5d6f6301290610b0cb64921aa04eafc51d20687c830aff981c3c90b2659a7c1adf9a8a43
+AUX rpcbind-0.2.3-remove-P-macro.patch 10070 SHA256 5b8da280f43a10e8de32c3197274fb03089483342396ff91662c16775237ab3a SHA512 6f8a4b98aae39fe0ddbb0750cce98292564d9f0852513e85ff4f140b484fdf3191a6e934980d22c97f7de358f314d0c6331fe5a89b271b1ac38a1e697061219e WHIRLPOOL 66d55250fbc498533420d86b351e91d45b9e0299bdbfc099dad93c7b942ad87f32056e29c84a57b1a612781be9acc6cadb394ed047d720a161b2df1c2a9f6aa5
 AUX rpcbind.confd 68 SHA256 38bb95aefc38d843d0890d9c15affd28f19f2133c17f463396c62970e7e2dffc SHA512 f11f6785708bde3ace7b55c1585e283ed07078faf310077c3d26e8e584baec6152d3f86f3d99d7a34fd10f22a7de4d8d70568c9e7f914a82eeb786b08b379044 WHIRLPOOL c9ce4d7d02c7573c96ceaa1a07732e9c8966d79e9266a8767cdd7fa56725b7757d25c31c47821e1ff858983955e3d278ba09da377d40efb6499e9830aaefeb3a
 AUX rpcbind.initd 421 SHA256 c249b8626522db73ae66b188ec777c39aa270b91b7909114544154c016e0515f SHA512 84c6bb1fb2cf1394df415bdcc2d0eb4ad8b90a158b451574f785c411f0fa8a145e9f55e60bef6e1f140c91813241b40e8ed227ea18af3f85b4b2ee32d9543546 WHIRLPOOL bf154214d4af3e89f136c8c6d2c3399e9f4e715aaaabe41c8ff4a2613fdebd6f9d1012a4f33ed425bdeb6b5c9e8ae4193100d833aa7f268d85bd757484f66690
 AUX rpcbind.service 193 SHA256 a7a648529f9480b50dd8e8e5906fa7d97320e7eba25875dba23189ce5e75aa67 SHA512 7ec717ebd69cdf3230d09c51c9b3f926a0860967baccbc2345bf8214a2251441b528bbceaa571c84bdcca17c272d43697567885b517501515d15d42f913f3f49 WHIRLPOOL 23f35d918152baa46278334e8a0fea6540adf96eec70dd7619dbe7a1ffb2975d1146e134ba2b6d2f4b00a9e1cd41ca7bc551ee2cde00413ae5eb07b4d50e6cd0
@@ -13,8 +14,9 @@ EBUILD rpcbind-0.2.0-r1.ebuild 1387 SHA256 563f7351159bf24be2eed6e74a47538b6808e
 EBUILD rpcbind-0.2.1-r1.ebuild 1217 SHA256 7a9d61ffc2f9b105e430c8e7fe9bcfd16c1c141fb1c7c35c69e973a032cb1a42 SHA512 7794fbfb67c220ebaf945f4f673d5c6c4437b0f330396bbe9cba100690886c70a10b7dea8f38ad3e56d97410c0ba6713d4fe24120de0f128e00a279807fef611 WHIRLPOOL 91a702c9f89e0c0e21aa50029e9a22e2ed1fa268353a42333ad23e8119ff1ba2061c795907b68772015ede33ec762612cd0872127ab6de6357585aae3f2c5085
 EBUILD rpcbind-0.2.2-r1.ebuild 1336 SHA256 d1abbe6aacd71ae90e49161b876f2923b66abc6ade5e2210d524cb52bf15200a SHA512 953c90c88dc633c09eafb372e11a466961516d315dd24d5af98f709f811241a89e8947a3775c1d707bc5f3fb7c6417d1ff507321eba786ae974a55606cd933a2 WHIRLPOOL ac2fd47b566c54b039c1823b81584f5faafe1916ac554c753b739ffdc79b1927bc3de687c2fb73adb0b09ce73cbc0c1d864455043e37c6d242bdc968e37fd90c
 EBUILD rpcbind-0.2.3-r1.ebuild 1420 SHA256 cf229ebdb21860d49d88a7e347d2fa311b6f279c22e25fd8026381a31e578959 SHA512 c53a334678b550981113cc2615bf11b004bdc671e7d353c73c71415e693f3ef98c3005b6fe1246aaef337fb1b047e7b319bf644313455be5247f96ee5d8f5fbe WHIRLPOOL 122efe0536922ef681694de187c69682e255ba5792729f181e99a1e1c8521ffcb43a1b1e8c99c9cb4a2d584b06327bdbe372dd8e0b69b8cdca555be6fde4016d
+EBUILD rpcbind-0.2.3-r2.ebuild 1485 SHA256 143046550c8df379751e274d391cc15b0c6183eb88296efb56b3bed7715bbff5 SHA512 0a9c37baaf7010f0af558623121a409cad2ebd216f41646d00580cd536f67831bc2b700cf3d2ecdd2d3b9e8c7a69efc5cd41f6d0bb6a51147e9550d419347b6b WHIRLPOOL ac9b5f194d653d28c9f1b6b405aed9e1c8acea3f423cb71804741f252012e42b10f7e0e1ba703240d2ba576c3018933bf7cfc2fdcb43d8133ef1b34568831334
 EBUILD rpcbind-0.2.3.ebuild 1376 SHA256 68d2c5e8294aecdb3f1199114a66204c241c2d63268d518cb32c6f769e61b4b7 SHA512 40e94281c998ad4244ab47a01f7a951ea86a753abde9692cb35dbbacde332677e32a79e1638b4b717f299bfdffea358243924c9c2844213f17e89a7587724f2b WHIRLPOOL 439311815ddefdb85d758b8d2347640f6174e6c29a31cb770c7a1db5d89795cbacddfd50d1d4ae10b0d1429cbb9cf1939916cffc10c5b188b1ad446971d5e22f
 EBUILD rpcbind-9999.ebuild 1334 SHA256 64e476fa3a2e123f489a1488354f2b55059ca8135b55a71b6176070a2dab6a6a SHA512 662eed0fa5368b445073122d299ae6bb0e7e1e66510389a82564205571de18cbabf21be9a3cc59277103237700e1265f507780d1f99b3606cfb32986a9c6a701 WHIRLPOOL 3364d58a264533b177b7af14a22af77ba9a75b025af0a8efced2939eca9c6303f163b9ea2698a7cc6a37095d382920d4767ab596a68a6b91ce1c769b087b53f5
-MISC ChangeLog 5468 SHA256 fcf5c3f4d99fffcf54648572b5674a1c2c49d6f10ac23c1465368cfd34863a66 SHA512 698f5041f97ba5ea056bf485bc156bb38a09b3ac4f91ec3f29610090cac3adba048b2a7018b11632199939c85b83f524b15e45c199a181f1b5a90c16624a7cec WHIRLPOOL 3e6b18258d4a62fbfcf028fa3389a60e4e9f3b983340a51e7374318f0d4725d5c01d190a80fa903fdd9ecbdc11b7687d7ec5ec51c32c00d6508c5b1bf8047fd0
+MISC ChangeLog 5696 SHA256 bfd3d7cc6a218f030a01ba6ffefd7b5069e7ba216380f4481b192e5bd765857c SHA512 a8900330ecab74c41bccd70a5f1f5911499c1557edd8ca1ff5fce7a7d47cd2f72dba47588f4a78549725ad33b1d4ce91be77d36f0f2ea093b0004f98a8a1da85 WHIRLPOOL 9a2ba508cae901c85145e85a3f37429160b3525a2fee59a0fb2934f835de522c16cd4615f28cc361063260137c4c2aeb36d2a299716866cc3a2b0f7578fd80bf
 MISC ChangeLog-2015 5908 SHA256 064fb710a31bc7f3ccca52d220832a71fd12e9d2bc44d924821eb59b9f802577 SHA512 380ae6c889bbabbaed12ab1a4a360c974024acdfbdbea27be8a4edb3d1824951ba17472e9f564debeb9928224d4014b01cddef6fe89e9286ffd941602c8339fa WHIRLPOOL d7e7eb9723819fd77f583f32800a532c190469e79303dfc5c2d48d32ee74c1dfff48d0f15cb08a706d6e6abfe8b1d8d5cbda7273542e68e01eaf32620cd036dc
 MISC metadata.xml 405 SHA256 f00aa4ca742840a4285cf6ee239cc319f88af5ba60d5aa1d3f0b62b2db50f99c SHA512 accad1ef4202c9ebd7292ae6e1e68a1c59ddbfb741779a635058d54aa1efbf8b70b5e045d53dc9dba61256d5981e11c57b540a1c7b8fb38207863a6f2c50a5af WHIRLPOOL 9726f030b21142d38207cfdfb784673473346c719e81cbc53a7170a3f0c4838697f7f83de9757ffbc3700477ebc5b9b9b07e8d0194ec34c26727bbdd1ec4b84a
diff --git a/net-nds/rpcbind/files/rpcbind-0.2.3-remove-P-macro.patch b/net-nds/rpcbind/files/rpcbind-0.2.3-remove-P-macro.patch
new file mode 100644
index 000000000000..8e1b69beb180
--- /dev/null
+++ b/net-nds/rpcbind/files/rpcbind-0.2.3-remove-P-macro.patch
@@ -0,0 +1,246 @@
+From 196e8f3abaa6e8899ba2655c6c2d8751e33a9795 Mon Sep 17 00:00:00 2001
+From: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Date: Wed, 17 Aug 2016 10:16:47 -0400
+Subject: [PATCH] src: remove use of the __P() macro
+
+The __P() macro is a legacy compatibility macro aimed making pre-ANSI
+(i.e. K&R) compilers that do not support function prototypes happy,
+while still allowing such prototypes for ANSI-compliant compilers.
+
+Since virtually all compilers have been ANSI-compliant for a few decades
+now, use of __P() is totally useless.
+
+Furthermore, __P() is defined in the non-standard sys/cdefs.h header.
+This header is present in glibc and uClibc, and both have it included
+from many of their headers. So, sys/cdefs.h is automagically included in
+most cases and its macros are available.
+
+However, the musl C library does not provide this sys/cdefs.h header.
+Thus, the build breaks on musl.
+
+For all the above reasons, get rid of __P() wherever it is used; just
+always declare real function prototypes.
+
+Reviewed-by: Chuck Lever <chuck.lever@oracle.com>
+Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
+Signed-off-by: Steve Dickson <steved@redhat.com>
+Cc: Chuck Lever <chuck.lever@oracle.com>
+Cc: Steve Dickson <SteveD@redhat.com>
+Cc: Mike Frysinger <vapier@gentoo.org>
+---
+ src/check_bound.c  |  2 +-
+ src/pmap_svc.c     | 10 +++++-----
+ src/rpcb_svc.c     | 10 +++++-----
+ src/rpcb_svc_4.c   | 14 ++++++--------
+ src/rpcb_svc_com.c | 46 +++++++++++++++++++++++-----------------------
+ src/rpcbind.c      | 12 ++++++------
+ src/util.c         |  2 +-
+ src/warmstart.c    |  4 ++--
+ 8 files changed, 49 insertions(+), 51 deletions(-)
+
+diff --git a/src/check_bound.c b/src/check_bound.c
+index c70b845..92bfd36 100644
+--- a/src/check_bound.c
++++ b/src/check_bound.c
+@@ -70,7 +70,7 @@ static struct fdlist *fdhead;	/* Link list of the check fd's */
+ static struct fdlist *fdtail;
+ static char *nullstring = "";
+ 
+-static bool_t check_bound __P((struct fdlist *, char *uaddr));
++static bool_t check_bound(struct fdlist *, char *uaddr);
+ 
+ /*
+  * Returns 1 if the given address is bound for the given addr & transport
+diff --git a/src/pmap_svc.c b/src/pmap_svc.c
+index ad28b93..4c744fe 100644
+--- a/src/pmap_svc.c
++++ b/src/pmap_svc.c
+@@ -60,11 +60,11 @@ static	char sccsid[] = "@(#)pmap_svc.c 1.23 89/04/05 Copyr 1984 Sun Micro";
+ #include "rpcbind.h"
+ #include "xlog.h"
+ #include <rpc/svc_soc.h> /* svc_getcaller routine definition */
+-static struct pmaplist *find_service_pmap __P((rpcprog_t, rpcvers_t,
+-					       rpcprot_t));
+-static bool_t pmapproc_change __P((struct svc_req *, SVCXPRT *, u_long));
+-static bool_t pmapproc_getport __P((struct svc_req *, SVCXPRT *));
+-static bool_t pmapproc_dump __P((struct svc_req *, SVCXPRT *));
++static struct pmaplist *find_service_pmap(rpcprog_t, rpcvers_t,
++					       rpcprot_t);
++static bool_t pmapproc_change(struct svc_req *, SVCXPRT *, u_long);
++static bool_t pmapproc_getport(struct svc_req *, SVCXPRT *);
++static bool_t pmapproc_dump(struct svc_req *, SVCXPRT *);
+ 
+ /*
+  * Called for all the version 2 inquiries.
+diff --git a/src/rpcb_svc.c b/src/rpcb_svc.c
+index bd92201..709e3fb 100644
+--- a/src/rpcb_svc.c
++++ b/src/rpcb_svc.c
+@@ -53,10 +53,10 @@
+ #include "rpcbind.h"
+ #include "xlog.h"
+ 
+-static void *rpcbproc_getaddr_3_local __P((void *, struct svc_req *, SVCXPRT *,
+-					   rpcvers_t));
+-static void *rpcbproc_dump_3_local __P((void *, struct svc_req *, SVCXPRT *,
+-					rpcvers_t));
++static void *rpcbproc_getaddr_3_local(void *, struct svc_req *, SVCXPRT *,
++					   rpcvers_t);
++static void *rpcbproc_dump_3_local(void *, struct svc_req *, SVCXPRT *,
++					rpcvers_t);
+ 
+ /*
+  * Called by svc_getreqset. There is a separate server handle for
+@@ -75,7 +75,7 @@ rpcb_service_3(struct svc_req *rqstp, SVCXPRT *transp)
+ 	} argument;
+ 	char *result;
+ 	xdrproc_t xdr_argument, xdr_result;
+-	void *(*local) __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t));
++	void *(*local)(void *, struct svc_req *, SVCXPRT *, rpcvers_t);
+ 	rpcprog_t setprog = 0;
+ 
+ 	rpcbs_procinfo(RPCBVERS_3_STAT, rqstp->rq_proc);
+diff --git a/src/rpcb_svc_4.c b/src/rpcb_svc_4.c
+index b673452..5094879 100644
+--- a/src/rpcb_svc_4.c
++++ b/src/rpcb_svc_4.c
+@@ -54,13 +54,11 @@
+ #include "rpcbind.h"
+ #include "xlog.h"
+ 
+-static void *rpcbproc_getaddr_4_local __P((void *, struct svc_req *, SVCXPRT *,
+-				      rpcvers_t));
+-static void *rpcbproc_getversaddr_4_local __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t));
+-static void *rpcbproc_getaddrlist_4_local
+-	__P((void *, struct svc_req *, SVCXPRT *, rpcvers_t));
+-static void free_rpcb_entry_list __P((rpcb_entry_list_ptr *));
+-static void *rpcbproc_dump_4_local __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t));
++static void *rpcbproc_getaddr_4_local(void *, struct svc_req *, SVCXPRT *, rpcvers_t);
++static void *rpcbproc_getversaddr_4_local(void *, struct svc_req *, SVCXPRT *, rpcvers_t);
++static void *rpcbproc_getaddrlist_4_local(void *, struct svc_req *, SVCXPRT *, rpcvers_t);
++static void free_rpcb_entry_list(rpcb_entry_list_ptr *);
++static void *rpcbproc_dump_4_local(void *, struct svc_req *, SVCXPRT *, rpcvers_t);
+ 
+ /*
+  * Called by svc_getreqset. There is a separate server handle for
+@@ -78,7 +76,7 @@ rpcb_service_4(struct svc_req *rqstp, SVCXPRT *transp)
+ 	} argument;
+ 	char *result;
+ 	xdrproc_t xdr_argument, xdr_result;
+-	void *(*local) __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t));
++	void *(*local)(void *, struct svc_req *, SVCXPRT *, rpcvers_t);
+ 	rpcprog_t setprog = 0;
+ 
+ 	rpcbs_procinfo(RPCBVERS_4_STAT, rqstp->rq_proc);
+diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c
+index 148fe42..5862c26 100644
+--- a/src/rpcb_svc_com.c
++++ b/src/rpcb_svc_com.c
+@@ -100,29 +100,29 @@ struct finfo {
+ static struct finfo     FINFO[NFORWARD];
+ 
+ 
+-static bool_t xdr_encap_parms __P((XDR *, struct encap_parms *));
+-static bool_t xdr_rmtcall_args __P((XDR *, struct r_rmtcall_args *));
+-static bool_t xdr_rmtcall_result __P((XDR *, struct r_rmtcall_args *));
+-static bool_t xdr_opaque_parms __P((XDR *, struct r_rmtcall_args *));
+-static int find_rmtcallfd_by_netid __P((char *));
+-static SVCXPRT *find_rmtcallxprt_by_fd __P((int));
+-static int forward_register __P((u_int32_t, struct netbuf *, int, char *,
+-    rpcproc_t, rpcvers_t, u_int32_t *));
+-static struct finfo *forward_find __P((u_int32_t));
+-static int free_slot_by_xid __P((u_int32_t));
+-static int free_slot_by_index __P((int));
+-static int netbufcmp __P((struct netbuf *, struct netbuf *));
+-static struct netbuf *netbufdup __P((struct netbuf *));
+-static void netbuffree __P((struct netbuf *));
+-static int check_rmtcalls __P((struct pollfd *, int));
+-static void xprt_set_caller __P((SVCXPRT *, struct finfo *));
+-static void send_svcsyserr __P((SVCXPRT *, struct finfo *));
+-static void handle_reply __P((int, SVCXPRT *));
+-static void find_versions __P((rpcprog_t, char *, rpcvers_t *, rpcvers_t *));
+-static rpcblist_ptr find_service __P((rpcprog_t, rpcvers_t, char *));
+-static char *getowner __P((SVCXPRT *, char *, size_t));
+-static int add_pmaplist __P((RPCB *));
+-static int del_pmaplist __P((RPCB *));
++static bool_t xdr_encap_parms(XDR *, struct encap_parms *);
++static bool_t xdr_rmtcall_args(XDR *, struct r_rmtcall_args *);
++static bool_t xdr_rmtcall_result(XDR *, struct r_rmtcall_args *);
++static bool_t xdr_opaque_parms(XDR *, struct r_rmtcall_args *);
++static int find_rmtcallfd_by_netid(char *);
++static SVCXPRT *find_rmtcallxprt_by_fd(int);
++static int forward_register(u_int32_t, struct netbuf *, int, char *,
++    rpcproc_t, rpcvers_t, u_int32_t *);
++static struct finfo *forward_find(u_int32_t);
++static int free_slot_by_xid(u_int32_t);
++static int free_slot_by_index(int);
++static int netbufcmp(struct netbuf *, struct netbuf *);
++static struct netbuf *netbufdup(struct netbuf *);
++static void netbuffree(struct netbuf *);
++static int check_rmtcalls(struct pollfd *, int);
++static void xprt_set_caller(SVCXPRT *, struct finfo *);
++static void send_svcsyserr(SVCXPRT *, struct finfo *);
++static void handle_reply(int, SVCXPRT *);
++static void find_versions(rpcprog_t, char *, rpcvers_t *, rpcvers_t *);
++static rpcblist_ptr find_service(rpcprog_t, rpcvers_t, char *);
++static char *getowner(SVCXPRT *, char *, size_t);
++static int add_pmaplist(RPCB *);
++static int del_pmaplist(RPCB *);
+ 
+ /*
+  * Set a mapping of program, version, netid
+diff --git a/src/rpcbind.c b/src/rpcbind.c
+index c4265cd..87ccdc2 100644
+--- a/src/rpcbind.c
++++ b/src/rpcbind.c
+@@ -136,13 +136,13 @@ char *tcp_uaddr;	/* Universal TCP address */
+ static char servname[] = "rpcbind";
+ static char superuser[] = "superuser";
+ 
+-int main __P((int, char *[]));
++int main(int, char *[]);
+ 
+-static int init_transport __P((struct netconfig *));
+-static void rbllist_add __P((rpcprog_t, rpcvers_t, struct netconfig *,
+-			     struct netbuf *));
+-static void terminate __P((int));
+-static void parseargs __P((int, char *[]));
++static int init_transport(struct netconfig *);
++static void rbllist_add(rpcprog_t, rpcvers_t, struct netconfig *,
++			     struct netbuf *);
++static void terminate(int);
++static void parseargs(int, char *[]);
+ 
+ int
+ main(int argc, char *argv[])
+diff --git a/src/util.c b/src/util.c
+index a6c835b..74b0284 100644
+--- a/src/util.c
++++ b/src/util.c
+@@ -70,7 +70,7 @@ static struct sockaddr_in *local_in4;
+ static struct sockaddr_in6 *local_in6;
+ #endif
+ 
+-static int bitmaskcmp __P((void *, void *, void *, int));
++static int bitmaskcmp(void *, void *, void *, int);
+ 
+ /*
+  * For all bits set in "mask", compare the corresponding bits in
+diff --git a/src/warmstart.c b/src/warmstart.c
+index b6eb73e..122a058 100644
+--- a/src/warmstart.c
++++ b/src/warmstart.c
+@@ -58,8 +58,8 @@
+ #define	PMAPFILE	RPCBIND_STATEDIR "/portmap.xdr"
+ #endif
+ 
+-static bool_t write_struct __P((char *, xdrproc_t, void *));
+-static bool_t read_struct __P((char *, xdrproc_t, void *));
++static bool_t write_struct(char *, xdrproc_t, void *);
++static bool_t read_struct(char *, xdrproc_t, void *);
+ 
+ static bool_t
+ write_struct(char *filename, xdrproc_t structproc, void *list)
+-- 
+1.8.3.1
+
diff --git a/net-nds/rpcbind/rpcbind-0.2.3-r2.ebuild b/net-nds/rpcbind/rpcbind-0.2.3-r2.ebuild
new file mode 100644
index 000000000000..a8bfe3de1b9c
--- /dev/null
+++ b/net-nds/rpcbind/rpcbind-0.2.3-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://linux-nfs.org/~steved/rpcbind.git"
+	inherit autotools git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+DESCRIPTION="portmap replacement which supports RPC over various protocols"
+HOMEPAGE="https://sourceforge.net/projects/rpcbind/"
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="debug selinux systemd tcpd warmstarts"
+
+CDEPEND=">=net-libs/libtirpc-0.2.3:=
+	systemd? ( sys-apps/systemd:= )
+	tcpd? ( sys-apps/tcp-wrappers )"
+DEPEND="${CDEPEND}
+	virtual/pkgconfig"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-rpcbind )"
+
+src_prepare() {
+	[[ ${PV} == "9999" ]] && eautoreconf
+	epatch "${FILESDIR}"/${P}-libtirpc.patch
+	epatch "${FILESDIR}"/${P}-mem-corrupt.patch #560990
+	epatch "${FILESDIR}"/${P}-remove-P-macro.patch #589666
+	epatch_user
+}
+
+src_configure() {
+	econf \
+		--bindir="${EPREFIX}"/sbin \
+		--with-statedir="${EPREFIX}"/run/${PN} \
+		--with-rpcuser=root \
+		--with-systemdsystemunitdir=$(usex systemd "$(systemd_get_unitdir)" "no") \
+		$(use_enable tcpd libwrap) \
+		$(use_enable debug) \
+		$(use_enable warmstarts)
+}
+
+src_install() {
+	default
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+}
diff --git a/net-p2p/go-ethereum/ChangeLog b/net-p2p/go-ethereum/ChangeLog
new file mode 100644
index 000000000000..a418611ae93e
--- /dev/null
+++ b/net-p2p/go-ethereum/ChangeLog
@@ -0,0 +1,27 @@
+# ChangeLog for net-p2p/go-ethereum
+# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
+# (auto-generated from git log)
+
+*go-ethereum-1.4.16 (06 Oct 2016)
+
+  06 Oct 2016; David Seifert <soap@gentoo.org> +go-ethereum-1.4.16.ebuild,
+  +metadata.xml:
+  New package
+
+  go-ethereum is a Go client for the Ethereum cryptocurrency.
+
+  This ebuild was based on work found in the hnaparst overlay.
+
+  Package-Manager: portage-2.3.0
+  Closes: https://github.com/gentoo/gentoo/pull/2497
+
+  Signed-off-by: David Seifert <soap@gentoo.org>
+
+*go-ethereum-1.4.16-r1 (06 Oct 2016)
+
+  06 Oct 2016; David Seifert <soap@gentoo.org> -go-ethereum-1.4.16.ebuild,
+  +go-ethereum-1.4.16-r1.ebuild:
+  Add subslot operator on dev-lang/go
+
+  Package-Manager: portage-2.3.1
+
diff --git a/net-p2p/go-ethereum/Manifest b/net-p2p/go-ethereum/Manifest
new file mode 100644
index 000000000000..8c58cf36158e
--- /dev/null
+++ b/net-p2p/go-ethereum/Manifest
@@ -0,0 +1,4 @@
+DIST go-ethereum-1.4.16.tar.gz 14755287 SHA256 8b63fbfb54c256a0f302d9823f8bdb6e8c6a9f6583047d492fc1d7e18c850769 SHA512 ffe97a36c98460405014f6f6f3709ec4fd0556fd9f8f319f120065b2f44b4bc80791143b8a960dc44f858b7f368cd630d3d38ba954402486d67193c76f2eb13f WHIRLPOOL 0bc39515a539116ad963f4d06def628b59199e09aaef17e0420eb649dbbd83395633371d5a2876db2e2a73b906c7d091de83e2a135cf9850d293c5d81624b7ec
+EBUILD go-ethereum-1.4.16-r1.ebuild 579 SHA256 4e90aa1722b73f5b9e6b25d540ea40db2705603b7a4a3ae785cca49b751d6c81 SHA512 04f68cbdf8448d5bf3076406eb3cef39efad74f669f00cacc76b57513a2d2d004ae2f9c965536bd507adbd8e5e15d912db755516ec8127a1075923b97b7b04ee WHIRLPOOL 9a5c3c6ff45e84a4e4ef21a8492e8b6121f8b5bc8e62f9569cc8de6e84a4d618af9b9c541114d035448e1b5e9d4ffc63de80d398857fe7d7f14a1d84c4c40c24
+MISC ChangeLog 764 SHA256 45d5a00f34c34416b4b12271c5b443b8633d9e88a161d08de333f4c8efcf38c3 SHA512 7e23ddc7dec535ed899d20aaebb3c878946eae9743289244d2e829b9924a096b568e99d2490d4acfdeb7e16532953f9673c00a91aa55eec69213e26b50972796 WHIRLPOOL e319283544dd3b7d31002f3af62b891ded1002a63c6070b9031368a36d084df3f3c46ab8d6340cd30082dda4746234a0e4e2df0cfd2d13493fd5f7b5901b2262
+MISC metadata.xml 446 SHA256 7340c817f670e22bf49097d86afee6ab8d295ffa103ee8dc8f452d7dbdcae1ea SHA512 9617a68864eb45a54c126b13d6d83d0ff7d3bdfb4d26ac7018fef5028d1fc53ca9e5b054f92b149de9b1177f2bdd5e6c2f17b011c080c4a1a11828880849cf38 WHIRLPOOL 90a8cbb7a0e95775559f99205c6103b51719f5133f0f35df1dad5d841d97fa614979cc7c51afe49769c53dcaffa9c49c86266d8daf38b9ff85ec3c478fc40472
diff --git a/net-p2p/go-ethereum/go-ethereum-1.4.16-r1.ebuild b/net-p2p/go-ethereum/go-ethereum-1.4.16-r1.ebuild
new file mode 100644
index 000000000000..e5c4fb7ef62a
--- /dev/null
+++ b/net-p2p/go-ethereum/go-ethereum-1.4.16-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+DESCRIPTION="Official golang implementation of the Ethereum protocol"
+HOMEPAGE="https://github.com/ethereum/go-ethereum"
+SRC_URI="https://github.com/ethereum/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+ LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="evm"
+
+DEPEND="dev-lang/go:="
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	emake geth
+	use evm && emake evm
+}
+
+src_install() {
+	einstalldocs
+
+	dobin build/bin/geth
+	use evm && dobin build/bin/evm
+}
diff --git a/net-p2p/go-ethereum/metadata.xml b/net-p2p/go-ethereum/metadata.xml
new file mode 100644
index 000000000000..d54331023213
--- /dev/null
+++ b/net-p2p/go-ethereum/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mathy@vanvoorden.be</email>
+		<name>Mathy Vanvoorden</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<use>
+		<flag name="evm">Build Ethereum Virtual Machine (EVM)</flag>
+	</use>
+</pkgmetadata>
diff --git a/profiles/desc/l10n.desc b/profiles/desc/l10n.desc
index b0bcddf2838b..785ad79e6afe 100644
--- a/profiles/desc/l10n.desc
+++ b/profiles/desc/l10n.desc
@@ -8,11 +8,13 @@
 
 # The following are considered duplicates. Use the generic language
 # tag without region subtag instead.
+# fil-PH - Filipino (Philippines)
 # fy-NL - Western Frisian (Netherlands)
 # ga-IE - Irish (Ireland)
 # gu-IN - Gujarati (India)
 # hi-IN - Hindi (India)
 # hy-AM - Armenian (Armenia)
+# id-ID - Indonesian (Indonesia)
 # kn-IN - Kannada (India)
 # nb-NO - Norwegian Bokmål (Norway)
 # nn-NO - Norwegian Nynorsk (Norway)
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 5916f309dad1..5987e3680247 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -6414,6 +6414,7 @@ net-p2p/eiskaltdcpp:json - Enable JSON for cli and daemon
 net-p2p/eiskaltdcpp:libcanberra - Enable sound notifications support over libcanberra in EiskaltDC++ Gtk
 net-p2p/eiskaltdcpp:minimal - Don't install headers
 net-p2p/fms:frost - Add support for frost boards
+net-p2p/go-ethereum:evm - Build Ethereum Virtual Machine (EVM)
 net-p2p/go-ipfs-bin:fuse - Enable runtime support for sys-fs/fuse
 net-p2p/i2p:ecdsa - Enables additional checks to make sure a setup is available that is capable of using I2Ps ECDSA provisions. I2P will work without it, but you will likely see warnings.
 net-p2p/i2p:nls - Adds Native Language Support using GNU gettext.
diff --git a/sci-electronics/gazebo/ChangeLog b/sci-electronics/gazebo/ChangeLog
index 9d431a9533e3..cc677fd56e1b 100644
--- a/sci-electronics/gazebo/ChangeLog
+++ b/sci-electronics/gazebo/ChangeLog
@@ -148,3 +148,9 @@
 
   Package-Manager: portage-2.3.0
 
+  06 Oct 2016; Alexis Ballier <aballier@gentoo.org> +files/boost162.patch,
+  gazebo-7.3.1.ebuild:
+  fix build with boost 1.62
+
+  Package-Manager: portage-2.3.1
+
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index 0d1dc769a1c6..e4f919ce6120 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,8 +1,9 @@
+AUX boost162.patch 370 SHA256 d0320d8b0458b240e412679bbe581107e5a53d76d65f94c1b77cb5e524e55c6c SHA512 50e38109f99121ca1f566ee61361bf9ed24b2d66f83e56e555c42e203c9fc092db8e86c24935990a2d4966f6f44ad1ded69342c44a6315840c52dcc72e6deacb WHIRLPOOL de679710d5253f23981b68d1a8a4df94d6f0ac324836ae6563ccfc6e51adf58091ddafbc8f90c7491dc05c0341cab5a74678db5c268fe1a8dc1a97b9a786a05e
 AUX tinyxml2.patch 783 SHA256 a4fadb8169474f0fcddab1d384f367904308e78b1eec267d354d5bf35bcb0992 SHA512 0b82681d40321f0eb51f160cc43c65733389c5b5615db0d652356ce39177a553a27b8f9e4b7379ed55d38af55f16d516b5cad3fc5ecc891641efcc128629860a WHIRLPOOL 0a387783dc9e6b5d06a536e617d7474ee8d6debbb34e6684edad8d420930f9b12251433c5065658cca906e970faff490fd9fb50b83617481ca67c31d5be76595
 DIST gazebo-7.2.0.tar.bz2 51084680 SHA256 3e10501379236146f5393fcf02be419ce343bfa76b0f6670d43cc5bc13cd6fb1 SHA512 b484ef589fbcbe3262b257a6741f253ba23837c3585f42a857e7b03acf6dcbf7209a65f1fce9e4ee6df3b8a45a5124015c99e8708644f259e6d1275bbadab503 WHIRLPOOL 595146621ed9f6bbeecb325fddcacf048fadaff69338c2c8cefccb6e82669494d92000ae194e0a1941094491be3ec759165e8f8220fb7649cdb209ee66e5b60a
 DIST gazebo-7.3.1.tar.bz2 50992794 SHA256 aeff031d9b1b72c94b06b2a87790e6b561f4cba0e1dce155269108b3237e5c62 SHA512 2ecf89efd5312efe2d7c2b27c898467b49f94e2dbe75c69c2e403262e11361bea0a701a61134bbbfe01f1723621e5ccfc44c6d40698c7c2e8608292e275b5ea5 WHIRLPOOL 50886561eb6d8fffaabeb90466ddee1ed57aefc9b9d8ef4d65cc9a311355a8abea62034289dcd15bbf185c697bda1575d2365f80b52f8922af734dbd5586f37f
 EBUILD gazebo-7.2.0.ebuild 1673 SHA256 a28d1b69c453561628b0bb0dce6534a5ba21a29b7b0551e718cded0722ae0cae SHA512 3075e0ee1584d3eb6371af25d2cf2eed1ac61a3c001ad6af1361a0ed01756890556224f2ecd0ff635ae4c5b6f95dc884ec94fe6a076b44f4937cce9fe7d7f0ad WHIRLPOOL d09303238619cfb9e44ef48adfc1b5c8fc7e05bdfda508f035daf1bbf223250ddb1db0edc24f0fee01b71d5cb5ccc137de356848a0d54fe255f2b3aa69467c8c
-EBUILD gazebo-7.3.1.ebuild 1714 SHA256 ff5b099b8f347e5f52d773df6db09915af6874c1967d6316fbd52e571b8510ab SHA512 cd463a8c66499235df30966d12aa14af1a3e3d3a8cd749cacdcaf62c8695e9b65c7f6459c4cd2272435f621e10b3769424e46d5f0320464511f6db4927319e4a WHIRLPOOL 73a4ce5e6dc057ee1b9853876d527e0178bc8f1cfbcfb0659943ed1c22178aa43fc908f5f52c3c1565aee5cc651b4dfdff90ff022f3318149422a2bed531b569
-MISC ChangeLog 4636 SHA256 c446313716111448cc78cbe8aeeb8d50234ca1eac11bd913b4861a73f7de39dd SHA512 8c3f3ed947741d557c87de7b3bca403e0c0827ec4f1ee7e7542bbf5f33b9afae2157ddb4a8d665cbdc1be3d6424dbd5d862c5f670731d110f325b535b20790dd WHIRLPOOL 772fe0303abe989665207880e00e9b0660fa25b65a30e1133b17fe9c5b7e367ac281ea4e17d6a32552cf01d9852685205030d0129e504d370cdc3cadbd72b467
+EBUILD gazebo-7.3.1.ebuild 1743 SHA256 fcaea656fb67853ef5d8df7f117e399d0961250eacd93edf96265bfc84bea6c9 SHA512 f7221e29b79252a899b5ccfdddc8d7b05c3a6ce1e66bd40a4d99410a3fc8276cc59c43471e533f9a7542ea04ef588b1e6617c49a5fce1e90783a322d82cc5e28 WHIRLPOOL 8210283ce172874a53d46498977cf58a07a9a3e98c22f2ef82940551800591c18a84a50001318759d587d1f5a9e4c147cd3f09741703fea4892836294d21f692
+MISC ChangeLog 4797 SHA256 4aa9e2c15664853b789da74f58815928b0757e78574fea7a52d6afd0913c06b2 SHA512 91c33d30a5ad50ecc2875aa96fef0b992ffc70f4e8576362cbee12ccf038c899a424946adf5b6e1e39114fc0aa8f8e9b3c40f64e18ec08ab85a00459a705179b WHIRLPOOL acc144534b6c8addbde2363b1a1fa70bd810be4b1bd955323c692ee6ef682ea47c10f3fa7bc9ad984a22793f38442d6e2e8d16c69462f31c763551dc3b7d7961
 MISC ChangeLog-2015 651 SHA256 67ebde8ca478a696872483b2e85e9027cb3ee6a907f93532bbc0b587f5a1913e SHA512 e51b8e3e12bc1ee161b2a2fb3d5c132b53404a598ac45b69eaa785570abcb0c074fad7b5bd7688faf7bc617e83df9a873bee59ec560dbceb8cf0d90ca6f3fa8e WHIRLPOOL 09e66475d7e53fc56c38fb5df72abd2f8953d63138f272551693e21252ae46e4e737646339ef7442244370702ca945c9f07ada3c52f425f19cd60e0057ebe227
 MISC metadata.xml 243 SHA256 15deb598d18c4f8b8de5be1aa70b9f355143d083acd82d6ecb15eef490960590 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c WHIRLPOOL 1a3dcdd25c150262234f12dc0b25a8a5f67acf1ae5e7e7195b472ed0c7ee869a105c19125f8e58401c8ff7a8b2ca86db6b0cf382045130a50dbb79f3cd3cf5ec
diff --git a/sci-electronics/gazebo/files/boost162.patch b/sci-electronics/gazebo/files/boost162.patch
new file mode 100644
index 000000000000..e91643fbef44
--- /dev/null
+++ b/sci-electronics/gazebo/files/boost162.patch
@@ -0,0 +1,12 @@
+Index: gazebo-7.3.1/gazebo/rendering/Camera.cc
+===================================================================
+--- gazebo-7.3.1.orig/gazebo/rendering/Camera.cc
++++ gazebo-7.3.1/gazebo/rendering/Camera.cc
+@@ -25,6 +25,7 @@
+ 
+ #include <boost/algorithm/string.hpp>
+ #include <boost/filesystem.hpp>
++#include <boost/format.hpp>
+ #include <sdf/sdf.hh>
+ 
+ #ifndef _WIN32
diff --git a/sci-electronics/gazebo/gazebo-7.3.1.ebuild b/sci-electronics/gazebo/gazebo-7.3.1.ebuild
index cdc015cda205..01d18e8d6f14 100644
--- a/sci-electronics/gazebo/gazebo-7.3.1.ebuild
+++ b/sci-electronics/gazebo/gazebo-7.3.1.ebuild
@@ -54,7 +54,7 @@ DEPEND="${RDEPEND}
 	test? ( dev-libs/libxslt )
 "
 CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=( "${FILESDIR}/tinyxml2.patch" )
+PATCHES=( "${FILESDIR}/tinyxml2.patch" "${FILESDIR}/boost162.patch" )
 
 src_configure() {
 	# doesnt build without it
diff --git a/sys-apps/checkpolicy/Manifest b/sys-apps/checkpolicy/Manifest
index 9f704ecae106..318a34cf1c2b 100644
--- a/sys-apps/checkpolicy/Manifest
+++ b/sys-apps/checkpolicy/Manifest
@@ -1,8 +1,8 @@
 DIST checkpolicy-2.5.tar.gz 69857 SHA256 33af9f3eb19135a7e6536ecd3fbb9686323000016cd51eb88346346ed7546001 SHA512 cbbb57fabc26951e7a61fc867720f34d8c9ccf259744e86c1fa8d5e8099d90dee7c8e69dd001c4f3224562c3e0aff36051b0d227ac102790f94a104ca90163ad WHIRLPOOL f4339877514da938c995a33558317f3d8b9110127c36e3f6c3e916ccff73c84dcc3f4e2e944c571962d1594d02cb6236ecaf616f12d1de52fca7e1b859980d72
-DIST checkpolicy-2.6-rc1.tar.gz 69769 SHA256 3d76ded6a5393ec39710f66414d6a0c9c397d96a1b7b8a3c08e9a24b5c6b2143 SHA512 506aea34ceee6059f7570574a2ccd42f5e8b85eadc32043208a18e5c062bdd341e33c2dcfd7904e9438025c14cc513cc9d2c33924020cfc0311ff2b1c997068c WHIRLPOOL ce32d560a553d435c5a714004c533641e5f5bfe3421beb5e68cbdcf19dabb90fb3659b11050e6665acd97212559afe6e07e2cbd89e357ae60c0c8c0e285bc723
+DIST checkpolicy-2.6-rc2.tar.gz 69767 SHA256 bc2dbbfbbea8d1c7d0cfc45c97d846c428e300c6f82421a3e525f59eafd63d02 SHA512 293e224fbc4f7e5fb3a4988772db3829685f8b721bcf9eb29f7deb09301ef18a4a542b5d7c5baf215df175b2a51338928b49ee7aef4e2e61214bc586e7e29c6f WHIRLPOOL fbda1333899a2a3221b12f5971c456183891e77435fc381ff13d658456d2306e930f1da7c6f5bb64ee62c1c9fea4b8b3a4e978af201353de783b8c565d9965cd
 EBUILD checkpolicy-2.5.ebuild 1216 SHA256 76e7cec2e9473ef22663c8f1593f82500c862dbed9e49425ee443b8deca81e8c SHA512 dde5efccb94e1c3b21c0d6ac18fe96d72ea437461014c521238bea6421ceb7aae8bb47b77dc9ef4ceda567a62a466d46e8ee5e02291f7aef2c0d2b8a4906f9c3 WHIRLPOOL f324c41386c95cbf943ee34e5eec7814321704153d8d8d3db06665b4faa8ebfa2cfc04c1970f1302f5253b427789557ae36da6b0fc1a7a4e1ba69d50e805e66b
-EBUILD checkpolicy-2.6_rc1.ebuild 1179 SHA256 52bac8a312a79da610852e7a517fe853f90c0c8130ee7f440784b94fcf4caf54 SHA512 a22f107fb895c1bc8945a1afca415c31358926d6879e8f4e0178fa433eb3bf14bb2abd9e7f33ba43ef3b9d08445f008f4c04ab2fedbf314797c220ab7ecf3517 WHIRLPOOL eb22e61c38c91ef232f0b98886117dfdec4cbf1bcc82fa431bc04179605259cecdbc11076b7fb3bed5b5129b98cbce7f2585d006c90a593bf88eb46d7dce18da
-EBUILD checkpolicy-9999.ebuild 1179 SHA256 52bac8a312a79da610852e7a517fe853f90c0c8130ee7f440784b94fcf4caf54 SHA512 a22f107fb895c1bc8945a1afca415c31358926d6879e8f4e0178fa433eb3bf14bb2abd9e7f33ba43ef3b9d08445f008f4c04ab2fedbf314797c220ab7ecf3517 WHIRLPOOL eb22e61c38c91ef232f0b98886117dfdec4cbf1bcc82fa431bc04179605259cecdbc11076b7fb3bed5b5129b98cbce7f2585d006c90a593bf88eb46d7dce18da
+EBUILD checkpolicy-2.6_rc2.ebuild 1179 SHA256 b50367bf1f298a12b2fa288b34aa872eb25bbc981198c7f83f10fbc2c03e1e4b SHA512 43dcd497c4fa6b42ba4edde2b7b621ed8d27fde5683274e69b541e44780bf8e2ab571d0df6016bd2a50f492adeaedcfefa39cca9a920640b942a92e4b24b91ac WHIRLPOOL 41a50440b4ca769e5697de402e2c3a66be203a388f7737fdece4b854fb63227ee9f69ffdfe21020da99adc9fefb4f11845b00627519f3d52b1be5bf74805d45b
+EBUILD checkpolicy-9999.ebuild 1179 SHA256 b50367bf1f298a12b2fa288b34aa872eb25bbc981198c7f83f10fbc2c03e1e4b SHA512 43dcd497c4fa6b42ba4edde2b7b621ed8d27fde5683274e69b541e44780bf8e2ab571d0df6016bd2a50f492adeaedcfefa39cca9a920640b942a92e4b24b91ac WHIRLPOOL 41a50440b4ca769e5697de402e2c3a66be203a388f7737fdece4b854fb63227ee9f69ffdfe21020da99adc9fefb4f11845b00627519f3d52b1be5bf74805d45b
 MISC ChangeLog 3456 SHA256 e42c61a8d5bc3a53af1c4d4f615760996cb09637a4962734bb8c61c458aa51e0 SHA512 a48f2d18240afe5267b98f6a3a8bef0994b502a6af84fcb474034429d6a907e468126415345cf4eb4c6eceff8dbcc46856218e18e0bf1da332d71525c4311de0 WHIRLPOOL 7a1aeb7aef8f3f4ea9c752c64d17c7fa53749031cab8b10da5d50559d37fdc483801ad02ac5ef6a436c9b7896bbc65f0e61b4d11e5a8e97419ccc42f1a2777d1
 MISC ChangeLog-2015 11441 SHA256 f12a3aab8bc77da0cc4b2fb84cd8a41e3824632157f4cf8133920c0c0bca4d9b SHA512 e408593bb24513ad663768838d5e9d2b3a7e918d63f161e6432e9d459cd463276f0662cfe0cfb667bb2160015282f0366e04627f13cececda35e0a80dd11e588 WHIRLPOOL 14356c428d724416dc500a4200feb8be3521923e9e6a0f8ee7f1032e52b683bd238450db432beae2880e57285cb6d792319f9f75fd343cfd4928412fac62d7b7
 MISC metadata.xml 308 SHA256 e18ad84d03bc0569121d1a2a228843f85913376e162435e979a1888ea9a976ff SHA512 e07f79eaa348cc35ebb4eac966f6b59ff87cde6c2b9694ac996da971c45aed834f34b8a9325b205fdfe590d7add0d46013cc551af166a9ca2ca59e0feffbc9bb WHIRLPOOL 9b2dc03d3db3f486141b4c49914fce11b3f31253a9f4b400e3bea315d70409fb9a882537c1667113499defa92868f30ec8e9a6533f99910fafcc3f7e194f1d2c
diff --git a/sys-apps/checkpolicy/checkpolicy-2.6_rc1.ebuild b/sys-apps/checkpolicy/checkpolicy-2.6_rc2.ebuild
similarity index 97%
rename from sys-apps/checkpolicy/checkpolicy-2.6_rc1.ebuild
rename to sys-apps/checkpolicy/checkpolicy-2.6_rc2.ebuild
index 14b6885cc909..230bed1c38cd 100644
--- a/sys-apps/checkpolicy/checkpolicy-2.6_rc1.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-2.6_rc2.ebuild
@@ -7,7 +7,7 @@ EAPI="6"
 inherit toolchain-funcs
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20160930"
+MY_RELEASEDATE="20161006"
 
 SEPOL_VER="${PV}"
 SEMNG_VER="${PV}"
diff --git a/sys-apps/checkpolicy/checkpolicy-9999.ebuild b/sys-apps/checkpolicy/checkpolicy-9999.ebuild
index 14b6885cc909..230bed1c38cd 100644
--- a/sys-apps/checkpolicy/checkpolicy-9999.ebuild
+++ b/sys-apps/checkpolicy/checkpolicy-9999.ebuild
@@ -7,7 +7,7 @@ EAPI="6"
 inherit toolchain-funcs
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20160930"
+MY_RELEASEDATE="20161006"
 
 SEPOL_VER="${PV}"
 SEMNG_VER="${PV}"
diff --git a/sys-apps/openrc/ChangeLog b/sys-apps/openrc/ChangeLog
index 0660ed8ac1f4..764e90e49441 100644
--- a/sys-apps/openrc/ChangeLog
+++ b/sys-apps/openrc/ChangeLog
@@ -514,3 +514,10 @@
 
   Package-Manager: portage-2.3.0
 
+*openrc-0.22.2 (06 Oct 2016)
+
+  06 Oct 2016; William Hubbs <williamh@gentoo.org> +openrc-0.22.2.ebuild:
+  0.22.2 version bump
+
+  Package-Manager: portage-2.3.0
+
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 91525ae19893..7f25ce1ed6a1 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -9,12 +9,14 @@ DIST openrc-0.18.4.tar.bz2 157237 SHA256 2c8bf1c6f52fcf4c1f6945a2836ba2551a7d930
 DIST openrc-0.19.1.tar.bz2 159598 SHA256 5628c04b12e2f51f25e59c303bdccbf545ba0db25484adcca48e70d0712ce0e6 SHA512 303db4475fd02aa3aa161dbd8794a45c2633b9fe96aaab67b81014fa3915bed1aa51cff57128f4413cf9f2329ce1f2012e460e089c39f01ac6eb061a95844329 WHIRLPOOL a4e8720579b8983cb3c2c9b4dd983c1b7bf45e053aa0c9545f31e36c22e44d06e55198d4143dc0a6bca3b7d00b151b43d1da439b2479044344ca12f3151711f1
 DIST openrc-0.21.7.tar.bz2 168104 SHA256 0d4bb11cfac9950687dfbc1a72a90e337af25bb39edc032cb0b807cfe0d04c3d SHA512 26edf47e0eae0b62b651484bcbe73a5ccda2032ecbcc303f280bbf671fd1a8a1394d206228bd12e5157e8214210eb124898d11acc78cdef0d9145a952754f6bc WHIRLPOOL 5731326b0879759f58b3e251e3b1c4cc6dcc17bee3ebf1d8ef4b689dff5ec39d429cde9c3d4f2901c8a592aaad7253bfca69a0caaa2ae77b6f45f9afe6e66df4
 DIST openrc-0.22.1.tar.gz 215672 SHA256 1e06c878fc2a6022795524a88fc97c9079158d4947b2fca048d17abbb7ec8920 SHA512 3dd74ab58003b7712ace90094def3dd1fe9239144925fd019df308550da9decf07b66e36cc5bb1ebf41218333525777a17ee36d164a5155ba6d499856c559883 WHIRLPOOL a13322b43d822214c9794c0d6e18c07795d8a839f495074b9b774a6bd0011f33628e83b3567b4c6529a11735a4603d82ce5af09d422b5a08e00f29e84ae52997
+DIST openrc-0.22.2.tar.gz 215328 SHA256 d6485cab4d01d7204b8878e78889a39a2ad9fd3b13ee77162b0f1738daeae59e SHA512 21962627612408e58cea0345ad445f9b8974e56a98784b51674cebc12e19310a766bfd11a84285f11616b5f25922dcbced4f19048dcf2ab715cffa1407ab403f WHIRLPOOL 14e11b00bdf8a32ce1bba93d32d14ed19ff291eab581ef9ee0a4257622a37a1848eb024d135ea2b22fd6b51a7bc120835850be431700a280cf421b520cb6c8f1
 EBUILD openrc-0.17.ebuild 10650 SHA256 dc185a3a810347f06c9b75931e6534b184a18f9e82d78489c9f83736574af7ab SHA512 20432dc28eaf54a2b70ac54a1109d0c3aa1fefd605559b64c52772e99ad970c167e9647d17fc6b739240a5186d74654eb554a3559dfabe6ed324bb9e2a1ecbf3 WHIRLPOOL f396e321211e4e277e8b00e160ad6d6f44e139a8afb7127723b8d8d9a1e1bf268c657f8650fa233b9084f0ab2d469cacf4a5c7dc277f18b4587793f8310c897b
 EBUILD openrc-0.18.4.ebuild 11036 SHA256 40408b2e2792a20a35fc56ebc7b583a9353a5af78e9c4bb24c024ab267aeaabc SHA512 dd2c638fe41376cda1d0e135fecdfeec00b909eec4f62a051b09ef634b2d1ba658f2b46665e38c6c0cfc99ae0c2121b0f0d0ca9ba2c8a11950a5598ba2efb74e WHIRLPOOL 8b90dcbb2b452bda54c78f9446aedd389ca8b64a2da946a96aa392a37502e9d98b573dfe40ba4f5ad07e291c0010a14965184282c7c63638dd6d45d11e2ab313
 EBUILD openrc-0.19.1.ebuild 11022 SHA256 cf219eb51d04e90edd659e79aea0f56dd35a4b0c5d138c0a57cde048578256f5 SHA512 8efb500ae0f1bcac771de3545c6c7fab69059908d05ed6604c4317270c8bbb44dfb0059a7dfd8624d942cdb1be965fda4631aad15c3783269b335297815f098c WHIRLPOOL 5d40264b1c0b6e206a65e5881fded7af226c3fe687929f718a470be1af641f47bb5cf989d049ff26debbad70cf901599b61f334ade835eaf5e64b5eb70bb8f02
 EBUILD openrc-0.21.7.ebuild 10229 SHA256 9ca34491d3aa1b94e201747cf7b618e5bd1172fad0332f2c2fb8cf01648435e4 SHA512 01ee1551a0d423ffe1c5d65412edbcdcbca0a4b2e4965c428d1df6425721870121b37748bce3e113ced025de82e77321e5b2a9445550368b6f41cadc7af601ab WHIRLPOOL bd7e50b4132c9ac09f4643fa44c4ad99f6653fd2ed2754e9f1bb502d48eb52fe7bf25df2e196f13a2541a62154e76c73162c35002b093f672c6ddf42bd0991f4
 EBUILD openrc-0.22.1.ebuild 10253 SHA256 2a869616b2d53c94b700ca1c97daf5c14b7b90bb405b2805162681fdd80c284b SHA512 0b137c042b208a132db0305f67bbaee977724f71d01941215e4414201abcac56b7f6e2483acc9b6c8b3a03e200d4775041a4675a638103289c9d7c636c1e1370 WHIRLPOOL b2490be9494ba5f04939f69725ca1d60a37a33b3e10737efb0fb4eace55f10f8e3e87203d2b8120b12a9e6d3e275725593ceb28a931f5036fd69e79b106b7475
+EBUILD openrc-0.22.2.ebuild 10253 SHA256 2a869616b2d53c94b700ca1c97daf5c14b7b90bb405b2805162681fdd80c284b SHA512 0b137c042b208a132db0305f67bbaee977724f71d01941215e4414201abcac56b7f6e2483acc9b6c8b3a03e200d4775041a4675a638103289c9d7c636c1e1370 WHIRLPOOL b2490be9494ba5f04939f69725ca1d60a37a33b3e10737efb0fb4eace55f10f8e3e87203d2b8120b12a9e6d3e275725593ceb28a931f5036fd69e79b106b7475
 EBUILD openrc-9999.ebuild 10228 SHA256 3b38f298ce469800b37bb5c18eb21c04fb491740271e8d48d3460aa9225a1946 SHA512 6f6f6e5b134ff8922b84e018a44019cc278a17cba7622b903bce7f33a3d8f001a4f5927eacf2dee775496309297e111412e4ae4b2a3a991ee58a61fb8762f00d WHIRLPOOL 7ee03d6280292cba0b68ef2b4ef76da04d1669197d6873c64585ca9d9af3c75aecdce92839605d9b3d9ddabc9b2ed3763d2d36a4cc1a13194eaf6af84c586615
-MISC ChangeLog 16296 SHA256 b7074c8dd8f0c9e59eb3cc88309a1fc0ea41910ef51ea3ade64a29092c928d6f SHA512 beaeb1a99cc85897a02bc832aafd24093410bbe2bb3dd0667f4e572b9a5f116a9a820403d84f5858e36a03ace28fde7eb74d2958302a47c5ea1e2c78a1219cae WHIRLPOOL 020dd76f682f51625dee2e0584480b98ddb8aac154ace724c7a9e7cbed280ef7de9142be9a2db528971e00707188e181a209c9118137e3a58ed94c027c7ac525
+MISC ChangeLog 16457 SHA256 b99ba368d714d5becf95b1a391f0076bb3744714a956f4cbf3868ff03d5c2a9d SHA512 64ac60f86f7ea55ad1fb36ad061a88d5d576b5ddc17744302265aa4cd75f768abf5c6a34bea6663b89d26954c475c19eec3e7997313dfb0e4ec5f634d15caa48 WHIRLPOOL 76e524f951bb69f9dd43fb28701224b0cf71de9728d6de6bc1011898fac936b29ad51410c3f7513e1d60517ee9da6f83cdd877af6aea19a3d1aae1a4c6eb6284
 MISC ChangeLog-2015 57223 SHA256 df20987356d1c191a7f947374ec43989a1191abae87a47094832785ae87cc012 SHA512 314bdddce280e6a02e6c0bb8e7fc4b52e0fce8ab00ac9669c7d4dc36986017bb220d54ad743651e1b1d65a0b598f9e2f1fe34adfb755592671f4fac00a4a3ee9 WHIRLPOOL cb8531c90fd33e586741997db52abac7883ef4f128c22d60dd78e85eb01cdee6174d566b31a8ed43520e40de887b4223202f38705193215bf4cd8ae91e135c78
 MISC metadata.xml 546 SHA256 7dc34140a23c4445469336e18d9c6320b4cd5a6a327ad0fc68833edd0d9ec8af SHA512 22c5577746b2a8116dd46cac0e0d56da300e3186122471a15bf6aa617bd88152adf0149c9f72b78c6823a964450e0a7fed6ec21eb0292b2fad23a45d8c8016c2 WHIRLPOOL 6a7591daa65ce63d522884bf6199df57ed375bda4d81e5f77f187984911db0aa98c20e1e1d2ae281e8712b81f13cd81cac2f442253607054a87159428194a308
diff --git a/sys-apps/openrc/openrc-0.22.2.ebuild b/sys-apps/openrc/openrc-0.22.2.ebuild
new file mode 100644
index 000000000000..ea6aaf64d747
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.22.2.ebuild
@@ -0,0 +1,330 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit flag-o-matic pam toolchain-funcs
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://github.com/OpenRC/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit debug ncurses pam newnet prefix +netifrc selinux static-libs
+	tools unicode kernel_linux kernel_FreeBSD"
+
+COMMON_DEPEND="kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-ubin-9.0_rc sys-process/fuser-bsd ) )
+	ncurses? ( sys-libs/ncurses:0= )
+	pam? (
+		sys-auth/pambase
+		virtual/pam
+	)
+	tools? ( dev-lang/perl )
+	audit? ( sys-process/audit )
+	kernel_linux? (
+		sys-process/psmisc
+		!<sys-process/procps-3.3.9-r2
+	)
+	selinux? (
+		sys-apps/policycoreutils
+		sys-libs/libselinux
+	)
+	!<sys-apps/baselayout-2.1-r1
+	!<sys-fs/udev-init-scripts-27"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	!prefix? (
+		kernel_linux? ( || ( >=sys-apps/sysvinit-2.86-r6 sys-process/runit ) )
+		kernel_FreeBSD? ( sys-freebsd/freebsd-sbin )
+	)
+	selinux? (
+		sec-policy/selinux-base-policy
+		sec-policy/selinux-openrc
+	)
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_prepare() {
+	sed -i 's:0444:0644:' mk/sys.mk || die
+
+	if [[ ${PV} == "9999" ]] ; then
+		local ver="git-${EGIT_VERSION:0:6}"
+		sed -i "/^GITVER[[:space:]]*=/s:=.*:=${ver}:" mk/gitver.mk || die
+	fi
+
+	# Allow user patches to be applied without modifying the ebuild
+	eapply_user
+}
+
+src_compile() {
+	unset LIBDIR #266688
+
+	MAKE_ARGS="${MAKE_ARGS}
+		LIBNAME=$(get_libdir)
+		LIBEXECDIR=${EPREFIX}/$(get_libdir)/rc
+		MKNET=$(usex newnet)
+		MKSELINUX=$(usex selinux)
+		MKAUDIT=$(usex audit)
+		MKPAM=$(usev pam)
+		MKSTATICLIBS=$(usex static-libs)
+		MKTOOLS=$(usex tools)"
+
+	local brand="Unknown"
+	if use kernel_linux ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=Linux"
+		brand="Linux"
+	elif use kernel_FreeBSD ; then
+		MAKE_ARGS="${MAKE_ARGS} OS=FreeBSD"
+		brand="FreeBSD"
+	fi
+	export BRANDING="Gentoo ${brand}"
+	use prefix && MAKE_ARGS="${MAKE_ARGS} MKPREFIX=yes PREFIX=${EPREFIX}"
+	export DEBUG=$(usev debug)
+	export MKTERMCAP=$(usev ncurses)
+
+	tc-export CC AR RANLIB
+	emake ${MAKE_ARGS}
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	emake ${MAKE_ARGS} DESTDIR="${D}" install
+
+	# move the shared libs back to /usr so ldscript can install
+	# more of a minimal set of files
+	# disabled for now due to #270646
+	#mv "${ED}"/$(get_libdir)/lib{einfo,rc}* "${ED}"/usr/$(get_libdir)/ || die
+	#gen_usr_ldscript -a einfo rc
+	gen_usr_ldscript libeinfo.so
+	gen_usr_ldscript librc.so
+
+	if ! use kernel_linux; then
+		keepdir /$(get_libdir)/rc/init.d
+	fi
+	keepdir /$(get_libdir)/rc/tmp
+
+	# Backup our default runlevels
+	dodir /usr/share/"${PN}"
+	cp -PR "${ED}"/etc/runlevels "${ED}"/usr/share/${PN} || die
+	rm -rf "${ED}"/etc/runlevels
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/usr/share/openrc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	# install gentoo pam.d files
+	newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+	newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+
+	# install documentation
+	dodoc ChangeLog *.md
+	if use newnet; then
+		dodoc README.newnet
+	fi
+}
+
+add_boot_init() {
+	local initd=$1
+	local runlevel=${2:-boot}
+	# if the initscript is not going to be installed and is not
+	# currently installed, return
+	[[ -e "${ED}"/etc/init.d/${initd} || -e "${EROOT}"etc/init.d/${initd} ]] \
+		|| return
+	[[ -e "${EROOT}"etc/runlevels/${runlevel}/${initd} ]] && return
+
+	# if runlevels dont exist just yet, then create it but still flag
+	# to pkg_postinst that it needs real setup #277323
+	if [[ ! -d "${EROOT}"etc/runlevels/${runlevel} ]] ; then
+		mkdir -p "${EROOT}"etc/runlevels/${runlevel}
+		touch "${EROOT}"etc/runlevels/.add_boot_init.created
+	fi
+
+	elog "Auto-adding '${initd}' service to your ${runlevel} runlevel"
+	ln -snf /etc/init.d/${initd} "${EROOT}"etc/runlevels/${runlevel}/${initd}
+}
+add_boot_init_mit_config() {
+	local config=$1 initd=$2
+	if [[ -e ${EROOT}${config} ]] ; then
+		if [[ -n $(sed -e 's:#.*::' -e '/^[[:space:]]*$/d' "${EROOT}"${config}) ]] ; then
+			add_boot_init ${initd}
+		fi
+	fi
+}
+
+pkg_preinst() {
+	local f LIBDIR=$(get_libdir)
+
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+
+	# termencoding was added in 0.2.1 and needed in boot
+	has_version ">=sys-apps/openrc-0.2.1" || add_boot_init termencoding
+
+	# swapfiles was added in 0.9.9 and needed in boot (february 2012)
+	has_version ">=sys-apps/openrc-0.9.9" || add_boot_init swapfiles
+
+	if ! has_version ">=sys-apps/openrc-0.11"; then
+		add_boot_init sysfs sysinit
+	fi
+
+	if ! has_version ">=sys-apps/openrc-0.11.3" ; then
+		migrate_udev_mount_script
+		add_boot_init tmpfiles.setup boot
+	fi
+
+	# these were added in 0.12.
+	if ! has_version ">=sys-apps/openrc-0.12"; then
+		add_boot_init loopback
+		add_boot_init tmpfiles.dev sysinit
+
+		# ensure existing /etc/conf.d/net is not removed
+		# undoes the hack to get around CONFIG_PROTECT in openrc-0.11.8 and earlier
+		# this needs to stay in openrc ebuilds for a long time. :(
+		# Added in 0.12.
+		if [[ -f "${EROOT}"etc/conf.d/net ]]; then
+			einfo "Modifying conf.d/net to keep it from being removed"
+			cat <<-EOF >>"${EROOT}"etc/conf.d/net
+
+# The network scripts are now part of net-misc/netifrc
+# In order to avoid sys-apps/${P} from removing this file, this comment was
+# added; you can safely remove this comment.  Please see
+# /usr/share/doc/netifrc*/README* for more information.
+EOF
+		fi
+	fi
+	has_version ">=sys-apps/openrc-0.14" || add_boot_init binfmt
+
+	if ! has_version ">=sys-apps/openrc-0.18.3"; then
+		add_boot_init mtab
+		if [[ -f "${EROOT}"etc/mtab ]] && [[ ! -L "${EROOT}"etc/mtab ]]; then
+			ewarn "${EROOT}etc/mtab will be replaced with a"
+			ewarn "symbolic link to /proc/self/mounts on the next"
+			ewarn "reboot."
+			ewarn "Change the setting in ${EROOT}etc/conf.d/mtab"
+			ewarn "if you do not want this to happen."
+		fi
+	fi
+}
+
+# >=OpenRC-0.11.3 requires udev-mount to be in the sysinit runlevel with udev.
+migrate_udev_mount_script() {
+	if [ -e "${EROOT}"etc/runlevels/sysinit/udev -a \
+		! -e "${EROOT}"etc/runlevels/sysinit/udev-mount ]; then
+		add_boot_init udev-mount sysinit
+	fi
+	return 0
+}
+
+pkg_postinst() {
+	local LIBDIR=$(get_libdir)
+
+	# Make our runlevels if they don't exist
+	if [[ ! -e "${EROOT}"etc/runlevels ]] || [[ -e "${EROOT}"etc/runlevels/.add_boot_init.created ]] ; then
+		einfo "Copying across default runlevels"
+		cp -RPp "${EROOT}"usr/share/${PN}/runlevels "${EROOT}"etc
+		rm -f "${EROOT}"etc/runlevels/.add_boot_init.created
+	else
+		if [[ ! -e "${EROOT}"etc/runlevels/sysinit/devfs ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/sysinit
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/sysinit/* \
+				"${EROOT}"etc/runlevels/sysinit
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/shutdown/mount-ro ]] ; then
+			mkdir -p "${EROOT}"etc/runlevels/shutdown
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/shutdown/* \
+				"${EROOT}"etc/runlevels/shutdown
+		fi
+		if [[ ! -e "${EROOT}"etc/runlevels/nonetwork/local ]]; then
+			cp -RPp "${EROOT}"usr/share/${PN}/runlevels/nonetwork \
+				"${EROOT}"etc/runlevels
+		fi
+	fi
+
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	# Handle the conf.d/local.{start,stop} -> local.d transition
+	if path_exists -o "${EROOT}"etc/conf.d/local.{start,stop} ; then
+		elog "Moving your ${EROOT}etc/conf.d/local.{start,stop}"
+		elog "files to ${EROOT}etc/local.d"
+		mv "${EROOT}"etc/conf.d/local.start "${EROOT}"etc/local.d/baselayout1.start
+		mv "${EROOT}"etc/conf.d/local.stop "${EROOT}"etc/local.d/baselayout1.stop
+		chmod +x "${EROOT}"etc/local.d/*{start,stop}
+	fi
+
+	if use kernel_linux && [[ "${EROOT}" = "/" ]]; then
+		if ! /$(get_libdir)/rc/sh/migrate-to-run.sh; then
+			ewarn "The dependency data could not be migrated to /run/openrc."
+			ewarn "This means you need to reboot your system."
+		fi
+	fi
+
+	# update the dependency tree after touching all files #224171
+	[[ "${EROOT}" = "/" ]] && "${EROOT}/${LIBDIR}"/rc/bin/rc-depend -u
+
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/wicd,"
+		ewarn "net-misc/NetworkManager, or net-misc/badvpn."
+		ewarn "Or, you have the option of emerging openrc with the newnet"
+		ewarn "use flag and configuring /etc/conf.d/network and"
+		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+		ewarn
+	fi
+
+	if use newnet && [ ! -e "${EROOT}"etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
+		ewarn "as soon as possible. Not doing so could leave you with a system"
+		ewarn "without networking."
+		ewarn
+	fi
+}
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index 806c493f31f7..03b110b92721 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -9,11 +9,11 @@ AUX 0120-build-failure-for-mcscolor-for-CONTEXT__CONTAINS.patch 483 SHA256 572d1
 AUX 0130-Only-invoke-RPM-on-RPM-enabled-Linux-distributions-bug-534682.patch 3330 SHA256 72620c7af5c86340255c085891500592c626e10bb21b10da63e37c0062e5f952 SHA512 49ed2e6440dfbbef791ad10dd903819bdef5577f6744bf72a2e08f0d72dbe9e97bff6e2e8a8ec21c22b86f8fd45a37b9b8ec190912410f98af66ea01b16614d9 WHIRLPOOL 7a92520f71b5010ce5a5cad1ba42ab272eff12e8fa137d90e28884c0e32db7bf375707a6b3e214cd08d597db3c9118131032284c6003a9ead1caf919c045e9c4
 AUX 0140-Set-self.sename-to-sename-after-calling-semanage-bug-557370.patch 932 SHA256 4168c6c0d54f8306da4e0dad4a388d898c02c20292bb08b4c796375c6b253cd5 SHA512 c28904f456c4682946100d40374498f4bacb96f8c7c213a7c01fb6da6203246b350d9f9e6ac09b86a2ce58105def86ab446fe56c89733a3781b5a1e89bf69920 WHIRLPOOL 5ed1d2a0983813ba346681e1bd92c2a1a53941a33436b737129e74e75f8537d2fed590342359c8cb78f611ddee66d4cffac04bb890bd275f5c667979297fced7
 DIST policycoreutils-2.5.tar.gz 4986066 SHA256 329382cfe9fa977678abf541dcd8fe3847cf0c83b24654c8f7322343907078a1 SHA512 0eabf046cf44c6fe2e28492f53862f4302551d602e9b678b923f34f35bfc48f03a73b62962ac71465b9d99b411016b2cfc976f3baf113133a6c0adab1e1f6f8b WHIRLPOOL 27a6810d611f50ac1292f614c9936f0b73b7334be80685f1eda6fd72ec7e85fc0f7b4ff930a48c08a61ade84fd46bd9e7285f5a135ea6db6e4fe88e38d73bd16
-DIST policycoreutils-2.6-rc1.tar.gz 4660503 SHA256 6bcb91a351ac54d8b10659c162a27556b6d65c4817da80e3b987db270c487f10 SHA512 91ec1356ab60e944a7b5f0a2366cf148f8dfbdde37931ada5ba150580f423302f74d1872f0271488843a0a794ec8d8aab40615c2d6091b98a2638c1d161f9b74 WHIRLPOOL 2a639d99767b71da9f0bf9eb9d0a317ff23bd3182a408e064328c0a93b31db4f60e5af5e83286db629da8c837448672ca2efaa1caafe404355486573d909b9fe
+DIST policycoreutils-2.6-rc2.tar.gz 4660425 SHA256 1090a736d111bbc61cdf3d5ddec55febd7cd69bbeb07998dd121ede5c399d63d SHA512 d85196f09983eb35a512d982ce9385fbbaa9df6dbf8de7d1d55e10a03546a7573e59901da9c498a9f6f07c1b36d47ebf529143bc5905d4b6b3ac1bb6ee7e7170 WHIRLPOOL 96a2575cf8346349603e1ecfcc21105fb79481c0785caeb30e4ae14d268ff018aa646385f93cca25e9043404c136791fc58828b318a2d15f43d12daf988d99e1
 DIST policycoreutils-extra-1.34.tar.bz2 12107 SHA256 56ae2aac57bf104d6a8a7837b25de7978b25e0642744ef95e6e6d483201aa4ca SHA512 b1db6d70cf864023f22583e5bd24c85e796f1541f9c1bc878dd55309464b27346e05e414db3ef81bef2dfe8c8d7d7063ee7e0422878f38a3db56c67d9468b89d WHIRLPOOL 8b094818bed0e438ce4258428afa054cb561f53e303d84e171881add5952cfc0fa577bce2765294905dac8ddd5560906904958f35c96afce0f357feb5333646d
 EBUILD policycoreutils-2.5.ebuild 5508 SHA256 e7c3a3278f1b42af10fd04c8b2f2c48b7555612ba24c3a0ae3091bfe70ecb5dc SHA512 4adf1282614e80368846b0eb43fdbe702ac2b8456d179988f642c54b9e958463e732c56fc260e38280ee9c36870eb2560af7ebf47a25eeb8cc02f30ac10b4714 WHIRLPOOL 99f1b53b640c24d37824a1a65a71400b04bb47dc9d96526e54dd97768d5070f92187789aed4c69cfb1cdb429126397c4dfe9fd2885e04381b7b2c9c35c85b929
-EBUILD policycoreutils-2.6_rc1.ebuild 5427 SHA256 319f4ed9905262f7c36212ee808207b1896c04b0c3017adaae40ad160ff25407 SHA512 fe8bfa740a5db2907671669485b037d877114cba755e70d5cf07c03f5a6360936662c08028f0bac57ed5d19cda81a4ae6c11f3eb73cdb3ba01188aa38f479e76 WHIRLPOOL b6acc8ed77af883845e8238d2e7d82d2c54299f7e10ab16c99d052676fe059873551564ae73f61f16f5b43051817b015b17d709c24afb5e23f4b03da7f72f070
-EBUILD policycoreutils-9999.ebuild 5341 SHA256 ed16146238fde260d51edf52a465ff516b322174a50ec6c15c4c1db3c617421b SHA512 cce00296e218d30dc966a484a8beac9b4805fdff03fadd0527ecb29671f40825752cba95a99119717bf06104ff81b73927ac0c9c8e9f0ba943685c18a6ec7270 WHIRLPOOL aad157b645b57e7765cf63a7f723ee9499e9bdf901dc52186c67394d8a956b678bd12a818b687e97b4627694b2dc30d2b0e5d254aa472aeb76d592e1c0a65370
+EBUILD policycoreutils-2.6_rc2.ebuild 5427 SHA256 79baf05d457e7fe938949efc1f551bb16f69a31b6ed7f825bb063c24acee1181 SHA512 d80f821044e740f9ffeba7fe9ddfaa640b29b3d97b585de546e0c1880df941f06a4dbe0adf3651879b4d35b63ab2edce4e2139b65b7e93233e6d4f8a5658621c WHIRLPOOL e753d74028cccf74ae1b499d652c8203997da72ae31a59cc63ca2b2fea07afe993c59befcc44a5bfacbaf27109363a78abeb5a2bef27a85e8e0fb0684ca6cab3
+EBUILD policycoreutils-9999.ebuild 5341 SHA256 2304db39707224856b722a6a6253e0916f313799c76068c978e3ba581340929a SHA512 142eaec9cd60fa15acf2ab8dcdccfa25cddeb2b555ade4ae66acf060b50f111a96e2fdf8170b0768418fb92dfcc3c8b36b2b7a658eee62a341d8957dd0a26956 WHIRLPOOL 804ed40bfc556344e47c03d89be5767baac01d5d725605f1099d9994d5379aace764c631089d677d1c0e819b263b0aa54547e1973a2d21bd6ebb5a87de778895
 MISC ChangeLog 6003 SHA256 db6ad106b1f7ab9150db641f3c9b9c1ec5e42293499584a51fdf6ab7bdb74bbb SHA512 44088e9e40fb7eaf15421fb8de70e3c8eab316fb11276fb42b63e9aa483393520da8360b30b14a289da17c271ee38c4c258cfb589e3b0a8ba3f82f356bb1c158 WHIRLPOOL eaac5bbb347805440f7a662390a8c4160ca0f5f8c5ec651db43859f1552284788b1228ea4bde160d8cf6cae5d64c1f52c7e739ab39bbc12654f04ad549316d12
 MISC ChangeLog-2015 27068 SHA256 004588c7a9a83bad3e2c4f8b328c77a570e916332eda797fa504a84750373d22 SHA512 b26e0cf65b36ecd72f30f7ae4a467843434374d6c82fb3a8ca67d3a7294073f3aa78e7225052f20b9647266cff4207c95239528c128b5d13eba04e69b04c34af WHIRLPOOL a05d316fa06a95f73ee98c2f247b0cd715da322725ee2f3f09c1e82d12b0fca83cc1f17e362ad6cfb9080fe5fceccb56fab66057afde3b9a4a81554357b0394b
 MISC metadata.xml 1117 SHA256 4b5df713eb05f5d1610a5de599ae97ba21335de28b889ea5128ab52d7819f925 SHA512 1f8703b31ced13b4e15311ecc9d4e03c085eb580e61394e8781744a9c33794e0f10144617415e69b703f5716ca5fd15ad6db14fe93a95c9b5d46c429542beac5 WHIRLPOOL 86f2ca768507b5d12de4d43348bd61f84ee1851beda15e6bc4e69906c31983ab7e4975b472ce041855960252fead92cbf5b8ee889e43b0e017dca77d30706a0c
diff --git a/sys-apps/policycoreutils/policycoreutils-2.6_rc1.ebuild b/sys-apps/policycoreutils/policycoreutils-2.6_rc2.ebuild
similarity index 99%
rename from sys-apps/policycoreutils/policycoreutils-2.6_rc1.ebuild
rename to sys-apps/policycoreutils/policycoreutils-2.6_rc2.ebuild
index 92e7c94ce33e..ee194d8a2fea 100644
--- a/sys-apps/policycoreutils/policycoreutils-2.6_rc1.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-2.6_rc2.ebuild
@@ -10,7 +10,7 @@ inherit multilib python-r1 toolchain-funcs bash-completion-r1
 
 MY_P="${P//_/-}"
 
-MY_RELEASEDATE="20160930"
+MY_RELEASEDATE="20161006"
 EXTRAS_VER="1.34"
 SEMNG_VER="${PV}"
 SELNX_VER="${PV}"
diff --git a/sys-apps/policycoreutils/policycoreutils-9999.ebuild b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
index 8c1933b0a453..e2a3641b57f2 100644
--- a/sys-apps/policycoreutils/policycoreutils-9999.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-9999.ebuild
@@ -10,7 +10,7 @@ inherit multilib python-r1 toolchain-funcs bash-completion-r1
 
 MY_P="${P//_/-}"
 
-MY_RELEASEDATE="20160930"
+MY_RELEASEDATE="20161006"
 EXTRAS_VER="1.34"
 SEMNG_VER="${PV}"
 SELNX_VER="${PV}"
diff --git a/sys-apps/secilc/Manifest b/sys-apps/secilc/Manifest
index ae6124cbd3bc..78a4a5b7aefb 100644
--- a/sys-apps/secilc/Manifest
+++ b/sys-apps/secilc/Manifest
@@ -1,8 +1,8 @@
 DIST secilc-2.5.tar.gz 174642 SHA256 4303d911c06ee5c207e00f778ca786c1a6efa2554a562f5d014dbc0d2f4cc4a4 SHA512 7f7b6fb72bee7018f7a591e6a7d8f58a81ed0e1ec914e0792ccd57a550756a5e21c6359e35ad2fe29225a0bd352637d01288721de3b95a9a175bb3ab052620b9 WHIRLPOOL e674039433041f527a1346ad64887254fa4d7f37f3125b08edcf1e16e23f1d40e1b1151cf6e10d4875d849c43a6b39af0069185303f23b5f331b39c1433deb0e
-DIST secilc-2.6-rc1.tar.gz 174555 SHA256 201b30905e84704d0083f8bc20322c2e2f44b0b047234364fb654a5525c0ec5e SHA512 4e2608bbe3b970bed9838dcf9518e06cd049cd3bb977e83a6e1072390867edc519bac12b02dd8130cf3af5c3a2b1571910d6033c5ccb58d479e6b3b853d105c2 WHIRLPOOL 8390e497e5b3c2bcda72cc64342dc29b44318b4df465b6e128126f716f8db060112778a9cba36a5341ac0189acb44630f5c97b2e876047d882d060d4d276b7f4
-EBUILD secilc-2.5.ebuild 929 SHA256 27376b2a2eab983b1529465ffb4cb017962c426d848c9913bdd3caa1950b4d4f SHA512 7288dc96cb8401f9196ae86dfd834290d67b8b50430e28c9a84d446dd05452e94ef83f76402666fd6bb6c6e2eaa0bb1845a7055d6d7c4035a71e1975cc311528 WHIRLPOOL a0bbd49907105c2d174479d439db9983060bce68cc31f4521e9742da3029d981522780e810ddfff72258040206ac054cf3ce972b35503366537647cfb22e8d57
-EBUILD secilc-2.6_rc1.ebuild 865 SHA256 662651b9f7ef0aa6fc59af996b51c31f7bc54c5c857922926df77e21d675c383 SHA512 ae81cfca1ba83fa53ba0122b58ac22c053ed76cf52fd8447cfe7b78b366ee3502dcc0c778f5ebab064584718ec80beec64a1ff8f81d82263dd691fbf228ca5f4 WHIRLPOOL 2af60281037eff28bb01b7a6c708d0a56691f62070f229781edc39eb9bf683473aa9630932746f1b13a5278ec74a37786ab0a2de53e1bf2291066f697fda7d35
-EBUILD secilc-9999.ebuild 865 SHA256 662651b9f7ef0aa6fc59af996b51c31f7bc54c5c857922926df77e21d675c383 SHA512 ae81cfca1ba83fa53ba0122b58ac22c053ed76cf52fd8447cfe7b78b366ee3502dcc0c778f5ebab064584718ec80beec64a1ff8f81d82263dd691fbf228ca5f4 WHIRLPOOL 2af60281037eff28bb01b7a6c708d0a56691f62070f229781edc39eb9bf683473aa9630932746f1b13a5278ec74a37786ab0a2de53e1bf2291066f697fda7d35
+DIST secilc-2.6-rc2.tar.gz 174560 SHA256 3a1b993edb6f135e49b00890b1d2ab9ad983db60ae23f2be175c031f913636f8 SHA512 0cfbc771918df67b2ac1862408f97fc1e09101b3a47c5b27915e879ca3139d39b97a5ed90e3067cec9f047244a245af6bd552025cb2448727f8721c53ab3f611 WHIRLPOOL d75f4d0f1caa273989ef8b11dc4b839ccc61de4538a762f586e922dfdfbfe357c39e07bad9995996459abed6213b4233f6de1e0591f2bc3d2ee5ceb12ed27656
+EBUILD secilc-2.5.ebuild 927 SHA256 f9bd609bd11c1fd514da8a74ce623f00985f5fd5f112b35c6086985f08f1b69f SHA512 3a944de53a71af23de8703476c36cba53caeb80bd99c6646ce37b98e4d22230b03cac638ec2c3ddb769a1908bd3c08d0e6d36266ddc83a3655e1ec15d331064f WHIRLPOOL 3091b7e67de39b384dcca09416d6eae01334a1ecdf656caee1de113cd5bed9066de9d25330c2a7131ebc8a53ba633a67f3def11a7bcec1fe0eaabb5dfb0ed2d3
+EBUILD secilc-2.6_rc2.ebuild 865 SHA256 c905b6798bcf5169d3df40754b3e1952cbf9bfa6fd32d046715dce815f05bf8b SHA512 78d467cce2516f38ad92510964f8909c4ebb77f5356fb6ec7bf1fa120de6f6ca3217b1e698d4d8b8083f3d3d644abafad6bbfbf1aff55592920b4d3bbb56e512 WHIRLPOOL cf0ee437f17790627c169803971ce451bd8d618eeecadeca70c08316cdd1138a43d8ee705dd1df76b0427d0d34636c865ea74f56be3eff73b4a7e66b4fadb0ee
+EBUILD secilc-9999.ebuild 865 SHA256 c905b6798bcf5169d3df40754b3e1952cbf9bfa6fd32d046715dce815f05bf8b SHA512 78d467cce2516f38ad92510964f8909c4ebb77f5356fb6ec7bf1fa120de6f6ca3217b1e698d4d8b8083f3d3d644abafad6bbfbf1aff55592920b4d3bbb56e512 WHIRLPOOL cf0ee437f17790627c169803971ce451bd8d618eeecadeca70c08316cdd1138a43d8ee705dd1df76b0427d0d34636c865ea74f56be3eff73b4a7e66b4fadb0ee
 MISC ChangeLog 2661 SHA256 6858b30266bc0edee124bfbf5716354e832d4a7fa8e293038775b7a65e88ed20 SHA512 f2c3be81f87d41d31221b9de89822879aed007938d77c580a4bd97b75b2ea02b99ed9727b4f89283525accdc1f9e3f195d136e579114c2e038107744bf0cc95e WHIRLPOOL e257dd28b1f59ad04e92eefba44956164688e247b51511f436119f5b9543a9b41c1092b546eb4b94a0d258225d22918ecfe02b4427f03841444567eed0528d33
 MISC ChangeLog-2015 378 SHA256 f0c9286dc915f35b032160fb4300480b1e69f03533f61b0082d15bca1df8845d SHA512 2d45f26f81fb77175c99ef125d27f31876ead319a05eaadb5ae4d673dcebf3191d61cf048207cf4efc84208be3e221cf3ec119a273fb5b1e4a04d6641b5e74c2 WHIRLPOOL bf2f7c89779a51bee170cf5b44d5f248eb1cd210d923161d8de7ad7d9cac26ea47f5d1882e4b627d980fbbd40eabb17de47ba08ec79ee33cc2b95d10d31dfd99
 MISC metadata.xml 529 SHA256 875c9833e8587f5dd895dbd3552b91153422b8d8779d8101d1708cb4f21056fb SHA512 390d766e53aeb5b9e37d8796736b2fd98e06ed4620f8ad2af4fed980ac2468c7cb316caa46358f3247c77d9a1d7a32d30deb3ddb08359265defb265b3fbcb8c7 WHIRLPOOL 52a598cf3e8d036f9b02d010a401c5f7ad7ec7fa41b85ed6c8506e484a1552a4e22a173cb20078077be83f4874163fd7a4aa0b536d5c8b67d3ff98726e6b5e41
diff --git a/sys-apps/secilc/secilc-2.5.ebuild b/sys-apps/secilc/secilc-2.5.ebuild
index 9b5d6dac018d..582d20bb9ef7 100644
--- a/sys-apps/secilc/secilc-2.5.ebuild
+++ b/sys-apps/secilc/secilc-2.5.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]]; then
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
 	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/secilc/secilc-2.6_rc1.ebuild b/sys-apps/secilc/secilc-2.6_rc2.ebuild
similarity index 96%
rename from sys-apps/secilc/secilc-2.6_rc1.ebuild
rename to sys-apps/secilc/secilc-2.6_rc2.ebuild
index 2d316f8aeb42..5c7439f35b95 100644
--- a/sys-apps/secilc/secilc-2.6_rc1.ebuild
+++ b/sys-apps/secilc/secilc-2.6_rc2.ebuild
@@ -5,7 +5,7 @@
 EAPI="6"
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20160930"
+MY_RELEASEDATE="20161006"
 
 SEPOL_VER="${PV}"
 
diff --git a/sys-apps/secilc/secilc-9999.ebuild b/sys-apps/secilc/secilc-9999.ebuild
index 2d316f8aeb42..5c7439f35b95 100644
--- a/sys-apps/secilc/secilc-9999.ebuild
+++ b/sys-apps/secilc/secilc-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI="6"
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20160930"
+MY_RELEASEDATE="20161006"
 
 SEPOL_VER="${PV}"
 
diff --git a/sys-auth/consolekit/ChangeLog b/sys-auth/consolekit/ChangeLog
index d96d540b8060..fd410adfc571 100644
--- a/sys-auth/consolekit/ChangeLog
+++ b/sys-auth/consolekit/ChangeLog
@@ -346,3 +346,9 @@
   Package-Manager: portage-2.3.1
   RepoMan-Options: --ignore-arches
 
+  07 Oct 2016; Jeroen Roovers <jer@gentoo.org> consolekit-1.1.0-r1.ebuild:
+  Stable for HPPA PPC64 (bug #596264).
+
+  Package-Manager: portage-2.3.1
+  RepoMan-Options: --ignore-arches
+
diff --git a/sys-auth/consolekit/Manifest b/sys-auth/consolekit/Manifest
index 6e4c7768b502..927a0752b9db 100644
--- a/sys-auth/consolekit/Manifest
+++ b/sys-auth/consolekit/Manifest
@@ -13,9 +13,9 @@ DIST ConsoleKit2-1.1.0.tar.bz2 630178 SHA256 a40d92358aca9f627a224dca674090e3104
 DIST consolekit_0.4.6-4.debian.tar.gz 12192 SHA256 6d4dd5e13a76454b4bab27ab6b407718cd77616afd2b1af7cb8d947c1323b802 SHA512 f7fc5965b1f495d16a8ca167940431bc2569e9bde9e4a356b9c9ed00c2825db61da7b6db3d434d977fff72b3aaef30c455a365b9eba282a887a523753613b58f WHIRLPOOL 961a918c21259e24c68c7a5bf93964825b891ea207c088fecab61f81434012dc8925fca83b74518cfc9cf42f2c4a87eba7518c0829f663716ca0e11e38c856c9
 EBUILD consolekit-0.4.6.ebuild 3428 SHA256 6cf39ec7f9b63fb33a1fe58f0f273b1add22f3622f6c50675ec65c6f1cf2a52d SHA512 5e4b75e712c1c28f31bca6d52678418bdb823423982f9b3654b6d44319beacf45c289a4cb0804ede16112ce0c80a9175f5504ff862ed392c280b5e528cfbb429 WHIRLPOOL 7eeab1f3c20b55cae95abf136aa64df6be2959b36877bde201c0d1eeeb0b892296c7d6e141e32d76afdadedde24ce2ed88d3bfc886a3183922102f708ae1dca2
 EBUILD consolekit-1.0.1.ebuild 3136 SHA256 97db4def0ad705e0812a08a3afd4c2caaba845d1a849e95b4c18f119bd42af48 SHA512 1ba59ee56ec4d549647ae62d4a9c24551940bc5828605baf647eb0ebfe801b005e40c01a0ec6d6339551ddf44a14ee477ac49b26c38a1767b454e4cef0adbf3c WHIRLPOOL a164a109b46c3f356bc364ad066070a685b46cc3cbf31216fd7ed493b82b70c852ec82f2e3861bfc7c79aded128bb604943f87c7c1d337a6a17b026a17e2a051
-EBUILD consolekit-1.1.0-r1.ebuild 3247 SHA256 c9a0af10909fb5a170ea3c5861490e13ace7051784f9b7bdac8679164b90d132 SHA512 548d988287e513471682a26d0b3d87225b9fac8aaf034491ff4810706881f796f839374fd929a9a1ff8ac76a242edf257f85385d81e476f7180508bd192b1533 WHIRLPOOL de2d1ca8b094720c4db37f28daeefc49e414f378c3abb6ad6d6714cecb813833af50383a52e25f0057ee9b06c38633f5d2151ee213d3b6327170c9f5d22eda89
+EBUILD consolekit-1.1.0-r1.ebuild 3245 SHA256 769078e48016dceff49a8696d8ceeb7826a91f80a8911c13e740444777b07cde SHA512 503f2ee30ed81bc476ad1fab0ea4b6dd18021df38aad1a8bec538f6e3090c372eecabde806e2a786e3dc5a4d39de3ae41d85c1a7129d3015ce08abc3e8b044b7 WHIRLPOOL dac7b70bc7da405badbceebb61854d11a834263d4882967bfb939ddce4e04f61c176b9f74cef7cbb00070ea4cf64a29e11667c960d4080dcfd2fb1561c483c96
 EBUILD consolekit-1.1.0.ebuild 3131 SHA256 8fa4175e622df18af1974b383756a27dba74fc7b26ac837cae11252793b15252 SHA512 09a86202c1c2a8d30203012e66fd1d26dd1b408f05393a1ba3cf838bd1f6f90b944930097316fb2d216d3b0bcb534f0fec8c0fa22b3dfe9ccdc6be915d6d34ac WHIRLPOOL 8ce882fc3aa08a04c0599d6ad74d9ca5f2b647cb67faa66cd193e7c5782210d2270058bd23889ebf8219092b00268534e498ce40bf3da4084679127fc8d9260a
 EBUILD consolekit-9999.ebuild 3030 SHA256 c052def402bc26e96f52cfe1b8c6f7377f6a269610613c44c0d90a77d2b1e43e SHA512 a31d7eb37fb63cf29c317294868d0b0472b8c385b5d8f9097077fed648fb80b5fe1c127464f183766f9648299dc159c2a75bea0540004b3159043fd347097422 WHIRLPOOL 52de856ccf930f02f0cd4fc930bbc583ae5afa5e8e01581f80233d2c6503e1fd8afa305f5e703347cce5435247989e4b0510c12d53a4f54a586bc53d1b6bc4eb
-MISC ChangeLog 10774 SHA256 65a9e909eedde2a9a7767a42d4dc32d28a06867eb795a58e251cd8e68d5917b8 SHA512 2b871675e6f6311743e158799e5609d97f53c2e052774eafb4e578f7f91cc1a9a761168f9251aeee53a9fba0c93ae2e633ffc9946f02a9ea3747ba101d770beb WHIRLPOOL 914b5807cb7840d2469c1dcd63c2213a0242c7cef09c0c09d98ae6860dae7dccafd31e8ab861e07282db0da0d9518e72e90c0cab188d26065b28269995dbc5a6
+MISC ChangeLog 10958 SHA256 d0577649b25687e8cd3747d478f208dda751739ddffde28dad67e8fa218b46e5 SHA512 6a5c44df430a16baceebd54c3afc954d5573ebb32cde6bb4f2f7d4dbfed6bb5dde5494ca58e588357da7f53dc0acad4c4bf7f9404220831f9dccec89192b7c4c WHIRLPOOL c78f505f2ae716ae20f1c88fda7c9f9bc8b03914d33db8708df171c9796f858ace195f9ef4fe3e71647e23c54a63eef83c81c8c08d2d0a68317c83888e81ea86
 MISC ChangeLog-2015 27717 SHA256 bb12cd6e6784f6f87a420e8cf1dea2e5000c0f87f9ca652702492eb14f116b34 SHA512 e01c42a85818919e57aeb58c7713f3fae740094a743f83f41b6b70cc9b3b537add09b0b7ab3f935bdd033f65efc084113db3f510c69c9009f31f308ce26795b5 WHIRLPOOL 802c7719cb7361cc6c3b9e8640371a389ed3cc250cd3868cf26d078e0022065408c5b3ac69de5f6a71a63ac3e4fee1a39e626eb55df5b3e2412d35bc11335ef5
 MISC metadata.xml 923 SHA256 45928fd2c0568ea7439f7bd7051fa4089b22af86330d589b4205650c6317be04 SHA512 87c8601eabd92730b8e95e98b5680fc3d43ec959d369e4326e10e0cbc3483de8b30f489d64d83f7f7f146c39ba0723e49ffcab198c835d969ff6a80054fc2ad0 WHIRLPOOL b58bf42ce8cd0b1d8050e9b50120f2907d0a3144d964dc22aa9bbca13a6abe1dbf3e887695380e4cae036a812b67f61c8dda64546119ce7b12079f2f250af080
diff --git a/sys-auth/consolekit/consolekit-1.1.0-r1.ebuild b/sys-auth/consolekit/consolekit-1.1.0-r1.ebuild
index a0b4a93ea449..11a3079ce58f 100644
--- a/sys-auth/consolekit/consolekit-1.1.0-r1.ebuild
+++ b/sys-auth/consolekit/consolekit-1.1.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/${PV}/${MY_P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ppc ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
 IUSE="acl cgroups debug doc kernel_linux pam pm-utils policykit selinux test"
 
 COMMON_DEPEND=">=dev-libs/glib-2.40:2=[dbus]
diff --git a/sys-auth/keystone/ChangeLog b/sys-auth/keystone/ChangeLog
index 768aae0cca49..f5410939bc16 100644
--- a/sys-auth/keystone/ChangeLog
+++ b/sys-auth/keystone/ChangeLog
@@ -441,3 +441,11 @@
 
   Package-Manager: portage-2.3.0
 
+*keystone-10.0.0 (06 Oct 2016)
+
+  06 Oct 2016; Matthew Thode <prometheanfire@gentoo.org>
+  +keystone-10.0.0.ebuild:
+  NEWTON :D
+
+  Package-Manager: portage-2.3.0
+
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index 358b6eaf7711..aeca6b8da138 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -1,11 +1,13 @@
 AUX keystone.confd 124 SHA256 50daa09c5922190a6663e36a32e9b6e5c512672e5be776fcc9b0805da40b6e8d SHA512 1cf50ddcd55421481f8b34f91f35787299b2f9044bcc0a63c70ffff372d740cb84c399d31e52d708fdacad3455d77867d02b438ec2fb39b35ac2e106a2c9e0ad WHIRLPOOL e6c2b76131846cd0ce86e8d766d3f5bbd0d8cd0643de9100d7946afa44c3f13500719feca3ee4ea49644f6881fa34bdc17c08d65a001841ae8f40fc820d334fc
 AUX keystone.initd 561 SHA256 fd10b6da5f203aff2abea3e637c1251a3eb790cb546b2a6854c10aab68b9f85b SHA512 4ea7340473ea5f6e911bada67a8151ec62f1873d819a5e65151c47bed702373d2441c04ee789d4140abd51875e002208dcc8749c2f23938083043ae28a05c714 WHIRLPOOL 7b5d33442d52aeb5ec2b63b619ebbf298a4addaee9961cbf5944f2b18a5bd59337d1d28b14adb0fa07a322ffafbfa0f798e823e58585aa7dcc009d9369dac4d7
+DIST keystone-10.0.0.tar.gz 1355520 SHA256 5317c7a0c67ec5184e3efabd513ed7bd2eb3a5d537e24d781bc252035f46ae63 SHA512 de71ac4edda12def82885dd3a664d37cf5cd243e917dd5638164e2f331991ba0faae529b136beb4931949edf097441f327aca6238a20b9c6c6497bb66c266857 WHIRLPOOL 03e71774c6b6da9aa660ad6f285fd06b06a437111005ac8da23383abd39476639c660f1052d56536ac30870ed3710908e34bd765e9fefdb82d666bd447b2a288
 DIST keystone-9.1.0.tar.gz 1183959 SHA256 3828f8907d07901a3f0516b9ee99fbd42bd9d293e4fa137d850a46487c76bad3 SHA512 2326d3ef91e614df8c0cfc68c4c4ced5f28a9c2c07e7bf6b7e55078c12d00cbb910bb53e1aee9cfcded70cfd78ab250ae5316bfc40e79609e980f0512f308fc0 WHIRLPOOL 5f6fcdcd5e2bb6dd2f7a0feaf6645f06baa5cdcaa645dc18a6fc95d2eaddcc1d160d4735631c08a90103a392b502344e8d463b917fb78a286ac4dcc806f22029
 DIST keystone-9.2.0.tar.gz 1186091 SHA256 c2131d01a84cb430ab8cd842467a63ea759274935584ca83f7dda2f42ef0cbb0 SHA512 06e66853c7b1067f97b5cd09783a941393ec993a9b1d5c05cf4c4c41c96f4b09b1528dcfab4fa7eb08e2a372599e807fd8ac77b4e01fb1434c1e905a2c33a6c2 WHIRLPOOL d1936743cf992b086a6c5c707d2ec69c284d2b55e10f5826599f765a98dc9713f5aa6f61ecc7d63c8bf66452aff04bf316e0181e4791f74e7ef8e5029712d783
+EBUILD keystone-10.0.0.ebuild 5784 SHA256 43be80057fdba8ca54a296076e09ff2f6550e7578e2766f3efad4cb54567c7a2 SHA512 615d76bc6e071abf709709fa1bf5dd2e45b65406fcef216db60d07d883c36db00a1fcd20c495460a412b5d0242a9edeb3c4e51d09826548a95abbc7bd3555ceb WHIRLPOOL 69751242070eb71d9309936fa8c4ca7caf45c664640a6aed56e5190f0eb4bbf1fe3faa0071106ae9ca6bc980cb3df667dd55e294aacae6ea211bfc5a47eff4bb
 EBUILD keystone-2016.1.9999.ebuild 5879 SHA256 96ec4d615eb559ee8ba1ba519ced61295b71dc4674511d0aee750ff99b8a2192 SHA512 f1c33b7336a8bc8459791609dbd75aec994a8e053d68e9c8c2ac53f28bfa71eb2f8ec20fee28829b8c1e0143d30d1fd31ca28e8f2b652edebadbc354c2e2f638 WHIRLPOOL c9e17c1ad6b795f47fb9e57c5286ecd3c3a5256db1bd5bc35b54473328f4641c896d2d04b1f0443eb8954871a3a5cafd34b7e9ce6dd2414309a1a918c84fea47
 EBUILD keystone-2016.2.9999.ebuild 5800 SHA256 aeca79fbf9f9090006cface98b78ad69909e07b6d7a05a491befa4be0058235b SHA512 076256e5d9bb4d05ad1e30ae318f1aba5d404e5aa84c2ff3a470b0584d091da29ec02ba77e8a852af4e0f4699283c35a2a3b595dd0d8f92a03dc3886a4963c96 WHIRLPOOL fbfd7aeadbfbe3b29302df9787c9faaf9310d68f650ba79685c9b571d5bfd974bca70632824f452d15caeeb3592c1ab03f0e405d0096fef969c3b7a1a357c953
 EBUILD keystone-9.1.0.ebuild 5861 SHA256 e25da117544c63320889b7e7eaee5a31b1c83f2d1819d6f9b7b345358f6654bb SHA512 f55438ac7e0eb04615285522092a4d7384bae90024f66722d11e171a0ef7b19de0a5c33445e18a863985b51190e9838098ba6442fb0443c87c62dbc16246292c WHIRLPOOL d5ec6fd7c73c10180c7c571b6bdbe3dd5e14c68774466460deeece8bafabb0fc536c25b826defd70b46c987cf7a54196eccafa5e5bca9c6d63409a4fe7195be7
 EBUILD keystone-9.2.0.ebuild 5863 SHA256 e48fdbbab5e301e03b22d163fccbd0acd92abac7c9697c4db75e2675bc40a363 SHA512 cb6aeadda2c1de5240fdc423da4178846261ba18039a84fb6de02bba37c9577dd28a75085966c59581725f8063371eed8d2c998316d7ab89cb05da90666efb96 WHIRLPOOL 224cd69a66c3108b7aa6fa1769aa6a7af947930461c7e2ca26f9b1abfb1272c0b92f2d00a1fe3183f8e6f207c64e92cf348373e009fe8baf90ea4699a69ab9a3
-MISC ChangeLog 13068 SHA256 267140beab05d8e003c9c3daaa6885c0d40bae8866354725ec94c07497d8bf78 SHA512 597f72f2aaea82ca0dcd5ae4c95ebaadd6c93bc692ae16db2b5542c040b4fc71b93b1fa5de94729d49c4b21f9b47e70cd786cb1415f97203443f7e1aa318f2b2 WHIRLPOOL 2fdb414dee2ea6c9e5c4eaceae370f4c669980fbdf3cc137109496c993308ed9bcb7c56a77fd65c54fbabb67a5835458810bcbe14b46bbc4c22126157209d859
+MISC ChangeLog 13231 SHA256 de1bb3e4403e461c35f72a657115a04a38f49678def3e94f44c62d6b60092b22 SHA512 88d7191db2080e39d9674149dca6272665ce029ea39f77804ee121a7ab756edf75ea14b42b017a7430fc66e7cd436493192cf053f640647b6493263880623543 WHIRLPOOL c726812060c3be79c3090b4da23538974939d18ca7cf1952d81b5e65d01f75ea43e024479cf768ba3f1f60f713e7c5ea48d881624778f554fd47f8fbe89099d5
 MISC ChangeLog-2015 20650 SHA256 d48ae7dc48725af18da9d4cd43ba70b1b2f088be6f0fa79c81501a4e91cff168 SHA512 da42f7d98c6e07b9600807b2bc6e341c598ab2a98fd689c29ec58f96e6816fab549ab5ac25c58b4a6f0243b4e3d3b8541caa58ac7fc6532e005f81a1fc0e4a06 WHIRLPOOL 2887330061afad1f3c7fd4ff7ffa7e141001e336eb3d3ae3f9db11785470105abc3afcc0bb3c515ce5000af7d5de7d928c8c05e669d993a3d06f5a9b114217a3
 MISC metadata.xml 806 SHA256 d1db147f9ba0acc083c2244834e09bb06d7e4650e96d37cb6deb890212e21eaa SHA512 1575c2231b568b9faaf52e683bf166877fa2921f29a89635e205e8f589645c7e8526d364906b1976c887dad9b3d64c439b6fafcbfbc0e94426929e1197517392 WHIRLPOOL d44e5d68951248bdcbd939f3774605ba43e585d3be693fef5254c8289cf09ad25517ede836829a05306e73852f8863aff1b01b6fe97d6388abd86cb19554aee1
diff --git a/sys-auth/keystone/keystone-10.0.0.ebuild b/sys-auth/keystone/keystone-10.0.0.ebuild
new file mode 100644
index 000000000000..be2780eaac17
--- /dev/null
+++ b/sys-auth/keystone/keystone-10.0.0.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+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 ~arm64 ~x86"
+IUSE="+sqlite ldap memcached mongo mysql postgres test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	dev-python/paste[${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.3.0[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/passlib-1.6[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/keystonemiddleware-4.1.0[${PYTHON_USEDEP}]
+	!~dev-python/keystonemiddleware-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.10.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-db-4.13.1[${PYTHON_USEDEP}]
+	!~dev-python/oslo-db-4.13.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/oauthlib-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pysaml2-2.4.0[${PYTHON_USEDEP}]
+	<dev-python/pysaml2-4.0.3[${PYTHON_USEDEP}]
+	>=dev-python/dogpile-cache-0.6.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/pycadf-1.1.0[${PYTHON_USEDEP}]
+	!~dev-python/pycadf-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	memcached? (
+		>=dev-python/python-memcached-1.56[${PYTHON_USEDEP}]
+	)
+	mongo? (
+		>=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}]
+		!~dev-python/pymongo-3.1[${PYTHON_USEDEP}]
+	)
+	ldap? (
+		>=dev-python/pyldap-2.4[${PYTHON_USEDEP}]
+		>=dev-python/ldappool-2.0.0[${PYTHON_USEDEP}]
+	)
+	|| (
+		www-servers/uwsgi[python,${PYTHON_USEDEP}]
+		www-apache/mod_wsgi[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${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
+	sed -i 's|/usr/local|/usr|g' httpd/keystone-uwsgi-* || die
+	sed -i 's|python|python27|g' httpd/keystone-uwsgi-* || 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
+
+	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/*
+
+	fowners keystone:keystone /etc/keystone /etc/keystone/httpd /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-cluster/cinder/ChangeLog b/sys-cluster/cinder/ChangeLog
index 621b5512c24b..a7434b84ee5d 100644
--- a/sys-cluster/cinder/ChangeLog
+++ b/sys-cluster/cinder/ChangeLog
@@ -327,3 +327,17 @@
 
   Package-Manager: portage-2.3.0
 
+*cinder-9.0.0 (06 Oct 2016)
+
+  06 Oct 2016; Matthew Thode <prometheanfire@gentoo.org> +cinder-9.0.0.ebuild,
+  cinder-2016.2.9999.ebuild:
+  NEWTON :D
+
+  Package-Manager: portage-2.3.0
+
+  06 Oct 2016; Matthew Thode <prometheanfire@gentoo.org> -files/cinder-confd,
+  -files/cinder-init, -files/cinder-sudoers:
+  cleanup
+
+  Package-Manager: portage-2.3.0
+
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index 976853305dfb..0e75663106c2 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1,6 +1,3 @@
-AUX cinder-confd 75 SHA256 178148ecb30d9d1a03e4f5210dfa235be3028dc2af7d6f7a4c2e4d0ef190f0f3 SHA512 4dd3db170c1234906fa679ec6684cde16a6bdad4ac90d6a9c00bc0c4afc7ee40ebcebdc7071ad0a34f8eb5bd9c0ab32c6f8fc40624b6c575c4fbb58dad1c91e3 WHIRLPOOL 3f32cbe4f4935a5c5c34de77d638b4cbc10a7a75ba230be5be75af85b12179741bb970603252ec74f098319dffce6eef7e5f0c9bfa34a5b84119fb7642f22d22
-AUX cinder-init 1437 SHA256 f6741f433d118bb18d94bb69f459e98213fea14b885ac08c1aef682aedf73283 SHA512 7b9ed3839e41f38667f457546546cdad94a41067ea0aafa92520c8ad46d0fd4ab4a142ec1b35adc503cedaa8102ff7b6b74d0ecfd2c69dca89f7445cb020ccd3 WHIRLPOOL 57854b5d43694d1001adac56ca94bc55ae014fed253ef8dd8cb960072b9bd1638ee91f4660915c404d6befa5ec76580705bc8cd0f00cf9496fdbe159608302d0
-AUX cinder-sudoers 86 SHA256 a2c2b8f50b21deaceaa2184c00725492cd96db44736cb3fe4bf4aaecc0805b6f SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1 WHIRLPOOL 52642c53b34b089fb9c82c1307c02cd611ea834492a2919a12902bc974a146348a3dcde3db6058eb417395acaff8131398e70fbfa74c7325abcd695102f372c3
 AUX cinder.initd 764 SHA256 d119c2190d1c798c35ddda4c07083066c5a6171738932eb75bae9f0bc13298c7 SHA512 0326b3be6e4d7ae14781e58eea525c70f0267cdeae4efad29f60119353a56d4eda92be2948326aad75b0d09aa8e0b52a2c3c57ddb4c32803016b654f89cea64b WHIRLPOOL 9b2e8439b7238b0078575aa42da66424cc6ee0e3eee4df97682274c41e13846e34dad80c7206a97db575db3ac7bed4a3fbbae63ac1e44c4168a2e63972cfd1b3
 AUX cinder.sudoersd 86 SHA256 a2c2b8f50b21deaceaa2184c00725492cd96db44736cb3fe4bf4aaecc0805b6f SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1 WHIRLPOOL 52642c53b34b089fb9c82c1307c02cd611ea834492a2919a12902bc974a146348a3dcde3db6058eb417395acaff8131398e70fbfa74c7325abcd695102f372c3
 AUX etc.liberty/api-httpd.conf 572 SHA256 603324371bf142b586e28b1b552689e18a2abcc70ad3a270410fe7d5948ce2c9 SHA512 47e86f6245c2d241d9573932e26391a455d546f7ef0cd94c608c563ea4be4599711fe783c8735bcd0095ad57a55409ae96dcf938ee95024b2225ab8450cfc5b1 WHIRLPOOL 4d991a109c8c6316c42bf0856bd04fd2113198b2552603bbfe4e56dbc4fa62d2c5c8c5abbb47a4cd3384ea20e679a9dc81c0fe160dba4b97be7b101078eb47a6
@@ -11,6 +8,7 @@ AUX etc.liberty/rootwrap.conf 973 SHA256 f12fde48864a16fa12d93e09878d7f73af484d5
 AUX etc.liberty/rootwrap.d/volume.filters 9478 SHA256 3bcb6b7786c63b41315ebf524b6fc253e4fba572448ce1bc099f35cf3ddefa07 SHA512 ed5f9456eee9c72aa5e72a745f6f4958bade85d34cd7ee6cdf6c082d69a20bf4f9e46e600b3944dcf63cb744d3ffb3c9c4412e50b8762f254d7b59bb561500d5 WHIRLPOOL d7aa8a444d74fabe515948f31007d13d5da0d36002d5f1b01ef2934f6e8664bf9a8c22b265f378e6dcde98dd79e8e5b043c4ebd569abf44e903210df824f9cae
 DIST cinder-8.1.0.tar.gz 3860875 SHA256 f2bd093ee6ed56b10a694e198eb2b3b436340b492d2bb1c6ae85eba5ef1e0326 SHA512 df6be20bfa90c6b1603125986e9b1b90f9f5e86b07a72acf52f53bd68adbc6971b5b9b88b70a312647d8306480ef55eade8cbe747d27646b302f886972631abb WHIRLPOOL 3516447f85bd2cecb907931d0c3eb0c379f2246c97be94b80549d01da68830d82d0dfe5967b153a287e98ee3a833c6d27491f5e3cb21a989bec490117c3b1b75
 DIST cinder-8.1.1.tar.gz 3875392 SHA256 57de9d1410e9e5a0568499e38414241167e4b2b1742aac309844da80efd127e2 SHA512 4dfa5a11b11b684761519b33d1b45f4d65152df96fc9303e92724f88a01bea031e0dd7aaa229d5876641fa4a5089fcd197e52cf01652a89f6027435b038f3560 WHIRLPOOL 9815230914da588529f3f3916ddfdb25025a531015fd78fce635a6e55b6051f2a26f2e4710cd980daceb905f41caaceb274f84c34353bbc363a36e12a88c8245
+DIST cinder-9.0.0.tar.gz 4183579 SHA256 19c08dfd3bd87d5c0568977a6114a5f6ff58313d9881f5c786181d75abec305d SHA512 30e9cae3557ecb22f2a99a7129135ac524dd6fb816fdbd6ccb2d865e18a7ebdc766e55299daf5494c43500cc1802da57f267c57182af4a152db0e73ec116a949 WHIRLPOOL e5416dbfaf14e4e4741570790456fc000a490d8614ecb0f10df9f96204ea55c31e2dbeaceca00ed74a0e0d22522ed5d3e441cec16898524eefc45ced1acfa039
 DIST mitaka-cinder-api-paste.ini 2416 SHA256 3794a5e34dace60474274e93a7346662eb03a485d1b9b67afded591e764aba9d SHA512 f6e3800557fa7efb562a69f80eea9b516c0ad2e54b9a013c92118bf91daaf2bdd2a9ced309626fab13fe9b979f0c768ac22bba63c7fa8aa3443004d50359d844 WHIRLPOOL 90e8c7bf065609e6a85d247c15b1022ea51bb94b000841c30a69d99c96082a08125fca58cf5b216990c6b746f52af5cedebbafc5b9450a91c0d32cdc21951952
 DIST mitaka-cinder-policy.json 4959 SHA256 5a9cd9d5d4cf80a9271fd7a5146d6d5415d10f8d699a8499a39a3cde29f50bd6 SHA512 b36daa51ab7719e1a56ca760e7ec62a98fb3a88ffed96196852023abf4ffe483200c9dcb934e3c7910fc6988f9c2bb9bb914121d0d649dc3b01466f467a82fe2 WHIRLPOOL f288b6dba2593fa6deb8ad94862948899ec10f71e4751f108ec1fbfff814c3206b5c541aaac0bb7edd2fb5311639a1cd3a44586855912cb2e0e675d5ad78161c
 DIST mitaka-cinder-volume.filters 9819 SHA256 20e4833aaf18b6be247e8ea2a0f63cc509ed595ea799c3ccfbcc1d0afc5bf9d8 SHA512 7b7aacdd843b960ed075b466e0bd7d2973a7733e7db63b4cb02df4b824a9528f6b7074870bf0048674e600bed983bc66caa1914963fff4aed00e8ab40e2ef600 WHIRLPOOL 32fb88041b8f38c821896d82139ea712ea0fc0a71bd6154e31887e85baf58d80b2c8bfd6c60b21613e522fe32fb022078091fcdc74110e5c9968826ae218c085
@@ -19,9 +17,10 @@ DIST newton-cinder-policy.json 6412 SHA256 3a140134201452c52a97eae9f4c45ea30a3a2
 DIST newton-cinder-volume.filters 11025 SHA256 c36bdb9abb4d97350db9971dae1c44a713911920362a0c6c5bc3cfe2701dd4f6 SHA512 311a636180a18bb45867d55f9d33f1eff053cc7b278b41149c58a14450ff8e6d2016d749cc3fb81d1976c4ab78f7701a908bd9c81eb6e9da31c20820a4eaff3d WHIRLPOOL 7496fffec8e42eb1c3bea39563cef8d48cb607b7de1ba8a4ac9a831b6def3dcbcfdf7d485aa81f52aa9bdf7600a51ba07ff85fbf88c5c70091ad88f8c01ca37e
 DIST newton-cinder.conf.sample 50793 SHA256 5179c86590fb5c9477ec838f1ccb8cd9c481e8c31384eb7a012f296c68e0ddc1 SHA512 bf3b5fa262d7df57ca8a496724df449eb6c49ea951c1384b216af334db7cb948af5f7a5f24ddcebd4c80cca40da65e8aaa3a65f09ae2e184794ec1bf9bf466db WHIRLPOOL 7798325f7da5e236d49c8aec4218ef1e50e8e1bf8466f5fdb7b51844c5e6059868c9e4286afecefa637acd0e1df5315de2ac787947a31f4c51978529a54e1862
 EBUILD cinder-2016.1.9999.ebuild 6929 SHA256 37a9c88aeef888b54047d24818a9cd7e43cc86f60fefab3d463e4edca5b69997 SHA512 6d273241bb3d740d50620cde20dc0974b30ff914a64a649096a912208c7cce1f4739c1c0a31d57a754f9ea817d928fc8288f3fcca34bac4e3dbfd95251312aff WHIRLPOOL 2db4137e3719d091d0778fecca77f49861e6584000aa1eafb4c1f66a6c675fd2f1f1ea120f4b5e85bc1023d4f3daeb18943b022d3430f8f85a6cfddf6dfdffff
-EBUILD cinder-2016.2.9999.ebuild 7206 SHA256 8b1a40cf36196660491f9063ec4e2182b4369de63022cdc7adfb95bdc0af80f4 SHA512 f415ed3bb27f64e877feb91ea05d2c11053ecff648121945ca8133b2124104bac22d71afd1d96dc41b9a00c5afef833c0f824e4c8675244c75ee68d95e861943 WHIRLPOOL f4fe99dd6d2414f55d9e4c3ce35838e63284ffe3034b9e636b9ede13f94e47d00e5e5c31c8a1ca771cf817f45a5dc34e7a298a1850bd5bf5c11a10dfa381dca9
+EBUILD cinder-2016.2.9999.ebuild 7132 SHA256 d705c53f9c44fc921e659cdd0fe15359e09a486fc55930db5105b5f60191f22e SHA512 4aeb713b13d3f3e25f7f63ee3e074fa5dc131b3c19b66e541b044474775ec9b12aa918f848d502366e934f9a43711cefb3977c8efd485af18b8673590bb6aa19 WHIRLPOOL 468c7bba52557f8a598e681f346ace0d0eb1b6f5f515718d2216db9ca78cdccf6e4aaf0a3a8e73d3bf3b41c817db9815b6352ec9eab9de9c6ebdac77ebdd467b
 EBUILD cinder-8.1.0.ebuild 6872 SHA256 4efa08e0a860dc9c5e4b986e7a7ec4705964b53310223046071cbccc2292546a SHA512 6b4e4de5dc42b4e30679c22de5e30dac9cae2bdeda82a1791a1b6e3a22d600167f66fb7b5ebe8492d03c879d8f29818248dd453fc38d2ffc2b0745a6d9f2f061 WHIRLPOOL 8c243defb6b763d8ea2c1d90b51025d5590b60cddc1eb24a7d87182ec681dc8b698f8b76a198e0e7079dd030468fe3abecf6c0d18209f32fe8f6f00910fedf51
 EBUILD cinder-8.1.1.ebuild 6874 SHA256 d481e6081fd688ece0ccac110d63b385db36c1cef72ae4e0ef124ef348a04b28 SHA512 d945dac33bab269fa59d29f7087d18fd58706cf2b8fe110c341639cf8b1bdd1a28b5825c9bdff8df7a734a451d36b157298ca373e9dd3bd33e5f9086731c23c7 WHIRLPOOL e54a0ee473100ec6ac5ef532db5b10df1302138404461e5ada850716a2db88c73daeedba89a336e61cedecde09406b77f007fb7e584297eef3848dd762cd1b24
-MISC ChangeLog 10054 SHA256 9318b329d372bd945e37a297dd333535fc6b9037d19b234bb7283626e5b967f3 SHA512 86a73c3748bc277781c1f717fc9c48abe2bdbb6ba09ab961202e73a1314494a302427d60e48e78b5bde673edcabb8527d6be754026ea3d7856249820540401db WHIRLPOOL a72072926eb0acc3aec90f1e4c1d7e7b4bc7dd15d9bd47fc0f73480bb33987b03c87e5168d06ef95c8dbb3af1d0e70d0578a7b1568054931a93a1ebdb88512cc
+EBUILD cinder-9.0.0.ebuild 7108 SHA256 72c52471c6e9c55c923ffcea3a9b205204fe753a06e4dc5c99066dd1f5f74530 SHA512 410e09c779b5685afe5695a371e5a5b92d207160e8fd4aba78b39446f71dc6f147a64c66dbbc7b25b3e5d424ba5f9dfb6678a8396f6528230ebec3dbe6d619ec WHIRLPOOL b8d79f1ee9ca3cb90445513cf4ec4e416aa078b057378110d04993ec840da13621c53a67a96024e56424f8bba3f539992c3247fa4ecff6816159226fb931db5b
+MISC ChangeLog 10406 SHA256 f946ed786ad04ed1383c6fdcc0e6faa8ac9b1bacbe13ff4804b039b1d581a0d6 SHA512 d8bbaa05f2cef36ad58f1efb490e2b89c79edebf67aa04c17c1e6d1a23b420b9bc9ce18e4f95e813476371a0bf9b440f73b9b202dfacd3ea3efc21e82c1d8014 WHIRLPOOL 72bf8d023410346a578164446c980bf35033de8bbd454e2a35cf2b5b4f0490bba48ee3275be091d636dc5990a35ff98d2499ee4a3b71b42a9a0fce4ab8dfdb69
 MISC ChangeLog-2015 11216 SHA256 6c55aa9191bee1734ca15844357c93fcaed07adcc3a4a4e7e1f3a9eaaa3f1e09 SHA512 ae7725963e418dfed8c911f56904ba0f758946549d60cfcf6931772aba447b891eb5a49a185ebdd0b06f9f4ff9f5f903368490b696c0e6301ec7ca06ba18808c WHIRLPOOL d6e9ec33deda3abe0e371728dc7d281b39f559604c677ca0b0f500f5bd22ced2e815465646ef54e9856f774ff3faa387190bc3b3061c200d1b59a2f4ac9ebd64
 MISC metadata.xml 1296 SHA256 45bd365dc173fa9c92dbcd6a5685035fe48f8567b29153d22e5598d5e36accf1 SHA512 a71fa36ebcc3ecae82bfd026b8129a5268c1dbc5a7af8a8ad4c2eebdeafc0ba60a581992009a83b7e4e34db7a6a2d268710e6812f6875182f5fccb474b7deef7 WHIRLPOOL d1ae8d7bf66bc7a5bb73193a1e140f84e0eda181dcb4380953f901f23845d0cd11319ae79007588fb440b7e02ac4d29028cc42b732ea217bfe51c00e33f4a9a3
diff --git a/sys-cluster/cinder/cinder-2016.2.9999.ebuild b/sys-cluster/cinder/cinder-2016.2.9999.ebuild
index 60d342ed4749..39ffd3083c53 100644
--- a/sys-cluster/cinder/cinder-2016.2.9999.ebuild
+++ b/sys-cluster/cinder/cinder-2016.2.9999.ebuild
@@ -18,8 +18,8 @@ EGIT_BRANCH="stable/newton"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE="+api +scheduler +volume infiniband iscsi lio lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
-REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( || ( tgt lio ) ) infiniband? ( rdma )"
+IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
+REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
 
 CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
@@ -113,10 +113,6 @@ RDEPEND="
 	>=dev-python/castellan-0.4.0[${PYTHON_USEDEP}]
 	iscsi? (
 		tgt? ( sys-block/tgt )
-		lio? (
-			sys-block/targetcli
-			sys-block/lio-utils
-		)
 		sys-block/open-iscsi
 	)
 	lvm? ( sys-fs/lvm2 )
diff --git a/sys-cluster/cinder/cinder-9.0.0.ebuild b/sys-cluster/cinder/cinder-9.0.0.ebuild
new file mode 100644
index 000000000000..1bfce45272da
--- /dev/null
+++ b/sys-cluster/cinder/cinder-9.0.0.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 eutils linux-info user
+
+DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
+HOMEPAGE="https://launchpad.net/cinder"
+SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/newton/cinder.conf.sample -> newton-cinder.conf.sample
+https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/newton/policy.json -> newton-cinder-policy.json
+https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/newton/volume.filters -> newton-cinder-volume.filters
+https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
+REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	dev-python/enum34[$(python_gen_usedep 'python2_7')]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	virtual/python-ipaddress[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/keystonemiddleware-4.1.0[${PYTHON_USEDEP}]
+	!~dev-python/keystonemiddleware-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.13.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.13.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.13.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.3.0[${PYTHON_USEDEP}]
+	!~dev-python/python-glanceclient-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-2.29.0[${PYTHON_USEDEP}]
+	!~dev-python/python-novaclient-2.33.0[${PYTHON_USEDEP}]
+	>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${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.3[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-1.26.0[${PYTHON_USEDEP}]
+	>=dev-python/rtslib-fb-2.1.41[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
+	~dev-python/suds-0.6[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-vmware-2.11.0[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-1.6.1[${PYTHON_USEDEP}]
+	>=dev-python/os-win-0.2.3[${PYTHON_USEDEP}]
+	>=dev-python/tooz-1.28.0[${PYTHON_USEDEP}]
+	>=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.4.0[${PYTHON_USEDEP}]
+	iscsi? (
+		tgt? ( sys-block/tgt )
+		sys-block/open-iscsi
+	)
+	lvm? ( sys-fs/lvm2 )
+	memcached? ( net-misc/memcached )
+	app-emulation/qemu
+	sys-fs/sysfsutils"
+# qemu is needed for image conversion
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES=""
+	if use tcp; then
+		CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP "
+	fi
+	if use rdma; then
+		CONFIG_CHECK_MODULES+="INFINIBAND_ISER "
+	fi
+	if use infiniband; then
+		CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS"
+	fi
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
+		done
+	fi
+	enewgroup cinder
+	enewuser cinder -1 -1 /var/lib/cinder cinder
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
+	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
+}
+
+python_install() {
+	distutils-r1_python_install
+	keepdir /etc/cinder
+	dodir /etc/cinder/rootwrap.d
+
+	for svc in api scheduler volume; do
+		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
+	done
+
+	insinto /etc/cinder
+	insopts -m0640 -o cinder -g cinder
+	doins "etc/cinder/api-httpd.conf"
+	doins "etc/cinder/logging_sample.conf"
+	doins "etc/cinder/rootwrap.conf"
+	doins "etc/cinder/api-paste.ini"
+	newins "${DISTDIR}/newton-cinder-policy.json" "policy.json"
+	newins "${DISTDIR}/newton-cinder.conf.sample" "cinder.conf.sample"
+	insinto /etc/cinder/rootwrap.d
+	newins "${DISTDIR}/newton-cinder-volume.filters" "volume.filters"
+
+	dodir /var/log/cinder
+	fowners cinder:cinder /var/log/cinder
+
+	#add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	insopts -m 0440 -o root -g root
+	newins "${FILESDIR}/cinder.sudoersd" cinder
+}
+
+pkg_postinst() {
+	if use iscsi ; then
+		elog "Cinder needs tgtd to be installed and running to work with iscsi"
+		elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
+	fi
+}
diff --git a/sys-cluster/cinder/files/cinder-confd b/sys-cluster/cinder/files/cinder-confd
deleted file mode 100644
index d09928c17c9c..000000000000
--- a/sys-cluster/cinder/files/cinder-confd
+++ /dev/null
@@ -1,3 +0,0 @@
-#Don't touch this unless you know what you are doing
-PID_PATH=/run/cinder
-
diff --git a/sys-cluster/cinder/files/cinder-init b/sys-cluster/cinder/files/cinder-init
deleted file mode 100644
index 6747d1258ed0..000000000000
--- a/sys-cluster/cinder/files/cinder-init
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-BASENAME=$(echo $SVCNAME | cut -d '-' -f 1)
-SERVERNAME=$(echo $SVCNAME | cut -d '-' -f 2)
-
-depend() {
-    need net 
-}
-
-checkconfig() {
-    if [ ! -r /etc/conf.d/$BASENAME ]; then
-        eerror "No cinder conf.d file found: /etc/conf.d/$BASENAME)"
-        return 1
-    fi
-    return 0
-}
-
-start() {
-    checkconfig || return $?
-    . /etc/conf.d/$BASENAME
-    
-    ebegin "Starting ${SVCNAME}"
-        if [ ! -d ${PID_PATH} ]; then
-                mkdir ${PID_PATH}
-        chown cinder:root ${PID_PATH}
-        fi
-
-    start-stop-daemon --start \
-              --quiet \
-              --user cinder \
-              --pidfile "${PID_PATH}/${SVCNAME}.pid" \
-              --make-pidfile \
-              --background \
-              --exec /usr/bin/cinder-${SERVERNAME} --  --config-file /etc/cinder/cinder.conf --log-file /var/log/cinder/cinder-${SERVERNAME}
-    
-    eend $? "Failed to start ${SVCNAME}"
-}
-
-stop() {
-    checkconfig || return $?
-    . /etc/conf.d/$BASENAME
-    
-    ebegin "Stopping ${SVCNAME}"
-    
-    start-stop-daemon --stop \
-              --quiet \
-              --user cinder \
-              --pidfile "${PID_PATH}/${SVCNAME}.pid" \
-              --exec /usr/bin/cinder-${SERVERNAME} --  --config-file /etc/cinder/cinder.conf
-
-    eend $? "Failed to stop ${SVCNAME}"
-}
-
-#restart() {
-#
-#}
diff --git a/sys-cluster/cinder/files/cinder-sudoers b/sys-cluster/cinder/files/cinder-sudoers
deleted file mode 100644
index f44bab4a5778..000000000000
--- a/sys-cluster/cinder/files/cinder-sudoers
+++ /dev/null
@@ -1,4 +0,0 @@
-Defaults:cinder !requiretty
-
-cinder ALL = (root) NOPASSWD: /usr/bin/cinder-rootwrap 
-
diff --git a/sys-cluster/heat/ChangeLog b/sys-cluster/heat/ChangeLog
index 890379f4bae9..82509fd9bd96 100644
--- a/sys-cluster/heat/ChangeLog
+++ b/sys-cluster/heat/ChangeLog
@@ -10,3 +10,10 @@
 
   Package-Manager: portage-2.3.0
 
+*heat-7.0.0 (06 Oct 2016)
+
+  06 Oct 2016; Matthew Thode <prometheanfire@gentoo.org> +heat-7.0.0.ebuild:
+  NEWTON :D
+
+  Package-Manager: portage-2.3.0
+
diff --git a/sys-cluster/heat/Manifest b/sys-cluster/heat/Manifest
index 4e36ab9fd4b6..64a586c27fa6 100644
--- a/sys-cluster/heat/Manifest
+++ b/sys-cluster/heat/Manifest
@@ -1,5 +1,7 @@
 AUX heat.initd 1366 SHA256 301fc987baa93f25195b174ee4b1b25c8bcf53fe91e69706ae050a9c8ee2223c SHA512 2310ece290dd900b0cb6a966349f9bda0300bfa9341f0ec6d761fb1af96e8b39a133f20e2eefe7124c9f0189eada600dd542a3ada14e2e61e47dc077fb23fa40 WHIRLPOOL 8f539dcb52226f4ca91bb2862e3020624c18c55ffeaad640252ce5eb4d0e39a17bd9d7dbc973df4ed57523796fb3759ce7b2ab648e09f47c364464651d063f2a
 AUX newton-heat.conf.sample 44580 SHA256 a14fcca8e128e588077fdcafbf991a383ac926bf621273a5925055a7faaebd33 SHA512 e96aad96d7b93c704ab03b7f9e6edb9ea20f6854f6d3fb79fe2bba800e7fc320e20cb1adec5d4b5f499dcb9f7dd786e54eae62670af43f4fc5681f3e6ce6fcf4 WHIRLPOOL 411b5963ff433eab8d572b44b39a98defc23a411e24169030a22b27e70d9957185d448e2d07caabe132dc71b3f95fddd4f4569e25d462faea1b749b5327bc96d
+DIST heat-7.0.0.tar.gz 2269393 SHA256 16db746d540cee87170ec1fa6fdca945b6d2ead91b39e59f4d2d4a4c1d69e2db SHA512 23026d56e871bb8d86b0020678c4a0233ec63d4b16d338e089f4e594f1814d8581c5c46f3035993934711e34beccc18acb350e85e98675f52aba6e194f3de3fc WHIRLPOOL 08c87c89597c3f92ccc8cb96888f53b27ac44a46b245ab5b993c96b34446330df76dc098f26ab5dcd2d46970052315ead7b93ad3a44855a4f17f46d694a624d8
 EBUILD heat-2016.2.9999.ebuild 5719 SHA256 740166d49cf7f0c269748141adceb629084e7350244b70ad3e17d1228d513e9b SHA512 2f0142e2c3734ced27f6a47ff68fe22f8c8945ea206170482f7290fbb98f2a4690172d1559560d4d08dd7fae0acfd71848a945af33e7f0992270c77b66bd4f56 WHIRLPOOL 743deff8acf5cf810c572a6e1ce9196e36fc38f8384e1dc6fc042266ac00059fd96e4f2c81e5400d00d77ec9a524a89a2d070f1c0e44c4038b886f6d723c8361
-MISC ChangeLog 372 SHA256 a0d2fb3629f3a8d3669417d760d9a75cb8448634d4233f31f63c98e342e361af SHA512 bfe55f2b6457b516c4153483830dbed947ad7a08277cab94549bf3493803d560aaa872e917420716fb8f67b43d47240c43cf7e2e082c2990ad12d16feabf72f8 WHIRLPOOL a0709b2c38edbb300df8437cf9221deee2254fa7178e4fde11b359f854adf08b95e1c2362e2061fe8cdbe4e7facd9601b4d6abd960a6f034860bdc2ff33e549a
+EBUILD heat-7.0.0.ebuild 5696 SHA256 c963989df36b2f17ea8bb3329743795c3151ee8b82513d8bdf9cd7f08c02b3ef SHA512 152e94d664eb432ba07fd283ca37cf8b2259c7388be9c76ff95899c7f69e94e76d839e773c9a38553c6ee55191d6f062209461292efa403312ec2f92719456ba WHIRLPOOL fd6d089076e0d4cfce87b4498b50b52a08be149f0984d25b3509add6b1af59dd29d697bc25bbd76203c7b2f7696f6b3dd1482fa11ef32b2f8fb40c87990c4000
+MISC ChangeLog 523 SHA256 6c148c1dc54da3bcfd9a5dfbff6e64237c09fa31334040f1f7b27ebae8a4cd98 SHA512 5cd533ac9d57b41a773a4d5df2cdeec4f6f0c3589f1e5240ff5168410c30d2becaf2893d131e4d26f7f8d3ce3a341da4223839151c98970e6175ad16555ca901 WHIRLPOOL 56ede8eef52cd07eeba39b1b718e62839be7b8f6c0903743ecfac009976cae37b2ce01473a651749285523be6c89e86928d3f2feb32a3cb50e142c180c62a706
 MISC metadata.xml 647 SHA256 94d24f5e04810c279c3ffe98ac3345e4b4d8503bfad456f45b091ef7c865abf3 SHA512 3a535007ac0bd968b88d3fee7695ed9186c537c8d9267eea944c6be1da27264e9e30eeb520e83904ec5c3d52f87dea8ccd28dc4578a3b3501511554ece9f12ef WHIRLPOOL b7dd05b1790183b5babb8c01971542643ff26ea6e9b4b5da1f03840fd0a205f707fc3db26177418234fb136c55512651bea94823ccec0478b27fe1ff80a77bd8
diff --git a/sys-cluster/heat/heat-7.0.0.ebuild b/sys-cluster/heat/heat-7.0.0.ebuild
new file mode 100644
index 000000000000..9fccc6028312
--- /dev/null
+++ b/sys-cluster/heat/heat-7.0.0.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 eutils user
+
+DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchistration engine."
+HOMEPAGE="https://launchpad.net/heat"
+SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+mysql +memcached postgres sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+CDEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/croniter-0.3.4[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.0.0[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/keystonemiddleware-4.1.0[${PYTHON_USEDEP}]
+	!~dev-python/keystonemiddleware-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.13.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.13.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.13.0[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+	>=dev-python/aodhclient-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-ceilometerclient-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/python-cinderclient-1.6.0[${PYTHON_USEDEP}]
+	!~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}]
+	!~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.3.0[${PYTHON_USEDEP}]
+	!~dev-python/python-glanceclient-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/python-heatclient-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/python-keystoneclient-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-magnumclient-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-manilaclient-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/python-mistralclient-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/python-monascaclient-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-2.29.0[${PYTHON_USEDEP}]
+	!~dev-python/python-novaclient-2.33.0[${PYTHON_USEDEP}]
+	>=dev-python/python-openstackclient-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-senlinclient-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-troveclient-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-zaqarclient-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${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.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
+
+	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
+	>=dev-python/yaql-1.1.0[${PYTHON_USEDEP}]"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+	enewgroup heat
+	enewuser heat -1 -1 /var/lib/heat heat
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install
+	keepdir /etc/heat
+	dodir /etc/heat/environment.d
+	dodir /etc/heat/templates
+
+	for svc in api api-cfn engine; do
+		newinitd "${FILESDIR}/heat.initd" heat-${svc}
+	done
+
+	insinto /etc/heat
+	insopts -m0640 -o heat -g heat
+	newins "${FILESDIR}/newton-heat.conf.sample" "heat.conf.sample"
+	doins "etc/heat/api-paste.ini"
+	doins "etc/heat/policy.json"
+	insinto /etc/heat/templates
+	doins "etc/heat/templates/"*
+	insinto /etc/heat/environment.d
+	doins "etc/heat/environment.d/default.yaml"
+
+	dodir /var/log/heat
+	fowners heat:heat /var/log/heat
+}
diff --git a/sys-cluster/neutron/ChangeLog b/sys-cluster/neutron/ChangeLog
index 83edf173e74f..1de89cde6b46 100644
--- a/sys-cluster/neutron/ChangeLog
+++ b/sys-cluster/neutron/ChangeLog
@@ -431,3 +431,21 @@
 
   Package-Manager: portage-2.3.0
 
+*neutron-9.0.0 (06 Oct 2016)
+
+  06 Oct 2016; Matthew Thode <prometheanfire@gentoo.org>
+  +neutron-9.0.0.ebuild:
+  NEWTON :D
+
+  Package-Manager: portage-2.3.0
+
+  06 Oct 2016; Matthew Thode <prometheanfire@gentoo.org>
+  files/neutron-linuxbridge-agent.confd,
+  -files/neutron-linuxbridge-agent.confd.liberty,
+  -files/neutron-ovs-cleanup.confd, neutron-8.2.0.ebuild,
+  neutron-9.0.0.ebuild, neutron-2016.1.9999.ebuild,
+  neutron-2016.2.9999.ebuild:
+  cleanup
+
+  Package-Manager: portage-2.3.0
+
diff --git a/sys-cluster/neutron/Manifest b/sys-cluster/neutron/Manifest
index 95798be2a739..ebfc29cf2272 100644
--- a/sys-cluster/neutron/Manifest
+++ b/sys-cluster/neutron/Manifest
@@ -1,23 +1,25 @@
 AUX neutron-dhcp-agent.confd 75 SHA256 e36fe3d370ad2b4c82ccf1f4caac60882334d93e3abd7e0e6e268d23cb069d71 SHA512 94cf300c9a9d0275e4fcab4ffdb7e29ca26b73c120d6ff683b48ea0e9c21e46123289522aedd295e4d5d28307133b50084541a90a48db456802d675eed6c2d3e WHIRLPOOL 9e77fe1ef65fa8ef46f8272ddea7213a46e71c6f2884eab20f09eaddc977f5cc202c8529c1a75347132c667e4e2d39d5bdd3ab2c94812c4b1f95f398af75c38c
 AUX neutron-l3-agent.confd 73 SHA256 560997f3e40d90ef885483e4bd02728bf88720378238fc5e6b3b2abb2ba9dd0e SHA512 4a902c5621abc124424bdad97de8959f63f7c846b4c7b9b3ccaab5522ff3e6938acf748df269980484228d4fc13d2f1e3e3670619207e3c88ea5dd5373699e0a WHIRLPOOL 653156dbbff34606fa0694bab622eb40c2ead171b1ad0a0c934285a50f15db4d8927e40ebff8d2ffe64078a8a079d48a2834e68b049c11a68417dc3945374cb8
-AUX neutron-linuxbridge-agent.confd 140 SHA256 1eff0c9c6adb37abf3064a8d035a9d8042bc1151106ed790397d1cca1463c718 SHA512 f49db80c48488b86eb55077fae61202bbe29eaef0f2fa212c44c9b42f41c5f3cc31bdd48c9c405c0e0c51e7d7c3910169a6cc08e36a2be98f9d032b3a11a0a5a WHIRLPOOL 9b9f8932e7a72cdfd241d86b0063d660499c52de62ca6cda09ed6a74649587ef674fca72a0b80f82141e8d0db6fe3c3cf6c28739775230ae7bdf83afcd1fa694
-AUX neutron-linuxbridge-agent.confd.liberty 133 SHA256 6ab45c510081a0cb25a42bbae3e4b326e3332efedf1bd6b95edf0c7f6b5b54c5 SHA512 d87a21d307dbfcdadaf9655b194a9646dad26a3b138bb02977dcb372cf0a7585ca69fa4bd7085e63b4119daa25f5db314ac4d62839a4d7d106a85a795ac3d1d4 WHIRLPOOL f24a3b450ee92678ee170af2f08e444fd968dfe64322fa27922e9156d3a1c4e2ce173dd334fbde739b56831d77f7fc6535eea4ed348ad9b2b4e341017ca432b5
+AUX neutron-linuxbridge-agent.confd 133 SHA256 6ab45c510081a0cb25a42bbae3e4b326e3332efedf1bd6b95edf0c7f6b5b54c5 SHA512 d87a21d307dbfcdadaf9655b194a9646dad26a3b138bb02977dcb372cf0a7585ca69fa4bd7085e63b4119daa25f5db314ac4d62839a4d7d106a85a795ac3d1d4 WHIRLPOOL f24a3b450ee92678ee170af2f08e444fd968dfe64322fa27922e9156d3a1c4e2ce173dd334fbde739b56831d77f7fc6535eea4ed348ad9b2b4e341017ca432b5
 AUX neutron-metadata-agent.confd 79 SHA256 6888df2f0bf5332d880ceb5a1076816ee605d30b70879d9972b0c9504399edea SHA512 a7a4af56141f1528f7f9ca222f88d400f7a5f6cba392a603121974f6429ecdb925996b1bd6631b589df70464f910deed688e287668ccb1d61fe1d6aa641272a1 WHIRLPOOL e7fc657e6fd0dcf99dad0bc5b7747b1521e22ba1eced8ad163151a0e1ec8c6c9b4eb46ed17ce23264c8903c5aeb2455f9c057ad956fa925d6ad131345cb2d772
 AUX neutron-openvswitch-agent.confd 142 SHA256 5b58c86356f0f851d5a838bddffe9d86da4ac8a54198859067684ccf37d13715 SHA512 277bc5fe0a55bfc5e6f95ddabee76340a7725d156ca1100bc0dbc6245929322e537129628b5cef353cfe689d14330a7c8e0cd9aff894f7d0b093d909c83fdd87 WHIRLPOOL 5079aaaf0cf32337acb8c74d7de99520f2bd738a9af61844fb276688e1af1b1bc039b9988384914bd8df7aadb03fff7b5f13e57f542f23e489f7660f1afc8519
-AUX neutron-ovs-cleanup.confd 102 SHA256 a5d5aa7ba2794f593e65c8c87888f29867a817dc169cbae21f06fd6424b5fa87 SHA512 9fb7fc95b1eb00e685e269213bb694019471f9c14074ccac5f55c3969d5ff4d6f98ab3f2ff7e56bd0837a0261ab59b58645e2e7f4caf9ff4ecb52877df816423 WHIRLPOOL aff1c3a5e2b858b598f88699720069031c33305870d2324bc5d059dfc380beae27f5a60278bc5560178596e6a2d22af957205ed75a2df145316d8999cf4b034c
 AUX neutron-server.confd 70 SHA256 40d09a699fc3bced40c5a9dc7394a76c40c245b579fc270909966e11485564d7 SHA512 79f1a40486c37b2c3486b4ef015864f6b20ee89b05d788ce6ade8af934e2c160da9e0495d22e941a717072c1d8ca3b77963a3ec06f3ec25a3f8af8b24a4e40a0 WHIRLPOOL 59f9ac13d58fd76014090988c642d4cb244d51726fb5733cc30e7fbba5c22226ef955f8e8021dad04ab457df0fe5879d13af8c40a6913d03c15bffb48cf4a5ac
 AUX neutron.initd 686 SHA256 fc4e020db87b4376528d35f3f80f62078a5dc0b7e3d9c41d646188f4c3b9fadc SHA512 33effb1479d3a0b13b67d0d78ad8e22dd8a333e761d6e1b54c7dde18b02c46b2e894f6b0386efd45f17c925b6f2c71eca03cf6f137d3346eeb3b9018396e2a5d WHIRLPOOL 8aa64e620ee429fa9c6b11d3c5082eddcbfcd9c7b1438e2867e42c9dc29c5f9b455feb06dd3ce49376c15d879de4ae81287ddde15b7cb6f28cff341467ba5f80
 AUX neutron.sudoersd 117 SHA256 b40ea04a95deedbb66fe504df61b55905cbd746e5ba26321c01cd25b5cc9dcbe SHA512 143f8a1faa7650bc66b2566d0bd62f71eb743231b9efc4c7df265e53d664418b23182e3f271b86845ed76c537b7f60157e87af59413cf659379f367924d14366 WHIRLPOOL bb0e35d7b7471fab424f86f181601bc87d4bba98f4fbc282cc6302a05128992613097afe1fea159e9c718cd688a03c280b53d72bfe47fc91bd24967a4b4618da
 DIST neutron-8.2.0.tar.gz 2820699 SHA256 8d6edde5cacd5f77bf9f95c0ecee8acfcdceafa1ae4a2dd4ad3ea7ad7343811c SHA512 e7ec025678d23a13c7cbefa4a23f0a72afeefb7118f93419b8227d74de38661024d80a5797e0b67a0322dd5118010de3ef8c8a62106ea46cff4579f6f29f0d68 WHIRLPOOL e719d16d690cb6f0e99021854358758a1dc64c50239593785dae3313e1284068ada80566bb6f064666a2b140a64f988194d32d9ed0908575bbae651b5f5db0e5
+DIST neutron-9.0.0.tar.gz 3012055 SHA256 f8f46f9b9ae5a4673e557fa6f48314390ed992fa6c8f53ad890e3004488df8aa SHA512 4c404725e5ecbd6f306923b05276cfde63b2a3a83f972e39fa7e32876ccb9f70d5177717aa077b70daace993b993ca2c0e059ad860b8d5f9bf960e86fbeb999e WHIRLPOOL dde00afa5558a31b18f68f41df8a400114975e35020ba34edea4268c90b0789edcb8d25decd42003d357642827d45dec24aa61a37260301337bf94073e384403
 DIST neutron-configs-2016.1.9999.tar.gz 11523 SHA256 906229c66882eb05d782a749b53b9368df28ae69eb99179cbaed2640996dd227 SHA512 95ff31ce599977b8bbd7f8783ba41c1f760a30721e8a6ea84fc8f0ecfc4f429d624dad29728d5bc026f7d76a4da6e19c0f4718fd1b58b65c50ff0470a3cf8f2d WHIRLPOOL 38868696cb444cd7c4eaaf704bfb8e2efb6486aa67a99951afd43de1a8e8ca7224e8b8592a2c28e09a7a43c1a9cf0ca02e44e05a50cc370bb9dacee873022a6d
 DIST neutron-configs-2016.2.9999.tar.gz 13458 SHA256 111e940f7da24c18673794188f348285997a0e1f250446076700902bab101f71 SHA512 42f9a685f0869c491610c66f5bc5f952b959a0a8514687007814e0ca97e27fb491460bc64eaf8fc47e982c8519b1dc9b5e2b4a3c047535b52521b3325ba38d44 WHIRLPOOL bcceb81f46d69aa02876f2d2a76c642f9b48b472dc3e6217bef48649ecfa64d535c2361d224889f31f21b7fb40bb97930ab93443abe6d9cddfd56f19d84f5601
 DIST neutron-configs-8.2.0.tar.gz 11523 SHA256 906229c66882eb05d782a749b53b9368df28ae69eb99179cbaed2640996dd227 SHA512 95ff31ce599977b8bbd7f8783ba41c1f760a30721e8a6ea84fc8f0ecfc4f429d624dad29728d5bc026f7d76a4da6e19c0f4718fd1b58b65c50ff0470a3cf8f2d WHIRLPOOL 38868696cb444cd7c4eaaf704bfb8e2efb6486aa67a99951afd43de1a8e8ca7224e8b8592a2c28e09a7a43c1a9cf0ca02e44e05a50cc370bb9dacee873022a6d
+DIST neutron-configs-9.0.0.tar.gz 13458 SHA256 111e940f7da24c18673794188f348285997a0e1f250446076700902bab101f71 SHA512 42f9a685f0869c491610c66f5bc5f952b959a0a8514687007814e0ca97e27fb491460bc64eaf8fc47e982c8519b1dc9b5e2b4a3c047535b52521b3325ba38d44 WHIRLPOOL bcceb81f46d69aa02876f2d2a76c642f9b48b472dc3e6217bef48649ecfa64d535c2361d224889f31f21b7fb40bb97930ab93443abe6d9cddfd56f19d84f5601
 DIST neutron-ml2-plugins-2016.1.9999.tar.gz 2031 SHA256 af1f0436924a64d9a07f0770f06d0a2e48457b45389e1ab90e42c7157797557b SHA512 b0c194ad29d7e7a44c04b74a109523044cf268ebd8cb91965759a5cbba7cef47c252f7d0ab49bf888a74b1776891b99402dd54d45fd6099734fa03afd519350d WHIRLPOOL c279518f1868c54409a28dea03f32aa60a413af9dc3ce4387034aaab6387f1c96a937c370bcab3e6e96474a12f19f3794e7b3e0482cb067fb2b060ad09faabad
 DIST neutron-ml2-plugins-2016.2.9999.tar.gz 2073 SHA256 1e12e81673168860a2d7c5172deb00a7301d0a698014113dfcfba74759ba444d SHA512 bcde3a4d5e041c0080503cdf8f60c83e1c09f873010e78f4bc9066f57b17cf69394cf71cedbb8d3819a62d9cfdd545b102f16b53c0e3deb44b1d03136c14d711 WHIRLPOOL 099e19f4ec98fb54187e100af057711db3df3f86ae117a03f38afe37b6c5135666330aeb05867331cc015e8f14bee6e34942d1cb5aec63f92e01e7d6ae69f671
 DIST neutron-ml2-plugins-8.2.0.tar.gz 2031 SHA256 af1f0436924a64d9a07f0770f06d0a2e48457b45389e1ab90e42c7157797557b SHA512 b0c194ad29d7e7a44c04b74a109523044cf268ebd8cb91965759a5cbba7cef47c252f7d0ab49bf888a74b1776891b99402dd54d45fd6099734fa03afd519350d WHIRLPOOL c279518f1868c54409a28dea03f32aa60a413af9dc3ce4387034aaab6387f1c96a937c370bcab3e6e96474a12f19f3794e7b3e0482cb067fb2b060ad09faabad
-EBUILD neutron-2016.1.9999.ebuild 7850 SHA256 49bc1e041d71dbcd78b3d6507b4eedcea4b6d20dd7025c1f23f417f78f61ab93 SHA512 92972ecc0d6a81e9dc6159d0d039716d6b76cdccbb7b4853c2cc8a441431a435c92b63071a07b4ced6589192f3e8ac29bf801398327aaad85c8a3364460f54db WHIRLPOOL acbc829e7d54b4777282e0b4359c8869eb33810b6b10683095833af74296a3cac0239c21a5bcda825e2a966b62c057f03fbbc7f251a86802c5ce90c6e6fa10f0
-EBUILD neutron-2016.2.9999.ebuild 8457 SHA256 0c30dd085becfbf1cebaf79635d7537de9caf497adb13090e237a1d145e63924 SHA512 d7155f8961ef3cafb1f93152b403a8b017c157c463ebbcfedd4dd4b8b0a31cba06012ab09b8602e14cf4ecf6436f5f8786da6d53c93ffec582f3307c3cbc92a5 WHIRLPOOL 795f4ce599519bbfa786f956a91847bebcff6519ab892e84a8384fd78b6cfff0b3955b09b7fe8b760819f07f94d529c3a81930edef858d8b4582fc7c34c23712
-EBUILD neutron-8.2.0.ebuild 7824 SHA256 8547e32a8fee9ac8acf6b76e55b87c97ed1609e7489f4c64a969ede33172a1ff SHA512 83a5389ed247bf400cb9fa16a9b311b95ee433548f53f89f967f5e29b8aa012dd448a83f6a24125f33054c448f9d13dde15c40ba5acafcd955ea434936398458 WHIRLPOOL 4bb3f0e126cba2c2573f9d83b0330b53f709acef7c66dc61991ef99172d0c4c9f888554d67a821f2079de21e70c4f0a65234824871596fc29987613275b3e3e4
-MISC ChangeLog 13105 SHA256 c90bb6c9cfdc54adff1d577fe93b0093974b80d000b2673f9de44058f3982c07 SHA512 6071509f382749339a36d9aeae37115477bb66089801271580e50be19dfa0fd71f0c515c8d4e0c3c1de3fda6d73c30f6b9c901e8460ded0edd287c7bde585cbe WHIRLPOOL 81f392590ab7eeb74f61092ded3077bc782dd380e038e1e691bc585cae18ffcbbfc3a83668571568e0b978e05950b6b2012f984b4ffe9af63882f21e996cfa35
+DIST neutron-ml2-plugins-9.0.0.tar.gz 2073 SHA256 1e12e81673168860a2d7c5172deb00a7301d0a698014113dfcfba74759ba444d SHA512 bcde3a4d5e041c0080503cdf8f60c83e1c09f873010e78f4bc9066f57b17cf69394cf71cedbb8d3819a62d9cfdd545b102f16b53c0e3deb44b1d03136c14d711 WHIRLPOOL 099e19f4ec98fb54187e100af057711db3df3f86ae117a03f38afe37b6c5135666330aeb05867331cc015e8f14bee6e34942d1cb5aec63f92e01e7d6ae69f671
+EBUILD neutron-2016.1.9999.ebuild 7842 SHA256 24e9138cb818dff68ee403ff4786d9206ac13747c53e8d713a5995df39b02675 SHA512 f3dba9588959a0e85fb67ff0eb9682376ee38983621220ae8ec102dc2ebe9f0ece0df7fa491c2afb2a82327a65e9dbc758212361a27da98235b0314960e88da5 WHIRLPOOL 260990063d70380ae9b16fdb918ede82ac6ab91a4ed65b3c613248cd4fb1a25b974856feb3bf52776912344c5b7430bd13ce7b33db0949a0984b037caec074ec
+EBUILD neutron-2016.2.9999.ebuild 8449 SHA256 234b4a3bacdc3b5a4016c5f513c8379e13944642c7fa13269d5dee6fa131f1ae SHA512 7697e51baa22ee7510037bba222c050e24de98b8f2da86d4e657bc53637420d853b47e2fea44a894afd6207c7341dbd7efb777a82e3304709ab4b44caed2203c WHIRLPOOL d0870707c124a45f31a80aa1b75107545a528a2cd086e5a624bcf5e94acf516551b270a778b51eaf4f6592f61ac6c084cdeca198e617e0ed137bfebb7d43cd7c
+EBUILD neutron-8.2.0.ebuild 7816 SHA256 19508d5fec4993170f33fd24d7942442e98cd108fbc6c7e8d39f3a0a5a5fbc9f SHA512 e777f0e8e6c50685c6fcd808c1b1613667f0ef278f44b80c96fc711edd27b15ba1ca24cb60db1eee0df5ffbc1fb0ebf63f4a19be9cd700183afc195e7a320fee WHIRLPOOL dea6516cddeb4624ba82253dd59e0e48e1f84ac9883547a5637693ca37e53dda579e907f1129d9ad79faee093e796624e3ef1e963422f22bd79e9c826b65b449
+EBUILD neutron-9.0.0.ebuild 8425 SHA256 f7cadc710212076648cf305e8add3fd12080ed38fa732e72b6cd93f0fffdb7d8 SHA512 b31dc75e95e8b15c62a52d1b5d486b32a5e51b4f415655c4af10fb3f6e8e232b7cd6013d7f730ed50ad1234365dfb8d09c973ded2d62195ee1fd82aa109aec44 WHIRLPOOL 05cec41f834f88958dfbaf8587e6f0b4fd0a3a97778bc7614e26e57dbdde2201300fd97c3890f916684e2e5f7bef0569fd43a2443fa785de41579226bace9545
+MISC ChangeLog 13597 SHA256 0cd01b471f8b87a1cc14b7f5d915877590c39e8881d0872d1bacfe8e2f4c729c SHA512 038d8868d67cc5d7a63c81391245f11b29893f7e044bdd2b59657d8b38eb0f3d47b94cc2de7af7673e8c20a9b46a15cf61b4e830527788fc8f5aa5a9a2064f75 WHIRLPOOL a6535b2cb537e6418a260f260d59df52797d8c1140938cee81f1a7b5687cfa9fdc9a818158699f5a014792600b7e3481a3e90e06664969322110a5e355ff67ba
 MISC ChangeLog-2015 18698 SHA256 4a6446fb01cf1d8399a4ce110d6eb6ab16544e5620f9fdc5971310a096366f63 SHA512 ba2d79f13f48cb97014e803c285e236bf51121b759109485d60cbb5d1abda48edb041a1040a9c291f3bc57ee116b44baba3b861c26a8c17549fcb986ba790f38 WHIRLPOOL a1edadb7c8edc01c01a1c23b01a37998bf2551988b6f08d602ceda8eb6b1d371f644a28d734504fbead7af94e90665fd4c59eeb3fd1b61c599abfee1fec1e3b1
 MISC metadata.xml 1558 SHA256 682529a97125283a2c418001c0417de5847843c05d47a1fcbeb059b5506a460c SHA512 26adb0d64cf6b4f67f41f318b89e33283385694d45f4800422664548f9ff306e20205e1881b6c0eed7651d5499297e73dbac3378eebde8abbbe8126cde849659 WHIRLPOOL c8e8862186a4036c2df0dbbda08eae2f862419b4aaf371420cc7d27bdb4e370fa8345f2b697023b83835c9644c0736533f9a2f7d4fb0ec42fd1d555abd4e8903
diff --git a/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd b/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd
index fdd4ed4865b4..9a2d52c70f8a 100644
--- a/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd
+++ b/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd
@@ -1 +1 @@
-NEUTRON_CONFS=("/etc/neutron/neutron.conf" "/etc/neutron/plugins/ml2/ml2_conf.ini" "/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini")
+NEUTRON_CONFS=("/etc/neutron/neutron.conf" "/etc/neutron/plugins/ml2/ml2_conf.ini" "/etc/neutron/plugins/ml2/linuxbridge_agent.ini")
diff --git a/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd.liberty b/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd.liberty
deleted file mode 100644
index 9a2d52c70f8a..000000000000
--- a/sys-cluster/neutron/files/neutron-linuxbridge-agent.confd.liberty
+++ /dev/null
@@ -1 +0,0 @@
-NEUTRON_CONFS=("/etc/neutron/neutron.conf" "/etc/neutron/plugins/ml2/ml2_conf.ini" "/etc/neutron/plugins/ml2/linuxbridge_agent.ini")
diff --git a/sys-cluster/neutron/files/neutron-ovs-cleanup.confd b/sys-cluster/neutron/files/neutron-ovs-cleanup.confd
deleted file mode 100644
index eba422c2c716..000000000000
--- a/sys-cluster/neutron/files/neutron-ovs-cleanup.confd
+++ /dev/null
@@ -1 +0,0 @@
-NEUTRON_CONFS=("/etc/neutron/neutron.conf" "/etc/neutron/plugins/openvswitch/ovs_neutron_plugin.ini")
diff --git a/sys-cluster/neutron/neutron-2016.1.9999.ebuild b/sys-cluster/neutron/neutron-2016.1.9999.ebuild
index e0eda23d6bd2..bff65d219c61 100644
--- a/sys-cluster/neutron/neutron-2016.1.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2016.1.9999.ebuild
@@ -167,7 +167,7 @@ python_install() {
 	fi
 	if use linuxbridge; then
 		newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
-		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd.liberty" "neutron-linuxbridge-agent"
+		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
 	fi
 	diropts -m 755 -o neutron -g neutron
 	dodir /var/log/neutron /var/lib/neutron
diff --git a/sys-cluster/neutron/neutron-2016.2.9999.ebuild b/sys-cluster/neutron/neutron-2016.2.9999.ebuild
index 1a66a80fdc8e..726e0f2943cc 100644
--- a/sys-cluster/neutron/neutron-2016.2.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2016.2.9999.ebuild
@@ -180,7 +180,7 @@ python_install() {
 	fi
 	if use linuxbridge; then
 		newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
-		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd.liberty" "neutron-linuxbridge-agent"
+		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
 	fi
 	diropts -m 755 -o neutron -g neutron
 	dodir /var/log/neutron /var/lib/neutron
diff --git a/sys-cluster/neutron/neutron-8.2.0.ebuild b/sys-cluster/neutron/neutron-8.2.0.ebuild
index 943ebb5e4189..a8d6d24a41ed 100644
--- a/sys-cluster/neutron/neutron-8.2.0.ebuild
+++ b/sys-cluster/neutron/neutron-8.2.0.ebuild
@@ -166,7 +166,7 @@ python_install() {
 	fi
 	if use linuxbridge; then
 		newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
-		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd.liberty" "neutron-linuxbridge-agent"
+		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
 	fi
 	diropts -m 755 -o neutron -g neutron
 	dodir /var/log/neutron /var/lib/neutron
diff --git a/sys-cluster/neutron/neutron-9.0.0.ebuild b/sys-cluster/neutron/neutron-9.0.0.ebuild
new file mode 100644
index 000000000000..c77faa3ade9e
--- /dev/null
+++ b/sys-cluster/neutron/neutron-9.0.0.ebuild
@@ -0,0 +1,229 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+# still no 34 :( https://bugs.launchpad.net/neutron/+bug/1630439
+
+inherit distutils-r1 linux-info user
+
+DESCRIPTION="A virtual network service for Openstack"
+HOMEPAGE="https://launchpad.net/neutron"
+SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/newton/configs.tar.gz -> neutron-configs-${PV}.tar.gz
+	https://dev.gentoo.org/~prometheanfire/dist/openstack/neutron/newton/ml2_plugins.tar.gz -> neutron-ml2-plugins-${PV}.tar.gz
+	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="compute-only dhcp ipv6 l3 metadata openvswitch linuxbridge server sqlite mysql postgres"
+REQUIRED_USE="!compute-only? ( || ( mysql postgres sqlite ) )
+						compute-only? ( !mysql !postgres !sqlite !dhcp !l3 !metadata !server
+						|| ( openvswitch linuxbridge ) )"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	dev-python/paste[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${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.3[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	>=dev-python/pecan-1.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pecan-1.0.2[${PYTHON_USEDEP}]
+	!~dev-python/pecan-1.0.3[${PYTHON_USEDEP}]
+	!~dev-python/pecan-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
+	!=dev-python/keystonemiddleware-4.1.0[${PYTHON_USEDEP}]
+	!=dev-python/keystonemiddleware-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/neutron-lib-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/ryu-3.30[${PYTHON_USEDEP}]
+	!~dev-python/ryu-4.1[${PYTHON_USEDEP}]
+	!~dev-python/ryu-4.2[${PYTHON_USEDEP}]
+	!~dev-python/ryu-4.2.1[${PYTHON_USEDEP}]
+	!~dev-python/ryu-4.4[${PYTHON_USEDEP}]
+	compute-only? (
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/alembic-0.8.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.10.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-db-4.13.1[${PYTHON_USEDEP}]
+	!~dev-python/oslo-db-4.13.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.13.0[${PYTHON_USEDEP}]
+	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/ovs-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-2.29.0[${PYTHON_USEDEP}]
+	!~dev-python/python-novaclient-2.33.0[${PYTHON_USEDEP}]
+	>=dev-python/python-designateclient-1.5.0[${PYTHON_USEDEP}]
+	virtual/python-singledispatch[${PYTHON_USEDEP}]
+	dev-python/pyudev[${PYTHON_USEDEP}]
+	sys-apps/iproute2
+	net-misc/bridge-utils
+	net-firewall/ipset
+	net-firewall/iptables
+	net-firewall/ebtables
+	net-firewall/conntrack-tools
+	openvswitch? ( <=net-misc/openvswitch-2.6.9999 )
+	ipv6? (
+		net-misc/radvd
+		>=net-misc/dibbler-1.0.1
+	)
+	dhcp? ( net-dns/dnsmasq[dhcp-tools] )"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="VLAN_8021Q IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
+	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 \
+	NF_NAT_IPV4 NF_NAT NF_CONNTRACK IP_NF_FILTER IP_NF_IPTABLES NETFILTER_XTABLES"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+		done
+	fi
+	enewgroup neutron
+	enewuser neutron -1 -1 /var/lib/neutron neutron
+}
+
+pkg_config() {
+	fperms 0700 /var/log/neutron
+	fowners neutron:neutron /var/log neutron
+}
+
+src_prepare() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	# it's /bin/ip not /sbin/ip
+	sed -i 's/sbin\/ip\,/bin\/ip\,/g' etc/neutron/rootwrap.d/* || die
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install
+	if use server; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-server"
+		newconfd "${FILESDIR}/neutron-server.confd" "neutron-server"
+		dosym /etc/neutron/plugin.ini /etc/neutron/plugins/ml2/ml2_conf.ini
+	fi
+	if use dhcp; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-dhcp-agent"
+		newconfd "${FILESDIR}/neutron-dhcp-agent.confd" "neutron-dhcp-agent"
+	fi
+	if use l3; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-l3-agent"
+		newconfd "${FILESDIR}/neutron-l3-agent.confd" "neutron-l3-agent"
+	fi
+	if use metadata; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-metadata-agent"
+		newconfd "${FILESDIR}/neutron-metadata-agent.confd" "neutron-metadata-agent"
+	fi
+	if use openvswitch; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-openvswitch-agent"
+		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-openvswitch-agent"
+		newinitd "${FILESDIR}/neutron.initd" "neutron-ovs-cleanup"
+		newconfd "${FILESDIR}/neutron-openvswitch-agent.confd" "neutron-ovs-cleanup"
+	fi
+	if use linuxbridge; then
+		newinitd "${FILESDIR}/neutron.initd" "neutron-linuxbridge-agent"
+		newconfd "${FILESDIR}/neutron-linuxbridge-agent.confd" "neutron-linuxbridge-agent"
+	fi
+	diropts -m 755 -o neutron -g neutron
+	dodir /var/log/neutron /var/lib/neutron
+	keepdir /etc/neutron
+	insinto /etc/neutron
+	insopts -m 0640 -o neutron -g neutron
+
+	doins etc/*
+	# stupid renames
+	insinto /etc/neutron
+	doins -r "etc/neutron/plugins"
+	insopts -m 0640 -o root -g root
+	doins "etc/rootwrap.conf"
+	doins -r "etc/neutron/rootwrap.d"
+
+	insopts -m 0644
+	insinto "/usr/lib64/python2.7/site-packages/neutron/db/migration/alembic_migrations/"
+	doins -r "neutron/db/migration/alembic_migrations/versions"
+
+	#add sudoers definitions for user neutron
+	insinto /etc/sudoers.d/
+	insopts -m 0440 -o root -g root
+	newins "${FILESDIR}/neutron.sudoersd" neutron
+
+	# add generated configs
+	cd "${D}/etc/neutron" || die
+	unpack "neutron-configs-${PV}.tar.gz"
+	cd "${D}/etc/neutron/plugins/ml2" || die
+	unpack "neutron-ml2-plugins-${PV}.tar.gz"
+
+	# correcting perms
+	fowners neutron:neutron -R "/etc/neutron"
+	fperms o-rwx -R "/etc/neutron/"
+
+	#remove superfluous stuff
+	rm -R "${D}/usr/etc/"
+}
+
+pkg_postinst() {
+	elog
+	elog "neutron-server's conf.d file may need updating to include additional ini files"
+	elog "We currently assume the ml2 plugin will be used but do not make assumptions"
+	elog "on if you will use openvswitch or linuxbridge (or something else)"
+	elog
+	elog "Other conf.d files may need updating too, but should be good for the default use case"
+	elog
+}
diff --git a/sys-cluster/nova/ChangeLog b/sys-cluster/nova/ChangeLog
index ed6a4c998ba3..a010ed726f0e 100644
--- a/sys-cluster/nova/ChangeLog
+++ b/sys-cluster/nova/ChangeLog
@@ -568,3 +568,10 @@
   +nova-2016.2.9999.ebuild:
   openstack p2, newton is done, will add heat later
 
+*nova-14.0.0 (06 Oct 2016)
+
+  06 Oct 2016; Matthew Thode <prometheanfire@gentoo.org> +nova-14.0.0.ebuild:
+  NEWTON :D
+
+  Package-Manager: portage-2.3.0
+
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index e590cfb0fb78..c0fd12565fc1 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -8,9 +8,11 @@ AUX scsi-openscsi-link.sh 2777 SHA256 4ea97b8b7121092245ae108faf488beb2b11113407
 DIST mitaka-nova.conf.sample 36427 SHA256 dd4c3ccab89fbe9f69df520f47d439c7ffa440d3f8b288b0ab99ac328a02ec75 SHA512 169671bde5cb5bb89065d801f80aa0d3c664af652d9ddb0c409ed3e0af2c0b94f1dbd0ebf834849e3e75dc38972935ec65a6e533d86148a7315839597d577cad WHIRLPOOL 20f95a296c3d112a532c9c5cc911d30b67472868d94bcfd52fadfd7105f9095a6b77020ca1caa6a70319548239358868d809feed363a82e4d574aceb6e5f016d
 DIST newton-nova.conf.sample 44496 SHA256 a7d9b95e67b77d0335edac760e037ad117d8c9f18c4792939ba8bb02739eae58 SHA512 ac917f0fed24c6705cbe43b4e1af31138bb656ea06f0cbe66d5b820677a47ca854abf6ca7fdf76a9a7f3a5afff758dac294ffd778d1bda82bb9f95c48d103d6e WHIRLPOOL 3c54dc8e4721f4289a8f64e9ac215c4b2e4b6afd2904fea4080659d3c292dcd942535d998b463efa4dd96a6090afb9830dfa6b9b3f2062439a8d03ec09356adc
 DIST nova-13.1.1.tar.gz 5407219 SHA256 1af74830f52deb24ca0f25acf150c2338a414ccd2082bbb31092d55d28a92a9d SHA512 18866a1fb9e1e94b91b27d72318401de755255be3b3fd374f156ccf88c84697a8f54b6f5be17842f55b5ff323f19d778213925dbeb4ae9c02225d2b3fb56b3cc WHIRLPOOL d5bd05f773b49cf309f02ea34c7d5cbbd82078a17a7aadc66ebd1ed9dd8180a036f31d74d27ea6f1af644eaa873e0e955a52b44ee66448ea93e0507561055d50
+DIST nova-14.0.0.tar.gz 5567908 SHA256 95fc42853904493e5897188fcb92c760770c08efc7cf31f2d9a9a57450e54f76 SHA512 cfa4aefbb6703ea3bb7324b1e402eb1eb879fd0a8717d81e713402331a5505dd107f4cba043b9c9515c68e5725d243fa62656760782335bdd248d99a55b5080c WHIRLPOOL 4697191e2099facfea552fbcbbf91445ef655b9ba8847468f5335182eeb75e455916e183851a4b3357881904e3e5586fd46978bf3a23ffb4bf9b82edbe5a5313
 EBUILD nova-13.1.1.ebuild 7967 SHA256 df8c3c22ee64dac936b7b118214bdb83430623614ce6eba477bd9cfcfa857955 SHA512 8908675ac34bdda8acba433ae212d9138a2d4b949ebd6e69e15b4ab55c074566c951233f9e4d11d2a8f43b40a9d3c6112333cd7effe7b17f91ece30927630d9b WHIRLPOOL d9597feb92ab0821d340b100acc1ff7e9941aa2270383eba41a65bd33b215b428544ba39e8c795557cbfbb3f772be6c8b387a7d380695bf1770438075dabac9d
+EBUILD nova-14.0.0.ebuild 7985 SHA256 20885f37bf9f66ef3bdd906f949c7dc718b12cc21a5d982dc6716e342dad9ce5 SHA512 fc4b34744c6c1e2825823b6a924f9b531fae5f3222b2b89a492e4e0a4aa3c3ff798dcde96e8e21bc108a405db1fa747eeb1f06b7f15390d92f3674a5234e04ec WHIRLPOOL 6085d1db37f555450f460c2f189ef83f67eb65bee372490ee34c26950d5e12506d07c10ffbf6d504f5403ae342c9cdd6a4000fc323426df7cf8dc0120832ea1a
 EBUILD nova-2016.1.9999.ebuild 7526 SHA256 86756eab2a47a3335b7b863385a5f71e52ebab5cfb2cfce020c69437205ea66b SHA512 881c8cf63db594720ca77ccc93b8fd4d658eae9fe028f67d6536cae272be6efb51e877993aad7453b0fd9d63576ba6c2d38d9e3d74d63458c30700d59bfe262b WHIRLPOOL c0ab1d8e2467882e08c34dbfa7bd83533b8786c45b284822616a4fb5b4fb79b279c65b4906dad85c984626337d87102353497d34a86c54bf936b378e457229e1
 EBUILD nova-2016.2.9999.ebuild 8007 SHA256 e3996c19ba47a3d7bcf7fc2bad3b4d913c705ebf053e352de6b68d01c47d1b8a SHA512 eba9182364de121be9d656b083761fb1d66856a12c8e9ed5fe6a43fbdc2e6d305f5b908392e9aaf53eea4059374181898a7ff0344e2179026442cf7f9aebdfee WHIRLPOOL 3cbbef7d4786c51bb2d927fdd7b6271f111e516764a116a772ae3a219537e41570b2cbe25ed50866a8fa9aa052b1686eed02f0bc6c31f2e80850ba635c597a6c
-MISC ChangeLog 17267 SHA256 3568285a5ff697d480ac807f1d6171bea3fb92921e9730f036bea69d005f4206 SHA512 38f5c4e0665529adcf707a3a65e3956e0e86da7d15489f3166d56fabfbb8f1422a2bd0f05ac25f0b63c14b1a9215fb8eabc23c6c2beddd13bcd8587aee21bdce WHIRLPOOL 60b7cc718943750a1b06377d94335ebae40554143b1420f6a27dfbcbc3649beaea93a387d69b8d91fa4a0932360cbaa2514a70fd91a78e50de30ac0bb73cfa1a
+MISC ChangeLog 17420 SHA256 1db8f218f44befa178560393a5349fb0401aae4d0014e357af68faed109fb5b5 SHA512 732c7a66bdd2b684f4c394518db10a5257136ee32670e6dcd35f1cbb284a489b8524cedc280f491c6c246ab0ab85878ffed59c98eb072c3aa55aebbc63833ac6 WHIRLPOOL e6eb77e5f06d95d7c1155e5eeeb0dba2c82b1454980d070f207ff4bb7dfeb40d1391ccde881b866131daea829474719a774146a5d138e07fec75c738f22f0c27
 MISC ChangeLog-2015 22304 SHA256 e33e52b8d5741a0dc8d9ea31b2b46f4120b7dab5a6b678cfe1b8ff7e40bb4809 SHA512 6400c0bbc4b6a7064afa6f40b08057af88bd3710bd16391639a26bb2d9e3a04c283bada292afabd735a7c4a18163b193b4660013b26a77d0a93ac860594cd2b9 WHIRLPOOL 42237f4fd4b4f7ab040a9c225c3c54d3c2960c827805ed6f1ae5f06b3e07299a2d5423e033992e8b60d89fe13726b9bf2028f8847736afd083193676427a104c
 MISC metadata.xml 1169 SHA256 7817a6c1ddc3b5ca10491fb0fb3eb4400a633fe0be6dec3b533f9c9204b6bd96 SHA512 6d76accbff08908ba3e0125a8849a7be8fb2da26f9b1d9b209e2f7c515072d97ba9570cf6e5f060f32cf2750557e450ac01a2de3fd80f559c3f747498ab1fb3e WHIRLPOOL 753e8ff4d1b2f4bd9fdf97a8fb59b42e90e40289d1d0c29630ce2cc93566e35c24d6014f460a33d6d3bac6f6308255e3b88bd8d18fe51a228b89dff656155730
diff --git a/sys-cluster/nova/nova-14.0.0.ebuild b/sys-cluster/nova/nova-14.0.0.ebuild
new file mode 100644
index 000000000000..b6d3a1fd8ca2
--- /dev/null
+++ b/sys-cluster/nova/nova-14.0.0.ebuild
@@ -0,0 +1,215 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_4 )
+
+inherit distutils-r1 eutils linux-info multilib user
+
+DESCRIPTION="Cloud computing fabric controller (main part of an IaaS system) in Python"
+HOMEPAGE="https://launchpad.net/nova"
+SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/nova/newton/nova.conf.sample -> newton-nova.conf.sample
+https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+compute compute-only iscsi +memcached mysql +novncproxy openvswitch postgres +rabbitmq sqlite"
+REQUIRED_USE="
+	!compute-only? ( || ( mysql postgres sqlite ) )
+	compute-only? ( compute !rabbitmq !memcached !mysql !postgres !sqlite )"
+
+CDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
+DEPEND="
+	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
+	${CDEPEND}
+	app-admin/sudo"
+
+RDEPEND="
+	${CDEPEND}
+	compute-only? (
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	sqlite? (
+		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[sqlite,${PYTHON_USEDEP}]
+	)
+	mysql? (
+		>=dev-python/pymysql-0.6.2[${PYTHON_USEDEP}]
+		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	)
+	>=dev-python/boto-2.32.1[${PYTHON_USEDEP}]
+	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-4.0.0[${PYTHON_USEDEP}]
+	!~dev-python/keystonemiddleware-4.1.0[${PYTHON_USEDEP}]
+	!~dev-python/keystonemiddleware-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/lxml-2.3[${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.3[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.0[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+	dev-python/paste[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7[${PYTHON_USEDEP}]
+	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.9.6[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.13[${PYTHON_USEDEP}]
+	!~dev-python/netaddr-0.7.16[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${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-cinderclient-1.6.0[${PYTHON_USEDEP}]
+	!~dev-python/python-cinderclient-1.7.0[${PYTHON_USEDEP}]
+	!~dev-python/python-cinderclient-1.7.1[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/python-neutronclient-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-2.3.0[${PYTHON_USEDEP}]
+	!~dev-python/python-glanceclient-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.10.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-16.0[${PYTHON_USEDEP}]
+	!~dev-python/setuptools-24.0.0[${PYTHON_USEDEP}]
+	>=dev-python/websockify-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-cache-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-config-3.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.14.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.16.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-4.10.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-db-4.13.1[${PYTHON_USEDEP}]
+	!~dev-python/oslo-db-4.13.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-5.2.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-policy-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/psutil-1.1.1[${PYTHON_USEDEP}]
+	<dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-versionedobjects-1.13.0[${PYTHON_USEDEP}]
+	>=dev-python/os-brick-1.6.1[${PYTHON_USEDEP}]
+	>=dev-python/os-vif-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/os-win-0.2.3[${PYTHON_USEDEP}]
+	>=dev-python/castellan-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/microversion-parse-0.1.2[${PYTHON_USEDEP}]
+	>=dev-python/wsgiintercept-0.6.1[${PYTHON_USEDEP}]
+	dev-python/libvirt-python[${PYTHON_USEDEP}]
+	app-emulation/libvirt[iscsi?]
+	novncproxy? ( www-apps/novnc )
+	sys-apps/iproute2
+	openvswitch? ( <=net-misc/openvswitch-2.5.9999 )
+	rabbitmq? ( net-misc/rabbitmq-server )
+	memcached? (
+		net-misc/memcached
+		>=dev-python/python-memcached-1.58
+	)
+	sys-fs/sysfsutils
+	sys-fs/multipath-tools
+	net-misc/bridge-utils
+	compute? (
+		app-cdr/cdrkit
+		sys-fs/dosfstools
+		app-emulation/qemu
+	)
+	iscsi? (
+		sys-fs/lsscsi
+		>=sys-block/open-iscsi-2.0.873-r2
+	)"
+
+#PATCHES=(
+#)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	CONFIG_CHECK_MODULES="BLK_DEV_NBD VHOST_NET IP6_NF_FILTER IP6_NF_IPTABLES IP_NF_TARGET_REJECT \
+	IP_NF_MANGLE IP_NF_TARGET_MASQUERADE NF_NAT_IPV4 IP_NF_FILTER IP_NF_IPTABLES \
+	NF_CONNTRACK_IPV4 NF_DEFRAG_IPV4 NF_NAT_IPV4 NF_NAT NF_CONNTRACK NETFILTER_XTABLES \
+	ISCSI_TCP SCSI_DH DM_MULTIPATH DM_SNAPSHOT"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK_MODULES}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled in kernel"
+		done
+	fi
+	enewgroup nova
+	enewuser nova -1 -1 /var/lib/nova nova
+}
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	if use !compute-only; then
+		for svc in api cert conductor consoleauth network scheduler spicehtml5proxy xvpvncproxy; do
+			newinitd "${FILESDIR}/nova.initd" "nova-${svc}"
+		done
+	fi
+	use compute && newinitd "${FILESDIR}/nova.initd" "nova-compute"
+	use novncproxy && newinitd "${FILESDIR}/nova.initd" "nova-novncproxy"
+
+	diropts -m 0750 -o nova -g qemu
+	dodir /var/log/nova /var/lib/nova/instances
+	diropts -m 0750 -o nova -g nova
+
+	insinto /etc/nova
+	insopts -m 0640 -o nova -g nova
+	newins "${DISTDIR}/newton-nova.conf.sample" "nova.conf.sample"
+	doins "${S}/etc/nova/"*
+	#rootwrap filters
+	insopts -m 0644
+	insinto /etc/nova/rootwrap.d
+	doins "etc/nova/rootwrap.d/api-metadata.filters"
+	doins "etc/nova/rootwrap.d/compute.filters"
+	doins "etc/nova/rootwrap.d/network.filters"
+	#copy migration conf file (not coppied on install via setup.py script)
+	insinto /usr/$(get_libdir)/python2.7/site-packages/nova/db/sqlalchemy/migrate_repo/
+	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
+	#copy the CA cert dir (not coppied on install via setup.py script)
+	cp -R "${S}/nova/CA" "${D}/usr/$(get_libdir)/python2.7/site-packages/nova/" || die "installing CA files failed"
+
+	#add sudoers definitions for user nova
+	insinto /etc/sudoers.d/
+	insopts -m 0600 -o root -g root
+	doins "${FILESDIR}/nova-sudoers"
+
+	if use iscsi ; then
+		# Install udev rules for handle iscsi disk with right links under /dev
+		udev_newrules "${FILESDIR}/openstack-scsi-disk.rules" 60-openstack-scsi-disk.rules
+
+		insinto /etc/nova/
+		doins "${FILESDIR}/scsi-openscsi-link.sh"
+	fi
+}
+
+pkg_postinst() {
+	if use iscsi ; then
+		elog "iscsid needs to be running if you want cinder to connect"
+	fi
+}
diff --git a/sys-libs/libcxxabi/ChangeLog b/sys-libs/libcxxabi/ChangeLog
index 5bb23937ab75..378dbca73bbe 100644
--- a/sys-libs/libcxxabi/ChangeLog
+++ b/sys-libs/libcxxabi/ChangeLog
@@ -14,3 +14,11 @@
   +files/libcxxabi-3.9.0-cmake-path.patch, +libcxxabi-3.9.0.ebuild:
   Wrap up 3.9.0 release
 
+  06 Oct 2016; Michał Górny <mgorny@gentoo.org> libcxxabi-3.9.0.ebuild,
+  libcxxabi-9999.ebuild:
+  Pass libunwind include & (fake) src path, #596340
+
+  06 Oct 2016; Michał Górny <mgorny@gentoo.org>
+  +files/libcxxabi-3.9.0-test-unwind.patch, libcxxabi-3.9.0.ebuild:
+  Fix running tests against ext libunwind
+
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index a844f06494fe..ddf291a58999 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -1,7 +1,8 @@
 AUX libcxxabi-3.9.0-cmake-path.patch 1447 SHA256 8b4eb6a654c32ee8d2bedd1e7feaa7b0566a6d720b9d94fd5ead9c5cccbdb2fa SHA512 0466db8c0bfce67bda9a72ab953c327d7d7ddcf279aea7ecf02d121ec96f940ba76d390c35fb39ed5fb4fffdb66a412d6bd952d6e4a661494bf56e7aa7d6bc16 WHIRLPOOL 23b7e3c0079c34389bc6464d9f02847ecad2b0ed3bab714bb2a304fa3e8aea718d997eafbd218c08d8ef3e09c0379b0320114fb22cbf77451173f4ec1ac93e07
+AUX libcxxabi-3.9.0-test-unwind.patch 1110 SHA256 6bedf46f50f826291a8cb68b80b741701a6ae295100a5f893c2093956f546831 SHA512 b4ca3b35bc4e430fc7b7ff6bd6bad0306b30aec193275bc57d840e6643ffcf8cf6696eaf8b560d108f969a548cbb4688ce9d4e1bf649d60a98e7a9e280ed4763 WHIRLPOOL c68e7721a21c65b9c851625dd4159e72b730f07b5b615c94346904804129c204bd97b87186b3521c19808a70a6bc69a7ae9b849653f8c1b948098387fcae2365
 DIST libcxx-3.9.0.src.tar.xz 1198308 SHA256 d0b38d51365c6322f5666a2a8105785f2e114430858de4c25a86b49f227f5b06 SHA512 55d5c4adff378ee02b0b99d732bc9f326910f9e49ab8c320a588eccdd0362fe009bc9a6a4337d29faf6338420c91b10d0d7d67f66128268f01258d30502c4f4a WHIRLPOOL 3ee3519acfe95287a862a6c44e30ed52ced1204332913007797da4e4da40dfdc5991ae120f5686827cc208b559936da5bc5485dab75617bdd5cbbd9e95a6032a
 DIST libcxxabi-3.9.0.src.tar.xz 511324 SHA256 b037a92717856882e05df57221e087d7d595a2ae9f170f7bc1a23ec7a92c8019 SHA512 500207bfd59664bd42d920741d6b467c4b88569453742db6470af081c77be04894e097a14b8419e333b51abce484566366e35cbc3ed2607cd86dfc0ec0ddd0c5 WHIRLPOOL 7b2d3b022c4c539596ce7be0afac724df929f19fb80e6f5b14074e240fb252b04389fe121f987ceaf6f3567d59735238b2940546475e4107f3c32eb55a5f8a80
-EBUILD libcxxabi-3.9.0.ebuild 2169 SHA256 215f4b3b8ab5d5ec39f208e3f5411480793c6863632389a32f81e414b5494df8 SHA512 82bfdc8940f9d0740de745244bc270a3e57334c3abde99838cd426282145d61f5e93f13a57e13658fa4ae9cac9ee34aaab6104e29f585a9da1ef51dc6dfc36b8 WHIRLPOOL 552dd98be61dcc860fab0d3badb26c6e703227abd1fadfd2ff247b5060be629a2e403c79e62c47367350e6ac41c74b694bee26069f47a51e5c24bcb47f823e11
-EBUILD libcxxabi-9999.ebuild 2212 SHA256 af345df994a8502fb9462549a1cc705e71006bb85c394e2a326e42c5067f2d39 SHA512 ae08ce7fb93f7420e91bf7b49eaba133125323eb886dda0918bc3ba63a965e1f3ac05aedf310223ecad8babaa3caaebb27c2696a78e6dbc0620ce0e3b92df3f6 WHIRLPOOL 23f5d9ed0a22c878ff722892dd87eb1baf80c876183955cd2414bd3f4aaaa1549fc94b8fb6c962781db5ba28accb25e6013d73961268a838ec879eb2044fab94
-MISC ChangeLog 458 SHA256 f7744fe60ce47323230143cd2ac8a19f7c88f59258028e2afda2a3c609a09f86 SHA512 31936543f7a1d567efa48d3af80c54831b6eb1312ca338471d46ffbb2868fd7d01a103e9d94c30e0a05b6ea18e4f90a572d0f009e2b92141f072576716c26bfc WHIRLPOOL dbcb34f9939d596dd9b970e8c4553eb11b8bceac71b02705536b610401439df966df88a2dbba1599c79c89001c0b538b98f0a92511537d0d72901c3b6f5bb308
+EBUILD libcxxabi-3.9.0.ebuild 2555 SHA256 9b7469f27a177bbc7cd2b83ea7b31dc33ff4602bafdcb3d7affeff4878ac6a9e SHA512 f260fceb255b815e6b7b0d1d82e1b07d785c190a59830971cb726a18fa4cffe31788cd2602fd1dac29e5808253a67fe4529ffb7ad05e9ebea018eadaa9974c2d WHIRLPOOL 3a31a61825f17e74a94371cafa0efe9e2d996ee6620de7d444a2451fcc5fb3bb6f31b70e10c9784084c584c6625ab62b7aafd9fe7ee692f1e49328268a71f93a
+EBUILD libcxxabi-9999.ebuild 2571 SHA256 0d7c06fcc183b6c0b47d96c6b731a8edc5cc73b4311ffd8d24f19137c8572f6f SHA512 5b3ddf9e4f4cf9f41cd39a2afa5c9f6721ce5519fb67bdefcd9d53c40d62e804c16b03d467f2d235d14d00bae559455e0382b84d73ba73985237ea4895ca89c1 WHIRLPOOL f517a5631cef4309b34d48ea620b5a9219012e496c56a5232716cce29c7b30f0068a67b6a77367e7fa85392e1f41e6f52681a95b8f8544162e0c9233874774e0
+MISC ChangeLog 771 SHA256 6c5c630db9ff7a74a6974c185570a949751bc915eae02cb25e698d319f2daeb7 SHA512 f575c7ed8487ad689c9e3be8bd298f58cb4956fdf74a3eb7da1dbb40d10648523946029b95710885fcba434f12bacb17dddd0b4452d02e86116432faa8a18b8c WHIRLPOOL 45d2f8982a9cec50fe22397dbec5a9ea5e4f4061c9289e82425e48e70f26808e27a15cd29c852939628f9b4ce514baf2dae05a9c42e6725f70677cab964ce9c0
 MISC metadata.xml 350 SHA256 19efe268c0747e237a6e9f54dde3471b5b562fa6d7f698853bc09a06aa1b0460 SHA512 317dd7b59a711dd0461b5369f7e31ea196882b018e047e1dbae8077274d06cb68542c8762efb852cce0b8021bedea69c19aa0c124b9414a36cf1a9c00e0b9703 WHIRLPOOL 0f5edd5b7c2c2bed62c5a69286bf2f8f465b31716a8670549717b10f1f78a5b529d225244869ca2fc5680ccf043208905e1e34508dc4f74c639572d938db9d6e
diff --git a/sys-libs/libcxxabi/files/libcxxabi-3.9.0-test-unwind.patch b/sys-libs/libcxxabi/files/libcxxabi-3.9.0-test-unwind.patch
new file mode 100644
index 000000000000..1005cb7d133e
--- /dev/null
+++ b/sys-libs/libcxxabi/files/libcxxabi-3.9.0-test-unwind.patch
@@ -0,0 +1,37 @@
+From fff85c801ae564a09479e1e8e4cf81977536c550 Mon Sep 17 00:00:00 2001
+From: Petr Hosek <phosek@chromium.org>
+Date: Mon, 8 Aug 2016 22:09:54 +0000
+Subject: [PATCH] Do not depend on unwind when building standalone
+
+When libcxxabi is being built standalone, unwind dependency is not
+available, so do not use it even when LLVM unwinder is being
+requested.
+
+Differential Revision: https://reviews.llvm.org/D23228
+
+git-svn-id: https://llvm.org/svn/llvm-project/libcxxabi/trunk@278058 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ test/CMakeLists.txt | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 31b5d1d..3a489bf 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -36,10 +36,9 @@ endif()
+ 
+ if (NOT LIBCXXABI_BUILT_STANDALONE)
+   list(APPEND LIBCXXABI_TEST_DEPS cxx)
+-endif()
+-
+-if (LIBCXXABI_USE_LLVM_UNWINDER)
+-  list(APPEND LIBCXXABI_TEST_DEPS unwind)
++  if (LIBCXXABI_USE_LLVM_UNWINDER)
++    list(APPEND LIBCXXABI_TEST_DEPS unwind)
++  endif()
+ endif()
+ 
+ add_lit_testsuite(check-libcxxabi "Running libcxxabi tests"
+-- 
+2.10.1
+
diff --git a/sys-libs/libcxxabi/libcxxabi-3.9.0.ebuild b/sys-libs/libcxxabi/libcxxabi-3.9.0.ebuild
index 46845482e465..48c45199c980 100644
--- a/sys-libs/libcxxabi/libcxxabi-3.9.0.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-3.9.0.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 	libunwind? (
 		|| (
 			>=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
-			sys-libs/llvm-libunwind[static-libs?,${MULTILIB_USEDEP}]
+			>=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
 		)
 	)"
 DEPEND="${RDEPEND}
@@ -48,6 +48,8 @@ src_prepare() {
 
 	# backport cmake path fix for llvm-3.9+
 	eapply "${FILESDIR}/${P}-cmake-path.patch"
+	# kill stray unwind test dep in stand-alone builds
+	eapply "${FILESDIR}/${P}-test-unwind.patch"
 }
 
 src_configure() {
@@ -66,6 +68,11 @@ multilib_src_configure() {
 		-DLLVM_INCLUDE_TESTS=$(usex test)
 
 		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx-${PV}.src/include
+		# upstream is omitting standard search path for this
+		# probably because gcc & clang are bundling their own unwind.h
+		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
+		# this only needs to exist, it does not have to make sense
+		-DLIBCXXABI_LIBUNWIND_SOURCES="${T}"
 	)
 	if use test; then
 		mycmakeargs+=(
diff --git a/sys-libs/libcxxabi/libcxxabi-9999.ebuild b/sys-libs/libcxxabi/libcxxabi-9999.ebuild
index 66de8aaa299b..e84bfd70f849 100644
--- a/sys-libs/libcxxabi/libcxxabi-9999.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-9999.ebuild
@@ -25,7 +25,7 @@ RDEPEND="
 	libunwind? (
 		|| (
 			>=sys-libs/libunwind-1.0.1-r1[static-libs?,${MULTILIB_USEDEP}]
-			sys-libs/llvm-libunwind[static-libs?,${MULTILIB_USEDEP}]
+			>=sys-libs/llvm-libunwind-3.9.0-r1[static-libs?,${MULTILIB_USEDEP}]
 		)
 	)"
 DEPEND="${RDEPEND}
@@ -69,6 +69,12 @@ multilib_src_configure() {
 		-DLLVM_INCLUDE_TESTS=$(usex test)
 
 		-DLIBCXXABI_LIBCXX_INCLUDES="${WORKDIR}"/libcxx/include
+		# upstream is omitting standard search path for this
+		# probably because gcc & clang are bundling their own unwind.h
+		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
+		# this only needs to exist, it does not have to make sense
+		# FIXME: remove this once https://reviews.llvm.org/D25314 is merged
+		-DLIBCXXABI_LIBUNWIND_SOURCES="${T}"
 	)
 	if use test; then
 		mycmakeargs+=(
diff --git a/sys-libs/libselinux/Manifest b/sys-libs/libselinux/Manifest
index 325428711bbd..24232fee2e43 100644
--- a/sys-libs/libselinux/Manifest
+++ b/sys-libs/libselinux/Manifest
@@ -3,15 +3,14 @@ AUX 0007-build-related-fixes-bug-500674-for-2.5.patch 2918 SHA256 15b6e58c721fa8
 AUX libselinux-2.5-0001-only-mount-proc-if-necessary.patch 1612 SHA256 0f9bec3bfd575cf4b805bc9b6773f68fc23c6f9bab55321ae63990ae3d722c15 SHA512 dbe76ba56bd3bd223b0733dd0645c5869bd3beda8ee502862c0c156d7b8532e94894edd488b64071f5e9dde070bd078ec9f529445a2377d092da65a941e5b5dd WHIRLPOOL 6e64be7cbae5bf3c67a633181b4bde4b5533fc40ce64db809ef542e60359b4a4b5bdb7fb03299ce877fcb21a08e7cd57ff9a8952e24a533953deea5616b5ba82
 AUX libselinux-2.5-0002-Avoid-mounting-proc-outside-of-selinux_init_load_pol.patch 3418 SHA256 f575d32566a4ed03701c2d4f57029da0a5d182d87842f276145e31b0e2f5eea5 SHA512 05dd4f39fb1b849551e944847a02d32f0cccf9f1fa07b12ed3648dfb2351241036eb3afe791c83b753c53234c16d9b124f490fb40ff122d97800e7fbf57174ac WHIRLPOOL 9b0176237815d741550eb937b0bf9ad22c964d578ca6f414c1a92149c38f44323d3d941e5580a415e22cd110b294a386dbf9dc63d94a56412cec790e15a0813f
 AUX libselinux-2.5-0003-Change-the-location-of-_selinux.so.patch 1810 SHA256 61a833d92d233546bab338ccefa449e6f4b1cb70ac78c11d1ce94e6286bde9d1 SHA512 93b56eb3864dfee200d90f2e54ada3998219076b1408b028890fb4111264781374dfef47db774fcad12aa7e98c9737b566eccd436302ece0bd54f94055578dba WHIRLPOOL 289a6ba5f5e84ec686a3b93876cc989cde55a2aaca2ab6e5429bfec9a546a09c09f98dc66301933471ca5c540ed71becb770eaed3c793acf865a37b996087264
-AUX libselinux-2.6-0001-libselinux-selinux_restorecon-fix-realpath-logic.patch 2526 SHA256 d66f1542c2d5da407bb830508b6ce523b9d28f7eab92c34f55c578b2d0c3bdcd SHA512 27f49ee04be756c0f14831e898d963761fba0c09567bd891e75d99afa3a734ccfcb0a9b7339f797bbb32078339bab7f70ec15412bc08c92dccfe59b6322a886a WHIRLPOOL 3bce0540e0c7fc7303bb1e3cc8e59be58d5133b88e077a8f0c3981e26ded5e3cbf8ef9a53393e2fb2bdad878f4c1cc4862ea47dbcd2f14425ae8ff9ae9084cb1
 AUX libselinux-2.6-0005-use-ruby-include-with-rubylibver.patch 1673 SHA256 206e81ea9612694fa70f6b24b36470078c1a6bae03aec7e7f2164cfbc436507e SHA512 8efdff3f4fc95b8f56ada87f30a7ca5663eaa9425bad157259d73e509fe6193c960497f77393ba3f05f77e7ecc5a55dcf9db01fb59ec94d4f3acf785a534c4ac WHIRLPOOL 8cfa852da01d839af0cec391d7b76e3fbd3721b53d76dfa6051cfc8e3270c0448f3b091ceccd21f8fb5769876bd0b5e41db664f2878e3547f6ae6161a990f050
 AUX libselinux-2.6-0007-build-related-fixes-bug-500674.patch 3565 SHA256 2d7aef43e8fadb9becbc2ba7e0a478314540a50be6dbd205d0c56fcb2db13a7d SHA512 d377c6be001edb874e443d1a3992633bffef8b243ba73757e83b348d9db988be1af1239820471f4d319ea76a308148b5b06c23178910bfd032892ea861a47cd4 WHIRLPOOL fec6f0f05c5c7b62a37784ad7de78d03329b321e95ad351e9fcca4e17b522d744d17f67b78325893efa537988d68b020baf6c490303f556841bceb6fe7db3c54
 DIST libselinux-2.5.tar.gz 189019 SHA256 94c9e97706280bedcc288f784f67f2b9d3d6136c192b2c9f812115edba58514f SHA512 1c6718aa6fa05c8635427cd6f5a89ce47fb6bb9bd2fec417293122826695d1ebb0e0b86e83711abb5c4fe71c67dce6f2e18745592833d1711f0ab2d01246b8c7 WHIRLPOOL 96192b856d32a82b9b4413137085e69ad52cbf2e0d274603a90d904e9a318a80c83f337aef26f54c685a689972432955f0f9de67949e0bb4f844611df22d3589
-DIST libselinux-2.6-rc1.tar.gz 203034 SHA256 4ef2bbb1bdb1d0c43ed14b237066364b07bd1d2ae0a16dcd475bbf7793723928 SHA512 72a8a1d244fea3902cecff69fda48c1bc8d7ce1789902126565272782105bd43205e517af8a4cac5cc5cab47c48f0cd3b287c42a408ae3889b51b19b0b38632b WHIRLPOOL b9012b74a3f073e25b63d83003194f23f7177cdd0e33443de87ff7491e0ecffa72eea07be04247cafd3045773427dbf98f592e02346c8fa32bc161be624cc2b4
-EBUILD libselinux-2.5-r1.ebuild 4673 SHA256 a9a3d62c0178d4024f5329d78dc90e6e494221b11983b21e01f9470e9d46e2da SHA512 ea673de764cb75e8fbd96e72acad606a1d0d067f518e0ff35d73ac180222f28b7fd39900531670c6ad5c34c52088494b53c5add2eb6d75eca8a4554719ebc450 WHIRLPOOL b679604b360ca8189182811370b24f709cbadc7417deda6d60a75601ecf82fa69ea8daeae06c4698b1a755a78846cda6fce65ab543e0c79c836e6d9fe76d4538
+DIST libselinux-2.6-rc2.tar.gz 203126 SHA256 c0e297a046a2e07f9dbe14ef0ea8a36b44afeaf798fd51189638939eea741be7 SHA512 6e2c03a8bd41f08e5d45693862e13db7373dec639bd6962d1398644b1b1b1351d845fd93f8a952be3387af8242e17badd0a2e8e2b31d542f1d9e227d45e38d39 WHIRLPOOL 636702cdf5c7ea151fcc904712da3b419d0a50bf45d45dbe83ecb7b1dc418a8a179356f2af5a7d92179c82e1da7ec0f809b6c320dff0fa56ab588a852cc35dfe
+EBUILD libselinux-2.5-r1.ebuild 4671 SHA256 f7d09708d07f7ca9a2e78ae7771a7b3d13d9b627da46732cfc6ed91980612905 SHA512 94f9ed4418362ea22e153acf735c97ad5797e83fb4b4b679f35a8133e1f33b2b6e7888d41e4efafd340f7fa5845d4d3c3e28309e6b8dc041a602a9fd543254f8 WHIRLPOOL 43b6bfa8010e4b2e10ff65808b82af1200554a6e1b9f823aa6a14bc46214bd1163ab3b2ba105d1140cdee928f75f5bcd89461fa4d7ac6b75a5504f9339c9b72a
 EBUILD libselinux-2.5.ebuild 4135 SHA256 01302b05e90766aa38d2e812ac7e6971c98955e9e2300c18ad0e5273f8972fd1 SHA512 8ec90988ad3a14256c564c34233d4f613bb1885045acb71a54f1687dd40fcd1a184df86ee56fd4345a60c2a31cfd88c6376339326a5faea731dcf1fe6f08174e WHIRLPOOL 717d544efd34b8fa4e9452498aba4f40efc53455d4da1ab5c76d68d8b5450e3a6d32ae802eb643c84165a16b9c54724f5471c38b691b3f315f8a67b07e007716
-EBUILD libselinux-2.6_rc1-r1.ebuild 4425 SHA256 e53d5b80e7532007e9981a0c3b4ec1d78ef30713a47f133783332e9966e6ea05 SHA512 53c62b6e891c475070046cb5891531cc26e9cc97ab626e55a80df2f021e512ea4e17f1ecfe0643bbdf5132255adba5b7498ea6e02a6df241f529be1e1f22f487 WHIRLPOOL e0015add72a99d4e938119d8243c95a02768d404c076910fbfca0ea42aedf93d08d7a1c147067cc28e841422bf2eb34e7953c27b0036ebaf986a152089ed490d
-EBUILD libselinux-9999.ebuild 4327 SHA256 da4db34d4c962e3abba926653b8ff3c5f957e360d3c0c14a73d28544a0eeb183 SHA512 c27f32b9930cc5588ebb46a85b683246ce9514df5f4639fa0e27616bb944f1c9f8b3a5fe9f6b07ee3f5c48652f1db2b29db3b7a80278296aa0a3bd57d3bacc68 WHIRLPOOL 59a3a29e77606b52e3a45682bcc0d5328267047ec84b83d805676aae2bea1601969648fca0203ccd65c80c68a6f12e72fa081849690ce84a776eb7b7061e5fbd
+EBUILD libselinux-2.6_rc2.ebuild 4327 SHA256 1effc266e2d113168d36fcdbdf861002832059002b1473930d096ec38f554abd SHA512 5a1a70c945b8d27fa656a2b802a14321d0e542b30219e92815a175c1329243270bf414437ef35658fb9b19346dd32a921ac7c47f0e196d689cfee09434b83d55 WHIRLPOOL 824e3b61824580ab7e3357b219f95bb42022ba94692ffd2a798286d6b9ce6e91a477940daee3ef7caa433a86831759369fcde3d52577b046d50185622bec02c0
+EBUILD libselinux-9999.ebuild 4327 SHA256 1effc266e2d113168d36fcdbdf861002832059002b1473930d096ec38f554abd SHA512 5a1a70c945b8d27fa656a2b802a14321d0e542b30219e92815a175c1329243270bf414437ef35658fb9b19346dd32a921ac7c47f0e196d689cfee09434b83d55 WHIRLPOOL 824e3b61824580ab7e3357b219f95bb42022ba94692ffd2a798286d6b9ce6e91a477940daee3ef7caa433a86831759369fcde3d52577b046d50185622bec02c0
 MISC ChangeLog 5679 SHA256 c25a8dba2fc0ab7047eb632bcaf7cc41a9570e39e6ab47931aae74b66db53a78 SHA512 3f5ace2d21dd8e644f617d7b4d2f4fce06b4f9515c434d77039785dec8874730e3aa898d16bdeb9df0b788b54596ea63334eaeea0dd824850d708054ae10eb4b WHIRLPOOL 1d3f8377be3981a231cdb63df63a48df7a626cdbbb6ddc180cde766b97dce3011a3f8b5ae2f7c8d9c50861648c474614bd8018de78c041c08776ff38a0dc7c4a
 MISC ChangeLog-2015 21667 SHA256 3c8ecd29df3b5dd6b0b751dde592c1be7ad4d3c58fc6abc4ff5ddf1fa0dff484 SHA512 d9599d12aa78d4b97f74d989132b5def6d3ad3f34792457795bea1b3bdc1a06f0532cafb3d932339dbf7576fa68bd2422af1e5f5cccb36f74d0ca09dfc6145e1 WHIRLPOOL e5901ad1fbcf84db8c915e51d56da7f72d3703410113e82cddaf08979bf79a4886a5618cfa922a1f564ad2fb14694e6f46a97b3519a31e33d983f84e2ca414fe
 MISC metadata.xml 676 SHA256 288211da34dc4cabaeaa85c52462c3ad2792347abbf88f78eae812a4e3dc8c8c SHA512 7b33e0d113637a129a7894d8720feb9024d67466b86d475fbc3398f514b2ecc28c70dc759952376208d2022a00658eb120fc3561edbb9c7ecdc4404bed5f57a7 WHIRLPOOL bd4938862e3ec119c1da448d5bc8c99a6063704a65c8a906514f5160adf65851af64c6a1c4626e97438e9f4a7288ef002b06a876b9d73e67d70e38ca31cc1319
diff --git a/sys-libs/libselinux/files/libselinux-2.6-0001-libselinux-selinux_restorecon-fix-realpath-logic.patch b/sys-libs/libselinux/files/libselinux-2.6-0001-libselinux-selinux_restorecon-fix-realpath-logic.patch
deleted file mode 100644
index 3a0d7fb87cac..000000000000
--- a/sys-libs/libselinux/files/libselinux-2.6-0001-libselinux-selinux_restorecon-fix-realpath-logic.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From aa0c824bb2eeb8960ba02133faade72c837ea951 Mon Sep 17 00:00:00 2001
-From: Stephen Smalley <sds@tycho.nsa.gov>
-Date: Wed, 5 Oct 2016 10:45:35 -0400
-Subject: [PATCH] libselinux: selinux_restorecon: fix realpath logic
-
-The realpath logic in selinux_restorecon() was taken from the
-Android libselinux fork.  However, bionic dirname() and basename()
-do not modify their argument and therefore are safe to call on a
-const string.  POSIX dirname() and basename() can modify their argument.
-There is a GNU basename() that does not modify its argument, but not
-for dirname().
-For portability, create copies of the original pathname for each call
-and keep them around until finished using the result.
-
-Fixes "restorecon -r goes up the tree?" bug reported by Jason Zaman.
-
-Reported-by: Jason Zaman <jason@perfinion.com>
-Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
----
- libselinux/src/selinux_restorecon.c | 26 +++++++++++++++++++++-----
- 1 file changed, 21 insertions(+), 5 deletions(-)
-
-diff --git a/libselinux/src/selinux_restorecon.c b/libselinux/src/selinux_restorecon.c
-index 0945138..e38d1d0 100644
---- libselinux/src/selinux_restorecon.c
-+++ libselinux/src/selinux_restorecon.c
-@@ -797,25 +797,41 @@ int selinux_restorecon(const char *pathname_orig,
- 	 * realpath of containing dir, then appending last component name.
- 	 */
- 	if (flags.userealpath) {
--		pathbname = basename((char *)pathname_orig);
-+		char *basename_cpy = strdup(pathname_orig);
-+		if (!basename_cpy)
-+			goto realpatherr;
-+		pathbname = basename(basename_cpy);
- 		if (!strcmp(pathbname, "/") || !strcmp(pathbname, ".") ||
- 					    !strcmp(pathbname, "..")) {
- 			pathname = realpath(pathname_orig, NULL);
--			if (!pathname)
-+			if (!pathname) {
-+				free(basename_cpy);
- 				goto realpatherr;
-+			}
- 		} else {
--			pathdname = dirname((char *)pathname_orig);
-+			char *dirname_cpy = strdup(pathname_orig);
-+			if (!dirname_cpy) {
-+				free(basename_cpy);
-+				goto realpatherr;
-+			}
-+			pathdname = dirname(dirname_cpy);
- 			pathdnamer = realpath(pathdname, NULL);
--			if (!pathdnamer)
-+			free(dirname_cpy);
-+			if (!pathdnamer) {
-+				free(basename_cpy);
- 				goto realpatherr;
-+			}
- 			if (!strcmp(pathdnamer, "/"))
- 				error = asprintf(&pathname, "/%s", pathbname);
- 			else
- 				error = asprintf(&pathname, "%s/%s",
- 						    pathdnamer, pathbname);
--			if (error < 0)
-+			if (error < 0) {
-+				free(basename_cpy);
- 				goto oom;
-+			}
- 		}
-+		free(basename_cpy);
- 	} else {
- 		pathname = strdup(pathname_orig);
- 		if (!pathname)
--- 
-2.7.3
-
diff --git a/sys-libs/libselinux/libselinux-2.5-r1.ebuild b/sys-libs/libselinux/libselinux-2.5-r1.ebuild
index 51e5c29e746e..a93562f392ff 100644
--- a/sys-libs/libselinux/libselinux-2.5-r1.ebuild
+++ b/sys-libs/libselinux/libselinux-2.5-r1.ebuild
@@ -22,7 +22,7 @@ if [[ ${PV} == 9999 ]] ; then
 	S="${WORKDIR}/${MY_P}/${PN}"
 else
 	SRC_URI="https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/${MY_RELEASEDATE}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~mips x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-libs/libselinux/libselinux-2.6_rc1-r1.ebuild b/sys-libs/libselinux/libselinux-2.6_rc2.ebuild
similarity index 97%
rename from sys-libs/libselinux/libselinux-2.6_rc1-r1.ebuild
rename to sys-libs/libselinux/libselinux-2.6_rc2.ebuild
index fe8c78bde01e..0c6c84222e02 100644
--- a/sys-libs/libselinux/libselinux-2.6_rc1-r1.ebuild
+++ b/sys-libs/libselinux/libselinux-2.6_rc2.ebuild
@@ -11,7 +11,7 @@ inherit multilib python-r1 toolchain-funcs multilib-minimal
 
 MY_P="${P//_/-}"
 SEPOL_VER="${PV}"
-MY_RELEASEDATE="20160930"
+MY_RELEASEDATE="20161006"
 
 DESCRIPTION="SELinux userland library"
 HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
@@ -47,7 +47,6 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	if [[ ${PV} != 9999 ]] ; then
 		# If needed for live builds, place them in /etc/portage/patches
-		eapply "${FILESDIR}/libselinux-2.6-0001-libselinux-selinux_restorecon-fix-realpath-logic.patch"
 		eapply "${FILESDIR}/libselinux-2.6-0005-use-ruby-include-with-rubylibver.patch"
 		eapply "${FILESDIR}/libselinux-2.6-0007-build-related-fixes-bug-500674.patch"
 	fi
diff --git a/sys-libs/libselinux/libselinux-9999.ebuild b/sys-libs/libselinux/libselinux-9999.ebuild
index 84092cb7eb1d..0c6c84222e02 100644
--- a/sys-libs/libselinux/libselinux-9999.ebuild
+++ b/sys-libs/libselinux/libselinux-9999.ebuild
@@ -11,7 +11,7 @@ inherit multilib python-r1 toolchain-funcs multilib-minimal
 
 MY_P="${P//_/-}"
 SEPOL_VER="${PV}"
-MY_RELEASEDATE="20160930"
+MY_RELEASEDATE="20161006"
 
 DESCRIPTION="SELinux userland library"
 HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
diff --git a/sys-libs/libsemanage/Manifest b/sys-libs/libsemanage/Manifest
index fc7803f04997..7c8fec81cc53 100644
--- a/sys-libs/libsemanage/Manifest
+++ b/sys-libs/libsemanage/Manifest
@@ -1,11 +1,10 @@
 AUX libsemanage-2.4-build-paths.patch 1322 SHA256 2c0b7a433b450a1af1fe700be31b64add02694fb5b850dcee859a140320be697 SHA512 dc667b90503847702c80e456549c2d4f94b6e4aa56d0babcb15dfd16a8f0f77db6807858eb8ddd204af8856bdcff0e34fb23f77f88b37a02f74f823d97dafb61 WHIRLPOOL 8fc48dc15f123d5001b5ee96be8b86a9c28f55d682db4d4aa495ccd1c3edf5774b318fa93036024fb1bed7d10c7cfa52cbbf7c4ea70d854a177d487a3478212b
-AUX libsemanage-2.6-0001-libsemanage-Fixes-bug-preventing-the-installation-of.patch 3792 SHA256 216a85b78ac8c0e2169dc32085e3e8b6a316a23979e30af23983619eb185fb9a SHA512 bf36a6e4593c88d3aeea914da1c13aff65af509f56995e00289cddaf0e0f9b9df43a5601be2511c3cf22a9462cfbdb6448d84245480fdf8d268b1422da346458 WHIRLPOOL ff4a6311d5c5c08d2181fb2e329e827c20e44b1341aa0cad5134402b3a038aa2aee0b6c26eebaa3ef61c0d36aa5e8b963bd0e4e94c679d9c629db87551994b43
 AUX libsemanage-2.6-build-paths.patch 1325 SHA256 83429eb03458ca686f6a682a7d815b6726935cf2f8de27e9e43357a57c9a2065 SHA512 06fb96608f27169efde64bf679b8cc3e337857e4b6cf0743953f96be7df382e11ea0a20837d854c73dc5c216cee8f9723e23b17fa1a7844d3a4b7ef4ebe937d2 WHIRLPOOL 45fb38af7936b535f196cd9f028e89c80d5138cece7fb8e575c38c1043b961e9f6fc8c8f9378685b3cd12eab6c234d3dc80589f5b0aa99c76d26905f8b181583
 DIST libsemanage-2.5.tar.gz 152884 SHA256 46e2f36254369b6e91d1eea0460c262b139361b055a3a67d3ceea2d8ef72e006 SHA512 cf644b77d8a24f76c630ece582df1b49a0c5f48f1c9f79b1caee0df10372008954406974472a072360dbe6de5ebc19b1b21bb247084d75b7186f61b32f33b8ec WHIRLPOOL 397b7fd2e9b2c00dbc2f58bdc023501dcd7ecf1212fef9ad7993b4763a041068416ef06552c0abf0beef8c69f4704933feca36951866c43d867181332971f6be
-DIST libsemanage-2.6-rc1.tar.gz 155844 SHA256 3c4706c0b72a0ff6f4968eb5d7ecffe9faa1ea831036d6fe13f37927183fa4b5 SHA512 e1930039ad94b166726256a9422f948b600c29f963f420bdaf4afa891743e5144984acefac7226f05f4f3e20708a9b5788e450124633bc25337a591f02ff7ba5 WHIRLPOOL ca0e3707ff089d10d35f84abcdb8c3df983dbd39259acabe72b804216dcd8d762efe8b03fd2d1cca79d29c079a7ae4f624f33f60cbe6a71dcbf5f1d413d85f98
+DIST libsemanage-2.6-rc2.tar.gz 155934 SHA256 672bd1c3c6faeca483d90515a03ac9b65b6596064f49cd4cfbbb53c186d08a47 SHA512 fb794738d7497709441248b1ba3abe35aac7bbfaf7dc875d0c50733f871e5e90b209aefe912584f1e08d3aba596dd569caad749c236440662ba16b1c64727511 WHIRLPOOL afd746fca0b4d2a616996ca7346242f50ab35591df050ede9805a9e8aa958a4c8b474a62fd10aea99971f0bf7507a1d0d9d6e4e7b79b8095eea32feeaba1a2d6
 EBUILD libsemanage-2.5.ebuild 4575 SHA256 4582be7ca80b1024592aa8669644f81e9a12832b0ae5abf4e3ddfa85421450ae SHA512 5ff8f7098463c4dd2284e495ecdbf9f9a7b31fddf2f5a3a0893874151c6de154124b5f5530dd44d911e4f94da72ed59a607d6e90d17cd746aef527677ba2a9a9 WHIRLPOOL 3fc220facd64840f506050efc101144a23e3fafc84c720df346a455ec7fe6b1690a696da6869090f114a116a9ad505d5fe23887f8024f41fb93b39d0613eff12
-EBUILD libsemanage-2.6_rc1-r1.ebuild 4840 SHA256 0591c99ff82513b6853596ae8e664766a956da1a197d9ff9c41aacfdff46c242 SHA512 f0e2146176445371dd7bf0e32017823cf1e572b206e68490b68f4327579b23a1df92f73af927b31a91be9252bbf3e258f7032f4d0f2e56df3ab78e939d1f5a2d WHIRLPOOL 3780c5daf2a92db50263abdd727539c46a1fb5a0005c5708d0f57fe9a7ac4a8f79e6157ce28a5708d3b64bfe9e6ac017aae7fda0fadb855600018a2ed7e5c151
-EBUILD libsemanage-9999.ebuild 4744 SHA256 6501c6d9d2821c195d13dfd125c1a87455947f8674a46a9e29221f23450e170a SHA512 4057f5ce1c2eeb835a6b7bd241f2ef90ba490df677262c336dbe30dd05c0323db16c030c6df657b7ff43a3138fc2351c95504b313f7bc07632e3f3efa85b901f WHIRLPOOL 1d5f7accfb3174c6cfaef55a0d0540c9c33c83c3cb6f2af6225755c7f433383aa22987cec9686ce631003148f21e38c24a53fe9fbcbc14d5b427975751ab7b52
+EBUILD libsemanage-2.6_rc2.ebuild 4744 SHA256 24e9b9aef86d23f60abc99fed0f5bf9d84e6b376bca8ad1636b465f9b505df54 SHA512 bf951b0f50023fc930d70f9f726b8eebeca1ca7aa68e2404c9341a68daf59f8040e76c6a285ed07daabfa1dfc1a9a2f8ccd2518818b65ac62f84812a36141a6c WHIRLPOOL 4dc08a4ec34c3ee7279cb83190f24832ad367f63536081af023d65b11ea77cf2c788436c52f18bf84fe06de14c0e6127a55c6e089ac423fd2f18352c967a9c60
+EBUILD libsemanage-9999.ebuild 4744 SHA256 24e9b9aef86d23f60abc99fed0f5bf9d84e6b376bca8ad1636b465f9b505df54 SHA512 bf951b0f50023fc930d70f9f726b8eebeca1ca7aa68e2404c9341a68daf59f8040e76c6a285ed07daabfa1dfc1a9a2f8ccd2518818b65ac62f84812a36141a6c WHIRLPOOL 4dc08a4ec34c3ee7279cb83190f24832ad367f63536081af023d65b11ea77cf2c788436c52f18bf84fe06de14c0e6127a55c6e089ac423fd2f18352c967a9c60
 MISC ChangeLog 5596 SHA256 dad3afd77571d3cdb72c13d3dbd740b2a3188c19c155c6703de477a763c04df8 SHA512 9fc44c397218b1c52fb4468b1447cd9d02793a6997ac2c0f96bfcb8dc869c173e0607414e2d32ea810f88376d9e38348c2de58112fdc8b555a4a922df61e5add WHIRLPOOL 8dddecfb5406405f4cb7802567f4463f119500251d25dab7fe6ff3ee532e66f0be0877e8c78503838ea2571627e12b9adc979bbd2ca1e27ce33bf74cfc4e7189
 MISC ChangeLog-2015 13938 SHA256 d7938bb036a37dc37a0d2654be04c655b30cf54cb8c4f019e4f6549ffe3179da SHA512 e006775684003b4a7bd9e77f9fdf173bc1402e3cf05aad684b2e31c1942e8d2a268e7ffa19164a94e04e07f7977c1fdefbaaabf021f4ea4e6e8e8e463f69be3c WHIRLPOOL e87415fff3ee0136db7905a45881fdeed6a46b5dbbbf487fc62adba321a99f747f4eb5c549feb8093ffa22bc8369a60e5370638674a4db2c0aa2a4c020cf4230
 MISC metadata.xml 406 SHA256 0209a41b2fe792b837de815e5e6b2a34fd06890b015a0cb578961d4c63b50381 SHA512 742aba47cdd9ad8f97fcb03a01cc2552c6e1d715f6b717c9dff2ae86ab34b850745888e4f2e3963ec2c258cf16a33cb161205f4ea72563446eada82f6c298479 WHIRLPOOL e00029ce45c8ffa5247ab3a4bcd7afc3f36e4d4a61038ec2075bba0e984cbe6a68a2ffe79a7aee9b3954bbabce5c985376889ce9187613f32bf898bb3300a59b
diff --git a/sys-libs/libsemanage/files/libsemanage-2.6-0001-libsemanage-Fixes-bug-preventing-the-installation-of.patch b/sys-libs/libsemanage/files/libsemanage-2.6-0001-libsemanage-Fixes-bug-preventing-the-installation-of.patch
deleted file mode 100644
index 8f99b768efbd..000000000000
--- a/sys-libs/libsemanage/files/libsemanage-2.6-0001-libsemanage-Fixes-bug-preventing-the-installation-of.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 9d25ca61603a2eed08d1b58b25c81f878c729474 Mon Sep 17 00:00:00 2001
-From: James Carter <jwcart2@tycho.nsa.gov>
-Date: Mon, 3 Oct 2016 14:15:40 -0400
-Subject: [PATCH] libsemanage: Fixes bug preventing the installation of base
- modules
-
-Commit 7a728e46 changed module installation so that a module pp would
-be installed using its module name instead of its filename and a warning
-would be printed if they were different. With this change, base modules
-could no longer be installed because of the way error handling was done.
-
-This change fixes the error handling, so that when a base module is
-installed it will be installed using its filename (since it does not
-have a module name).
-
-Based on bug report by Jason Zaman
-
-Signed-off-by: James Carter <jwcart2@tycho.nsa.gov>
----
- libsemanage/src/direct_api.c | 39 ++++++++++++++-------------------------
- 1 file changed, 14 insertions(+), 25 deletions(-)
-
-diff --git a/libsemanage/src/direct_api.c b/libsemanage/src/direct_api.c
-index 3719cb1..e5c72cd 100644
---- libsemanage/src/direct_api.c
-+++ libsemanage/src/direct_api.c
-@@ -368,7 +368,7 @@ static int semanage_direct_begintrans(semanage_handle_t * sh)
-  * 'version' to module's version.  The caller is responsible for
-  * free()ing 'module_name', and 'version'; they will be
-  * set to NULL upon entering this function.  Returns 0 on success, -1
-- * if out of memory, or -2 if data did not represent a module.
-+ * if out of memory.
-  */
- static int parse_module_headers(semanage_handle_t * sh, char *module_data,
-                                size_t data_len, char **module_name,
-@@ -384,23 +384,10 @@ static int parse_module_headers(semanage_handle_t * sh, char *module_data,
-        }
-        sepol_policy_file_set_mem(pf, module_data, data_len);
-        sepol_policy_file_set_handle(pf, sh->sepolh);
--       if (module_data == NULL ||
--           data_len == 0 ||
-+       if (module_data != NULL && data_len > 0)
-            sepol_module_package_info(pf, &file_type, module_name,
--                                     version) == -1) {
--               sepol_policy_file_free(pf);
--               ERR(sh, "Could not parse module data.");
--               return -2;
--       }
-+                                     version);
-        sepol_policy_file_free(pf);
--       if (file_type != SEPOL_POLICY_MOD) {
--               if (file_type == SEPOL_POLICY_BASE)
--                       ERR(sh,
--                           "Received a base module, expected a non-base module.");
--               else
--                       ERR(sh, "Data did not represent a module.");
--               return -2;
--       }
- 
-        return 0;
- }
-@@ -1608,22 +1595,24 @@ static int semanage_direct_install_file(semanage_handle_t * sh,
- 		lang_ext = separator + 1;
- 	}
- 
--	if (strcmp(lang_ext, "pp") != 0) {
-+	if (strcmp(lang_ext, "pp") == 0) {
-+		retval = parse_module_headers(sh, data, data_len, &module_name, &version);
-+		free(version);
-+		if (retval != 0)
-+			goto cleanup;
-+	}
-+
-+	if (module_name == NULL) {
- 		module_name = strdup(filename);
- 		if (module_name == NULL) {
- 			ERR(sh, "No memory available for module_name.\n");
- 			retval = -1;
- 			goto cleanup;
- 		}
--	} else {
--		if ((retval = parse_module_headers(sh, data, data_len, &module_name, &version)) != 0)
--			goto cleanup;
--
--		if (strcmp(module_name, filename) != 0)
--			fprintf(stderr, "Warning: SELinux userspace will refer to the module from %s as %s rather than %s\n", install_filename, module_name, filename);
--
--		free(version);
-+	} else if (strcmp(module_name, filename) != 0) {
-+		fprintf(stderr, "Warning: SELinux userspace will refer to the module from %s as %s rather than %s\n", install_filename, module_name, filename);
- 	}
-+
- 	retval = semanage_direct_install(sh, data, data_len, module_name, lang_ext);
- 
- cleanup:
--- 
-2.7.3
-
diff --git a/sys-libs/libsemanage/libsemanage-2.6_rc1-r1.ebuild b/sys-libs/libsemanage/libsemanage-2.6_rc2.ebuild
similarity index 97%
rename from sys-libs/libsemanage/libsemanage-2.6_rc1-r1.ebuild
rename to sys-libs/libsemanage/libsemanage-2.6_rc2.ebuild
index daaa79f8b717..2b625f502cbf 100644
--- a/sys-libs/libsemanage/libsemanage-2.6_rc1-r1.ebuild
+++ b/sys-libs/libsemanage/libsemanage-2.6_rc2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit multilib python-r1 toolchain-funcs multilib-minimal
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20160930"
+MY_RELEASEDATE="20161006"
 
 SEPOL_VER="${PV}"
 SELNX_VER="${PV}"
@@ -72,7 +72,6 @@ src_prepare() {
 	echo "# decompression of modules in the module store." >> "${S}/src/semanage.conf"
 	echo "bzip-small=true" >> "${S}/src/semanage.conf"
 
-	eapply "${FILESDIR}/${PN}-2.6-0001-libsemanage-Fixes-bug-preventing-the-installation-of.patch"
 	eapply "${FILESDIR}"/${PN}-2.6-build-paths.patch
 
 	eapply_user
diff --git a/sys-libs/libsemanage/libsemanage-9999.ebuild b/sys-libs/libsemanage/libsemanage-9999.ebuild
index 76b2430f794d..2b625f502cbf 100644
--- a/sys-libs/libsemanage/libsemanage-9999.ebuild
+++ b/sys-libs/libsemanage/libsemanage-9999.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 inherit multilib python-r1 toolchain-funcs multilib-minimal
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20160930"
+MY_RELEASEDATE="20161006"
 
 SEPOL_VER="${PV}"
 SELNX_VER="${PV}"
diff --git a/sys-libs/libsepol/Manifest b/sys-libs/libsepol/Manifest
index 7b0f8892697c..ba6bf087a21b 100644
--- a/sys-libs/libsepol/Manifest
+++ b/sys-libs/libsepol/Manifest
@@ -1,8 +1,8 @@
 DIST libsepol-2.5.tar.gz 438730 SHA256 2bdeec56d0a08b082b93b40703b4b3329cc5562152f7254d8f6ef6b56afe850a SHA512 ea781a9a61ee7036abd221422f411451e15d01202de64b167c61886644d6e9ec81916dd770bc644ba2453ff177ac91f280be63df0e20b469b4f778ce3bfdedd9 WHIRLPOOL f1a4614eae84cd07eb909c88342628d5abd3db6123907c437c680e39930137f5d07f91ce46353fbd73f42d97126f1b70dffba814d791f3931e116daf391f4531
-DIST libsepol-2.6-rc1.tar.gz 441953 SHA256 467e69a1937effeac24c5a3dbdd76bc9967d83bd80deaa95bd28cee8cadda063 SHA512 3ec5627bf525a3499fb19464fc412c5ac2326365899b72b18d8d754003c34c1ac300c0fe359ae9e8f5ac3466a1c9c096716aa78ca00e31c6c78ee02ef62d822c WHIRLPOOL 0b0b61bccb6a018266998e43ae77908900775c291f3316a11fda697fbd91b2b9a8c3a1d7ee084b70ca9348c5b6ca23a0e9719cbd5972424d94b7c820ce51812c
+DIST libsepol-2.6-rc2.tar.gz 442673 SHA256 6c68aebc6fadc69e396d2d113b0862be64215231c39fdbacff552ee5b4b678a4 SHA512 1049932d951e9da9139b7372e3f54009aeebb0b1617c09f9d175e6a3fab853ce05c6f1cf7bc746b2b1ca87b24949914ad8c17f2a38ea5f0aa20b847061d22b8c WHIRLPOOL f874054310f827c36a6d96a2f0e9b944c97423e14a63e25b801c3c3a4c2136d815271a19d47249b372739cf6873709d9356414b3b6198ee54edf70df979d3fd8
 EBUILD libsepol-2.5.ebuild 992 SHA256 9abb87bba15e12f4936ba6976267eb2ecc40f24c508cd2aaf7c7286885c0ea6d SHA512 0f2acd446a9a6c407a3aba90c65fe308c0754ad78ec3a68a0190e8a63c84f53453762cb45094f6c38bbcd9ccd8115f9c37b0ec750a38ee1f7d9ee8bb47c5f838 WHIRLPOOL ae5bf248e48cd2fac69d0a1a8a78c2f0543b799cd65d779d8f8d7a0b5b7694dee0890a621e154d5c905243aa2cfbae18b5719a5d2fc4f1fd491fdb9d2e35fc50
-EBUILD libsepol-2.6_rc1.ebuild 1169 SHA256 111ae928fc2ad338897d357d53694714dd508a6c76dfdc1a6fbd9ec2a5ebfb78 SHA512 90cd9ae20a1e2d22e3ad27ffee10c39518b04d847e1de20beca8e0e93181f79a9d424c0695c5ee68b5560b6a226978b52d53a1618059a10a22d5e044012c2260 WHIRLPOOL 0f869eda0e851bdc8ae41188ffabda740297069af3f8e7254e8872e4d8cd9964b21b455bb7c1c2ca418f031cbc94693459a0eaec25acae871ee430b3705ffe3c
-EBUILD libsepol-9999.ebuild 1169 SHA256 111ae928fc2ad338897d357d53694714dd508a6c76dfdc1a6fbd9ec2a5ebfb78 SHA512 90cd9ae20a1e2d22e3ad27ffee10c39518b04d847e1de20beca8e0e93181f79a9d424c0695c5ee68b5560b6a226978b52d53a1618059a10a22d5e044012c2260 WHIRLPOOL 0f869eda0e851bdc8ae41188ffabda740297069af3f8e7254e8872e4d8cd9964b21b455bb7c1c2ca418f031cbc94693459a0eaec25acae871ee430b3705ffe3c
+EBUILD libsepol-2.6_rc2.ebuild 1169 SHA256 c7cfc60be93956c056cedfc2c70096c6d7b0119e24ff059cf6c4768a36e2730f SHA512 d01bf9b4946c7ba431c8434a608964548da58b7c6946d5461eb2ca06c2beb93b403f18cfb5fa8036149e1250c4f0cdde5a46581c3dec1e3aa9a38a836ada2c40 WHIRLPOOL f1ec2d471b41baf427ace2688ec32679e17bb3b2c04547aeccc07c686be6e72e9a4498201e1180874b120d02c4ad9fe9f1452238606912285d3f53896c6a7e9d
+EBUILD libsepol-9999.ebuild 1169 SHA256 c7cfc60be93956c056cedfc2c70096c6d7b0119e24ff059cf6c4768a36e2730f SHA512 d01bf9b4946c7ba431c8434a608964548da58b7c6946d5461eb2ca06c2beb93b403f18cfb5fa8036149e1250c4f0cdde5a46581c3dec1e3aa9a38a836ada2c40 WHIRLPOOL f1ec2d471b41baf427ace2688ec32679e17bb3b2c04547aeccc07c686be6e72e9a4498201e1180874b120d02c4ad9fe9f1452238606912285d3f53896c6a7e9d
 MISC ChangeLog 3391 SHA256 4e1489022a7ebc05879c432c16bca835d09fc8db022d69132e8be2e647d393c4 SHA512 ed1f22e6cd7af4f15a678dd0f4fa9a2206a1ae32aa98d91238088f1dbbc5d6e5df092be7f33e14e79deb22564d7e525b5a19eb759dc530c24c5d67ddb05f50e1 WHIRLPOOL 0720f53d9eb775b717a48e772f4233d746bdcc911ffe977dedcd29ae216809a173026df8d79de269df2c0c6daff3a4d19a03113655aec71291684183f0dec4b7
 MISC ChangeLog-2015 10342 SHA256 a41401fcb4dfd0082c5d55d20e95da9b3eff6a309f6e2ef97b9034f53cd96184 SHA512 be504b6afa14d27e557d678a504466eab37fd519ca7fb1f083f2a8a247d9a5ba832c820d6a5096a5ca0a0f13b54d5b1c527def12e134137535440493122d3184 WHIRLPOOL 2973b3b8e6449ad1ec6f6a250a9a148800a5d6d533abfbe58795e74aff9e82610bb032c5031ea7465c2058e0b3cac7585dea9da3c58421194793847a3fbbe238
 MISC metadata.xml 428 SHA256 786c53bd0eee5b2d84990b9fc63ef2ef1ca8d0455f48f912a4b3e76c84b6c99f SHA512 14093ec1e86ac7b7521ab02ace725347013e11628e22cf3ed5362cfe7f30a180374ab00747b58ae251afbb3fabbeb4e328bda798e512bfac9bad643206835192 WHIRLPOOL ccaea270553624ba0a42e06d15d001b78c384df8708dadbc26f064d049feb9808993d1353ecf3a8a69200d490de54e34d8a0db9d0b397ea02207c1f4e9d24aa1
diff --git a/sys-libs/libsepol/libsepol-2.6_rc1.ebuild b/sys-libs/libsepol/libsepol-2.6_rc2.ebuild
similarity index 97%
rename from sys-libs/libsepol/libsepol-2.6_rc1.ebuild
rename to sys-libs/libsepol/libsepol-2.6_rc2.ebuild
index 521d7760d121..c9f9cf424ca0 100644
--- a/sys-libs/libsepol/libsepol-2.6_rc1.ebuild
+++ b/sys-libs/libsepol/libsepol-2.6_rc2.ebuild
@@ -7,7 +7,7 @@ EAPI="6"
 inherit multilib toolchain-funcs multilib-minimal
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20160930"
+MY_RELEASEDATE="20161006"
 
 DESCRIPTION="SELinux binary policy representation library"
 HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
diff --git a/sys-libs/libsepol/libsepol-9999.ebuild b/sys-libs/libsepol/libsepol-9999.ebuild
index 521d7760d121..c9f9cf424ca0 100644
--- a/sys-libs/libsepol/libsepol-9999.ebuild
+++ b/sys-libs/libsepol/libsepol-9999.ebuild
@@ -7,7 +7,7 @@ EAPI="6"
 inherit multilib toolchain-funcs multilib-minimal
 
 MY_P="${P//_/-}"
-MY_RELEASEDATE="20160930"
+MY_RELEASEDATE="20161006"
 
 DESCRIPTION="SELinux binary policy representation library"
 HOMEPAGE="https://github.com/SELinuxProject/selinux/wiki"
diff --git a/sys-libs/llvm-libunwind/ChangeLog b/sys-libs/llvm-libunwind/ChangeLog
index d03b5537f8db..b19f28bcd622 100644
--- a/sys-libs/llvm-libunwind/ChangeLog
+++ b/sys-libs/llvm-libunwind/ChangeLog
@@ -42,3 +42,9 @@
   Add MULTILIB_USEDEP on sys-devel/llvm since the needed CMake files are
   installed in ABI-specific lib* directory.
 
+*llvm-libunwind-3.9.0-r1 (06 Oct 2016)
+
+  06 Oct 2016; Michał Górny <mgorny@gentoo.org> -llvm-libunwind-3.9.0.ebuild,
+  +llvm-libunwind-3.9.0-r1.ebuild, llvm-libunwind-9999.ebuild:
+  Install headers, req for #596340
+
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index f8f0046cb132..bcf610adebcc 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -3,7 +3,7 @@ AUX libunwind-3.9-cmake-static-lib.patch 1855 SHA256 1b6d6abbb687eb691a1907288c3
 DIST libunwind-3.8.1.src.tar.xz 60596 SHA256 21e58ce09a5982255ecf86b86359179ddb0be4f8f284a95be14201df90e48453 SHA512 2a60d7c4b0aee6c58f50089ac9fa2b756ab1d74faaee32f7436ddace4510589c7ffdd20478919966ed2fa8a23ee1b5d1b26115dbd8ee2834b00b5bcd61d00b14 WHIRLPOOL f2756de12d39de2df9bf06be3024327b3ca37f2537aae17efda6e94fb9807c31cab1a2eb070aca8e7e44467ab51c69fecbeef063e07472ec59657309a16bdd1c
 DIST libunwind-3.9.0.src.tar.xz 61764 SHA256 66675ddec5ba0d36689757da6008cb2596ee1a9067f4f598d89ce5a3b43f4c2b SHA512 dce384bea99ed61b363b847e20946fc9d70377389a227cc7054fbaa916e7cb5ba0b9d89f0df6ed33409dbf38beefd3654c18c1abcf0e50b5d0315ce0135a1d25 WHIRLPOOL 3fddaf6a06390143beee04d0e73ac0b66fb27c5497b80309ca314a52fd67d49ae3806b2b7588f07185c49339a75b7549bbf303f50224916f1ed65f6ad82415d0
 EBUILD llvm-libunwind-3.8.1.ebuild 893 SHA256 f53fa7056987ad9bd54c4ffe49c2ebb65d48fd8512bd5d53032d868c9d45c2e3 SHA512 f82cdaf70edcf76cf68455f284dd06288378197538f57ed1deb18b31cec561267ea12b3c255932495b45be75f65b1beb5908ac08b53e3932f823a8ff4e5a58ec WHIRLPOOL 761585fdf6f99d6aae3f25aee326e7d5d83490e6bb08f036507c61fc6ec81d8c43cc2a36225b7ae4b7872f7319fef6601dc9c014ba3cfc25c8625b3a71be3af3
-EBUILD llvm-libunwind-3.9.0.ebuild 1086 SHA256 2d46ff96437c550cf21fa7c4e0bf4f9c16c43400e81002f2317e56f87c78a5c9 SHA512 5c888c13dd4c18a0946e6353becbe6c27d4f2c973c1f609d697ad1451c6e5196559d926680ed8c34534998fd619a865324ab5d100802f3b0a3a3b157eb2c55d8 WHIRLPOOL b7eafb10794c577ea20c0cd632ea0ae2f16f655ecafd7bb3f184c4e3e6a4cf615d6ac53aeb1e19837c70225a0c7aa469822f2ac30a46eea5ea41f8d6cbc3363d
-EBUILD llvm-libunwind-9999.ebuild 942 SHA256 f5da569b2512dbad200be90bbebbc67c97b6de02633731dcc4482832643c5bcf SHA512 72468c44fb7935eda86266e46f83f959cf58e0876aa612a374b0cf76780fafbb69b889df052d146f8b9c870fb17d30e965e9b93e70e21da87c558dcb25ee2bcd WHIRLPOOL 228da65c5ad8c73bee5dcbd2ff780712f7c3f4c8b700c92008adfda6d65d2f68b13b9a0ad62b66cef70a63a6ba40b7ceac6cfc5af1c640389a07e8c9ca329b42
-MISC ChangeLog 1413 SHA256 72d4da8043aa72ced60c72364bc63e266773e983c33bfcf3594893f51689f1f8 SHA512 6596dca82817264339d31ad67342ee0247f62720526e168c19ca932327237eab0a8955a045198ab3ffeaeeac0b1f30a4fd36b9ac6a173a3a52e5479da2ee0f9c WHIRLPOOL 22ffbeb6302ebb62df3d5fb54bb98a31667cb76dff5c4b4f1ea9d421982146a2d6c351d51d13f318dceb7f59911d8b6b57dca40017a6b3f5b78e61d1ea4566dc
+EBUILD llvm-libunwind-3.9.0-r1.ebuild 1212 SHA256 ec62ae3171368f2eaead6fd19ca68241255451f5c9a514e02660d437b6b83fe8 SHA512 0837eb1fc47228f71dff527538551d5d6de3d9c2b6f19f74baedd7328739f006d18f9ea369e28c66ed12ee1c4209dbb03f6f18ea078b5b8b0118d98619dff1e1 WHIRLPOOL b59ad1f318bf94d2c875f67fddcdbfb16fa8b5182bc3dd60c5b00573c4d54d389a8af2eead0eb6a7a5ac4ccac921974bbe7db5fa78a4c19a8cedac3531759775
+EBUILD llvm-libunwind-9999.ebuild 1068 SHA256 f29c71c069ea967e94f46707f4192dec84191cbad020835e22b62c51fd9c6171 SHA512 30a69bf71f1d135116f94c035dbcd3b6d12430c001f25c7280a4d8e93d8c6a6c68422a150da4b7ad0ed4abd22e64819e790d6f1387ee23a0c2cdcfd8929ff499 WHIRLPOOL 42680dd6039c352bb6356dbcf142368a6e3e118c35a5e170d90b44deb3ee263ba0cb5efa24cf23396e332c88941ee7b47f995abc95b1bf89c50e3d86c17a8f1d
+MISC ChangeLog 1632 SHA256 b53287c438bcd44ae5f83379f90b140589fa914bad4f3f9ca9ffcf30440ed23d SHA512 0bd16c4e745548f2e80fccd162123a45dbf9cbf0ba414344ae4f5b690062f122b1813c23ce7a90efc2544b2a4f5ec2a3bfc15fac265391fc4046334781242245 WHIRLPOOL a7259e499c13e8e8d1abb1bb5e122df4f53db7ad6a6ada2f1387cd39bf5af1b94fa107373172f105132960f2594d20a599b4c353f704f72eeb3842e161f334ff
 MISC metadata.xml 216 SHA256 e94ba81dd2791908508a3993afdebf723cc617314c53c273b9bcca15a9c48327 SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5 WHIRLPOOL 29145f5721e079e0548c5ef22424c65e6a5b2bfc4428918e923fcfdfc37e9b8749fb63e3c2eb5773c17fab276f7513dd66e326b906f1848911dceba7ae4b419a
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-3.9.0.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-3.9.0-r1.ebuild
similarity index 89%
rename from sys-libs/llvm-libunwind/llvm-libunwind-3.9.0.ebuild
rename to sys-libs/llvm-libunwind/llvm-libunwind-3.9.0-r1.ebuild
index 1346f7ab91b7..e06514de5201 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-3.9.0.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-3.9.0-r1.ebuild
@@ -42,3 +42,10 @@ multilib_src_configure() {
 
 	cmake-utils_src_configure
 }
+
+multilib_src_install() {
+	cmake-utils_src_install
+
+	# install headers like sys-libs/libunwind
+	doheader "${S}"/include/*.h
+}
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild
index df6f7707c965..1fee4bf287a5 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-9999.ebuild
@@ -35,3 +35,10 @@ multilib_src_configure() {
 
 	cmake-utils_src_configure
 }
+
+multilib_src_install() {
+	cmake-utils_src_install
+
+	# install headers like sys-libs/libunwind
+	doheader "${S}"/include/*.h
+}
diff --git a/www-client/qupzilla/ChangeLog b/www-client/qupzilla/ChangeLog
index fc8348dc23f4..7ac6e3b01474 100644
--- a/www-client/qupzilla/ChangeLog
+++ b/www-client/qupzilla/ChangeLog
@@ -153,3 +153,10 @@
 
   Package-Manager: portage-2.2.28
 
+  06 Oct 2016; Michael Palimaka <kensington@gentoo.org> qupzilla-2.0.1.ebuild:
+  drop broken l10n handling
+
+  Gentoo-bug: 590942
+
+  Package-Manager: portage-2.3.1
+
diff --git a/www-client/qupzilla/Manifest b/www-client/qupzilla/Manifest
index db99399750a4..edcb4bff9305 100644
--- a/www-client/qupzilla/Manifest
+++ b/www-client/qupzilla/Manifest
@@ -6,7 +6,7 @@ DIST qupzilla-plugins-2015.10.02.tar.gz 335649 SHA256 9e167a6f1234b0b51c26cbd4ac
 DIST qupzilla-plugins-2016.05.02.tar.gz 425314 SHA256 276491a89daf1b64d6eab861b54d313e85c815d322bf51d47491f00ad22f55bc SHA512 b294ecb2372b3267603a43bc7412ab75d2cd29a8c4667331f0d2c74e3b0b99d0c2a005b9e4854c6d777894522bba9fb3b1607e85e8da6dcbaa760c9ddc6288f2 WHIRLPOOL 471807dc70dd3ea072f1e429a6e67ea97ecd5eadc02ac19debdcddfca4f5cb8e1767ad754aed1ff8a557f0734460a87b4e2d5e01ea57d07c473f48b006e32ef1
 EBUILD qupzilla-1.8.9.ebuild 3143 SHA256 5b926c63bf65da520be2a9455eeec033cb41ed60ba1a5f894930d5a2930508c7 SHA512 4f64b87cd7f7fd138f202671996ed5d72e6b7908bdc5465faab5ac5afbd109ca083c4f6f8e1aa97c5b7630054c41763a96801558418f6c9f289e4890df8a4da9 WHIRLPOOL 2cc613a7358605034e2478d40c9dfe62250c58e6c702658844807ea5a279c3748dc67edca14d48abac7ba92eab26ecfabc769ace60363a71a3da579c1212fad7
 EBUILD qupzilla-2.0.0.ebuild 2890 SHA256 9841dc427168ae57842ce58dea6e72186202d0ac954c67d5b7af86b4cbe3a836 SHA512 a9521079bc7128df0ee62973d8970e8ab3d9465175e62c797c41d42c80a247ed4402547f1e6e70e15b6c2dfb7bbf23718a2ddc6f83f973fb457e1d658c7c646d WHIRLPOOL 66157a2f702e945dfa0e304c9b3a4dfc351d5da03399dd26dc24f8ca375b814423209e57efea207c42076318360a0d2208363e2a9d4aa752835f6b18ce407135
-EBUILD qupzilla-2.0.1.ebuild 2903 SHA256 80d0b2bbd5de69628517a264fac36d8c9ecef89d7995f81ed6e030e9ed886b12 SHA512 60bc9ec44a4d558d0d81a71a2a0f2e3d9f7235ce0a173632bdeeec9379efe18b53fbe8aef360e29d2683139a7410e3948895920a3e27eb67cefebfb68e304f48 WHIRLPOOL c44593c4714046a793f6484af56a73a5326e12e9ebf67574500e4b70a71eb54bc9bea6ba0e21f7629e732908126f934ab0e3b5fd31bd2652487bd96efeed71b0
-MISC ChangeLog 4828 SHA256 38f7367f044b06eb4e402c1a38c72acb2d7d000bb66aa0799604fd10a8b12c4a SHA512 de234ec3f9a757925a9a27a28275f9f193d3621fe2a006b25faace0d32f2f6ea0a5e6f6472baa5ea035bde255a959a400a7fd65e6ddc124a59a98976fe7d4afc WHIRLPOOL 36ee0f0b4576034add2091dd49e656d7aeb1194b6abf0cef24104188ea19dce57f81ed21b6c7ef56c4e88ef80f9fadb31c04631d65419031146e1826195df53e
+EBUILD qupzilla-2.0.1.ebuild 2359 SHA256 d6e3f93593b9bf4a92798313f3306d35042b514ee088aadb41655ee943230fc9 SHA512 b2158ce9d91834baf808eeaf7fe2dc45f274bed72a871574bab0122b34abc29b0ad42dec27aa4ed07d1061b23aeece34689ee6e0ad8da9cb24723fecee3004e3 WHIRLPOOL c8e3138253319fc3df91cb83aed07c9e1169c0377f3d6543aca37592a12460137c246e2a73436346bb7694c6fc09d84fa1e54b29eae0e6245699bc0ec2e625a0
+MISC ChangeLog 4992 SHA256 a49a3cab347d62a79bcdaac70f8053e30587a7723eff80366f8f174ee8784ce7 SHA512 8ba7eb2dad5211a58b9fba5dfc2d49a3c15d9d839980054785b41a67620f1c9315b76d6d7dfd91b268b789cd63c6421f4f8f70c9e0a4ef85673ee3fcb2797183 WHIRLPOOL bbf5f9b0a3b9700b454babbbf48b3efb4669a0c2cd153cdfe9d50ef770690023c8a33605c9d933568bde481b44940127eb9a8039f9ecdd977e500dcdd13987fa
 MISC ChangeLog-2015 8942 SHA256 b2c7533cace9e417caee761506a654153767bca76af1eeac25cf66a3ad64705e SHA512 43f20aeb4bb9d2b1d2b7b051d5955f4e33fe67f3ffbd4933600beab97bb4d6a9396eb6fb507e6c9de3a2af83092a13bf05b3ef77a6d09e57b367c157c0d69534 WHIRLPOOL 83b892904657bd1207e8d54a7a935857ec2118f554a84f6557a36390dedca6a3b6ee107497054fe717dc075abeb78721e2dd6ad0636ff7fb7d25ed8576e2c633
 MISC metadata.xml 606 SHA256 41d59b11712e4b17f58d694251f1f66f8a1044150edae3f3fbb3065a600d34c2 SHA512 0934acb3284b7de961bb00f01364c8d3dc2493f8e5c1301dd20c7cceb2b9efdb72e5cdb46ad1d7194ea60d0d2bcfc69f20e6dccbe0a2cd66b68e6c8affb244f6 WHIRLPOOL 2316fbb974364e4e220211d3fe244b86a457f758fd6099818c975ac84b6eaa641b88767ab0750e8e1041bb27ef10a49df460d67e20d83dff18615545f5c18a7b
diff --git a/www-client/qupzilla/qupzilla-2.0.1.ebuild b/www-client/qupzilla/qupzilla-2.0.1.ebuild
index 42a3737accb5..cacbc2196cda 100644
--- a/www-client/qupzilla/qupzilla-2.0.1.ebuild
+++ b/www-client/qupzilla/qupzilla-2.0.1.ebuild
@@ -4,15 +4,10 @@
 
 EAPI=6
 
-PLOCALES="ar_SA bg_BG ca_ES cs_CZ da_DK de_DE el_GR es_ES es_MX es_VE eu_ES
-	fa_IR fi_FI fr_FR gl_ES he_IL hr_HR hu_HU id_ID it_IT ja_JP ka_GE lg
-	lt lv_LV nl_NL nqo pl_PL pt_BR pt_PT ro_RO ru_RU sk_SK sr
-	sr@ijekavian sr@ijekavianlatin sr@latin sv_SE tr_TR uk_UA uz@Latn
-	zh_CN zh_TW"
 PLUGINS_HASH='c332d306c0f6cf645c75eaf198d2fc5e12339e9e'
 PLUGINS_VERSION='2016.05.02' # if there are no updates, we can use the older archive
 
-inherit l10n qmake-utils
+inherit qmake-utils
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -69,21 +64,12 @@ src_prepare() {
 	# get extra plugins into qupzilla build tree
 	mv "${WORKDIR}"/${PN}-plugins-${PLUGINS_HASH}/plugins/* "${S}"/src/plugins/ || die
 
-	rm_loc() {
-		# remove localizations the user has not specified
-		sed -i -e "/${1}.ts/d" translations/translations.pri || die
-		rm translations/${1}.ts || die
-	}
-
 	# remove outdated prebuilt localizations
 	rm -rf bin/locale || die
 
 	# remove empty locale
 	rm translations/empty.ts || die
 
-	l10n_find_plocales_changes translations '' .ts
-	l10n_for_each_disabled_locale_do rm_loc
-
 	default
 }
 
diff --git a/x11-libs/fltk/ChangeLog b/x11-libs/fltk/ChangeLog
index fdb2b5234a6b..1bee9f742e2c 100644
--- a/x11-libs/fltk/ChangeLog
+++ b/x11-libs/fltk/ChangeLog
@@ -171,3 +171,11 @@
 
   Package-Manager: portage-2.3.0
 
+*fltk-1.3.3-r5 (06 Oct 2016)
+
+  06 Oct 2016; Alexis Ballier <aballier@gentoo.org> -fltk-1.3.3-r4.ebuild,
+  +fltk-1.3.3-r5.ebuild:
+  install fluid executable; bug #595246
+
+  Package-Manager: portage-2.3.1
+
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
index 0dd0025cd482..96d5a2fca724 100644
--- a/x11-libs/fltk/Manifest
+++ b/x11-libs/fltk/Manifest
@@ -12,6 +12,6 @@ DIST fltk-1.3.3-source.tar.gz 4986376 SHA256 f8398d98d7221d40e77bc7b19e761adaf2f
 EBUILD fltk-1.3.3-r3.ebuild 3810 SHA256 4e832165e17d67d3c495f754fc5179bea007517d141ae5c20282e637e657706c SHA512 28be69d0c5b3045f31bd5949d3c68e5ef15ed004881145279454a5ff2737695911e472008ba36192d4b59c826c864e7c5f33dd5b3489a2a34edf43225d89f1ec WHIRLPOOL 6884055f5d2ccb40e36a6dcd6959028636faa286a96682dbc7e09256fc5cc3373de463bd34ee265b2252c22d001d48cd9469e59741c6cbe5331d294cce446a5b
 EBUILD fltk-1.3.3-r5.ebuild 4440 SHA256 514880bf956e7c90a2193a2d3c7b8af79ad7b7c800753812db5179844f72f5a5 SHA512 4a444bf8a275cfc49e90f62c7fb8d310c6406524d3d9e196fde6acf418967e5d20fff8218693b915c1217ea704ce021f74951d990eec0ac8d7fa68634dae819e WHIRLPOOL e248c0aee8b867e93840e8729d890f6ace225d593b7e72192cf73cef89803495a5819ab652042cd95cf53093242db7eec198b1b92b3d69d4da23e5c8d79983e6
 EBUILD fltk-1.3.9999.ebuild 4318 SHA256 8ebefeb938511f82533245a0064ff5544af5d9950d9a19365d2aeab7d80a606e SHA512 48d6321ca79015f6f2b9408031bb4226f541d15bf6a09bede48fa3d1a700223d1021c9de2747586ab27a11ddf5426160eace0de3c6ad41aba7829a3500e52e6e WHIRLPOOL 1ba09066e01b28eedcf752d271b1076a50c232e192d90b39736eb3608dff4d5c2d5320066fcf6ef4ee8b41716f4d64113ccf796813a4d0d0eb66125474fd7cb2
-MISC ChangeLog 6014 SHA256 83138693d0492763a6f552ec215e0c98c2e50831187e2d773e21bf7759458043 SHA512 c61f57e828cb4627da3dc71b5425956aedf49f20bb4d2ca87a0760402feb0bb0170b3ad2d36e7c90461eced568418d0ea2dd07e33710231ebf6a113dfb801fe4 WHIRLPOOL 2896e2fef413c1f77bcb7e717154bede5a5973ceb9a974ef826b1e7b3f9b33e71f8a375231dcafa2f7e50dd2237eb6ec9524dcbccb43fab4ccdc4c0a09ece802
+MISC ChangeLog 6219 SHA256 40ae42140a97ed27a94cb44ebafca9951740dea6be6002ee6150c287f33fd4e2 SHA512 cd393db3ca17dcc155614b35a4e7a3e47c9f62276466b045317adc35a8a8976e76dc7af326fad8b84ae4f952775c709409cab709a8bb2c864fe294387764b864 WHIRLPOOL a06b82694639c22915fb011f850d0a288a3bb5991d144ba7e9fd13af88604394e8d61f9a326b3fa0fa2d17740f965377428af8ab07f89e6162bff22fff42fdb2
 MISC ChangeLog-2015 34960 SHA256 7b3d26e71182ec7e55f02fc1c724fcc18655c97c7061a7c6441f15f1a0c095fd SHA512 d2b9dddf6624e8c432db3ff22ec317054642ba7e3e9ec093bb8b35564f5a21def4158199ca4056b8dd773da957b60381099b2f40db2b33f6118b9100b3e1311e WHIRLPOOL 177b17b673199bd6b93d128c718d7c4f541f842e97d79cbca28e5aa70c6f170c105229cca3a35740635a067995969838e8bc84a9582070f4ed64a831ea44d7f9
 MISC metadata.xml 698 SHA256 cb439844f5d1ab2672a80746ca86f8c2339da770ea366acf10df1e7fe10786a4 SHA512 05565c7e9fe48f03536bdb10f0396c4d609ae7e52ecf6e1a04e956a3f8fa9ad68e2a79827ace0e51b60111859a4482054680b361fe7b391b824ebd39bdfbd24f WHIRLPOOL d64fa0d57232ca2617eb5203ee7aa31ecedb7e01003505ffc51656ac27c5e1947ef3c7acf286b1462f7a339e6e8ea45550c281f75fc118739edc01dd0c9f7555
diff --git a/x11-libs/qtermwidget/ChangeLog b/x11-libs/qtermwidget/ChangeLog
index 06f24f40aa65..3fe44fb01986 100644
--- a/x11-libs/qtermwidget/ChangeLog
+++ b/x11-libs/qtermwidget/ChangeLog
@@ -110,3 +110,13 @@
 
   Package-Manager: portage-2.2.28
 
+*qtermwidget-0.7.0 (06 Oct 2016)
+
+  06 Oct 2016; Michael Palimaka <kensington@gentoo.org>
+  +qtermwidget-0.7.0.ebuild, qtermwidget-9999.ebuild:
+  version bump
+
+  Gentoo-bug: 596232
+
+  Package-Manager: portage-2.3.1
+
diff --git a/x11-libs/qtermwidget/Manifest b/x11-libs/qtermwidget/Manifest
index 36a0be223c53..396860699379 100644
--- a/x11-libs/qtermwidget/Manifest
+++ b/x11-libs/qtermwidget/Manifest
@@ -1,6 +1,8 @@
 DIST qtermwidget-0.6.0.tar.xz 158312 SHA256 1ea148e67c3e28a53ca24a3c91532507ddd6c5d28611467e7a67334d945cd010 SHA512 2e6c5c4bee50244757aecf461c2f63f3d7306647693176df3587271129a3f12d188ea425d8db3704ec1c52df56d429b06472a7c628b5b916c0852752ebfdb79a WHIRLPOOL 55d3e9544f654dce4139f81e3d933a0d11e3e06e965671e4b17e590219e2e5e991b3bdb61db59203197789d943780f3f40d28f8b5d874479a44cc486ae9a6aad
+DIST qtermwidget-0.7.0.tar.xz 158556 SHA256 413d20a6b8feaf14b8e1106d3b01156e85cb3c4ea0f43ff5c1d79b95cd989748 SHA512 5470ef9179c5ac9e82474134fe87e0a09a853211d41d584c16bcac2028e7e9c83aad805d5c3be5fe405535f41151d51c989877f8c2866c1c26e47cc3cac44b27 WHIRLPOOL e192c13e0ca618f5c0b08e80450ae0eed7ea26320c24ae9f1bc48b7a829fdc7ba90cbd0b756b4e1b26273c347ff64de0dd3a86270be15c911f305bc3466a259a
 EBUILD qtermwidget-0.6.0-r1.ebuild 1123 SHA256 6aec8750c097f852252757f21d8c00ff4251a72ba86e196cf684b9318bc47ad8 SHA512 b2b1ff191de662f4c3fd9b1154b4e33eb03eccc8fb782a372554966ea7cdac4dfa5ebf3886c470a38b0c07085b2b28c3387d2a97a0062221995d4a05227cbb40 WHIRLPOOL a5e23a252ff802e4fffe56027a0dc4a1ca43ae2ff4768a60787294435dc73e1f1cbd0169a1acfd571e95ef051e5d3d80c951a4dab2f54394746c898ff82ccc80
-EBUILD qtermwidget-9999.ebuild 1095 SHA256 2911d64408d326dd2c6e91248db206212b62ad89ff3b9771b280dc01bb6f00a5 SHA512 76ae7da032ad77da138379590c26474678cbd037666ead0c3f463dee8d0d5cb46567c7f6a92b016fc079fe9adeb788daa6a27914bcb6a56ff444a0b395c9fae7 WHIRLPOOL fb4f666df60bf18b68428adbf0408e919e4af833149b206486fee01df46b47464e7b1e775ba6e0261aa4e86cc8e6d4024925f701d6c76869e6d6da1edf58edcc
-MISC ChangeLog 3739 SHA256 e933dc7988eaf8fc72b001675c286850742e48b39e236e86093439aa92ba80c9 SHA512 216b9ef50493e7d158426d42d62f26e96b4eac35b48b59f49a4554813ca13c1872d14bc3803c50a5a6e290ae11ca1b2f2161b6faba70bf49fa62a9deb3c51480 WHIRLPOOL 901b9ce1dad721c1cc64d70ba97b611d853a0975e71bda0d782e8d05fbba9cdcdb8fe59ceeed9ab76c36b7c7317a3fca3aa9e872d572cfb57ddc2f786c4b6a44
+EBUILD qtermwidget-0.7.0.ebuild 456 SHA256 2eee542ccc6c7c097d1515299209fa57e553514fd1978962f47c46c8f9d827a8 SHA512 94afa2669bd540839400e819d60beb7915613699f27ffd4fb20c10d8b02f65d468e82bde9e03c3831686f49b89f8af44d99f0b812ff4c6aa3c12ffe6892aa2fe WHIRLPOOL c41efa6ee88036558cab15ca5a0ed22d9f4d04265c2baa2731a7e3dab24af1d9112658a42ed5b49e44dd3aa8764b88ba445ba8e349c53ece02e234ca043a4396
+EBUILD qtermwidget-9999.ebuild 427 SHA256 a1166c2610c3d895864afc4efae23ac33e91f556120a66e9df5f11d1dc4392c2 SHA512 29e6a4a2cd652acbdfcb191ab767cb08466f4cc0b1375410a66c082ffcfd709613d12929eace1e2439a838d1090e6721df461debc5cdbbbe7f6ed90798e08882 WHIRLPOOL a65fcc3ba8651b6a029d414c0447c71facd8c9ecc27e3c8b5f123d88d127bf3c174658f5e567323aba007e2009907b807b9028bf0f985f3fd7dd374a041ff9c2
+MISC ChangeLog 3955 SHA256 cb57758d6f32c30316ce0f3ff8e0df58d908b23bf33547eb0ec6b6c246eb73b1 SHA512 2876c83f0aa58f1a87a7b89c06234613704427cb8c1b06e673f5d6e78f89811eb8633270bf0ff5352fabf477d549fd2cc5cd80ede0926fd8fa368cba1d30c962 WHIRLPOOL d0cacf5e22063acdd5fb07fede193e4a899b5d372f4a609f7ec2b08193f1cedfb13baa198e5cb395a3045d73a965de95d9e7f196126b25fed8ba3f81d4176d5b
 MISC ChangeLog-2015 2196 SHA256 db909af40292c0bd3691855e8fa90c2dbf9732b15f22b209ca46e9ceed73c5fb SHA512 6a931b9b8fa095c852a05cd9e2bd82ca320b5390021499cdce1ca53b470978c2f56bea03dcb0d9dce8da28517295067324e19b6e5da22d50f78ac9d612ea16d9 WHIRLPOOL 5f9319551943584c7188442187e6615ac47494c1d18e44007af870f38467232cc24447b45e7b9b15cec839f6e5fb6e7678de9cdbfaf3efab2b439dfbc427cfc1
 MISC metadata.xml 601 SHA256 0b407956c2d14c20f4d2b1c4c5ea1dff4b2261606fd9b0454a05d0f021492f6a SHA512 529451269b457fa56a9cab375f946849779035786cfb4ee2955b7cdeacbad3303408f31fbad6eadbc3d4fc983e3ab20ec48f47237863c1166aa10d44be90527d WHIRLPOOL 2326b5554ac98db55dbe75939ff868e08b14490c158b4a3cfd5bb82ebf9640e1fbbc20077dd598b939675a6db604ee566a733ce834f6e647200253c946db6ea7
diff --git a/x11-libs/qtermwidget/qtermwidget-0.7.0.ebuild b/x11-libs/qtermwidget/qtermwidget-0.7.0.ebuild
new file mode 100644
index 000000000000..c802a6a5a9b4
--- /dev/null
+++ b/x11-libs/qtermwidget/qtermwidget-0.7.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit cmake-utils
+
+DESCRIPTION="Qt terminal emulator widget"
+HOMEPAGE="https://github.com/lxde/qtermwidget"
+SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
+RDEPEND="${DEPEND}"
diff --git a/x11-libs/qtermwidget/qtermwidget-9999.ebuild b/x11-libs/qtermwidget/qtermwidget-9999.ebuild
index 330186fb4099..6c7ec53b8117 100644
--- a/x11-libs/qtermwidget/qtermwidget-9999.ebuild
+++ b/x11-libs/qtermwidget/qtermwidget-9999.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=6
-inherit cmake-utils multibuild git-r3
+inherit cmake-utils git-r3
 
 DESCRIPTION="Qt terminal emulator widget"
 HOMEPAGE="https://github.com/lxde/qtermwidget"
@@ -12,47 +12,11 @@ EGIT_REPO_URI="https://github.com/lxde/qtermwidget.git"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS=""
-IUSE="qt4 qt5"
-REQUIRED_USE="|| ( qt4 qt5 )"
+IUSE=""
 
 DEPEND="
-	qt4? ( dev-qt/designer:4
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4 )
-	qt5? ( dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5 )"
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+"
 RDEPEND="${DEPEND}"
-
-src_prepare() {
-	MULTIBUILD_VARIANTS=( $(usev qt4) $(usev qt5) )
-	default
-}
-
-mb_variantx() {
-	if [[ ${MULTIBUILD_VARIANT} == "$1" ]]; then
-		echo "${2-ON}"
-	else
-		echo "${3-OFF}"
-	fi
-}
-
-src_configure() {
-	myconfigure() {
-		local mycmakeargs=(
-			-DBUILD_DESIGNER_PLUGIN="$(mb_variantx qt4)"
-			-DUSE_QT5="$(mb_variantx qt5)"
-		)
-		cmake-utils_src_configure
-	}
-
-	multibuild_foreach_variant myconfigure
-}
-
-src_compile() {
-	multibuild_foreach_variant cmake-utils_src_compile
-}
-
-src_install() {
-	multibuild_foreach_variant cmake-utils_src_install
-}
diff --git a/x11-misc/albert/ChangeLog b/x11-misc/albert/ChangeLog
index 9ebc4bbb1ca2..a72a84b007c9 100644
--- a/x11-misc/albert/ChangeLog
+++ b/x11-misc/albert/ChangeLog
@@ -109,3 +109,10 @@
 
   Package-Manager: portage-2.3.0
 
+*albert-0.8.11 (06 Oct 2016)
+
+  06 Oct 2016; Michael Palimaka <kensington@gentoo.org> +albert-0.8.11.ebuild:
+  version bump
+
+  Package-Manager: portage-2.3.1
+
diff --git a/x11-misc/albert/Manifest b/x11-misc/albert/Manifest
index f745acd1777c..e2e7a10efc59 100644
--- a/x11-misc/albert/Manifest
+++ b/x11-misc/albert/Manifest
@@ -1,4 +1,6 @@
 DIST albert-0.8.10.tar.gz 4630646 SHA256 32a54bb6b86a5e7e55055ec21eabbb85d0821c2bd465ac751d53eb6f345f6b58 SHA512 2003e9d9d13650a87f7afc24f41e7daecaf9090088a50f2ea35d903d13b264cfbf09592be712e74f66a4721ea05491b9ba68684a76322fb12a5bb3b90b0db890 WHIRLPOOL 7be2004a5edcb0f946d5012a3c0e83f814518de8b87061112bc634300fd799dcefeab092f9e841fcabf7b63a2461f767b66b3670516d67d6e8bf79ad56652ea8
+DIST albert-0.8.11.tar.gz 10509450 SHA256 7a829add4308a59204071a509487571ada1d2f42af34d799d0984e48bab2e5d3 SHA512 939b9fe4b5aaf0f3eaf280fbaebcecb12560e55e17a41b8917145c32e8e5bbfa45cbd85f249f22c0dcc8a7a1b32ec31f07bfb10c0f41080245c03555f93d7af3 WHIRLPOOL 114bed1a4f0b9c3157582f3a6e972d2b9991e90760311bb3a493c71ccdc3e05ec2f1790b4d47ad740af99d466d2c865777ba39cceb71cffaf176e621755d1538
 EBUILD albert-0.8.10.ebuild 699 SHA256 a3f33065a763c50f9e28935ea85ed3aa8e3cf2eabf7f4c5a2dd6b2da73f97683 SHA512 6d238b4e820592de1b82323f123ed8288cef013343cf3b7af2bf40934c011588055767fb447fa0076ec7103713e4ad54783e05cb38430263375282a71bfa303c WHIRLPOOL 05cc16c022718ca11addb85168d973a51b797a907a7f8f10091316ef5ef23ced5254acdb3e3c91b6bb9a94bbcf1c0b2eaf7fdcf41e2083d11ec3ab36e6087bea
-MISC ChangeLog 2907 SHA256 a41480e15f0497b03c60f5e960d3bac51dd99869a20211a47152bb7d224d9a67 SHA512 f9acf8cd399dac97f68ff2592aa2dce2d497c9335b2a7c3da73d367d0bd7f90a73f77dc0b4c8cb2fa45789280a80b813fc6121e3b071032de067b3b608cad46f WHIRLPOOL d8df06738da9d7ef6205affad87cc49a0c4484adc4c15aebbd21c5b51cca4782edbca7c3635eeae6172650588e1f8e31d39624af310b5aa58e20a6e6d4d0c2a0
+EBUILD albert-0.8.11.ebuild 749 SHA256 32a3f6955897a34502bbe0325f113b3f426234448cc2e5be5550c11b9c6024b4 SHA512 11a586581c8adb90627f391a7dad2f9c90e371dc834ad03f5cc83207034098fc51366efcebf847a5f527960c567a6902a6bf74484b68a4e5251f9d4b36245125 WHIRLPOOL 2fa93859644015c50e3893205ee89297963497cf065c993ddea74795dc15f3f699dd95a588257998231d8e8878457985890d347aa42e058901b6abea5df1d5a2
+MISC ChangeLog 3066 SHA256 b7d82b1df5f0e64e3e85ef315be69d14e353db4fd5c285481238cfea42f61b48 SHA512 11c44a4a4bc4f709f891f224881596bd34ff4df3133b0922e41baa60c240783732cfc17e83fc644033566ee7177389d91ac3fb6b7e74ea003d1de24b8b91c8cb WHIRLPOOL 8e87b103ed67d57f03341ab4a46d08ca67d5a08b13e55d7ec6281951d2cb789df753a960013f31f8b0163821a8d19c4d7b08c1b66ebce4c70d9c216d2b399a89
 MISC metadata.xml 308 SHA256 7b558724436b53a3cb1dbe62f6e3bc9f550f923c5219c2223de2885778aafcda SHA512 d1d3b296028ad198033932d85889987fc91b13c896b0cfd356570f0d13ebc1d257d99fce50cb4905a767dd4743bd4df4077ee764102831e6fa7d0201372cc220 WHIRLPOOL 42f576ac88931d2be9cff7afa3346914b48a4e6a5a3bd04da725a51354fd1e4133b00a627c3e4380d9292672dfc5e2a2d7ded235baf81c4385a57ac54c526522
diff --git a/x11-misc/albert/albert-0.8.11.ebuild b/x11-misc/albert/albert-0.8.11.ebuild
new file mode 100644
index 000000000000..303fb0709a77
--- /dev/null
+++ b/x11-misc/albert/albert-0.8.11.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 cmake-utils gnome2-utils
+
+DESCRIPTION="Desktop agnostic launcher"
+HOMEPAGE="https://github.com/manuelschneid3r/albert"
+SRC_URI="https://github.com/manuelschneid3r/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	dev-cpp/muParser
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+"
+DEPEND="${RDEPEND}
+	dev-qt/qtconcurrent:5
+"
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-misc/rednotebook/ChangeLog b/x11-misc/rednotebook/ChangeLog
index 3827118e5737..1bb3a9babefd 100644
--- a/x11-misc/rednotebook/ChangeLog
+++ b/x11-misc/rednotebook/ChangeLog
@@ -81,3 +81,21 @@
 
   Package-Manager: portage-2.3.0
 
+  06 Oct 2016; Patrice Clement <monsieurp@gentoo.org>
+  -files/rednotebook-1.2.0-disable-spell.patch:
+  cleanup unused patch.
+
+  Signed-off-by: Henning Schild <henning@hennsch.de>
+  Closes: https://github.com/gentoo/gentoo/pull/2483
+  Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
+
+*rednotebook-1.14 (06 Oct 2016)
+
+  06 Oct 2016; Patrice Clement <monsieurp@gentoo.org>
+  +rednotebook-1.14.ebuild:
+  version bump to 1.14.
+
+  Signed-off-by: Henning Schild <henning@hennsch.de>
+  Closes: https://github.com/gentoo/gentoo/pull/2484
+  Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
+
diff --git a/x11-misc/rednotebook/Manifest b/x11-misc/rednotebook/Manifest
index 41a3334ec248..b32c1beda186 100644
--- a/x11-misc/rednotebook/Manifest
+++ b/x11-misc/rednotebook/Manifest
@@ -1,7 +1,8 @@
-AUX rednotebook-1.2.0-disable-spell.patch 469 SHA256 db13324d803102d8af5facfa1de8a22292130feaef57275be5b1aa99e5bbd470 SHA512 747f21d327f2dac06a542d3dba135986b68c5377123bbef254c63213cbf3741642b1bdb8dc19043ef5d3bc3d78d6456bd7f38874f7247ef38cb2d691c8b7ed1d WHIRLPOOL 503aba0e71fe72e7c77adbe1cffb6e3327abb04091f70d412738b9666184f2a1d2ff7ac21872e3928d7386d2fd168dc4a6982dba18ce4d340f567255c5180f71
 AUX rednotebook-1.6.5-disable-spell.patch 458 SHA256 1b894b338047bb43a1d75ee42806df2690c401083b2b1d6285f6f809c5c79d59 SHA512 73f1e94828f88263bc43ddc106c2fd1deef25c45e2864c06bd68cc70ae8087099676011b026d7eb07f5269226028515761475aaeeae702478a2caa61555af98d WHIRLPOOL dbf9f8c643a0ffca8f53ab613f55d2f0360b0ddce1f62f439af01bc7b66e66aef6f3824ad0d2a867fbaad43bffef5ad89147df8d39692e10b3b9e688a55e2339
+DIST rednotebook-1.14.tar.gz 507719 SHA256 f33bd410ae01d064c1e449c532359ce1c134169d44a97d74ef1e99ff8d287d88 SHA512 d78c8996cd0959270da82ed8b8ea82c0c320e0db5c2cf11fba2b5fe5c73efb92b4b44d42344e679c5e274b4b2453883f81beeecf2884bb4da1774ea102610ec3 WHIRLPOOL 5607d0a4849c33bc4e15168efb58d0fec0aff1fcf73cc34ab584ca03cdefbab74a378b64126ae1ee5cafd9fb8996722bc57e06e532ca50aa65be4b76811ee1f5
 DIST rednotebook-1.8.0.tar.gz 500452 SHA256 63beacfdc738a9640bcc7b35ae28c18c7310d9f6fc9e9a6afafcc4d37f628213 SHA512 4d165bff34013fb5583a98a77b96d149eea62b67f0f0177778f0f97e9f65beb2d298c6b08fb5f6f8b18fa951b18f19478b52b239ab1af397ee3850d24eb8a9cf WHIRLPOOL 684bf11e2552b0a5030bbfa58a27a2fa6825ecc8657c3954117096e76b28dc8fb18f261d199cf712b67d3f7439b65e15231c984da9e8d04a1e0bc4505c40ce98
+EBUILD rednotebook-1.14.ebuild 721 SHA256 bc3582154086eb0d2650a89032ab589d0ae894e844aca1b3d4eadbeae0ab95a1 SHA512 a3eab9c6ab240ac5f7955c6674750d46f3889c3b8b25200f2f7d81a79ca7999526c17968f16161b576836f3d9942e51f8845bdf52865d8f62d8f6d52f29a6418 WHIRLPOOL 03c47733260739d0b5bae1067dcafd855f25f4106901dedc94f25738d9d7086462e31ac4476fca744e189e1256a2f649d36dec56d0661a355a042575d926cb12
 EBUILD rednotebook-1.8.0.ebuild 783 SHA256 51cc45b4b59519c8db66293201727942dfe0dde677e62464ac6497cffceef67e SHA512 e2f6c219588a8895febacc9e73b921adefd8c6cdcf4cd2ffc10d686740467f0cebe1b19c267169ba42de95d664601bac3af468df2067dae4ab45788f8ca97d4d WHIRLPOOL 813d98017e3e308ec33d84f6bb57a60276f0cc8294845dfa88ee185df3d92454c892254dfee1f9ba0637dcdac0c1f6432a71ce6d97f52078c29b8e58cb6abd5e
-MISC ChangeLog 2900 SHA256 ee8268540044a5c48a6e358913d60791cbe5ddcc24570a6e9f3d55bb807cbc1a SHA512 383da020c99d6f3d225d27ecac277e5caab66917ab3339d64a10d3f4f77977530bb38cbab37632cff9f8bea566ef77a7a7e5aaf091e6764e721abbb9a147d95a WHIRLPOOL b2831b5e431d42ec5528299ebc3fb3ab2524f12f97161dc0b1986aaa2692bda192bd9240c800603f578b943c8fbed41359ce5b02089f2044cf17eba489262833
+MISC ChangeLog 3493 SHA256 a4a4a444eb01454bc171d8667f55cc97173a673c6244d059b312ed3cf6f21f0b SHA512 192ce52e160dded1e750a3e76c8e60e15c73e50095e7ba89166408383dcb65fbb07560560cd489bef01aa99b6967925d48365de3bbabf369b7bdef4a0d416135 WHIRLPOOL 299fb8a0ba178ff8988c22b018588aad11fc4e82281fc8fa3a4a963ffeaa8e0c5c4c1215077bacba956ee59cda4f81b09c93c28e10e86914d90c3fc06283047e
 MISC ChangeLog-2015 12532 SHA256 6f5095d65222054236809058f4a6433af2ac5970d5172a9919afa72cfeb2309b SHA512 f4fce4f29c83f56f97b2004fe4efbbc1ef925ffcb7983d1d7f5ccab229b929113245f55e9e12d3afc024b11d1378ff5d9ad5557fb6079979bac3bb38b448fc87 WHIRLPOOL 3ae36b0e0b51517840d81f394a4dc34a6c8d1574005a28abbf10fae94f377e52be0a2cc380411d435f404f1b096d22297e27995a7659621eec42e426a17861f9
 MISC metadata.xml 486 SHA256 80f5448ace1bc26091880eae188f50e7d89cf53e511fb88e825231b6d4ed410b SHA512 59b41315fa20e18c9930b46617af38a77f040676fde9ce821cdccc77375db23b84b6c812e037d5c9e30b031188800a1af38b2938706db35eca157223afd67f75 WHIRLPOOL 5f566ea400a3013e30f13413241a085aadc1c1a363f1b92f0cb80fc48d065c910c112d364132c4ec6ce414159246202bc97e66356c80b5f50aaa90fd0a631462
diff --git a/x11-misc/rednotebook/files/rednotebook-1.2.0-disable-spell.patch b/x11-misc/rednotebook/files/rednotebook-1.2.0-disable-spell.patch
deleted file mode 100644
index ac4261b99018..000000000000
--- a/x11-misc/rednotebook/files/rednotebook-1.2.0-disable-spell.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: rednotebook-1.2.0/rednotebook/gui/editor.py
-===================================================================
---- rednotebook-1.2.0.orig/rednotebook/gui/editor.py
-+++ rednotebook-1.2.0/rednotebook/gui/editor.py
-@@ -25,11 +25,7 @@ import gtk
- import gobject
- import pango
- 
--# try to import gtkspell
--try:
--    import gtkspell
--except ImportError:
--    gtkspell = None
-+gtkspell = None
- 
- from rednotebook.gui import t2t_highlight
- from rednotebook import undo
diff --git a/x11-misc/rednotebook/rednotebook-1.14.ebuild b/x11-misc/rednotebook/rednotebook-1.14.ebuild
new file mode 100644
index 000000000000..c702aed2277e
--- /dev/null
+++ b/x11-misc/rednotebook/rednotebook-1.14.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Graphical journal with calendar, templates, tags and keyword searching"
+HOMEPAGE="http://rednotebook.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="libyaml spell"
+
+RDEPEND="
+	>=dev-python/pyyaml-3.05[libyaml?,${PYTHON_USEDEP}]
+	>=dev-python/pygtk-2.16[${PYTHON_USEDEP}]
+	>=dev-python/pywebkitgtk-1.1.5[${PYTHON_USEDEP}]
+	dev-python/chardet[${PYTHON_USEDEP}]
+	spell? ( dev-python/pygtkspellcheck[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
diff --git a/x11-terms/qterminal/ChangeLog b/x11-terms/qterminal/ChangeLog
index 4229fa3675ac..b75ad0714d3a 100644
--- a/x11-terms/qterminal/ChangeLog
+++ b/x11-terms/qterminal/ChangeLog
@@ -97,3 +97,14 @@
 
   Package-Manager: portage-2.2.28
 
+*qterminal-0.7.0 (06 Oct 2016)
+
+  06 Oct 2016; Michael Palimaka <kensington@gentoo.org>
+  +files/qterminal-no-liblxqt.patch, +qterminal-0.7.0.ebuild,
+  qterminal-9999.ebuild:
+  version bump
+
+  Gentoo-bug: 596232
+
+  Package-Manager: portage-2.3.1
+
diff --git a/x11-terms/qterminal/Manifest b/x11-terms/qterminal/Manifest
index cc0f134d5c11..9cd9187583b2 100644
--- a/x11-terms/qterminal/Manifest
+++ b/x11-terms/qterminal/Manifest
@@ -1,6 +1,9 @@
+AUX qterminal-no-liblxqt.patch 1568 SHA256 28fb8edd2084208d4abfc1dcd4a47991851ad4e9c5b8ec3c0858647a5ddb6b41 SHA512 4d18a9a0fadcfbbefdcd041798a3a0b47859c9aa0a55b5d27bc3cf8878d31e19a0e1c0b31d3934a0ddb6e8d2e7568e443ee33de06b0c8bbb7c45e00002f88dc9 WHIRLPOOL 4531488fd00273fa392b518a503ffbf6446c03e96d9f2d29de84839c817d6eb41527d03d833a1f343ccc4626e35289eb2353828806909c64d8819340a3aa3818
 DIST qterminal-0.6.0.tar.xz 100660 SHA256 61121ad0d1d34a5129e1109b6689d7fb7b10130a32831eaf500a86909b29d9bc SHA512 e51b768dc9b467800c7439bf7b021e04d83073a236023632e76ba00551bffa70f3b96f2098c68092283287914ce9103c8dfae8af79c9c25e119528b3f102ab34 WHIRLPOOL 4d67cce15b1ced30916f123ad140f3b00237bd5f4535fe0fb9adbd31829cfdb3120b6788f29cb9545d23d892c6ce22970793c0afed2e5ed225ba8e9a2487a88d
+DIST qterminal-0.7.0.tar.xz 98636 SHA256 a9cc63bb6c6bf6e42c9d1061efce641d9c0b57bd455446b6889d1a417a28968d SHA512 ad89bf2639c1c3d15396de1d91121920cbbb52d097d53d2751bf42e1d96b9d00cef8c54456a00b8fa40808a85535f1b88ea7bb3342dc9681fa8e769c2663061e WHIRLPOOL 8bdfb1b44e67e67d4261e78f305097ca202710e3f6020b76ff729f17b661f30bce1be4bbc77840bc24e197766ecdcba69392e325402f71b4dc885b5287934684
 EBUILD qterminal-0.6.0-r1.ebuild 778 SHA256 037c91ef9549012b18a58c4fca5dc7e79b4278b372c1b948222e63a8cfe7305e SHA512 610dfd7b5fa57ac02ecbc133532e81e20d2f47470f6216d38cab557a14a06ca54b3308e04f3bad2b7ea0d84d3f92012dd491a4d0099dc72a4da478a7bb0f9ab1 WHIRLPOOL 574339abd8c515790107b2d4de4b780b94681422d33bad6f2917d29a938b314b25ab12dde63189db9c57648657162e43c85009f9ef78c3071272f94f3e149c53
-EBUILD qterminal-9999.ebuild 747 SHA256 7c27f782cb32fa9dae73db60b004112c14c70b5241a3372be124dd43514d7f3d SHA512 01204876b790b2c7ee6ada57f0a6531a4e95f97a2ec22597312ad71e961cbc6cae6510bcc24b27f6733d74adc740581e717fd3ffeb7baed23c756262f407e5c7 WHIRLPOOL 0ace3006bee234616a935e7771e7f6d1cc1d354aad2ba7a63a8b91702f208f05ec9359a3c6a550f4b4075eb9e625659346410b02077636474446f829dbd86071
-MISC ChangeLog 3402 SHA256 8f446f9c0b16612e0c3333a5aa24f1a0e21b49e6da38e3d50e275bd491f5aab6 SHA512 c8c9e0111c2405eb3e5c729f460350e8c7a7da18a4ed2347db67b04f6765c5339bc73a8a1080271ce1acd4172f32e0a088292b81bdd301c538e75ac8203812c8 WHIRLPOOL a21481d4bf3a03415c9f77a254c742d7ab243f934b2d4ee651f2aa257b8eae751a30181d59975ef952fabf8538e1a5819c01d15b849486adccdd65f43724c4ab
+EBUILD qterminal-0.7.0.ebuild 725 SHA256 7d30e8e1f7922a88d87c163229150c85f944eb5f7ffe6d5a6325227939244ae4 SHA512 a04b11936e23ca0e46d8deb701da08e762e3d3965f0c3224ea3f17479d309ed1d9992df52b11dae55dda03088fd66b76385221b0723b8dac468c767393ae020b WHIRLPOOL ccad36cc59542ddd50b2cd58fd8cc3c708654147803ee02b95281801031a047472d159681e9baeb703d21713f2eae8b81009cd37b9f6de190c61d5e39edb0925
+EBUILD qterminal-9999.ebuild 694 SHA256 f975899b847e86b09408ea416bc06fae3fd26446c0ffdef08152f2babedebe26 SHA512 d84d73aa86b09e2005c1b60d43f8aabd7e52a4296a1b81bbff025c6715992a4142065c15075e7fe2eb5d33309cdfd7a4a741ee5e04a514cd77d892739905fa1c WHIRLPOOL d0774152cf96017534bd5dc278f35192143b4641fc2aa0ab7b65277cc480b0de1b3187f1daa037d3d922be88979b8793f107770f7efcb46ee920dd99b2f1ae43
+MISC ChangeLog 3649 SHA256 2b4e5e131e6d3fc281dfcc96f6e66854fe92ca9ae06a853583dc5537b8932904 SHA512 cafacdc2de2bb66926d3adaa09f73d07fc3d742dbb8cf0949a5de562f8b06f91361da8375306c5d4d37ac8a71f07fc3024d1b800a06275ab4203121b2bb5fa4b WHIRLPOOL b78556fcb41292eebaa456ed2e875789d681d5ab55ebfb58b302016af70eb91644d40cbfc602d01c924efcb7b2e5aa0b641e230f83bde7f046713a26ebe15108
 MISC ChangeLog-2015 1159 SHA256 39bfb245d2dabab0da30ea14704c6bccbd6fc324c802cf23ccfd9976aa584e5d SHA512 9d0da85b387c98a9ea34c2f978528a93c7edc4bb269ca2dedabf7c727e7e49e96c2425bc325ea361622d49b3321cb7b5835bea0f12512f20e6a706a47e9cbc05 WHIRLPOOL 89d05483f8b9d88a58b331fcbcfd47b5a01854d27f9d0a927d6ff90f84381566c25d12782765101ce4bc7b6e3c196701f77477d2592ffcd403885edbafae0bfb
 MISC metadata.xml 331 SHA256 a568f3f0a552ee5ef199da875d44a375ebcd3320bafd3a92cf7e0fc00fcb29e9 SHA512 6093916b3ba5afc8249b5b0444f021719336ab71c8749827c8c629ceb2b6b1edc0aeed5eae3f098f0e3fc120e80f691669ccf85a195386dd17bf6f343121bdd5 WHIRLPOOL 8d3ec83ca620f364642a4a65ad2354c36c9a60e99eb8043a9c5f0ca3cc0d3b7eaa47c39ae5c5ac84bd92dfd93e388762bd28d078502204c5b46316dc05b7da40
diff --git a/x11-terms/qterminal/files/qterminal-no-liblxqt.patch b/x11-terms/qterminal/files/qterminal-no-liblxqt.patch
new file mode 100644
index 000000000000..f2a9795fb48d
--- /dev/null
+++ b/x11-terms/qterminal/files/qterminal-no-liblxqt.patch
@@ -0,0 +1,52 @@
+Translations are fetched from upstream git repo at build time, so disable them.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -29,15 +29,15 @@
+ # we need qpa/qplatformnativeinterface.h for global shortcut
+ find_package(Qt5Gui REQUIRED)
+ find_package(Qt5Widgets REQUIRED)
+-find_package(Qt5LinguistTools REQUIRED)
++#find_package(Qt5LinguistTools REQUIRED)
+ if(APPLE)
+ elseif(UNIX)
+     find_package(Qt5X11Extras REQUIRED)
+ endif()
+ find_package(QTermWidget5 REQUIRED)
+ #Note: no run-time dependency on liblxqt, just a build dependency for lxqt_translate_ts/desktop
+-find_package(lxqt REQUIRED)
+-include(LXQtTranslateTs)
++#find_package(lxqt REQUIRED)
++#include(LXQtTranslateTs)
+ message(STATUS "Qt version: ${Qt5Core_VERSION_STRING}")
+ 
+ include(${QTERMWIDGET_USE_FILE})
+@@ -110,17 +110,17 @@
+ qt5_wrap_ui( QTERM_UI ${QTERM_UI_SRC} )
+ qt5_wrap_cpp( QTERM_MOC ${QTERM_MOC_SRC} )
+ qt5_add_resources( QTERM_RCC ${QTERM_RCC_SRC} )
+-lxqt_translate_ts(QTERM_QM
+-    TRANSLATION_DIR "src/translations"
+-    PULL_TRANSLATIONS
+-        ${PULL_TRANSLATIONS}
+-    CLEAN_TRANSLATIONS
+-        ${CLEAN_TRANSLATIONS}
+-    TRANSLATIONS_REPO
+-        ${TRANSLATIONS_REPO}
+-    TRANSLATIONS_REFSPEC
+-        ${TRANSLATIONS_REFSPEC}
+-)
++#lxqt_translate_ts(QTERM_QM
++#    TRANSLATION_DIR "src/translations"
++#    PULL_TRANSLATIONS
++#        ${PULL_TRANSLATIONS}
++#    CLEAN_TRANSLATIONS
++#        ${CLEAN_TRANSLATIONS}
++#    TRANSLATIONS_REPO
++#        ${TRANSLATIONS_REPO}
++#    TRANSLATIONS_REFSPEC
++#        ${TRANSLATIONS_REFSPEC}
++#)
+ 
+ include_directories(
+     "${CMAKE_SOURCE_DIR}"
diff --git a/x11-terms/qterminal/qterminal-0.7.0.ebuild b/x11-terms/qterminal/qterminal-0.7.0.ebuild
new file mode 100644
index 000000000000..f3a882e69488
--- /dev/null
+++ b/x11-terms/qterminal/qterminal-0.7.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit cmake-utils gnome2-utils
+
+DESCRIPTION="Qt-based multitab terminal emulator"
+HOMEPAGE="https://github.com/lxde/qterminal"
+SRC_URI="https://github.com/lxde/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+	~x11-libs/qtermwidget-${PV}
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-no-liblxqt.patch" )
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/x11-terms/qterminal/qterminal-9999.ebuild b/x11-terms/qterminal/qterminal-9999.ebuild
index 2d552417db5d..8d6dc6aaf068 100644
--- a/x11-terms/qterminal/qterminal-9999.ebuild
+++ b/x11-terms/qterminal/qterminal-9999.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=6
-inherit cmake-utils git-r3
+inherit cmake-utils git-r3 gnome2-utils
 
 DESCRIPTION="Qt-based multitab terminal emulator"
 HOMEPAGE="https://github.com/lxde/qterminal"
@@ -12,30 +12,28 @@ EGIT_REPO_URI="https://github.com/lxde/qterminal.git"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS=""
-IUSE="qt5"
+IUSE=""
 
 RDEPEND="
-	!qt5? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		x11-libs/libqxt
-		~x11-libs/qtermwidget-${PV}[qt4]
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		~x11-libs/qtermwidget-${PV}[qt5]
-	)
-"
-DEPEND="${RDEPEND}
-	qt5? ( dev-qt/linguist-tools:5 )
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	x11-libs/libX11
+	~x11-libs/qtermwidget-${PV}
 "
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-no-liblxqt.patch" )
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
 
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_QT5=$(usex qt5)
-		-DUSE_SYSTEM_QXT=$(usex !qt5)
-	)
-	cmake-utils_src_configure
+pkg_postrm() {
+	gnome2_icon_cache_update
 }