Merge branch 'edge' into next

5 files changed, 6 insertions, 94 deletions

diff --git a/app-portage/layman/Manifest b/app-portage/layman/Manifest
index b320b42b9436..0fbe08d5cf96 100644
--- a/app-portage/layman/Manifest
+++ b/app-portage/layman/Manifest
@@ -1,6 +1,4 @@
-DIST layman-2.4.2.tar.gz 137893 BLAKE2B ad925b974e280c0c933cb7c7d5131946fbb40d15410a671be3d93fa895e2d92a4f3218bce99abc8f2c1e007e72bd51662a18665579bf2ded7f349eb9ed5c652c SHA512 9d32269f51f896c554e6cbf8a674c50009bce48dd83dfe773b08b75bafd567eb75c26c227ab3a60bc83c1ed511862a3979b8d851befe8ad16fd0847eb91337cf
 DIST layman-2.4.3.tar.gz 135311 BLAKE2B b83fd543468be904a10d6fbda11f8d603a6936ecef3029c9d1c82fe4c938d2cd299874a3e114ac3524485ce8a33c5ec21885adddc218f5e331519318c0b1ad5a SHA512 2f3d1180647b358d5ca929fd28c6c5f4664f1f6f24e3114a4dc886d23279ffcdde7ca292c64aab84f1710ddf7029c26483de07c2271ca527b8618888b0ea2b54
-EBUILD layman-2.4.2-r1.ebuild 2072 BLAKE2B b97f6552d5779f157ae2d89bf48194bfcd018f6c6576aa708a9a05949e09687bf46b124781db36760fa08f3b11d05d1add4f9cff1dbb9baf423f3f6073359acd SHA512 b22c3e6797549eb93c8db5799275d5d2bfcd1c05a59bc28d4b32ffac7662576f7d576d3a6da2a50abcf88e6956a8b3064c199c24303a92a88ac016d16801a0fa
-EBUILD layman-2.4.3.ebuild 2247 BLAKE2B 8d15c448de4899111a45c0374bd8c83497e2cb3b5d52a9bc3a897957af871255b732e1274e9e225e1c878f4fb4aac14de562cca1c6c0ffe366d6a71eacd9356c SHA512 0dd9a39c99199db9722370cf348c114b53590a603774603b65673035102980b86e08881a3ab53450c27132b0e44a5038360d8cfd0b2b1cfb4337f1692c94d569
-EBUILD layman-9999.ebuild 2247 BLAKE2B 8d15c448de4899111a45c0374bd8c83497e2cb3b5d52a9bc3a897957af871255b732e1274e9e225e1c878f4fb4aac14de562cca1c6c0ffe366d6a71eacd9356c SHA512 0dd9a39c99199db9722370cf348c114b53590a603774603b65673035102980b86e08881a3ab53450c27132b0e44a5038360d8cfd0b2b1cfb4337f1692c94d569
-MISC metadata.xml 1177 BLAKE2B 0024befce684e122216fecaecb3ccf2f2da44fa82a3f2c8811155861041009a0cded912e93a2d6e66884814afc8b1ccbe6f006b40b6e44cafa13fa0f53c90a4d SHA512 d41244afefdb11e5f68be2200a759e4209b2b59f5b9de083e79a522d5a10f12359f9fd6f30fd24f73d4e9b190a2f974f8e519cd22614dd2b023594952dba957e
+EBUILD layman-2.4.3.ebuild 2207 BLAKE2B cc85e64ce5df75a68c46e57216a7fd1fb90f077717c12c8c308d5caa7a4718c5e53d7f4b3bf4ccd46dbdd42d9321430ac1b6f1a2a8783d90f4289dadb64a0623 SHA512 70734126db021ec6942e2427e0c5f0221c09a87d1bbac050f26696739ed0ca53bf1f62934978ebc7ddf2416216fcdb92ea22945392e0958b33ec4d4ccb2dc179
+EBUILD layman-9999.ebuild 2215 BLAKE2B b04e0bca7c19751b787a70af3ca00974bc4eade5c682524dcd0332015f6bf63efc1ffa7c473633cf7c736c0fd7886a4f3954d66401db995fb42fb0c97f7486bb SHA512 5b77a9aaaae63877163df6f9d03c0ec70c8182cf93699306809502f26a08b72abce4129d1fc816ca3217996d7938704329ce7ac1838e62166ed2d65b02685d6a
+MISC metadata.xml 1102 BLAKE2B 43b832918f1c938f9b8a7d8bd09869ab79c50b5c9c38faa73267db851deacbf9fb2a95fa34b7b90298134f1ec5b557adef10722c87ac34ff9b8784e5c2f8efcc SHA512 9025362fc830f889b90c753de3485917af23adcbdf6a567010e4d07570bbb51189039f8501d16ee1bd6ec094f2e163da5744f2a16bffadb4a7826f1b852ca88e
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 6ed498235fd2..000000000000
--- a/app-portage/layman/layman-2.4.2-r1.ebuild
+++ /dev/null
@@ -1,83 +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="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] )
-	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 dae60bcf5c63..6b6d71a01b39 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"
@@ -22,14 +22,13 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Layman"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test"
+IUSE="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 )
diff --git a/app-portage/layman/layman-9999.ebuild b/app-portage/layman/layman-9999.ebuild
index dae60bcf5c63..691cdb324f88 100644
--- a/app-portage/layman/layman-9999.ebuild
+++ b/app-portage/layman/layman-9999.ebuild
@@ -22,14 +22,13 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Layman"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="bazaar cvs darcs +git gpg g-sorcery mercurial sqlite squashfs subversion sync-plugin-portage test"
+IUSE="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 )
diff --git a/app-portage/layman/metadata.xml b/app-portage/layman/metadata.xml
index 095d087db42d..d291a854bfcb 100644
--- a/app-portage/layman/metadata.xml
+++ b/app-portage/layman/metadata.xml
@@ -6,7 +6,6 @@
 		<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>