[gentoo-commits] repo/gentoo:master commit in: app-emulation/cloud-init/files/, app-emulation/cloud-init/

[Gilles Dartiguelongue]

commit:     c918a84082945588ba2363960d25e1d5ffa11343
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 24 16:35:38 2018 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Oct 25 16:35:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c918a840

app-emulation/cloud-init: cleanup old revisions

Signed-off-by: Gilles Dartiguelongue <eva <AT> gentoo.org>

 .../cloud-init/cloud-init-0.7.6-r1.ebuild          | 102 ---------------------
 .../cloud-init/cloud-init-0.7.6-r2.ebuild          |  76 ---------------
 .../cloud-init/cloud-init-0.7.6_p1212-r1.ebuild    |  79 ----------------
 .../cloud-init/cloud-init-0.7.6_p1212.ebuild       |  78 ----------------
 app-emulation/cloud-init/cloud-init-0.7.7.ebuild   |  87 ------------------
 .../cloud-init/cloud-init-0.7.8-r2.ebuild          |  94 -------------------
 .../cloud-init/files/cloud-init-0.7.6-gentoo.patch |  51 -----------
 .../files/cloud-init-0.7.6_p1212-gentoo.patch      |  33 -------
 .../files/cloud-init-0.7.7-gentooinit.patch        |  42 ---------
 .../files/cloud-init-0.7.8-gentooinit.patch        |  38 --------
 10 files changed, 680 deletions(-)

