app-portage/layman: Remove old
authorDavid Seifert <soap@gentoo.org>
Sun, 29 Dec 2019 08:51:16 +0000 (09:51 +0100)
committerDavid Seifert <soap@gentoo.org>
Sun, 29 Dec 2019 08:51:16 +0000 (09:51 +0100)
Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: David Seifert <soap@gentoo.org>
app-portage/layman/Manifest
app-portage/layman/files/layman-2.0.0.doctest.patch [deleted file]
app-portage/layman/files/layman-2.0.0.svn_upgrade.patch [deleted file]
app-portage/layman/files/layman-2.2.0-adds-kwargs-debug.patch [deleted file]
app-portage/layman/files/layman-2.2.0-change-for-upstream-ssl-fetch.patch [deleted file]
app-portage/layman/files/layman-2.2.0-removes-doctest-remnants.patch [deleted file]
app-portage/layman/files/layman-2.4.1-sourcefileattributechanges.patch [deleted file]
app-portage/layman/layman-2.0.0-r1.ebuild [deleted file]
app-portage/layman/layman-2.0.0-r3.ebuild [deleted file]
app-portage/layman/layman-2.2.0-r7.ebuild [deleted file]
app-portage/layman/layman-2.4.1-r1.ebuild [deleted file]

index 23209d985e13e0a621c9299820c5e29e4a7c7f86..e161600729efa63e1ca177c5492a853428d7ac1d 100644 (file)
@@ -1,4 +1 @@
-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
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 (file)
index 6d3305c..0000000
+++ /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 (file)
index 431b937..0000000
+++ /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 (file)
index 2020cb7..0000000
+++ /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 (file)
index d738b26..0000000
+++ /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 (file)
index 4b07714..0000000
+++ /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 (file)
index 207f474..0000000
+++ /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 (file)
index cfba5b5..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bazaar cvs darcs +git mercurial subversion test"
-RESTRICT="!test? ( 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 (file)
index e2e6e9d..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bazaar cvs darcs +git mercurial subversion test"
-RESTRICT="!test? ( 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 (file)
index 00fc4d1..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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 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 ~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"
-RESTRICT="!test? ( 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 (file)
index 398b9ad..0000000
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,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"
-RESTRICT="!test? ( 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
-}