reinit the tree, so we can have metadata

17 files changed, 1016 insertions, 0 deletions

diff --git a/app-emulation/cloud-init/Manifest b/app-emulation/cloud-init/Manifest
new file mode 100644
index 000000000000..00bc7a9ce464
--- /dev/null
+++ b/app-emulation/cloud-init/Manifest
@@ -0,0 +1,23 @@
+AUX cloud-init-0.7.6-gentoo.patch 2569 SHA256 11e177a66511a27c8bed12237365e16d1b8d3a3376f687ec964e86b5e9bedc90 SHA512 5de2fe7632162bd5b527bda21a6f8c96122bdb2a9cb4ae40e8d73e48a303b56ae479a06985b8c1807829f53dd859e59d053b3613d6e2e446e5506b310d5e2eb5 WHIRLPOOL a2be7408066ceb091aaedeae7458ac41ae83b259f1d6c84d59aaf966b62b49be3b2ae649fef9d800a601f213dc3e0e16db12a8dc33a824c0d84434dcfe9f0c9e
+AUX cloud-init-0.7.6_p1212-gentoo.patch 1521 SHA256 d51e5ad00b28bf697cb040c16499f641d0d28ba1405da5fba61d1c3dc6bb2991 SHA512 e364bc88b8a41dc109d0e44ac7045d2de9312bbc27afa0668cfc31f6cdc60456ca39b08e23669eb36da8dc71e72e8360a113179f1524ab0646665749e7a9cd5e WHIRLPOOL ef522c89840573a9caf659a3f103bca593fc51a501aa361710f2087e759ad2fe018fbb6786e5519a870d2a7aef121015b3c43324db5b2cd06f7b06ea5a72671f
+AUX cloud-init-0.7.7-gentooinit.patch 2066 SHA256 6bb15613c1b9fdf95dfad3b51afd566c7d9bfe2a05d47f588f867e660012940f SHA512 2846c04f65d37f8dd981c5feb445ebb3ba1c437ac4e7fae12557a49cc12bc369e0e46acf3977a8fc2890f3675480a47f504b6a69b79e61307f6c82f17bf00c47 WHIRLPOOL 1a49203a037fa18b202242df59bbc1ab3ba9b66c173afc55c8d454bba9a901bcb1c777d1c99eb5564c37233c55eb1b12e0379d75964b552532af87bf1b9dfbde
+AUX cloud-init-0.7.8-gentooinit.patch 1111 SHA256 41b79f2f6143fa0b17e0955cc81e97cf15232a45394ea9f8d230f16a7b5c6106 SHA512 2a7e81b327853c8052c7eeb039d8166414d302e3558fa1a5147c2614f6f14d85419a70d10e8e526c3611b72273b5cae8027bb250f1a0f743924b89fd350aa130 WHIRLPOOL 9e82d06a55832a02f5393a4c4c62adf02fa9d6445dda48a3514d6e17fb70033a1b21fa73f28ad942e73d3410c1bbffdc52d0070ec1dadb5dc9d124d90c89d22b
+AUX cloud-init-0.7.9-tests.patch 468 SHA256 4f115cdd8693b5a8d4c024d78ede36e5890748a3a9271d397882fb39407c7207 SHA512 07538a07a494c752b49ca357b448b4ae012ae855751886c4368e95d7a152a65afcc7c243eae428b670ae5f5802fbaeedeebf5a07d3a470bdc74d33c1f5f8ca02 WHIRLPOOL 725bc5babdec0a45c536a39b5f3edd67ded7f1ed03d973a006948d024439f93226bd8fad51b5065d9e0e5f58476575902df84b150bc31795206bfeffff74f0b7
+AUX cloud.cfg 1815 SHA256 e2eecea357864a080ff8c757f4282b9ae6373acef4e6ed604b071f9c622cd7bd SHA512 ff9a978befebdc177000ce50252a89d2b9adf4e2ab92c7c87300c54cebe5ff160fd6619dd56f0432a6ec8a819a4f948aa3e99c06e37dc6650ed41fdce16daeb3 WHIRLPOOL 97a2dcfd07860920cad70e28641853272e3ff927ed7cdc6075a26065bbb2a017d94f2b39795ecdfa5c1ec70587fc6a7b88fd281b2f702cc3ddbf7d1475a1bba0
+AUX hosts.gentoo.tmpl 920 SHA256 a7d1a6e160bb05928bbb9f2b8cfcbc1fa60c3a33cd034b06f3f92ffe1126df37 SHA512 39e6bcdf40bd842a1d2e4ccd1c993b432016f7b3c4d5455b71896a16ee87a5d698e214919172f0a7e2f647156f5efe0964fed999dd193e4f16c944efdcc0f9c5 WHIRLPOOL 89ad898aa4479b9bc3dc3efc9a10d7be81c302e490e8548f3752af9d50cd688ef0f3202d2efeadf2e034fcf5ef39ef3a5e78f9ebfa308f79684dd0342686e94d
+DIST cloud-init-0.7.6.tar.gz 515670 SHA256 9e8fd22eb7f6e40ae6a5f66173ddc3cc18f65ee406c460a728092b37db2f3ed7 SHA512 aa2397328afda8e77ed6d642e7642f41a4b4b5bcd3d0e87056aa8c88b56624ec65c57cfc66b0d13ccc235f1840baf1d577316974902a0439cf2f2eb0f8eef36d WHIRLPOOL 639a556e51b4b4b180951f9e481f9a0dcd45067d1d5760ce7e871ceea8bbb4e195258d96273d3ef88c7e2f2520318e9172c3ad0cb23d6ad0ae1835e17087e3a5
+DIST cloud-init-0.7.6_p1212.tar.gz 451717 SHA256 d213ee72a62cef5ef63369737a52c0ce0c2034ca1ae230925b6679f4335e685d SHA512 25c5d1cc7c8fa887859624b4f28416d455063c278e3f00bfb3561ab0c99aa708d9fa431ff17c42994aba43eb985538982e5175bf0531857cc18fd8e724ef1fd3 WHIRLPOOL d6608c750370fd470d6aae0e88125e9e56b424c40a5b1131b610cb675808b1f7e0657169273db29c4e994d3dce12f6076566eccbac6deee8c4277ffd33ceae38
+DIST cloud-init-0.7.7.tar.gz 477287 SHA256 d7b75e314ecdb99619014f21f3b622294a6c3bde248887dfb5e9cedb927ad0b0 SHA512 06cd2bba67da9668204416073af771145668db43777d6f183dcb54e8e1d9d12471fe3bfc99dfbc03a81814c5614347ff7d6acc5dbe117e1206d7fc2041ae4b62 WHIRLPOOL 9fccfba02aacc138dc62a6be9547fa1e5bd6959a96eef9b7f6f1ac86112049b36751882d954ac0e8d7aa5bf9580c5e27ec9abfdc2ef542628af448c00c468a09
+DIST cloud-init-0.7.8.tar.gz 508777 SHA256 4a4f1f7fb9dd0987a02aa7cd6f609910294fce8f9724dcebc0cd88630b4f1fd6 SHA512 ff6c3837afe702359879f0ae1d7443247b0ed97d60ecf0cbe85fc364dc833e553962aae221f48becb104ad3f951a28cbd742a3b8521ef25dfb8fd19439759447 WHIRLPOOL 1881cc41ee85e69cf5169115c7449ff581f927def51aaf3df986b8e8c29baeace658bb24bc5b98fd6eab6fdb5f05ab4555ba4081b7758402089a35fe20595876
+DIST cloud-init-0.7.9.tar.gz 602188 SHA256 76edb80bf1bdbda68f8014bc057a303ae438a139bdf394e825e548d6ae39d472 SHA512 ee52909f634f51dcf9e1229a8f49faa8c562bf05b69fac108fcc80cb3217f4364a33cf696df015e4dcd7887c68cf6108729850648b4daee07b3d3247ca3cc5b1 WHIRLPOOL 02093161cd3c6930b868ed18ca2e649ebbfac57b4ba3e8dcf4cb3107775cf052c739a0aee40ac79c69511efe5b3dfe60cbc2d55d9bbad74512cdf3a31fb77261
+EBUILD cloud-init-0.7.6-r1.ebuild 2585 SHA256 df26a8f48eb2eb38372485882f4327b5c3aff4410e1ff28ea285aac63cc7c67b SHA512 0c82e788cacd91e923ff57c240a3615c20157d2a4ba1fdf7d28eb6f0e9f7c55b64b3ef321dc1f2cadd40e47128d2ef0854f3488fe7aabf5cdcf3f8b326eb6ad8 WHIRLPOOL 9319eb572c5a8a698e64992f612ff193e702dc501ebf4cafb6ff50fa1c4f4801b1ca99efd73a3562bc1c66c197620a71c0a925ce2f3a9098efcdc6fd56dad548
+EBUILD cloud-init-0.7.6-r2.ebuild 1922 SHA256 abbd4a3c48cb4d88b908fdf956a593a6cc7edfea0c4d46f956a6bb67af7b954b SHA512 a3e22b4b2985670b8de5fe9af2f2ef16df626a3b3acfdf1d1656f247e44ae91b9629fc693829beb7ea931be38509b418c52f5257f24d1f02045f97735c8ff8f3 WHIRLPOOL 09badf0e47bae767077cbf9ab5a1d3d09548e09237ee12bc36244ef72d487e4ee8c1c92b5427f31661277545b1226e95013ce020f8db3e4635fc985ebb036d70
+EBUILD cloud-init-0.7.6_p1212-r1.ebuild 1989 SHA256 1152a314e3d891eee09507e1811af76cb2fab439e73e4809ed8cbc6add6c28f0 SHA512 4e71e5ff1b4a2ea8bf600d627911f7eb197d5f90f354e553996388bdef13309ceecab732b168e1f4c3bd8d5fa3dfa736a34bc535eedb55ffe6c23a6b1eb873ce WHIRLPOOL 47f7d07ac5c4db8d685f2849234ce8e78ee17c0c9e5d8e446ca5a986dee38d991ab7302cbd965d3e2940e95de21f9e63a2b3ca1863939380b1dac3fac8239535
+EBUILD cloud-init-0.7.6_p1212.ebuild 1952 SHA256 0e1f41152c5e70596c0f10946cdd183e393e5c24620649c3a5f9ffb4b7c75f26 SHA512 4e5064b3cf997f7cbcc3a615f0d1817a37608015c599aa718a60d8e1adcf994422c5fbccbcfe65ad98d93a208364e96382e78f4534e88b8f8e2b936c3c5c25f7 WHIRLPOOL ca1d5a255568edf6280285658632e8fd1b05c61742dee3e489204555f469520927ac6d27ad0084e9e9dc0980157000cbf77ad36649490a2870bfaa82a3064a3f
+EBUILD cloud-init-0.7.7.ebuild 2399 SHA256 726a74c4265e9d18f3599ec0f1d4518f69688af19ca224ed32efff1a9fcf0859 SHA512 1c171970b6e60cc075b3863dafbb527fe23ad2ff0005303b34dba2d5ccff640ade4cfc0bfe54f97d0dd424b95266624599fd585d8931e92ad78bf5b8dae38bce WHIRLPOOL 2511737b3a0d9d229e92595c32393f1ac6496b0ecae1de6afea02608a4465852ad34178acc047709b84d29853d44193cc5dd3e9e74c2975555799cf66406df8c
+EBUILD cloud-init-0.7.8-r2.ebuild 2547 SHA256 305353ce70285b6648611378d972ba4187f6d1fafb3d1b4b1b61ef4703b77d9c SHA512 972a04cc2c359f7271960820f4212ae1afc13def893b5bd87efe8ed30dd5f03f7219c008c9c7806f918eb7dbe3609e3c0407b7c0d5d5ad66b568abd2361ce2ec WHIRLPOOL 1cc11aa4c9eb4afc7e61365842ae2ef40cdb80235f57e3af3a0f1a6898e7d9664389faf33988b6ff317b28a2f3fb880ffcb7ff5f4c18e0b65ad93411e981c0cf
+EBUILD cloud-init-0.7.9.ebuild 2542 SHA256 6f494ba3d828db5219d273f1573808063fe64778271011e0d255ebfb714c5eb5 SHA512 11db9733a73ca6ca53189b2f768e08a471a00adb419d96b00d7a64731299aa43fe45f6b4a03e1ebe16ce7d58316b06eb96933a83b99cb19bd6a6b2453278220d WHIRLPOOL 078703b94e2cec80eb08ec9d635f2f06e257ff54bdf34f63d89bdb4ee2fbfab13922a2547684de612f1b5f5f2c1c04812dfd9b7f73bb33c6c1f8f654c9f77329
+EBUILD cloud-init-9999.ebuild 2219 SHA256 4f95c95c9814175961b50e8afb4c769cfb373e7fd76eee460feda94206b5d90d SHA512 f50bf3530aef585d11e8984a2252724d0e0a89e1b912304f26ec0a74cdbde78103eb7efb2ed4d9a7cf69c3db43970c7f40a959c5a969e85a547ce9e2a3894be5 WHIRLPOOL 95ac6e6797fa8a3f48184cc2cad12250f7add5d57eca6306eaf84904a0ca1c0c0c0429de849ebaa40b37d12850f4be4656c7269eb99e2f7014c90d0cfb6f99bc
+MISC ChangeLog 6321 SHA256 6827aba1d60badd5cca5d44c55033291eb99c1d98d3f6d2bd238a942ef06ac9e SHA512 cf30e71550bcf4d4c73d7c80691a973e8dbaaa726c5341389af3cd79d3f4e0f890d818bc2b6b9e2d2c31153669026c038e198f68382b7dab65495b55aca93f0d WHIRLPOOL 0fa6fd9fe30b196bbc3878616e7e85a377f96eb8f51a2eff5f7e7d7bd07a68654940f82a3c465d894bc6e6484cf86efcf18478234950f16cd507ced1c6ad4648
+MISC ChangeLog-2015 3361 SHA256 be1943a0d510b5b544b7e31cb630149f23093559da96b30c3933c073021b0bb7 SHA512 c2eea40c0d70371003e10986f5d674026dc325862d17793c60af3588ec81f6f54ba2d0402467e35f3c78c67d71203198029a2a1918fd028b36505277cb02c9ad WHIRLPOOL 711132a9e69fcb065186b293d3ceaef3febe8e0456466dff0d84ed497ed209ea1d144b6f20fa5b4982a5bb5eb9998c34b8ffb6f49ba23304cc35949b0015cb49
+MISC metadata.xml 561 SHA256 f4687f875ff0bb6e1c1072335f53f7deeeebc1cad46c629c7ac9d05fbca0d8f6 SHA512 76fcc7f7853794562c8a3e9359cc573d549b9bc627846bc9b9ebe67739cf4b2a97635baa7bc8fdefcf87284933d50e7f294d8e852ccfb2f5f822aa812712415c WHIRLPOOL 3c0c0e2498170ab20753a2b044f0d88c4205cd127d8223d184764d4fe16a73087bd551169c7e1b8ec7b9f60b6569427c48eb5920558020205a76026dc9d5565f
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
new file mode 100644
index 000000000000..9af4ed7a5fd2
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild
@@ -0,0 +1,102 @@
+# 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
new file mode 100644
index 000000000000..2254a19a64ca
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-0.7.6-r2.ebuild
@@ -0,0 +1,76 @@
+# 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 ppc64 ~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
new file mode 100644
index 000000000000..91ce7346914a
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-0.7.6_p1212-r1.ebuild
@@ -0,0 +1,79 @@
+# 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
new file mode 100644
index 000000000000..737e56a54944
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-0.7.6_p1212.ebuild
@@ -0,0 +1,78 @@
+# 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
new file mode 100644
index 000000000000..389eb6402e3c
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-0.7.7.ebuild
@@ -0,0 +1,87 @@
+# 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
new file mode 100644
index 000000000000..88cb62749cb1
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-0.7.8-r2.ebuild
@@ -0,0 +1,94 @@
+# 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/cloud-init-0.7.9.ebuild b/app-emulation/cloud-init/cloud-init-0.7.9.ebuild
new file mode 100644
index 000000000000..df1fcce20697
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-0.7.9.ebuild
@@ -0,0 +1,94 @@
+# 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"
+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.9-tests.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/cloud-init-9999.ebuild b/app-emulation/cloud-init/cloud-init-9999.ebuild
new file mode 100644
index 000000000000..20a2e5936f9c
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-9999.ebuild
@@ -0,0 +1,86 @@
+# 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 git-r3 multilib systemd
+
+DESCRIPTION="cloud initialisation magic"
+HOMEPAGE="https://launchpad.net/cloud-init"
+EGIT_REPO_URI="https://git.launchpad.net/cloud-init"
+
+LICENSE="GPL-3"
+SLOT="0"
+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/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.8-gentooinit.patch" )
+
+python_prepare_all() {
+	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
+}
+
+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/files/cloud-init-0.7.6-gentoo.patch b/app-emulation/cloud-init/files/cloud-init-0.7.6-gentoo.patch
new file mode 100644
index 000000000000..27abd3812ab4
--- /dev/null
+++ b/app-emulation/cloud-init/files/cloud-init-0.7.6-gentoo.patch
@@ -0,0 +1,51 @@
+# 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@canonical.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
new file mode 100644
index 000000000000..ef5d950842fe
--- /dev/null
+++ b/app-emulation/cloud-init/files/cloud-init-0.7.6_p1212-gentoo.patch
@@ -0,0 +1,33 @@
+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@canonical.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
new file mode 100644
index 000000000000..ddb4f38201cc
--- /dev/null
+++ b/app-emulation/cloud-init/files/cloud-init-0.7.7-gentooinit.patch
@@ -0,0 +1,42 @@
+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@canonical.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
new file mode 100644
index 000000000000..ff0e0149fa3b
--- /dev/null
+++ b/app-emulation/cloud-init/files/cloud-init-0.7.8-gentooinit.patch
@@ -0,0 +1,38 @@
+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@canonical.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
+ }
diff --git a/app-emulation/cloud-init/files/cloud-init-0.7.9-tests.patch b/app-emulation/cloud-init/files/cloud-init-0.7.9-tests.patch
new file mode 100644
index 000000000000..b80a60a47b7f
--- /dev/null
+++ b/app-emulation/cloud-init/files/cloud-init-0.7.9-tests.patch
@@ -0,0 +1,13 @@
+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@canonical.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.cfg b/app-emulation/cloud-init/files/cloud.cfg
new file mode 100644
index 000000000000..d62e3a22241b
--- /dev/null
+++ b/app-emulation/cloud-init/files/cloud.cfg
@@ -0,0 +1,79 @@
+# The top level settings are used as module
+# and system configuration.
+
+# A set of users which may be applied and/or used by various modules
+# when a 'default' entry is found it will reference the 'default_user'
+# from the distro configuration specified below
+users:
+   - default
+
+# If this is set, 'root' will not be able to ssh in and they 
+# will get a message to login instead as the above $user (ubuntu)
+disable_root: true
+ssh_pwauth:   false
+
+# This will cause the set+update hostname module to not operate (if true)
+# preserve_hostname: false
+
+syslog_fix_perms: root:root
+
+ssh_deletekeys: false
+ssh_genkeytypes: [rsa, dsa] 
+
+cloud_init_modules:
+ - seed_random
+ - bootcmd
+ - write-files
+ - growpart
+ - resizefs
+ - set_hostname
+ - update_hostname
+ - update_etc_hosts
+ - ca-certs
+ - users-groups
+ - ssh
+
+cloud_config_modules:
+ - disk_setup
+ - mounts
+ - ssh-import-id
+ - set-passwords
+ - timezone
+ - puppet
+ - chef
+ - salt-minion
+ - mcollective
+ - disable-ec2-metadata
+ - runcmd
+
+cloud_final_modules:
+ - scripts-vendor
+ - scripts-per-once
+ - scripts-per-boot
+ - scripts-per-instance
+ - scripts-user
+ - ssh-authkey-fingerprints
+ - keys-to-console
+ - phone-home
+ - final-message
+ - power-state-change
+
+# System and/or distro specific settings
+# (not accessible to handlers/transforms)
+system_info:
+   # This will affect which distro class gets used
+   distro: gentoo
+   # Default user name + that default users groups (if added/used)
+   default_user:
+     name: gentoo
+     lock_passwd: True
+     gecos: Gentoo
+     groups: [users, wheel]
+     primary_group: users
+     no-user-group: true
+     sudo: ["ALL=(ALL) NOPASSWD:ALL"]
+     shell: /bin/bash
+   # Other config here will be given to the distro class and/or path classes
+   paths:
+      cloud_dir: /var/lib/cloud/
+      templates_dir: /etc/cloud/templates/
diff --git a/app-emulation/cloud-init/files/hosts.gentoo.tmpl b/app-emulation/cloud-init/files/hosts.gentoo.tmpl
new file mode 100644
index 000000000000..bc0bca47c5ce
--- /dev/null
+++ b/app-emulation/cloud-init/files/hosts.gentoo.tmpl
@@ -0,0 +1,23 @@
+## template:jinja
+{#
+This file /etc/cloud/templates/hosts.gentoo.tmpl is only utilized
+if enabled in cloud-config.  Specifically, in order to enable it
+you need to add the following to config:
+  manage_etc_hosts: template
+-#}
+# Your system has configured 'manage_etc_hosts' as 'template'.
+# As a result, if you wish for changes to this file to persist
+# then you will need to either
+# a.) make changes to the master file in /etc/cloud/templates/hosts.gentoo.tmpl
+# b.) change or remove the value of 'manage_etc_hosts' in
+#     /etc/cloud/cloud.cfg or cloud-config from user-data
+# 
+# The following lines are desirable for IPv4 capable hosts
+127.0.0.1 {{fqdn}} {{hostname}}
+127.0.0.1 localhost.localdomain localhost
+127.0.0.1 localhost4.localdomain4 localhost4
+
+# The following lines are desirable for IPv6 capable hosts
+::1 {{fqdn}} {{hostname}}
+::1 localhost.localdomain localhost
+::1 localhost6.localdomain6 localhost6
\ No newline at end of file
diff --git a/app-emulation/cloud-init/metadata.xml b/app-emulation/cloud-init/metadata.xml
new file mode 100644
index 000000000000..246445d7479a
--- /dev/null
+++ b/app-emulation/cloud-init/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>prometheanfire@gentoo.org</email>
+		<name>Matthew Thode</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>alunduil@gentoo.org</email>
+		<name>Alex Brandt</name>
+	</maintainer>
+	<longdescription lang="en">
+    Package provides configuration and customization of cloud instance.
+  </longdescription>
+	<upstream>
+		<remote-id type="launchpad">cloud-init</remote-id>
+	</upstream>
+</pkgmetadata>