app-portage/layman: Version bump, Fix pyGPG dep on recent versions

Cheange the pyGPG dep to >=-0.2.
Clean out old ~arch versions.

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

7 files changed, 8 insertions, 260 deletions

diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index 416c82c915a..125f87c6a7d 100644
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -4,3 +4,4 @@ DIST layman-2.2.0.tar.gz 116210 SHA256 4a10cfd3eb354e993886369995ae9b1243418e037
 DIST layman-2.3.0.tar.gz 119223 SHA256 76559b8e202c012d124deac01b92bbe70b550afe711144a3b1e301c5d8bbd0f2 SHA512 d110fb1781017d87e995098ecb48c4223347323d67534b584a393dc4354b761a6d960fd31e6e6787b5f37fa7e63b357c49486042c7cb527f78dd5beb5373627d WHIRLPOOL 76c82f08b18830e925ffd4c97b490753de2e7d0b3c71a82a0a75fd776ed3af84d2ba2fe06dab25e5e4d2ea400b0f0b66eda65f1f4eded0521ec579a1a0c1b17f
 DIST layman-2.4.0.tar.gz 130052 SHA256 0dd9dbcd05b5bf062139308cb812507b2c3310dd81f25c9cdc4c8f643b3f74c8 SHA512 011ac0e7dfed8415b875898ff1eecfe77ba5a68ccac208d8f5c693b9b880355ffef572490bb98ede62092bea1a84298bbd72e6c93a234fdfa319e96551e7eb07 WHIRLPOOL 0fdcd09ef4347f9450897237befd6fa73187a3e5ed0eff6b08345846ff270cd9751a3f38277f7b53baffb3b9a3e18e10f08ebe33c228ed7f7ccd01ce81d05a76
 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/layman-2.1.0-r3.ebuild b/app-portage/layman/layman-2.1.0-r3.ebuild
deleted file mode 100644
index 9628c45a95e..00000000000
--- a/app-portage/layman/layman-2.1.0-r3.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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 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 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}]
-	>=dev-python/ssl-fetch-0.2[${PYTHON_USEDEP}]
-	"
-
-python_prepare_all()  {
-	distutils-r1_python_prepare_all
-	epatch "${FILESDIR}"/${P}-local_overlay.patch
-	epatch "${FILESDIR}"/${P}-incorrect-import-make-conf-fix.patch
-	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 b947ad82f07..00000000000
--- a/app-portage/layman/layman-2.2.0-r7.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# 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
-}
diff --git a/app-portage/layman/layman-2.3.0-r1.ebuild b/app-portage/layman/layman-2.3.0-r1.ebuild
deleted file mode 100644
index db189a579d8..00000000000
--- a/app-portage/layman/layman-2.3.0-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5} 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="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86"
-IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial squashfs subversion sync-plugin-portage test"
-
-DEPEND="test? ( dev-vcs/subversion )
-	>=dev-python/ssl-fetch-0.2[${PYTHON_USEDEP}]
-"
-
-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]
-		)
-	)
-	sync-plugin-portage?  ( >=sys-apps/portage-2.2.16[${PYTHON_USEDEP}] )
-	!sync-plugin-portage? ( sys-apps/portage[${PYTHON_USEDEP}] )
-	gpg? ( dev-python/pyGPG )
-	>=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()  {
-	python_setup
-	esetup.py setup_plugins
-	distutils-r1_python_prepare_all
-	#rm "${S}"/"${PN}"/tests/dtest.py
-	epatch "${FILESDIR}"/${P}-dir_check.patch
-	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
index 3176efa8552..dcbaeed00a3 100644
--- a/app-portage/layman/layman-2.4.1-r1.ebuild
+++ b/app-portage/layman/layman-2.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -35,7 +35,7 @@ RDEPEND="
 			>=dev-vcs/subversion-1.5.4[webdav-serf]
 		)
 	)
-	gpg? ( =dev-python/pyGPG-0.2 )
+	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}]
diff --git a/app-portage/layman/layman-2.4.0-r1.ebuild b/app-portage/layman/layman-2.4.2.ebuild
index 7ae33587ffc..c17c9060d36 100644
--- a/app-portage/layman/layman-2.4.0-r1.ebuild
+++ b/app-portage/layman/layman-2.4.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -35,12 +35,13 @@ RDEPEND="
 			>=dev-vcs/subversion-1.5.4[webdav-serf]
 		)
 	)
-	gpg? ( =dev-python/pyGPG-0.2 )
+	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}]
 	"
 
+
 layman_check_kernel_config() {
 	local CONFIG_CHECK
 	use squashfs && CONFIG_CHECK+=" ~BLK_DEV_LOOP ~SQUASHFS"
diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild
index 41ba82e14d3..a7d8292d705 100644
--- a/app-portage/layman/layman-9999.ebuild
+++ b/app-portage/layman/layman-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -37,7 +37,7 @@ RDEPEND="
 			>=dev-vcs/subversion-1.5.4[webdav-serf]
 		)
 	)
-	gpg? ( =dev-python/pyGPG-9999 )
+	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}]