[app-admin/google-compute-engine] Version bump 2.4.0

31 files changed, 111 insertions, 1296 deletions

diff --git a/app-admin/google-compute-engine/Manifest b/app-admin/google-compute-engine/Manifest
index 17168ec..4e6eb9f 100644
--- a/app-admin/google-compute-engine/Manifest
+++ b/app-admin/google-compute-engine/Manifest
@@ -1,3 +1,15 @@
-DIST google-compute-engine-2.1.2.tar.gz 24991 SHA256 c1603145086273da11319e38361f7f63b30bb183dae34960eb02579f7c360db4 SHA512 c094c28075832b2acf9160601c680c180d3cb17db5419c16616754beeea36f85fc5208aa1c783960f3e562289efaa5c5223cc1cbc3b54997cd2340b01849b048 WHIRLPOOL 5c4fb492fc79853f909bcd92d163c9e1c76ca16e4473be75136bba6e0201d7ec54ae244141e04637225c534daf4d9cce6a06f20242cfd054bf3f6be1a421aabc
-DIST google-compute-engine-2.2.4.tar.gz 27256 SHA256 a402b9e41572bcc9ca2d724d95156ca7ec544647ada027d00407804ad2b18ef6 SHA512 81da7157dd8cbb2204f938623b107fd1cf66938dc22cfe31829053706253d17a2c72e365cf4495448dea9ee1936f6853c257708146c6d1d7d58399bf19c54284 WHIRLPOOL eb50056662163fcb1445e61cfffa678251c78eb570e1c01eb93056a03da42f9ef79256d65825227c9216bf1a5c142095b70691ca45057ae714636fd89a56601c
-DIST google-compute-engine-2.3.6.tar.gz 27548 SHA256 3710b4ebe86e5c6d413c14cf88e8c92b47e0761ffaf2fe696edcd6478ec23eba SHA512 6fbd8901b683ab15608ae4f64422fa5b39a180cbcbf842842c1293278b4d155b726639b29f29e70caedc8cd8b5972e83ce3be6af4b6721eb4044db0335c0832f WHIRLPOOL 21fc49d7cb9b12ac6a09c981c1f5871ae208629f9fac283a356b99a5677fc1e040b5020a310610faa360fe563132d396ec0ae47f7aea71f1055b95f061d7ce8e
+DIST google-accounts-daemon.20170622 2656 SHA256 c9ee1572fdcfdcba98a42b7a41e4461f98afe88b0d34b9b2d7d57117390d35e7 SHA512 c7bacbfc6a2ddbe7dee3258a2f0151592660f28b6947b2ea5ef1dc3bb008f7244a6c5e4c32fe021fc6c4a1c55573be6e4b6d1e092869090bc25fefd587d70cda WHIRLPOOL 10a6d9a0039865724931b775dbad1d204b726bd74dda7b4abc3c2bb16899143c21d9083d420707cf121f4b758599ac224915a5f4e59bd32810931e83567849f3
+DIST google-accounts-daemon.service.20170622 264 SHA256 adeb12d48a82df4f3b26236d8bfbdeda26abed323033bca9ea00cf0f7be3e76a SHA512 ae72ecc7edef633378c42e7635a5b511db720e62bad07d443a52ccd87aabf334af577b18153eeda1b17c09271ab260432993ef5695af7bb88e3a6c8d1b9b1d2e WHIRLPOOL bc967948973865e3a832659bc5f2abb29c4570f3f5199bfa64ad61dd5d697debaafa902b916d5eda9fca5896165d8d70bfaabe8dc09cb66f440797cdef7f9697
+DIST google-clock-skew-daemon.20170622 2666 SHA256 95d7f490aee0e29ef80af1d800b9775cb087e4c143d6d996aebb21f5a550fd76 SHA512 d83effcfb11417eba2dafb1f3a1c36837abbade2e67cb1b4f8d240416cc0805916b72392198b784a66dcb2df0a532879c839420d8738920b2af69728065d0364 WHIRLPOOL 450c4c605deb3be800cafcfb6bf40278596a30523616942676c7c557e834d8cd9e0cd4b7d4af7094c5bacf0aacdf0ee5b93592c66aa194513fff0768ef07d2d2
+DIST google-clock-skew-daemon.service.20170622 268 SHA256 bf5491f77b35ae6d5fca403e231312e3006d48d0e293dece14ec107302dfb465 SHA512 169f2355dd6d1c8f0d4d60efffa4c27fb36b223501ae6e530b976c54f3ceb99014456b45fd8b8fa15dc2a59a66166e49f9c3d69546720509d3e261c0cea8bc77 WHIRLPOOL 494a6bcfc4d7d5a7609de351d01aed6fe6dba3463fc523849385fddce27775a72749caa2949fd2f51b256cf5abd52c8b56473b602e11a155609e869b370bb2f9
+DIST google-compute-engine-2.4.0.tar.gz 28452 SHA256 7f6d8870fbb6315a298d4ccfc23d8635fd1392e41f0ae28947b5649085fcec79 SHA512 b626bb8365c914b746a00f3e2fdb2b5b35d52b76bd8a6b8a7b72298180dde76a04d2c48999578ef504d90da1613ff08d59f5831257d002c9e6da05c48f3ab211 WHIRLPOOL 04a5b46c622a7ba89b29d8a76799e8399d5ca9a5226521b18ab5673d0e3980106d102fa3789f87ab5a0ec7e4ce1cee8138e57b4bc3c3101c30a667a8e1db6262
+DIST google-instance-setup.20170622 1278 SHA256 c2a6313948b70108531fdccb1fc4ee7e3761d439dd17f83d43b490dc2901edac SHA512 fd1ddcebb8af5a2db6a46de87c88ef520cc6067f3c4aefa883ff5c5f830949a96bd2d1bd13f872e014dcd9a4d92414dc85ee618503854c9a7b261078966ba2b4 WHIRLPOOL c07588d958d00c49c9a745cfead2ed7b5d0a3bf34b7b148966cb8aa35829e65b4a84366f347e1af113b9b24b620cddc01fa42b0b61b5a09bb016289b00d888b7
+DIST google-instance-setup.service.20170622 335 SHA256 4fec58da40a5f7f66c49904f830ead3b45f187bb8919b803acd9f918ad63d9c5 SHA512 e3b026a67baa264c904997832bd69c6196d2e6fe28c378f04dd2972b8f9b2209c88dda656a19ae5ea47e6b9de49103d777af1b91c57e09fd36bc9d79acae234c WHIRLPOOL 324be42ec020502094f7f32d9ee390bad29b163feac8d375e5717ff001547f4061f022fbcc382aadf94a49ad66f5c32fb524c6f0197f5b896759563791b97abf
+DIST google-ip-forwarding-daemon.20170622 2665 SHA256 c8674803ecf0ec226e13c3a0ce4c3bdd29e200681dc5646f71f5cb8c1958e495 SHA512 99cdc86611b382676fa510979f90805a38e11e8acbac02a2c423074ffe52e8a271a3739e8edc518dcab0e2ca5849d1011803b72fb29a8e403d75e031112ccaaf WHIRLPOOL 9b4f629c6c55e7b3c1cbc2b0cbd0268060114c9a0679f54caf26b412470048aecfdd414af0375489a2095c7dd59508cc81dce28092c38c4875501f5740f88cc0
+DIST google-ip-forwarding-daemon.service.20170622 274 SHA256 e6cf17af8613217be116cce47702c1665b2c2f294117fddec96dfcc60fed6bf4 SHA512 968f7f2326693bf6e773241dba2023b65a07ecf1ed3734ae2cd0447b0587596a2c9988cec484521de5fc75c1a40d6c9f887a7ea2d1f427c8abd8103d2840a11f WHIRLPOOL 3e11300d8387bd0441483692e1bc0959e4921a3f5ea82b464373e72944916f1e788ab2bac502f43973ad4e26a2406645b7a80a8eb4ed8650c16002c26ac0e811
+DIST google-network-setup.20170622 1257 SHA256 d6e7727fa8bd37a0b288cc8b393d7f4d040d22d1d603d0a961c3e8e307fb3cb3 SHA512 146a647c58cd5c786b3885f854737fd36fbf8ef53e0c537e5ab0bf9614fc0a1790cf628cc4cf0ae91b805b51ae840ca96f85518c9ce89e2d0089fffcdb531531 WHIRLPOOL 25124eafa5ff5c3e46f9645f21f31f4e7544f2c8d13e808b22734990fe795ce806cbf5315083a722feb56d9710ec182f1fb93ad7d9b903b8c07a780da96ad949
+DIST google-network-setup.service.20170622 344 SHA256 2ae4bfb76aed607da4c79effb13dd13d7ab9a770d01da4d8d44be6553404b528 SHA512 3a7dafcd380ad6c16e8feea567f6e2abf3dbdb9ed695462f33580845b260ebcd3be5ac03da2f220c3f9dbef41ccf2e6eb19a34e33eb0454293ca794601dc64a9 WHIRLPOOL 4c7aa61840355df1616f2ffafb050ce9b1f5a35c449ec721b9a03f5d80600cde2e90e92aac0c2b4ef55c2f35bbf8c41ce8d7b6f2ad5464dc8068276aea116903
+DIST google-shutdown-scripts.20170622 1313 SHA256 ec2bf724d71fff411a4bb6ecbc65b4d2839ce4677da4d43b55dcc6cc04b04f99 SHA512 92e0a1cd3aff8e1ab932ccbf9114bc7f3e9afb4cb6ff3689dc44e1ff072a738ec7b976df17094dc58df94a3a21b991570a8e4de370670672cbb9f5d07bd0d8ad WHIRLPOOL 21077d7052b7df6dd4b6f82925a928c2f991438b8eea63f3b95aeea550fb61ce8b1174a2f104841f79d1f7e3d7810de3c2f50aeeb8c06b38eee0686d82f04bf5
+DIST google-shutdown-scripts.service.20170622 448 SHA256 0e27e79f7e02b1e47169e5799e3679276c6eb888c44f08a7c9255ee95eabb9f1 SHA512 f4def86713b9c29505b4b88883958f2a5955c5695ebbbcd4d9911aa67b5079036059df6484d21d475d11ab75b8af2782ccd970836679abe87c45a2928c308d51 WHIRLPOOL 8f064fa0a5a15b2f39ced33601373f4e05c929dc970b2cc1bf9cab7e96d5122f162470bbf66e59935e119e293b7ff0eb2f4f6dc70b8ce9f9a7b174077d4a2ed1
+DIST google-startup-scripts.20170622 1331 SHA256 c886346de92c638377d8ed4a3ff07f66c139ed10b9c3ab1fa75d804249674559 SHA512 3ca3403fd3dd01566e06b5519a0f09875ba8ab6f19ce4b6b38e7338caebae82c0ebe1caf09fb7788faef8121e27e4bedc2d4590d3ddd1e450c0f1244f2ed86bf WHIRLPOOL f9b5b0d8e3be59cf76ea07452b3f3715315c84244e0c3b2c773b00c28427814ccc0ce526834642a42262e59d20086fb02143d774cbb2bfbbd3b7c6858b947058
+DIST google-startup-scripts.service.20170622 406 SHA256 cb8ca2af1e10be4e589957fbddc0d731915991b8e43c536d56296770056af05b SHA512 d540abc91cf78fca916b3441890ca0e06ac0ffff8c5ec924a4c96254616bd5df8308a5172d565cf459fc8d258cd1382b0703e0c0b544be6d120d4583dea19519 WHIRLPOOL 3f9b7a30bdf4a6ccc13dde277445a4ad3e2b937029a88df72dae5304c478481ca41ba44b45ce24522cc8f98692fdc740dd5ba90e49bfa572b523310a9c39ff91
diff --git a/app-admin/google-compute-engine/files/systemd/google-accounts-daemon.service-20160719 b/app-admin/google-compute-engine/files/systemd/google-accounts-daemon.service-20160719
deleted file mode 100644
index 04d74b5..0000000
--- a/app-admin/google-compute-engine/files/systemd/google-accounts-daemon.service-20160719
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Google Compute Engine Accounts Daemon
-After=network.target google-instance-setup.service
-Before=sshd.service
-Requires=network.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/google_accounts_daemon
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-admin/google-compute-engine/files/systemd/google-accounts-daemon.service-20160803 b/app-admin/google-compute-engine/files/systemd/google-accounts-daemon.service-20160803
deleted file mode 100644
index 125e776..0000000
--- a/app-admin/google-compute-engine/files/systemd/google-accounts-daemon.service-20160803
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Google Compute Engine Accounts Daemon
-After=network.target google-instance-setup.service google-network-setup.service
-Before=sshd.service
-Requires=network.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/google_accounts_daemon
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-admin/google-compute-engine/files/systemd/google-clock-skew-daemon.service-20160719 b/app-admin/google-compute-engine/files/systemd/google-clock-skew-daemon.service-20160719
deleted file mode 100644
index 511f55b..0000000
--- a/app-admin/google-compute-engine/files/systemd/google-clock-skew-daemon.service-20160719
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Google Compute Engine Clock Skew Daemon
-After=network.target google-instance-setup.service
-Requires=network.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/google_clock_skew_daemon
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-admin/google-compute-engine/files/systemd/google-clock-skew-daemon.service-20160803 b/app-admin/google-compute-engine/files/systemd/google-clock-skew-daemon.service-20160803
deleted file mode 100644
index 476abde..0000000
--- a/app-admin/google-compute-engine/files/systemd/google-clock-skew-daemon.service-20160803
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Google Compute Engine Clock Skew Daemon
-After=network.target google-instance-setup.service google-network-setup.service
-Requires=network.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/google_clock_skew_daemon
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-admin/google-compute-engine/files/systemd/google-instance-setup.service-20160719 b/app-admin/google-compute-engine/files/systemd/google-instance-setup.service-20160719
deleted file mode 100644
index afa639a..0000000
--- a/app-admin/google-compute-engine/files/systemd/google-instance-setup.service-20160719
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Google Compute Engine Instance Setup
-After=local-fs.target network-online.target network.target rsyslog.service
-Before=sshd.service
-Wants=local-fs.target network-online.target network.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/google_instance_setup
-
-[Install]
-WantedBy=sshd.service
-WantedBy=multi-user.target
diff --git a/app-admin/google-compute-engine/files/systemd/google-instance-setup.service-20160803 b/app-admin/google-compute-engine/files/systemd/google-instance-setup.service-20160803
deleted file mode 100644
index afa639a..0000000
--- a/app-admin/google-compute-engine/files/systemd/google-instance-setup.service-20160803
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Google Compute Engine Instance Setup
-After=local-fs.target network-online.target network.target rsyslog.service
-Before=sshd.service
-Wants=local-fs.target network-online.target network.target
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/google_instance_setup
-
-[Install]
-WantedBy=sshd.service
-WantedBy=multi-user.target
diff --git a/app-admin/google-compute-engine/files/systemd/google-ip-forwarding-daemon.service-20160719 b/app-admin/google-compute-engine/files/systemd/google-ip-forwarding-daemon.service-20160719
deleted file mode 100644
index d8d98ad..0000000
--- a/app-admin/google-compute-engine/files/systemd/google-ip-forwarding-daemon.service-20160719
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Google Compute Engine IP Forwarding Daemon
-After=network.target google-instance-setup.service
-Requires=network.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/google_ip_forwarding_daemon
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-admin/google-compute-engine/files/systemd/google-ip-forwarding-daemon.service-20160803 b/app-admin/google-compute-engine/files/systemd/google-ip-forwarding-daemon.service-20160803
deleted file mode 100644
index d3704c6..0000000
--- a/app-admin/google-compute-engine/files/systemd/google-ip-forwarding-daemon.service-20160803
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Google Compute Engine IP Forwarding Daemon
-After=network.target google-instance-setup.service google-network-setup.service
-Requires=network.target
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/google_ip_forwarding_daemon
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-admin/google-compute-engine/files/systemd/google-network-setup.service-20160803 b/app-admin/google-compute-engine/files/systemd/google-network-setup.service-20160803
deleted file mode 100644
index 4400391..0000000
--- a/app-admin/google-compute-engine/files/systemd/google-network-setup.service-20160803
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Google Compute Engine Network Setup
-After=local-fs.target network-online.target network.target rsyslog.service
-After=google-instance-setup.service
-Wants=local-fs.target network-online.target network.target
-
-[Service]
-ExecStart=/usr/bin/google_network_setup
-KillMode=process
-Type=oneshot
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-admin/google-compute-engine/files/systemd/google-shutdown-scripts.service-20160719 b/app-admin/google-compute-engine/files/systemd/google-shutdown-scripts.service-20160719
deleted file mode 100644
index 04c82fd..0000000
--- a/app-admin/google-compute-engine/files/systemd/google-shutdown-scripts.service-20160719
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Google Compute Engine Shutdown Scripts
-After=local-fs.target network-online.target network.target rsyslog.service
-After=google-instance-setup.service
-Wants=local-fs.target network-online.target network.target
-
-[Service]
-ExecStart=/bin/true
-ExecStop=/usr/bin/google_metadata_script_runner --script-type shutdown
-Type=oneshot
-RemainAfterExit=true
-TimeoutStopSec=0
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-admin/google-compute-engine/files/systemd/google-shutdown-scripts.service-20160803 b/app-admin/google-compute-engine/files/systemd/google-shutdown-scripts.service-20160803
deleted file mode 100644
index 3561089..0000000
--- a/app-admin/google-compute-engine/files/systemd/google-shutdown-scripts.service-20160803
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Google Compute Engine Shutdown Scripts
-After=local-fs.target network-online.target network.target rsyslog.service
-After=google-instance-setup.service google-network-setup.service
-Wants=local-fs.target network-online.target network.target
-
-[Service]
-ExecStart=/bin/true
-ExecStop=/usr/bin/google_metadata_script_runner --script-type shutdown
-Type=oneshot
-RemainAfterExit=true
-TimeoutStopSec=0
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-admin/google-compute-engine/files/systemd/google-startup-scripts.service-20160719 b/app-admin/google-compute-engine/files/systemd/google-startup-scripts.service-20160719
deleted file mode 100644
index 1c373c5..0000000
--- a/app-admin/google-compute-engine/files/systemd/google-startup-scripts.service-20160719
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Google Compute Engine Startup Scripts
-After=local-fs.target network-online.target network.target rsyslog.service
-After=google-instance-setup.service
-Wants=local-fs.target network-online.target network.target
-
-[Service]
-ExecStart=/usr/bin/google_metadata_script_runner --script-type startup
-KillMode=process
-Type=oneshot
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-admin/google-compute-engine/files/systemd/google-startup-scripts.service-20160803 b/app-admin/google-compute-engine/files/systemd/google-startup-scripts.service-20160803
deleted file mode 100644
index 9c04d79..0000000
--- a/app-admin/google-compute-engine/files/systemd/google-startup-scripts.service-20160803
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=Google Compute Engine Startup Scripts
-After=local-fs.target network-online.target network.target rsyslog.service
-After=google-instance-setup.service google-network-setup.service
-Wants=local-fs.target network-online.target network.target
-
-[Service]
-ExecStart=/usr/bin/google_metadata_script_runner --script-type startup
-KillMode=process
-Type=oneshot
-
-[Install]
-WantedBy=multi-user.target
diff --git a/app-admin/google-compute-engine/files/sysvinit/google-accounts-daemon-20160719 b/app-admin/google-compute-engine/files/sysvinit/google-accounts-daemon-20160719
deleted file mode 100644
index 96b0a55..0000000
--- a/app-admin/google-compute-engine/files/sysvinit/google-accounts-daemon-20160719
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-# Copyright 2016 Google Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
-### BEGIN INIT INFO
-# Provides:          google_accounts_daemon
-# X-Start-Before:    ssh
-# Required-Start:    $local_fs $network $named $syslog $google_instance_setup
-# Required-Stop:
-# Default-Start:     2 3 4 5
-# Default-Stop:
-# Short-Description: Google Compute Engine Accounts Daemon
-# Description:       Manages accounts from metadata SSH keys.
-### END INIT INFO
-
-# Do NOT "set -e".
-
-NAME=google-accounts-daemon
-DAEMON=/usr/bin/google_accounts_daemon
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Exit if the package is not installed.
-[ -x "$DAEMON" ] || exit 0
-
-# Load the rcS variables.
-. /lib/init/vars.sh
-
-# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service.
-#
-do_start()
-{
-  start-stop-daemon \
-    --background \
-    --exec $DAEMON \
-    --make-pidfile \
-    --pidfile $PIDFILE \
-    --quiet \
-    --start > /dev/null
-}
-
-#
-# Function that stops the daemon/service.
-#
-do_stop()
-{
-  start-stop-daemon \
-    --exec $DAEMON \
-    --pidfile $PIDFILE \
-    --quiet \
-    --retry=TERM/30/KILL/5 \
-    --stop > /dev/null
-
-  # Wait for children to finish too if this is a daemon that forks
-  # and if the daemon is only ever run from this initscript.
-  # If the above conditions are not satisfied then add some other code
-  # that waits for the process to drop all resources that could be
-  # needed by services started subsequently.  A last resort is to
-  # sleep for some time.
-  start-stop-daemon \
-    --exec $DAEMON \
-    --oknodo \
-    --quiet \
-    --retry=0/30/KILL/5 \
-    --stop > /dev/null
-
-  # Delete the pidfile when the daemon exits.
-  rm -f $PIDFILE
-}
-
-case "$1" in
-  start)
-    do_start
-    ;;
-  stop)
-    do_stop
-    ;;
-  status)
-    status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-    ;;
-  restart|force-reload)
-    do_stop
-    do_start
-    ;;
-  *)
-    echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-    exit 1
-    ;;
-esac
-
-:
diff --git a/app-admin/google-compute-engine/files/sysvinit/google-accounts-daemon-20160803 b/app-admin/google-compute-engine/files/sysvinit/google-accounts-daemon-20160803
deleted file mode 100644
index 4f37c52..0000000
--- a/app-admin/google-compute-engine/files/sysvinit/google-accounts-daemon-20160803
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/sh
-# Copyright 2016 Google Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
-### BEGIN INIT INFO
-# Provides:          google_accounts_daemon
-# X-Start-Before:    ssh
-# Required-Start:    $local_fs $network $named $syslog $google_instance_setup
-#                    $google_network_setup
-# Required-Stop:
-# Default-Start:     2 3 4 5
-# Default-Stop:
-# Short-Description: Google Compute Engine Accounts Daemon
-# Description:       Manages accounts from metadata SSH keys.
-### END INIT INFO
-
-# Do NOT "set -e".
-
-NAME=google-accounts-daemon
-DAEMON=/usr/bin/google_accounts_daemon
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Exit if the package is not installed.
-[ -x "$DAEMON" ] || exit 0
-
-# Load the rcS variables.
-. /lib/init/vars.sh
-
-# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service.
-#
-do_start()
-{
-  start-stop-daemon \
-    --background \
-    --exec $DAEMON \
-    --make-pidfile \
-    --pidfile $PIDFILE \
-    --quiet \
-    --start > /dev/null
-}
-
-#
-# Function that stops the daemon/service.
-#
-do_stop()
-{
-  start-stop-daemon \
-    --exec $DAEMON \
-    --pidfile $PIDFILE \
-    --quiet \
-    --retry=TERM/30/KILL/5 \
-    --stop > /dev/null
-
-  # Wait for children to finish too if this is a daemon that forks
-  # and if the daemon is only ever run from this initscript.
-  # If the above conditions are not satisfied then add some other code
-  # that waits for the process to drop all resources that could be
-  # needed by services started subsequently.  A last resort is to
-  # sleep for some time.
-  start-stop-daemon \
-    --exec $DAEMON \
-    --oknodo \
-    --quiet \
-    --retry=0/30/KILL/5 \
-    --stop > /dev/null
-
-  # Delete the pidfile when the daemon exits.
-  rm -f $PIDFILE
-}
-
-case "$1" in
-  start)
-    do_start
-    ;;
-  stop)
-    do_stop
-    ;;
-  status)
-    status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-    ;;
-  restart|force-reload)
-    do_stop
-    do_start
-    ;;
-  *)
-    echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-    exit 1
-    ;;
-esac
-
-:
diff --git a/app-admin/google-compute-engine/files/sysvinit/google-clock-skew-daemon-20160719 b/app-admin/google-compute-engine/files/sysvinit/google-clock-skew-daemon-20160719
deleted file mode 100644
index 02b0011..0000000
--- a/app-admin/google-compute-engine/files/sysvinit/google-clock-skew-daemon-20160719
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/sh
-# Copyright 2016 Google Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
-### BEGIN INIT INFO
-# Provides:          google_clock_skew_daemon
-# Required-Start:    $network $syslog $google_instance_setup
-# Required-Stop:     $network
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Google Compute Engine Clock Skew Daemon
-# Description:       Sync the system clock on migration.
-### END INIT INFO
-
-# Do NOT "set -e".
-
-NAME=google-clock-skew-daemon
-DAEMON=/usr/bin/google_clock_skew_daemon
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Exit if the package is not installed.
-[ -x "$DAEMON" ] || exit 0
-
-# Load the rcS variables.
-. /lib/init/vars.sh
-
-# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service.
-#
-do_start()
-{
-  start-stop-daemon \
-    --background \
-    --exec $DAEMON \
-    --make-pidfile \
-    --pidfile $PIDFILE \
-    --quiet \
-    --start > /dev/null
-}
-
-#
-# Function that stops the daemon/service.
-#
-do_stop()
-{
-  start-stop-daemon \
-    --exec $DAEMON \
-    --pidfile $PIDFILE \
-    --quiet \
-    --retry=TERM/30/KILL/5 \
-    --stop > /dev/null
-
-  # Wait for children to finish too if this is a daemon that forks
-  # and if the daemon is only ever run from this initscript.
-  # If the above conditions are not satisfied then add some other code
-  # that waits for the process to drop all resources that could be
-  # needed by services started subsequently.  A last resort is to
-  # sleep for some time.
-  start-stop-daemon \
-    --exec $DAEMON \
-    --oknodo \
-    --quiet \
-    --retry=0/30/KILL/5 \
-    --stop > /dev/null
-
-  # Delete the pidfile when the daemon exits.
-  rm -f $PIDFILE
-}
-
-case "$1" in
-  start)
-    do_start
-    ;;
-  stop)
-    do_stop
-    ;;
-  status)
-    status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-    ;;
-  restart|force-reload)
-    do_stop
-    do_start
-    ;;
-  *)
-    echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-    exit 1
-    ;;
-esac
-
-:
diff --git a/app-admin/google-compute-engine/files/sysvinit/google-clock-skew-daemon-20160803 b/app-admin/google-compute-engine/files/sysvinit/google-clock-skew-daemon-20160803
deleted file mode 100644
index 92e1607..0000000
--- a/app-admin/google-compute-engine/files/sysvinit/google-clock-skew-daemon-20160803
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-# Copyright 2016 Google Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
-### BEGIN INIT INFO
-# Provides:          google_clock_skew_daemon
-# Required-Start:    $network $syslog $google_instance_setup
-#                    $google_network_setup
-# Required-Stop:     $network
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Google Compute Engine Clock Skew Daemon
-# Description:       Sync the system clock on migration.
-### END INIT INFO
-
-# Do NOT "set -e".
-
-NAME=google-clock-skew-daemon
-DAEMON=/usr/bin/google_clock_skew_daemon
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Exit if the package is not installed.
-[ -x "$DAEMON" ] || exit 0
-
-# Load the rcS variables.
-. /lib/init/vars.sh
-
-# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service.
-#
-do_start()
-{
-  start-stop-daemon \
-    --background \
-    --exec $DAEMON \
-    --make-pidfile \
-    --pidfile $PIDFILE \
-    --quiet \
-    --start > /dev/null
-}
-
-#
-# Function that stops the daemon/service.
-#
-do_stop()
-{
-  start-stop-daemon \
-    --exec $DAEMON \
-    --pidfile $PIDFILE \
-    --quiet \
-    --retry=TERM/30/KILL/5 \
-    --stop > /dev/null
-
-  # Wait for children to finish too if this is a daemon that forks
-  # and if the daemon is only ever run from this initscript.
-  # If the above conditions are not satisfied then add some other code
-  # that waits for the process to drop all resources that could be
-  # needed by services started subsequently.  A last resort is to
-  # sleep for some time.
-  start-stop-daemon \
-    --exec $DAEMON \
-    --oknodo \
-    --quiet \
-    --retry=0/30/KILL/5 \
-    --stop > /dev/null
-
-  # Delete the pidfile when the daemon exits.
-  rm -f $PIDFILE
-}
-
-case "$1" in
-  start)
-    do_start
-    ;;
-  stop)
-    do_stop
-    ;;
-  status)
-    status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-    ;;
-  restart|force-reload)
-    do_stop
-    do_start
-    ;;
-  *)
-    echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-    exit 1
-    ;;
-esac
-
-:
diff --git a/app-admin/google-compute-engine/files/sysvinit/google-instance-setup-20160719 b/app-admin/google-compute-engine/files/sysvinit/google-instance-setup-20160719
deleted file mode 100644
index 4382f25..0000000
--- a/app-admin/google-compute-engine/files/sysvinit/google-instance-setup-20160719
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-# Copyright 2016 Google Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
-### BEGIN INIT INFO
-# Provides:          google_instance_setup
-# X-Start-Before:    ssh
-# Required-Start:    $local_fs $network $syslog
-# Required-Stop:
-# Default-Start:     2 3 4 5
-# Default-Stop:
-# Short-Description: Google Compute Engine Instance Setup
-# Description:       Runs instance setup on boot.
-### END INIT INFO
-
-NAME=google-instance-setup
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Load the rcS variables.
-. /lib/init/vars.sh
-
-#
-# Function that starts the daemon/service.
-#
-do_start()
-{
-  /usr/bin/google_instance_setup > /dev/null
-}
-
-case "$1" in
-  start)
-    do_start
-    ;;
-  *)
-    echo "Usage: $SCRIPTNAME start" >&2
-    exit 1
-    ;;
-esac
-
-:
diff --git a/app-admin/google-compute-engine/files/sysvinit/google-instance-setup-20160803 b/app-admin/google-compute-engine/files/sysvinit/google-instance-setup-20160803
deleted file mode 100644
index 4382f25..0000000
--- a/app-admin/google-compute-engine/files/sysvinit/google-instance-setup-20160803
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-# Copyright 2016 Google Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
-### BEGIN INIT INFO
-# Provides:          google_instance_setup
-# X-Start-Before:    ssh
-# Required-Start:    $local_fs $network $syslog
-# Required-Stop:
-# Default-Start:     2 3 4 5
-# Default-Stop:
-# Short-Description: Google Compute Engine Instance Setup
-# Description:       Runs instance setup on boot.
-### END INIT INFO
-
-NAME=google-instance-setup
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Load the rcS variables.
-. /lib/init/vars.sh
-
-#
-# Function that starts the daemon/service.
-#
-do_start()
-{
-  /usr/bin/google_instance_setup > /dev/null
-}
-
-case "$1" in
-  start)
-    do_start
-    ;;
-  *)
-    echo "Usage: $SCRIPTNAME start" >&2
-    exit 1
-    ;;
-esac
-
-:
diff --git a/app-admin/google-compute-engine/files/sysvinit/google-ip-forwarding-daemon-20160719 b/app-admin/google-compute-engine/files/sysvinit/google-ip-forwarding-daemon-20160719
deleted file mode 100644
index 92e72a8..0000000
--- a/app-admin/google-compute-engine/files/sysvinit/google-ip-forwarding-daemon-20160719
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/bin/sh
-# Copyright 2016 Google Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
-### BEGIN INIT INFO
-# Provides:          google_ip_forwarding_daemon
-# Required-Start:    $network $syslog $google_instance_setup
-# Required-Stop:     $network
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Google Compute Engine IP Forwarding Daemon
-# Description:       Manages IP forwarding.
-### END INIT INFO
-
-# Do NOT "set -e".
-
-NAME=google-ip-forwarding-daemon
-DAEMON=/usr/bin/google_ip_forwarding_daemon
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Exit if the package is not installed.
-[ -x "$DAEMON" ] || exit 0
-
-# Load the rcS variables.
-. /lib/init/vars.sh
-
-# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service.
-#
-do_start()
-{
-  start-stop-daemon \
-    --background \
-    --exec $DAEMON \
-    --make-pidfile \
-    --pidfile $PIDFILE \
-    --quiet \
-    --start > /dev/null
-}
-
-#
-# Function that stops the daemon/service.
-#
-do_stop()
-{
-  start-stop-daemon \
-    --exec $DAEMON \
-    --pidfile $PIDFILE \
-    --quiet \
-    --retry=TERM/30/KILL/5 \
-    --stop > /dev/null
-
-  # Wait for children to finish too if this is a daemon that forks
-  # and if the daemon is only ever run from this initscript.
-  # If the above conditions are not satisfied then add some other code
-  # that waits for the process to drop all resources that could be
-  # needed by services started subsequently.  A last resort is to
-  # sleep for some time.
-  start-stop-daemon \
-    --exec $DAEMON \
-    --oknodo \
-    --quiet \
-    --retry=0/30/KILL/5 \
-    --stop > /dev/null
-
-  # Delete the pidfile when the daemon exits.
-  rm -f $PIDFILE
-}
-
-case "$1" in
-  start)
-    do_start
-    ;;
-  stop)
-    do_stop
-    ;;
-  status)
-    status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-    ;;
-  restart|force-reload)
-    do_stop
-    do_start
-    ;;
-  *)
-    echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-    exit 1
-    ;;
-esac
-
-:
diff --git a/app-admin/google-compute-engine/files/sysvinit/google-ip-forwarding-daemon-20160803 b/app-admin/google-compute-engine/files/sysvinit/google-ip-forwarding-daemon-20160803
deleted file mode 100644
index 6aefc0b..0000000
--- a/app-admin/google-compute-engine/files/sysvinit/google-ip-forwarding-daemon-20160803
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-# Copyright 2016 Google Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
-### BEGIN INIT INFO
-# Provides:          google_ip_forwarding_daemon
-# Required-Start:    $network $syslog $google_instance_setup
-#                    $google_network_setup
-# Required-Stop:     $network
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Google Compute Engine IP Forwarding Daemon
-# Description:       Manages IP forwarding.
-### END INIT INFO
-
-# Do NOT "set -e".
-
-NAME=google-ip-forwarding-daemon
-DAEMON=/usr/bin/google_ip_forwarding_daemon
-PIDFILE=/var/run/$NAME.pid
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Exit if the package is not installed.
-[ -x "$DAEMON" ] || exit 0
-
-# Load the rcS variables.
-. /lib/init/vars.sh
-
-# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
-# and status_of_proc is working.
-. /lib/lsb/init-functions
-
-#
-# Function that starts the daemon/service.
-#
-do_start()
-{
-  start-stop-daemon \
-    --background \
-    --exec $DAEMON \
-    --make-pidfile \
-    --pidfile $PIDFILE \
-    --quiet \
-    --start > /dev/null
-}
-
-#
-# Function that stops the daemon/service.
-#
-do_stop()
-{
-  start-stop-daemon \
-    --exec $DAEMON \
-    --pidfile $PIDFILE \
-    --quiet \
-    --retry=TERM/30/KILL/5 \
-    --stop > /dev/null
-
-  # Wait for children to finish too if this is a daemon that forks
-  # and if the daemon is only ever run from this initscript.
-  # If the above conditions are not satisfied then add some other code
-  # that waits for the process to drop all resources that could be
-  # needed by services started subsequently.  A last resort is to
-  # sleep for some time.
-  start-stop-daemon \
-    --exec $DAEMON \
-    --oknodo \
-    --quiet \
-    --retry=0/30/KILL/5 \
-    --stop > /dev/null
-
-  # Delete the pidfile when the daemon exits.
-  rm -f $PIDFILE
-}
-
-case "$1" in
-  start)
-    do_start
-    ;;
-  stop)
-    do_stop
-    ;;
-  status)
-    status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
-    ;;
-  restart|force-reload)
-    do_stop
-    do_start
-    ;;
-  *)
-    echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
-    exit 1
-    ;;
-esac
-
-:
diff --git a/app-admin/google-compute-engine/files/sysvinit/google-network-setup-20160803 b/app-admin/google-compute-engine/files/sysvinit/google-network-setup-20160803
deleted file mode 100644
index 41b800c..0000000
--- a/app-admin/google-compute-engine/files/sysvinit/google-network-setup-20160803
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-# Copyright 2016 Google Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
-### BEGIN INIT INFO
-# Provides:          google_network_setup
-# Required-Start:    $all $google_instance_setup
-# Required-Stop:
-# Default-Start:     2 3 4 5
-# Default-Stop:
-# Short-Description: Google Compute Engine Network Setup
-# Description:       Enables network interfaces on boot.
-### END INIT INFO
-
-NAME=google-network-setup
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Load the rcS variables.
-. /lib/init/vars.sh
-
-#
-# Function that starts the daemon/service.
-#
-do_start()
-{
-  /usr/bin/google_network_setup > /dev/null
-}
-
-case "$1" in
-  start)
-    do_start
-    ;;
-  *)
-    echo "Usage: $SCRIPTNAME start" >&2
-    exit 1
-    ;;
-esac
-
-:
diff --git a/app-admin/google-compute-engine/files/sysvinit/google-shutdown-scripts-20160719 b/app-admin/google-compute-engine/files/sysvinit/google-shutdown-scripts-20160719
deleted file mode 100644
index 3f93799..0000000
--- a/app-admin/google-compute-engine/files/sysvinit/google-shutdown-scripts-20160719
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-# Copyright 2016 Google Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
-### BEGIN INIT INFO
-# Provides:          google_shutdown_scripts
-# Required-Start:
-# Required-Stop:     $remote_fs $syslog docker kubelet
-# Default-Start:
-# Default-Stop:      0 6
-# Short-Description: Google Compute Engine Shutdown Scripts
-# Description:       Runs user specified shutdown scripts from metadata.
-### END INIT INFO
-
-NAME=google-shutdown-scripts
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Load the rcS variables.
-. /lib/init/vars.sh
-
-#
-# Function that stops the daemon/service.
-#
-do_stop()
-{
-  /usr/bin/google_metadata_script_runner --script-type shutdown > /dev/null
-}
-
-case "$1" in
-  stop)
-    do_stop
-    ;;
-  *)
-    echo "Usage: $SCRIPTNAME stop" >&2
-    exit 1
-    ;;
-esac
-
-:
diff --git a/app-admin/google-compute-engine/files/sysvinit/google-shutdown-scripts-20160803 b/app-admin/google-compute-engine/files/sysvinit/google-shutdown-scripts-20160803
deleted file mode 100644
index 3f93799..0000000
--- a/app-admin/google-compute-engine/files/sysvinit/google-shutdown-scripts-20160803
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-# Copyright 2016 Google Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
-### BEGIN INIT INFO
-# Provides:          google_shutdown_scripts
-# Required-Start:
-# Required-Stop:     $remote_fs $syslog docker kubelet
-# Default-Start:
-# Default-Stop:      0 6
-# Short-Description: Google Compute Engine Shutdown Scripts
-# Description:       Runs user specified shutdown scripts from metadata.
-### END INIT INFO
-
-NAME=google-shutdown-scripts
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Load the rcS variables.
-. /lib/init/vars.sh
-
-#
-# Function that stops the daemon/service.
-#
-do_stop()
-{
-  /usr/bin/google_metadata_script_runner --script-type shutdown > /dev/null
-}
-
-case "$1" in
-  stop)
-    do_stop
-    ;;
-  *)
-    echo "Usage: $SCRIPTNAME stop" >&2
-    exit 1
-    ;;
-esac
-
-:
diff --git a/app-admin/google-compute-engine/files/sysvinit/google-startup-scripts-20160719 b/app-admin/google-compute-engine/files/sysvinit/google-startup-scripts-20160719
deleted file mode 100644
index 2ee8a56..0000000
--- a/app-admin/google-compute-engine/files/sysvinit/google-startup-scripts-20160719
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-# Copyright 2016 Google Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
-### BEGIN INIT INFO
-# Provides:          google_startup_scripts
-# Required-Start:    $all $google_instance_setup
-# Required-Stop:
-# Default-Start:     2 3 4 5
-# Default-Stop:
-# Short-Description: Google Compute Engine Startup Scripts
-# Description:       Runs user specified startup scripts from metadata.
-### END INIT INFO
-
-NAME=google-startup-scripts
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Load the rcS variables.
-. /lib/init/vars.sh
-
-#
-# Function that starts the daemon/service.
-#
-do_start()
-{
-  /usr/bin/google_metadata_script_runner --script-type startup > /dev/null
-}
-
-case "$1" in
-  start)
-    do_start
-    ;;
-  *)
-    echo "Usage: $SCRIPTNAME start" >&2
-    exit 1
-    ;;
-esac
-
-:
diff --git a/app-admin/google-compute-engine/files/sysvinit/google-startup-scripts-20160803 b/app-admin/google-compute-engine/files/sysvinit/google-startup-scripts-20160803
deleted file mode 100644
index c9d61d1..0000000
--- a/app-admin/google-compute-engine/files/sysvinit/google-startup-scripts-20160803
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh
-# Copyright 2016 Google Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-#     Unless required by applicable law or agreed to in writing, software
-#     distributed under the License is distributed on an "AS IS" BASIS,
-#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#     See the License for the specific language governing permissions and
-#     limitations under the License.
-#
-### BEGIN INIT INFO
-# Provides:          google_startup_scripts
-# Required-Start:    $all $google_instance_setup $google_network_setup
-# Required-Stop:
-# Default-Start:     2 3 4 5
-# Default-Stop:
-# Short-Description: Google Compute Engine Startup Scripts
-# Description:       Runs user specified startup scripts from metadata.
-### END INIT INFO
-
-NAME=google-startup-scripts
-SCRIPTNAME=/etc/init.d/$NAME
-
-# Load the rcS variables.
-. /lib/init/vars.sh
-
-#
-# Function that starts the daemon/service.
-#
-do_start()
-{
-  /usr/bin/google_metadata_script_runner --script-type startup > /dev/null
-}
-
-case "$1" in
-  start)
-    do_start
-    ;;
-  *)
-    echo "Usage: $SCRIPTNAME start" >&2
-    exit 1
-    ;;
-esac
-
-:
diff --git a/app-admin/google-compute-engine/google-compute-engine-2.1.2.ebuild b/app-admin/google-compute-engine/google-compute-engine-2.1.2.ebuild
deleted file mode 100644
index 70924f6..0000000
--- a/app-admin/google-compute-engine/google-compute-engine-2.1.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5}} pypy{,3} )
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="Scripts and tools for Google Compute Engine Linux images."
-HOMEPAGE="https://github.com/GoogleCloudPlatform/compute-image-packages"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-    dev-python/boto[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-    dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-
-python_install_all() {
-	for _s in google-accounts-daemon \
-		     google-clock-skew-daemon \
-		     google-instance-setup \
-		     google-ip-forwarding-daemon \
-		     google-shutdown-scripts \
-		     google-startup-scripts;
-    do
-    	newinitd "${FILESDIR}/sysvinit/${_s}-20160719" "${_s}"
-    	systemd_newunit "${FILESDIR}/systemd/${_s}.service-20160719" "${_s}.service"
-    done
-
-    # Install google-compute-engine python modules.
-    distutils-r1_python_install_all
-}
diff --git a/app-admin/google-compute-engine/google-compute-engine-2.2.4.ebuild b/app-admin/google-compute-engine/google-compute-engine-2.2.4.ebuild
deleted file mode 100644
index 84767b9..0000000
--- a/app-admin/google-compute-engine/google-compute-engine-2.2.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5}} pypy{,3} )
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="Scripts and tools for Google Compute Engine Linux images."
-HOMEPAGE="https://github.com/GoogleCloudPlatform/compute-image-packages"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-    dev-python/boto[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-    dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-
-python_install_all() {
-	for _s in google-accounts-daemon \
-		     google-clock-skew-daemon \
-		     google-instance-setup \
-		     google-ip-forwarding-daemon \
-		     google-network-setup \
-		     google-shutdown-scripts \
-		     google-startup-scripts;
-    do
-    	newinitd "${FILESDIR}/sysvinit/${_s}-20160803" "${_s}"
-    	systemd_newunit "${FILESDIR}/systemd/${_s}.service-20160803" "${_s}.service"
-    done
-
-    # Install google-compute-engine python modules.
-    distutils-r1_python_install_all
-}
diff --git a/app-admin/google-compute-engine/google-compute-engine-2.3.6.ebuild b/app-admin/google-compute-engine/google-compute-engine-2.3.6.ebuild
deleted file mode 100644
index 84767b9..0000000
--- a/app-admin/google-compute-engine/google-compute-engine-2.3.6.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5}} pypy{,3} )
-
-inherit distutils-r1 systemd
-
-DESCRIPTION="Scripts and tools for Google Compute Engine Linux images."
-HOMEPAGE="https://github.com/GoogleCloudPlatform/compute-image-packages"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-    dev-python/boto[${PYTHON_USEDEP}]
-"
-
-DEPEND="${RDEPEND}
-    dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-
-python_install_all() {
-	for _s in google-accounts-daemon \
-		     google-clock-skew-daemon \
-		     google-instance-setup \
-		     google-ip-forwarding-daemon \
-		     google-network-setup \
-		     google-shutdown-scripts \
-		     google-startup-scripts;
-    do
-    	newinitd "${FILESDIR}/sysvinit/${_s}-20160803" "${_s}"
-    	systemd_newunit "${FILESDIR}/systemd/${_s}.service-20160803" "${_s}.service"
-    done
-
-    # Install google-compute-engine python modules.
-    distutils-r1_python_install_all
-}
diff --git a/app-admin/google-compute-engine/google-compute-engine-2.4.0.ebuild b/app-admin/google-compute-engine/google-compute-engine-2.4.0.ebuild
new file mode 100644
index 0000000..a884d1f
--- /dev/null
+++ b/app-admin/google-compute-engine/google-compute-engine-2.4.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} pypy{,3} )
+
+inherit distutils-r1 systemd
+
+GITHUB_USER="GoogleCloudPlatform"
+MY_PN="compute-image-packages"
+MY_TAG="20170622"
+
+DESCRIPTION="Scripts and tools for Google Compute Engine Linux images."
+HOMEPAGE="https://github.com/GoogleCloudPlatform/compute-image-packages"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+		https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${MY_TAG}/google_compute_engine_init/sysvinit/google-accounts-daemon -> google-accounts-daemon.${MY_TAG}
+		https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${MY_TAG}/google_compute_engine_init/systemd/google-accounts-daemon.service -> google-accounts-daemon.service.${MY_TAG}
+		https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${MY_TAG}/google_compute_engine_init/sysvinit/google-clock-skew-daemon -> google-clock-skew-daemon.${MY_TAG}
+		https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${MY_TAG}/google_compute_engine_init/systemd/google-clock-skew-daemon.service -> google-clock-skew-daemon.service.${MY_TAG}
+		https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${MY_TAG}/google_compute_engine_init/sysvinit/google-instance-setup -> google-instance-setup.${MY_TAG}
+		https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${MY_TAG}/google_compute_engine_init/systemd/google-instance-setup.service -> google-instance-setup.service.${MY_TAG}
+		https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${MY_TAG}/google_compute_engine_init/sysvinit/google-ip-forwarding-daemon -> google-ip-forwarding-daemon.${MY_TAG}
+		https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${MY_TAG}/google_compute_engine_init/systemd/google-ip-forwarding-daemon.service -> google-ip-forwarding-daemon.service.${MY_TAG}
+		https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${MY_TAG}/google_compute_engine_init/sysvinit/google-network-setup -> google-network-setup.${MY_TAG}
+		https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${MY_TAG}/google_compute_engine_init/systemd/google-network-setup.service -> google-network-setup.service.${MY_TAG}
+		https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${MY_TAG}/google_compute_engine_init/sysvinit/google-shutdown-scripts -> google-shutdown-scripts.${MY_TAG}
+		https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${MY_TAG}/google_compute_engine_init/systemd/google-shutdown-scripts.service -> google-shutdown-scripts.service.${MY_TAG}
+		https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${MY_TAG}/google_compute_engine_init/sysvinit/google-startup-scripts -> google-startup-scripts.${MY_TAG}
+		https://raw.githubusercontent.com/${GITHUB_USER}/${MY_PN}/${MY_TAG}/google_compute_engine_init/systemd/google-startup-scripts.service -> google-startup-scripts.service.${MY_TAG}"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+    dev-python/boto[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+    dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+INIT=(
+	"google-accounts-daemon"
+	"google-clock-skew-daemon"
+	"google-instance-setup"
+	"google-ip-forwarding-daemon"
+	"google-network-setup"
+	"google-shutdown-scripts"
+	"google-startup-scripts")
+
+python_install_all() {
+    for _s in "${INIT[@]}"
+    do
+        newinitd "${DISTDIR}/${_s}.${MY_TAG}" "${_s}"
+        systemd_newunit "${DISTDIR}/${_s}.service.${MY_TAG}" "${_s}.service"
+    done
+
+    # Install google-compute-engine python modules.
+    distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "Systems using systemd can do the following:"
+	ewarn "    # Stop existing daemons."
+    ewarn "    systemctl stop --no-block google-accounts-daemon"
+    ewarn "    systemctl stop --no-block google-clock-skew-daemon"
+    ewarn "    systemctl stop --no-block google-ip-forwarding-daemon"
+    ewarn
+    ewarn "    # Enable systemd services."
+    ewarn "    systemctl enable google-accounts-daemon.service"
+    ewarn "    systemctl enable google-clock-skew-daemon.service"
+    ewarn "    systemctl enable google-instance-setup.service"
+    ewarn "    systemctl enable google-ip-forwarding-daemon.service"
+    ewarn "    systemctl enable google-network-setup.service"
+    ewarn "    systemctl enable google-shutdown-scripts.service"
+    ewarn "    systemctl enable google-startup-scripts.service"
+    ewarn
+    ewarn "    # Run instance setup manually to prevent startup script execution."
+    ewarn "    /usr/bin/google_instance_setup"
+    ewarn
+    ewarn "    # Enable network interfaces."
+    ewarn "    /usr/bin/google_network_setup"
+    ewarn
+    ewarn "    # Start daemons."
+    ewarn "    systemctl start --no-block google-accounts-daemon"
+    ewarn "    systemctl start --no-block google-clock-skew-daemon"
+    ewarn "    systemctl start --no-block google-ip-forwarding-daemon"
+	ewarn
+}