app-emulation/cloud-init: update live ebuild

Package-Manager: Portage-2.3.51, Repoman-2.3.11
Signed-off-by: Gilles Dartiguelongue <eva@gentoo.org>

2 files changed, 28 insertions, 34 deletions

diff --git a/app-emulation/cloud-init/Manifest b/app-emulation/cloud-init/Manifest
index 1ed457e3bf6b..96b57fd0e5e9 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -1,7 +1,3 @@
-DIST cloud-init-0.7.6.tar.gz 515670 BLAKE2B edaab1c731d5ac0ce1f0a3a82b1fed9cca54ac555f2704a4bf0bab2627d54d8f090610fa6aed79d0e2f131abff4016fb8ed55c0c0822ca45c602eabc80548ca9 SHA512 aa2397328afda8e77ed6d642e7642f41a4b4b5bcd3d0e87056aa8c88b56624ec65c57cfc66b0d13ccc235f1840baf1d577316974902a0439cf2f2eb0f8eef36d
-DIST cloud-init-0.7.6_p1212.tar.gz 451717 BLAKE2B 0b2136e36b78de38a700f9abad0639cfd3f49ca5a0e43aa7673afd0f9aa365a7ebe2b5767b076e481d4eb3521a0e8a04d581d1aa3de5537bbd09bcead867d3ee SHA512 25c5d1cc7c8fa887859624b4f28416d455063c278e3f00bfb3561ab0c99aa708d9fa431ff17c42994aba43eb985538982e5175bf0531857cc18fd8e724ef1fd3
-DIST cloud-init-0.7.7.tar.gz 477287 BLAKE2B eade80cff35e545a619f7d0beafadde145777c5ae581325a4588436ad8becc95a5945c216d8c3c814331099dd4b5cfafe62ee411329f4dce9897ab816ce5ba1f SHA512 06cd2bba67da9668204416073af771145668db43777d6f183dcb54e8e1d9d12471fe3bfc99dfbc03a81814c5614347ff7d6acc5dbe117e1206d7fc2041ae4b62
-DIST cloud-init-0.7.8.tar.gz 508777 BLAKE2B 7b5b3f1b5f28b6a4ba67ef30cbbb32e1a1eb21a373da5491a7157f45553843de68b56e040ec9f07a2ca35a0bbf9fdd5f90d0ef381d2da558422080de3da0299d SHA512 ff6c3837afe702359879f0ae1d7443247b0ed97d60ecf0cbe85fc364dc833e553962aae221f48becb104ad3f951a28cbd742a3b8521ef25dfb8fd19439759447
 DIST cloud-init-0.7.9.tar.gz 602188 BLAKE2B c2e2b8538488474cd4674b976f859164f0ab8ed585fc0b59c6e75f23a62fd035b8b76e0700c1e68893fc4a8346b3110ff2b25f13be92ff13eeac0f1ad2405641 SHA512 ee52909f634f51dcf9e1229a8f49faa8c562bf05b69fac108fcc80cb3217f4364a33cf696df015e4dcd7887c68cf6108729850648b4daee07b3d3247ca3cc5b1
 DIST cloud-init-17.1.tar.gz 780532 BLAKE2B 10809da2e81d594542d83b2416481c493474cac2e790da25363e631f6dae9edc1e2fd160708121486dd3a2ebd19cfc29d18978cbe7d82eb1aec907762bf7bf0b SHA512 988cae4291c8d6a5bce012b78d651c602c02ad38c3790e9ed9aa7c815ae84c98767718ab9b0d346ddbc9c83cb886d455590128af750183618c0bf0f0c5a79564
 DIST cloud-init-17.2.tar.gz 810821 BLAKE2B df1a7c1ed1fc48a7801a53bd89839d963debca6abf7f892d61bf7ec9222ab33bf78221e65d79028e0445cac4c5fe1e0c1620d49aea26c036ee17933d9c1893f5 SHA512 ad1c7f6ca9762b70a1f06a6b538032a7de0c5371fd792260d5959df113f4f51509d184b2207ffa23b41f395c1903d551d66aaf2a2ad60af3594cf1f18d1e4a38
diff --git a/app-emulation/cloud-init/cloud-init-9999.ebuild b/app-emulation/cloud-init/cloud-init-9999.ebuild
index 4072bd36f068..0b0b7bcaac95 100644
--- a/app-emulation/cloud-init/cloud-init-9999.ebuild
+++ b/app-emulation/cloud-init/cloud-init-9999.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
 
-inherit distutils-r1 eutils git-r3 multilib systemd
+inherit distutils-r1 git-r3
 
-DESCRIPTION="cloud initialisation magic"
+DESCRIPTION="Cloud instance initialisation magic"
 HOMEPAGE="https://launchpad.net/cloud-init"
 EGIT_REPO_URI="https://git.launchpad.net/cloud-init"
 
@@ -16,15 +16,15 @@ KEYWORDS=""
 IUSE="test"
 
 CDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
 	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
 	dev-python/oauthlib[${PYTHON_USEDEP}]
-	dev-python/prettytable[${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/six[${PYTHON_USEDEP}]
 "
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
@@ -34,33 +34,37 @@ DEPEND="
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 		dev-python/unittest2[${PYTHON_USEDEP}]
-		dev-python/pep8[${PYTHON_USEDEP}]
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/hacking[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/contextlib2[${PYTHON_USEDEP}]
 	)
 "
 RDEPEND="
 	${CDEPEND}
+	net-analyzer/macchanger
 	sys-apps/iproute2
 	sys-fs/growpart
 	virtual/logger
 "
 
-PATCHES=( "${FILESDIR}/cloud-init-0.7.8-gentooinit.patch" )
+PATCHES=(
+	"${FILESDIR}"/${PN}-18.4-fix-packages-module.patch
+	"${FILESDIR}"/${PN}-18.4-gentoo-support-upstream-templates.patch
+)
 
 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
-	sed -i '/^argparse/d' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
 	distutils-r1_python_prepare_all
 }
 
 python_test() {
-	emake 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"
+	distutils-r1_python_install --init-system=sysvinit_openrc,systemd --distro gentoo
 }
 
 python_install_all() {
@@ -68,19 +72,13 @@ python_install_all() {
 
 	distutils-r1_python_install_all
 
-	chmod +x "${D}"/etc/init.d/cloud-config
-	chmod +x "${D}"/etc/init.d/cloud-final
-	chmod +x "${D}"/etc/init.d/cloud-init
-	chmod +x "${D}"/etc/init.d/cloud-init-local
-
-	insinto /etc/cloud/templates
-	doins "${FILESDIR}/hosts.gentoo.tmpl"
-	insinto /etc/cloud
-	doins "${FILESDIR}/cloud.cfg"
+	# installs as non-executable
+	chmod +x "${D}"/etc/init.d/*
+}
 
-	systemd_dounit "${S}"/systemd/cloud-config.service
-	systemd_dounit "${S}"/systemd/cloud-config.target
-	systemd_dounit "${S}"/systemd/cloud-final.service
-	systemd_dounit "${S}"/systemd/cloud-init-local.service
-	systemd_dounit "${S}"/systemd/cloud-init.service
+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."
 }