commit: 44cfdb3c49f7ebce1e66324ad5ac68285d8d08bb Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Jun 10 02:44:59 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Jun 10 02:44:59 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44cfdb3c
app-emulation/cloud-init: restore OpenRC files broken w/ PEP517 for now Bug: https://bugs.gentoo.org/850628 Signed-off-by: Sam James <sam <AT> gentoo.org> ...-init-9999.ebuild => cloud-init-22.2-r1.ebuild} | 22 +++++++++++++++------ app-emulation/cloud-init/cloud-init-9999.ebuild | 23 +++++++++++++++------- 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/app-emulation/cloud-init/cloud-init-9999.ebuild b/app-emulation/cloud-init/cloud-init-22.2-r1.ebuild similarity index 84% copy from app-emulation/cloud-init/cloud-init-9999.ebuild copy to app-emulation/cloud-init/cloud-init-22.2-r1.ebuild index f8fc9fc2c079..b253c34820df 100644 --- a/app-emulation/cloud-init/cloud-init-9999.ebuild +++ b/app-emulation/cloud-init/cloud-init-22.2-r1.ebuild @@ -3,17 +3,18 @@ EAPI=8 -DISTUTILS_USE_PEP517=setuptools +# Disabled for now: bug #850628 +#DISTUTILS_USE_PEP517=setuptools 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 SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"; - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="amd64 arm64 ppc64 x86" fi DESCRIPTION="Cloud instance initialisation magic" @@ -58,7 +59,10 @@ 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 } @@ -72,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" diff --git a/app-emulation/cloud-init/cloud-init-9999.ebuild b/app-emulation/cloud-init/cloud-init-9999.ebuild index f8fc9fc2c079..9c937d818458 100644 --- a/app-emulation/cloud-init/cloud-init-9999.ebuild +++ b/app-emulation/cloud-init/cloud-init-9999.ebuild @@ -3,12 +3,13 @@ EAPI=8 -DISTUTILS_USE_PEP517=setuptools +# Disabled for now: bug #850628 +#DISTUTILS_USE_PEP517=setuptools 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 +22,6 @@ HOMEPAGE="https://launchpad.net/cloud-init"; LICENSE="GPL-3" SLOT="0" -IUSE="test" -RESTRICT="!test? ( test )" CDEPEND=" dev-python/jinja[${PYTHON_USEDEP}] @@ -58,7 +57,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 } @@ -72,10 +75,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"
