app-emulation/cloud-init: add virtual/logger dependency—fixes bug #511384

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0x92FEA28B

4 files changed, 108 insertions, 3 deletions

diff --git a/app-emulation/cloud-init/ChangeLog b/app-emulation/cloud-init/ChangeLog
index a1b289aa7e7b..00b096c06b44 100644
--- a/app-emulation/cloud-init/ChangeLog
+++ b/app-emulation/cloud-init/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/cloud-init
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/cloud-init/ChangeLog,v 1.10 2014/08/06 06:44:38 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/cloud-init/ChangeLog,v 1.11 2014/08/24 23:53:40 alunduil Exp $
+
+*cloud-init-0.7.5-r2 (24 Aug 2014)
+
+  24 Aug 2014; Alex Brandt <alunduil@gentoo.org> +cloud-init-0.7.5-r2.ebuild,
+  metadata.xml:
+  Add virtual/logger dependency. Fixes bug #511384
 
   06 Aug 2014; Patrick Lauer <patrick@gentoo.org> cloud-init-0.7.5-r1.ebuild:
   Make description more repoman-happy
diff --git a/app-emulation/cloud-init/Manifest b/app-emulation/cloud-init/Manifest
index f3ca75e1c69a..ba8fc6beac9c 100644
--- a/app-emulation/cloud-init/Manifest
+++ b/app-emulation/cloud-init/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX cloud-init-0.7.5-tests-exclude.patch 534 SHA256 9d2a13365551334bdbdbd9c243ba3413b66f47dd36ae94727c5336fb013113bb SHA512 b59bdcb5a5c6c7891a62c67c7bea83c42f00b2458959341fde33520dc02d65fe4a29a344f84c4f94c166a37bd98c19b596ef92eb51760228a2945b67f919087a WHIRLPOOL a8126ba0641ccd700ab7d58f81815c1a15e5c4289536aa9db6504b47a218d18c232062c6e0a4f149a87b70f2cfea9599876dc1d05693b26079c199107f496fa7
 DIST cloud-init-0.7.5.tar.gz 503717 SHA256 a92bb83809c139a7db378916414c18b0819e306852d6c60dd89388868857ed33 SHA512 79e1e4a9e1130a3a9deb0482278215baf5ed41e02beebed0a2c6fac4e215340a9537158bd259758a2e074f334c0c0b9e7b936c23eeb9c848c67f7e7835cf0f5d WHIRLPOOL 7d92a0e1b6a3faf550bc442b02c117280c47d160e7e318d9fb859d6d8b59a0ef947d057dfb615bd925420a25ca28852742ee87ffd6066664faf640ca53a13073
 EBUILD cloud-init-0.7.5-r1.ebuild 1659 SHA256 b1b78f80550051f716b6b48fdf4855a251016d536dcc470041f39f15516269bd SHA512 33300619cd99e488f9255ef08ecb73d7b29b76271e28c541926208436ffaeddac7671f3082897ff84382a9fb9d524fc4cc78a32403292f4b5a1fa8d81419acc7 WHIRLPOOL f6da626c00c23c53a3607dd9c9a150f8c5bc28ed21ec44631e8f57503c0a6f114215b570b11b9b181a9081de6e3e06f05bedcb88abb1673ed2b000ff6191fcf0
