Drop remaining $Id$ and $Header$ from files.

Bug: 611234

142 files changed, 0 insertions, 142 deletions

diff --git a/net-misc/adjtimex/files/adjtimex.init b/net-misc/adjtimex/files/adjtimex.init
index 989d8d5f10c6..ef46890bf3c9 100644
--- a/net-misc/adjtimex/files/adjtimex.init
+++ b/net-misc/adjtimex/files/adjtimex.init
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 DAEMON=adjtimex
 OPTS="--tick ${TICK} --frequency ${FREQ}"
diff --git a/net-misc/apt-cacher-ng/files/initd b/net-misc/apt-cacher-ng/files/initd
index d0b3473e20d1..d054b4de76bd 100644
--- a/net-misc/apt-cacher-ng/files/initd
+++ b/net-misc/apt-cacher-ng/files/initd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 NAME="apt-cacher-ng"
 DAEMON="/usr/sbin/$NAME"
diff --git a/net-misc/apt-cacher-ng/files/initd-r1 b/net-misc/apt-cacher-ng/files/initd-r1
index 4a72c23bf880..2e401dcd25a0 100644
--- a/net-misc/apt-cacher-ng/files/initd-r1
+++ b/net-misc/apt-cacher-ng/files/initd-r1
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 DAEMON="/usr/sbin/${RC_SVCNAME}"
 RUNDIR="/var/run/${RC_SVCNAME}"
diff --git a/net-misc/apt-proxy/files/apt-proxy b/net-misc/apt-proxy/files/apt-proxy
index 40db15ac96e9..6f10c66b6cf1 100644
--- a/net-misc/apt-proxy/files/apt-proxy
+++ b/net-misc/apt-proxy/files/apt-proxy
@@ -1,6 +1,5 @@
 # default: off
 # description: this is a proxy for debian packages.  
