gentoo resync : 16.04.2022

7 files changed, 182 insertions, 36 deletions

diff --git a/app-emulation/cloud-init/Manifest b/app-emulation/cloud-init/Manifest
index 7f07dc8e60de..9bdd51739161 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -1,12 +1,16 @@
 AUX 18.4-add-support-for-package_upgrade.patch 1734 BLAKE2B 1eb4fd07bec989b1584ec0ad272243d33f0c6b6fd17994b6bda69c38a0360acedfdeb7ca81f8c9bee2c35a40b07b5f831a10315129c1b0fd030a00881831fc76 SHA512 ebe2eadb13190d29e1933a81d1e8a0301842f2a9fbf1848ec2618c479a731d98d8807827abb1b43aebb05110bc566048841f8d1b63118b691f8a0c3e4c32aefb
 AUX 18.4-fix-filename-for-storing-locale.patch 1045 BLAKE2B 0167101d78f821fefc3d05447d3fe35d7328cdebcb3a0eebdaaf2f14b8e2f46efe7c0fb4031baa3a8600546a47f98641719112992c8e50cc1ab0181851937f81 SHA512 8a3b1bf35a445cbc7c3d4849c4c9ebd716209bc3b38bc060cd3b27b1b09749da8dcf35c8e0963300f7cc21f43fda96e5928f9f3c86c22a784cc60b840a1cc419
 AUX 18.4-fix-update_package_sources-function.patch 880 BLAKE2B f8a50714d5763f43c177de8e65369203e4d3b94de98126b85fca22ee4a89f9568c6081078b03dd4bb6cdcd07c51bc55b093e94092a06fd7eeec610ce22780f67 SHA512 8b82d0e565a9f8b4f6464382e01b79c95ad0ced600bf2ba1c6377eea704f86108cf68bc20c99f65e68c6b2d7a7ccc02624bfef400dd76990ef18f00f1e220f6c
+AUX 22.1-add-support-for-package_upgrade.patch 1614 BLAKE2B 77f1c96a2a403fa0fedd2d80809bab03aa617b82bf590c4b274bb618b84a801b76734d500010e8749021d7e78bcb2a0b419773dffff25c728f82448645f458ef SHA512 308a5943da076b23aee25ba2a6c2302600476572903acd9d3f8806e7f7c3ed6d6ee39b268bb5d1a7702289aa86e9f5ffbf24823754a93aa84e889ec459353072
+AUX 22.1-fix-update_package_sources-function.patch 714 BLAKE2B 361ce316d4c499da40e55651fc3b0d4279b78386a47bf17240a1ca2071893f6454f9658c5242c19a05f3788680ed430a8b2308d03931ba6c0c5c282cd28a6da9 SHA512 2f8509356c66b5fd915280b21720e4072119d7fe85b747929cafb0c72926fb9ed1c300cd82f7e07696bd051720e3b53153299b07e51391821aafc30f6e28a6f7
 AUX cloud-init-18.4-fix-packages-module.patch 704 BLAKE2B e5deb163e7d97365befb63bf6978900d250356a3b29972b5c8ec6dd19c202d03cf0a07bbf1e8b437c3ec80b810f5c1af456bd589adfde290636b3fc10028ad36 SHA512 ea28c8d5c9a4ebd0d65dea8dd09e5c9c9973fc3456ff8a4e35b3eb4eb856e5c4809b922ef5d958682fb7429ba23eafd80e0fdee629967b7f838d4127db5e1ac7
 AUX cloud-init-20.4-gentoo-support-upstream-templates.patch 3467 BLAKE2B 0d6185373ef7de03de60f3ae277a808a8457c8bbce23ab5a10ff3382c0ace244fe5d054285d2eeeb99956863156f3ff0000b7f6f84b706489d19c29cb1dbeadf SHA512 d5209c78ede276b6d614baad2ff586008694e4533114394207f377a67cbb8cd9a73547c8e0a9daa55051fa56ccb099b3a0f2bcf824cda0cbef0de858332c95f8
 AUX cloud-init-21.2-gentoo-support-upstream-templates.patch 3793 BLAKE2B 4e5cbc9fa872cc1d148861be1d1fb0615a68e69c6acbec8173580590c8d2c5e50df44e067d3b8ea77dd0b23ef658837a2a317c98712f8b42e9a14398d4cfe996 SHA512 9d436f223dacfd018df4caf407b0da3de5e9cc1932d3aad56f455c664d2b9f3dc8ab40d8607f9ef4481ee778ae897717161d3cb1a7d4d99041585a00a97d8774
 DIST cloud-init-20.4.tar.gz 1228898 BLAKE2B c5697af31e7219a060a82732fbae2e89dd00786e5b0feb638f1f64f6ce861df041ef687a6095cc3bdb5478f4f4c1504286155808102aea9cae853caa97d4ba1b SHA512 da2fa4673b253468380c4472795fd449809c8ac84d8f13ec1472b9b7e7d54e187ae06e5a81a36774793b05f4e1212dca57bc19aa8955b4c7fa7183cb100bfbb9
 DIST cloud-init-21.2.tar.gz 1278878 BLAKE2B 74e07649a24fc85df54aafcd72797a05f0bdbcceb90fe90c6af7024da09e876780b67bb1d7963cd164d03e3151715944b1f3fd5709d3557ac341a09061409fcc SHA512 8cc24945efc6f16b3c64411c5e7e5b83582d337f1c3f546163d52c14a6177ff752e91ba1fec04b7ade800f921c2b79c04d032df62c2b4171930ca1fb74c49a7d
