gentoo resync : 14.07.2018

14 files changed, 0 insertions, 953 deletions

diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
deleted file mode 100644
index 9afebfd540b2..000000000000
--- a/app-portage/layman/Manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-AUX layman-2.0.0.doctest.patch 933 BLAKE2B d2e9c8f4b49fdd37530981d6f0cd621a676eba9688e0c45e68cd82e774b052085f556b437a13789f0554bdf18a6a1112ce3b1503abf6a0719cfbb4efde20bc5e SHA512 37a3bf04ba5185bf7f885321a4a925e24218d6e283b4c9d85e4935e0fb3dacf4fa543fa79e146c44bcbf833e7348dc49270cd0baa562a5e2539fc792b91abaf8
-AUX layman-2.0.0.svn_upgrade.patch 2447 BLAKE2B 0603c816eff3eef5824e04619c4b7634e253993028823b1c19713c76c1953d0df8160655e3a35d17a083736839628b75f77f8364e40a3e38d90035cc80c01561 SHA512 a3b9d0a0049aef011ddaadc627c38c9730e547aa4941fc1081ea7727f228e72080314a1cc376fa96ba23efe365529795a1b501c90b76561f6c4bff9aba72eb1f
-AUX layman-2.2.0-adds-kwargs-debug.patch 1015 BLAKE2B b0f249a7e66606cd06f9107882d4a6edaed658b01a75c99f00ac03e8e8db8dc5fb1c2dc1e4738a8800c09645d44e7f39012d37dccf3c6c4ffc00f42833aff99e SHA512 cedf55524b2d11ae41a05192e8ba31fce677fb528560b168e4441bf2274c864c23a0d6463e79ea34c29e61ff1d4f514efba32bcee914fe6b915b6f039f8e106e
-AUX layman-2.2.0-change-for-upstream-ssl-fetch.patch 1234 BLAKE2B 1592e974a34142b62a21fe58011d98d118060a9bbc4e1e5d7ae0fdae1791a7715d325a9e3a2374a223f764fa3f40990855ec5d205a63a96d6b61cb1c3e4167d9 SHA512 bd58b813e3b364f4116537c1a66b0109a6a08fb5a30a53a691c697739197d84fed4449bbd3b751396e81d4adbb0f72101bd04e949068534bb77ced929c5c4191
-AUX layman-2.2.0-removes-doctest-remnants.patch 6172 BLAKE2B 0f6e9b68ebfb85f08c06a26e52a13bc3412edcf58d052cc72d576efbaeb8bd7c9a04268465632de0c3d611ed9fc369ae0d1dc9d2d61955a934124a70c7e46958 SHA512 9c8f81269d7219a6a1d0ca6365be3e49c6c407810670a5acf71edf8d47255772e67631a018b1f1a1a4bc0f1981663882d30c2480af1e90fef09030bf2e12935e
-AUX layman-2.4.1-sourcefileattributechanges.patch 1889 BLAKE2B b99001a1fbc19224111ab565343146230ac464add57bfb8ae3e202d339a6e7cb36dd3ba9050625cb1a9d3420ad892dc2417bbb5a5045a8bf6bf7e4e939f9a1a0 SHA512 ffb5015069c1b1725514d18abff9a7c152825335f05a7edf160d0e90a3d7cd9d0a6338fb24ed8a6ebcc24c2f23beefc4bc35d3d12fe887d86a3251bdb03fc4f2
-DIST layman-2.0.0.tar.gz 81184 BLAKE2B a1d8481f6dba7392c2c857c887284371c53f0bf64b4f013091b415fdb95c27d5695beaf004585fbc83731abcbdc08f4ecd6591dbfdc5a1caa418f3ab47aa37dc SHA512 30756464d71ab1e047036550b6500d7e57999d808ebe3efba1d1ae6c037f8ca777ba704a4981d75a90285133635027a7bc13f1890f34823de33ae991ed99e2da
-DIST layman-2.2.0.tar.gz 116210 BLAKE2B 253fc35885e9e0bb804512db50962749a53cd25950102e3e79df48f87e683b6ad24857fcbd7d398a11a152c455a683e22a92dfa2ceaa7b80b6db764d54355514 SHA512 34cac041d7b64274debdbc42cab079fd3bb3aee511ea9e80db726df0f828207d79a5262788483ced5cbf49924e3aa4f19fe21439c98dceea973d8f83473c2e41
-DIST layman-2.4.1.tar.gz 130388 BLAKE2B 0a03e7f67d3c33528bee0c53a1216862d20dbdb1a48a18331b5d936bb48568072ac4c208807baf667b346bbbc1edb6acc385cc379de1d54d96adb62484c5f085 SHA512 bdb713d4c7d3773129b45a385068278958040759bb564e48cfda4dda9da5224ccaa7833fce3d06151ed1fecddbb6f1a059db6e71534d0e887dff12640af6c806
-DIST layman-2.4.2.tar.gz 137893 BLAKE2B ad925b974e280c0c933cb7c7d5131946fbb40d15410a671be3d93fa895e2d92a4f3218bce99abc8f2c1e007e72bd51662a18665579bf2ded7f349eb9ed5c652c SHA512 9d32269f51f896c554e6cbf8a674c50009bce48dd83dfe773b08b75bafd567eb75c26c227ab3a60bc83c1ed511862a3979b8d851befe8ad16fd0847eb91337cf
-EBUILD layman-2.0.0-r1.ebuild 1629 BLAKE2B ff95ce6ba92ce4d8b536260cb15149f786bee79fac0b5a0eef979854687fbb59ca799dc593457dcb3468dfcce038ed740009fe94c64004a1778a4e37279514ee SHA512 bce1210abde1e4626bdcce87a771f7bec2e95de631df615b89508d61b1ad33571dd3379912c8915408b4689d106914451abc0ab2ee9168219ad1ccee2282e056
-EBUILD layman-2.0.0-r3.ebuild 1668 BLAKE2B 9132c3dc910abfadf07e6fd9b3a69ea6234bd63dac873d20fd0235d3c35ba21991b2b97dc992d735a1b0452eaf44cb5eea7cab6678a977dce55c932bfbb685e2 SHA512 215e1136fbba7153772417deee4456b4174d0b551194f4ebeb3f29583315a74fcb4791b631c1049fb993218b2b8d6e30910366eaf935e4d0b010725488d7213f
-EBUILD layman-2.2.0-r7.ebuild 2178 BLAKE2B 2b3959e9f03c436dd07d7db4cc36b6d0a147cc0e3d35dfc9363e2baa1e869b9092c4eadda6a5424ea53c50667add23622065222ac4ade7142bc34cebc2e08f5f SHA512 04c77e388d73a53034fce76018c09d79ff67e1ece9719afb381bb79a4566b45873ba3acab4040f64b4012e0a442f72d9bb534f1cfe19840a461e5b607678b255
-EBUILD layman-2.4.1-r1.ebuild 2116 BLAKE2B 4f16a3e6aa26701a653c3b2e103085edd6420676f0667db18ccd87cf3aba8a858827f85f5fce383c379c658faeb82b736a77f17790a5ba95eaeafea72a1aa9f2 SHA512 5ecb7a7786ca0354090a20f4fc63def960d27a2a47b77d2d69742f905109a06f693154694967229ab3dcfbb52ec4ddfbfcee7260c426afe2253011f329035b60
-EBUILD layman-2.4.2-r1.ebuild 2289 BLAKE2B 46d9b5292320f7d091822630cb69037f0745a9dd35f1b4b5b7da8c60571a7072a82635603e0403e9b4819b80d511429025a6d2909eef14e64dd3bb37d5af93e9 SHA512 d4d2e268bba46ff1c6c33963c4ff75239db5f28c8eb64109a86d3531c7f707c61a2011d4270d2a55c3365aeb59a6344a6ccbdcabc89c0bae3405b6278c91eca1
-EBUILD layman-9999.ebuild 2223 BLAKE2B 1d32d63d9c99593e03dc8e3ed8b31d775918593bc115129433eee7dec66d115eba0424eba42864e187a2796e5bc3ea54aa5c3ac13a2d851fc81dcb18ad8d3342 SHA512 ac5a21aa58ae616b661f92ed4dfcd9cd15413be55778e496a22dded16de24efa26f707008d50a2e0bbe43a4c615dcff1333d972cde8eca2671b3c1f480c3b8d4
-MISC metadata.xml 1177 BLAKE2B 0024befce684e122216fecaecb3ccf2f2da44fa82a3f2c8811155861041009a0cded912e93a2d6e66884814afc8b1ccbe6f006b40b6e44cafa13fa0f53c90a4d SHA512 d41244afefdb11e5f68be2200a759e4209b2b59f5b9de083e79a522d5a10f12359f9fd6f30fd24f73d4e9b190a2f974f8e519cd22614dd2b023594952dba957e
diff --git a/app-portage/layman/files/layman-2.0.0.doctest.patch b/app-portage/layman/files/layman-2.0.0.doctest.patch
deleted file mode 100644
index 6d3305ca3ef7..000000000000
--- a/app-portage/layman/files/layman-2.0.0.doctest.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/layman/db.py b/layman/db.py
-index e2d740c..55a846a 100644
---- a/layman/db.py
-+++ b/layman/db.py
-@@ -93,6 +93,7 @@ class DB(DbBase):
-         >>> from layman.config import OptionConfig
-         >>> myoptions = {'installed' :
-         ...           here + '/tests/testfiles/global-overlays.xml',
-+        ...           'local_list':  here + '/tests/testfiles/overlays.xml',
-         ...           'make_conf' : write2,
-         ...           'nocheck'    : 'yes',
-         ...           'storage'   : tmpdir}
-@@ -173,6 +174,7 @@ class DB(DbBase):
-         >>> from layman.config import OptionConfig
-         >>> myoptions = {'installed' :
-         ...           here + '/tests/testfiles/global-overlays.xml',
-+        ...           'local_list':  here + '/tests/testfiles/overlays.xml',
-         ...           'make_conf' : write2,
-         ...           'nocheck'    : 'yes',
-         ...           'storage'   : tmpdir}
diff --git a/app-portage/layman/files/layman-2.0.0.svn_upgrade.patch b/app-portage/layman/files/layman-2.0.0.svn_upgrade.patch
deleted file mode 100644
index 431b9370593a..000000000000
--- a/app-portage/layman/files/layman-2.0.0.svn_upgrade.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 580097d4bc0cd3f07b4ce1b8da33e63f03ef0305 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Mon, 6 Jan 2014 22:01:12 -0800
-Subject: [PATCH] Update svn's check_upgrade() for newer svn versions.
-
-Thanks you, Arfrever, for your assistance.
----
- layman/overlays/svn.py | 32 ++++++++++++--------------------
- 1 file changed, 12 insertions(+), 20 deletions(-)
-
-diff --git a/layman/overlays/svn.py b/layman/overlays/svn.py
-index 4804925..374a516 100644
---- a/layman/overlays/svn.py
-+++ b/layman/overlays/svn.py
-@@ -131,27 +131,19 @@ class SvnOverlay(OverlaySource):
-         return
- 
-     def check_upgrade(self, target):
--        '''Code to check the installed svn version and
--        run "svn upgrade" if needed.'''
-+        '''Code to run "svn upgrade" it only takes longer
-+        than checking if it does need an upgrade if it is
-+        actually needed.
-+        '''
-         file_to_run = _resolve_command(self.command(), self.output.error)[1]
--        args = file_to_run + ' -q --version'
-+        args = " ".join([file_to_run, " upgrade", target])
--        pipe = Popen(args, shell=True, stdout=PIPE)
-+        pipe = Popen(args, shell=True, stdout=PIPE, stderr=PIPE)
-         if pipe:
--            self.output.debug("SVN: check_upgrade()... have a valid pipe", 4)
--            version = pipe.stdout.readline().strip('\n')
--            self.output.debug("SVN: check_upgrade()... svn version found: %s"
--                % version, 4)
-+            self.output.debug("SVN: check_upgrade()... have a valid pipe, "
-+                "running upgrade", 4)
-+            upgrade_output = pipe.stdout.readline().strip('\n')
-+            if upgrade_output:
-+                self.output.debug("  output: %s" % upgrade_output, 4)
-+            self.output.debug("SVN: check_upgrade()... svn upgrade done", 4)
-             pipe.terminate()
--            if version >= '1.7.0':
--                self.output.debug("SVN: check_upgrade()... svn upgrade maybe",
--                    4)
--                _path = path([target,'.svn/wc.db'])
--                if not os.path.exists(_path):
--                    self.output.info("An svn upgrade needs to be run...",
--                        2)
--                    args = ["upgrade"]
--                    return self.run_command(self.command(), args,
--                        cwd=target, cmd="svn upgrade")
--                return
--        else:
--            return
-+        return
--- 
-1.8.3.2
-
diff --git a/app-portage/layman/files/layman-2.2.0-adds-kwargs-debug.patch b/app-portage/layman/files/layman-2.2.0-adds-kwargs-debug.patch
deleted file mode 100644
index 2020cb716449..000000000000
--- a/app-portage/layman/files/layman-2.2.0-adds-kwargs-debug.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Devan Franchini <twitch153@gentoo.org>
-Date: Sun, 7 Dec 2014 23:12:36 -0500
-Subject: [PATCH] Adds kwargs-debug and modifies kwargs-info level to 5
-
---- a/layman/overlays/archive.py
-+++ b/layman/overlays/archive.py
-@@ -50,7 +50,8 @@ class ArchiveOverlay(OverlaySource):
-             connector_output = {
-                 'info': self.output.debug,
-                 'error': self.output.error,
--                'kwargs-info': {'level': 2},
-+                'kwargs-info': {'level': 5},
-+                'kwargs-debug': {'level': 2},
-                 'kwargs-error': {'level': None},
-             }
-            
---- a/layman/remotedb.py
-+++ b/layman/remotedb.py
-@@ -120,6 +120,6 @@ class RemoteDB(DbBase):
-             'info':  self.output.info,
-             'debug': self.output.debug,
-             'error': self.output.error,
--            'kwargs-info': {'level': 2},
-+            'kwargs-info': {'level': 5},
-             'kwargs-debug': {'level': 2},
-             'kwargs-error':{'level': None},
-         }
-
diff --git a/app-portage/layman/files/layman-2.2.0-change-for-upstream-ssl-fetch.patch b/app-portage/layman/files/layman-2.2.0-change-for-upstream-ssl-fetch.patch
deleted file mode 100644
index d738b26f12c0..000000000000
--- a/app-portage/layman/files/layman-2.2.0-change-for-upstream-ssl-fetch.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 81f1545f1371931d560492e8b323096d4befc775 Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Fri, 17 Oct 2014 19:40:38 -0700
-Subject: [PATCH] remotedb.py: Change for upstream ssl-fetch change
-
----
- layman/remotedb.py | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/layman/remotedb.py b/layman/remotedb.py
-index f0f7ea9..b866bd7 100644
---- a/layman/remotedb.py
-+++ b/layman/remotedb.py
-@@ -57,7 +57,7 @@ class RemoteDB(DbBase):
-         self.detached_urls = []
-         self.signed_urls = []
-         self.proxies = config.proxies
--        
-+
-         self.urls  = [i.strip()
-             for i in config['overlays'].split('\n') if len(i)]
- 
-@@ -116,9 +116,11 @@ class RemoteDB(DbBase):
-         need_gpg = [False, True, True]
-         # setup the ssl-fetch output map
-         connector_output = {
--            'info':  self.output.debug,
-+            'info':  self.output.info,
-+            'debug': self.output.debug,
-             'error': self.output.error,
-             'kwargs-info': {'level': 2},
-+            'kwargs-debug': {'level': 2},
-             'kwargs-error':{'level': None},
-         }
-         fetcher = Connector(connector_output, self.proxies, USERAGENT)
--- 
-2.0.5
-
diff --git a/app-portage/layman/files/layman-2.2.0-removes-doctest-remnants.patch b/app-portage/layman/files/layman-2.2.0-removes-doctest-remnants.patch
deleted file mode 100644
index 4b077140019b..000000000000
--- a/app-portage/layman/files/layman-2.2.0-removes-doctest-remnants.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-From: Devan Franchini <twitch153@gentoo.org>
-Date: Fri, 18 Oct 2014 15:21:24 -0400
-Subject: [PATCH] Removes doctest remnants
-
---- a/layman/api.py	2014-10-18 14:27:13.233842116 -0400
-+++ b/layman/api.py	2014-10-18 14:29:51.184849673 -0400
-@@ -714,15 +714,3 @@
-     write = os.fdopen(fd_w, 'w')
-     read = os.fdopen(fd_r, 'r')
-     return (read, write, fd_r, fd_w)
--
--
--if __name__ == '__main__':
--    import doctest, sys
--
--    # Ignore warnings here. We are just testing
--    from warnings     import filterwarnings, resetwarnings
--    filterwarnings('ignore')
--
--    doctest.testmod(sys.modules[__name__])
--
--    resetwarnings()
---- a/layman/argsparser.py	2014-10-18 14:27:13.233842116 -0400
-+++ b/layman/argsparser.py	2014-10-18 14:30:35.256851781 -0400
-@@ -404,14 +404,3 @@
-         self.output.debug('ARGSPARSER: Returning keys', 9)
- 
-         return keys
--
--
--#===============================================================================
--#
--# Testing
--#
--#-------------------------------------------------------------------------------
--
--if __name__ == '__main__':
--    import doctest
--    doctest.testmod(sys.modules[__name__])
---- a/layman/cli.py	2014-10-18 14:27:13.233842116 -0400
-+++ b/layman/cli.py	2014-10-18 14:32:11.456856384 -0400
-@@ -397,15 +397,3 @@
-         # blank newline  -- no " *"
-         self.output.notice('')
-         return info != {}
--
--
--if __name__ == '__main__':
--    import doctest
--
--    # Ignore warnings here. We are just testing
--    from warnings     import filterwarnings, resetwarnings
--    filterwarnings('ignore')
--
--    doctest.testmod(sys.modules[__name__])
--
--    resetwarnings()
---- a/layman/config.py	2014-10-18 14:27:13.233842116 -0400
-+++ b/layman/config.py	2014-10-18 14:31:02.528853086 -0400
-@@ -348,13 +348,3 @@
-         if new_defaults is not None:
-             self._defaults.update(new_defaults)
-         return
--
--#===============================================================================
--#
--# Testing
--#
--#-------------------------------------------------------------------------------
--
--if __name__ == '__main__':
--    import doctest
--    doctest.testmod(sys.modules[__name__])
---- a/layman/db.py	2014-10-18 14:27:13.234842116 -0400
-+++ b/layman/db.py	2014-10-18 14:32:32.160857374 -0400
-@@ -315,21 +315,3 @@
-             raise Exception('Syncing overlay "' + overlay_name +
-                             '" returned status ' + str(result) + '!' +
-                             '\ndb.sync()')
--
--
--#===============================================================================
--#
--# Testing
--#
--#-------------------------------------------------------------------------------
--
--if __name__ == '__main__':
--    import doctest, sys
--
--    # Ignore warnings here. We are just testing
--    from warnings     import filterwarnings, resetwarnings
--    filterwarnings('ignore')
--
--    doctest.testmod(sys.modules[__name__])
--
--    resetwarnings()
---- a/layman/dbbase.py	2014-10-18 14:27:13.234842116 -0400
-+++ b/layman/dbbase.py	2014-10-18 14:31:14.648853666 -0400
-@@ -252,21 +252,3 @@
-         """returns a list of the overlay names
-         """
-         return sorted(self.overlays)
--
--
--#===============================================================================
--#
--# Testing
--#
--#-------------------------------------------------------------------------------
--
--if __name__ == '__main__':
--    import doctest
--
--    # Ignore warnings here. We are just testing
--    from warnings     import filterwarnings, resetwarnings
--    filterwarnings('ignore')
--
--    doctest.testmod(sys.modules[__name__])
--
--    resetwarnings()
---- a/layman/overlays/archive.py	2014-10-18 14:27:13.253842116 -0400
-+++ b/layman/overlays/archive.py	2014-10-18 14:31:54.640855579 -0400
-@@ -188,15 +188,3 @@
-         '''
- 
-         return self.is_supported()
--
--
--if __name__ == '__main__':
--    import doctest
--
--    # Ignore warnings here. We are just testing.
--    from warnings    import filterwarnings, resetwarnings
--    filterwarnings('ignore')
--
--    doctest.testmod(sys.modules[__name__])
--
--    resetwarnings()
---- a/layman/overlays/modules/tar/tar.py	2014-10-18 14:27:13.245842116 -0400
-+++ b/layman/overlays/modules/tar/tar.py	2014-10-18 15:10:13.303965557 -0400
-@@ -94,14 +94,3 @@
-         return require_supported(
-             [(self.command(),  'tar', 'app-arch/tar'), ],
-             self.output.warn)
--
--if __name__ == '__main__':
--    import doctest
--
--    # Ignore warnings here. We are just testing
--    from warnings     import filterwarnings, resetwarnings
--    filterwarnings('ignore')
--
--    doctest.testmod(sys.modules[__name__])
--
--    resetwarnings()
---- a/layman/overlays/overlay.py	2014-10-18 14:27:13.253842116 -0400
-+++ b/layman/overlays/overlay.py	2014-10-18 14:31:38.624854813 -0400
-@@ -546,14 +546,3 @@
-     def source_types(self):
-         for i in self.sources:
-             yield i.type
--
--
--#==============================================================================
--#
--# Testing
--#
--#------------------------------------------------------------------------------
--
--if __name__ == '__main__':
--    import doctest
--    doctest.testmod(sys.modules[__name__])
---- a/layman/remotedb.py	2014-10-18 14:27:13.253842116 -0400
-+++ b/layman/remotedb.py	2014-10-18 14:29:31.064848710 -0400
-@@ -384,14 +384,3 @@
-         self.signed_urls = [i.strip()
-             for i in self.config['gpg_signed_lists'].split('\n') if len(i)]
-     '''
--
--if __name__ == '__main__':
--    import doctest
--
--    # Ignore warnings here. We are just testing
--    from warnings     import filterwarnings, resetwarnings
--    filterwarnings('ignore')
--
--    doctest.testmod(sys.modules[__name__])
--
--    resetwarnings()
---- a/layman/utils.py	2014-10-18 14:27:13.254842117 -0400
-+++ b/layman/utils.py	2014-10-18 14:30:24.088851247 -0400
-@@ -347,14 +347,3 @@
-     for key in kwargs:
-         result[key] = kwargs[key]
-     return result
--
--
--#===============================================================================
--#
--# Testing
--#
--#-------------------------------------------------------------------------------
--
--if __name__ == '__main__':
--    import doctest
--    doctest.testmod(sys.modules[__name__])
-
diff --git a/app-portage/layman/files/layman-2.4.1-sourcefileattributechanges.patch b/app-portage/layman/files/layman-2.4.1-sourcefileattributechanges.patch
deleted file mode 100644
index 207f474304c7..000000000000
--- a/app-portage/layman/files/layman-2.4.1-sourcefileattributechanges.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 90fe6724d0a8d1ebfe6443dee118432e20432b8b Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <dolsen@gentoo.org>
-Date: Tue, 10 May 2016 15:12:02 -0700
-Subject: [PATCH] layman/module.py: Fix commit 63808ef00f94 mis-applied
- 'sourcefile' attribute changes
-
-It was not looking for the 'sourcefile' attribute first, then falling back to the kidname for
-backward compatibility.
-It was incorrectly looking for an ImportError, instead of a 'sourcefile' KeyError.
-The filepath of the affected file for the error message had an extra leading '_'.
-Add the module name to the warning message.
----
- layman/module.py | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/layman/module.py b/layman/module.py
-index 08bcbc2..092418f 100644
---- a/layman/module.py
-+++ b/layman/module.py
-@@ -49,13 +49,14 @@ class Module(object):
-             kid = self.module_spec['provides'][submodule]
-             kidname = kid['name']
-             try:
-+                kid['module_name'] = '.'.join([mod_name, kid['sourcefile']])
-+            except KeyError:
-                 kid['module_name'] = '.'.join([mod_name, kidname])
--            except ImportError:
--                kid['module_name'] = '.'.join([mod_name, self.name])
--                f = self.__module.__file__
--                msg = 'Module.__initialize(); module spec is old, missing '\
-+                f = self._module.__file__
-+                msg = 'Module.__initialize(); %(module)s module spec is old, missing '\
-                       'attribute: \'sourcefile\'.\nBackward compatibility '\
--                      'may be removed in the future.\nFile: %(f)s' % {'f': f}
-+                      'may be removed in the future.\nFile: %(f)s' % {
-+                      'module': self.name, 'f': f}
-                 self.output.warn(msg)
-             kid['is_imported'] = False
-             self.kids[kidname] = kid
--- 
-2.8.3
-
diff --git a/app-portage/layman/layman-2.0.0-r1.ebuild b/app-portage/layman/layman-2.0.0-r1.ebuild
deleted file mode 100644
index b0c313242eb5..000000000000
--- a/app-portage/layman/layman-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit eutils distutils-r1 prefix
-
-DESCRIPTION="Tool to manage Gentoo overlays"
-HOMEPAGE="http://layman.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bazaar cvs darcs +git mercurial subversion test"
-
-DEPEND="test? ( dev-vcs/subversion )"
-
-RDEPEND="
-	bazaar? ( dev-vcs/bzr )
-	cvs? ( dev-vcs/cvs )
-	darcs? ( dev-vcs/darcs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	subversion? (
-		|| (
-			>=dev-vcs/subversion-1.5.4[http]
-			>=dev-vcs/subversion-1.5.4[webdav-neon]
-			>=dev-vcs/subversion-1.5.4[webdav-serf]
-		)
-	)
-	"
-
-python_prepare_all()  {
-	local PATCHES=( "${FILESDIR}"/layman-2.0.0.doctest.patch )
-	distutils-r1_python_prepare_all
-	eprefixify etc/layman.cfg layman/config.py
-}
-
-python_test() {
-	for suite in layman/tests/{dtest,external}.py ; do
-		PYTHONPATH="." "${PYTHON}" ${suite} \
-				|| die "test suite '${suite}' failed"
-	done
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/layman
-	doins etc/layman.cfg
-
-	doman doc/layman.8
-	dohtml doc/layman.8.html
-
-	keepdir /var/lib/layman
-	keepdir /etc/layman/overlays
-}
-
-pkg_postinst() {
-	# now run layman's update utility
-	einfo "Running layman-updater..."
-	"${EROOT}"/usr/bin/layman-updater
-	einfo
-}
diff --git a/app-portage/layman/layman-2.0.0-r3.ebuild b/app-portage/layman/layman-2.0.0-r3.ebuild
deleted file mode 100644
index dfe874aaa77b..000000000000
--- a/app-portage/layman/layman-2.0.0-r3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 pypy )
-PYTHON_REQ_USE="xml(+)"
-
-inherit eutils distutils-r1 prefix
-
-DESCRIPTION="Tool to manage Gentoo overlays"
-HOMEPAGE="http://layman.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bazaar cvs darcs +git mercurial subversion test"
-
-DEPEND="test? ( dev-vcs/subversion )"
-
-RDEPEND="
-	bazaar? ( dev-vcs/bzr )
-	cvs? ( dev-vcs/cvs )
-	darcs? ( dev-vcs/darcs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	subversion? (
-		|| (
-			>=dev-vcs/subversion-1.5.4[http]
-			>=dev-vcs/subversion-1.5.4[webdav-neon]
-			>=dev-vcs/subversion-1.5.4[webdav-serf]
-		)
-	)
-	sys-apps/portage[${PYTHON_USEDEP}]
-	"
-
-python_prepare_all()  {
-	local PATCHES=( "${FILESDIR}"/layman-2.0.0.*.patch )
-	distutils-r1_python_prepare_all
-	eprefixify etc/layman.cfg layman/config.py
-}
-
-python_test() {
-	for suite in layman/tests/{dtest,external}.py ; do
-		PYTHONPATH="." "${PYTHON}" ${suite} \
-				|| die "test suite '${suite}' failed"
-	done
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/layman
-	doins etc/layman.cfg
-
-	doman doc/layman.8
-	dohtml doc/layman.8.html
-
-	keepdir /var/lib/layman
-	keepdir /etc/layman/overlays
-}
-
-pkg_postinst() {
-	# now run layman's update utility
-	einfo "Running layman-updater..."
-	"${EROOT}"/usr/bin/layman-updater
-	einfo
-}
diff --git a/app-portage/layman/layman-2.2.0-r7.ebuild b/app-portage/layman/layman-2.2.0-r7.ebuild
deleted file mode 100644
index c8f4f72e8786..000000000000
--- a/app-portage/layman/layman-2.2.0-r7.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4} pypy )
-PYTHON_REQ_USE="xml(+)"
-
-inherit eutils distutils-r1 linux-info prefix
-
-DESCRIPTION="Tool to manage Gentoo overlays"
-HOMEPAGE="http://layman.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bazaar cvs darcs +git g-sorcery mercurial squashfs subversion test"
-
-DEPEND="test? ( dev-vcs/subversion )"
-
-RDEPEND="
-	bazaar? ( dev-vcs/bzr )
-	cvs? ( dev-vcs/cvs )
-	darcs? ( dev-vcs/darcs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	g-sorcery? ( app-portage/g-sorcery )
-	subversion? (
-		|| (
-			>=dev-vcs/subversion-1.5.4[http]
-			>=dev-vcs/subversion-1.5.4[webdav-neon]
-			>=dev-vcs/subversion-1.5.4[webdav-serf]
-		)
-	)
-	sys-apps/portage[${PYTHON_USEDEP}]
-	>=dev-python/ssl-fetch-0.2[${PYTHON_USEDEP}]
-	"
-
-layman_check_kernel_config() {
-	local CONFIG_CHECK
-	use squashfs && CONFIG_CHECK+=" ~BLK_DEV_LOOP ~SQUASHFS"
-	[[ -n ${CONFIG_CHECK} ]] && check_extra_config
-}
-
-pkg_pretend() {
-	layman_check_kernel_config
-}
-
-pkg_setup() {
-	layman_check_kernel_config
-}
-
-python_prepare_all()  {
-	distutils-r1_python_prepare_all
-	epatch "${FILESDIR}"/${P}-removes-doctest-remnants.patch
-	epatch "${FILESDIR}"/${P}-change-for-upstream-ssl-fetch.patch
-	epatch "${FILESDIR}"/${P}-adds-kwargs-debug.patch
-	rm "${S}"/"${PN}"/tests/dtest.py
-	eprefixify etc/layman.cfg layman/config.py
-}
-
-python_test() {
-	for suite in layman/tests/external.py ; do
-		PYTHONPATH="." "${PYTHON}" ${suite} \
-		|| die "test suite '${suite}' failed"
-	done
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/layman
-	doins etc/layman.cfg
-
-	doman doc/layman.8
-	dohtml doc/layman.8.html
-
-	keepdir /var/lib/layman
-	keepdir /etc/layman/overlays
-}
-
-pkg_postinst() {
-	# now run layman's update utility
-	einfo "Running layman-updater..."
-	"${EROOT}"/usr/bin/layman-updater
-	einfo
-}
diff --git a/app-portage/layman/layman-2.4.1-r1.ebuild b/app-portage/layman/layman-2.4.1-r1.ebuild
deleted file mode 100644
index 78e7343bf953..000000000000
--- a/app-portage/layman/layman-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
-PYTHON_REQ_USE="xml(+),sqlite?"
-
-inherit eutils distutils-r1 linux-info prefix
-
-DESCRIPTION="Tool to manage Gentoo overlays"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Layman"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86"
-IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test"
-
-DEPEND="test? ( dev-vcs/subversion )
-	"
-
-RDEPEND="
-	bazaar? ( dev-vcs/bzr )
-	cvs? ( dev-vcs/cvs )
-	darcs? ( dev-vcs/darcs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	g-sorcery? ( app-portage/g-sorcery )
-	subversion? (
-		|| (
-			>=dev-vcs/subversion-1.5.4[http]
-			>=dev-vcs/subversion-1.5.4[webdav-neon]
-			>=dev-vcs/subversion-1.5.4[webdav-serf]
-		)
-	)
-	gpg? ( >=dev-python/pyGPG-0.2 )
-	sync-plugin-portage?  ( >=sys-apps/portage-2.2.16[${PYTHON_USEDEP}] )
-	!sync-plugin-portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
-	>=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}]
-	"
-
-PATCHES=(
-	"${FILESDIR}/layman-2.4.1-sourcefileattributechanges.patch"
-)
-
-layman_check_kernel_config() {
-	local CONFIG_CHECK
-	use squashfs && CONFIG_CHECK+=" ~BLK_DEV_LOOP ~SQUASHFS"
-	[[ -n ${CONFIG_CHECK} ]] && check_extra_config
-}
-
-pkg_pretend() {
-	layman_check_kernel_config
-}
-
-pkg_setup() {
-	layman_check_kernel_config
-}
-
-python_prepare_all()  {
-	python_setup
-	esetup.py setup_plugins
-	distutils-r1_python_prepare_all
-	eprefixify etc/layman.cfg layman/config.py
-}
-
-python_test() {
-	suite=layman/tests/external.py
-	PYTHONPATH="." "${PYTHON}" ${suite} || die "test suite '${suite}' failed"
-	unset suite
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/layman
-	doins etc/layman.cfg
-
-	doman doc/layman.8
-	dohtml doc/layman.8.html
-
-	keepdir /var/lib/layman
-	keepdir /etc/layman/overlays
-}
-
-pkg_postinst() {
-	# now run layman's update utility
-	einfo "Running layman-updater..."
-	"${EROOT}"/usr/bin/layman-updater
-	einfo
-}
diff --git a/app-portage/layman/layman-2.4.2-r1.ebuild b/app-portage/layman/layman-2.4.2-r1.ebuild
deleted file mode 100644
index 7cd74b995ce9..000000000000
--- a/app-portage/layman/layman-2.4.2-r1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
-PYTHON_REQ_USE="xml(+),sqlite?"
-
-inherit eutils distutils-r1 linux-info prefix
-
-DESCRIPTION="Tool to manage Gentoo overlays"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Layman"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test"
-
-DEPEND="test? ( dev-vcs/subversion )
-	"
-
-RDEPEND="
-	bazaar? ( dev-vcs/bzr )
-	cvs? ( dev-vcs/cvs )
-	darcs? ( dev-vcs/darcs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	g-sorcery? ( app-portage/g-sorcery )
-	subversion? (
-		|| (
-			>=dev-vcs/subversion-1.5.4[http]
-			>=dev-vcs/subversion-1.5.4[webdav-neon]
-			>=dev-vcs/subversion-1.5.4[webdav-serf]
-		)
-	)
-	gpg? ( >=dev-python/pyGPG-0.2 )
-	sync-plugin-portage? (
-		|| (
-			>=sys-apps/portage-2.2.16[${PYTHON_USEDEP}]
-			sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-		)
-	)
-	!sync-plugin-portage? (
-		|| (
-			sys-apps/portage[${PYTHON_USEDEP}]
-			sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-		)
-	)
-	>=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}]
-	"
-
-layman_check_kernel_config() {
-	local CONFIG_CHECK
-	use squashfs && CONFIG_CHECK+=" ~BLK_DEV_LOOP ~SQUASHFS"
-	[[ -n ${CONFIG_CHECK} ]] && check_extra_config
-}
-
-pkg_pretend() {
-	layman_check_kernel_config
-}
-
-pkg_setup() {
-	layman_check_kernel_config
-}
-
-python_prepare_all()  {
-	python_setup
-	esetup.py setup_plugins
-	distutils-r1_python_prepare_all
-	eprefixify etc/layman.cfg layman/config.py
-}
-
-python_test() {
-	suite=layman/tests/external.py
-	PYTHONPATH="." "${PYTHON}" ${suite} || die "test suite '${suite}' failed"
-	unset suite
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/layman
-	doins etc/layman.cfg
-
-	doman doc/layman.8
-	dohtml doc/layman.8.html
-
-	keepdir /var/lib/layman
-	keepdir /etc/layman/overlays
-}
-
-pkg_postinst() {
-	# now run layman's update utility
-	einfo "Running layman-updater..."
-	"${EROOT}"/usr/bin/layman-updater
-	einfo
-}
diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild
deleted file mode 100644
index 41753c3c8898..000000000000
--- a/app-portage/layman/layman-9999.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
-PYTHON_REQ_USE="xml(+),sqlite?"
-
-inherit eutils distutils-r1 git-r3 linux-info prefix
-
-DESCRIPTION="Tool to manage Gentoo overlays"
-HOMEPAGE="http://layman.sourceforge.net"
-EGIT_REPO_URI="git://anongit.gentoo.org/proj/layman.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test"
-
-DEPEND="test? ( dev-vcs/subversion )
-	app-text/asciidoc
-	"
-
-RDEPEND="
-	bazaar? ( dev-vcs/bzr )
-	cvs? ( dev-vcs/cvs )
-	darcs? ( dev-vcs/darcs )
-	git? ( dev-vcs/git )
-	mercurial? ( dev-vcs/mercurial )
-	g-sorcery? ( app-portage/g-sorcery )
-	subversion? (
-		|| (
-			>=dev-vcs/subversion-1.5.4[http]
-			>=dev-vcs/subversion-1.5.4[webdav-neon]
-			>=dev-vcs/subversion-1.5.4[webdav-serf]
-		)
-	)
-	gpg? ( >=dev-python/pyGPG-0.2 )
-	sync-plugin-portage? (
-		|| (
-			>=sys-apps/portage-2.2.16[${PYTHON_USEDEP}]
-			sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-		)
-	)
-	!sync-plugin-portage? (
-		|| (
-			sys-apps/portage[${PYTHON_USEDEP}]
-			sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-		)
-	)
-	>=dev-python/ssl-fetch-0.4[${PYTHON_USEDEP}]
-	"
-
-layman_check_kernel_config() {
-	local CONFIG_CHECK
-	use squashfs && CONFIG_CHECK+=" ~BLK_DEV_LOOP ~SQUASHFS"
-	[[ -n ${CONFIG_CHECK} ]] && check_extra_config
-}
-
-pkg_pretend() {
-	layman_check_kernel_config
-}
-
-pkg_setup() {
-	layman_check_kernel_config
-}
-
-python_prepare_all()  {
-	python_setup
-	esetup.py setup_plugins
-	distutils-r1_python_prepare_all
-	eprefixify etc/layman.cfg layman/config.py
-}
-
-python_test() {
-	suite=layman/tests/external.py
-	PYTHONPATH="." "${PYTHON}" ${suite} || die "test suite '${suite}' failed"
-	unset suite
-}
-
-python_compile_all() {
-	# override MAKEOPTS to prevent build failure
-	emake -j1 -C doc
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/layman
-	doins etc/layman.cfg
-
-	doman doc/layman.8
-	dohtml doc/layman.8.html
-
-	keepdir /var/lib/layman
-	keepdir /etc/layman/overlays
-}
-
-pkg_postinst() {
-	# now run layman's update utility
-	einfo "Running layman-updater..."
-	"${EROOT}"/usr/bin/layman-updater
-	einfo
-}
diff --git a/app-portage/layman/metadata.xml b/app-portage/layman/metadata.xml
deleted file mode 100644
index 095d087db42d..000000000000
--- a/app-portage/layman/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>layman@gentoo.org</email>
-		<name>Gentoo Layman team</name>
-	</maintainer>
-	<use>
-		<flag name="bazaar">Support <pkg>dev-vcs/bzr</pkg> based overlays</flag>
-		<flag name="cvs">Support <pkg>dev-vcs/cvs</pkg> based overlays</flag>
-		<flag name="darcs">Support <pkg>dev-vcs/darcs</pkg> based overlays</flag>
-		<flag name="g-sorcery">Support <pkg>app-portage/g-sorcery</pkg> based overlays</flag>
-		<flag name="git">Support <pkg>dev-vcs/git</pkg> based overlays</flag>
-		<flag name="gpg">Support <pkg>app-crypt/gnupg</pkg> signed overlays lists and manifests</flag>
-		<flag name="mercurial">Support <pkg>dev-vcs/mercurial</pkg> based overlays</flag>
-		<flag name="squashfs">Support mounting squashfs image overlays locally read-only</flag>
-		<flag name="subversion">Support <pkg>dev-vcs/subversion</pkg> based overlays</flag>
-		<flag name="sync-plugin-portage">Install the <pkg>sys-apps/portage</pkg> sync module</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">layman</remote-id>
-	</upstream>
-</pkgmetadata>