[gentoo-commits] repo/gentoo:master commit in: app-portage/layman/

[Brian Dolbec]

commit:     0f701efbb429b24be5e5ef4945bafe55238f760a
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Fri May  8 18:08:43 2020 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Fri May  8 18:11:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f701efb

app-portage/layman: amd64 x86 stable wrt #720934

Clean out remaining deprecated eapi/python version

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Brian Dolbec <dolsen <AT> gentoo.org>

 app-portage/layman/Manifest               |  1 -
 app-portage/layman/layman-2.4.2-r1.ebuild | 82 -------------------------------
 app-portage/layman/layman-2.4.3.ebuild    |  2 +-
 3 files changed, 1 insertion(+), 84 deletions(-)

diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index 4d3f37e06d6..0d796db12b7 100644
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -1,2 +1 @@
-DIST layman-2.4.2.tar.gz 137893 BLAKE2B ad925b974e280c0c933cb7c7d5131946fbb40d15410a671be3d93fa895e2d92a4f3218bce99abc8f2c1e007e72bd51662a18665579bf2ded7f349eb9ed5c652c SHA512 9d32269f51f896c554e6cbf8a674c50009bce48dd83dfe773b08b75bafd567eb75c26c227ab3a60bc83c1ed511862a3979b8d851befe8ad16fd0847eb91337cf
 DIST layman-2.4.3.tar.gz 135311 BLAKE2B b83fd543468be904a10d6fbda11f8d603a6936ecef3029c9d1c82fe4c938d2cd299874a3e114ac3524485ce8a33c5ec21885adddc218f5e331519318c0b1ad5a SHA512 2f3d1180647b358d5ca929fd28c6c5f4664f1f6f24e3114a4dc886d23279ffcdde7ca292c64aab84f1710ddf7029c26483de07c2271ca527b8618888b0ea2b54

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 db47d4e416b..00000000000
--- a/app-portage/layman/layman-2.4.2-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python3_6 )
-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="cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-vcs/subversion )
-	"
-
-RDEPEND="
-	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] )
-	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"
-	[[ -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.3.ebuild b/app-portage/layman/layman-2.4.3.ebuild
index a41d0f5cf3a..6b6d71a01b3 100644
--- a/app-portage/layman/layman-2.4.3.ebuild
+++ b/app-portage/layman/layman-2.4.3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	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"
+	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"
 fi
 
 DESCRIPTION="Tool to manage Gentoo overlays"