-EBUILD cloud-init-20.4.ebuild 2620 BLAKE2B da53cd675b21b9140ff603850dcce985990c9a1f5c90bd4be4524f6649788485b417217ab3450a7a47a6cf110bddc8823775367d109c1ad66beccc7ee94feef0 SHA512 b6d4df6d9dff2970710aedd30b1552490218ccf9067c972465a3f5b0ef2597e7b6a5f36ca3f1c98b0496f2c5da95ecea541a52557b426d7c30b82473857a1a66
-EBUILD cloud-init-21.2.ebuild 2634 BLAKE2B fd45521ef7b88a74144780b5e3f938385ceec3f91e390fc22c868da72a781e77d787d1ac764d0ac632bddd86fe41e2d768405ac886fff575bed0297e415e1545 SHA512 19b64946f0b7d881dd9db21eb332d8dca1e71e5674346405aeba0546ce55227694c77ffec2944d66e3e8f0b4284dfd8e036b88276c55d8383b2a61b104cc8fb2
-EBUILD cloud-init-9999.ebuild 2636 BLAKE2B ecc028c023e898f70c75ece9fe6355c3dc6edd0c61a098b83124ba026e1836f1de32715e2c85db407df0caa1813126db05b2ccf0ebf07b7e5c971f173b3c1947 SHA512 74dc1bddb1a6c0740d13f653eadb6f034af41243137316e0238c778e942af5cb9669324e00a409fb9d9f04a26d4ac1d49876d15fbadcd741caeff3600a29bce3
+DIST cloud-init-22.1.tar.gz 1313034 BLAKE2B ca55378db822cdf58808de1bd2b519861c50ad8b08ed699212827833e0134fdc0968b76a4c2a13f39eae1d20ef8b22a99ff99b85ef77e496fd41593f4e2f2d55 SHA512 485e358777379a22dd2b0f6aa7afb1751eb44831c6e03ecbbd9c6823eaa20535e6e83fc245818ce1bb207425976839b356dadcfa3cfe62385b9d340b08ff21ab
+EBUILD cloud-init-20.4.ebuild 2570 BLAKE2B fd761ab40065f361beba0ddca7c907b314f7149de664de99b5c8033df856dbad88cf51a296b8ed4b118a1d97efd0792f4f0d15348962597ecbe6de25646501d3 SHA512 d42a26022cbaa3fad576c236a17cc6b35c91a232eb12bc4326975bf5d17b11cf51f4626d5e11c266313a7989140cd8816c2132b46ceb25eee935dad7b8a1c1ef
+EBUILD cloud-init-21.2.ebuild 2583 BLAKE2B 3495a3365d0e27de5d9a86208bc94f3745a98ad7505d1930ad48a4f4e68657a044174532399a72110f19be5f6e6c1f853229781cbde4c0abbe1c7cb4e852e271 SHA512 917ab440ff35629309c3db1e336506e1e97801746c5800e8a9f87654ca87644fb0631b5c8a5c58ff2a1bed6def3fae77a6664ea38a71a53e7811382a414580b9
+EBUILD cloud-init-22.1-r1.ebuild 2282 BLAKE2B d296a08408c38573c43aa1de8b6a6dc284b748ef8648a9e9cbd1d71832e7d78f173d5e2c8ef645950af66c5c48b7a43119a4f81e7f49270207b2af877fbbf977 SHA512 c0908a439be3706e4a64aec63a9dc991319578ad42fab390a6af88e437f2e29430d5eba8b5a469aced142c207bd34e3da83a8827e872849dca9e245dee11c131
+EBUILD cloud-init-9999.ebuild 2035 BLAKE2B 24a897f5a1798b284e95daef8d101c2060284191f04cd71169e273debb909ea8cda86618ebdb79d3849065a96130f98cd6dd3db22a862453920f30b0fc51fce5 SHA512 caa770167a7d9cc45dbca77f56bd08f172952fbe73eff4f1eb8cbc590b3916e1e05fc3e3daf8f97ce0e0cedfc19b6e9713798e2ca73a1682ee83bcc3e7a0d5f6
 MISC metadata.xml 652 BLAKE2B 3cdf1331c7ae5065c1cbe4211acb44ed5b633a97add66b70e26fcebef19461fb6bddf06c455369f03b45d3a12a4214b02aa60463c39c38b527db634e883872a5 SHA512 ff07770f741ea072d1e0007856ed7af1a55f2e6e879cf8ba39039ef0dd148c078438d87e0ae14acc4b8a1fb42429abaaf53a7467473aca587dc5ee6b1b266af5