-# $Id$
 
 service apt-proxy
 {
diff --git a/net-misc/arpsponge/files/arpsponge.confd b/net-misc/arpsponge/files/arpsponge.confd
index 4f941f483a2a..164ecfd591c6 100644
--- a/net-misc/arpsponge/files/arpsponge.confd
+++ b/net-misc/arpsponge/files/arpsponge.confd
@@ -1,6 +1,5 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 # Mandatory arguments: IPADDR/PREFIXLEN dev IFNAME
 # 	Example: 192.168.0.0/24 dev eth0
diff --git a/net-misc/arpsponge/files/arpsponge.initd b/net-misc/arpsponge/files/arpsponge.initd
index 73c35b139ee5..ccb911ca6968 100644
--- a/net-misc/arpsponge/files/arpsponge.initd
+++ b/net-misc/arpsponge/files/arpsponge.initd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	need net
diff --git a/net-misc/asterisk/files/1.8.0/asterisk.confd b/net-misc/asterisk/files/1.8.0/asterisk.confd
index 2ecbb6e10db3..f826d46f245c 100644
--- a/net-misc/asterisk/files/1.8.0/asterisk.confd
+++ b/net-misc/asterisk/files/1.8.0/asterisk.confd
@@ -1,6 +1,5 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 #
 # Additional options for asterisk
diff --git a/net-misc/asterisk/files/1.8.0/asterisk.initd7 b/net-misc/asterisk/files/1.8.0/asterisk.initd7
index 3626b6a58653..0897919caac5 100644
--- a/net-misc/asterisk/files/1.8.0/asterisk.initd7
+++ b/net-misc/asterisk/files/1.8.0/asterisk.initd7
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 extra_started_commands="forcestop reload"
 
diff --git a/net-misc/asterisk/files/1.8.0/asterisk.initd8 b/net-misc/asterisk/files/1.8.0/asterisk.initd8
index 86b94fe7acac..4419dda06883 100644
--- a/net-misc/asterisk/files/1.8.0/asterisk.initd8
+++ b/net-misc/asterisk/files/1.8.0/asterisk.initd8
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 extra_started_commands="forcestop reload"
 extra_commands="checkperms"
diff --git a/net-misc/astmanproxy/files/astmanproxy.rc6 b/net-misc/astmanproxy/files/astmanproxy.rc6
index 588a4c3e647d..7e6737de00dc 100644
--- a/net-misc/astmanproxy/files/astmanproxy.rc6
+++ b/net-misc/astmanproxy/files/astmanproxy.rc6
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	need net
diff --git a/net-misc/bird/files/initd-v4-bird-1.3.8 b/net-misc/bird/files/initd-v4-bird-1.3.8
index 1a62e1632bd8..c7c6a0b63af7 100644
--- a/net-misc/bird/files/initd-v4-bird-1.3.8
+++ b/net-misc/bird/files/initd-v4-bird-1.3.8
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 extra_started_commands="reload"
 
diff --git a/net-misc/bird/files/initd-v6-bird-1.3.8 b/net-misc/bird/files/initd-v6-bird-1.3.8
index 2379a9152243..94ba4426e5dd 100644
--- a/net-misc/bird/files/initd-v6-bird-1.3.8
+++ b/net-misc/bird/files/initd-v6-bird-1.3.8
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 extra_started_commands="reload"
 
diff --git a/net-misc/bopm/files/bopm.conf.d b/net-misc/bopm/files/bopm.conf.d
index d6fd35a30542..48eb33790cd1 100644
--- a/net-misc/bopm/files/bopm.conf.d
+++ b/net-misc/bopm/files/bopm.conf.d
@@ -1,6 +1,5 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 # Config file for /etc/init.d/bopm
 
diff --git a/net-misc/bopm/files/bopm.conf.d-r1 b/net-misc/bopm/files/bopm.conf.d-r1
index 71bacbe7f218..eb27446768c3 100644
--- a/net-misc/bopm/files/bopm.conf.d-r1
+++ b/net-misc/bopm/files/bopm.conf.d-r1
@@ -1,6 +1,5 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 # Config file for /etc/init.d/bopm
 
diff --git a/net-misc/bopm/files/bopm.init.d b/net-misc/bopm/files/bopm.init.d
index bf036840bd5c..7b0d0591aca5 100644
--- a/net-misc/bopm/files/bopm.init.d
+++ b/net-misc/bopm/files/bopm.init.d
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 opts="depend start stop"
 
diff --git a/net-misc/bopm/files/bopm.init.d-r1 b/net-misc/bopm/files/bopm.init.d-r1
index 4f6f2ea77bdc..6a292f800be2 100644
--- a/net-misc/bopm/files/bopm.init.d-r1
+++ b/net-misc/bopm/files/bopm.init.d-r1
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 command="/usr/bin/bopm"
 description="Blitzed Open Proxy Monitor"
diff --git a/net-misc/capi4hylafax/files/capi4hylafax.initd b/net-misc/capi4hylafax/files/capi4hylafax.initd
index e7ad4e858a01..08c3917f6f8f 100644
--- a/net-misc/capi4hylafax/files/capi4hylafax.initd
+++ b/net-misc/capi4hylafax/files/capi4hylafax.initd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	need capi
diff --git a/net-misc/chrome-remote-desktop/files/chrome-remote-desktop.rc b/net-misc/chrome-remote-desktop/files/chrome-remote-desktop.rc
index 1e2f748fd90f..0604c61c78a4 100644
--- a/net-misc/chrome-remote-desktop/files/chrome-remote-desktop.rc
+++ b/net-misc/chrome-remote-desktop/files/chrome-remote-desktop.rc
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 extra_started_commands="checkconfig reload"
 
diff --git a/net-misc/chrony/files/chronyd.init b/net-misc/chrony/files/chronyd.init
index 2a046d582adf..3a71fe748fd7 100644
--- a/net-misc/chrony/files/chronyd.init
+++ b/net-misc/chrony/files/chronyd.init
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	use dns
diff --git a/net-misc/chrony/files/chronyd.init-r1 b/net-misc/chrony/files/chronyd.init-r1
index 765c2dc4b126..a76e2533f57d 100644
--- a/net-misc/chrony/files/chronyd.init-r1
+++ b/net-misc/chrony/files/chronyd.init-r1
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	use dns
diff --git a/net-misc/clockspeed/files/ntpclockset b/net-misc/clockspeed/files/ntpclockset
index 35441097ca61..c4c9d1b68ccb 100644
--- a/net-misc/clockspeed/files/ntpclockset
+++ b/net-misc/clockspeed/files/ntpclockset
@@ -1,5 +1,4 @@
 #!/bin/bash
-# $Id$
 
 # Updates by Sascha Silbe
 
diff --git a/net-misc/connman/files/connman.initd2 b/net-misc/connman/files/connman.initd2
index 7b14d074c226..428245d7f6e2 100644
--- a/net-misc/connman/files/connman.initd2
+++ b/net-misc/connman/files/connman.initd2
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Purpose License v2
-# $Id$
 
 depend() {
    need dbus
diff --git a/net-misc/dahdi-tools/files/dahdi.init2 b/net-misc/dahdi-tools/files/dahdi.init2
index 820e5e6fb5fe..d3abf3c4e61e 100644
--- a/net-misc/dahdi-tools/files/dahdi.init2
+++ b/net-misc/dahdi-tools/files/dahdi.init2
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	need net
diff --git a/net-misc/dhcp/files/dhcpd.init5 b/net-misc/dhcp/files/dhcpd.init5
index 6842888f8247..f0ea9b0c7904 100644
--- a/net-misc/dhcp/files/dhcpd.init5
+++ b/net-misc/dhcp/files/dhcpd.init5
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 extra_commands="configtest"
 
diff --git a/net-misc/dhcp/files/dhcrelay.init3 b/net-misc/dhcp/files/dhcrelay.init3
index b7e28d86f42c..a08ba8850740 100644
--- a/net-misc/dhcp/files/dhcrelay.init3
+++ b/net-misc/dhcp/files/dhcrelay.init3
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	need net
diff --git a/net-misc/dibbler/files/dibbler-client b/net-misc/dibbler/files/dibbler-client
index 9551dd1cd447..ec381be75f9f 100644
--- a/net-misc/dibbler/files/dibbler-client
+++ b/net-misc/dibbler/files/dibbler-client
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	need net
diff --git a/net-misc/dibbler/files/dibbler-relay b/net-misc/dibbler/files/dibbler-relay
index 3b0dbff3b42f..1adf16f9fab2 100644
--- a/net-misc/dibbler/files/dibbler-relay
+++ b/net-misc/dibbler/files/dibbler-relay
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	need net
diff --git a/net-misc/dibbler/files/dibbler-server b/net-misc/dibbler/files/dibbler-server
index 5cba3b01b463..95f2845ae325 100644
--- a/net-misc/dibbler/files/dibbler-server
+++ b/net-misc/dibbler/files/dibbler-server
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	need net
diff --git a/net-misc/dropbear/files/dropbear.init.d b/net-misc/dropbear/files/dropbear.init.d
index bc149cf37571..eaa3ae2919c2 100644
--- a/net-misc/dropbear/files/dropbear.init.d
+++ b/net-misc/dropbear/files/dropbear.init.d
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	use logger dns
diff --git a/net-misc/dropbox/files/dropbox.initd b/net-misc/dropbox/files/dropbox.initd
index 95a230eeea63..4f8dd70629f3 100644
--- a/net-misc/dropbox/files/dropbox.initd
+++ b/net-misc/dropbox/files/dropbox.initd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Id$
 
 depend() {
     need localmount net
diff --git a/net-misc/fakeidentd/files/fakeidentd.rc b/net-misc/fakeidentd/files/fakeidentd.rc
index 4510f7450706..5b3bfef5aca2 100644
--- a/net-misc/fakeidentd/files/fakeidentd.rc
+++ b/net-misc/fakeidentd/files/fakeidentd.rc
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	use net
diff --git a/net-misc/freelan/files/openrc/freelan.initd b/net-misc/freelan/files/openrc/freelan.initd
index 66da39c7a9d8..bab116d3db06 100755
--- a/net-misc/freelan/files/openrc/freelan.initd
+++ b/net-misc/freelan/files/openrc/freelan.initd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 command="/usr/bin/freelan"
 command_args="-s -p /var/run/freelan.pid"
diff --git a/net-misc/guacamole-server/files/guacd b/net-misc/guacamole-server/files/guacd
index 576ffe40de84..64aa93fd0678 100644
--- a/net-misc/guacamole-server/files/guacd
+++ b/net-misc/guacamole-server/files/guacd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 DAEMON="/usr/sbin/guacd"
 PIDFILE="/run/guacd/guacd"
diff --git a/net-misc/gvrpcd/files/init.gvrpcd b/net-misc/gvrpcd/files/init.gvrpcd
index 233a379f2d1a..edef1f39f608 100644
--- a/net-misc/gvrpcd/files/init.gvrpcd
+++ b/net-misc/gvrpcd/files/init.gvrpcd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Id$
 
 extra_commands="checkconfig"
 
diff --git a/net-misc/htbinit/files/htbinit.rc b/net-misc/htbinit/files/htbinit.rc
index 8a779846229d..219ad04a37e7 100644
--- a/net-misc/htbinit/files/htbinit.rc
+++ b/net-misc/htbinit/files/htbinit.rc
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 extra_commands="stats list timecheck"
 extra_started_commands="reload"
diff --git a/net-misc/htpdate/files/htpdate.init-r1 b/net-misc/htpdate/files/htpdate.init-r1
index 03c295fa66a0..950972df868b 100644
--- a/net-misc/htpdate/files/htpdate.init-r1
+++ b/net-misc/htpdate/files/htpdate.init-r1
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 description="Synchronizes local system with time offered by remote webservers over HTTP"
 pidfile="/run/htpdate.pid"
diff --git a/net-misc/i2pd/files/i2pd-2.6.0-r3.initd b/net-misc/i2pd/files/i2pd-2.6.0-r3.initd
index 81739e9cc34b..09c83927b206 100644
--- a/net-misc/i2pd/files/i2pd-2.6.0-r3.initd
+++ b/net-misc/i2pd/files/i2pd-2.6.0-r3.initd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 description="C++ daemon for accessing the I2P network"
 description_graceful="Graceful shutdown, takes 10 minutes"
diff --git a/net-misc/iaxmodem/files/iaxmodem.initd b/net-misc/iaxmodem/files/iaxmodem.initd
index ae5b4615f61f..327b0843c922 100644
--- a/net-misc/iaxmodem/files/iaxmodem.initd
+++ b/net-misc/iaxmodem/files/iaxmodem.initd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 description="IAXmodem"
 description_reload="Reread configuration file and make the appropriate changes"
diff --git a/net-misc/ices/files/ices.initd-r1 b/net-misc/ices/files/ices.initd-r1
index 6d61053a6099..dbc76374c359 100644
--- a/net-misc/ices/files/ices.initd-r1
+++ b/net-misc/ices/files/ices.initd-r1
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 description="Icecast OGG streaming client"
 pidfile="/var/run/ices.pid"
diff --git a/net-misc/igmpproxy/files/igmpproxy-init.d b/net-misc/igmpproxy/files/igmpproxy-init.d
index e24952ed18d0..ca0b88032713 100644
--- a/net-misc/igmpproxy/files/igmpproxy-init.d
+++ b/net-misc/igmpproxy/files/igmpproxy-init.d
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	need net
diff --git a/net-misc/iodine/files/iodined-1.init b/net-misc/iodine/files/iodined-1.init
index 429ead397c06..edee6c6ac31a 100644
--- a/net-misc/iodine/files/iodined-1.init
+++ b/net-misc/iodine/files/iodined-1.init
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 PID_FILE="/run/iodined.pid"
 
diff --git a/net-misc/ip-sentinel/files/ip-sentinel.init b/net-misc/ip-sentinel/files/ip-sentinel.init
index a2347cd66526..923cedeac13c 100644
--- a/net-misc/ip-sentinel/files/ip-sentinel.init
+++ b/net-misc/ip-sentinel/files/ip-sentinel.init
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 CFG_FILE="/etc/ip-sentinel.cfg"
 
diff --git a/net-misc/iperf/files/iperf.confd b/net-misc/iperf/files/iperf.confd
index 01bd473328e3..7d82492a30f9 100644
--- a/net-misc/iperf/files/iperf.confd
+++ b/net-misc/iperf/files/iperf.confd
@@ -1,6 +1,5 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 # extra options (run iperf -h for a list of supported options)
 IPERF_OPTS="--format Mbytes"
diff --git a/net-misc/iperf/files/iperf.initd-r1 b/net-misc/iperf/files/iperf.initd-r1
index e7d13ff3bf9e..cd17a7b47e9e 100644
--- a/net-misc/iperf/files/iperf.initd-r1
+++ b/net-misc/iperf/files/iperf.initd-r1
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 description="IP bandwidth measurement server"
 command="/usr/bin/iperf"
diff --git a/net-misc/iperf/files/iperf3.initd b/net-misc/iperf/files/iperf3.initd
index bb79f15b2a09..281ebf5ae2d3 100644
--- a/net-misc/iperf/files/iperf3.initd
+++ b/net-misc/iperf/files/iperf3.initd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 description="IP bandwidth measurement server"
 command="/usr/bin/iperf3"
diff --git a/net-misc/iputils/files/rarpd.init.d b/net-misc/iputils/files/rarpd.init.d
index bf8cf1e271d7..27081fc760c0 100644
--- a/net-misc/iputils/files/rarpd.init.d
+++ b/net-misc/iputils/files/rarpd.init.d
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 pidfile="/var/run/rarpd.pid"
 command="/usr/sbin/rarpd"
diff --git a/net-misc/ipx-utils/files/ipx.confd b/net-misc/ipx-utils/files/ipx.confd
index d061d0d0de83..da14fd6e6605 100644
--- a/net-misc/ipx-utils/files/ipx.confd
+++ b/net-misc/ipx-utils/files/ipx.confd
@@ -1,6 +1,5 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 # Config file for /etc/init.d/ipx
 
diff --git a/net-misc/ipx-utils/files/ipx.init b/net-misc/ipx-utils/files/ipx.init
index f1db7a2c07e7..891505926b63 100644
--- a/net-misc/ipx-utils/files/ipx.init
+++ b/net-misc/ipx-utils/files/ipx.init
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 #NB: Config is in /etc/conf.d/ipx
 
diff --git a/net-misc/kafka-bin/files/kafka-zookeeper.init.d b/net-misc/kafka-bin/files/kafka-zookeeper.init.d
index b5c87fa1de51..fd70cdc5aa74 100644
--- a/net-misc/kafka-bin/files/kafka-zookeeper.init.d
+++ b/net-misc/kafka-bin/files/kafka-zookeeper.init.d
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
 description="Zookeeper for Kafka distributed messaging system"
 
diff --git a/net-misc/kafka-bin/files/kafka.init.d b/net-misc/kafka-bin/files/kafka.init.d
index 38943b697d10..3b23a7fac7c9 100644
--- a/net-misc/kafka-bin/files/kafka.init.d
+++ b/net-misc/kafka-bin/files/kafka.init.d
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
 description="Kafka distributed messaging system"
 
diff --git a/net-misc/knock/files/knockd.confd.2 b/net-misc/knock/files/knockd.confd.2
index cd72be91ddde..335a522fccb9 100644
--- a/net-misc/knock/files/knockd.confd.2
+++ b/net-misc/knock/files/knockd.confd.2
@@ -1,6 +1,5 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 # interface to listen to
 IFACE="eth0"
diff --git a/net-misc/knock/files/knockd.initd.2 b/net-misc/knock/files/knockd.initd.2
index 739f4a125cae..1d80f5980afc 100644
--- a/net-misc/knock/files/knockd.initd.2
+++ b/net-misc/knock/files/knockd.initd.2
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Id$
 
 : ${CONFIGFILE:=/etc/knockd.conf}
 : ${IFACE:=eth0}
diff --git a/net-misc/lambdamoo/files/lambdamoo.rc b/net-misc/lambdamoo/files/lambdamoo.rc
index 579076f26cb1..2a641acc4ba9 100644
--- a/net-misc/lambdamoo/files/lambdamoo.rc
+++ b/net-misc/lambdamoo/files/lambdamoo.rc
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 # adapted from Pavel Curtis' restart.sh
 
diff --git a/net-misc/linux-identd/files/identd.init b/net-misc/linux-identd/files/identd.init
index 1e4629c1eed8..4210441c157b 100644
--- a/net-misc/linux-identd/files/identd.init
+++ b/net-misc/linux-identd/files/identd.init
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	need net
diff --git a/net-misc/lldpd/files/lldpd-initd-5 b/net-misc/lldpd/files/lldpd-initd-5
index 83a0aa653189..ab0fc20c769c 100644
--- a/net-misc/lldpd/files/lldpd-initd-5
+++ b/net-misc/lldpd/files/lldpd-initd-5
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 name=lldpd
 pidfile=/run/lldpd.pid
diff --git a/net-misc/logmein-hamachi/files/logmein-hamachi.confd b/net-misc/logmein-hamachi/files/logmein-hamachi.confd
index a4de40249809..73523ee3e3de 100644
--- a/net-misc/logmein-hamachi/files/logmein-hamachi.confd
+++ b/net-misc/logmein-hamachi/files/logmein-hamachi.confd
@@ -1,6 +1,5 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 # /etc/conf.d/logmein-hamachi
 # Config file for logmein-hamachi control script
diff --git a/net-misc/mediatomb/files/mediatomb-0.12.1.initd b/net-misc/mediatomb/files/mediatomb-0.12.1.initd
index 0ae26f1f0c19..6c7989d89d66 100644
--- a/net-misc/mediatomb/files/mediatomb-0.12.1.initd
+++ b/net-misc/mediatomb/files/mediatomb-0.12.1.initd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	need net
diff --git a/net-misc/midentd/files/midentd.conf.d b/net-misc/midentd/files/midentd.conf.d
index 3edc5bdc7654..ab0dd4598144 100644
--- a/net-misc/midentd/files/midentd.conf.d
+++ b/net-misc/midentd/files/midentd.conf.d
@@ -1,6 +1,5 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 # Options to pass to midentd
 MIDENTD_OPTS="-u nobody"
diff --git a/net-misc/midentd/files/midentd.rc b/net-misc/midentd/files/midentd.rc
index 12ed1a6cc7c7..555dd1a8a3e7 100644
--- a/net-misc/midentd/files/midentd.rc
+++ b/net-misc/midentd/files/midentd.rc
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 start() {
 	ebegin "Starting midentd"
diff --git a/net-misc/minidlna/files/minidlna-1.1.2.initd b/net-misc/minidlna/files/minidlna-1.1.2.initd
index d1f252ed8632..eeb0786f0b51 100644
--- a/net-misc/minidlna/files/minidlna-1.1.2.initd
+++ b/net-misc/minidlna/files/minidlna-1.1.2.initd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	need net
diff --git a/net-misc/minidlna/files/minidlna-1.1.5.initd b/net-misc/minidlna/files/minidlna-1.1.5.initd
index c4cb33f0464c..416f122fa904 100644
--- a/net-misc/minidlna/files/minidlna-1.1.5.initd
+++ b/net-misc/minidlna/files/minidlna-1.1.5.initd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 : ${CONFIG:=/etc/minidlna.conf}
 : ${M_USER:=minidlna}
diff --git a/net-misc/miniupnpd/files/miniupnpd-init.d b/net-misc/miniupnpd/files/miniupnpd-init.d
index 3c25dba0d3e8..6d1ee24e3d31 100644
--- a/net-misc/miniupnpd/files/miniupnpd-init.d
+++ b/net-misc/miniupnpd/files/miniupnpd-init.d
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	need net iptables
diff --git a/net-misc/miredo/files/miredo.rc.2 b/net-misc/miredo/files/miredo.rc.2
index 5b9f9c75d500..c0ae6d0d1495 100644
--- a/net-misc/miredo/files/miredo.rc.2
+++ b/net-misc/miredo/files/miredo.rc.2
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	need localmount
diff --git a/net-misc/monmotha/files/monmotha.rc6 b/net-misc/monmotha/files/monmotha.rc6
index 30bcca24ab19..9bd0eeb8e2b1 100644
--- a/net-misc/monmotha/files/monmotha.rc6
+++ b/net-misc/monmotha/files/monmotha.rc6
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	need net
diff --git a/net-misc/mrouted/files/mrouted.rc b/net-misc/mrouted/files/mrouted.rc
index ac76f639bb13..2be6b393d472 100644
--- a/net-misc/mrouted/files/mrouted.rc
+++ b/net-misc/mrouted/files/mrouted.rc
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	use logger
diff --git a/net-misc/ndisc6/files/rdnssd.rc b/net-misc/ndisc6/files/rdnssd.rc
index e9ab83b24dfe..3b8d64cd035d 100644
--- a/net-misc/ndisc6/files/rdnssd.rc
+++ b/net-misc/ndisc6/files/rdnssd.rc
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	need localmount
diff --git a/net-misc/ndisc6/files/rdnssd.rc-1 b/net-misc/ndisc6/files/rdnssd.rc-1
index fcf89d64f4be..83aef06a0416 100644
--- a/net-misc/ndisc6/files/rdnssd.rc-1
+++ b/net-misc/ndisc6/files/rdnssd.rc-1
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	need localmount
diff --git a/net-misc/ndppd/files/ndppd.initd b/net-misc/ndppd/files/ndppd.initd
index 58d1153eb850..ba99a1926556 100644
--- a/net-misc/ndppd/files/ndppd.initd
+++ b/net-misc/ndppd/files/ndppd.initd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 command="/usr/sbin/ndppd"
 pidfile="/var/run/ndppd.pid"
diff --git a/net-misc/netkit-bootparamd/files/bootparamd.initd b/net-misc/netkit-bootparamd/files/bootparamd.initd
index d905d0a80a5f..251e8994969a 100644
--- a/net-misc/netkit-bootparamd/files/bootparamd.initd
+++ b/net-misc/netkit-bootparamd/files/bootparamd.initd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 [ -e /etc/conf.d/bootparamd ] && . /etc/conf.d/bootparamd
 
diff --git a/net-misc/netkit-routed/files/routed.initd b/net-misc/netkit-routed/files/routed.initd
index 0b821fd19e83..3b022fb54586 100644
--- a/net-misc/netkit-routed/files/routed.initd
+++ b/net-misc/netkit-routed/files/routed.initd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	need net
diff --git a/net-misc/netkit-rwho/files/netkit-rwho-0.17-cron b/net-misc/netkit-rwho/files/netkit-rwho-0.17-cron
index 96c6ddf6d2f1..9fab9f25ee0e 100644
--- a/net-misc/netkit-rwho/files/netkit-rwho-0.17-cron
+++ b/net-misc/netkit-rwho/files/netkit-rwho-0.17-cron
@@ -1,7 +1,6 @@
 #!/bin/sh
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 #
 # Clean up stale rwho entries after one month
 find /var/spool/rwho -mindepth 1 -maxdepth 1 -type f ! -name .keep \
diff --git a/net-misc/netkit-timed/files/timed.rc6 b/net-misc/netkit-timed/files/timed.rc6
index 0aaa477a16f9..eb939565310a 100644
--- a/net-misc/netkit-timed/files/timed.rc6
+++ b/net-misc/netkit-timed/files/timed.rc6
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	need net
diff --git a/net-misc/networkmanager/files/init.d.NetworkManager b/net-misc/networkmanager/files/init.d.NetworkManager
index 779c0eba5142..c0816c18b38b 100644
--- a/net-misc/networkmanager/files/init.d.NetworkManager
+++ b/net-misc/networkmanager/files/init.d.NetworkManager
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright (c) 2008 Saleem Abdulrasool <compnerd@compnerd.org>
 # Distributed under the terms of the GNU General Purpose License v2
-# $Id$
 
 description="NetworkManager daemon. The service is marked as started only \
 when a network connection is established."
diff --git a/net-misc/networkmanager/files/init.d.NetworkManager-r1 b/net-misc/networkmanager/files/init.d.NetworkManager-r1
index fbb8973b8af9..e5d577432d4c 100644
--- a/net-misc/networkmanager/files/init.d.NetworkManager-r1
+++ b/net-misc/networkmanager/files/init.d.NetworkManager-r1
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright (c) 2008 Saleem Abdulrasool <compnerd@compnerd.org>
 # Distributed under the terms of the GNU General Purpose License v2
-# $Id$
 
 description="NetworkManager daemon. The service is marked as started only \
 when a network connection is established."
diff --git a/net-misc/nstx/files/nstxcd.init b/net-misc/nstx/files/nstxcd.init
index 63852481d04e..444358970731 100644
--- a/net-misc/nstx/files/nstxcd.init
+++ b/net-misc/nstx/files/nstxcd.init
@@ -3,7 +3,6 @@
 # Distributed under the terms of the GNU General Public License v2
 # (Written  by Phillip Berndt <phillip.berndt at gmail dot com>)
 # (Modified by Steven Brudenell <steven dot brudenell at gmail>)
-# $Id$
 
 depend() {
     local iface
diff --git a/net-misc/nstx/files/nstxd.init b/net-misc/nstx/files/nstxd.init
index 496442fea0b8..2bf2a4133251 100644
--- a/net-misc/nstx/files/nstxd.init
+++ b/net-misc/nstx/files/nstxd.init
@@ -3,7 +3,6 @@
 # Distributed under the terms of the GNU General Public License v2
 # (Written  by Phillip Berndt <phillip.berndt at gmail dot com>)
 # (Modified by Steven Brudenell <steven dot brudenell at gmail>)
-# $Id$
 
 depend() {
     if [ ! -z "${BIND_INTERFACE}" ] ; then
diff --git a/net-misc/ntp/files/ntp-client.rc b/net-misc/ntp/files/ntp-client.rc
index 93375b4a3b24..5b5d59447395 100644
--- a/net-misc/ntp/files/ntp-client.rc
+++ b/net-misc/ntp/files/ntp-client.rc
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	before cron portmap
diff --git a/net-misc/ntp/files/ntpd.rc-r1 b/net-misc/ntp/files/ntpd.rc-r1
index 5bed5ce757c0..7573411c9986 100644
--- a/net-misc/ntp/files/ntpd.rc-r1
+++ b/net-misc/ntp/files/ntpd.rc-r1
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 description="ntpd - the network time protocol daemon"
 pidfile="/var/run/ntpd.pid"
diff --git a/net-misc/ntp/files/sntp.rc b/net-misc/ntp/files/sntp.rc
index 5b3b4632bfb9..4ed56ae2bf1a 100644
--- a/net-misc/ntp/files/sntp.rc
+++ b/net-misc/ntp/files/sntp.rc
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 command="/usr/bin/sntp"
 
diff --git a/net-misc/ofono/files/ofono.initd b/net-misc/ofono/files/ofono.initd
index e1f1906d6f2d..7500edc2291f 100644
--- a/net-misc/ofono/files/ofono.initd
+++ b/net-misc/ofono/files/ofono.initd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Purpose License v2
-# $Id$
 
 depend() {
    need dbus
diff --git a/net-misc/oidentd/files/oidentd-2.0.7-init b/net-misc/oidentd/files/oidentd-2.0.7-init
index f86e2d4743bf..5b1ae44089d0 100644
--- a/net-misc/oidentd/files/oidentd-2.0.7-init
+++ b/net-misc/oidentd/files/oidentd-2.0.7-init
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
     need net
diff --git a/net-misc/omniORB/files/omniNames b/net-misc/omniORB/files/omniNames
index 860cedfc9085..e2e7851fd3a2 100644
--- a/net-misc/omniORB/files/omniNames
+++ b/net-misc/omniORB/files/omniNames
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	need net
diff --git a/net-misc/openconnect/files/openconnect.init.in b/net-misc/openconnect/files/openconnect.init.in
index d88b2a3c67a6..c4497956d8a3 100644
--- a/net-misc/openconnect/files/openconnect.init.in
+++ b/net-misc/openconnect/files/openconnect.init.in
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 VPN="${RC_SVCNAME#*.}"
 VPNLOG="/var/log/openconnect/${VPN}"
diff --git a/net-misc/openconnect/files/openconnect.init.in-r4 b/net-misc/openconnect/files/openconnect.init.in-r4
index f1af83eae192..040edc76f637 100644
--- a/net-misc/openconnect/files/openconnect.init.in-r4
+++ b/net-misc/openconnect/files/openconnect.init.in-r4
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 VPN="${RC_SVCNAME#*.}"
 VPNDIR="/etc/openconnect/${VPN}"
diff --git a/net-misc/openntpd/files/openntpd.init.d-20080406-r6 b/net-misc/openntpd/files/openntpd.init.d-20080406-r6
index 226a9a7e0f9c..193483f1c17e 100644
--- a/net-misc/openntpd/files/openntpd.init.d-20080406-r6
+++ b/net-misc/openntpd/files/openntpd.init.d-20080406-r6
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 name="OpenNTPD"
 command="/usr/sbin/ntpd"
diff --git a/net-misc/openrdate/files/openrdate-confd b/net-misc/openrdate/files/openrdate-confd
index 0760ecb43ba8..fb4ee4caa746 100644
--- a/net-misc/openrdate/files/openrdate-confd
+++ b/net-misc/openrdate/files/openrdate-confd
@@ -1,6 +1,5 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 # the NTP or RFC868/time server to get the date from
 RDATE_SERVER="pool.ntp.org"
diff --git a/net-misc/openrdate/files/openrdate-initd b/net-misc/openrdate/files/openrdate-initd
index 15d40be0fe9e..92210cce3c89 100644
--- a/net-misc/openrdate/files/openrdate-initd
+++ b/net-misc/openrdate/files/openrdate-initd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	before cron
diff --git a/net-misc/openssh/files/sshd.rc6.4 b/net-misc/openssh/files/sshd.rc6.4
index a361401755cc..5e301420361f 100644
--- a/net-misc/openssh/files/sshd.rc6.4
+++ b/net-misc/openssh/files/sshd.rc6.4
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 extra_commands="checkconfig"
 extra_started_commands="reload"
diff --git a/net-misc/openvswitch/files/ovs-controller-r1 b/net-misc/openvswitch/files/ovs-controller-r1
index e6e825964027..b48d29757477 100644
--- a/net-misc/openvswitch/files/ovs-controller-r1
+++ b/net-misc/openvswitch/files/ovs-controller-r1
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 description="Open vSwitch OpenFlow controller"
 
diff --git a/net-misc/openvswitch/files/ovs-vswitchd-r1 b/net-misc/openvswitch/files/ovs-vswitchd-r1
index edb34780b030..bc5602a60030 100644
--- a/net-misc/openvswitch/files/ovs-vswitchd-r1
+++ b/net-misc/openvswitch/files/ovs-vswitchd-r1
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 description="Open vSwitch virtual switch"
 
diff --git a/net-misc/openvswitch/files/ovsdb-server-r1 b/net-misc/openvswitch/files/ovsdb-server-r1
index 352dcb6a6458..f7360adbb4c8 100644
--- a/net-misc/openvswitch/files/ovsdb-server-r1
+++ b/net-misc/openvswitch/files/ovsdb-server-r1
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 description="Open vSwitch database server"
 
diff --git a/net-misc/orbited/files/orbited.init b/net-misc/orbited/files/orbited.init
index ce45f0c1a3fd..09cce6b454ef 100644
--- a/net-misc/orbited/files/orbited.init
+++ b/net-misc/orbited/files/orbited.init
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	need net
diff --git a/net-misc/peervpn/files/peervpn.initd b/net-misc/peervpn/files/peervpn.initd
index d90043f0de97..b02458ae16ca 100644
--- a/net-misc/peervpn/files/peervpn.initd
+++ b/net-misc/peervpn/files/peervpn.initd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 description="peervpn server"
 pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
diff --git a/net-misc/portfwd/files/portfwd.init b/net-misc/portfwd/files/portfwd.init
index 81452bac5b99..aa4aabd70546 100644
--- a/net-misc/portfwd/files/portfwd.init
+++ b/net-misc/portfwd/files/portfwd.init
@@ -1,5 +1,4 @@
 #!/sbin/openrc-run
-# $Id$
 
 depend() {
 	need net
diff --git a/net-misc/ps3mediaserver/files/ps3mediaserver.confd b/net-misc/ps3mediaserver/files/ps3mediaserver.confd
index 7f12ebcf63b9..609393750f4d 100644
--- a/net-misc/ps3mediaserver/files/ps3mediaserver.confd
+++ b/net-misc/ps3mediaserver/files/ps3mediaserver.confd
@@ -1,6 +1,5 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 PMS_USER=
 PMS_GROUP=
diff --git a/net-misc/ps3mediaserver/files/ps3mediaserver.initd b/net-misc/ps3mediaserver/files/ps3mediaserver.initd
index 4067c85df4d9..59df7b7b4503 100644
--- a/net-misc/ps3mediaserver/files/ps3mediaserver.initd
+++ b/net-misc/ps3mediaserver/files/ps3mediaserver.initd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 command="/usr/bin/ps3mediaserver"
 command_args="console"
diff --git a/net-misc/ptpd/files/ptpd2.rc b/net-misc/ptpd/files/ptpd2.rc
index e8cc217aa749..bf8e14332298 100644
--- a/net-misc/ptpd/files/ptpd2.rc
+++ b/net-misc/ptpd/files/ptpd2.rc
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 PTPD_CONFIGFILE=${PTPD_CONFIGFILE:-/etc/${RC_SVCNAME}.conf}
 PTPD_STATEFILE_DIR=${PTPD_STATEFILE_DIR:-/var/run}
diff --git a/net-misc/quagga/files/quagga-services.init.3 b/net-misc/quagga/files/quagga-services.init.3
index 845ecfe3327e..e613b26abb03 100644
--- a/net-misc/quagga/files/quagga-services.init.3
+++ b/net-misc/quagga/files/quagga-services.init.3
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 : ${CFGFILE:=/etc/quagga/${SVCNAME}.conf}
 
diff --git a/net-misc/rabbitmq-server/files/rabbitmq-server.init-r3 b/net-misc/rabbitmq-server/files/rabbitmq-server.init-r3
index 0a9aaf1adebe..fb7c194aa94f 100644
--- a/net-misc/rabbitmq-server/files/rabbitmq-server.init-r3
+++ b/net-misc/rabbitmq-server/files/rabbitmq-server.init-r3
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	need net
diff --git a/net-misc/radvd/files/radvd-1.9.1.init b/net-misc/radvd/files/radvd-1.9.1.init
index 099bd92b7c4f..cea880730008 100644
--- a/net-misc/radvd/files/radvd-1.9.1.init
+++ b/net-misc/radvd/files/radvd-1.9.1.init
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 CONFIGFILE=/etc/radvd.conf
 PIDFILE=/var/run/radvd/radvd.pid
diff --git a/net-misc/radvd/files/radvd-2.15.init b/net-misc/radvd/files/radvd-2.15.init
index 1603d5d0aeb2..2c96cca422dd 100644
--- a/net-misc/radvd/files/radvd-2.15.init
+++ b/net-misc/radvd/files/radvd-2.15.init
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 CONFIGFILE=/etc/radvd.conf
 PIDFILE=/run/radvd/radvd.pid
diff --git a/net-misc/radvd/files/radvd.conf b/net-misc/radvd/files/radvd.conf
index d1a95b8dea20..6ba8f65b12a0 100644
--- a/net-misc/radvd/files/radvd.conf
+++ b/net-misc/radvd/files/radvd.conf
@@ -1,6 +1,5 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 # Extra options to pass to radvd
 OPTIONS=""
diff --git a/net-misc/rdate/files/rdate-confd b/net-misc/rdate/files/rdate-confd
index fba3d73ba6af..0dd38cb6ecd5 100644
--- a/net-misc/rdate/files/rdate-confd
+++ b/net-misc/rdate/files/rdate-confd
@@ -1,6 +1,5 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 # the NTP server to get the date from
 RDATE_SERVER="pool.ntp.org"
diff --git a/net-misc/rdate/files/rdate-initd-1.4-r3 b/net-misc/rdate/files/rdate-initd-1.4-r3
index 937d9d8979ec..25ac67dc5236 100644
--- a/net-misc/rdate/files/rdate-initd-1.4-r3
+++ b/net-misc/rdate/files/rdate-initd-1.4-r3
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	before cron
diff --git a/net-misc/rinetd/files/rinetd.rc b/net-misc/rinetd/files/rinetd.rc
index 88807c95c7bc..abdb04755702 100644
--- a/net-misc/rinetd/files/rinetd.rc
+++ b/net-misc/rinetd/files/rinetd.rc
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	use net
diff --git a/net-misc/ris-linux/files/binlsrv.initd b/net-misc/ris-linux/files/binlsrv.initd
index f6d99e09f4cd..f247a39db4ed 100644
--- a/net-misc/ris-linux/files/binlsrv.initd
+++ b/net-misc/ris-linux/files/binlsrv.initd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	need net
diff --git a/net-misc/rsync/files/rsyncd.init.d-r1 b/net-misc/rsync/files/rsyncd.init.d-r1
index cbbe62074161..243e107b5407 100644
--- a/net-misc/rsync/files/rsyncd.init.d-r1
+++ b/net-misc/rsync/files/rsyncd.init.d-r1
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 command="/usr/bin/rsync"
 command_args="--daemon ${RSYNC_OPTS}"
diff --git a/net-misc/rwbs/files/rwbs.rc b/net-misc/rwbs/files/rwbs.rc
index 58bdd20f43e6..280e2d258a24 100644
--- a/net-misc/rwbs/files/rwbs.rc
+++ b/net-misc/rwbs/files/rwbs.rc
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	need net
diff --git a/net-misc/samplicator/files/samplicator.initd b/net-misc/samplicator/files/samplicator.initd
index 675d1471da62..0260192c3ee1 100644
--- a/net-misc/samplicator/files/samplicator.initd
+++ b/net-misc/samplicator/files/samplicator.initd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 NAME=${SVCNAME##*.}
 if [ -n "${NAME}" -a "${SVCNAME}" != "samplicator" ]; then
diff --git a/net-misc/ser/files/ser.confd b/net-misc/ser/files/ser.confd
index 73648294ed9c..62d2cd2291f4 100644
--- a/net-misc/ser/files/ser.confd
+++ b/net-misc/ser/files/ser.confd
@@ -1,6 +1,5 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 # Additional options to start SER with
 #
diff --git a/net-misc/ser/files/ser.rc6 b/net-misc/ser/files/ser.rc6
index 61c0a3385d25..da2cb54290f7 100644
--- a/net-misc/ser/files/ser.rc6
+++ b/net-misc/ser/files/ser.rc6
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 2002 Frauenhofer Gesellschaft FOKUS, Germany.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Id$
 
 depend() {
 	need net
diff --git a/net-misc/ser2net/files/ser2net.initd b/net-misc/ser2net/files/ser2net.initd
index 79ae57eb2864..3ce489bd1ff1 100644
--- a/net-misc/ser2net/files/ser2net.initd
+++ b/net-misc/ser2net/files/ser2net.initd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 description="Serial to network proxy (${RC_SVCNAME#*.})"
 pidfile="/var/run/${RC_SVCNAME}.pid"
diff --git a/net-misc/siproxd/files/siproxd.rc6 b/net-misc/siproxd/files/siproxd.rc6
index 63ffe152cafb..0ec75e159f79 100644
--- a/net-misc/siproxd/files/siproxd.rc6
+++ b/net-misc/siproxd/files/siproxd.rc6
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	need net
diff --git a/net-misc/siproxd/files/siproxd.rc8 b/net-misc/siproxd/files/siproxd.rc8
index 146fefbc81ad..017783025f1f 100644
--- a/net-misc/siproxd/files/siproxd.rc8
+++ b/net-misc/siproxd/files/siproxd.rc8
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 config_file="/etc/siproxd.conf"
 
diff --git a/net-misc/sobby/files/sobby-conf-0.4.7 b/net-misc/sobby/files/sobby-conf-0.4.7
index b60192c99616..0dced5a6df41 100644
--- a/net-misc/sobby/files/sobby-conf-0.4.7
+++ b/net-misc/sobby/files/sobby-conf-0.4.7
@@ -1,6 +1,5 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2         
-# $Id$
 
 SOBBY_OPTS="-c /etc/sobby/sobby.xml"
 SOBBY_USER="sobby"
diff --git a/net-misc/sobby/files/sobby-init-0.4.7 b/net-misc/sobby/files/sobby-init-0.4.7
index cc314936e427..2fc00631147f 100644
--- a/net-misc/sobby/files/sobby-init-0.4.7
+++ b/net-misc/sobby/files/sobby-init-0.4.7
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2         
-# $Id$
 
 depend() {
 	use avahi
diff --git a/net-misc/spiped/files/spiped.initd b/net-misc/spiped/files/spiped.initd
index 8b9bbfc5678e..0f33ccfa9cdb 100644
--- a/net-misc/spiped/files/spiped.initd
+++ b/net-misc/spiped/files/spiped.initd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 KEYFILE=${KEYFILE:="/etc/spiped/keyfile"}
 SPIPED_USER=${SPIPED_USER:="nobody"}
diff --git a/net-misc/spread/files/spread.init.d b/net-misc/spread/files/spread.init.d
index 9d551840a344..c041444e65a9 100644
--- a/net-misc/spread/files/spread.init.d
+++ b/net-misc/spread/files/spread.init.d
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	need net
diff --git a/net-misc/sslh/files/sslh.init.d-2 b/net-misc/sslh/files/sslh.init.d-2
index b75e96f2a371..7e4b2cb578a4 100644
--- a/net-misc/sslh/files/sslh.init.d-2
+++ b/net-misc/sslh/files/sslh.init.d-2
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 start() {
 	ebegin "Starting ${SVCNAME}"
diff --git a/net-misc/stunnel/files/stunnel b/net-misc/stunnel/files/stunnel
index 328287665cec..13887f911332 100644
--- a/net-misc/stunnel/files/stunnel
+++ b/net-misc/stunnel/files/stunnel
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 SERVICENAME=${SVCNAME#*.}
 SERVICENAME=${SERVICENAME:-stunnel}
diff --git a/net-misc/stunnel/files/stunnel-r1 b/net-misc/stunnel/files/stunnel-r1
index e7eee32c2f15..a73527ed57e7 100644
--- a/net-misc/stunnel/files/stunnel-r1
+++ b/net-misc/stunnel/files/stunnel-r1
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 extra_started_commands="reload"
 SERVICENAME=${SVCNAME#*.}
diff --git a/net-misc/stuntman/files/stuntman.initd b/net-misc/stuntman/files/stuntman.initd
index 25950b09f03a..d0730a017031 100644
--- a/net-misc/stuntman/files/stuntman.initd
+++ b/net-misc/stuntman/files/stuntman.initd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 pidfile="/run/stunserver.pid"
 command="/usr/sbin/stunserver"
diff --git a/net-misc/teamviewer/files/teamviewerd.init b/net-misc/teamviewer/files/teamviewerd.init
index a8966dc14a4c..3ca37da3ebc4 100644
--- a/net-misc/teamviewer/files/teamviewerd.init
+++ b/net-misc/teamviewer/files/teamviewerd.init
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 command=/opt/teamviewer@TVV@/tv_bin/teamviewerd
 command_args=-d
diff --git a/net-misc/teamviewer/files/teamviewerd9.init b/net-misc/teamviewer/files/teamviewerd9.init
index 80e881eb887c..3a625c95d3b7 100644
--- a/net-misc/teamviewer/files/teamviewerd9.init
+++ b/net-misc/teamviewer/files/teamviewerd9.init
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 description="daemon for TeamViewer"
 
diff --git a/net-misc/termpkg/files/termnetd.initd b/net-misc/termpkg/files/termnetd.initd
index 010c5c351c0d..dfc422be6671 100644
--- a/net-misc/termpkg/files/termnetd.initd
+++ b/net-misc/termpkg/files/termnetd.initd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 description="Terminal Server daemon (${RC_SVCNAME#*.})"
 command="/usr/sbin/termnetd"
diff --git a/net-misc/termpkg/files/ttyd.initd b/net-misc/termpkg/files/ttyd.initd
index 31930531a1e2..971789047a3d 100644
--- a/net-misc/termpkg/files/ttyd.initd
+++ b/net-misc/termpkg/files/ttyd.initd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 description="Remote Modem Utility (${RC_SVCNAME#*.})"
 command="/usr/sbin/ttyd"
diff --git a/net-misc/tigervnc/files/tigervnc.initd b/net-misc/tigervnc/files/tigervnc.initd
index f1d3a402e55c..06a154257e6f 100644
--- a/net-misc/tigervnc/files/tigervnc.initd
+++ b/net-misc/tigervnc/files/tigervnc.initd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Id$
 
 depend() {
 	need net
diff --git a/net-misc/tinc/files/tincd-r1 b/net-misc/tinc/files/tincd-r1
index 15d863aa6801..ecfb24a6a64f 100644
--- a/net-misc/tinc/files/tincd-r1
+++ b/net-misc/tinc/files/tincd-r1
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 extra_started_commands="reload"
 
diff --git a/net-misc/tinc/files/tincd-r2 b/net-misc/tinc/files/tincd-r2
index 6e242d17c5d3..55728bec2c78 100644
--- a/net-misc/tinc/files/tincd-r2
+++ b/net-misc/tinc/files/tincd-r2
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 extra_started_commands="reload"
 
diff --git a/net-misc/tlsdate/files/tlsdate.rc b/net-misc/tlsdate/files/tlsdate.rc
index 25ad29e3f0ec..3c5163ac92b5 100644
--- a/net-misc/tlsdate/files/tlsdate.rc
+++ b/net-misc/tlsdate/files/tlsdate.rc
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 description="set time once when started"
 
diff --git a/net-misc/tlsdate/files/tlsdated.rc b/net-misc/tlsdate/files/tlsdated.rc
index 8c8152e31b99..d0814c874b4e 100644
--- a/net-misc/tlsdate/files/tlsdated.rc
+++ b/net-misc/tlsdate/files/tlsdated.rc
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 description="start a daemon to continuously set time via a helper"
 
diff --git a/net-misc/tor/files/tor.initd-r8 b/net-misc/tor/files/tor.initd-r8
index ca319134aa4e..de9b66eb555b 100644
--- a/net-misc/tor/files/tor.initd-r8
+++ b/net-misc/tor/files/tor.initd-r8
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 command=/usr/bin/tor
 pidfile=/var/run/tor/tor.pid
diff --git a/net-misc/ucarp/files/ucarp.initd-r1 b/net-misc/ucarp/files/ucarp.initd-r1
index 3367a97566bd..14d84dc01ea4 100644
--- a/net-misc/ucarp/files/ucarp.initd-r1
+++ b/net-misc/ucarp/files/ucarp.initd-r1
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 description="UCARP is a portable implementation of the CARP protocol"
 description_logstatus="Logs the status of ${SVCNAME} to syslog"
diff --git a/net-misc/ucarp/files/ucarp.initd-r2 b/net-misc/ucarp/files/ucarp.initd-r2
index a9747e9fd3da..cc6537e1226e 100644
--- a/net-misc/ucarp/files/ucarp.initd-r2
+++ b/net-misc/ucarp/files/ucarp.initd-r2
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 description="UCARP is a portable implementation of the CARP protocol"
 description_logstatus="Logs the status of ${SVCNAME} to syslog"
diff --git a/net-misc/udpxy/files/udpxy.initd b/net-misc/udpxy/files/udpxy.initd
index 7a698d8d543c..57d61cc93983 100644
--- a/net-misc/udpxy/files/udpxy.initd
+++ b/net-misc/udpxy/files/udpxy.initd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	need net
diff --git a/net-misc/uftp/files/uftpd.init b/net-misc/uftp/files/uftpd.init
index 7f4c7abc344c..38a6ea3779a4 100644
--- a/net-misc/uftp/files/uftpd.init
+++ b/net-misc/uftp/files/uftpd.init
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 PROGRAM=/usr/sbin/uftpd
 PIDFILE=/var/run/uftpd.pid
diff --git a/net-misc/uftp/files/uftpproxyd.init b/net-misc/uftp/files/uftpproxyd.init
index 428ba6176b8b..a4b1107d9d0e 100644
--- a/net-misc/uftp/files/uftpproxyd.init
+++ b/net-misc/uftp/files/uftpproxyd.init
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 PROGRAM=/usr/sbin/uftpproxyd
 PIDFILE=/var/run/uftpproxyd.pid
diff --git a/net-misc/utelnetd/files/utelnetd.initd b/net-misc/utelnetd/files/utelnetd.initd
index 3e84801be844..35bea850d64f 100644
--- a/net-misc/utelnetd/files/utelnetd.initd
+++ b/net-misc/utelnetd/files/utelnetd.initd
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 start() {
 	ebegin "Starting utelnetd"
diff --git a/net-misc/vde/files/vde.init b/net-misc/vde/files/vde.init
index 8b2419d57050..e132d51fad36 100644
--- a/net-misc/vde/files/vde.init
+++ b/net-misc/vde/files/vde.init
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	after net.${VDE_TAP}
diff --git a/net-misc/vpnc/files/vpnc-3.init b/net-misc/vpnc/files/vpnc-3.init
index be0aa0fe6b18..f76538f1630e 100644
--- a/net-misc/vpnc/files/vpnc-3.init
+++ b/net-misc/vpnc/files/vpnc-3.init
@@ -2,7 +2,6 @@
 
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 VPNDIR="/etc/vpnc"
 VPN="${SVCNAME#*.}"
diff --git a/net-misc/vtun/files/vtun.rc b/net-misc/vtun/files/vtun.rc
index 03f445892d1b..7ef322985043 100644
--- a/net-misc/vtun/files/vtun.rc
+++ b/net-misc/vtun/files/vtun.rc
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 depend() {
 	need net
diff --git a/net-misc/x2goserver/files/x2goserver.init b/net-misc/x2goserver/files/x2goserver.init
index cb394f513c8d..29da1c81e96f 100644
--- a/net-misc/x2goserver/files/x2goserver.init
+++ b/net-misc/x2goserver/files/x2goserver.init
@@ -1,7 +1,6 @@
 #!/sbin/openrc-run
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 DAEMON=/usr/sbin/x2gocleansessions
 PIDFILE=/run/x2goserver.pid