summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2017-02-28 11:47:27 -0800
committerRobin H. Johnson <robbat2@gentoo.org>2017-02-28 11:50:50 -0800
commit61b861acd7b49083dab687e133f30f3331cb7480 (patch)
tree8a7f8399749ed165000187dad48ad8ac4b831465 /sys-cluster
parentkde-apps/kcharselect: Add missing DEPEND (diff)
downloadgentoo-61b861acd7b49083dab687e133f30f3331cb7480.tar.gz
gentoo-61b861acd7b49083dab687e133f30f3331cb7480.tar.bz2
gentoo-61b861acd7b49083dab687e133f30f3331cb7480.zip
Drop $Id$ per council decision in bug #611234.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/ampi/ampi-0_pre20140616.ebuild1
-rw-r--r--sys-cluster/c3/c3-4.0.1.ebuild1
-rw-r--r--sys-cluster/ccs/ccs-2.03.09.ebuild1
-rw-r--r--sys-cluster/ceph/ceph-0.94.9.ebuild1
-rw-r--r--sys-cluster/ceph/ceph-10.2.3-r2.ebuild1
-rw-r--r--sys-cluster/ceph/ceph-10.2.5-r1.ebuild1
-rw-r--r--sys-cluster/ceph/ceph-10.2.5-r3.ebuild1
-rw-r--r--sys-cluster/ceph/ceph-9.2.1-r2.ebuild1
-rw-r--r--sys-cluster/ceph/ceph-9999.ebuild1
-rw-r--r--sys-cluster/charm/charm-6.5.1-r1.ebuild1
-rw-r--r--sys-cluster/charm/charm-6.5.1-r2.ebuild1
-rw-r--r--sys-cluster/charm/charm-6.5.1-r3.ebuild1
-rw-r--r--sys-cluster/charm/charm-6.6.0-r1.ebuild1
-rw-r--r--sys-cluster/charm/charm-6.6.0.ebuild1
-rw-r--r--sys-cluster/charm/charm-6.6.1.ebuild1
-rw-r--r--sys-cluster/charm/charm-6.7.1.ebuild1
-rw-r--r--sys-cluster/charmdebug/charmdebug-6.2.0-r1.ebuild1
-rw-r--r--sys-cluster/cinder/cinder-2016.1.9999.ebuild1
-rw-r--r--sys-cluster/cinder/cinder-2016.2.9999.ebuild1
-rw-r--r--sys-cluster/cinder/cinder-8.1.1.ebuild1
-rw-r--r--sys-cluster/cinder/cinder-9.1.2.ebuild1
-rw-r--r--sys-cluster/classads/classads-1.0.10.ebuild1
-rw-r--r--sys-cluster/cluster-glue/cluster-glue-1.0.10.ebuild1
-rw-r--r--sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild1
-rw-r--r--sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild1
-rw-r--r--sys-cluster/cluster-glue/cluster-glue-1.0.9-r1.ebuild1
-rw-r--r--sys-cluster/cman-lib/cman-lib-2.03.09-r1.ebuild1
-rw-r--r--sys-cluster/cman-lib/cman-lib-2.03.09.ebuild1
-rw-r--r--sys-cluster/cman/cman-3.1.5-r1.ebuild1
-rw-r--r--sys-cluster/cman/cman-3.1.5.ebuild1
-rw-r--r--sys-cluster/cman/cman-3.2.0.ebuild1
-rw-r--r--sys-cluster/corosync/corosync-1.3.0.ebuild1
-rw-r--r--sys-cluster/corosync/corosync-1.3.5.ebuild1
-rw-r--r--sys-cluster/corosync/corosync-1.4.7.ebuild1
-rw-r--r--sys-cluster/corosync/corosync-2.3.3.ebuild1
-rw-r--r--sys-cluster/corosync/corosync-2.3.4-r1.ebuild1
-rw-r--r--sys-cluster/corosync/corosync-2.3.5.ebuild1
-rw-r--r--sys-cluster/crmsh/crmsh-2.1.1.ebuild1
-rw-r--r--sys-cluster/csync2/csync2-2.0.ebuild1
-rw-r--r--sys-cluster/dlm-lib/dlm-lib-2.03.09.ebuild1
-rw-r--r--sys-cluster/dlm-lib/dlm-lib-2.03.11.ebuild1
-rw-r--r--sys-cluster/dlm/dlm-2.03.09.ebuild1
-rw-r--r--sys-cluster/dlm/dlm-2.03.11.ebuild1
-rw-r--r--sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild1
-rw-r--r--sys-cluster/drbd-kernel/drbd-kernel-8.3.6.ebuild1
-rw-r--r--sys-cluster/drbd-kernel/drbd-kernel-8.3.8.1.ebuild1
-rw-r--r--sys-cluster/drbd-utils/drbd-utils-8.9.3.ebuild1
-rw-r--r--sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild1
-rw-r--r--sys-cluster/drbd-utils/drbd-utils-8.9.6.ebuild1
-rw-r--r--sys-cluster/drbd/drbd-8.0.16.ebuild1
-rw-r--r--sys-cluster/drbd/drbd-8.3.10.ebuild1
-rw-r--r--sys-cluster/drbd/drbd-8.3.11-r1.ebuild1
-rw-r--r--sys-cluster/drbd/drbd-8.3.12.ebuild1
-rw-r--r--sys-cluster/drbd/drbd-8.3.13.ebuild1
-rw-r--r--sys-cluster/drbd/drbd-8.3.15.ebuild1
-rw-r--r--sys-cluster/drbd/drbd-8.3.7.ebuild1
-rw-r--r--sys-cluster/drbd/drbd-8.3.8.1-r1.ebuild1
-rw-r--r--sys-cluster/drbd/drbd-8.3.8.1.ebuild1
-rw-r--r--sys-cluster/drbd/drbd-8.4.0.ebuild1
-rw-r--r--sys-cluster/drbd/drbd-8.4.2.ebuild1
-rw-r--r--sys-cluster/drbd/drbd-8.4.3-r1.ebuild1
-rw-r--r--sys-cluster/drbd/drbd-8.4.3-r2.ebuild1
-rw-r--r--sys-cluster/drbd/drbd-8.4.3.ebuild1
-rw-r--r--sys-cluster/fake/fake-1.1.10.ebuild1
-rw-r--r--sys-cluster/feedbackd-agent/feedbackd-agent-0.4.ebuild1
-rw-r--r--sys-cluster/feedbackd-master/feedbackd-master-0.4.ebuild1
-rw-r--r--sys-cluster/fence-agents/fence-agents-3.1.5-r1.ebuild1
-rw-r--r--sys-cluster/fence-agents/fence-agents-3.1.5-r2.ebuild1
-rw-r--r--sys-cluster/galera/galera-25.3.15.ebuild1
-rw-r--r--sys-cluster/galera/galera-25.3.17.ebuild1
-rw-r--r--sys-cluster/galera/galera-25.3.19.ebuild1
-rw-r--r--sys-cluster/ganglia-web/ganglia-web-3.5.10-r1.ebuild1
-rw-r--r--sys-cluster/ganglia-web/ganglia-web-3.5.8-r1.ebuild1
-rw-r--r--sys-cluster/ganglia/ganglia-3.7.1-r1.ebuild1
-rw-r--r--sys-cluster/gasnet/gasnet-1.26.4-r1.ebuild1
-rw-r--r--sys-cluster/gasnet/gasnet-1.26.4.ebuild1
-rw-r--r--sys-cluster/gasnet/gasnet-1.28.0.ebuild1
-rw-r--r--sys-cluster/gearmand/gearmand-0.34-r1.ebuild1
-rw-r--r--sys-cluster/glusterfs/glusterfs-3.5.4.ebuild1
-rw-r--r--sys-cluster/glusterfs/glusterfs-3.6.5.ebuild1
-rw-r--r--sys-cluster/glusterfs/glusterfs-3.7.4.ebuild1
-rw-r--r--sys-cluster/glusterfs/glusterfs-3.8.6.ebuild1
-rw-r--r--sys-cluster/heartbeat/heartbeat-3.0.5-r3.ebuild1
-rw-r--r--sys-cluster/heat/heat-2016.2.9999.ebuild1
-rw-r--r--sys-cluster/heat/heat-2017.1.9999.ebuild1
-rw-r--r--sys-cluster/heat/heat-7.0.2.ebuild1
-rw-r--r--sys-cluster/heat/heat-8.0.0.ebuild1
-rw-r--r--sys-cluster/hpl/hpl-2.0-r3.ebuild1
-rw-r--r--sys-cluster/hpx/hpx-0.9.10.ebuild1
-rw-r--r--sys-cluster/hpx/hpx-0.9.8.ebuild1
-rw-r--r--sys-cluster/hpx/hpx-0.9.9.ebuild1
-rw-r--r--sys-cluster/hpx/hpx-0.9.99.ebuild1
-rw-r--r--sys-cluster/hpx/hpx-9999.ebuild1
-rw-r--r--sys-cluster/ipvsadm/ipvsadm-1.21-r1.ebuild1
-rw-r--r--sys-cluster/ipvsadm/ipvsadm-1.24.ebuild1
-rw-r--r--sys-cluster/ipvsadm/ipvsadm-1.26-r2.ebuild1
-rw-r--r--sys-cluster/ipvsadm/ipvsadm-1.27-r1.ebuild1
-rw-r--r--sys-cluster/ipvsadm/ipvsadm-1.28.ebuild1
-rw-r--r--sys-cluster/keepalived/keepalived-1.2.15.ebuild1
-rw-r--r--sys-cluster/keepalived/keepalived-1.2.19.ebuild1
-rw-r--r--sys-cluster/keepalived/keepalived-1.2.2-r4.ebuild1
-rw-r--r--sys-cluster/keepalived/keepalived-1.2.22.ebuild1
-rw-r--r--sys-cluster/keepalived/keepalived-1.2.23.ebuild1
-rw-r--r--sys-cluster/keepalived/keepalived-1.2.24.ebuild1
-rw-r--r--sys-cluster/knem/knem-1.1.1.ebuild1
-rw-r--r--sys-cluster/knem/knem-9999.ebuild1
-rw-r--r--sys-cluster/kubectl/kubectl-1.5.2.ebuild1
-rw-r--r--sys-cluster/kubectl/kubectl-1.5.3.ebuild1
-rw-r--r--sys-cluster/legion/legion-16.08.0-r1.ebuild1
-rw-r--r--sys-cluster/legion/legion-16.10.0.ebuild1
-rw-r--r--sys-cluster/libccs-perl/libccs-perl-3.1.5.ebuild1
-rw-r--r--sys-cluster/libccs/libccs-3.1.5.ebuild1
-rw-r--r--sys-cluster/libccs/libccs-3.2.0.ebuild1
-rw-r--r--sys-cluster/libcircle/libcircle-0.2.0_rc1.ebuild1
-rw-r--r--sys-cluster/libcircle/libcircle-0.2.1_rc1.ebuild1
-rw-r--r--sys-cluster/libcman/libcman-3.1.5.ebuild1
-rw-r--r--sys-cluster/libcman/libcman-3.2.0.ebuild1
-rw-r--r--sys-cluster/libdlm/libdlm-3.1.5.ebuild1
-rw-r--r--sys-cluster/libdlm/libdlm-3.2.0.ebuild1
-rw-r--r--sys-cluster/libfence/libfence-3.1.5.ebuild1
-rw-r--r--sys-cluster/libfence/libfence-3.2.0.ebuild1
-rw-r--r--sys-cluster/liblogthread/liblogthread-3.1.5.ebuild1
-rw-r--r--sys-cluster/liblogthread/liblogthread-3.2.0.ebuild1
-rw-r--r--sys-cluster/libqb/libqb-0.13.0.ebuild1
-rw-r--r--sys-cluster/libqb/libqb-0.14.3.ebuild1
-rw-r--r--sys-cluster/libqb/libqb-0.14.4.ebuild1
-rw-r--r--sys-cluster/libqb/libqb-0.17.0.ebuild1
-rw-r--r--sys-cluster/libqb/libqb-0.17.1.ebuild1
-rw-r--r--sys-cluster/libqb/libqb-0.17.2.ebuild1
-rw-r--r--sys-cluster/libquo/libquo-1.2.2.ebuild1
-rw-r--r--sys-cluster/libquo/libquo-1.2.3.ebuild1
-rw-r--r--sys-cluster/libquo/libquo-1.2.4-r1.ebuild1
-rw-r--r--sys-cluster/libquo/libquo-1.2.9.ebuild1
-rw-r--r--sys-cluster/libquo/libquo-1.2.ebuild1
-rw-r--r--sys-cluster/libquo/libquo-9999.ebuild1
-rw-r--r--sys-cluster/lspbs/lspbs-1.1-r1.ebuild1
-rw-r--r--sys-cluster/maui/maui-3.3.1-r2.ebuild1
-rw-r--r--sys-cluster/maui/maui-3.3.1-r3.ebuild1
-rw-r--r--sys-cluster/minikube/minikube-0.16.0.ebuild1
-rw-r--r--sys-cluster/moosefs/moosefs-1.6.26-r1.ebuild1
-rw-r--r--sys-cluster/moosefs/moosefs-1.6.27.ebuild1
-rw-r--r--sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild1
-rw-r--r--sys-cluster/mpich/mpich-3.0.4.ebuild1
-rw-r--r--sys-cluster/mpich/mpich-3.1.3.ebuild1
-rw-r--r--sys-cluster/mpich/mpich-3.1.4.ebuild1
-rw-r--r--sys-cluster/mpich/mpich-3.2-r1.ebuild1
-rw-r--r--sys-cluster/mpich/mpich-3.2.ebuild1
-rw-r--r--sys-cluster/mpich2/mpich2-1.5.ebuild1
-rw-r--r--sys-cluster/mvapich2/mvapich2-1.6.ebuild1
-rw-r--r--sys-cluster/native-mpi/native-mpi-0.ebuild1
-rw-r--r--sys-cluster/neutron/neutron-10.0.0.ebuild1
-rw-r--r--sys-cluster/neutron/neutron-2016.1.9999.ebuild1
-rw-r--r--sys-cluster/neutron/neutron-2016.2.9999.ebuild1
-rw-r--r--sys-cluster/neutron/neutron-2017.1.9999.ebuild1
-rw-r--r--sys-cluster/neutron/neutron-8.3.0.ebuild1
-rw-r--r--sys-cluster/neutron/neutron-9.1.1.ebuild1
-rw-r--r--sys-cluster/neutron/neutron-9.2.0.ebuild1
-rw-r--r--sys-cluster/nova/nova-13.1.2.ebuild1
-rw-r--r--sys-cluster/nova/nova-13.1.3.ebuild1
-rw-r--r--sys-cluster/nova/nova-14.0.3.ebuild1
-rw-r--r--sys-cluster/nova/nova-14.0.4.ebuild1
-rw-r--r--sys-cluster/nova/nova-15.0.0.ebuild1
-rw-r--r--sys-cluster/nova/nova-2016.1.9999.ebuild1
-rw-r--r--sys-cluster/nova/nova-2016.2.9999.ebuild1
-rw-r--r--sys-cluster/nova/nova-2017.1.9999.ebuild1
-rw-r--r--sys-cluster/nullmpi/nullmpi-0.7.ebuild1
-rw-r--r--sys-cluster/ocfs/ocfs-1.0.14.ebuild1
-rw-r--r--sys-cluster/onesis/onesis-2.0.2.ebuild1
-rw-r--r--sys-cluster/open-mx/open-mx-1.5.4.ebuild1
-rw-r--r--sys-cluster/openais/openais-1.1.4-r1.ebuild1
-rw-r--r--sys-cluster/openmpi/openmpi-1.10.6.ebuild1
-rw-r--r--sys-cluster/openmpi/openmpi-1.4.3.ebuild1
-rw-r--r--sys-cluster/openmpi/openmpi-1.4.5.ebuild1
-rw-r--r--sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild1
-rw-r--r--sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild1
-rw-r--r--sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild1
-rw-r--r--sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild1
-rw-r--r--sys-cluster/openmpi/openmpi-1.8.8.ebuild1
-rw-r--r--sys-cluster/openmpi/openmpi-2.0.2.ebuild1
-rw-r--r--sys-cluster/openstack-meta/openstack-meta-2016.1.9999.ebuild1
-rw-r--r--sys-cluster/openstack-meta/openstack-meta-2016.2.9999.ebuild1
-rw-r--r--sys-cluster/openstack-meta/openstack-meta-2017.1.9999.ebuild1
-rw-r--r--sys-cluster/osc-mpiexec/osc-mpiexec-0.83.ebuild1
-rw-r--r--sys-cluster/pacemaker/pacemaker-1.1.12-r2.ebuild1
-rw-r--r--sys-cluster/pacemaker/pacemaker-1.1.14.ebuild1
-rw-r--r--sys-cluster/pbs-python/pbs-python-4.3.3-r1.ebuild1
-rw-r--r--sys-cluster/pconsole/pconsole-1.0-r3.ebuild1
-rw-r--r--sys-cluster/ploop/ploop-1.13.2.ebuild1
-rw-r--r--sys-cluster/ploop/ploop-1.14.1.ebuild1
-rw-r--r--sys-cluster/polysh/polysh-0.4-r1.ebuild1
-rw-r--r--sys-cluster/poolmon/poolmon-0.5.ebuild1
-rw-r--r--sys-cluster/projections/projections-6.2.1.ebuild1
-rw-r--r--sys-cluster/resource-agents/resource-agents-3.9.6.ebuild1
-rw-r--r--sys-cluster/rgmanager-agents/rgmanager-agents-3.9.2.ebuild1
-rw-r--r--sys-cluster/rgmanager/rgmanager-2.03.09-r1.ebuild1
-rw-r--r--sys-cluster/rgmanager/rgmanager-2.03.09.ebuild1
-rw-r--r--sys-cluster/rgmanager/rgmanager-3.1.5.ebuild1
-rw-r--r--sys-cluster/sanlock/sanlock-3.4.0-r1.ebuild1
-rw-r--r--sys-cluster/singularity/singularity-2.2.ebuild1
-rw-r--r--sys-cluster/slurm/slurm-16.05.2.ebuild1
-rw-r--r--sys-cluster/swift/swift-2.10.0-r1.ebuild1
-rw-r--r--sys-cluster/swift/swift-2.10.0.ebuild1
-rw-r--r--sys-cluster/swift/swift-2.10.1-r1.ebuild1
-rw-r--r--sys-cluster/swift/swift-2.10.1.ebuild1
-rw-r--r--sys-cluster/swift/swift-2.9.0.ebuild1
-rw-r--r--sys-cluster/sx/sx-2.0.ebuild1
-rw-r--r--sys-cluster/sx/sx-2.1.ebuild1
-rw-r--r--sys-cluster/torque/torque-2.5.13-r1.ebuild1
-rw-r--r--sys-cluster/torque/torque-4.1.7-r1.ebuild1
-rw-r--r--sys-cluster/torque/torque-4.2.9-r5.ebuild1
-rw-r--r--sys-cluster/torque/torque-6.0.1.ebuild1
-rw-r--r--sys-cluster/util-vserver/util-vserver-0.30.216_pre3120.ebuild1
-rw-r--r--sys-cluster/vzctl/vzctl-4.9.4.ebuild1
-rw-r--r--sys-cluster/wulfware/wulfware-2.6.0.ebuild1
-rw-r--r--sys-cluster/zookeepercli/zookeepercli-1.0.10.ebuild1
215 files changed, 0 insertions, 215 deletions
diff --git a/sys-cluster/ampi/ampi-0_pre20140616.ebuild b/sys-cluster/ampi/ampi-0_pre20140616.ebuild
index 8b2486d39074..a461773f29b2 100644
--- a/sys-cluster/ampi/ampi-0_pre20140616.ebuild
+++ b/sys-cluster/ampi/ampi-0_pre20140616.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/c3/c3-4.0.1.ebuild b/sys-cluster/c3/c3-4.0.1.ebuild
index a38f3c5daae6..cb0a59ac791d 100644
--- a/sys-cluster/c3/c3-4.0.1.ebuild
+++ b/sys-cluster/c3/c3-4.0.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="The Cluster Command and Control (C3) tool suite"
HOMEPAGE="http://www.csm.ornl.gov/torc/C3/"
diff --git a/sys-cluster/ccs/ccs-2.03.09.ebuild b/sys-cluster/ccs/ccs-2.03.09.ebuild
index 215aaef8d1f0..2f2b1c7f1307 100644
--- a/sys-cluster/ccs/ccs-2.03.09.ebuild
+++ b/sys-cluster/ccs/ccs-2.03.09.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils versionator
diff --git a/sys-cluster/ceph/ceph-0.94.9.ebuild b/sys-cluster/ceph/ceph-0.94.9.ebuild
index 9c81d29bfc17..01fbc561d1f0 100644
--- a/sys-cluster/ceph/ceph-0.94.9.ebuild
+++ b/sys-cluster/ceph/ceph-0.94.9.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
diff --git a/sys-cluster/ceph/ceph-10.2.3-r2.ebuild b/sys-cluster/ceph/ceph-10.2.3-r2.ebuild
index 1e7491940eb7..9985ce305658 100644
--- a/sys-cluster/ceph/ceph-10.2.3-r2.ebuild
+++ b/sys-cluster/ceph/ceph-10.2.3-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python{2_7,3_{4,5}} )
diff --git a/sys-cluster/ceph/ceph-10.2.5-r1.ebuild b/sys-cluster/ceph/ceph-10.2.5-r1.ebuild
index 1f381009dddc..6d87b25f3629 100644
--- a/sys-cluster/ceph/ceph-10.2.5-r1.ebuild
+++ b/sys-cluster/ceph/ceph-10.2.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python{2_7,3_{4,5}} )
diff --git a/sys-cluster/ceph/ceph-10.2.5-r3.ebuild b/sys-cluster/ceph/ceph-10.2.5-r3.ebuild
index cce9b22dd9e3..b64ba9f1485c 100644
--- a/sys-cluster/ceph/ceph-10.2.5-r3.ebuild
+++ b/sys-cluster/ceph/ceph-10.2.5-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
diff --git a/sys-cluster/ceph/ceph-9.2.1-r2.ebuild b/sys-cluster/ceph/ceph-9.2.1-r2.ebuild
index 6f0e932eed68..e4512579227e 100644
--- a/sys-cluster/ceph/ceph-9.2.1-r2.ebuild
+++ b/sys-cluster/ceph/ceph-9.2.1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
diff --git a/sys-cluster/ceph/ceph-9999.ebuild b/sys-cluster/ceph/ceph-9999.ebuild
index 0cbd9163ea01..4cd90a1a32f9 100644
--- a/sys-cluster/ceph/ceph-9999.ebuild
+++ b/sys-cluster/ceph/ceph-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python{2_7,3_{4,5}} )
diff --git a/sys-cluster/charm/charm-6.5.1-r1.ebuild b/sys-cluster/charm/charm-6.5.1-r1.ebuild
index f16f5aee5282..4f82e15a3eba 100644
--- a/sys-cluster/charm/charm-6.5.1-r1.ebuild
+++ b/sys-cluster/charm/charm-6.5.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/charm/charm-6.5.1-r2.ebuild b/sys-cluster/charm/charm-6.5.1-r2.ebuild
index f800eaedcfc6..b66af8c38b24 100644
--- a/sys-cluster/charm/charm-6.5.1-r2.ebuild
+++ b/sys-cluster/charm/charm-6.5.1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/charm/charm-6.5.1-r3.ebuild b/sys-cluster/charm/charm-6.5.1-r3.ebuild
index af8976f3ff77..5cf9b4f6cb0e 100644
--- a/sys-cluster/charm/charm-6.5.1-r3.ebuild
+++ b/sys-cluster/charm/charm-6.5.1-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/charm/charm-6.6.0-r1.ebuild b/sys-cluster/charm/charm-6.6.0-r1.ebuild
index f2c7beaa0558..a8d9206fc52c 100644
--- a/sys-cluster/charm/charm-6.6.0-r1.ebuild
+++ b/sys-cluster/charm/charm-6.6.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/charm/charm-6.6.0.ebuild b/sys-cluster/charm/charm-6.6.0.ebuild
index 7d180536644a..b6347d0be608 100644
--- a/sys-cluster/charm/charm-6.6.0.ebuild
+++ b/sys-cluster/charm/charm-6.6.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/charm/charm-6.6.1.ebuild b/sys-cluster/charm/charm-6.6.1.ebuild
index 69b3cff3e8ce..fb6f4b9f8e25 100644
--- a/sys-cluster/charm/charm-6.6.1.ebuild
+++ b/sys-cluster/charm/charm-6.6.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/charm/charm-6.7.1.ebuild b/sys-cluster/charm/charm-6.7.1.ebuild
index cacc25bdddba..1f2d2300a744 100644
--- a/sys-cluster/charm/charm-6.7.1.ebuild
+++ b/sys-cluster/charm/charm-6.7.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/charmdebug/charmdebug-6.2.0-r1.ebuild b/sys-cluster/charmdebug/charmdebug-6.2.0-r1.ebuild
index 6a7e80227142..117b686bf762 100644
--- a/sys-cluster/charmdebug/charmdebug-6.2.0-r1.ebuild
+++ b/sys-cluster/charmdebug/charmdebug-6.2.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/cinder/cinder-2016.1.9999.ebuild b/sys-cluster/cinder/cinder-2016.1.9999.ebuild
index 79b9d7568133..f5bd73382472 100644
--- a/sys-cluster/cinder/cinder-2016.1.9999.ebuild
+++ b/sys-cluster/cinder/cinder-2016.1.9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 python3_4 )
diff --git a/sys-cluster/cinder/cinder-2016.2.9999.ebuild b/sys-cluster/cinder/cinder-2016.2.9999.ebuild
index 7332681e78d7..6578492a3858 100644
--- a/sys-cluster/cinder/cinder-2016.2.9999.ebuild
+++ b/sys-cluster/cinder/cinder-2016.2.9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 python3_4 )
diff --git a/sys-cluster/cinder/cinder-8.1.1.ebuild b/sys-cluster/cinder/cinder-8.1.1.ebuild
index cad860847db3..33be7350c04f 100644
--- a/sys-cluster/cinder/cinder-8.1.1.ebuild
+++ b/sys-cluster/cinder/cinder-8.1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 python3_4 )
diff --git a/sys-cluster/cinder/cinder-9.1.2.ebuild b/sys-cluster/cinder/cinder-9.1.2.ebuild
index 506af6a06c7e..a4f99f386431 100644
--- a/sys-cluster/cinder/cinder-9.1.2.ebuild
+++ b/sys-cluster/cinder/cinder-9.1.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 python3_4 )
diff --git a/sys-cluster/classads/classads-1.0.10.ebuild b/sys-cluster/classads/classads-1.0.10.ebuild
index 14968f657b61..72ea735ea47f 100644
--- a/sys-cluster/classads/classads-1.0.10.ebuild
+++ b/sys-cluster/classads/classads-1.0.10.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
inherit autotools-utils
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.10.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.10.ebuild
index 57becbdc3bcc..c1ac97aab2c8 100644
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.10.ebuild
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.10.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild
index 5760c217c337..02c1372177ca 100644
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.11.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild
index b908ffa6f06a..08450183febb 100644
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.12.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/cluster-glue/cluster-glue-1.0.9-r1.ebuild b/sys-cluster/cluster-glue/cluster-glue-1.0.9-r1.ebuild
index d6e247a62e10..8a1b0c3d2428 100644
--- a/sys-cluster/cluster-glue/cluster-glue-1.0.9-r1.ebuild
+++ b/sys-cluster/cluster-glue/cluster-glue-1.0.9-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/cman-lib/cman-lib-2.03.09-r1.ebuild b/sys-cluster/cman-lib/cman-lib-2.03.09-r1.ebuild
index 9f22441fda84..d3e78fcdc3cd 100644
--- a/sys-cluster/cman-lib/cman-lib-2.03.09-r1.ebuild
+++ b/sys-cluster/cman-lib/cman-lib-2.03.09-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils versionator multilib
diff --git a/sys-cluster/cman-lib/cman-lib-2.03.09.ebuild b/sys-cluster/cman-lib/cman-lib-2.03.09.ebuild
index f41806232f69..4468db7584b8 100644
--- a/sys-cluster/cman-lib/cman-lib-2.03.09.ebuild
+++ b/sys-cluster/cman-lib/cman-lib-2.03.09.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils versionator
diff --git a/sys-cluster/cman/cman-3.1.5-r1.ebuild b/sys-cluster/cman/cman-3.1.5-r1.ebuild
index dfb531253432..ebddee75dd57 100644
--- a/sys-cluster/cman/cman-3.1.5-r1.ebuild
+++ b/sys-cluster/cman/cman-3.1.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/cman/cman-3.1.5.ebuild b/sys-cluster/cman/cman-3.1.5.ebuild
index 050c7bf4b55f..f97954b26b3c 100644
--- a/sys-cluster/cman/cman-3.1.5.ebuild
+++ b/sys-cluster/cman/cman-3.1.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/cman/cman-3.2.0.ebuild b/sys-cluster/cman/cman-3.2.0.ebuild
index b6ed94b4eae9..2b59cd78f283 100644
--- a/sys-cluster/cman/cman-3.2.0.ebuild
+++ b/sys-cluster/cman/cman-3.2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/corosync/corosync-1.3.0.ebuild b/sys-cluster/corosync/corosync-1.3.0.ebuild
index 2751b6730632..61ddf86a3279 100644
--- a/sys-cluster/corosync/corosync-1.3.0.ebuild
+++ b/sys-cluster/corosync/corosync-1.3.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=3
diff --git a/sys-cluster/corosync/corosync-1.3.5.ebuild b/sys-cluster/corosync/corosync-1.3.5.ebuild
index 1ed7c8b59844..bde57a61886f 100644
--- a/sys-cluster/corosync/corosync-1.3.5.ebuild
+++ b/sys-cluster/corosync/corosync-1.3.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/corosync/corosync-1.4.7.ebuild b/sys-cluster/corosync/corosync-1.4.7.ebuild
index 837684bb5b94..3f64531dfcff 100644
--- a/sys-cluster/corosync/corosync-1.4.7.ebuild
+++ b/sys-cluster/corosync/corosync-1.4.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/corosync/corosync-2.3.3.ebuild b/sys-cluster/corosync/corosync-2.3.3.ebuild
index c004014489cd..bd5f41d9dfab 100644
--- a/sys-cluster/corosync/corosync-2.3.3.ebuild
+++ b/sys-cluster/corosync/corosync-2.3.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/corosync/corosync-2.3.4-r1.ebuild b/sys-cluster/corosync/corosync-2.3.4-r1.ebuild
index 893ba3273fa6..b203b7438f30 100644
--- a/sys-cluster/corosync/corosync-2.3.4-r1.ebuild
+++ b/sys-cluster/corosync/corosync-2.3.4-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/corosync/corosync-2.3.5.ebuild b/sys-cluster/corosync/corosync-2.3.5.ebuild
index 73063c3da5d1..44016fee9958 100644
--- a/sys-cluster/corosync/corosync-2.3.5.ebuild
+++ b/sys-cluster/corosync/corosync-2.3.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/sys-cluster/crmsh/crmsh-2.1.1.ebuild b/sys-cluster/crmsh/crmsh-2.1.1.ebuild
index 8dda3f2c593f..8f5a4f76184b 100644
--- a/sys-cluster/crmsh/crmsh-2.1.1.ebuild
+++ b/sys-cluster/crmsh/crmsh-2.1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/csync2/csync2-2.0.ebuild b/sys-cluster/csync2/csync2-2.0.ebuild
index 441bf4111df8..93288e0b154a 100644
--- a/sys-cluster/csync2/csync2-2.0.ebuild
+++ b/sys-cluster/csync2/csync2-2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/dlm-lib/dlm-lib-2.03.09.ebuild b/sys-cluster/dlm-lib/dlm-lib-2.03.09.ebuild
index 37e1e5cdfdab..9f7ee3a8e734 100644
--- a/sys-cluster/dlm-lib/dlm-lib-2.03.09.ebuild
+++ b/sys-cluster/dlm-lib/dlm-lib-2.03.09.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils linux-mod multilib versionator
diff --git a/sys-cluster/dlm-lib/dlm-lib-2.03.11.ebuild b/sys-cluster/dlm-lib/dlm-lib-2.03.11.ebuild
index 70c0c9cd53e4..2be0a15458dc 100644
--- a/sys-cluster/dlm-lib/dlm-lib-2.03.11.ebuild
+++ b/sys-cluster/dlm-lib/dlm-lib-2.03.11.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils linux-mod multilib versionator
diff --git a/sys-cluster/dlm/dlm-2.03.09.ebuild b/sys-cluster/dlm/dlm-2.03.09.ebuild
index a4b0c0337208..361d6e30adc6 100644
--- a/sys-cluster/dlm/dlm-2.03.09.ebuild
+++ b/sys-cluster/dlm/dlm-2.03.09.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils linux-mod versionator
diff --git a/sys-cluster/dlm/dlm-2.03.11.ebuild b/sys-cluster/dlm/dlm-2.03.11.ebuild
index 93de7f1df5dd..c4816c691d72 100644
--- a/sys-cluster/dlm/dlm-2.03.11.ebuild
+++ b/sys-cluster/dlm/dlm-2.03.11.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils linux-mod versionator
diff --git a/sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild b/sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild
index 2ad9f5fa86c2..c7940d8f75ab 100644
--- a/sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild
+++ b/sys-cluster/drbd-kernel/drbd-kernel-8.0.16.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils versionator linux-mod
diff --git a/sys-cluster/drbd-kernel/drbd-kernel-8.3.6.ebuild b/sys-cluster/drbd-kernel/drbd-kernel-8.3.6.ebuild
index 6f348cd8c13d..a204c0f4fc5a 100644
--- a/sys-cluster/drbd-kernel/drbd-kernel-8.3.6.ebuild
+++ b/sys-cluster/drbd-kernel/drbd-kernel-8.3.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/sys-cluster/drbd-kernel/drbd-kernel-8.3.8.1.ebuild b/sys-cluster/drbd-kernel/drbd-kernel-8.3.8.1.ebuild
index 7c0ccb89556f..8c2a7bc6cdbb 100644
--- a/sys-cluster/drbd-kernel/drbd-kernel-8.3.8.1.ebuild
+++ b/sys-cluster/drbd-kernel/drbd-kernel-8.3.8.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/sys-cluster/drbd-utils/drbd-utils-8.9.3.ebuild b/sys-cluster/drbd-utils/drbd-utils-8.9.3.ebuild
index 3f5a6e8efb98..7bb3129097f5 100644
--- a/sys-cluster/drbd-utils/drbd-utils-8.9.3.ebuild
+++ b/sys-cluster/drbd-utils/drbd-utils-8.9.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild b/sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild
index c81e9c164038..d66c244db4a2 100644
--- a/sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild
+++ b/sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/drbd-utils/drbd-utils-8.9.6.ebuild b/sys-cluster/drbd-utils/drbd-utils-8.9.6.ebuild
index c81e9c164038..d66c244db4a2 100644
--- a/sys-cluster/drbd-utils/drbd-utils-8.9.6.ebuild
+++ b/sys-cluster/drbd-utils/drbd-utils-8.9.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/drbd/drbd-8.0.16.ebuild b/sys-cluster/drbd/drbd-8.0.16.ebuild
index 519a52eeea5e..bb60780de596 100644
--- a/sys-cluster/drbd/drbd-8.0.16.ebuild
+++ b/sys-cluster/drbd/drbd-8.0.16.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils versionator
diff --git a/sys-cluster/drbd/drbd-8.3.10.ebuild b/sys-cluster/drbd/drbd-8.3.10.ebuild
index 3a60ac67a580..08e388dcc8d3 100644
--- a/sys-cluster/drbd/drbd-8.3.10.ebuild
+++ b/sys-cluster/drbd/drbd-8.3.10.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/sys-cluster/drbd/drbd-8.3.11-r1.ebuild b/sys-cluster/drbd/drbd-8.3.11-r1.ebuild
index e9c994f13708..1b8377d9d570 100644
--- a/sys-cluster/drbd/drbd-8.3.11-r1.ebuild
+++ b/sys-cluster/drbd/drbd-8.3.11-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/drbd/drbd-8.3.12.ebuild b/sys-cluster/drbd/drbd-8.3.12.ebuild
index 0b91cb7a74e3..7a1ba7159d6c 100644
--- a/sys-cluster/drbd/drbd-8.3.12.ebuild
+++ b/sys-cluster/drbd/drbd-8.3.12.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/drbd/drbd-8.3.13.ebuild b/sys-cluster/drbd/drbd-8.3.13.ebuild
index 9a4653ca39e9..368253c78c5e 100644
--- a/sys-cluster/drbd/drbd-8.3.13.ebuild
+++ b/sys-cluster/drbd/drbd-8.3.13.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/drbd/drbd-8.3.15.ebuild b/sys-cluster/drbd/drbd-8.3.15.ebuild
index fb6fab1be8e5..cf347bf1695d 100644
--- a/sys-cluster/drbd/drbd-8.3.15.ebuild
+++ b/sys-cluster/drbd/drbd-8.3.15.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/drbd/drbd-8.3.7.ebuild b/sys-cluster/drbd/drbd-8.3.7.ebuild
index bf8f76e7e585..b04226b05a83 100644
--- a/sys-cluster/drbd/drbd-8.3.7.ebuild
+++ b/sys-cluster/drbd/drbd-8.3.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/sys-cluster/drbd/drbd-8.3.8.1-r1.ebuild b/sys-cluster/drbd/drbd-8.3.8.1-r1.ebuild
index 325af29ec636..2839e4ed603a 100644
--- a/sys-cluster/drbd/drbd-8.3.8.1-r1.ebuild
+++ b/sys-cluster/drbd/drbd-8.3.8.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/sys-cluster/drbd/drbd-8.3.8.1.ebuild b/sys-cluster/drbd/drbd-8.3.8.1.ebuild
index 140455671d65..2006395ddef0 100644
--- a/sys-cluster/drbd/drbd-8.3.8.1.ebuild
+++ b/sys-cluster/drbd/drbd-8.3.8.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/sys-cluster/drbd/drbd-8.4.0.ebuild b/sys-cluster/drbd/drbd-8.4.0.ebuild
index 741ac75b3cde..35f33e36c676 100644
--- a/sys-cluster/drbd/drbd-8.4.0.ebuild
+++ b/sys-cluster/drbd/drbd-8.4.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/drbd/drbd-8.4.2.ebuild b/sys-cluster/drbd/drbd-8.4.2.ebuild
index f21f0d078231..ffe8ffe7c70d 100644
--- a/sys-cluster/drbd/drbd-8.4.2.ebuild
+++ b/sys-cluster/drbd/drbd-8.4.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/drbd/drbd-8.4.3-r1.ebuild b/sys-cluster/drbd/drbd-8.4.3-r1.ebuild
index f80504c35bc2..b192e831b583 100644
--- a/sys-cluster/drbd/drbd-8.4.3-r1.ebuild
+++ b/sys-cluster/drbd/drbd-8.4.3-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/drbd/drbd-8.4.3-r2.ebuild b/sys-cluster/drbd/drbd-8.4.3-r2.ebuild
index 32578deb9328..591e689314c0 100644
--- a/sys-cluster/drbd/drbd-8.4.3-r2.ebuild
+++ b/sys-cluster/drbd/drbd-8.4.3-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit bash-completion-r1 versionator udev
diff --git a/sys-cluster/drbd/drbd-8.4.3.ebuild b/sys-cluster/drbd/drbd-8.4.3.ebuild
index f80504c35bc2..b192e831b583 100644
--- a/sys-cluster/drbd/drbd-8.4.3.ebuild
+++ b/sys-cluster/drbd/drbd-8.4.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/fake/fake-1.1.10.ebuild b/sys-cluster/fake/fake-1.1.10.ebuild
index 1dd42442c94a..d6247089d87c 100644
--- a/sys-cluster/fake/fake-1.1.10.ebuild
+++ b/sys-cluster/fake/fake-1.1.10.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils
diff --git a/sys-cluster/feedbackd-agent/feedbackd-agent-0.4.ebuild b/sys-cluster/feedbackd-agent/feedbackd-agent-0.4.ebuild
index c75714ee74f5..d5947540f5bd 100644
--- a/sys-cluster/feedbackd-agent/feedbackd-agent-0.4.ebuild
+++ b/sys-cluster/feedbackd-agent/feedbackd-agent-0.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils flag-o-matic
diff --git a/sys-cluster/feedbackd-master/feedbackd-master-0.4.ebuild b/sys-cluster/feedbackd-master/feedbackd-master-0.4.ebuild
index 26e0d49c0673..84783e6b42c2 100644
--- a/sys-cluster/feedbackd-master/feedbackd-master-0.4.ebuild
+++ b/sys-cluster/feedbackd-master/feedbackd-master-0.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils
diff --git a/sys-cluster/fence-agents/fence-agents-3.1.5-r1.ebuild b/sys-cluster/fence-agents/fence-agents-3.1.5-r1.ebuild
index 7e624d8d2e00..a1e725a143fa 100644
--- a/sys-cluster/fence-agents/fence-agents-3.1.5-r1.ebuild
+++ b/sys-cluster/fence-agents/fence-agents-3.1.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/fence-agents/fence-agents-3.1.5-r2.ebuild b/sys-cluster/fence-agents/fence-agents-3.1.5-r2.ebuild
index ff9a2d941a99..674b1ea1bb1c 100644
--- a/sys-cluster/fence-agents/fence-agents-3.1.5-r2.ebuild
+++ b/sys-cluster/fence-agents/fence-agents-3.1.5-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/galera/galera-25.3.15.ebuild b/sys-cluster/galera/galera-25.3.15.ebuild
index d8927e10f13b..3308158f8b39 100644
--- a/sys-cluster/galera/galera-25.3.15.ebuild
+++ b/sys-cluster/galera/galera-25.3.15.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/sys-cluster/galera/galera-25.3.17.ebuild b/sys-cluster/galera/galera-25.3.17.ebuild
index f3b2b293e5f8..c3dfde8bfa00 100644
--- a/sys-cluster/galera/galera-25.3.17.ebuild
+++ b/sys-cluster/galera/galera-25.3.17.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/sys-cluster/galera/galera-25.3.19.ebuild b/sys-cluster/galera/galera-25.3.19.ebuild
index e134560ace88..7215801dd4f2 100644
--- a/sys-cluster/galera/galera-25.3.19.ebuild
+++ b/sys-cluster/galera/galera-25.3.19.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/sys-cluster/ganglia-web/ganglia-web-3.5.10-r1.ebuild b/sys-cluster/ganglia-web/ganglia-web-3.5.10-r1.ebuild
index bba2fa8abee9..4ee2bb7ef1a0 100644
--- a/sys-cluster/ganglia-web/ganglia-web-3.5.10-r1.ebuild
+++ b/sys-cluster/ganglia-web/ganglia-web-3.5.10-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
WEBAPP_MANUAL_SLOT="yes"
diff --git a/sys-cluster/ganglia-web/ganglia-web-3.5.8-r1.ebuild b/sys-cluster/ganglia-web/ganglia-web-3.5.8-r1.ebuild
index 1a2c10828c44..a50a91e815d1 100644
--- a/sys-cluster/ganglia-web/ganglia-web-3.5.8-r1.ebuild
+++ b/sys-cluster/ganglia-web/ganglia-web-3.5.8-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
WEBAPP_MANUAL_SLOT="yes"
diff --git a/sys-cluster/ganglia/ganglia-3.7.1-r1.ebuild b/sys-cluster/ganglia/ganglia-3.7.1-r1.ebuild
index 9c6bcc324e84..4f264a867d19 100644
--- a/sys-cluster/ganglia/ganglia-3.7.1-r1.ebuild
+++ b/sys-cluster/ganglia/ganglia-3.7.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/gasnet/gasnet-1.26.4-r1.ebuild b/sys-cluster/gasnet/gasnet-1.26.4-r1.ebuild
index 140e3461c1f8..c7f53bc60cd8 100644
--- a/sys-cluster/gasnet/gasnet-1.26.4-r1.ebuild
+++ b/sys-cluster/gasnet/gasnet-1.26.4-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/sys-cluster/gasnet/gasnet-1.26.4.ebuild b/sys-cluster/gasnet/gasnet-1.26.4.ebuild
index 168cd0fec116..67055d3a67af 100644
--- a/sys-cluster/gasnet/gasnet-1.26.4.ebuild
+++ b/sys-cluster/gasnet/gasnet-1.26.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/sys-cluster/gasnet/gasnet-1.28.0.ebuild b/sys-cluster/gasnet/gasnet-1.28.0.ebuild
index abdb5dd43c31..9a32e2c0b5c5 100644
--- a/sys-cluster/gasnet/gasnet-1.28.0.ebuild
+++ b/sys-cluster/gasnet/gasnet-1.28.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/sys-cluster/gearmand/gearmand-0.34-r1.ebuild b/sys-cluster/gearmand/gearmand-0.34-r1.ebuild
index 41205c55d347..846d47261961 100644
--- a/sys-cluster/gearmand/gearmand-0.34-r1.ebuild
+++ b/sys-cluster/gearmand/gearmand-0.34-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/glusterfs/glusterfs-3.5.4.ebuild b/sys-cluster/glusterfs/glusterfs-3.5.4.ebuild
index c5049f0c0d77..47828a129648 100644
--- a/sys-cluster/glusterfs/glusterfs-3.5.4.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.5.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/glusterfs/glusterfs-3.6.5.ebuild b/sys-cluster/glusterfs/glusterfs-3.6.5.ebuild
index c861e72d14ac..88fd9cdb3998 100644
--- a/sys-cluster/glusterfs/glusterfs-3.6.5.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.6.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/glusterfs/glusterfs-3.7.4.ebuild b/sys-cluster/glusterfs/glusterfs-3.7.4.ebuild
index 9d3073a39439..8dbe65598784 100644
--- a/sys-cluster/glusterfs/glusterfs-3.7.4.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.7.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/glusterfs/glusterfs-3.8.6.ebuild b/sys-cluster/glusterfs/glusterfs-3.8.6.ebuild
index 8604c1040f8c..8aa87cab2fde 100644
--- a/sys-cluster/glusterfs/glusterfs-3.8.6.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.8.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/heartbeat/heartbeat-3.0.5-r3.ebuild b/sys-cluster/heartbeat/heartbeat-3.0.5-r3.ebuild
index e6b5a83467b6..20aadc77cebf 100644
--- a/sys-cluster/heartbeat/heartbeat-3.0.5-r3.ebuild
+++ b/sys-cluster/heartbeat/heartbeat-3.0.5-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
diff --git a/sys-cluster/heat/heat-2016.2.9999.ebuild b/sys-cluster/heat/heat-2016.2.9999.ebuild
index 09ba96b948a6..6b3b1f054d9a 100644
--- a/sys-cluster/heat/heat-2016.2.9999.ebuild
+++ b/sys-cluster/heat/heat-2016.2.9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 python3_4 )
diff --git a/sys-cluster/heat/heat-2017.1.9999.ebuild b/sys-cluster/heat/heat-2017.1.9999.ebuild
index 360f908cad7a..2963ef934c82 100644
--- a/sys-cluster/heat/heat-2017.1.9999.ebuild
+++ b/sys-cluster/heat/heat-2017.1.9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 python3_4 )
diff --git a/sys-cluster/heat/heat-7.0.2.ebuild b/sys-cluster/heat/heat-7.0.2.ebuild
index 470e5ec023a0..df7dda0453be 100644
--- a/sys-cluster/heat/heat-7.0.2.ebuild
+++ b/sys-cluster/heat/heat-7.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 python3_4 )
diff --git a/sys-cluster/heat/heat-8.0.0.ebuild b/sys-cluster/heat/heat-8.0.0.ebuild
index 41c6b9120bb2..323cdb3bbabf 100644
--- a/sys-cluster/heat/heat-8.0.0.ebuild
+++ b/sys-cluster/heat/heat-8.0.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 python3_4 )
diff --git a/sys-cluster/hpl/hpl-2.0-r3.ebuild b/sys-cluster/hpl/hpl-2.0-r3.ebuild
index 0f650e074faa..61cbba4afc7d 100644
--- a/sys-cluster/hpl/hpl-2.0-r3.ebuild
+++ b/sys-cluster/hpl/hpl-2.0-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/hpx/hpx-0.9.10.ebuild b/sys-cluster/hpx/hpx-0.9.10.ebuild
index 74b4db0a8816..c0535a43f491 100644
--- a/sys-cluster/hpx/hpx-0.9.10.ebuild
+++ b/sys-cluster/hpx/hpx-0.9.10.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/hpx/hpx-0.9.8.ebuild b/sys-cluster/hpx/hpx-0.9.8.ebuild
index 1de22ffc9217..6f73d465e84e 100644
--- a/sys-cluster/hpx/hpx-0.9.8.ebuild
+++ b/sys-cluster/hpx/hpx-0.9.8.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/hpx/hpx-0.9.9.ebuild b/sys-cluster/hpx/hpx-0.9.9.ebuild
index abc3c0cb50f6..d9b7d1a8e4a0 100644
--- a/sys-cluster/hpx/hpx-0.9.9.ebuild
+++ b/sys-cluster/hpx/hpx-0.9.9.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/hpx/hpx-0.9.99.ebuild b/sys-cluster/hpx/hpx-0.9.99.ebuild
index 244f72c32b51..b440abe724f0 100644
--- a/sys-cluster/hpx/hpx-0.9.99.ebuild
+++ b/sys-cluster/hpx/hpx-0.9.99.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/sys-cluster/hpx/hpx-9999.ebuild b/sys-cluster/hpx/hpx-9999.ebuild
index 244f72c32b51..b440abe724f0 100644
--- a/sys-cluster/hpx/hpx-9999.ebuild
+++ b/sys-cluster/hpx/hpx-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/sys-cluster/ipvsadm/ipvsadm-1.21-r1.ebuild b/sys-cluster/ipvsadm/ipvsadm-1.21-r1.ebuild
index c5be3b2388eb..52156e121819 100644
--- a/sys-cluster/ipvsadm/ipvsadm-1.21-r1.ebuild
+++ b/sys-cluster/ipvsadm/ipvsadm-1.21-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit linux-info
diff --git a/sys-cluster/ipvsadm/ipvsadm-1.24.ebuild b/sys-cluster/ipvsadm/ipvsadm-1.24.ebuild
index 6cd5698cece3..da5e18b99cf8 100644
--- a/sys-cluster/ipvsadm/ipvsadm-1.24.ebuild
+++ b/sys-cluster/ipvsadm/ipvsadm-1.24.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit linux-info toolchain-funcs
diff --git a/sys-cluster/ipvsadm/ipvsadm-1.26-r2.ebuild b/sys-cluster/ipvsadm/ipvsadm-1.26-r2.ebuild
index 0a12957158b6..a022f55e3d23 100644
--- a/sys-cluster/ipvsadm/ipvsadm-1.26-r2.ebuild
+++ b/sys-cluster/ipvsadm/ipvsadm-1.26-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/ipvsadm/ipvsadm-1.27-r1.ebuild b/sys-cluster/ipvsadm/ipvsadm-1.27-r1.ebuild
index 018911dbbd3c..ad82d37548d0 100644
--- a/sys-cluster/ipvsadm/ipvsadm-1.27-r1.ebuild
+++ b/sys-cluster/ipvsadm/ipvsadm-1.27-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/sys-cluster/ipvsadm/ipvsadm-1.28.ebuild b/sys-cluster/ipvsadm/ipvsadm-1.28.ebuild
index 7f7574660287..39f351f5ae90 100644
--- a/sys-cluster/ipvsadm/ipvsadm-1.28.ebuild
+++ b/sys-cluster/ipvsadm/ipvsadm-1.28.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/sys-cluster/keepalived/keepalived-1.2.15.ebuild b/sys-cluster/keepalived/keepalived-1.2.15.ebuild
index 9680303d3cfd..ec108341d805 100644
--- a/sys-cluster/keepalived/keepalived-1.2.15.ebuild
+++ b/sys-cluster/keepalived/keepalived-1.2.15.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/keepalived/keepalived-1.2.19.ebuild b/sys-cluster/keepalived/keepalived-1.2.19.ebuild
index dd31ca2bd87e..4e41c48678d2 100644
--- a/sys-cluster/keepalived/keepalived-1.2.19.ebuild
+++ b/sys-cluster/keepalived/keepalived-1.2.19.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/keepalived/keepalived-1.2.2-r4.ebuild b/sys-cluster/keepalived/keepalived-1.2.2-r4.ebuild
index 0e6cdfd809a4..724c71fa3556 100644
--- a/sys-cluster/keepalived/keepalived-1.2.2-r4.ebuild
+++ b/sys-cluster/keepalived/keepalived-1.2.2-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/keepalived/keepalived-1.2.22.ebuild b/sys-cluster/keepalived/keepalived-1.2.22.ebuild
index 4450afaa0fe7..1b9ac977126f 100644
--- a/sys-cluster/keepalived/keepalived-1.2.22.ebuild
+++ b/sys-cluster/keepalived/keepalived-1.2.22.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/sys-cluster/keepalived/keepalived-1.2.23.ebuild b/sys-cluster/keepalived/keepalived-1.2.23.ebuild
index 4450afaa0fe7..1b9ac977126f 100644
--- a/sys-cluster/keepalived/keepalived-1.2.23.ebuild
+++ b/sys-cluster/keepalived/keepalived-1.2.23.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/sys-cluster/keepalived/keepalived-1.2.24.ebuild b/sys-cluster/keepalived/keepalived-1.2.24.ebuild
index b65de7736d7e..56d96bf45ccf 100644
--- a/sys-cluster/keepalived/keepalived-1.2.24.ebuild
+++ b/sys-cluster/keepalived/keepalived-1.2.24.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/sys-cluster/knem/knem-1.1.1.ebuild b/sys-cluster/knem/knem-1.1.1.ebuild
index 846b974924eb..5de621a022fb 100644
--- a/sys-cluster/knem/knem-1.1.1.ebuild
+++ b/sys-cluster/knem/knem-1.1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/knem/knem-9999.ebuild b/sys-cluster/knem/knem-9999.ebuild
index 846b974924eb..5de621a022fb 100644
--- a/sys-cluster/knem/knem-9999.ebuild
+++ b/sys-cluster/knem/knem-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/kubectl/kubectl-1.5.2.ebuild b/sys-cluster/kubectl/kubectl-1.5.2.ebuild
index f6ac9b3e993e..637d85f31c80 100644
--- a/sys-cluster/kubectl/kubectl-1.5.2.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.5.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit user golang-build golang-vcs-snapshot
diff --git a/sys-cluster/kubectl/kubectl-1.5.3.ebuild b/sys-cluster/kubectl/kubectl-1.5.3.ebuild
index f6ac9b3e993e..637d85f31c80 100644
--- a/sys-cluster/kubectl/kubectl-1.5.3.ebuild
+++ b/sys-cluster/kubectl/kubectl-1.5.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit user golang-build golang-vcs-snapshot
diff --git a/sys-cluster/legion/legion-16.08.0-r1.ebuild b/sys-cluster/legion/legion-16.08.0-r1.ebuild
index 8a4a9b2c23b6..e90f7d02ed71 100644
--- a/sys-cluster/legion/legion-16.08.0-r1.ebuild
+++ b/sys-cluster/legion/legion-16.08.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/sys-cluster/legion/legion-16.10.0.ebuild b/sys-cluster/legion/legion-16.10.0.ebuild
index d163752808f1..ced14b8e65e5 100644
--- a/sys-cluster/legion/legion-16.10.0.ebuild
+++ b/sys-cluster/legion/legion-16.10.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/sys-cluster/libccs-perl/libccs-perl-3.1.5.ebuild b/sys-cluster/libccs-perl/libccs-perl-3.1.5.ebuild
index 560e4afba7cc..da075781e5b0 100644
--- a/sys-cluster/libccs-perl/libccs-perl-3.1.5.ebuild
+++ b/sys-cluster/libccs-perl/libccs-perl-3.1.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/libccs/libccs-3.1.5.ebuild b/sys-cluster/libccs/libccs-3.1.5.ebuild
index c5d73c51a655..d5dc0d2fea45 100644
--- a/sys-cluster/libccs/libccs-3.1.5.ebuild
+++ b/sys-cluster/libccs/libccs-3.1.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/libccs/libccs-3.2.0.ebuild b/sys-cluster/libccs/libccs-3.2.0.ebuild
index c5d73c51a655..d5dc0d2fea45 100644
--- a/sys-cluster/libccs/libccs-3.2.0.ebuild
+++ b/sys-cluster/libccs/libccs-3.2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/libcircle/libcircle-0.2.0_rc1.ebuild b/sys-cluster/libcircle/libcircle-0.2.0_rc1.ebuild
index c702e2734878..7f7163c13d3a 100644
--- a/sys-cluster/libcircle/libcircle-0.2.0_rc1.ebuild
+++ b/sys-cluster/libcircle/libcircle-0.2.0_rc1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/libcircle/libcircle-0.2.1_rc1.ebuild b/sys-cluster/libcircle/libcircle-0.2.1_rc1.ebuild
index c702e2734878..7f7163c13d3a 100644
--- a/sys-cluster/libcircle/libcircle-0.2.1_rc1.ebuild
+++ b/sys-cluster/libcircle/libcircle-0.2.1_rc1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/libcman/libcman-3.1.5.ebuild b/sys-cluster/libcman/libcman-3.1.5.ebuild
index f570f8425f02..d5cc61b46a93 100644
--- a/sys-cluster/libcman/libcman-3.1.5.ebuild
+++ b/sys-cluster/libcman/libcman-3.1.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/libcman/libcman-3.2.0.ebuild b/sys-cluster/libcman/libcman-3.2.0.ebuild
index 058dec9d07f2..d7c2b69c7a78 100644
--- a/sys-cluster/libcman/libcman-3.2.0.ebuild
+++ b/sys-cluster/libcman/libcman-3.2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/libdlm/libdlm-3.1.5.ebuild b/sys-cluster/libdlm/libdlm-3.1.5.ebuild
index 66fc618a03e5..8c6593cb92b6 100644
--- a/sys-cluster/libdlm/libdlm-3.1.5.ebuild
+++ b/sys-cluster/libdlm/libdlm-3.1.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/libdlm/libdlm-3.2.0.ebuild b/sys-cluster/libdlm/libdlm-3.2.0.ebuild
index 7218e0f402e5..5c41c3ea6dab 100644
--- a/sys-cluster/libdlm/libdlm-3.2.0.ebuild
+++ b/sys-cluster/libdlm/libdlm-3.2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/libfence/libfence-3.1.5.ebuild b/sys-cluster/libfence/libfence-3.1.5.ebuild
index 709fb9e4d987..024a3122df91 100644
--- a/sys-cluster/libfence/libfence-3.1.5.ebuild
+++ b/sys-cluster/libfence/libfence-3.1.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/libfence/libfence-3.2.0.ebuild b/sys-cluster/libfence/libfence-3.2.0.ebuild
index d8f1651a6c7f..65c873d412ec 100644
--- a/sys-cluster/libfence/libfence-3.2.0.ebuild
+++ b/sys-cluster/libfence/libfence-3.2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/liblogthread/liblogthread-3.1.5.ebuild b/sys-cluster/liblogthread/liblogthread-3.1.5.ebuild
index bdc39a2c16ec..6f0b960e7dcf 100644
--- a/sys-cluster/liblogthread/liblogthread-3.1.5.ebuild
+++ b/sys-cluster/liblogthread/liblogthread-3.1.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/liblogthread/liblogthread-3.2.0.ebuild b/sys-cluster/liblogthread/liblogthread-3.2.0.ebuild
index 2bb7b6a74e86..3ac15a7db5f0 100644
--- a/sys-cluster/liblogthread/liblogthread-3.2.0.ebuild
+++ b/sys-cluster/liblogthread/liblogthread-3.2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/libqb/libqb-0.13.0.ebuild b/sys-cluster/libqb/libqb-0.13.0.ebuild
index 3f128230d092..c05c159f4d19 100644
--- a/sys-cluster/libqb/libqb-0.13.0.ebuild
+++ b/sys-cluster/libqb/libqb-0.13.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/libqb/libqb-0.14.3.ebuild b/sys-cluster/libqb/libqb-0.14.3.ebuild
index c7d13ceaa4d4..5a6e8e609a00 100644
--- a/sys-cluster/libqb/libqb-0.14.3.ebuild
+++ b/sys-cluster/libqb/libqb-0.14.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/libqb/libqb-0.14.4.ebuild b/sys-cluster/libqb/libqb-0.14.4.ebuild
index 146081779c39..8600c87b9aea 100644
--- a/sys-cluster/libqb/libqb-0.14.4.ebuild
+++ b/sys-cluster/libqb/libqb-0.14.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/libqb/libqb-0.17.0.ebuild b/sys-cluster/libqb/libqb-0.17.0.ebuild
index 2b3c7ec5b057..4a5543a6e5d9 100644
--- a/sys-cluster/libqb/libqb-0.17.0.ebuild
+++ b/sys-cluster/libqb/libqb-0.17.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/libqb/libqb-0.17.1.ebuild b/sys-cluster/libqb/libqb-0.17.1.ebuild
index 02a8930a03ee..a4355767f770 100644
--- a/sys-cluster/libqb/libqb-0.17.1.ebuild
+++ b/sys-cluster/libqb/libqb-0.17.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/libqb/libqb-0.17.2.ebuild b/sys-cluster/libqb/libqb-0.17.2.ebuild
index 28233ca14930..62a6a36d8943 100644
--- a/sys-cluster/libqb/libqb-0.17.2.ebuild
+++ b/sys-cluster/libqb/libqb-0.17.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/libquo/libquo-1.2.2.ebuild b/sys-cluster/libquo/libquo-1.2.2.ebuild
index 8c8cae09a764..9b292df867ce 100644
--- a/sys-cluster/libquo/libquo-1.2.2.ebuild
+++ b/sys-cluster/libquo/libquo-1.2.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/libquo/libquo-1.2.3.ebuild b/sys-cluster/libquo/libquo-1.2.3.ebuild
index bd300904d2bc..7a17da6712d0 100644
--- a/sys-cluster/libquo/libquo-1.2.3.ebuild
+++ b/sys-cluster/libquo/libquo-1.2.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/libquo/libquo-1.2.4-r1.ebuild b/sys-cluster/libquo/libquo-1.2.4-r1.ebuild
index affeb65e51ad..b8f2df3472cf 100644
--- a/sys-cluster/libquo/libquo-1.2.4-r1.ebuild
+++ b/sys-cluster/libquo/libquo-1.2.4-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/libquo/libquo-1.2.9.ebuild b/sys-cluster/libquo/libquo-1.2.9.ebuild
index ddd74e5a70e5..30cf2f796e7d 100644
--- a/sys-cluster/libquo/libquo-1.2.9.ebuild
+++ b/sys-cluster/libquo/libquo-1.2.9.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/sys-cluster/libquo/libquo-1.2.ebuild b/sys-cluster/libquo/libquo-1.2.ebuild
index e19877dc1daf..dff6985f6700 100644
--- a/sys-cluster/libquo/libquo-1.2.ebuild
+++ b/sys-cluster/libquo/libquo-1.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/libquo/libquo-9999.ebuild b/sys-cluster/libquo/libquo-9999.ebuild
index 68615e034b10..9282e1dfe7ac 100644
--- a/sys-cluster/libquo/libquo-9999.ebuild
+++ b/sys-cluster/libquo/libquo-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/sys-cluster/lspbs/lspbs-1.1-r1.ebuild b/sys-cluster/lspbs/lspbs-1.1-r1.ebuild
index a0d9d10f6b94..6c7e8850c564 100644
--- a/sys-cluster/lspbs/lspbs-1.1-r1.ebuild
+++ b/sys-cluster/lspbs/lspbs-1.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="Displays clear, concise and up-to-date PBS node and CPU usage information"
SRC_URI="http://homepages.inf.ed.ac.uk/s0239160/misc/lspbs/${P}.tar.gz"
diff --git a/sys-cluster/maui/maui-3.3.1-r2.ebuild b/sys-cluster/maui/maui-3.3.1-r2.ebuild
index b20236772829..95d331c38e1e 100644
--- a/sys-cluster/maui/maui-3.3.1-r2.ebuild
+++ b/sys-cluster/maui/maui-3.3.1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/sys-cluster/maui/maui-3.3.1-r3.ebuild b/sys-cluster/maui/maui-3.3.1-r3.ebuild
index 43f46c3c57ee..a21bb11735c7 100644
--- a/sys-cluster/maui/maui-3.3.1-r3.ebuild
+++ b/sys-cluster/maui/maui-3.3.1-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/sys-cluster/minikube/minikube-0.16.0.ebuild b/sys-cluster/minikube/minikube-0.16.0.ebuild
index ca8f353282c3..e562d538f0ef 100644
--- a/sys-cluster/minikube/minikube-0.16.0.ebuild
+++ b/sys-cluster/minikube/minikube-0.16.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
diff --git a/sys-cluster/moosefs/moosefs-1.6.26-r1.ebuild b/sys-cluster/moosefs/moosefs-1.6.26-r1.ebuild
index 485bc8020c98..85de95a2f2f5 100644
--- a/sys-cluster/moosefs/moosefs-1.6.26-r1.ebuild
+++ b/sys-cluster/moosefs/moosefs-1.6.26-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/sys-cluster/moosefs/moosefs-1.6.27.ebuild b/sys-cluster/moosefs/moosefs-1.6.27.ebuild
index 0e6cc344292c..f6b7d4e65fa7 100644
--- a/sys-cluster/moosefs/moosefs-1.6.27.ebuild
+++ b/sys-cluster/moosefs/moosefs-1.6.27.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild b/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild
index a0043d8dec5d..3c424fdf3c65 100644
--- a/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild
+++ b/sys-cluster/mpe2/mpe2-1.0.6_p1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/mpich/mpich-3.0.4.ebuild b/sys-cluster/mpich/mpich-3.0.4.ebuild
index feecd56232a7..63dee55d2a0b 100644
--- a/sys-cluster/mpich/mpich-3.0.4.ebuild
+++ b/sys-cluster/mpich/mpich-3.0.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/mpich/mpich-3.1.3.ebuild b/sys-cluster/mpich/mpich-3.1.3.ebuild
index 1a9e3321b22a..0ed79526c4a0 100644
--- a/sys-cluster/mpich/mpich-3.1.3.ebuild
+++ b/sys-cluster/mpich/mpich-3.1.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/mpich/mpich-3.1.4.ebuild b/sys-cluster/mpich/mpich-3.1.4.ebuild
index 3b08bfb87395..81b842d0f03e 100644
--- a/sys-cluster/mpich/mpich-3.1.4.ebuild
+++ b/sys-cluster/mpich/mpich-3.1.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/mpich/mpich-3.2-r1.ebuild b/sys-cluster/mpich/mpich-3.2-r1.ebuild
index 16fac146e5c6..1e1892faf142 100644
--- a/sys-cluster/mpich/mpich-3.2-r1.ebuild
+++ b/sys-cluster/mpich/mpich-3.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/sys-cluster/mpich/mpich-3.2.ebuild b/sys-cluster/mpich/mpich-3.2.ebuild
index 3b08bfb87395..81b842d0f03e 100644
--- a/sys-cluster/mpich/mpich-3.2.ebuild
+++ b/sys-cluster/mpich/mpich-3.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/mpich2/mpich2-1.5.ebuild b/sys-cluster/mpich2/mpich2-1.5.ebuild
index ef0a98870a9d..221bc1b2d9a2 100644
--- a/sys-cluster/mpich2/mpich2-1.5.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/mvapich2/mvapich2-1.6.ebuild b/sys-cluster/mvapich2/mvapich2-1.6.ebuild
index 54b394cbf255..31fec6cd3d00 100644
--- a/sys-cluster/mvapich2/mvapich2-1.6.ebuild
+++ b/sys-cluster/mvapich2/mvapich2-1.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/sys-cluster/native-mpi/native-mpi-0.ebuild b/sys-cluster/native-mpi/native-mpi-0.ebuild
index cee36a66de5e..5b2cab5d1d15 100644
--- a/sys-cluster/native-mpi/native-mpi-0.ebuild
+++ b/sys-cluster/native-mpi/native-mpi-0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=3
diff --git a/sys-cluster/neutron/neutron-10.0.0.ebuild b/sys-cluster/neutron/neutron-10.0.0.ebuild
index 3474d2af6fe5..3d7f813965c4 100644
--- a/sys-cluster/neutron/neutron-10.0.0.ebuild
+++ b/sys-cluster/neutron/neutron-10.0.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 )
diff --git a/sys-cluster/neutron/neutron-2016.1.9999.ebuild b/sys-cluster/neutron/neutron-2016.1.9999.ebuild
index e60640b373ad..e5c8f959cbee 100644
--- a/sys-cluster/neutron/neutron-2016.1.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2016.1.9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 python3_4 )
diff --git a/sys-cluster/neutron/neutron-2016.2.9999.ebuild b/sys-cluster/neutron/neutron-2016.2.9999.ebuild
index 5f78ccc3e21f..c496dc6a14b3 100644
--- a/sys-cluster/neutron/neutron-2016.2.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2016.2.9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 )
diff --git a/sys-cluster/neutron/neutron-2017.1.9999.ebuild b/sys-cluster/neutron/neutron-2017.1.9999.ebuild
index 24498c6862b3..1872be64f638 100644
--- a/sys-cluster/neutron/neutron-2017.1.9999.ebuild
+++ b/sys-cluster/neutron/neutron-2017.1.9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 )
diff --git a/sys-cluster/neutron/neutron-8.3.0.ebuild b/sys-cluster/neutron/neutron-8.3.0.ebuild
index a8d6d24a41ed..446dbdd538ef 100644
--- a/sys-cluster/neutron/neutron-8.3.0.ebuild
+++ b/sys-cluster/neutron/neutron-8.3.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 python3_4 )
diff --git a/sys-cluster/neutron/neutron-9.1.1.ebuild b/sys-cluster/neutron/neutron-9.1.1.ebuild
index 46223a97f70f..a701bf7cbb5f 100644
--- a/sys-cluster/neutron/neutron-9.1.1.ebuild
+++ b/sys-cluster/neutron/neutron-9.1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 )
diff --git a/sys-cluster/neutron/neutron-9.2.0.ebuild b/sys-cluster/neutron/neutron-9.2.0.ebuild
index 9100e1649d8c..a845ee71fe30 100644
--- a/sys-cluster/neutron/neutron-9.2.0.ebuild
+++ b/sys-cluster/neutron/neutron-9.2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 )
diff --git a/sys-cluster/nova/nova-13.1.2.ebuild b/sys-cluster/nova/nova-13.1.2.ebuild
index aa36a49c78a5..f78cfd2766bd 100644
--- a/sys-cluster/nova/nova-13.1.2.ebuild
+++ b/sys-cluster/nova/nova-13.1.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 )
diff --git a/sys-cluster/nova/nova-13.1.3.ebuild b/sys-cluster/nova/nova-13.1.3.ebuild
index 07e0a1a1be78..5de77af67576 100644
--- a/sys-cluster/nova/nova-13.1.3.ebuild
+++ b/sys-cluster/nova/nova-13.1.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 )
diff --git a/sys-cluster/nova/nova-14.0.3.ebuild b/sys-cluster/nova/nova-14.0.3.ebuild
index ead869b335ca..50457191bde1 100644
--- a/sys-cluster/nova/nova-14.0.3.ebuild
+++ b/sys-cluster/nova/nova-14.0.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 python3_4 )
diff --git a/sys-cluster/nova/nova-14.0.4.ebuild b/sys-cluster/nova/nova-14.0.4.ebuild
index 58c642df92ec..cfc13d1a7c13 100644
--- a/sys-cluster/nova/nova-14.0.4.ebuild
+++ b/sys-cluster/nova/nova-14.0.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 python3_4 )
diff --git a/sys-cluster/nova/nova-15.0.0.ebuild b/sys-cluster/nova/nova-15.0.0.ebuild
index d15421a2f0cb..c44343dc4f1b 100644
--- a/sys-cluster/nova/nova-15.0.0.ebuild
+++ b/sys-cluster/nova/nova-15.0.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 python3_4 )
diff --git a/sys-cluster/nova/nova-2016.1.9999.ebuild b/sys-cluster/nova/nova-2016.1.9999.ebuild
index 0aa88e8394c4..96b1ff1fa494 100644
--- a/sys-cluster/nova/nova-2016.1.9999.ebuild
+++ b/sys-cluster/nova/nova-2016.1.9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 )
diff --git a/sys-cluster/nova/nova-2016.2.9999.ebuild b/sys-cluster/nova/nova-2016.2.9999.ebuild
index 30b4b5352e88..327dc40a7bf4 100644
--- a/sys-cluster/nova/nova-2016.2.9999.ebuild
+++ b/sys-cluster/nova/nova-2016.2.9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 python3_4 )
diff --git a/sys-cluster/nova/nova-2017.1.9999.ebuild b/sys-cluster/nova/nova-2017.1.9999.ebuild
index 4f0502b38f6d..865208ac7652 100644
--- a/sys-cluster/nova/nova-2017.1.9999.ebuild
+++ b/sys-cluster/nova/nova-2017.1.9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 python3_4 )
diff --git a/sys-cluster/nullmpi/nullmpi-0.7.ebuild b/sys-cluster/nullmpi/nullmpi-0.7.ebuild
index 0265f96e41df..b5c5cc6dabc2 100644
--- a/sys-cluster/nullmpi/nullmpi-0.7.ebuild
+++ b/sys-cluster/nullmpi/nullmpi-0.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/sys-cluster/ocfs/ocfs-1.0.14.ebuild b/sys-cluster/ocfs/ocfs-1.0.14.ebuild
index 8c433b545bca..ecbeed23ad84 100644
--- a/sys-cluster/ocfs/ocfs-1.0.14.ebuild
+++ b/sys-cluster/ocfs/ocfs-1.0.14.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit linux-mod
diff --git a/sys-cluster/onesis/onesis-2.0.2.ebuild b/sys-cluster/onesis/onesis-2.0.2.ebuild
index 7c05975183f3..3262234d696a 100644
--- a/sys-cluster/onesis/onesis-2.0.2.ebuild
+++ b/sys-cluster/onesis/onesis-2.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
MY_P="oneSIS-${PV/_}"
diff --git a/sys-cluster/open-mx/open-mx-1.5.4.ebuild b/sys-cluster/open-mx/open-mx-1.5.4.ebuild
index 79d7f5521619..ac461bfced30 100644
--- a/sys-cluster/open-mx/open-mx-1.5.4.ebuild
+++ b/sys-cluster/open-mx/open-mx-1.5.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/openais/openais-1.1.4-r1.ebuild b/sys-cluster/openais/openais-1.1.4-r1.ebuild
index 440d958aa269..d0b6f3ddc478 100644
--- a/sys-cluster/openais/openais-1.1.4-r1.ebuild
+++ b/sys-cluster/openais/openais-1.1.4-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/sys-cluster/openmpi/openmpi-1.10.6.ebuild b/sys-cluster/openmpi/openmpi-1.10.6.ebuild
index 5def3fbcdd77..a5c0064cf000 100644
--- a/sys-cluster/openmpi/openmpi-1.10.6.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.10.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/sys-cluster/openmpi/openmpi-1.4.3.ebuild b/sys-cluster/openmpi/openmpi-1.4.3.ebuild
index 81e08b71e8c3..4b8de0f2d9e8 100644
--- a/sys-cluster/openmpi/openmpi-1.4.3.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.4.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/openmpi/openmpi-1.4.5.ebuild b/sys-cluster/openmpi/openmpi-1.4.5.ebuild
index 4118adb8843d..a810a5a3e3ce 100644
--- a/sys-cluster/openmpi/openmpi-1.4.5.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.4.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
index 8ce3a9641813..51c493411e17 100644
--- a/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.6.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
index 6f39669a8075..ad59007d9d7b 100644
--- a/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.7.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild b/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
index aa4805d29fb4..293c81cfd155 100644
--- a/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.4-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild b/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
index bf106c92a402..b5ac91079d8f 100644
--- a/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.7-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/openmpi/openmpi-1.8.8.ebuild b/sys-cluster/openmpi/openmpi-1.8.8.ebuild
index 8e6ad68dd4fa..67b40fdebe2b 100644
--- a/sys-cluster/openmpi/openmpi-1.8.8.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.8.8.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/openmpi/openmpi-2.0.2.ebuild b/sys-cluster/openmpi/openmpi-2.0.2.ebuild
index ab902e602749..c4cd4837d7fb 100644
--- a/sys-cluster/openmpi/openmpi-2.0.2.ebuild
+++ b/sys-cluster/openmpi/openmpi-2.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/sys-cluster/openstack-meta/openstack-meta-2016.1.9999.ebuild b/sys-cluster/openstack-meta/openstack-meta-2016.1.9999.ebuild
index 9c0a605d8f87..cae347a1736e 100644
--- a/sys-cluster/openstack-meta/openstack-meta-2016.1.9999.ebuild
+++ b/sys-cluster/openstack-meta/openstack-meta-2016.1.9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/openstack-meta/openstack-meta-2016.2.9999.ebuild b/sys-cluster/openstack-meta/openstack-meta-2016.2.9999.ebuild
index 4ad950486fc7..6e11d28d3c8c 100644
--- a/sys-cluster/openstack-meta/openstack-meta-2016.2.9999.ebuild
+++ b/sys-cluster/openstack-meta/openstack-meta-2016.2.9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/sys-cluster/openstack-meta/openstack-meta-2017.1.9999.ebuild b/sys-cluster/openstack-meta/openstack-meta-2017.1.9999.ebuild
index 822f2107a237..59b9ec4d4271 100644
--- a/sys-cluster/openstack-meta/openstack-meta-2017.1.9999.ebuild
+++ b/sys-cluster/openstack-meta/openstack-meta-2017.1.9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/sys-cluster/osc-mpiexec/osc-mpiexec-0.83.ebuild b/sys-cluster/osc-mpiexec/osc-mpiexec-0.83.ebuild
index bf679b39f5ca..58b0836bf837 100644
--- a/sys-cluster/osc-mpiexec/osc-mpiexec-0.83.ebuild
+++ b/sys-cluster/osc-mpiexec/osc-mpiexec-0.83.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
MY_PN=${PN#osc-}
DESCRIPTION="replacement for mpirun, integrates MPI with PBS"
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.12-r2.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.12-r2.ebuild
index 633bdd2228ca..fc65ae9855a1 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.12-r2.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.12-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
PYTHON_COMPAT=( python2_7 )
diff --git a/sys-cluster/pacemaker/pacemaker-1.1.14.ebuild b/sys-cluster/pacemaker/pacemaker-1.1.14.ebuild
index 4c58935fbe76..492f531c7022 100644
--- a/sys-cluster/pacemaker/pacemaker-1.1.14.ebuild
+++ b/sys-cluster/pacemaker/pacemaker-1.1.14.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 )
diff --git a/sys-cluster/pbs-python/pbs-python-4.3.3-r1.ebuild b/sys-cluster/pbs-python/pbs-python-4.3.3-r1.ebuild
index c6762e49b410..d7f9338f422a 100644
--- a/sys-cluster/pbs-python/pbs-python-4.3.3-r1.ebuild
+++ b/sys-cluster/pbs-python/pbs-python-4.3.3-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
diff --git a/sys-cluster/pconsole/pconsole-1.0-r3.ebuild b/sys-cluster/pconsole/pconsole-1.0-r3.ebuild
index a72d90578947..e071f8b28ba4 100644
--- a/sys-cluster/pconsole/pconsole-1.0-r3.ebuild
+++ b/sys-cluster/pconsole/pconsole-1.0-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
diff --git a/sys-cluster/ploop/ploop-1.13.2.ebuild b/sys-cluster/ploop/ploop-1.13.2.ebuild
index 3e95c48fa3e1..153867c91c88 100644
--- a/sys-cluster/ploop/ploop-1.13.2.ebuild
+++ b/sys-cluster/ploop/ploop-1.13.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/ploop/ploop-1.14.1.ebuild b/sys-cluster/ploop/ploop-1.14.1.ebuild
index 00858bd6526a..c38b72e9f7e8 100644
--- a/sys-cluster/ploop/ploop-1.14.1.ebuild
+++ b/sys-cluster/ploop/ploop-1.14.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/polysh/polysh-0.4-r1.ebuild b/sys-cluster/polysh/polysh-0.4-r1.ebuild
index af93d07beadb..b6f9c52ccc77 100644
--- a/sys-cluster/polysh/polysh-0.4-r1.ebuild
+++ b/sys-cluster/polysh/polysh-0.4-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
diff --git a/sys-cluster/poolmon/poolmon-0.5.ebuild b/sys-cluster/poolmon/poolmon-0.5.ebuild
index cd2c7303c8cb..f22108a82c96 100644
--- a/sys-cluster/poolmon/poolmon-0.5.ebuild
+++ b/sys-cluster/poolmon/poolmon-0.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/projections/projections-6.2.1.ebuild b/sys-cluster/projections/projections-6.2.1.ebuild
index 47f2b6f9d403..a3d6764d546a 100644
--- a/sys-cluster/projections/projections-6.2.1.ebuild
+++ b/sys-cluster/projections/projections-6.2.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/resource-agents/resource-agents-3.9.6.ebuild b/sys-cluster/resource-agents/resource-agents-3.9.6.ebuild
index 4afa2a6a8f2c..0ed39e237c01 100644
--- a/sys-cluster/resource-agents/resource-agents-3.9.6.ebuild
+++ b/sys-cluster/resource-agents/resource-agents-3.9.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/sys-cluster/rgmanager-agents/rgmanager-agents-3.9.2.ebuild b/sys-cluster/rgmanager-agents/rgmanager-agents-3.9.2.ebuild
index df28021a98e2..280fff2162e2 100644
--- a/sys-cluster/rgmanager-agents/rgmanager-agents-3.9.2.ebuild
+++ b/sys-cluster/rgmanager-agents/rgmanager-agents-3.9.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/rgmanager/rgmanager-2.03.09-r1.ebuild b/sys-cluster/rgmanager/rgmanager-2.03.09-r1.ebuild
index efc5e8eb5cf2..916463bc0271 100644
--- a/sys-cluster/rgmanager/rgmanager-2.03.09-r1.ebuild
+++ b/sys-cluster/rgmanager/rgmanager-2.03.09-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
diff --git a/sys-cluster/rgmanager/rgmanager-2.03.09.ebuild b/sys-cluster/rgmanager/rgmanager-2.03.09.ebuild
index 5e4946bed132..6b626ebc17ac 100644
--- a/sys-cluster/rgmanager/rgmanager-2.03.09.ebuild
+++ b/sys-cluster/rgmanager/rgmanager-2.03.09.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils versionator
diff --git a/sys-cluster/rgmanager/rgmanager-3.1.5.ebuild b/sys-cluster/rgmanager/rgmanager-3.1.5.ebuild
index 5e79c692a609..14508c6668c9 100644
--- a/sys-cluster/rgmanager/rgmanager-3.1.5.ebuild
+++ b/sys-cluster/rgmanager/rgmanager-3.1.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/sys-cluster/sanlock/sanlock-3.4.0-r1.ebuild b/sys-cluster/sanlock/sanlock-3.4.0-r1.ebuild
index ff55baff61a1..ec3a883c19c7 100644
--- a/sys-cluster/sanlock/sanlock-3.4.0-r1.ebuild
+++ b/sys-cluster/sanlock/sanlock-3.4.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/sys-cluster/singularity/singularity-2.2.ebuild b/sys-cluster/singularity/singularity-2.2.ebuild
index adf27e452278..4ffbb268f804 100644
--- a/sys-cluster/singularity/singularity-2.2.ebuild
+++ b/sys-cluster/singularity/singularity-2.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/sys-cluster/slurm/slurm-16.05.2.ebuild b/sys-cluster/slurm/slurm-16.05.2.ebuild
index 3cebf3befcba..2561857e107a 100644
--- a/sys-cluster/slurm/slurm-16.05.2.ebuild
+++ b/sys-cluster/slurm/slurm-16.05.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/sys-cluster/swift/swift-2.10.0-r1.ebuild b/sys-cluster/swift/swift-2.10.0-r1.ebuild
index 52716bf282f9..dea08e05ae51 100644
--- a/sys-cluster/swift/swift-2.10.0-r1.ebuild
+++ b/sys-cluster/swift/swift-2.10.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
diff --git a/sys-cluster/swift/swift-2.10.0.ebuild b/sys-cluster/swift/swift-2.10.0.ebuild
index 5b0066dc9255..00065e0f077a 100644
--- a/sys-cluster/swift/swift-2.10.0.ebuild
+++ b/sys-cluster/swift/swift-2.10.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
diff --git a/sys-cluster/swift/swift-2.10.1-r1.ebuild b/sys-cluster/swift/swift-2.10.1-r1.ebuild
index b16b40938f97..9d13b7d3dda9 100644
--- a/sys-cluster/swift/swift-2.10.1-r1.ebuild
+++ b/sys-cluster/swift/swift-2.10.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
diff --git a/sys-cluster/swift/swift-2.10.1.ebuild b/sys-cluster/swift/swift-2.10.1.ebuild
index 1450feb2f8af..564cd0a16385 100644
--- a/sys-cluster/swift/swift-2.10.1.ebuild
+++ b/sys-cluster/swift/swift-2.10.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
diff --git a/sys-cluster/swift/swift-2.9.0.ebuild b/sys-cluster/swift/swift-2.9.0.ebuild
index 5b0066dc9255..00065e0f077a 100644
--- a/sys-cluster/swift/swift-2.9.0.ebuild
+++ b/sys-cluster/swift/swift-2.9.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
diff --git a/sys-cluster/sx/sx-2.0.ebuild b/sys-cluster/sx/sx-2.0.ebuild
index 5a7a1ccb0480..5be2ed5769b2 100644
--- a/sys-cluster/sx/sx-2.0.ebuild
+++ b/sys-cluster/sx/sx-2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/sx/sx-2.1.ebuild b/sys-cluster/sx/sx-2.1.ebuild
index 9c9509e09034..2f3a5f118213 100644
--- a/sys-cluster/sx/sx-2.1.ebuild
+++ b/sys-cluster/sx/sx-2.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/torque/torque-2.5.13-r1.ebuild b/sys-cluster/torque/torque-2.5.13-r1.ebuild
index 82934c0558f9..7a45fb1c9002 100644
--- a/sys-cluster/torque/torque-2.5.13-r1.ebuild
+++ b/sys-cluster/torque/torque-2.5.13-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/torque/torque-4.1.7-r1.ebuild b/sys-cluster/torque/torque-4.1.7-r1.ebuild
index 86dfeb5b6d3b..c3c2cac28b35 100644
--- a/sys-cluster/torque/torque-4.1.7-r1.ebuild
+++ b/sys-cluster/torque/torque-4.1.7-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/torque/torque-4.2.9-r5.ebuild b/sys-cluster/torque/torque-4.2.9-r5.ebuild
index 601227fd7edc..d972010f7c74 100644
--- a/sys-cluster/torque/torque-4.2.9-r5.ebuild
+++ b/sys-cluster/torque/torque-4.2.9-r5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/torque/torque-6.0.1.ebuild b/sys-cluster/torque/torque-6.0.1.ebuild
index caed69c5d931..81660c9a75b3 100644
--- a/sys-cluster/torque/torque-6.0.1.ebuild
+++ b/sys-cluster/torque/torque-6.0.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120.ebuild b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120.ebuild
index 5a674ee7449d..135626f3308f 100644
--- a/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120.ebuild
+++ b/sys-cluster/util-vserver/util-vserver-0.30.216_pre3120.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/sys-cluster/vzctl/vzctl-4.9.4.ebuild b/sys-cluster/vzctl/vzctl-4.9.4.ebuild
index a2dd024c798c..5623e9d70c87 100644
--- a/sys-cluster/vzctl/vzctl-4.9.4.ebuild
+++ b/sys-cluster/vzctl/vzctl-4.9.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/sys-cluster/wulfware/wulfware-2.6.0.ebuild b/sys-cluster/wulfware/wulfware-2.6.0.ebuild
index 333007764410..2bf28cbab2f2 100644
--- a/sys-cluster/wulfware/wulfware-2.6.0.ebuild
+++ b/sys-cluster/wulfware/wulfware-2.6.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit autotools eutils multilib toolchain-funcs
diff --git a/sys-cluster/zookeepercli/zookeepercli-1.0.10.ebuild b/sys-cluster/zookeepercli/zookeepercli-1.0.10.ebuild
index 0ad3a99a048c..690ea9db1f15 100644
--- a/sys-cluster/zookeepercli/zookeepercli-1.0.10.ebuild
+++ b/sys-cluster/zookeepercli/zookeepercli-1.0.10.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6