diff --git a/app-emulation/cloud-init/cloud-init-20.4.ebuild b/app-emulation/cloud-init/cloud-init-20.4.ebuild
index 89910008a34f..31a7326ac086 100644
--- a/app-emulation/cloud-init/cloud-init-20.4.ebuild
+++ b/app-emulation/cloud-init/cloud-init-20.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,14 +32,13 @@ CDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/jsonpatch[${PYTHON_USEDEP}]
 	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
 "
 DEPEND="
 	test? (
 		${CDEPEND}
 		>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
 	)
 "
@@ -69,8 +68,8 @@ python_prepare_all() {
 }
 
 python_test() {
-	# Do not use Makefile target as it does not setup environment correclty
-	esetup.py nosetests -v --where cloudinit --where tests/unittests || die
+	# Do not use Makefile target as it does not setup environment correctly
+	esetup.py pytest -v cloudinit/ tests/unittests || die
 }
 
 python_install() {
diff --git a/app-emulation/cloud-init/cloud-init-21.2.ebuild b/app-emulation/cloud-init/cloud-init-21.2.ebuild
index 55f12c07641e..f99af619353e 100644
--- a/app-emulation/cloud-init/cloud-init-21.2.ebuild
+++ b/app-emulation/cloud-init/cloud-init-21.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,14 +32,13 @@ CDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/jsonpatch[${PYTHON_USEDEP}]
 	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
 "
 DEPEND="
 		${CDEPEND}
 	test? (
 		>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/coverage[${PYTHON_USEDEP}]
 	)
 "
@@ -69,8 +68,8 @@ python_prepare_all() {
 }
 
 python_test() {
-	# Do not use Makefile target as it does not setup environment correclty
-	esetup.py nosetests -v --where cloudinit --where tests/unittests || die
+	# Do not use Makefile target as it does not setup environment correctly
+	esetup.py pytest -v cloudinit tests/unittests || die
 }
 
 python_install() {
diff --git a/app-emulation/cloud-init/cloud-init-22.1-r1.ebuild b/app-emulation/cloud-init/cloud-init-22.1-r1.ebuild
new file mode 100644
index 000000000000..667839f99352
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-22.1-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.launchpad.net/cloud-init"
+else
+	SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+DESCRIPTION="Cloud instance initialisation magic"
+HOMEPAGE="https://launchpad.net/cloud-init"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/oauthlib[${PYTHON_USEDEP}]
+	dev-python/pyserial[${PYTHON_USEDEP}]
+	>=dev-python/configobj-5.0.2[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/netifaces[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${CDEPEND}
+	test? (
+		>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	net-analyzer/macchanger
+	sys-apps/iproute2
+	sys-fs/growpart
+	virtual/logger
+"
+
+PATCHES=(
+	# Fix Gentoo support
+	# https://code.launchpad.net/~gilles-dartiguelongue/cloud-init/+git/cloud-init/+merge/358777
+	"${FILESDIR}"/22.1-fix-update_package_sources-function.patch
+	"${FILESDIR}"/22.1-add-support-for-package_upgrade.patch
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Fix location of documentation installation
+	sed -i "s:USR + '/share/doc/cloud-init:USR + '/share/doc/${PF}:" setup.py || die
+	sed -i 's/version=get_version(),/version=9999,/g' setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_install() {
+	distutils-r1_python_install --init-system=sysvinit_openrc,systemd --distro gentoo
+}
+
+python_install_all() {
+	keepdir /etc/cloud
+
+	distutils-r1_python_install_all
+
+	# installs as non-executable
+	chmod +x "${D}"/etc/init.d/*
+}
+
+pkg_postinst() {
+	elog "cloud-init-local needs to be run in the boot runlevel because it"
+	elog "modifies services in the default runlevel.  When a runlevel is started"
+	elog "it is cached, so modifications that happen to the current runlevel"
+	elog "while you are in it are not acted upon."
+}
diff --git a/app-emulation/cloud-init/cloud-init-9999.ebuild b/app-emulation/cloud-init/cloud-init-9999.ebuild
index c355c9f901de..e1b50da6f06a 100644
--- a/app-emulation/cloud-init/cloud-init-9999.ebuild
+++ b/app-emulation/cloud-init/cloud-init-9999.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -32,15 +33,14 @@ CDEPEND="
 	dev-python/requests[${PYTHON_USEDEP}]
 	dev-python/jsonpatch[${PYTHON_USEDEP}]
 	dev-python/jsonschema[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netifaces[${PYTHON_USEDEP}]
 "
-DEPEND="
+BDEPEND="
+	${CDEPEND}
 	test? (
-		${CDEPEND}
 		>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
 	)
 "
 RDEPEND="
@@ -51,15 +51,7 @@ RDEPEND="
 	virtual/logger
 "
 
-PATCHES=(
-	# Fix Gentoo support
-	# https://code.launchpad.net/~gilles-dartiguelongue/cloud-init/+git/cloud-init/+merge/358777
-	"${FILESDIR}/${PN}-18.4-fix-packages-module.patch"
-	"${FILESDIR}/${PN}-21.2-gentoo-support-upstream-templates.patch"
-	"${FILESDIR}"/18.4-fix-filename-for-storing-locale.patch
-	"${FILESDIR}"/18.4-fix-update_package_sources-function.patch
-	"${FILESDIR}"/18.4-add-support-for-package_upgrade.patch
-)
+distutils_enable_tests pytest
 
 python_prepare_all() {
 	# Fix location of documentation installation
@@ -68,11 +60,6 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-python_test() {
-	# Do not use Makefile target as it does not setup environment correclty
-	esetup.py nosetests -v --where cloudinit --where tests/unittests || die
-}
-
 python_install() {
 	distutils-r1_python_install --init-system=sysvinit_openrc,systemd --distro gentoo
 }
diff --git a/app-emulation/cloud-init/files/22.1-add-support-for-package_upgrade.patch b/app-emulation/cloud-init/files/22.1-add-support-for-package_upgrade.patch
new file mode 100644
index 000000000000..124b4225d830
--- /dev/null
+++ b/app-emulation/cloud-init/files/22.1-add-support-for-package_upgrade.patch
@@ -0,0 +1,48 @@
+From 7868b97507d0dd7d7721ad5c4539e22c67635f92 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Wed, 14 Nov 2018 15:58:30 +0100
+Subject: [PATCH 5/5] gentoo: add support for package_upgrade
+
+---
+diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py
+index 4eb76da8..702cda8a 100644
+--- a/cloudinit/distros/gentoo.py
++++ b/cloudinit/distros/gentoo.py
+@@ -218,23 +218,26 @@ class Distro(distros.Distro):
+         distros.set_etc_timezone(tz=tz, tz_file=self._find_tz_file(tz))
+ 
+     def package_command(self, command, args=None, pkgs=None):
+-        if pkgs is None:
+-            pkgs = []
+-
+         cmd = list("emerge")
+         # Redirect output
+         cmd.append("--quiet")
+ 
+-        if args and isinstance(args, str):
+-            cmd.append(args)
+-        elif args and isinstance(args, list):
+-            cmd.extend(args)
++        if command == "upgrade":
++            cmd.extend(["--update", "world"])
++        else:
++            if pkgs is None:
++                pkgs = []
++
++            if args and isinstance(args, str):
++                cmd.append(args)
++            elif args and isinstance(args, list):
++                cmd.extend(args)
+ 
+-        if command:
+-            cmd.append(command)
++            if command:
++                cmd.append(command)
+ 
+-        pkglist = util.expand_package_list("%s-%s", pkgs)
+-        cmd.extend(pkglist)
++            pkglist = util.expand_package_list("%s-%s", pkgs)
++            cmd.extend(pkglist)
+ 
+         # Allow the output of this to flow outwards (ie not be captured)
+         subp.subp(cmd, capture=False)
diff --git a/app-emulation/cloud-init/files/22.1-fix-update_package_sources-function.patch b/app-emulation/cloud-init/files/22.1-fix-update_package_sources-function.patch
new file mode 100644
index 000000000000..7a1b938e4e60
--- /dev/null
+++ b/app-emulation/cloud-init/files/22.1-fix-update_package_sources-function.patch
@@ -0,0 +1,21 @@
+From b15c4c4b24c894b3c8d444466110c881c35525e2 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org> 
+Date: Wed, 14 Nov 2018 15:35:37 +0100 
+Subject: [PATCH 4/5] gentoo: fix update_package_sources function
+
+Method is meant to update packages repository, not to update the system.
+---
+
+diff --git a/cloudinit/distros/gentoo.py b/cloudinit/distros/gentoo.py
+index 702cda8a..37217fe4 100644
+--- a/cloudinit/distros/gentoo.py
++++ b/cloudinit/distros/gentoo.py
+@@ -246,7 +246,7 @@ class Distro(distros.Distro):
+         self._runner.run(
+             "update-sources",
+             self.package_command,
+-            ["-u", "world"],
++            ["--sync"],
+             freq=PER_INSTANCE,
+         )
+