adding init scripts

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)

7 files changed, 78 insertions, 37 deletions

diff --git a/app-emulation/cloud-init/ChangeLog b/app-emulation/cloud-init/ChangeLog
index 7dc85c5e3dc4..99d579112c73 100644
--- a/app-emulation/cloud-init/ChangeLog
+++ b/app-emulation/cloud-init/ChangeLog
@@ -1,6 +1,14 @@
 # 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.3 2014/03/11 08:31:40 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/cloud-init/ChangeLog,v 1.4 2014/03/16 21:05:11 prometheanfire Exp $
+
+*cloud-init-0.7.4-r1 (16 Mar 2014)
+
+  16 Mar 2014; Matthew Thode <prometheanfire@gentoo.org>
+  +cloud-init-0.7.4-r1.ebuild, +files/cloud-config.init,
+  +files/cloud-final.init, +files/cloud-init-local.init, +files/cloud-init.init,
+  -cloud-init-0.7.2.ebuild, -cloud-init-0.7.4.ebuild:
+  adding init scripts
 
 *cloud-init-0.7.4 (11 Mar 2014)
 
diff --git a/app-emulation/cloud-init/cloud-init-0.7.2.ebuild b/app-emulation/cloud-init/cloud-init-0.7.2.ebuild
deleted file mode 100644
index 18babdf5f4c1..000000000000
--- a/app-emulation/cloud-init/cloud-init-0.7.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 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.2.ebuild,v 1.2 2013/10/29 04:42:05 prometheanfire Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils multilib
-
-DESCRIPTION="Package provides configuration and customization of cloud instance."
-HOMEPAGE="https://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=""
-
-DEPEND=""
-
-RDEPEND="dev-python/cheetah[${PYTHON_USEDEP}]
-		dev-python/prettytable[${PYTHON_USEDEP}]
-		dev-python/oauth[${PYTHON_USEDEP}]
-		dev-python/pyserial[${PYTHON_USEDEP}]
-		dev-python/configobj[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		virtual/python-argparse[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/boto[${PYTHON_USEDEP}]
-		dev-python/jsonpatch[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	sed -i "s/'tests'//g" "${S}/setup.py"
-	rm -R "${S}/tests"
-}
diff --git a/app-emulation/cloud-init/cloud-init-0.7.4.ebuild b/app-emulation/cloud-init/cloud-init-0.7.4-r1.ebuild
index 0b8e0d70973f..a8004a5ab45d 100644
--- a/app-emulation/cloud-init/cloud-init-0.7.4.ebuild
+++ b/app-emulation/cloud-init/cloud-init-0.7.4-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.4.ebuild,v 1.1 2014/03/11 08:31:40 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/cloud-init/cloud-init-0.7.4-r1.ebuild,v 1.1 2014/03/16 21:05:11 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -33,3 +33,10 @@ src_prepare() {
 	sed -i "s/'tests'//g" "${S}/setup.py"
 	rm -R "${S}/tests"
 }
+
+python_install() {
+	distutils-r1_python_install
+	for svc in config final init init-local; do
+		newinitd "${FILESDIR}/cloud-${svc}.init" "cloud-${svc}"
+	done
+}
diff --git a/app-emulation/cloud-init/files/cloud-config.init b/app-emulation/cloud-init/files/cloud-config.init
new file mode 100644
index 000000000000..64d80017ea57
--- /dev/null
+++ b/app-emulation/cloud-init/files/cloud-config.init
@@ -0,0 +1,16 @@
+#!/sbin/runscript
+# 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/files/cloud-config.init,v 1.1 2014/03/16 21:05:12 prometheanfire Exp $
+
+depend() {
+    after cloud-init-local
+    after cloud-init
+    before cloud-final
+    provide cloud-config
+}
+
+start() {
+    cloud-init modules --mode config
+    eend 0
+}
diff --git a/app-emulation/cloud-init/files/cloud-final.init b/app-emulation/cloud-init/files/cloud-final.init
new file mode 100644
index 000000000000..ace74d69f672
--- /dev/null
+++ b/app-emulation/cloud-init/files/cloud-final.init
@@ -0,0 +1,14 @@
+#!/sbin/runscript
+# 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/files/cloud-final.init,v 1.1 2014/03/16 21:05:12 prometheanfire Exp $
+
+depend() {
+    after cloud-config
+    provide cloud-final
+}
+
+start() {
+    cloud-init modules --mode final
+    eend 0
+}
diff --git a/app-emulation/cloud-init/files/cloud-init-local.init b/app-emulation/cloud-init/files/cloud-init-local.init
new file mode 100644
index 000000000000..0c8e9df223f5
--- /dev/null
+++ b/app-emulation/cloud-init/files/cloud-init-local.init
@@ -0,0 +1,15 @@
+#!/sbin/runscript
+# 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/files/cloud-init-local.init,v 1.1 2014/03/16 21:05:12 prometheanfire Exp $
+
+depend() {
+    after net
+    before cloud-init
+    provide cloud-init-local
+}
+
+start() {
+    cloud-init init --local
+    eend 0
+}
diff --git a/app-emulation/cloud-init/files/cloud-init.init b/app-emulation/cloud-init/files/cloud-init.init
new file mode 100644
index 000000000000..151faf502256
--- /dev/null
+++ b/app-emulation/cloud-init/files/cloud-init.init
@@ -0,0 +1,16 @@
+#!/sbin/runscript
+# 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/files/cloud-init.init,v 1.1 2014/03/16 21:05:12 prometheanfire Exp $
+
+# add depends for network, dns, fs etc
+depend() {
+    after cloud-init-local
+    before cloud-config
+    provide cloud-init
+}
+
+start() {
+    cloud-init init
+    eend 0
+}