gentoo resync : 29.12.2022

4 files changed, 200 insertions, 8 deletions

diff --git a/app-emulation/cloud-init/Manifest b/app-emulation/cloud-init/Manifest
index 9bdd51739161..109e68414e37 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -9,8 +9,11 @@ AUX cloud-init-21.2-gentoo-support-upstream-templates.patch 3793 BLAKE2B 4e5cbc9
 DIST cloud-init-20.4.tar.gz 1228898 BLAKE2B c5697af31e7219a060a82732fbae2e89dd00786e5b0feb638f1f64f6ce861df041ef687a6095cc3bdb5478f4f4c1504286155808102aea9cae853caa97d4ba1b SHA512 da2fa4673b253468380c4472795fd449809c8ac84d8f13ec1472b9b7e7d54e187ae06e5a81a36774793b05f4e1212dca57bc19aa8955b4c7fa7183cb100bfbb9
 DIST cloud-init-21.2.tar.gz 1278878 BLAKE2B 74e07649a24fc85df54aafcd72797a05f0bdbcceb90fe90c6af7024da09e876780b67bb1d7963cd164d03e3151715944b1f3fd5709d3557ac341a09061409fcc SHA512 8cc24945efc6f16b3c64411c5e7e5b83582d337f1c3f546163d52c14a6177ff752e91ba1fec04b7ade800f921c2b79c04d032df62c2b4171930ca1fb74c49a7d
 DIST cloud-init-22.1.tar.gz 1313034 BLAKE2B ca55378db822cdf58808de1bd2b519861c50ad8b08ed699212827833e0134fdc0968b76a4c2a13f39eae1d20ef8b22a99ff99b85ef77e496fd41593f4e2f2d55 SHA512 485e358777379a22dd2b0f6aa7afb1751eb44831c6e03ecbbd9c6823eaa20535e6e83fc245818ce1bb207425976839b356dadcfa3cfe62385b9d340b08ff21ab
+DIST cloud-init-22.2.tar.gz 1348736 BLAKE2B ae95bf04a0229ed0c7bbf6dc6889793eb020ffe6e6223b02f4003b3f38253781a1ed22a41f535b5064a8ba4bde20b197d58eb5d55789d4decd9b39aabd46d1c3 SHA512 07fec2f1d6eab20a1161672bb339a0c6b2826540bcb03936f95458b179fcb1b3142773c9a4038fe02b30bb05a5ca48a4153b6b0f59015b43bd6c6602832f9d6f
 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
+EBUILD cloud-init-22.2-r1.ebuild 2303 BLAKE2B dd14192049501a05542cd32c78833b0757e9c250a527081b6923743fda766873eda41a7e97aaf407921d7081b1499b67e528b5e5fd70f08b3523568480969132 SHA512 e90ee7bdf5df9a42deecfa6e5f004cc4752437e6807cf4ebb87be72a32b489f5d26a58612f6168653e0619ae6d463a3a36723371761a7cca7a54b50e87238c12
+EBUILD cloud-init-22.2.ebuild 2122 BLAKE2B 41b3e880dd26fa79cc901a251361b74183af6f21967dac2b7415369c5c71daef9260dd6cb47d12cecefe523f01cd3c6efc2de493c22a79279e5676b879b392c4 SHA512 121a59058035cd53c1a32f7698509bbfe9d09c2e5207e445aabea9c0baa5a54415cc5656b8e610c171d3b4e057f78376b9affd44b3b8d481676b10786eb1af08
+EBUILD cloud-init-9999.ebuild 2262 BLAKE2B d9e5722888f36579fed20e1adcb91e36a465395a19f5cf958cd85f8c25c229ee33515bc0a2d98f85f1f470b3bad53c20e7906551778237dfeaea97b062e3c282 SHA512 12ffc5dbdffce1927ff142e7e0a5be049543661b7aeb6643b3b6c7b65c462acc7969f31bcc120d2975e0b39624e89952adc17d2fc89f55878a2fb1350376985a
 MISC metadata.xml 652 BLAKE2B 3cdf1331c7ae5065c1cbe4211acb44ed5b633a97add66b70e26fcebef19461fb6bddf06c455369f03b45d3a12a4214b02aa60463c39c38b527db634e883872a5 SHA512 ff07770f741ea072d1e0007856ed7af1a55f2e6e879cf8ba39039ef0dd148c078438d87e0ae14acc4b8a1fb42429abaaf53a7467473aca587dc5ee6b1b266af5
diff --git a/app-emulation/cloud-init/cloud-init-22.2-r1.ebuild b/app-emulation/cloud-init/cloud-init-22.2-r1.ebuild
new file mode 100644
index 000000000000..082f34e59987
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-22.2-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Disabled for now: bug #850628
+# https://bugs.launchpad.net/cloud-init/+bug/1978328
+#DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 udev
+
+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 ppc64 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/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	net-analyzer/macchanger
+	sys-apps/iproute2
+	sys-fs/growpart
+	virtual/logger
+"
+
+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
+
+	if [[ ${PV} == *9999 ]] ; then
+		sed -i 's/version=get_version(),/version=9999,/g' setup.py || die
+	fi
+	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/* || die
+}
+
+pkg_prerm() {
+	udev_reload
+}
+
+pkg_postinst() {
+	udev_reload
+
+	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-22.2.ebuild b/app-emulation/cloud-init/cloud-init-22.2.ebuild
new file mode 100644
index 000000000000..071baaffc9f0
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-22.2.ebuild
@@ -0,0 +1,83 @@
+# 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 ppc64 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/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	net-analyzer/macchanger
+	sys-apps/iproute2
+	sys-fs/growpart
+	virtual/logger
+"
+
+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 e1b50da6f06a..0c21e628855e 100644
--- a/app-emulation/cloud-init/cloud-init-9999.ebuild
+++ b/app-emulation/cloud-init/cloud-init-9999.ebuild
@@ -3,12 +3,14 @@
 
 EAPI=8
 
-DISTUTILS_USE_PEP517=setuptools
+# Disabled for now: bug #850628
+#DISTUTILS_USE_PEP517=setuptools
+# https://bugs.launchpad.net/cloud-init/+bug/1978328
 PYTHON_COMPAT=( python3_{8..10} )
 
-inherit distutils-r1
+inherit distutils-r1 udev
 
-if [[ ${PV} == *9999 ]];then
+if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://git.launchpad.net/cloud-init"
 else
@@ -21,8 +23,6 @@ HOMEPAGE="https://launchpad.net/cloud-init"
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 CDEPEND="
 	dev-python/jinja[${PYTHON_USEDEP}]
@@ -40,6 +40,8 @@ BDEPEND="
 	test? (
 		>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
 		dev-python/setuptools[${PYTHON_USEDEP}]
 	)
 "
@@ -56,7 +58,11 @@ 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
+
+	if [[ ${PV} == *9999 ]] ; then
+		sed -i 's/version=get_version(),/version=9999,/g' setup.py || die
+	fi
+
 	distutils-r1_python_prepare_all
 }
 
@@ -70,10 +76,16 @@ python_install_all() {
 	distutils-r1_python_install_all
 
 	# installs as non-executable
-	chmod +x "${D}"/etc/init.d/*
+	chmod +x "${D}"/etc/init.d/* || die
+}
+
+pkg_prerm() {
+	udev_reload
 }
 
 pkg_postinst() {
+	udev_reload
+
 	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"