diff --git a/app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild b/app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild
deleted file mode 100644
index 9af4ed7a5fd..00000000000
--- a/app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils multilib systemd
-
-DESCRIPTION="EC2 initialisation magic"
-HOMEPAGE="https://launchpad.net/cloud-init"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-
-CDEPEND="
-	dev-python/cheetah[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	dev-python/oauth[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${CDEPEND}
-		>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
-		dev-python/mocker[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		~dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
-		dev-python/pyflakes[${PYTHON_USEDEP}]
-		sys-apps/iproute2
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	sys-fs/growpart
-	virtual/logger
-"
-
-python_prepare_all() {
-	# Note: Gentoo places ip in /sbin/ not /bin/
-	ebegin 'patching cloudinit/sources/DataSourceOpenNebula.py'
-	sed \
-		-e '438s/sbin/bin/' \
-		-i cloudinit/sources/DataSourceOpenNebula.py
-	STATUS=$?
-	eend ${STATUS}
-	[[ ${STATUS} -gt 0 ]] && die
-
-	# https://bugs.launchpad.net/cloud-init/+bug/1380424
-	ebegin 'patching tests/unittests/test_distros/test_netconfig.py'
-	sed \
-		-e '177s/test_simple_write_freebsd/_&/' \
-		-i tests/unittests/test_distros/test_netconfig.py
-	STATUS=$?
-	eend ${STATUS}
-	[[ ${STATUS} -gt 0 ]] && die
-
-	# Note Gentoo installs its own RC files
-	ebegin 'patching setup.py'
-	sed \
-		-e "144 s/'tests'/'tests.*', &/" \
-		-e '163,167 d' \
-		-i setup.py
-	STATUS=$?
-	eend ${STATUS}
-	[[ ${STATUS} -gt 0 ]] && die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	emake test
-}
-
-python_install_all() {
-	keepdir /etc/cloud
-
-	distutils-r1_python_install_all
-
-	doinitd "${S}"/sysvinit/gentoo/cloud-config
-	doinitd "${S}"/sysvinit/gentoo/cloud-final
-	doinitd "${S}"/sysvinit/gentoo/cloud-init
-	doinitd "${S}"/sysvinit/gentoo/cloud-init-local
-	insinto /etc/cloud/templates
-	doins "${FILESDIR}/hosts.gentoo.tmpl"
-	insinto /etc/cloud
-	doins "${FILESDIR}/cloud.cfg"
-
-	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
-}

diff --git a/app-emulation/cloud-init/cloud-init-0.7.6-r2.ebuild b/app-emulation/cloud-init/cloud-init-0.7.6-r2.ebuild
deleted file mode 100644
index f97fbc9cf6d..00000000000
--- a/app-emulation/cloud-init/cloud-init-0.7.6-r2.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils multilib systemd
-
-DESCRIPTION="EC2 initialisation magic"
-HOMEPAGE="https://launchpad.net/cloud-init"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-CDEPEND="
-	dev-python/cheetah[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	dev-python/oauth[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${CDEPEND}
-		>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
-		dev-python/mocker[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		~dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
-		dev-python/pyflakes[${PYTHON_USEDEP}]
-		sys-apps/iproute2
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	sys-fs/growpart
-	virtual/logger
-"
-
-PATCHES=( "${FILESDIR}/cloud-init-0.7.6-gentoo.patch" )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	emake test
-}
-
-python_install_all() {
-	keepdir /etc/cloud
-
-	distutils-r1_python_install_all
-
-	doinitd "${S}"/sysvinit/gentoo/cloud-config
-	doinitd "${S}"/sysvinit/gentoo/cloud-final
-	doinitd "${S}"/sysvinit/gentoo/cloud-init
-	doinitd "${S}"/sysvinit/gentoo/cloud-init-local
-	insinto /etc/cloud/templates
-	doins "${FILESDIR}/hosts.gentoo.tmpl"
-	insinto /etc/cloud
-	doins "${FILESDIR}/cloud.cfg"
-
-	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
-}

diff --git a/app-emulation/cloud-init/cloud-init-0.7.6_p1212-r1.ebuild b/app-emulation/cloud-init/cloud-init-0.7.6_p1212-r1.ebuild
deleted file mode 100644
index 91ce7346914..00000000000
--- a/app-emulation/cloud-init/cloud-init-0.7.6_p1212-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-BZRTGZ=1
-
-inherit distutils-r1 eutils multilib systemd
-
-DESCRIPTION="EC2 initialisation magic"
-HOMEPAGE="https://launchpad.net/cloud-init"
-if [ "x$BZRTGZ" != x1 ]; then
-	SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-else
-	# Launchpad does not provide consistent checksums https://bugs.launchpad.net/launchpad/+bug/1576338
-	# SRC_URI="http://bazaar.launchpad.net/~${PN}-dev/${PN}/trunk/tarball/${PV/*_p} -> ${P}.tar.gz"
-	SRC_URI="mirror://gentoo/${P}.tar.gz https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.gz"
-	S="${WORKDIR}/~cloud-init-dev/cloud-init/trunk/"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-CDEPEND="
-	dev-python/cheetah[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	dev-python/oauth[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${CDEPEND}
-		>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
-		dev-python/mocker[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		~dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
-		dev-python/pyflakes[${PYTHON_USEDEP}]
-		sys-apps/iproute2
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	sys-fs/growpart
-	virtual/logger
-"
-
-PATCHES=( "${FILESDIR}/cloud-init-0.7.6_p1212-gentoo.patch" )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	emake test
-}
-
-python_install() {
-	distutils-r1_python_install "--init-system=sysvinit_openrc"
-}
-
-python_install_all() {
-	keepdir /etc/cloud
-
-	distutils-r1_python_install_all
-	chmod +x "${D}"/etc/init.d/* || die
-
-	insinto /etc/cloud/templates
-	doins "${FILESDIR}/hosts.gentoo.tmpl"
-	insinto /etc/cloud
-	doins "${FILESDIR}/cloud.cfg"
-}

diff --git a/app-emulation/cloud-init/cloud-init-0.7.6_p1212.ebuild b/app-emulation/cloud-init/cloud-init-0.7.6_p1212.ebuild
deleted file mode 100644
index 737e56a5494..00000000000
--- a/app-emulation/cloud-init/cloud-init-0.7.6_p1212.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-BZRTGZ=1
-
-inherit distutils-r1 eutils multilib systemd
-
-DESCRIPTION="EC2 initialisation magic"
-HOMEPAGE="https://launchpad.net/cloud-init"
-if [ "x$BZRTGZ" != x1 ]; then
-	SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-else
-	# Launchpad does not provide consistent checksums https://bugs.launchpad.net/launchpad/+bug/1576338
-	# SRC_URI="http://bazaar.launchpad.net/~${PN}-dev/${PN}/trunk/tarball/${PV/*_p} -> ${P}.tar.gz"
-	SRC_URI="mirror://gentoo/${P}.tar.gz https://dev.gentoo.org/~robbat2/distfiles/${P}.tar.gz"
-	S="${WORKDIR}/~cloud-init-dev/cloud-init/trunk/"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-CDEPEND="
-	dev-python/cheetah[${PYTHON_USEDEP}]
-	dev-python/configobj[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/jsonpatch[${PYTHON_USEDEP}]
-	dev-python/oauth[${PYTHON_USEDEP}]
-	dev-python/prettytable[${PYTHON_USEDEP}]
-	dev-python/pyserial[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${CDEPEND}
-		>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
-		dev-python/mocker[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		~dev-python/pep8-1.5.7[${PYTHON_USEDEP}]
-		dev-python/pyflakes[${PYTHON_USEDEP}]
-		sys-apps/iproute2
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	sys-fs/growpart
-	virtual/logger
-"
-
-PATCHES=( "${FILESDIR}/cloud-init-0.7.6_p1212-gentoo.patch" )
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	emake test
-}
-
-python_install() {
-	distutils-r1_python_install "--init-system=sysvinit_openrc"
-}
-
-python_install_all() {
-	keepdir /etc/cloud
-
-	distutils-r1_python_install_all
-
-	insinto /etc/cloud/templates
-	doins "${FILESDIR}/hosts.gentoo.tmpl"
-	insinto /etc/cloud
-	doins "${FILESDIR}/cloud.cfg"
-}

diff --git a/app-emulation/cloud-init/cloud-init-0.7.7.ebuild b/app-emulation/cloud-init/cloud-init-0.7.7.ebuild
deleted file mode 100644
index 389eb6402e3..00000000000
--- a/app-emulation/cloud-init/cloud-init-0.7.7.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1 eutils multilib systemd
-
-DESCRIPTION="cloud initialisation magic"
-HOMEPAGE="https://launchpad.net/cloud-init"
-# Launchpad does not provide consistent checksums https://bugs.launchpad.net/launchpad/+bug/1576338
-# SRC_URI="http://bazaar.launchpad.net/~${PN}-dev/${PN}/trunk/tarball/${PV/*_p} -> ${P}.tar.gz"
-SRC_URI="mirror://gentoo/${P}.tar.gz https://dev.gentoo.org/~prometheanfire/dist/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-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/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${CDEPEND}
-		>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
-		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}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	sys-apps/iproute2
-	sys-fs/growpart
-	virtual/logger
-"
-
-PATCHES=( "${FILESDIR}/cloud-init-0.7.7-gentooinit.patch" )
-
-python_prepare_all() {
-	sed -i '/^argparse/d' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	emake test
-}
-
-python_install() {
-	distutils-r1_python_install "--init-system=sysvinit_openrc"
-}
-
-python_install_all() {
-	keepdir /etc/cloud
-
-	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"
-
-	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
-}

diff --git a/app-emulation/cloud-init/cloud-init-0.7.8-r2.ebuild b/app-emulation/cloud-init/cloud-init-0.7.8-r2.ebuild
deleted file mode 100644
index 88cb62749cb..00000000000
--- a/app-emulation/cloud-init/cloud-init-0.7.8-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1 eutils multilib systemd
-
-DESCRIPTION="cloud initialisation magic"
-HOMEPAGE="https://launchpad.net/cloud-init"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-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/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/cheetah[$(python_gen_usedep 'python2_7')]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${CDEPEND}
-		>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
-		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}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	net-analyzer/macchanger
-	sys-apps/iproute2
-	sys-fs/growpart
-	virtual/logger
-"
-
-PATCHES=( "${FILESDIR}/cloud-init-0.7.8-gentooinit.patch" )
-
-python_prepare_all() {
-	sed -i '/^argparse/d' requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	emake test
-}
-
-python_install() {
-	distutils-r1_python_install "--init-system=sysvinit_openrc"
-}
-
-python_install_all() {
-	keepdir /etc/cloud
-
-	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"
-
-	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."
-}

diff --git a/app-emulation/cloud-init/files/cloud-init-0.7.6-gentoo.patch b/app-emulation/cloud-init/files/cloud-init-0.7.6-gentoo.patch
deleted file mode 100644
index 27abd3812ab..00000000000
--- a/app-emulation/cloud-init/files/cloud-init-0.7.6-gentoo.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-# Note: Gentoo places ip in /sbin/ not /bin/
-diff -Nuar cloud-init-0.7.6.orig/cloudinit/sources/DataSourceOpenNebula.py cloud-init-0.7.6/cloudinit/sources/DataSourceOpenNebula.py
---- cloud-init-0.7.6.orig/cloudinit/sources/DataSourceOpenNebula.py	2014-10-10 08:26:25.000000000 -0700
-+++ cloud-init-0.7.6/cloudinit/sources/DataSourceOpenNebula.py	2016-04-25 15:24:51.483130933 -0700
-@@ -435,7 +435,7 @@
-     # http://opennebula.org/documentation:rel3.8:cong#network_configuration
-     for k in context.keys():
-         if re.match(r'^ETH\d+_IP$', k):
--            (out, _) = util.subp(['/sbin/ip', 'link'])
-+            (out, _) = util.subp(['/bin/ip', 'link'])
-             net = OpenNebulaNetwork(out, context)
-             results['network-interfaces'] = net.gen_conf()
-             break
-
-# Note Gentoo installs its own RC files
-diff -Nuar cloud-init-0.7.6.orig/setup.py cloud-init-0.7.6/setup.py
---- cloud-init-0.7.6.orig/setup.py	2014-10-10 08:26:25.000000000 -0700
-+++ cloud-init-0.7.6/setup.py	2016-04-25 15:24:51.488131027 -0700
-@@ -141,7 +141,7 @@
-       author='Scott Moser',
-       author_email='scott.moser@×××××××××.com',
-       url='http://launchpad.net/cloud-init/',
--      packages=setuptools.find_packages(exclude=['tests']),
-+      packages=setuptools.find_packages(exclude=['tests.*', 'tests']),
-       scripts=['bin/cloud-init',
-                'tools/cloud-init-per',
-                ],
-@@ -160,9 +160,4 @@
-                    [f for f in glob('doc/examples/seed/*') if is_f(f)]),
-                  ],
-       install_requires=read_requires(),
--      cmdclass={
--          # Use a subclass for install that handles
--          # adding on the right init system configuration files
--          'install': InitsysInstallData,
--      },
-       )
-
-# https://bugs.launchpad.net/cloud-init/+bug/1380424
-diff -Nuar cloud-init-0.7.6.orig/tests/unittests/test_distros/test_netconfig.py cloud-init-0.7.6/tests/unittests/test_distros/test_netconfig.py
---- cloud-init-0.7.6.orig/tests/unittests/test_distros/test_netconfig.py	2014-10-10 08:26:25.000000000 -0700
-+++ cloud-init-0.7.6/tests/unittests/test_distros/test_netconfig.py	2016-04-25 15:24:51.485130971 -0700
-@@ -174,7 +174,7 @@
-         self.assertCfgEquals(expected_buf, str(write_buf))
-         self.assertEquals(write_buf.mode, 0644)
- 
--    def test_simple_write_freebsd(self):
-+    def _test_simple_write_freebsd(self):
-         fbsd_distro = self._get_distro('freebsd')
-         util_mock = self.mocker.replace(util.write_file,
-                                         spec=False, passthrough=False)

diff --git a/app-emulation/cloud-init/files/cloud-init-0.7.6_p1212-gentoo.patch b/app-emulation/cloud-init/files/cloud-init-0.7.6_p1212-gentoo.patch
deleted file mode 100644
index ef5d950842f..00000000000
--- a/app-emulation/cloud-init/files/cloud-init-0.7.6_p1212-gentoo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nuar --exclude '*~' trunk.orig/setup.py trunk/setup.py
---- trunk.orig/setup.py	2016-04-25 14:44:43.000000000 -0700
-+++ trunk/setup.py	2016-04-25 15:44:45.254496814 -0700
-@@ -1,3 +1,4 @@
-+#!/usr/bin/python2
- # vi: ts=4 expandtab
- #
- #    Distutils magic for ec2-init
-@@ -74,6 +75,7 @@
-     'sysvinit': [f for f in glob('sysvinit/redhat/*') if is_f(f)],
-     'sysvinit_freebsd': [f for f in glob('sysvinit/freebsd/*') if is_f(f)],
-     'sysvinit_deb': [f for f in glob('sysvinit/debian/*') if is_f(f)],
-+    'sysvinit_openrc': [f for f in glob('sysvinit/gentoo/*') if is_f(f)],
-     'systemd': [f for f in (glob('systemd/*.service') +
-                             glob('systemd/*.target')) if is_f(f)],
-     'systemd.generators': [f for f in glob('systemd/*-generator') if is_f(f)],
-@@ -83,6 +85,7 @@
-     'sysvinit': '/etc/rc.d/init.d',
-     'sysvinit_freebsd': '/usr/local/etc/rc.d',
-     'sysvinit_deb': '/etc/init.d',
-+    'sysvinit_openrc': '/etc/init.d',
-     'systemd': pkg_config_read('systemd', 'systemdsystemunitdir'),
-     'systemd.generators': pkg_config_read('systemd',
-                                           'systemdsystemgeneratordir'),
-@@ -205,7 +208,7 @@
-     author='Scott Moser',
-     author_email='scott.moser@×××××××××.com',
-     url='http://launchpad.net/cloud-init/',
--    packages=setuptools.find_packages(exclude=['tests']),
-+    packages=setuptools.find_packages(exclude=['tests.*', 'tests']),
-     scripts=['bin/cloud-init',
-              'tools/cloud-init-per'],
-     license='GPLv3',

diff --git a/app-emulation/cloud-init/files/cloud-init-0.7.7-gentooinit.patch b/app-emulation/cloud-init/files/cloud-init-0.7.7-gentooinit.patch
deleted file mode 100644
index ddb4f38201c..00000000000
--- a/app-emulation/cloud-init/files/cloud-init-0.7.7-gentooinit.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/cloudinit/sources/DataSourceOpenNebula.py b/cloudinit/sources/DataSourceOpenNebula.py
-index 7b3a76b..635a836 100644
---- a/cloudinit/sources/DataSourceOpenNebula.py
-+++ b/cloudinit/sources/DataSourceOpenNebula.py
-@@ -407,7 +407,7 @@ def read_context_disk_dir(source_dir, asuser=None):
-     # http://opennebula.org/documentation:rel3.8:cong#network_configuration
-     for k in context:
-         if re.match(r'^ETH\d+_IP$', k):
--            (out, _) = util.subp(['/sbin/ip', 'link'])
-+            (out, _) = util.subp(['ip', 'link'])
-             net = OpenNebulaNetwork(out, context)
-             results['network-interfaces'] = net.gen_conf()
-             break
-diff --git a/setup.py b/setup.py
-index bbadd7b..1578a3d 100755
---- a/setup.py
-+++ b/setup.py
-@@ -74,6 +74,7 @@ INITSYS_FILES = {
-     'sysvinit': [f for f in glob('sysvinit/redhat/*') if is_f(f)],
-     'sysvinit_freebsd': [f for f in glob('sysvinit/freebsd/*') if is_f(f)],
-     'sysvinit_deb': [f for f in glob('sysvinit/debian/*') if is_f(f)],
-+    'sysvinit_openrc': [f for f in glob('sysvinit/gentoo/*') if is_f(f)],
-     'systemd': [f for f in (glob('systemd/*.service') +
-                             glob('systemd/*.target')) if is_f(f)],
-     'systemd.generators': [f for f in glob('systemd/*-generator') if is_f(f)],
-@@ -83,6 +84,7 @@ INITSYS_ROOTS = {
-     'sysvinit': '/etc/rc.d/init.d',
-     'sysvinit_freebsd': '/usr/local/etc/rc.d',
-     'sysvinit_deb': '/etc/init.d',
-+    'sysvinit_openrc': '/etc/init.d',
-     'systemd': pkg_config_read('systemd', 'systemdsystemunitdir'),
-     'systemd.generators': pkg_config_read('systemd',
-                                           'systemdsystemgeneratordir'),
-@@ -205,7 +207,7 @@ setuptools.setup(
-     author='Scott Moser',
-     author_email='scott.moser@×××××××××.com',
-     url='http://launchpad.net/cloud-init/',
--    packages=setuptools.find_packages(exclude=['tests']),
-+    packages=setuptools.find_packages(exclude=['tests.*', 'tests']),
-     scripts=['tools/cloud-init-per'],
-     license='GPLv3',
-     data_files=data_files,

diff --git a/app-emulation/cloud-init/files/cloud-init-0.7.8-gentooinit.patch b/app-emulation/cloud-init/files/cloud-init-0.7.8-gentooinit.patch
deleted file mode 100644
index ff0e0149fa3..00000000000
--- a/app-emulation/cloud-init/files/cloud-init-0.7.8-gentooinit.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/setup.py b/setup.py
-index bbadd7b..1578a3d 100755
---- a/setup.py
-+++ b/setup.py
-@@ -205,7 +207,7 @@ setuptools.setup(
-     author='Scott Moser',
-     author_email='scott.moser@×××××××××.com',
-     url='http://launchpad.net/cloud-init/',
--    packages=setuptools.find_packages(exclude=['tests']),
-+    packages=setuptools.find_packages(exclude=['tests.*', 'tests']),
-     scripts=['tools/cloud-init-per'],
-     license='GPLv3',
-     data_files=data_files,
-diff --git a/sysvinit/gentoo/cloud-init b/sysvinit/gentoo/cloud-init
-index 5afc0f2..531a715 100644
---- a/sysvinit/gentoo/cloud-init
-+++ b/sysvinit/gentoo/cloud-init
-@@ -2,6 +2,7 @@
- # add depends for network, dns, fs etc
- depend() {
-   after cloud-init-local
-+  after net
-   before cloud-config
-   provide cloud-init
- }
-diff --git a/sysvinit/gentoo/cloud-init-local b/sysvinit/gentoo/cloud-init-local
-index 9bd0b56..0f8cf65 100644
---- a/sysvinit/gentoo/cloud-init-local
-+++ b/sysvinit/gentoo/cloud-init-local
-@@ -2,7 +2,7 @@
- 
- depend() {
-   after localmount
--  after netmount
-+  before net
-   before cloud-init
-   provide cloud-init-local
- }