-MISC ChangeLog 2109 SHA256 0b5778c9ebf828834b215358d5a6a314f20fd3ed0070399877a491ef8f47cc05 SHA512 a694c81347fdc393a51a9140828442fe02015d5c7e5ba626de0c801c69ea478658f699aae03591a777a81a275c15aba674b38facfb1fc65ecb271aca067c0550 WHIRLPOOL 0de6babadda5fad0540b1bd718e1072fd528a326c19800b30c2c1d5983b59e1fa174463ac1f08525b1ffc5f6375c18b341e3f5fd9ec611846b87881784d81a26
-MISC metadata.xml 391 SHA256 5350444fadfde215a3d946f6ccb0df658075f9faf397ed498bc3950dc84a9955 SHA512 cfae01b863c1313dda64a093425eb104c6407025189d724e7b13107693386a8c24c5b52c41a09ffac427d6c9f067479eeb7d41f3770c86ce48cd4128284f063e WHIRLPOOL c720c46ef4b03864f72c9113f42218492a10c16cc355924f77d69cd6d8788ef689d072d653ba161656f1c9e43d51dd9bbc23aeb98699966abe86f60bdbc067d6
+EBUILD cloud-init-0.7.5-r2.ebuild 2411 SHA256 e4a58be7d11d57a75c8068169801c6f4fa0d6b65491e6f5012846c68ca5101c4 SHA512 5de768692d13c365b23570a3fb53ac594b62954965cad2f72efebc30d74be6905cf620ed06339ce6c97ed9e858c9201cab36be9feb91fc7df320d475e89cedfe WHIRLPOOL 7ae0e57a4617473ab781536b105e38b3f66dbe00f9865a061f41526a1cd524b36dba9875494bb6e5360340509c0617d2076a5e5e0bceec9bd023df93e3cd96a5
+MISC ChangeLog 2292 SHA256 f34f636b02fcb516b8c795047eff82dbb2a8eaec8559457471a5106ad0448e24 SHA512 8b302c2eb80f27bb7479332480efdd08582241ac78a1c58b9d33229737b5ac9a2e6c2e98aacb58eb31ab99ab08337403c90709f9c49b1163dbfa1cd3d11fd814 WHIRLPOOL df525181bae019e89aa78dcd39be775252e012fd88eeeec2e16fdcb5e2cf3b4118ba0d7c6d2de0523cffe5ab64295df695e04f4be063fc3123e5a86b7503c784
+MISC metadata.xml 484 SHA256 def0cfb2c35a0590095ae04153f8db9c69c3b3c88dc26e09754b9b87e4c57bea SHA512 d5100eeb140cd23c0f75681f765e4844215f994c573c62eb34a2783285509a3609d6f7dbbf75b09a60f3158152904ee1db2eb20577663b9fbd996cf7d2cbd15c WHIRLPOOL 7d5fbdeaf7dd7a4efe4b15e1b52a67ff11cb96dfc4123406cf5c1d08dd5106dbe96c0eac0fb508eb648015cc342c5a047b80bb1d17378a4147734fa4ff07db70
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iF4EAREIAAYFAlP6euEACgkQin3kvZL+oou8iQD/WekjFwaUgpt0UQIZ8ALpMPnJ
+vl19bVbo3XZS6Ln0K90A/3bEP8ik0JUrwkdzw/oGzUDRJRpQumM20gK1X2CuITqR
+=WuK0
+-----END PGP SIGNATURE-----
diff --git a/app-emulation/cloud-init/cloud-init-0.7.5-r2.ebuild b/app-emulation/cloud-init/cloud-init-0.7.5-r2.ebuild
new file mode 100644
index 000000000000..7cefd7b88ca0
--- /dev/null
+++ b/app-emulation/cloud-init/cloud-init-0.7.5-r2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/cloud-init/cloud-init-0.7.5-r2.ebuild,v 1.1 2014/08/24 23:53:40 alunduil Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=TRUE
+
+inherit distutils-r1 eutils multilib systemd
+
+DESCRIPTION="Cloud instance initialization"
+HOMEPAGE="http://launchpad.net/cloud-init"
+SRC_URI="http://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/jsonpatch[${PYTHON_USEDEP}]
+	dev-python/oauth[${PYTHON_USEDEP}]
+	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
+	dev-python/pyserial[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		${CDEPEND}
+		>=dev-python/httpretty-0.7.1[${PYTHON_USEDEP}]
+		dev-python/mocker[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pep8[${PYTHON_USEDEP}]
+		dev-python/pyflakes[${PYTHON_USEDEP}]
+		dev-python/pylint[${PYTHON_USEDEP}]
+		sys-apps/iproute2
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	virtual/logger
+"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}"/${P}-tests-exclude.patch
+	)
+
+	distutils-r1_python_prepare_all
+
+	# Skip SmartOS tests since they don't generally apply and don't skip based
+	# on environment.  Documented in bug #511384.
+	rm tests/unittests/test_datasource/test_smartos.py
+}
+
+python_test() {
+	# These tests are not broken but expect to locate an installed exe file
+	# other than where a gentoo system installs it;  (/bin/ip sought in /sbin)
+	# See cloudinit/sources/DataSourceOpenNebula.py for possible patching
+	sed \
+		-e 's:test_hostname:_&:' \
+		-e 's:test_network_interfaces:_&:' \
+		-i tests/unittests/test_datasource/test_opennebula.py
+
+	emake test
+}
+
+python_install_all() {
+	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
+
+	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/metadata.xml b/app-emulation/cloud-init/metadata.xml
index 20820d92906c..75cf7f9d2d6d 100644
--- a/app-emulation/cloud-init/metadata.xml
+++ b/app-emulation/cloud-init/metadata.xml
@@ -6,6 +6,10 @@
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer>
+	<email>alunduil@gentoo.org</email>
+	<name>Alex Brandt</name>
+  </maintainer>
   <longdescription lang="en">
     Package provides configuration and customization of cloud instance.
   </longdescription>