app-portage/layman: Re-add 2.2.0-r7 due to missing keywords for g-sorcery

Clean up files dir.

Package-Manager: Portage-2.3.3_p38, Repoman-2.3.1_p31

4 files changed, 90 insertions, 56 deletions

diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index 6dd75d61e6b6..20648364bd7c 100644
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -1,3 +1,4 @@
 DIST layman-2.0.0.tar.gz 81184 SHA256 5843035ae4cc069693c05cf9821dae3d89d3ea7e2115b8137ea5a4a6c2807f33 SHA512 30756464d71ab1e047036550b6500d7e57999d808ebe3efba1d1ae6c037f8ca777ba704a4981d75a90285133635027a7bc13f1890f34823de33ae991ed99e2da WHIRLPOOL ec362189c4757ee032dc93e079ea0f5b291d5652231a84f1175fb308ca5622882d5008f23fd6a3d5143ff0dc98c91632d19c2e6604dcaa9b6a550bc902d79c1a
+DIST layman-2.2.0.tar.gz 116210 SHA256 4a10cfd3eb354e993886369995ae9b1243418e0370c6aabd4d0ef6c5b387b7a2 SHA512 34cac041d7b64274debdbc42cab079fd3bb3aee511ea9e80db726df0f828207d79a5262788483ced5cbf49924e3aa4f19fe21439c98dceea973d8f83473c2e41 WHIRLPOOL 8c5d3cbbfef35c6294dfac899cb42f49e0761745573721e38b7d6c9ac48031f95bbb961c9d8dd9d309e4672cc1e5b050107ba025a9f28127e5d7d6d9a73a6e9a
 DIST layman-2.4.1.tar.gz 130388 SHA256 545792a15a0a2514c79f1b3090aceef15e413c656f294b6ff84f8a36da7aa2da SHA512 bdb713d4c7d3773129b45a385068278958040759bb564e48cfda4dda9da5224ccaa7833fce3d06151ed1fecddbb6f1a059db6e71534d0e887dff12640af6c806 WHIRLPOOL b6ef18f8f3633e9bb2a08df620306441f8352174dc66f2bbb68613cff0796e0914f7008de4f185167815ba3267c3b63a4fe22d2bcd794f70cd78bc20e706d7d8
 DIST layman-2.4.2.tar.gz 137893 SHA256 e84f8b745dd160bacf7b08dfd95b5c6d117dc8721edca370600f29ef0676ff92 SHA512 9d32269f51f896c554e6cbf8a674c50009bce48dd83dfe773b08b75bafd567eb75c26c227ab3a60bc83c1ed511862a3979b8d851befe8ad16fd0847eb91337cf WHIRLPOOL eba1844f2279071947601a8baa9424db24e5bd1ba2d9ac14f90e4ae2c3e0b566dabf10378cf6286225d85d11940add45239df8cb5b150eea227b47223ce65485
diff --git a/app-portage/layman/files/layman-2.1.0-incorrect-import-make-conf-fix.patch b/app-portage/layman/files/layman-2.1.0-incorrect-import-make-conf-fix.patch
deleted file mode 100644
index 1396e320ed5a..000000000000
--- a/app-portage/layman/files/layman-2.1.0-incorrect-import-make-conf-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 8f6005fcfb9d2012bba428863f89b6b9168c8226 Mon Sep 17 00:00:00 2001
-From: Devan Franchini <twitch153@gentoo.org>
-Date: Thu, 22 May 2014 22:57:08 -0400
-Subject: [PATCH] updater.py: Fixes incorrect import for make.conf class
-
-X-Gentoo-Bug: 521724
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/521724
----
- layman/updater.py  |  4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/layman/updater.py b/layman/updater.py
-index 26aeed2..b2187e3 100644
---- a/layman/updater.py
-+++ b/layman/updater.py
-@@ -155,8 +155,8 @@ class Main(object):
-         self.output.info("  Creating layman's make.conf file")
-         # create layman's %(storage)s/make.conf
-         # so portage won't error
--        from layman.makeconf import MakeConf
--        maker = MakeConf(self.config, None)
-+        from layman.makeconf import ConfigHandler
-+        maker = ConfigHandler(self.config, None)
-         maker.write()
- 
- 
--- 
-1.8.5.5
-
diff --git a/app-portage/layman/files/layman-2.1.0-local_overlay.patch b/app-portage/layman/files/layman-2.1.0-local_overlay.patch
deleted file mode 100644
index fbe5cd0e8137..000000000000
--- a/app-portage/layman/files/layman-2.1.0-local_overlay.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d0e5d9120c27f678e9039bb2f65cfc0e457be6c7 Mon Sep 17 00:00:00 2001
-From: Douglas Freed <dwfreed@mtu.edu>
-Date: Sat, 26 Jul 2014 15:54:11 -0700
-Subject: [PATCH] Fix a bug when an overlay isn't in the remote list
-
-If the overlay isn't in the remote list, it obviously isn't a different
-type, nor has its URL changed, so just init those to False so we can
-sync the overlay without hitting UnboundLocalError.
----
- layman/api.py | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/layman/api.py b/layman/api.py
-index a86970f..930f449 100755
---- a/layman/api.py
-+++ b/layman/api.py
-@@ -426,6 +426,7 @@ class LaymanAPI(object):
-                 message = 'Overlay "%s" could not be found in the remote lists.\n' \
-                         'Please check if it has been renamed and re-add if necessary.' % ovl
-                 warnings.append((ovl, message))
-+                (diff_type, update_url) = (False, False)
-             else:
-                 self.output.debug("API.sync(); else: self._get_remote_db().select(ovl)", 5)
- 
--- 
-1.8.5.5
-
diff --git a/app-portage/layman/layman-2.2.0-r7.ebuild b/app-portage/layman/layman-2.2.0-r7.ebuild
new file mode 100644
index 000000000000..b947ad82f072
--- /dev/null
+++ b/app-portage/layman/layman-2.2.0-r7.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+}