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 /app-admin
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 'app-admin')
-rw-r--r--app-admin/389-console/389-console-1.1.7-r1.ebuild1
-rw-r--r--app-admin/abrt/abrt-2.0.12-r2.ebuild1
-rw-r--r--app-admin/aerospike-amc-community/aerospike-amc-community-3.6.10.1.ebuild1
-rw-r--r--app-admin/aerospike-amc-community/aerospike-amc-community-3.6.11.ebuild1
-rw-r--r--app-admin/aerospike-amc-community/aerospike-amc-community-3.6.12.ebuild1
-rw-r--r--app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13-r1.ebuild1
-rw-r--r--app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13.ebuild1
-rw-r--r--app-admin/aerospike-amc-community/aerospike-amc-community-3.6.8.2.ebuild1
-rw-r--r--app-admin/aerospike-amc-community/aerospike-amc-community-3.6.8.ebuild1
-rw-r--r--app-admin/aerospike-amc-community/aerospike-amc-community-3.6.9.ebuild1
-rw-r--r--app-admin/amazon-ec2-init/amazon-ec2-init-20101127-r1.ebuild1
-rw-r--r--app-admin/analog/analog-6.0-r4.ebuild1
-rw-r--r--app-admin/ansible/ansible-2.1.4.0.ebuild1
-rw-r--r--app-admin/ansible/ansible-2.2.1.0.ebuild1
-rw-r--r--app-admin/ansible/ansible-9999.ebuild1
-rw-r--r--app-admin/apache-tools/apache-tools-2.2.31.ebuild1
-rw-r--r--app-admin/apache-tools/apache-tools-2.2.32.ebuild1
-rw-r--r--app-admin/apache-tools/apache-tools-2.4.25.ebuild1
-rw-r--r--app-admin/apachetop/apachetop-0.12.6-r1.ebuild1
-rw-r--r--app-admin/apachetop/apachetop-0.12.6-r2.ebuild1
-rw-r--r--app-admin/apg/apg-2.3.0b-r5.ebuild1
-rw-r--r--app-admin/augeas/augeas-1.3.0.ebuild1
-rw-r--r--app-admin/augeas/augeas-1.5.0.ebuild1
-rw-r--r--app-admin/augeas/augeas-1.6.0.ebuild1
-rw-r--r--app-admin/augeas/augeas-1.7.0.ebuild1
-rw-r--r--app-admin/authbind/authbind-2.1.1.ebuild1
-rw-r--r--app-admin/aws-as-tools/aws-as-tools-1.0.49.1.ebuild1
-rw-r--r--app-admin/aws-cw-tools/aws-cw-tools-1.0.12.1.ebuild1
-rw-r--r--app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1-r1.ebuild1
-rw-r--r--app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1.ebuild1
-rw-r--r--app-admin/aws-iam-tools/aws-iam-tools-1.3.0.ebuild1
-rw-r--r--app-admin/aws-rds-tools/aws-rds-tools-1.6.001.ebuild1
-rw-r--r--app-admin/bastille/bastille-3.0.9-r1.ebuild1
-rw-r--r--app-admin/bastille/bastille-3.0.9-r2.ebuild1
-rw-r--r--app-admin/bcfg2/bcfg2-1.2.4-r1.ebuild1
-rw-r--r--app-admin/calamares/calamares-2.4.6.ebuild1
-rw-r--r--app-admin/calamares/calamares-3.0.1.ebuild1
-rw-r--r--app-admin/cancd/cancd-0.1.0-r3.ebuild1
-rw-r--r--app-admin/ccze/ccze-0.2.1-r3.ebuild1
-rw-r--r--app-admin/ccze/ccze-0.2.1-r4.ebuild1
-rw-r--r--app-admin/cdist/cdist-4.4.1.ebuild1
-rw-r--r--app-admin/cgmanager/cgmanager-0.39.ebuild1
-rw-r--r--app-admin/cgmanager/cgmanager-0.41.ebuild1
-rw-r--r--app-admin/checkrestart/checkrestart-0.47-r3.ebuild1
-rw-r--r--app-admin/checkrestart/checkrestart-0.47-r4.ebuild1
-rw-r--r--app-admin/checksec/checksec-1.7.2.ebuild1
-rw-r--r--app-admin/checksec/checksec-1.7.3.ebuild1
-rw-r--r--app-admin/checksec/checksec-1.7.4.ebuild1
-rw-r--r--app-admin/checksec/checksec-1.7.5.ebuild1
-rw-r--r--app-admin/chroot_safe/chroot_safe-1.4.ebuild1
-rw-r--r--app-admin/chrootuid/chrootuid-1.3-r1.ebuild1
-rw-r--r--app-admin/chrootuid/chrootuid-1.3.ebuild1
-rw-r--r--app-admin/chrpath/chrpath-0.13-r2.ebuild1
-rw-r--r--app-admin/cli53/cli53-0.8.4.ebuild1
-rw-r--r--app-admin/cli53/cli53-0.8.7.ebuild1
-rw-r--r--app-admin/cli53/cli53-9999.ebuild1
-rw-r--r--app-admin/clog/clog-1.1.0.ebuild1
-rw-r--r--app-admin/clsync/clsync-0.4.1.ebuild1
-rw-r--r--app-admin/clsync/clsync-0.4.2.ebuild1
-rw-r--r--app-admin/clustershell/clustershell-1.6-r1.ebuild1
-rw-r--r--app-admin/clustershell/clustershell-1.6.ebuild1
-rw-r--r--app-admin/collectd/collectd-5.5.2.ebuild1
-rw-r--r--app-admin/collectd/collectd-5.6.1-r1.ebuild1
-rw-r--r--app-admin/collectd/collectd-5.6.2.ebuild1
-rw-r--r--app-admin/conky/conky-1.10.4.ebuild1
-rw-r--r--app-admin/conky/conky-1.10.6-r1.ebuild1
-rw-r--r--app-admin/conky/conky-1.10.6.ebuild1
-rw-r--r--app-admin/conky/conky-1.9.0-r3.ebuild1
-rw-r--r--app-admin/conkyforecast/conkyforecast-2.24-r1.ebuild1
-rw-r--r--app-admin/conserver/conserver-8.1.18-r1.ebuild1
-rw-r--r--app-admin/conserver/conserver-8.1.18.ebuild1
-rw-r--r--app-admin/consolehm/consolehm-1.31.ebuild1
-rw-r--r--app-admin/consul-replicate/consul-replicate-0.2.0.ebuild1
-rw-r--r--app-admin/consul-template/consul-template-0.12.2.ebuild1
-rw-r--r--app-admin/consul-template/consul-template-0.16.0.ebuild1
-rw-r--r--app-admin/consul/consul-0.7.1.ebuild1
-rw-r--r--app-admin/consul/consul-0.7.2.ebuild1
-rw-r--r--app-admin/consul/consul-0.7.3.ebuild1
-rw-r--r--app-admin/consul/consul-0.7.5.ebuild1
-rw-r--r--app-admin/cpulimit/cpulimit-1.8.ebuild1
-rw-r--r--app-admin/cpulimit/cpulimit-2.2.ebuild1
-rw-r--r--app-admin/cpulimit/cpulimit-2.4.ebuild1
-rw-r--r--app-admin/cronolog/cronolog-1.6.2-r3.ebuild1
-rw-r--r--app-admin/cronolog/cronolog-1.6.2-r4.ebuild1
-rw-r--r--app-admin/cronolog/cronolog-1.6.2-r5.ebuild1
-rw-r--r--app-admin/denyhosts/denyhosts-2.9.ebuild1
-rw-r--r--app-admin/denyhosts/denyhosts-3.0-r1.ebuild1
-rw-r--r--app-admin/denyhosts/denyhosts-3.0.ebuild1
-rw-r--r--app-admin/diamond/diamond-4.0-r1.ebuild1
-rw-r--r--app-admin/diamond/diamond-9999.ebuild1
-rw-r--r--app-admin/dio/dio-1.5.2.ebuild1
-rw-r--r--app-admin/diradm/diradm-2.9.7.1.ebuild1
-rw-r--r--app-admin/doas/doas-6.0.ebuild1
-rw-r--r--app-admin/drush/drush-6.7.0-r1.ebuild1
-rw-r--r--app-admin/drush/drush-6.7.0.ebuild1
-rw-r--r--app-admin/durep/durep-0.9-r4.ebuild1
-rw-r--r--app-admin/ec2-ami-tools/ec2-ami-tools-1.5.6-r1.ebuild1
-rw-r--r--app-admin/eclean-kernel/eclean-kernel-0.4.1.ebuild1
-rw-r--r--app-admin/eclean-kernel/eclean-kernel-0.4.2.ebuild1
-rw-r--r--app-admin/eclean-kernel/eclean-kernel-0.4.ebuild1
-rw-r--r--app-admin/eclean-kernel/eclean-kernel-1.99.3.ebuild1
-rw-r--r--app-admin/eclean-kernel/eclean-kernel-9999.ebuild1
-rw-r--r--app-admin/elektra/elektra-0.8.15.ebuild1
-rw-r--r--app-admin/elektra/elektra-0.8.16.ebuild1
-rw-r--r--app-admin/elektra/elektra-9999.ebuild1
-rw-r--r--app-admin/emacs-updater/emacs-updater-1.15.ebuild1
-rw-r--r--app-admin/entr/entr-3.6.ebuild1
-rw-r--r--app-admin/equo/equo-302.ebuild1
-rw-r--r--app-admin/eselect/eselect-1.4.5.ebuild1
-rw-r--r--app-admin/eselect/eselect-1.4.7.ebuild1
-rw-r--r--app-admin/eselect/eselect-1.4.8.ebuild1
-rw-r--r--app-admin/eselect/eselect-9999.ebuild1
-rw-r--r--app-admin/evtxtools/evtxtools-1.1.1-r1.ebuild1
-rw-r--r--app-admin/fam/fam-2.7.0-r7.ebuild1
-rw-r--r--app-admin/fetchlog/fetchlog-1.0.ebuild1
-rw-r--r--app-admin/fetchlog/fetchlog-1.4.ebuild1
-rw-r--r--app-admin/fifo-cronolog/fifo-cronolog-1.1.1.ebuild1
-rw-r--r--app-admin/filebeat/filebeat-5.1.2.ebuild1
-rw-r--r--app-admin/filewatcher/filewatcher-2.4.6.ebuild1
-rw-r--r--app-admin/fleet/fleet-0.11.5.ebuild1
-rw-r--r--app-admin/fleet/fleet-0.11.8.ebuild1
-rw-r--r--app-admin/fleet/fleet-1.0.0.ebuild1
-rw-r--r--app-admin/fleet/fleet-9999.ebuild1
-rw-r--r--app-admin/fsvs/fsvs-1.2.5-r1.ebuild1
-rw-r--r--app-admin/fsvs/fsvs-1.2.5-r2.ebuild1
-rw-r--r--app-admin/gam-server/gam-server-0.1.10-r2.ebuild1
-rw-r--r--app-admin/gamin/gamin-0.1.10-r1.ebuild1
-rw-r--r--app-admin/genromfs/genromfs-0.5.2.ebuild1
-rw-r--r--app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.1.0.ebuild1
-rw-r--r--app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.0.ebuild1
-rw-r--r--app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.1.ebuild1
-rw-r--r--app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r4.ebuild1
-rw-r--r--app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r5.ebuild1
-rw-r--r--app-admin/geolizer/geolizer-2.01.10_p20070115-r1.ebuild1
-rw-r--r--app-admin/github-backup-utils/github-backup-utils-2.5.0.ebuild1
-rw-r--r--app-admin/github-backup-utils/github-backup-utils-2.6.0.ebuild1
-rw-r--r--app-admin/github-backup-utils/github-backup-utils-2.6.3.ebuild1
-rw-r--r--app-admin/github-backup-utils/github-backup-utils-2.6.4.ebuild1
-rw-r--r--app-admin/github-backup-utils/github-backup-utils-2.7.0-r1.ebuild1
-rw-r--r--app-admin/github-backup-utils/github-backup-utils-2.7.0.ebuild1
-rw-r--r--app-admin/github-backup-utils/github-backup-utils-2.7.1.ebuild1
-rw-r--r--app-admin/github-backup-utils/github-backup-utils-2.8.2.ebuild1
-rw-r--r--app-admin/gkrellm/gkrellm-2.3.10.ebuild1
-rw-r--r--app-admin/gkrellm/gkrellm-2.3.5-r4.ebuild1
-rw-r--r--app-admin/gkrellm/gkrellm-2.3.7.ebuild1
-rw-r--r--app-admin/glance/glance-12.0.0.ebuild1
-rw-r--r--app-admin/glance/glance-13.0.0.ebuild1
-rw-r--r--app-admin/glance/glance-2016.1.9999.ebuild1
-rw-r--r--app-admin/glance/glance-2016.2.9999.ebuild1
-rw-r--r--app-admin/gnome-system-log/gnome-system-log-3.9.90.ebuild1
-rw-r--r--app-admin/graylog2/graylog2-2.1.2.ebuild1
-rw-r--r--app-admin/grubconfig/grubconfig-1.28-r2.ebuild1
-rw-r--r--app-admin/gtkdiskfree/gtkdiskfree-2.0.1-r1.ebuild1
-rw-r--r--app-admin/gtkdiskfree/gtkdiskfree-2.0.3.ebuild1
-rw-r--r--app-admin/hardening-check/hardening-check-2.5.ebuild1
-rw-r--r--app-admin/hardening-check/hardening-check-2.6.ebuild1
-rw-r--r--app-admin/hardening-check/hardening-check-2.7.ebuild1
-rw-r--r--app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild1
-rw-r--r--app-admin/haskell-updater/haskell-updater-1.2.10.ebuild1
-rw-r--r--app-admin/haskell-updater/haskell-updater-1.2.9.ebuild1
-rw-r--r--app-admin/hddtemp/hddtemp-0.3_beta15-r26.ebuild1
-rw-r--r--app-admin/hddtemp/hddtemp-0.3_beta15-r7.ebuild1
-rw-r--r--app-admin/ide-smart/ide-smart-1.4-r1.ebuild1
-rw-r--r--app-admin/integrit/integrit-4.0.ebuild1
-rw-r--r--app-admin/integrit/integrit-4.1-r1.ebuild1
-rw-r--r--app-admin/jinit/jinit-0.1.12-r1.ebuild1
-rw-r--r--app-admin/kedpm/kedpm-0.4.0-r2.ebuild1
-rw-r--r--app-admin/keepass/keepass-2.35-r1.ebuild1
-rw-r--r--app-admin/keepassx/keepassx-0.4.4.ebuild1
-rw-r--r--app-admin/keepassx/keepassx-2.0.2-r1.ebuild1
-rw-r--r--app-admin/keepassx/keepassx-2.0.3.ebuild1
-rw-r--r--app-admin/keepassxc/keepassxc-2.1.1.ebuild1
-rw-r--r--app-admin/keepassxc/keepassxc-2.1.2.ebuild1
-rw-r--r--app-admin/keepassxc/keepassxc-9999.ebuild1
-rw-r--r--app-admin/killproc/killproc-2.13-r1.ebuild1
-rw-r--r--app-admin/kpcli/kpcli-3.0.ebuild1
-rw-r--r--app-admin/kpcli/kpcli-3.1.ebuild1
-rw-r--r--app-admin/lastpass-binary-component/lastpass-binary-component-4.1.2.ebuild1
-rw-r--r--app-admin/lastpass-cli/lastpass-cli-1.0.0.ebuild1
-rw-r--r--app-admin/lib_users/lib_users-0.10.ebuild1
-rw-r--r--app-admin/lib_users/lib_users-0.9-r1.ebuild1
-rw-r--r--app-admin/lib_users/lib_users-0.9.ebuild1
-rw-r--r--app-admin/lnav/lnav-0.7.1.ebuild1
-rw-r--r--app-admin/lnav/lnav-0.8.1.ebuild1
-rw-r--r--app-admin/localepurge/localepurge-0.5.4-r2.ebuild1
-rw-r--r--app-admin/logcheck/logcheck-1.3.15-r1.ebuild1
-rw-r--r--app-admin/logcheck/logcheck-1.3.15-r2.ebuild1
-rw-r--r--app-admin/logcheck/logcheck-1.3.16.ebuild1
-rw-r--r--app-admin/logcheck/logcheck-1.3.17.ebuild1
-rw-r--r--app-admin/logmon/logmon-0.4.4-r1.ebuild1
-rw-r--r--app-admin/logrotate/logrotate-3.11.0.ebuild1
-rw-r--r--app-admin/logrotate/logrotate-3.9.1.ebuild1
-rw-r--r--app-admin/logsentry/logsentry-1.1.1-r1.ebuild1
-rw-r--r--app-admin/logsentry/logsentry-1.1.1.ebuild1
-rw-r--r--app-admin/logstalgia/logstalgia-1.0.3-r1.ebuild1
-rw-r--r--app-admin/logstalgia/logstalgia-1.0.6.ebuild1
-rw-r--r--app-admin/logstash-bin/logstash-bin-5.1.2.ebuild1
-rw-r--r--app-admin/logstash-bin/logstash-bin-5.2.0.ebuild1
-rw-r--r--app-admin/logsurfer+/logsurfer+-1.8-r2.ebuild1
-rw-r--r--app-admin/longrun/longrun-0.9-r4.ebuild1
-rw-r--r--app-admin/lsat/lsat-0.9.7.1-r1.ebuild1
-rw-r--r--app-admin/lsyncd/lsyncd-2.2.0.ebuild1
-rw-r--r--app-admin/lsyncd/lsyncd-2.2.1.ebuild1
-rw-r--r--app-admin/makepasswd/makepasswd-1.10.ebuild1
-rw-r--r--app-admin/matter/matter-302.ebuild1
-rw-r--r--app-admin/mcelog/mcelog-100.ebuild1
-rw-r--r--app-admin/mcelog/mcelog-117.ebuild1
-rw-r--r--app-admin/mcelog/mcelog-122.ebuild1
-rw-r--r--app-admin/mcollective/mcollective-2.10.0.ebuild1
-rw-r--r--app-admin/mcollective/mcollective-2.10.1.ebuild1
-rw-r--r--app-admin/mcollective/mcollective-2.8.8.ebuild1
-rw-r--r--app-admin/mcollective/mcollective-2.9.1.ebuild1
-rw-r--r--app-admin/metalog/metalog-3-r1.ebuild1
-rw-r--r--app-admin/mktwpol/mktwpol-0.2.5.ebuild1
-rw-r--r--app-admin/mktwpol/mktwpol-0.2.6.ebuild1
-rw-r--r--app-admin/mms-agent/mms-agent-3.7.0.212_p1.ebuild1
-rw-r--r--app-admin/mongo-tools/mongo-tools-3.0.10.ebuild1
-rw-r--r--app-admin/mongo-tools/mongo-tools-3.0.14.ebuild1
-rw-r--r--app-admin/mongo-tools/mongo-tools-3.2.11.ebuild1
-rw-r--r--app-admin/mongo-tools/mongo-tools-3.2.12.ebuild1
-rw-r--r--app-admin/mongo-tools/mongo-tools-3.4.1.ebuild1
-rw-r--r--app-admin/mongo-tools/mongo-tools-3.4.2.ebuild1
-rw-r--r--app-admin/monit/monit-5.20.0.ebuild1
-rw-r--r--app-admin/mtail/mtail-0_pre20161108.ebuild1
-rw-r--r--app-admin/multilog-watch/multilog-watch-1.12.ebuild1
-rw-r--r--app-admin/needrestart/needrestart-2.10.ebuild1
-rw-r--r--app-admin/needrestart/needrestart-2.11.ebuild1
-rw-r--r--app-admin/needrestart/needrestart-2.8-r1.ebuild1
-rw-r--r--app-admin/needrestart/needrestart-2.9-r1.ebuild1
-rw-r--r--app-admin/needrestart/needrestart-9999.ebuild1
-rw-r--r--app-admin/newsyslog/newsyslog-1.1.ebuild1
-rw-r--r--app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild1
-rw-r--r--app-admin/ngxtop/ngxtop-0.0.3_pre141201.ebuild1
-rw-r--r--app-admin/openrc-settingsd/openrc-settingsd-1.0.1.ebuild1
-rw-r--r--app-admin/packagekit-base/packagekit-base-1.0.11.ebuild1
-rw-r--r--app-admin/packagekit-base/packagekit-base-1.1.1.ebuild1
-rw-r--r--app-admin/packagekit-base/packagekit-base-1.1.4.ebuild1
-rw-r--r--app-admin/packagekit-base/packagekit-base-1.1.5.ebuild1
-rw-r--r--app-admin/packagekit-gtk/packagekit-gtk-1.0.11.ebuild1
-rw-r--r--app-admin/packagekit-gtk/packagekit-gtk-1.1.1.ebuild1
-rw-r--r--app-admin/packagekit-gtk/packagekit-gtk-1.1.4.ebuild1
-rw-r--r--app-admin/packagekit-gtk/packagekit-gtk-1.1.5.ebuild1
-rw-r--r--app-admin/packagekit-qt/packagekit-qt-0.9.6.ebuild1
-rw-r--r--app-admin/packagekit/packagekit-1.0.11-r1.ebuild1
-rw-r--r--app-admin/packagekit/packagekit-1.1.1.ebuild1
-rw-r--r--app-admin/packagekit/packagekit-1.1.4.ebuild1
-rw-r--r--app-admin/packagekit/packagekit-1.1.5.ebuild1
-rw-r--r--app-admin/pass/pass-1.6.5.ebuild1
-rw-r--r--app-admin/pass/pass-1.7.ebuild1
-rw-r--r--app-admin/pass/pass-9999.ebuild1
-rw-r--r--app-admin/passook/passook-20121001.ebuild1
-rw-r--r--app-admin/passwordsafe/passwordsafe-1.00_beta.ebuild1
-rw-r--r--app-admin/passwordsafe/passwordsafe-1.01_beta.ebuild1
-rw-r--r--app-admin/paxtest/paxtest-0.9.15-r1.ebuild1
-rw-r--r--app-admin/perl-cleaner/perl-cleaner-2.20.ebuild1
-rw-r--r--app-admin/perl-cleaner/perl-cleaner-2.22.ebuild1
-rw-r--r--app-admin/perl-cleaner/perl-cleaner-2.23.ebuild1
-rw-r--r--app-admin/perl-cleaner/perl-cleaner-9999.ebuild1
-rw-r--r--app-admin/petrovich/petrovich-1.0.0.ebuild1
-rw-r--r--app-admin/pprocm/pprocm-1.0-r1.ebuild1
-rw-r--r--app-admin/pprocm/pprocm-1.0-r2.ebuild1
-rw-r--r--app-admin/prelude-manager/prelude-manager-3.0.0.ebuild1
-rw-r--r--app-admin/prelude-manager/prelude-manager-3.1.0.ebuild1
-rw-r--r--app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild1
-rw-r--r--app-admin/procinfo/procinfo-18-r2.ebuild1
-rw-r--r--app-admin/psmon/psmon-1.39-r1.ebuild1
-rw-r--r--app-admin/puppet-agent/puppet-agent-1.7.2.ebuild1
-rw-r--r--app-admin/puppet-agent/puppet-agent-1.8.2-r1.ebuild1
-rw-r--r--app-admin/puppet-agent/puppet-agent-1.8.2.ebuild1
-rw-r--r--app-admin/puppet-agent/puppet-agent-1.8.3-r2.ebuild1
-rw-r--r--app-admin/puppet-agent/puppet-agent-1.9.0.ebuild1
-rw-r--r--app-admin/puppet-agent/puppet-agent-1.9.1.ebuild1
-rw-r--r--app-admin/puppet-agent/puppet-agent-1.9.2.ebuild1
-rw-r--r--app-admin/puppet-lint/metadata.xml4
-rw-r--r--app-admin/puppet-lint/puppet-lint-2.0.2.ebuild1
-rw-r--r--app-admin/puppet-lint/puppet-lint-2.1.0.ebuild1
-rw-r--r--app-admin/puppet-lint/puppet-lint-2.1.1.ebuild1
-rw-r--r--app-admin/puppet/puppet-3.8.7-r1.ebuild1
-rw-r--r--app-admin/puppet/puppet-3.8.7.ebuild1
-rw-r--r--app-admin/puppet/puppet-4.4.2.ebuild1
-rw-r--r--app-admin/puppet/puppet-4.7.0.ebuild1
-rw-r--r--app-admin/puppet/puppet-4.8.1.ebuild1
-rw-r--r--app-admin/puppet/puppet-4.9.1.ebuild1
-rw-r--r--app-admin/puppetdb/puppetdb-4.2.2.ebuild1
-rw-r--r--app-admin/puppetdb/puppetdb-4.2.4.ebuild1
-rw-r--r--app-admin/puppetdb/puppetdb-4.3.0-r1.ebuild1
-rw-r--r--app-admin/puppetserver/puppetserver-2.3.2.ebuild1
-rw-r--r--app-admin/puppetserver/puppetserver-2.4.0.ebuild1
-rw-r--r--app-admin/puppetserver/puppetserver-2.7.1.ebuild1
-rw-r--r--app-admin/pwcrypt/pwcrypt-1.2.2-r1.ebuild1
-rw-r--r--app-admin/pwcrypt/pwcrypt-1.2.2.ebuild1
-rw-r--r--app-admin/pwgen/pwgen-2.07.ebuild1
-rw-r--r--app-admin/pydf/pydf-12-r1.ebuild1
-rw-r--r--app-admin/python-updater/python-updater-0.11.ebuild1
-rw-r--r--app-admin/python-updater/python-updater-0.12.ebuild1
-rw-r--r--app-admin/python-updater/python-updater-0.13.ebuild1
-rw-r--r--app-admin/python-updater/python-updater-0.14.ebuild1
-rw-r--r--app-admin/python-updater/python-updater-9999.ebuild1
-rw-r--r--app-admin/qpage/qpage-3.3.ebuild1
-rw-r--r--app-admin/qtpass/qtpass-1.0.5.ebuild1
-rw-r--r--app-admin/qtpass/qtpass-1.1.0.ebuild1
-rw-r--r--app-admin/qtpass/qtpass-1.1.5.ebuild1
-rw-r--r--app-admin/qtpass/qtpass-1.1.6.ebuild1
-rw-r--r--app-admin/qtpass/qtpass-9999.ebuild1
-rw-r--r--app-admin/quickswitch/quickswitch-1.05.ebuild1
-rw-r--r--app-admin/r10k/r10k-1.1.3-r1.ebuild1
-rw-r--r--app-admin/r10k/r10k-1.5.1.ebuild1
-rw-r--r--app-admin/radmind/radmind-1.14.1-r1.ebuild1
-rw-r--r--app-admin/radmind/radmind-1.14.1.ebuild1
-rw-r--r--app-admin/ranpwd/ranpwd-1.2.ebuild1
-rw-r--r--app-admin/recursos/recursos-2.0-r1.ebuild1
-rw-r--r--app-admin/reportmagic/reportmagic-2.21.ebuild1
-rw-r--r--app-admin/restart_services/restart_services-0.13.0-r1.ebuild1
-rw-r--r--app-admin/restart_services/restart_services-0.13.1.ebuild1
-rw-r--r--app-admin/rex/rex-1.3.3.ebuild1
-rw-r--r--app-admin/rex/rex-1.4.0-r1.ebuild1
-rw-r--r--app-admin/rex/rex-1.4.1.ebuild1
-rw-r--r--app-admin/rex/rex-9999.ebuild1
-rw-r--r--app-admin/rsyslog/rsyslog-8.16.0-r1.ebuild1
-rw-r--r--app-admin/rsyslog/rsyslog-8.19.0.ebuild1
-rw-r--r--app-admin/rsyslog/rsyslog-8.22.0.ebuild1
-rw-r--r--app-admin/rsyslog/rsyslog-8.23.0.ebuild1
-rw-r--r--app-admin/rsyslog/rsyslog-8.24.0.ebuild1
-rw-r--r--app-admin/sagan-rules/sagan-rules-20130430.ebuild1
-rw-r--r--app-admin/sagan-rules/sagan-rules-20140617.ebuild1
-rw-r--r--app-admin/sagan-rules/sagan-rules-99999999.ebuild1
-rw-r--r--app-admin/sagan/sagan-0.2.3.ebuild1
-rw-r--r--app-admin/sagan/sagan-1.0.0_rc3.ebuild1
-rw-r--r--app-admin/salt/salt-2015.5.10.ebuild1
-rw-r--r--app-admin/salt/salt-2015.8.13.ebuild1
-rw-r--r--app-admin/salt/salt-2016.11.2.ebuild1
-rw-r--r--app-admin/salt/salt-2016.3.5.ebuild1
-rw-r--r--app-admin/salt/salt-9999.ebuild1
-rw-r--r--app-admin/serf/serf-0.8.0.ebuild1
-rw-r--r--app-admin/setools/setools-3.3.8-r7.ebuild1
-rw-r--r--app-admin/setools/setools-4.0.1.ebuild1
-rw-r--r--app-admin/setools/setools-4.1.0.ebuild1
-rw-r--r--app-admin/setools/setools-9999.ebuild1
-rw-r--r--app-admin/socklog/socklog-2.1.0.ebuild1
-rw-r--r--app-admin/sshguard/sshguard-1.7.1.ebuild1
-rw-r--r--app-admin/sshguard/sshguard-1.99.0-r1.ebuild1
-rw-r--r--app-admin/stow/stow-2.2.2-r1.ebuild1
-rw-r--r--app-admin/sud/sud-1.3-r1.ebuild1
-rw-r--r--app-admin/sudo/sudo-1.8.18_p1.ebuild1
-rw-r--r--app-admin/sudo/sudo-1.8.19_p2.ebuild1
-rw-r--r--app-admin/sudo/sudo-9999.ebuild1
-rw-r--r--app-admin/superadduser/superadduser-1.0.9.ebuild1
-rw-r--r--app-admin/supernova/supernova-2.0.9.ebuild1
-rw-r--r--app-admin/supernova/supernova-2.1.0.ebuild1
-rw-r--r--app-admin/supernova/supernova-2.2.0.ebuild1
-rw-r--r--app-admin/supervisor/supervisor-3.1.3.ebuild1
-rw-r--r--app-admin/supervisor/supervisor-3.2.1.ebuild1
-rw-r--r--app-admin/supervisor/supervisor-3.2.2.ebuild1
-rw-r--r--app-admin/supervisor/supervisor-3.2.3.ebuild1
-rw-r--r--app-admin/supervisor/supervisor-3.3.0.ebuild1
-rw-r--r--app-admin/supervisor/supervisor-3.3.1-r1.ebuild1
-rw-r--r--app-admin/supervisor/supervisor-3.3.1.ebuild1
-rw-r--r--app-admin/swatchdog/swatchdog-3.2.4.ebuild1
-rw-r--r--app-admin/sxid/sxid-4.2-r1.ebuild1
-rw-r--r--app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild1
-rw-r--r--app-admin/sysklogd/sysklogd-1.5.1.ebuild1
-rw-r--r--app-admin/syslog-ng/syslog-ng-3.4.8.ebuild1
-rw-r--r--app-admin/syslog-ng/syslog-ng-3.6.2.ebuild1
-rw-r--r--app-admin/syslog-ng/syslog-ng-3.6.4.ebuild1
-rw-r--r--app-admin/syslog-ng/syslog-ng-3.7.2.ebuild1
-rw-r--r--app-admin/syslog-ng/syslog-ng-3.7.3.ebuild1
-rw-r--r--app-admin/syslog-summary/syslog-summary-1.14-r1.ebuild1
-rw-r--r--app-admin/syslogread/syslogread-0.92-r1.ebuild1
-rw-r--r--app-admin/sysrqd/sysrqd-14.ebuild1
-rw-r--r--app-admin/sysstat/sysstat-11.4.0.ebuild1
-rw-r--r--app-admin/sysstat/sysstat-11.4.2.ebuild1
-rw-r--r--app-admin/sysstat/sysstat-11.4.3.ebuild1
-rw-r--r--app-admin/sysstat/sysstat-11.5.3.ebuild1
-rw-r--r--app-admin/sysstat/sysstat-11.5.4.ebuild1
-rw-r--r--app-admin/system-config-printer/system-config-printer-1.4.8.ebuild1
-rw-r--r--app-admin/system-tools-backends/system-tools-backends-2.10.2.ebuild1
-rw-r--r--app-admin/systemdgenie/systemdgenie-0.99.0.ebuild1
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.4.1.ebuild1
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.0.ebuild1
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.1.ebuild1
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.2.ebuild1
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.3.ebuild1
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.4.ebuild1
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.0.ebuild1
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.1.ebuild1
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.0.ebuild1
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.1.ebuild1
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.2.ebuild1
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.3.ebuild1
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.0.ebuild1
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.1.ebuild1
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.2.ebuild1
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.3.ebuild1
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.0.ebuild1
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.1.ebuild1
-rw-r--r--app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.2.ebuild1
-rw-r--r--app-admin/tenshi/tenshi-0.12.ebuild1
-rw-r--r--app-admin/tenshi/tenshi-0.14.ebuild1
-rw-r--r--app-admin/tenshi/tenshi-0.15.ebuild1
-rw-r--r--app-admin/testdisk/testdisk-7.0-r3.ebuild1
-rw-r--r--app-admin/tmpreaper/tmpreaper-1.6.13-r1.ebuild1
-rw-r--r--app-admin/tmpreaper/tmpreaper-1.6.13.ebuild1
-rw-r--r--app-admin/tmpwatch/tmpwatch-2.11-r2.ebuild1
-rw-r--r--app-admin/tmpwatch/tmpwatch-2.11.ebuild1
-rw-r--r--app-admin/tripwire/tripwire-2.4.3.1.ebuild1
-rw-r--r--app-admin/tripwire/tripwire-2.4.3.2.ebuild1
-rw-r--r--app-admin/tripwire/tripwire-2.4.3.3.ebuild1
-rw-r--r--app-admin/ulogd/ulogd-2.0.5_p20161017.ebuild1
-rw-r--r--app-admin/usbview/usbview-2.0.ebuild1
-rw-r--r--app-admin/vault/vault-0.5.3.ebuild1
-rw-r--r--app-admin/vault/vault-0.6.2.ebuild1
-rw-r--r--app-admin/vault/vault-0.6.5.ebuild1
-rw-r--r--app-admin/verynice/verynice-1.1-r2.ebuild1
-rw-r--r--app-admin/verynice/verynice-1.1-r3.ebuild1
-rw-r--r--app-admin/watchfolder/watchfolder-0.3.3.ebuild1
-rw-r--r--app-admin/webalizer/webalizer-2.23.05.ebuild1
-rw-r--r--app-admin/webalizer/webalizer-2.23.08.ebuild1
-rw-r--r--app-admin/webapp-config/webapp-config-1.52-r1.ebuild1
-rw-r--r--app-admin/webapp-config/webapp-config-1.53-r2.ebuild1
-rw-r--r--app-admin/webapp-config/webapp-config-1.54-r1.ebuild1
-rw-r--r--app-admin/webapp-config/webapp-config-1.54-r2.ebuild1
-rw-r--r--app-admin/webapp-config/webapp-config-9999.ebuild1
-rw-r--r--app-admin/webmin/webmin-1.791.ebuild1
-rw-r--r--app-admin/whowatch/whowatch-1.8.5.ebuild1
-rw-r--r--app-admin/xstow/xstow-1.0.1.ebuild1
-rw-r--r--app-admin/xtail/xtail-2.1-r1.ebuild1
-rw-r--r--app-admin/xtail/xtail-2.1.ebuild1
-rw-r--r--app-admin/yaala/yaala-0.7.3-r1.ebuild1
-rw-r--r--app-admin/yaala/yaala-0.7.3-r2.ebuild1
-rw-r--r--app-admin/yadm/yadm-1.05.ebuild1
-rw-r--r--app-admin/yadm/yadm-1.06.ebuild1
-rw-r--r--app-admin/yadm/yadm-1.07.ebuild1
432 files changed, 1 insertions, 434 deletions
diff --git a/app-admin/389-console/389-console-1.1.7-r1.ebuild b/app-admin/389-console/389-console-1.1.7-r1.ebuild
index 5c40b8d744a..79245f19325 100644
--- a/app-admin/389-console/389-console-1.1.7-r1.ebuild
+++ b/app-admin/389-console/389-console-1.1.7-r1.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/app-admin/abrt/abrt-2.0.12-r2.ebuild b/app-admin/abrt/abrt-2.0.12-r2.ebuild
index 432553a8037..e9e2cbced8f 100644
--- a/app-admin/abrt/abrt-2.0.12-r2.ebuild
+++ b/app-admin/abrt/abrt-2.0.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
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.10.1.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.10.1.ebuild
index 942b7c99157..5e04b68567f 100644
--- a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.10.1.ebuild
+++ b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.10.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
inherit eutils user
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.11.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.11.ebuild
index 942b7c99157..5e04b68567f 100644
--- a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.11.ebuild
+++ b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.11.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils user
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.12.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.12.ebuild
index 942b7c99157..5e04b68567f 100644
--- a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.12.ebuild
+++ b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.12.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils user
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13-r1.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13-r1.ebuild
index 0a71ac8aeb7..aeea28831d0 100644
--- a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13-r1.ebuild
+++ b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.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
inherit eutils user
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13.ebuild
index 942b7c99157..5e04b68567f 100644
--- a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13.ebuild
+++ b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.13.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils user
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.8.2.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.8.2.ebuild
index 942b7c99157..5e04b68567f 100644
--- a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.8.2.ebuild
+++ b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.8.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils user
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.8.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.8.ebuild
index 942b7c99157..5e04b68567f 100644
--- a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.8.ebuild
+++ b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.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
inherit eutils user
diff --git a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.9.ebuild b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.9.ebuild
index 942b7c99157..5e04b68567f 100644
--- a/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.9.ebuild
+++ b/app-admin/aerospike-amc-community/aerospike-amc-community-3.6.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
inherit eutils user
diff --git a/app-admin/amazon-ec2-init/amazon-ec2-init-20101127-r1.ebuild b/app-admin/amazon-ec2-init/amazon-ec2-init-20101127-r1.ebuild
index 94c6252ad1e..41cd0c9ccb8 100644
--- a/app-admin/amazon-ec2-init/amazon-ec2-init-20101127-r1.ebuild
+++ b/app-admin/amazon-ec2-init/amazon-ec2-init-20101127-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/app-admin/analog/analog-6.0-r4.ebuild b/app-admin/analog/analog-6.0-r4.ebuild
index d6119bb19f3..1fe3d76350d 100644
--- a/app-admin/analog/analog-6.0-r4.ebuild
+++ b/app-admin/analog/analog-6.0-r4.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/app-admin/ansible/ansible-2.1.4.0.ebuild b/app-admin/ansible/ansible-2.1.4.0.ebuild
index 227c76562ac..a3b7f176c45 100644
--- a/app-admin/ansible/ansible-2.1.4.0.ebuild
+++ b/app-admin/ansible/ansible-2.1.4.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/app-admin/ansible/ansible-2.2.1.0.ebuild b/app-admin/ansible/ansible-2.2.1.0.ebuild
index 227c76562ac..a3b7f176c45 100644
--- a/app-admin/ansible/ansible-2.2.1.0.ebuild
+++ b/app-admin/ansible/ansible-2.2.1.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/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
index 2b726862ee3..9978aff9cfa 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-9999.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/app-admin/apache-tools/apache-tools-2.2.31.ebuild b/app-admin/apache-tools/apache-tools-2.2.31.ebuild
index eb4d5e6dc82..164fa333340 100644
--- a/app-admin/apache-tools/apache-tools-2.2.31.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.2.31.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
inherit flag-o-matic eutils
diff --git a/app-admin/apache-tools/apache-tools-2.2.32.ebuild b/app-admin/apache-tools/apache-tools-2.2.32.ebuild
index 8d62d545934..0fe392617c2 100644
--- a/app-admin/apache-tools/apache-tools-2.2.32.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.2.32.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 flag-o-matic eutils
diff --git a/app-admin/apache-tools/apache-tools-2.4.25.ebuild b/app-admin/apache-tools/apache-tools-2.4.25.ebuild
index 73f7176358e..d1a471c0e14 100644
--- a/app-admin/apache-tools/apache-tools-2.4.25.ebuild
+++ b/app-admin/apache-tools/apache-tools-2.4.25.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 flag-o-matic eutils multilib toolchain-funcs
diff --git a/app-admin/apachetop/apachetop-0.12.6-r1.ebuild b/app-admin/apachetop/apachetop-0.12.6-r1.ebuild
index ac608e7ac59..2b4638b436a 100644
--- a/app-admin/apachetop/apachetop-0.12.6-r1.ebuild
+++ b/app-admin/apachetop/apachetop-0.12.6-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/app-admin/apachetop/apachetop-0.12.6-r2.ebuild b/app-admin/apachetop/apachetop-0.12.6-r2.ebuild
index d6a0ccbc743..bb433b83e58 100644
--- a/app-admin/apachetop/apachetop-0.12.6-r2.ebuild
+++ b/app-admin/apachetop/apachetop-0.12.6-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
inherit eutils autotools
diff --git a/app-admin/apg/apg-2.3.0b-r5.ebuild b/app-admin/apg/apg-2.3.0b-r5.ebuild
index ffd17da284c..818202c48ce 100644
--- a/app-admin/apg/apg-2.3.0b-r5.ebuild
+++ b/app-admin/apg/apg-2.3.0b-r5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/app-admin/augeas/augeas-1.3.0.ebuild b/app-admin/augeas/augeas-1.3.0.ebuild
index b171d7c8f6c..f17bf414b9c 100644
--- a/app-admin/augeas/augeas-1.3.0.ebuild
+++ b/app-admin/augeas/augeas-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=5
diff --git a/app-admin/augeas/augeas-1.5.0.ebuild b/app-admin/augeas/augeas-1.5.0.ebuild
index 6231afb5877..94a6be93b5c 100644
--- a/app-admin/augeas/augeas-1.5.0.ebuild
+++ b/app-admin/augeas/augeas-1.5.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/app-admin/augeas/augeas-1.6.0.ebuild b/app-admin/augeas/augeas-1.6.0.ebuild
index 19e6312a4e0..9b00f4fec05 100644
--- a/app-admin/augeas/augeas-1.6.0.ebuild
+++ b/app-admin/augeas/augeas-1.6.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/app-admin/augeas/augeas-1.7.0.ebuild b/app-admin/augeas/augeas-1.7.0.ebuild
index 045fa9ff2e4..2cdf509377f 100644
--- a/app-admin/augeas/augeas-1.7.0.ebuild
+++ b/app-admin/augeas/augeas-1.7.0.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/app-admin/authbind/authbind-2.1.1.ebuild b/app-admin/authbind/authbind-2.1.1.ebuild
index 3e2ebe2f005..c7a9890aa7c 100644
--- a/app-admin/authbind/authbind-2.1.1.ebuild
+++ b/app-admin/authbind/authbind-2.1.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/app-admin/aws-as-tools/aws-as-tools-1.0.49.1.ebuild b/app-admin/aws-as-tools/aws-as-tools-1.0.49.1.ebuild
index e2005bb8178..38450b0e2f0 100644
--- a/app-admin/aws-as-tools/aws-as-tools-1.0.49.1.ebuild
+++ b/app-admin/aws-as-tools/aws-as-tools-1.0.49.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/app-admin/aws-cw-tools/aws-cw-tools-1.0.12.1.ebuild b/app-admin/aws-cw-tools/aws-cw-tools-1.0.12.1.ebuild
index cc03b70d041..cef18133833 100644
--- a/app-admin/aws-cw-tools/aws-cw-tools-1.0.12.1.ebuild
+++ b/app-admin/aws-cw-tools/aws-cw-tools-1.0.12.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1-r1.ebuild b/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1-r1.ebuild
index 1ea497c4cdf..c1738a3ffad 100644
--- a/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1-r1.ebuild
+++ b/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1-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/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1.ebuild b/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1.ebuild
index 52657c3d5d3..23ee15e13fe 100644
--- a/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1.ebuild
+++ b/app-admin/aws-elb-tools/aws-elb-tools-1.0.15.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/app-admin/aws-iam-tools/aws-iam-tools-1.3.0.ebuild b/app-admin/aws-iam-tools/aws-iam-tools-1.3.0.ebuild
index e3cc3355fc3..e70c4d29a09 100644
--- a/app-admin/aws-iam-tools/aws-iam-tools-1.3.0.ebuild
+++ b/app-admin/aws-iam-tools/aws-iam-tools-1.3.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/app-admin/aws-rds-tools/aws-rds-tools-1.6.001.ebuild b/app-admin/aws-rds-tools/aws-rds-tools-1.6.001.ebuild
index 9751200d6b9..4d0cfb2e1d0 100644
--- a/app-admin/aws-rds-tools/aws-rds-tools-1.6.001.ebuild
+++ b/app-admin/aws-rds-tools/aws-rds-tools-1.6.001.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/app-admin/bastille/bastille-3.0.9-r1.ebuild b/app-admin/bastille/bastille-3.0.9-r1.ebuild
index 4acde86a950..cfdc9cf09dc 100644
--- a/app-admin/bastille/bastille-3.0.9-r1.ebuild
+++ b/app-admin/bastille/bastille-3.0.9-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/app-admin/bastille/bastille-3.0.9-r2.ebuild b/app-admin/bastille/bastille-3.0.9-r2.ebuild
index 1c1c80682ee..df56a06e45f 100644
--- a/app-admin/bastille/bastille-3.0.9-r2.ebuild
+++ b/app-admin/bastille/bastille-3.0.9-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
diff --git a/app-admin/bcfg2/bcfg2-1.2.4-r1.ebuild b/app-admin/bcfg2/bcfg2-1.2.4-r1.ebuild
index e677518ef22..99526eb04d2 100644
--- a/app-admin/bcfg2/bcfg2-1.2.4-r1.ebuild
+++ b/app-admin/bcfg2/bcfg2-1.2.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=5
diff --git a/app-admin/calamares/calamares-2.4.6.ebuild b/app-admin/calamares/calamares-2.4.6.ebuild
index a9c1cec9036..f4d00d9a242 100644
--- a/app-admin/calamares/calamares-2.4.6.ebuild
+++ b/app-admin/calamares/calamares-2.4.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/app-admin/calamares/calamares-3.0.1.ebuild b/app-admin/calamares/calamares-3.0.1.ebuild
index 6f72f0cb304..02e122fac8c 100644
--- a/app-admin/calamares/calamares-3.0.1.ebuild
+++ b/app-admin/calamares/calamares-3.0.1.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/app-admin/cancd/cancd-0.1.0-r3.ebuild b/app-admin/cancd/cancd-0.1.0-r3.ebuild
index efc7a8550c8..6ad37a6163f 100644
--- a/app-admin/cancd/cancd-0.1.0-r3.ebuild
+++ b/app-admin/cancd/cancd-0.1.0-r3.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/app-admin/ccze/ccze-0.2.1-r3.ebuild b/app-admin/ccze/ccze-0.2.1-r3.ebuild
index 24b79e2d029..94fa5efed7b 100644
--- a/app-admin/ccze/ccze-0.2.1-r3.ebuild
+++ b/app-admin/ccze/ccze-0.2.1-r3.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/app-admin/ccze/ccze-0.2.1-r4.ebuild b/app-admin/ccze/ccze-0.2.1-r4.ebuild
index 1aeb955a854..e2677e5eeb1 100644
--- a/app-admin/ccze/ccze-0.2.1-r4.ebuild
+++ b/app-admin/ccze/ccze-0.2.1-r4.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/app-admin/cdist/cdist-4.4.1.ebuild b/app-admin/cdist/cdist-4.4.1.ebuild
index 02cea87efb5..59661b8e498 100644
--- a/app-admin/cdist/cdist-4.4.1.ebuild
+++ b/app-admin/cdist/cdist-4.4.1.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/app-admin/cgmanager/cgmanager-0.39.ebuild b/app-admin/cgmanager/cgmanager-0.39.ebuild
index 13189f06351..95c7b5cdff4 100644
--- a/app-admin/cgmanager/cgmanager-0.39.ebuild
+++ b/app-admin/cgmanager/cgmanager-0.39.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/app-admin/cgmanager/cgmanager-0.41.ebuild b/app-admin/cgmanager/cgmanager-0.41.ebuild
index 59d66b70935..88b2a849915 100644
--- a/app-admin/cgmanager/cgmanager-0.41.ebuild
+++ b/app-admin/cgmanager/cgmanager-0.41.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/app-admin/checkrestart/checkrestart-0.47-r3.ebuild b/app-admin/checkrestart/checkrestart-0.47-r3.ebuild
index f23c26852cd..d48ce920036 100644
--- a/app-admin/checkrestart/checkrestart-0.47-r3.ebuild
+++ b/app-admin/checkrestart/checkrestart-0.47-r3.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/app-admin/checkrestart/checkrestart-0.47-r4.ebuild b/app-admin/checkrestart/checkrestart-0.47-r4.ebuild
index 1bf1b95ad57..e50065c8ed1 100644
--- a/app-admin/checkrestart/checkrestart-0.47-r4.ebuild
+++ b/app-admin/checkrestart/checkrestart-0.47-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/app-admin/checksec/checksec-1.7.2.ebuild b/app-admin/checksec/checksec-1.7.2.ebuild
index 16472f43100..8945352cbd1 100644
--- a/app-admin/checksec/checksec-1.7.2.ebuild
+++ b/app-admin/checksec/checksec-1.7.2.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/app-admin/checksec/checksec-1.7.3.ebuild b/app-admin/checksec/checksec-1.7.3.ebuild
index 68f36c7323a..e88dfd5d8fa 100644
--- a/app-admin/checksec/checksec-1.7.3.ebuild
+++ b/app-admin/checksec/checksec-1.7.3.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/app-admin/checksec/checksec-1.7.4.ebuild b/app-admin/checksec/checksec-1.7.4.ebuild
index b1d417d5130..eda9b9a0226 100644
--- a/app-admin/checksec/checksec-1.7.4.ebuild
+++ b/app-admin/checksec/checksec-1.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/app-admin/checksec/checksec-1.7.5.ebuild b/app-admin/checksec/checksec-1.7.5.ebuild
index b1d417d5130..eda9b9a0226 100644
--- a/app-admin/checksec/checksec-1.7.5.ebuild
+++ b/app-admin/checksec/checksec-1.7.5.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/app-admin/chroot_safe/chroot_safe-1.4.ebuild b/app-admin/chroot_safe/chroot_safe-1.4.ebuild
index 0618c943d0f..210b10565d6 100644
--- a/app-admin/chroot_safe/chroot_safe-1.4.ebuild
+++ b/app-admin/chroot_safe/chroot_safe-1.4.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 eutils multilib
diff --git a/app-admin/chrootuid/chrootuid-1.3-r1.ebuild b/app-admin/chrootuid/chrootuid-1.3-r1.ebuild
index d8c306ebc5e..4c7913e0408 100644
--- a/app-admin/chrootuid/chrootuid-1.3-r1.ebuild
+++ b/app-admin/chrootuid/chrootuid-1.3-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/app-admin/chrootuid/chrootuid-1.3.ebuild b/app-admin/chrootuid/chrootuid-1.3.ebuild
index a6d186afe93..c2c45d72e5c 100644
--- a/app-admin/chrootuid/chrootuid-1.3.ebuild
+++ b/app-admin/chrootuid/chrootuid-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="4"
diff --git a/app-admin/chrpath/chrpath-0.13-r2.ebuild b/app-admin/chrpath/chrpath-0.13-r2.ebuild
index 236aa1a2007..c81e1f1cd9b 100644
--- a/app-admin/chrpath/chrpath-0.13-r2.ebuild
+++ b/app-admin/chrpath/chrpath-0.13-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/app-admin/cli53/cli53-0.8.4.ebuild b/app-admin/cli53/cli53-0.8.4.ebuild
index df5e6cce76d..6b40b7aa848 100644
--- a/app-admin/cli53/cli53-0.8.4.ebuild
+++ b/app-admin/cli53/cli53-0.8.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/app-admin/cli53/cli53-0.8.7.ebuild b/app-admin/cli53/cli53-0.8.7.ebuild
index df5e6cce76d..6b40b7aa848 100644
--- a/app-admin/cli53/cli53-0.8.7.ebuild
+++ b/app-admin/cli53/cli53-0.8.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/app-admin/cli53/cli53-9999.ebuild b/app-admin/cli53/cli53-9999.ebuild
index df5e6cce76d..6b40b7aa848 100644
--- a/app-admin/cli53/cli53-9999.ebuild
+++ b/app-admin/cli53/cli53-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/app-admin/clog/clog-1.1.0.ebuild b/app-admin/clog/clog-1.1.0.ebuild
index 1ccebb1a4cc..656fa519199 100644
--- a/app-admin/clog/clog-1.1.0.ebuild
+++ b/app-admin/clog/clog-1.1.0.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/app-admin/clsync/clsync-0.4.1.ebuild b/app-admin/clsync/clsync-0.4.1.ebuild
index 388c01eecc2..c037951819d 100644
--- a/app-admin/clsync/clsync-0.4.1.ebuild
+++ b/app-admin/clsync/clsync-0.4.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/app-admin/clsync/clsync-0.4.2.ebuild b/app-admin/clsync/clsync-0.4.2.ebuild
index cad8320f7fe..d0e9c3ece97 100644
--- a/app-admin/clsync/clsync-0.4.2.ebuild
+++ b/app-admin/clsync/clsync-0.4.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/app-admin/clustershell/clustershell-1.6-r1.ebuild b/app-admin/clustershell/clustershell-1.6-r1.ebuild
index d078b714382..faa5e3e63f9 100644
--- a/app-admin/clustershell/clustershell-1.6-r1.ebuild
+++ b/app-admin/clustershell/clustershell-1.6-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# TODO: test phase
diff --git a/app-admin/clustershell/clustershell-1.6.ebuild b/app-admin/clustershell/clustershell-1.6.ebuild
index b655d509e08..6a13780d51c 100644
--- a/app-admin/clustershell/clustershell-1.6.ebuild
+++ b/app-admin/clustershell/clustershell-1.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# TODO: test phase
diff --git a/app-admin/collectd/collectd-5.5.2.ebuild b/app-admin/collectd/collectd-5.5.2.ebuild
index f9115617ee7..0d4f633af23 100644
--- a/app-admin/collectd/collectd-5.5.2.ebuild
+++ b/app-admin/collectd/collectd-5.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"
diff --git a/app-admin/collectd/collectd-5.6.1-r1.ebuild b/app-admin/collectd/collectd-5.6.1-r1.ebuild
index 640ca01c1a7..454ffc4a2be 100644
--- a/app-admin/collectd/collectd-5.6.1-r1.ebuild
+++ b/app-admin/collectd/collectd-5.6.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="6"
diff --git a/app-admin/collectd/collectd-5.6.2.ebuild b/app-admin/collectd/collectd-5.6.2.ebuild
index 7053b52d742..03fc40010fc 100644
--- a/app-admin/collectd/collectd-5.6.2.ebuild
+++ b/app-admin/collectd/collectd-5.6.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/app-admin/conky/conky-1.10.4.ebuild b/app-admin/conky/conky-1.10.4.ebuild
index 5d503e7c2bc..38f3c714f27 100644
--- a/app-admin/conky/conky-1.10.4.ebuild
+++ b/app-admin/conky/conky-1.10.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
diff --git a/app-admin/conky/conky-1.10.6-r1.ebuild b/app-admin/conky/conky-1.10.6-r1.ebuild
index 43228b16634..7f36c536e61 100644
--- a/app-admin/conky/conky-1.10.6-r1.ebuild
+++ b/app-admin/conky/conky-1.10.6-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/app-admin/conky/conky-1.10.6.ebuild b/app-admin/conky/conky-1.10.6.ebuild
index a660756b02e..6ced6dd687b 100644
--- a/app-admin/conky/conky-1.10.6.ebuild
+++ b/app-admin/conky/conky-1.10.6.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/app-admin/conky/conky-1.9.0-r3.ebuild b/app-admin/conky/conky-1.9.0-r3.ebuild
index 2b6b1f82173..68cfc2128f4 100644
--- a/app-admin/conky/conky-1.9.0-r3.ebuild
+++ b/app-admin/conky/conky-1.9.0-r3.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/app-admin/conkyforecast/conkyforecast-2.24-r1.ebuild b/app-admin/conkyforecast/conkyforecast-2.24-r1.ebuild
index ad5f02ca798..2a1f73e2ee4 100644
--- a/app-admin/conkyforecast/conkyforecast-2.24-r1.ebuild
+++ b/app-admin/conkyforecast/conkyforecast-2.24-r1.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/app-admin/conserver/conserver-8.1.18-r1.ebuild b/app-admin/conserver/conserver-8.1.18-r1.ebuild
index 7cc4d1e973e..c23494679c7 100644
--- a/app-admin/conserver/conserver-8.1.18-r1.ebuild
+++ b/app-admin/conserver/conserver-8.1.18-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/app-admin/conserver/conserver-8.1.18.ebuild b/app-admin/conserver/conserver-8.1.18.ebuild
index 4d4b1e78842..cb1fea8dbe9 100644
--- a/app-admin/conserver/conserver-8.1.18.ebuild
+++ b/app-admin/conserver/conserver-8.1.18.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/app-admin/consolehm/consolehm-1.31.ebuild b/app-admin/consolehm/consolehm-1.31.ebuild
index ade0fa3a301..a0dda68d846 100644
--- a/app-admin/consolehm/consolehm-1.31.ebuild
+++ b/app-admin/consolehm/consolehm-1.31.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils
diff --git a/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild b/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild
index ef70f35a068..be3251197b8 100644
--- a/app-admin/consul-replicate/consul-replicate-0.2.0.ebuild
+++ b/app-admin/consul-replicate/consul-replicate-0.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/app-admin/consul-template/consul-template-0.12.2.ebuild b/app-admin/consul-template/consul-template-0.12.2.ebuild
index 6e7190dce9b..94cb5223930 100644
--- a/app-admin/consul-template/consul-template-0.12.2.ebuild
+++ b/app-admin/consul-template/consul-template-0.12.2.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/app-admin/consul-template/consul-template-0.16.0.ebuild b/app-admin/consul-template/consul-template-0.16.0.ebuild
index 6018d6e751e..7e3a9d7c23c 100644
--- a/app-admin/consul-template/consul-template-0.16.0.ebuild
+++ b/app-admin/consul-template/consul-template-0.16.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/app-admin/consul/consul-0.7.1.ebuild b/app-admin/consul/consul-0.7.1.ebuild
index 17f065f197e..f86dc68c4e7 100644
--- a/app-admin/consul/consul-0.7.1.ebuild
+++ b/app-admin/consul/consul-0.7.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
diff --git a/app-admin/consul/consul-0.7.2.ebuild b/app-admin/consul/consul-0.7.2.ebuild
index 7bbd099fe74..31e55cd7dbb 100644
--- a/app-admin/consul/consul-0.7.2.ebuild
+++ b/app-admin/consul/consul-0.7.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/app-admin/consul/consul-0.7.3.ebuild b/app-admin/consul/consul-0.7.3.ebuild
index 7bbd099fe74..31e55cd7dbb 100644
--- a/app-admin/consul/consul-0.7.3.ebuild
+++ b/app-admin/consul/consul-0.7.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
diff --git a/app-admin/consul/consul-0.7.5.ebuild b/app-admin/consul/consul-0.7.5.ebuild
index 202f3ff2ebe..4e61df91c08 100644
--- a/app-admin/consul/consul-0.7.5.ebuild
+++ b/app-admin/consul/consul-0.7.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/app-admin/cpulimit/cpulimit-1.8.ebuild b/app-admin/cpulimit/cpulimit-1.8.ebuild
index 2b101c19826..bdc78ff5f3f 100644
--- a/app-admin/cpulimit/cpulimit-1.8.ebuild
+++ b/app-admin/cpulimit/cpulimit-1.8.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/app-admin/cpulimit/cpulimit-2.2.ebuild b/app-admin/cpulimit/cpulimit-2.2.ebuild
index e6f5cb1a40e..8df40c18cf6 100644
--- a/app-admin/cpulimit/cpulimit-2.2.ebuild
+++ b/app-admin/cpulimit/cpulimit-2.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/app-admin/cpulimit/cpulimit-2.4.ebuild b/app-admin/cpulimit/cpulimit-2.4.ebuild
index 225db27082f..72e81d6e2ab 100644
--- a/app-admin/cpulimit/cpulimit-2.4.ebuild
+++ b/app-admin/cpulimit/cpulimit-2.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/app-admin/cronolog/cronolog-1.6.2-r3.ebuild b/app-admin/cronolog/cronolog-1.6.2-r3.ebuild
index 595d8b92594..d3dd6636923 100644
--- a/app-admin/cronolog/cronolog-1.6.2-r3.ebuild
+++ b/app-admin/cronolog/cronolog-1.6.2-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils autotools
diff --git a/app-admin/cronolog/cronolog-1.6.2-r4.ebuild b/app-admin/cronolog/cronolog-1.6.2-r4.ebuild
index 44520970515..3c603c95959 100644
--- a/app-admin/cronolog/cronolog-1.6.2-r4.ebuild
+++ b/app-admin/cronolog/cronolog-1.6.2-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils autotools
diff --git a/app-admin/cronolog/cronolog-1.6.2-r5.ebuild b/app-admin/cronolog/cronolog-1.6.2-r5.ebuild
index 9e103ea121c..ca4ce0c7003 100644
--- a/app-admin/cronolog/cronolog-1.6.2-r5.ebuild
+++ b/app-admin/cronolog/cronolog-1.6.2-r5.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/app-admin/denyhosts/denyhosts-2.9.ebuild b/app-admin/denyhosts/denyhosts-2.9.ebuild
index a864f8dac60..f9a579759fe 100644
--- a/app-admin/denyhosts/denyhosts-2.9.ebuild
+++ b/app-admin/denyhosts/denyhosts-2.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
PYTHON_COMPAT=( python2_7 )
diff --git a/app-admin/denyhosts/denyhosts-3.0-r1.ebuild b/app-admin/denyhosts/denyhosts-3.0-r1.ebuild
index bb77441609b..09d0b464271 100644
--- a/app-admin/denyhosts/denyhosts-3.0-r1.ebuild
+++ b/app-admin/denyhosts/denyhosts-3.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
PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
diff --git a/app-admin/denyhosts/denyhosts-3.0.ebuild b/app-admin/denyhosts/denyhosts-3.0.ebuild
index c55b40ca5dd..cd2c9fdeea3 100644
--- a/app-admin/denyhosts/denyhosts-3.0.ebuild
+++ b/app-admin/denyhosts/denyhosts-3.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
PYTHON_COMPAT=( python2_7 )
diff --git a/app-admin/diamond/diamond-4.0-r1.ebuild b/app-admin/diamond/diamond-4.0-r1.ebuild
index e1372729e0d..202cf0c73d4 100644
--- a/app-admin/diamond/diamond-4.0-r1.ebuild
+++ b/app-admin/diamond/diamond-4.0-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/app-admin/diamond/diamond-9999.ebuild b/app-admin/diamond/diamond-9999.ebuild
index 656013e519d..c37ee683c29 100644
--- a/app-admin/diamond/diamond-9999.ebuild
+++ b/app-admin/diamond/diamond-9999.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/app-admin/dio/dio-1.5.2.ebuild b/app-admin/dio/dio-1.5.2.ebuild
index 1f1115e8952..6087eb8c535 100644
--- a/app-admin/dio/dio-1.5.2.ebuild
+++ b/app-admin/dio/dio-1.5.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/app-admin/diradm/diradm-2.9.7.1.ebuild b/app-admin/diradm/diradm-2.9.7.1.ebuild
index f82cea4b56d..40dd1892dcc 100644
--- a/app-admin/diradm/diradm-2.9.7.1.ebuild
+++ b/app-admin/diradm/diradm-2.9.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="2"
diff --git a/app-admin/doas/doas-6.0.ebuild b/app-admin/doas/doas-6.0.ebuild
index 5469c661ce5..e07d93c03e0 100644
--- a/app-admin/doas/doas-6.0.ebuild
+++ b/app-admin/doas/doas-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=6
diff --git a/app-admin/drush/drush-6.7.0-r1.ebuild b/app-admin/drush/drush-6.7.0-r1.ebuild
index d1a8d7dccad..e3ee7c54e67 100644
--- a/app-admin/drush/drush-6.7.0-r1.ebuild
+++ b/app-admin/drush/drush-6.7.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/app-admin/drush/drush-6.7.0.ebuild b/app-admin/drush/drush-6.7.0.ebuild
index d7502b923b6..4aea0e01c7e 100644
--- a/app-admin/drush/drush-6.7.0.ebuild
+++ b/app-admin/drush/drush-6.7.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/app-admin/durep/durep-0.9-r4.ebuild b/app-admin/durep/durep-0.9-r4.ebuild
index 65f97e42a4f..8a1b40e1159 100644
--- a/app-admin/durep/durep-0.9-r4.ebuild
+++ b/app-admin/durep/durep-0.9-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
inherit eutils
diff --git a/app-admin/ec2-ami-tools/ec2-ami-tools-1.5.6-r1.ebuild b/app-admin/ec2-ami-tools/ec2-ami-tools-1.5.6-r1.ebuild
index 18328183750..d4d938e7cf7 100644
--- a/app-admin/ec2-ami-tools/ec2-ami-tools-1.5.6-r1.ebuild
+++ b/app-admin/ec2-ami-tools/ec2-ami-tools-1.5.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/app-admin/eclean-kernel/eclean-kernel-0.4.1.ebuild b/app-admin/eclean-kernel/eclean-kernel-0.4.1.ebuild
index 0d4f6c0c41d..2f1d60a8f25 100644
--- a/app-admin/eclean-kernel/eclean-kernel-0.4.1.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-0.4.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
PYTHON_COMPAT=( python{2_7,3_4} pypy )
diff --git a/app-admin/eclean-kernel/eclean-kernel-0.4.2.ebuild b/app-admin/eclean-kernel/eclean-kernel-0.4.2.ebuild
index f4845dcf117..5d0d900e4d4 100644
--- a/app-admin/eclean-kernel/eclean-kernel-0.4.2.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-0.4.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
PYTHON_COMPAT=( python{2_7,3_4} pypy )
diff --git a/app-admin/eclean-kernel/eclean-kernel-0.4.ebuild b/app-admin/eclean-kernel/eclean-kernel-0.4.ebuild
index 4d97114d487..52d6470e4b7 100644
--- a/app-admin/eclean-kernel/eclean-kernel-0.4.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-0.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
PYTHON_COMPAT=( python2_7 pypy )
diff --git a/app-admin/eclean-kernel/eclean-kernel-1.99.3.ebuild b/app-admin/eclean-kernel/eclean-kernel-1.99.3.ebuild
index 8ce7440028a..ae41700c874 100644
--- a/app-admin/eclean-kernel/eclean-kernel-1.99.3.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-1.99.3.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/app-admin/eclean-kernel/eclean-kernel-9999.ebuild b/app-admin/eclean-kernel/eclean-kernel-9999.ebuild
index 1cec2e13bae..164b0f49395 100644
--- a/app-admin/eclean-kernel/eclean-kernel-9999.ebuild
+++ b/app-admin/eclean-kernel/eclean-kernel-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/app-admin/elektra/elektra-0.8.15.ebuild b/app-admin/elektra/elektra-0.8.15.ebuild
index bdcbd7fed43..8319b317bc5 100644
--- a/app-admin/elektra/elektra-0.8.15.ebuild
+++ b/app-admin/elektra/elektra-0.8.15.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/app-admin/elektra/elektra-0.8.16.ebuild b/app-admin/elektra/elektra-0.8.16.ebuild
index 2a675354108..a87cd518643 100644
--- a/app-admin/elektra/elektra-0.8.16.ebuild
+++ b/app-admin/elektra/elektra-0.8.16.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/app-admin/elektra/elektra-9999.ebuild b/app-admin/elektra/elektra-9999.ebuild
index 6ce1c4043f3..25d2c118ce6 100644
--- a/app-admin/elektra/elektra-9999.ebuild
+++ b/app-admin/elektra/elektra-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/app-admin/emacs-updater/emacs-updater-1.15.ebuild b/app-admin/emacs-updater/emacs-updater-1.15.ebuild
index ed945b442cc..5f285a56dca 100644
--- a/app-admin/emacs-updater/emacs-updater-1.15.ebuild
+++ b/app-admin/emacs-updater/emacs-updater-1.15.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/app-admin/entr/entr-3.6.ebuild b/app-admin/entr/entr-3.6.ebuild
index a0716bd87b8..948112b23de 100644
--- a/app-admin/entr/entr-3.6.ebuild
+++ b/app-admin/entr/entr-3.6.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/app-admin/equo/equo-302.ebuild b/app-admin/equo/equo-302.ebuild
index 90026e7d48d..1c5924a18e9 100644
--- a/app-admin/equo/equo-302.ebuild
+++ b/app-admin/equo/equo-302.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/app-admin/eselect/eselect-1.4.5.ebuild b/app-admin/eselect/eselect-1.4.5.ebuild
index 457572ecf1a..2f22ced24be 100644
--- a/app-admin/eselect/eselect-1.4.5.ebuild
+++ b/app-admin/eselect/eselect-1.4.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/app-admin/eselect/eselect-1.4.7.ebuild b/app-admin/eselect/eselect-1.4.7.ebuild
index 2c57be6f0d8..9bea48b166b 100644
--- a/app-admin/eselect/eselect-1.4.7.ebuild
+++ b/app-admin/eselect/eselect-1.4.7.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/app-admin/eselect/eselect-1.4.8.ebuild b/app-admin/eselect/eselect-1.4.8.ebuild
index 289a9142aa4..40722df6b35 100644
--- a/app-admin/eselect/eselect-1.4.8.ebuild
+++ b/app-admin/eselect/eselect-1.4.8.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/app-admin/eselect/eselect-9999.ebuild b/app-admin/eselect/eselect-9999.ebuild
index 0132fc4ee49..cf5d48bc58c 100644
--- a/app-admin/eselect/eselect-9999.ebuild
+++ b/app-admin/eselect/eselect-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/app-admin/evtxtools/evtxtools-1.1.1-r1.ebuild b/app-admin/evtxtools/evtxtools-1.1.1-r1.ebuild
index 6b7675e483d..972e084d767 100644
--- a/app-admin/evtxtools/evtxtools-1.1.1-r1.ebuild
+++ b/app-admin/evtxtools/evtxtools-1.1.1-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/app-admin/fam/fam-2.7.0-r7.ebuild b/app-admin/fam/fam-2.7.0-r7.ebuild
index 179ada610e0..9aea258bf7a 100644
--- a/app-admin/fam/fam-2.7.0-r7.ebuild
+++ b/app-admin/fam/fam-2.7.0-r7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils autotools multilib-minimal
diff --git a/app-admin/fetchlog/fetchlog-1.0.ebuild b/app-admin/fetchlog/fetchlog-1.0.ebuild
index 140838c1260..85b9ef56513 100644
--- a/app-admin/fetchlog/fetchlog-1.0.ebuild
+++ b/app-admin/fetchlog/fetchlog-1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit toolchain-funcs
diff --git a/app-admin/fetchlog/fetchlog-1.4.ebuild b/app-admin/fetchlog/fetchlog-1.4.ebuild
index 7bf7b9bfd25..e302d890ccc 100644
--- a/app-admin/fetchlog/fetchlog-1.4.ebuild
+++ b/app-admin/fetchlog/fetchlog-1.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit toolchain-funcs
diff --git a/app-admin/fifo-cronolog/fifo-cronolog-1.1.1.ebuild b/app-admin/fifo-cronolog/fifo-cronolog-1.1.1.ebuild
index 41a61210064..38bef60c550 100644
--- a/app-admin/fifo-cronolog/fifo-cronolog-1.1.1.ebuild
+++ b/app-admin/fifo-cronolog/fifo-cronolog-1.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=3
diff --git a/app-admin/filebeat/filebeat-5.1.2.ebuild b/app-admin/filebeat/filebeat-5.1.2.ebuild
index eafde7c5568..944daed826a 100644
--- a/app-admin/filebeat/filebeat-5.1.2.ebuild
+++ b/app-admin/filebeat/filebeat-5.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
diff --git a/app-admin/filewatcher/filewatcher-2.4.6.ebuild b/app-admin/filewatcher/filewatcher-2.4.6.ebuild
index 3e6d84c20e8..5243ed1b68c 100644
--- a/app-admin/filewatcher/filewatcher-2.4.6.ebuild
+++ b/app-admin/filewatcher/filewatcher-2.4.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="This is a configuration file control system and IDS"
HOMEPAGE="https://sourceforge.net/projects/filewatcher/"
diff --git a/app-admin/fleet/fleet-0.11.5.ebuild b/app-admin/fleet/fleet-0.11.5.ebuild
index 07d7fdd72be..b983d3184a1 100644
--- a/app-admin/fleet/fleet-0.11.5.ebuild
+++ b/app-admin/fleet/fleet-0.11.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/app-admin/fleet/fleet-0.11.8.ebuild b/app-admin/fleet/fleet-0.11.8.ebuild
index 9a5241dbda0..2de9c9d839c 100644
--- a/app-admin/fleet/fleet-0.11.8.ebuild
+++ b/app-admin/fleet/fleet-0.11.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/app-admin/fleet/fleet-1.0.0.ebuild b/app-admin/fleet/fleet-1.0.0.ebuild
index 27879962332..9f43c632f33 100644
--- a/app-admin/fleet/fleet-1.0.0.ebuild
+++ b/app-admin/fleet/fleet-1.0.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/app-admin/fleet/fleet-9999.ebuild b/app-admin/fleet/fleet-9999.ebuild
index c2038777bb9..278d60733de 100644
--- a/app-admin/fleet/fleet-9999.ebuild
+++ b/app-admin/fleet/fleet-9999.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/app-admin/fsvs/fsvs-1.2.5-r1.ebuild b/app-admin/fsvs/fsvs-1.2.5-r1.ebuild
index de9ee849532..70dbab7a23c 100644
--- a/app-admin/fsvs/fsvs-1.2.5-r1.ebuild
+++ b/app-admin/fsvs/fsvs-1.2.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/app-admin/fsvs/fsvs-1.2.5-r2.ebuild b/app-admin/fsvs/fsvs-1.2.5-r2.ebuild
index feef5d4335f..35d79e90877 100644
--- a/app-admin/fsvs/fsvs-1.2.5-r2.ebuild
+++ b/app-admin/fsvs/fsvs-1.2.5-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
diff --git a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
index 5a67006a763..9897b142db6 100644
--- a/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
+++ b/app-admin/gam-server/gam-server-0.1.10-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
GNOME_ORG_MODULE="gamin"
diff --git a/app-admin/gamin/gamin-0.1.10-r1.ebuild b/app-admin/gamin/gamin-0.1.10-r1.ebuild
index 257c8b5b7c8..54271b8266d 100644
--- a/app-admin/gamin/gamin-0.1.10-r1.ebuild
+++ b/app-admin/gamin/gamin-0.1.10-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/app-admin/genromfs/genromfs-0.5.2.ebuild b/app-admin/genromfs/genromfs-0.5.2.ebuild
index 9e21456eea0..3b3fd2b0b57 100644
--- a/app-admin/genromfs/genromfs-0.5.2.ebuild
+++ b/app-admin/genromfs/genromfs-0.5.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/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.1.0.ebuild b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.1.0.ebuild
index 0062758cdaa..a5dad27b323 100644
--- a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.1.0.ebuild
+++ b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.1.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/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.0.ebuild b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.0.ebuild
index 502d4a12e4e..4a2b5e0ef72 100644
--- a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.0.ebuild
+++ b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.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
diff --git a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.1.ebuild b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.1.ebuild
index 18a71ef5d30..573d0e36bc7 100644
--- a/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.1.ebuild
+++ b/app-admin/gentoo-perl-helpers/gentoo-perl-helpers-0.2.1.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/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r4.ebuild b/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r4.ebuild
index d98bf1c2d79..a6d6fb5792c 100644
--- a/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r4.ebuild
+++ b/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="Ebuild for setting up a Gentoo rsync mirror"
HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Infrastructure/Rsync"
diff --git a/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r5.ebuild b/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r5.ebuild
index 0fdbbc744eb..77dab9ccb5f 100644
--- a/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r5.ebuild
+++ b/app-admin/gentoo-rsync-mirror/gentoo-rsync-mirror-1.0-r5.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/app-admin/geolizer/geolizer-2.01.10_p20070115-r1.ebuild b/app-admin/geolizer/geolizer-2.01.10_p20070115-r1.ebuild
index 5bcb7e5bb3e..cf34bfe6034 100644
--- a/app-admin/geolizer/geolizer-2.01.10_p20070115-r1.ebuild
+++ b/app-admin/geolizer/geolizer-2.01.10_p20070115-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# uses webapp.eclass to create directories with right permissions
# probably slight overkill but works well
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.5.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.5.0.ebuild
index 9aa01798c90..6c89280fa66 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.5.0.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.5.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/app-admin/github-backup-utils/github-backup-utils-2.6.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.6.0.ebuild
index 9aa01798c90..6c89280fa66 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.6.0.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.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=6
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.6.3.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.6.3.ebuild
index 9aa01798c90..6c89280fa66 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.6.3.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.6.3.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/app-admin/github-backup-utils/github-backup-utils-2.6.4.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.6.4.ebuild
index 9aa01798c90..6c89280fa66 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.6.4.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.6.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/app-admin/github-backup-utils/github-backup-utils-2.7.0-r1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.7.0-r1.ebuild
index 24304bc6198..ae86106fc4c 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.7.0-r1.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.7.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/app-admin/github-backup-utils/github-backup-utils-2.7.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.7.0.ebuild
index 9aa01798c90..6c89280fa66 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.7.0.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.7.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/app-admin/github-backup-utils/github-backup-utils-2.7.1.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.7.1.ebuild
index 24304bc6198..ae86106fc4c 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.7.1.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.7.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
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.8.2.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.8.2.ebuild
index 24304bc6198..ae86106fc4c 100644
--- a/app-admin/github-backup-utils/github-backup-utils-2.8.2.ebuild
+++ b/app-admin/github-backup-utils/github-backup-utils-2.8.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/app-admin/gkrellm/gkrellm-2.3.10.ebuild b/app-admin/gkrellm/gkrellm-2.3.10.ebuild
index e96fcc8d2a7..ccd754786d9 100644
--- a/app-admin/gkrellm/gkrellm-2.3.10.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.10.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/app-admin/gkrellm/gkrellm-2.3.5-r4.ebuild b/app-admin/gkrellm/gkrellm-2.3.5-r4.ebuild
index ec86c036c2e..270ad03b149 100644
--- a/app-admin/gkrellm/gkrellm-2.3.5-r4.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.5-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/app-admin/gkrellm/gkrellm-2.3.7.ebuild b/app-admin/gkrellm/gkrellm-2.3.7.ebuild
index 49eca4b0aa6..50b713c9657 100644
--- a/app-admin/gkrellm/gkrellm-2.3.7.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.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/app-admin/glance/glance-12.0.0.ebuild b/app-admin/glance/glance-12.0.0.ebuild
index 9cecad90ab9..32013fe0e80 100644
--- a/app-admin/glance/glance-12.0.0.ebuild
+++ b/app-admin/glance/glance-12.0.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 )
diff --git a/app-admin/glance/glance-13.0.0.ebuild b/app-admin/glance/glance-13.0.0.ebuild
index 2b6384d2816..35bf1ea85a7 100644
--- a/app-admin/glance/glance-13.0.0.ebuild
+++ b/app-admin/glance/glance-13.0.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 python3_5 )
diff --git a/app-admin/glance/glance-2016.1.9999.ebuild b/app-admin/glance/glance-2016.1.9999.ebuild
index 410b8411d7c..4d322baa365 100644
--- a/app-admin/glance/glance-2016.1.9999.ebuild
+++ b/app-admin/glance/glance-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/app-admin/glance/glance-2016.2.9999.ebuild b/app-admin/glance/glance-2016.2.9999.ebuild
index 35e099bc349..3de083614ab 100644
--- a/app-admin/glance/glance-2016.2.9999.ebuild
+++ b/app-admin/glance/glance-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 python3_5 )
diff --git a/app-admin/gnome-system-log/gnome-system-log-3.9.90.ebuild b/app-admin/gnome-system-log/gnome-system-log-3.9.90.ebuild
index 0cccec3cfa5..62104f3e93b 100644
--- a/app-admin/gnome-system-log/gnome-system-log-3.9.90.ebuild
+++ b/app-admin/gnome-system-log/gnome-system-log-3.9.90.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
GCONF_DEBUG="no"
diff --git a/app-admin/graylog2/graylog2-2.1.2.ebuild b/app-admin/graylog2/graylog2-2.1.2.ebuild
index 0e52f74cd08..d6c214a10d0 100644
--- a/app-admin/graylog2/graylog2-2.1.2.ebuild
+++ b/app-admin/graylog2/graylog2-2.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
diff --git a/app-admin/grubconfig/grubconfig-1.28-r2.ebuild b/app-admin/grubconfig/grubconfig-1.28-r2.ebuild
index c7959ec1904..62c8d0e125b 100644
--- a/app-admin/grubconfig/grubconfig-1.28-r2.ebuild
+++ b/app-admin/grubconfig/grubconfig-1.28-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
diff --git a/app-admin/gtkdiskfree/gtkdiskfree-2.0.1-r1.ebuild b/app-admin/gtkdiskfree/gtkdiskfree-2.0.1-r1.ebuild
index f5cfe991ec6..d6cdb81631e 100644
--- a/app-admin/gtkdiskfree/gtkdiskfree-2.0.1-r1.ebuild
+++ b/app-admin/gtkdiskfree/gtkdiskfree-2.0.1-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/app-admin/gtkdiskfree/gtkdiskfree-2.0.3.ebuild b/app-admin/gtkdiskfree/gtkdiskfree-2.0.3.ebuild
index d1aabd1f127..25ff319c3ea 100644
--- a/app-admin/gtkdiskfree/gtkdiskfree-2.0.3.ebuild
+++ b/app-admin/gtkdiskfree/gtkdiskfree-2.0.3.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/app-admin/hardening-check/hardening-check-2.5.ebuild b/app-admin/hardening-check/hardening-check-2.5.ebuild
index ff78e06d91b..d52c84c63f0 100644
--- a/app-admin/hardening-check/hardening-check-2.5.ebuild
+++ b/app-admin/hardening-check/hardening-check-2.5.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/app-admin/hardening-check/hardening-check-2.6.ebuild b/app-admin/hardening-check/hardening-check-2.6.ebuild
index 9b7c96f3703..89d34e65467 100644
--- a/app-admin/hardening-check/hardening-check-2.6.ebuild
+++ b/app-admin/hardening-check/hardening-check-2.6.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/app-admin/hardening-check/hardening-check-2.7.ebuild b/app-admin/hardening-check/hardening-check-2.7.ebuild
index 9b7c96f3703..89d34e65467 100644
--- a/app-admin/hardening-check/hardening-check-2.7.ebuild
+++ b/app-admin/hardening-check/hardening-check-2.7.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/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild b/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild
index 64f5ee66a28..bd0e475811f 100644
--- a/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.ebuild
+++ b/app-admin/hardinfo/hardinfo-0.5.2_pre20130823.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/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
index e5a0e8ca573..5b32badf018 100644
--- a/app-admin/haskell-updater/haskell-updater-1.2.10.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.2.10.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/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild b/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild
index c3294384161..b9e1932fd81 100644
--- a/app-admin/haskell-updater/haskell-updater-1.2.9.ebuild
+++ b/app-admin/haskell-updater/haskell-updater-1.2.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/app-admin/hddtemp/hddtemp-0.3_beta15-r26.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r26.ebuild
index e54c80e5b8e..023295bad7e 100644
--- a/app-admin/hddtemp/hddtemp-0.3_beta15-r26.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r26.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/app-admin/hddtemp/hddtemp-0.3_beta15-r7.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r7.ebuild
index b278eba4782..1350815a28c 100644
--- a/app-admin/hddtemp/hddtemp-0.3_beta15-r7.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils autotools readme.gentoo systemd
diff --git a/app-admin/ide-smart/ide-smart-1.4-r1.ebuild b/app-admin/ide-smart/ide-smart-1.4-r1.ebuild
index c7118e1a8e7..cac5d77934f 100644
--- a/app-admin/ide-smart/ide-smart-1.4-r1.ebuild
+++ b/app-admin/ide-smart/ide-smart-1.4-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit toolchain-funcs
diff --git a/app-admin/integrit/integrit-4.0.ebuild b/app-admin/integrit/integrit-4.0.ebuild
index a30152eec41..f27b03a3238 100644
--- a/app-admin/integrit/integrit-4.0.ebuild
+++ b/app-admin/integrit/integrit-4.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit autotools toolchain-funcs
diff --git a/app-admin/integrit/integrit-4.1-r1.ebuild b/app-admin/integrit/integrit-4.1-r1.ebuild
index 6d3e58184d0..d987937dc33 100644
--- a/app-admin/integrit/integrit-4.1-r1.ebuild
+++ b/app-admin/integrit/integrit-4.1-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/app-admin/jinit/jinit-0.1.12-r1.ebuild b/app-admin/jinit/jinit-0.1.12-r1.ebuild
index 0a8f0d0db73..b5e444f2783 100644
--- a/app-admin/jinit/jinit-0.1.12-r1.ebuild
+++ b/app-admin/jinit/jinit-0.1.12-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils
diff --git a/app-admin/kedpm/kedpm-0.4.0-r2.ebuild b/app-admin/kedpm/kedpm-0.4.0-r2.ebuild
index 05a17cddec8..3aa49669b56 100644
--- a/app-admin/kedpm/kedpm-0.4.0-r2.ebuild
+++ b/app-admin/kedpm/kedpm-0.4.0-r2.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/app-admin/keepass/keepass-2.35-r1.ebuild b/app-admin/keepass/keepass-2.35-r1.ebuild
index 99ab9c12a57..0a4b7fe32aa 100644
--- a/app-admin/keepass/keepass-2.35-r1.ebuild
+++ b/app-admin/keepass/keepass-2.35-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/app-admin/keepassx/keepassx-0.4.4.ebuild b/app-admin/keepassx/keepassx-0.4.4.ebuild
index 66d9b5c6ea5..af2a1b3d2f0 100644
--- a/app-admin/keepassx/keepassx-0.4.4.ebuild
+++ b/app-admin/keepassx/keepassx-0.4.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit qt4-r2
diff --git a/app-admin/keepassx/keepassx-2.0.2-r1.ebuild b/app-admin/keepassx/keepassx-2.0.2-r1.ebuild
index 519898f9c73..8baf1a36ba4 100644
--- a/app-admin/keepassx/keepassx-2.0.2-r1.ebuild
+++ b/app-admin/keepassx/keepassx-2.0.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/app-admin/keepassx/keepassx-2.0.3.ebuild b/app-admin/keepassx/keepassx-2.0.3.ebuild
index 84aeb7d9cdf..3abb492c195 100644
--- a/app-admin/keepassx/keepassx-2.0.3.ebuild
+++ b/app-admin/keepassx/keepassx-2.0.3.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/app-admin/keepassxc/keepassxc-2.1.1.ebuild b/app-admin/keepassxc/keepassxc-2.1.1.ebuild
index abb4ee36cb4..a63c934e87f 100644
--- a/app-admin/keepassxc/keepassxc-2.1.1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.1.1.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/app-admin/keepassxc/keepassxc-2.1.2.ebuild b/app-admin/keepassxc/keepassxc-2.1.2.ebuild
index 99dc9a80c7c..ab7c275b1b2 100644
--- a/app-admin/keepassxc/keepassxc-2.1.2.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.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
diff --git a/app-admin/keepassxc/keepassxc-9999.ebuild b/app-admin/keepassxc/keepassxc-9999.ebuild
index 99dc9a80c7c..ab7c275b1b2 100644
--- a/app-admin/keepassxc/keepassxc-9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-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/app-admin/killproc/killproc-2.13-r1.ebuild b/app-admin/killproc/killproc-2.13-r1.ebuild
index 9a7dab55a48..7f61a89b324 100644
--- a/app-admin/killproc/killproc-2.13-r1.ebuild
+++ b/app-admin/killproc/killproc-2.13-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
inherit eutils toolchain-funcs
diff --git a/app-admin/kpcli/kpcli-3.0.ebuild b/app-admin/kpcli/kpcli-3.0.ebuild
index faac5c1f428..22e49477c1e 100644
--- a/app-admin/kpcli/kpcli-3.0.ebuild
+++ b/app-admin/kpcli/kpcli-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=5
diff --git a/app-admin/kpcli/kpcli-3.1.ebuild b/app-admin/kpcli/kpcli-3.1.ebuild
index fc7e916f5ba..8283bf2ccef 100644
--- a/app-admin/kpcli/kpcli-3.1.ebuild
+++ b/app-admin/kpcli/kpcli-3.1.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/app-admin/lastpass-binary-component/lastpass-binary-component-4.1.2.ebuild b/app-admin/lastpass-binary-component/lastpass-binary-component-4.1.2.ebuild
index 31e9ef42ebe..40a551fcd97 100644
--- a/app-admin/lastpass-binary-component/lastpass-binary-component-4.1.2.ebuild
+++ b/app-admin/lastpass-binary-component/lastpass-binary-component-4.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
diff --git a/app-admin/lastpass-cli/lastpass-cli-1.0.0.ebuild b/app-admin/lastpass-cli/lastpass-cli-1.0.0.ebuild
index 21b2f6be72a..a33a2766166 100644
--- a/app-admin/lastpass-cli/lastpass-cli-1.0.0.ebuild
+++ b/app-admin/lastpass-cli/lastpass-cli-1.0.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/app-admin/lib_users/lib_users-0.10.ebuild b/app-admin/lib_users/lib_users-0.10.ebuild
index 62a0cd344db..a8aa15563d3 100644
--- a/app-admin/lib_users/lib_users-0.10.ebuild
+++ b/app-admin/lib_users/lib_users-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
diff --git a/app-admin/lib_users/lib_users-0.9-r1.ebuild b/app-admin/lib_users/lib_users-0.9-r1.ebuild
index ab2f24bea8b..2114caad045 100644
--- a/app-admin/lib_users/lib_users-0.9-r1.ebuild
+++ b/app-admin/lib_users/lib_users-0.9-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/app-admin/lib_users/lib_users-0.9.ebuild b/app-admin/lib_users/lib_users-0.9.ebuild
index 0a85b5c29af..cd7902db1f3 100644
--- a/app-admin/lib_users/lib_users-0.9.ebuild
+++ b/app-admin/lib_users/lib_users-0.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/app-admin/lnav/lnav-0.7.1.ebuild b/app-admin/lnav/lnav-0.7.1.ebuild
index d6f9c4c4b15..4a18f058655 100644
--- a/app-admin/lnav/lnav-0.7.1.ebuild
+++ b/app-admin/lnav/lnav-0.7.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/app-admin/lnav/lnav-0.8.1.ebuild b/app-admin/lnav/lnav-0.8.1.ebuild
index 045f6fe36eb..c11649613fe 100644
--- a/app-admin/lnav/lnav-0.8.1.ebuild
+++ b/app-admin/lnav/lnav-0.8.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
diff --git a/app-admin/localepurge/localepurge-0.5.4-r2.ebuild b/app-admin/localepurge/localepurge-0.5.4-r2.ebuild
index edd34977e22..cb6dca5900a 100644
--- a/app-admin/localepurge/localepurge-0.5.4-r2.ebuild
+++ b/app-admin/localepurge/localepurge-0.5.4-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/app-admin/logcheck/logcheck-1.3.15-r1.ebuild b/app-admin/logcheck/logcheck-1.3.15-r1.ebuild
index d0cf98dff9f..606e3f5765d 100644
--- a/app-admin/logcheck/logcheck-1.3.15-r1.ebuild
+++ b/app-admin/logcheck/logcheck-1.3.15-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/app-admin/logcheck/logcheck-1.3.15-r2.ebuild b/app-admin/logcheck/logcheck-1.3.15-r2.ebuild
index 7f6dc764564..15c4b76c81c 100644
--- a/app-admin/logcheck/logcheck-1.3.15-r2.ebuild
+++ b/app-admin/logcheck/logcheck-1.3.15-r2.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/app-admin/logcheck/logcheck-1.3.16.ebuild b/app-admin/logcheck/logcheck-1.3.16.ebuild
index e68b56fea64..aac4f5a7cad 100644
--- a/app-admin/logcheck/logcheck-1.3.16.ebuild
+++ b/app-admin/logcheck/logcheck-1.3.16.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/app-admin/logcheck/logcheck-1.3.17.ebuild b/app-admin/logcheck/logcheck-1.3.17.ebuild
index 3e287860751..412128f5097 100644
--- a/app-admin/logcheck/logcheck-1.3.17.ebuild
+++ b/app-admin/logcheck/logcheck-1.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=5
diff --git a/app-admin/logmon/logmon-0.4.4-r1.ebuild b/app-admin/logmon/logmon-0.4.4-r1.ebuild
index 40cfbf8c984..8fede639a21 100644
--- a/app-admin/logmon/logmon-0.4.4-r1.ebuild
+++ b/app-admin/logmon/logmon-0.4.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="5"
diff --git a/app-admin/logrotate/logrotate-3.11.0.ebuild b/app-admin/logrotate/logrotate-3.11.0.ebuild
index 57623161f0b..2570ecbb1bf 100644
--- a/app-admin/logrotate/logrotate-3.11.0.ebuild
+++ b/app-admin/logrotate/logrotate-3.11.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/app-admin/logrotate/logrotate-3.9.1.ebuild b/app-admin/logrotate/logrotate-3.9.1.ebuild
index e6c7394c8f0..060e11be388 100644
--- a/app-admin/logrotate/logrotate-3.9.1.ebuild
+++ b/app-admin/logrotate/logrotate-3.9.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/app-admin/logsentry/logsentry-1.1.1-r1.ebuild b/app-admin/logsentry/logsentry-1.1.1-r1.ebuild
index 44524e4b230..fa0b6cc6a7d 100644
--- a/app-admin/logsentry/logsentry-1.1.1-r1.ebuild
+++ b/app-admin/logsentry/logsentry-1.1.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit toolchain-funcs
diff --git a/app-admin/logsentry/logsentry-1.1.1.ebuild b/app-admin/logsentry/logsentry-1.1.1.ebuild
index cfa23bd020f..06bf9e80257 100644
--- a/app-admin/logsentry/logsentry-1.1.1.ebuild
+++ b/app-admin/logsentry/logsentry-1.1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit toolchain-funcs
diff --git a/app-admin/logstalgia/logstalgia-1.0.3-r1.ebuild b/app-admin/logstalgia/logstalgia-1.0.3-r1.ebuild
index 03ad211eeff..3fcc54d82b0 100644
--- a/app-admin/logstalgia/logstalgia-1.0.3-r1.ebuild
+++ b/app-admin/logstalgia/logstalgia-1.0.3-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/app-admin/logstalgia/logstalgia-1.0.6.ebuild b/app-admin/logstalgia/logstalgia-1.0.6.ebuild
index 808a6c93473..5f9fc439efd 100644
--- a/app-admin/logstalgia/logstalgia-1.0.6.ebuild
+++ b/app-admin/logstalgia/logstalgia-1.0.6.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/app-admin/logstash-bin/logstash-bin-5.1.2.ebuild b/app-admin/logstash-bin/logstash-bin-5.1.2.ebuild
index 528bf276b7c..668a90ad7ac 100644
--- a/app-admin/logstash-bin/logstash-bin-5.1.2.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-5.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
diff --git a/app-admin/logstash-bin/logstash-bin-5.2.0.ebuild b/app-admin/logstash-bin/logstash-bin-5.2.0.ebuild
index 528bf276b7c..668a90ad7ac 100644
--- a/app-admin/logstash-bin/logstash-bin-5.2.0.ebuild
+++ b/app-admin/logstash-bin/logstash-bin-5.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
diff --git a/app-admin/logsurfer+/logsurfer+-1.8-r2.ebuild b/app-admin/logsurfer+/logsurfer+-1.8-r2.ebuild
index eb5a99a5a19..c691c7aae41 100644
--- a/app-admin/logsurfer+/logsurfer+-1.8-r2.ebuild
+++ b/app-admin/logsurfer+/logsurfer+-1.8-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"
inherit toolchain-funcs user
diff --git a/app-admin/longrun/longrun-0.9-r4.ebuild b/app-admin/longrun/longrun-0.9-r4.ebuild
index 82760300f41..afe681e3a69 100644
--- a/app-admin/longrun/longrun-0.9-r4.ebuild
+++ b/app-admin/longrun/longrun-0.9-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils linux-info toolchain-funcs
diff --git a/app-admin/lsat/lsat-0.9.7.1-r1.ebuild b/app-admin/lsat/lsat-0.9.7.1-r1.ebuild
index 898bf2fe9b4..2df288ba1a6 100644
--- a/app-admin/lsat/lsat-0.9.7.1-r1.ebuild
+++ b/app-admin/lsat/lsat-0.9.7.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils toolchain-funcs
diff --git a/app-admin/lsyncd/lsyncd-2.2.0.ebuild b/app-admin/lsyncd/lsyncd-2.2.0.ebuild
index b8a1089a4e6..7f8661b1a69 100644
--- a/app-admin/lsyncd/lsyncd-2.2.0.ebuild
+++ b/app-admin/lsyncd/lsyncd-2.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
diff --git a/app-admin/lsyncd/lsyncd-2.2.1.ebuild b/app-admin/lsyncd/lsyncd-2.2.1.ebuild
index 92ad9b8b48b..4e14745a58b 100644
--- a/app-admin/lsyncd/lsyncd-2.2.1.ebuild
+++ b/app-admin/lsyncd/lsyncd-2.2.1.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/app-admin/makepasswd/makepasswd-1.10.ebuild b/app-admin/makepasswd/makepasswd-1.10.ebuild
index 17633166fc0..55a550379ba 100644
--- a/app-admin/makepasswd/makepasswd-1.10.ebuild
+++ b/app-admin/makepasswd/makepasswd-1.10.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="Random password generator"
HOMEPAGE="http://packages.debian.org/stable/admin/makepasswd"
diff --git a/app-admin/matter/matter-302.ebuild b/app-admin/matter/matter-302.ebuild
index d7663ddd011..47f0521d6aa 100644
--- a/app-admin/matter/matter-302.ebuild
+++ b/app-admin/matter/matter-302.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/app-admin/mcelog/mcelog-100.ebuild b/app-admin/mcelog/mcelog-100.ebuild
index 1a283551380..8072b9a2b6f 100644
--- a/app-admin/mcelog/mcelog-100.ebuild
+++ b/app-admin/mcelog/mcelog-100.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/app-admin/mcelog/mcelog-117.ebuild b/app-admin/mcelog/mcelog-117.ebuild
index f46ca0c9618..6d3cfe9c2c5 100644
--- a/app-admin/mcelog/mcelog-117.ebuild
+++ b/app-admin/mcelog/mcelog-117.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/app-admin/mcelog/mcelog-122.ebuild b/app-admin/mcelog/mcelog-122.ebuild
index f46ca0c9618..6d3cfe9c2c5 100644
--- a/app-admin/mcelog/mcelog-122.ebuild
+++ b/app-admin/mcelog/mcelog-122.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/app-admin/mcollective/mcollective-2.10.0.ebuild b/app-admin/mcollective/mcollective-2.10.0.ebuild
index 2f791599c26..975f85e142e 100644
--- a/app-admin/mcollective/mcollective-2.10.0.ebuild
+++ b/app-admin/mcollective/mcollective-2.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="5"
diff --git a/app-admin/mcollective/mcollective-2.10.1.ebuild b/app-admin/mcollective/mcollective-2.10.1.ebuild
index 48e68442580..ec955b14231 100644
--- a/app-admin/mcollective/mcollective-2.10.1.ebuild
+++ b/app-admin/mcollective/mcollective-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"
diff --git a/app-admin/mcollective/mcollective-2.8.8.ebuild b/app-admin/mcollective/mcollective-2.8.8.ebuild
index 83438dcb263..7c46ea108b5 100644
--- a/app-admin/mcollective/mcollective-2.8.8.ebuild
+++ b/app-admin/mcollective/mcollective-2.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/app-admin/mcollective/mcollective-2.9.1.ebuild b/app-admin/mcollective/mcollective-2.9.1.ebuild
index 83438dcb263..7c46ea108b5 100644
--- a/app-admin/mcollective/mcollective-2.9.1.ebuild
+++ b/app-admin/mcollective/mcollective-2.9.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/app-admin/metalog/metalog-3-r1.ebuild b/app-admin/metalog/metalog-3-r1.ebuild
index b7ec541593e..b67bb91b753 100644
--- a/app-admin/metalog/metalog-3-r1.ebuild
+++ b/app-admin/metalog/metalog-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="3"
inherit eutils systemd
diff --git a/app-admin/mktwpol/mktwpol-0.2.5.ebuild b/app-admin/mktwpol/mktwpol-0.2.5.ebuild
index ab566371055..3d00392efaf 100644
--- a/app-admin/mktwpol/mktwpol-0.2.5.ebuild
+++ b/app-admin/mktwpol/mktwpol-0.2.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/app-admin/mktwpol/mktwpol-0.2.6.ebuild b/app-admin/mktwpol/mktwpol-0.2.6.ebuild
index 31733093c3f..e96d9006271 100644
--- a/app-admin/mktwpol/mktwpol-0.2.6.ebuild
+++ b/app-admin/mktwpol/mktwpol-0.2.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/app-admin/mms-agent/mms-agent-3.7.0.212_p1.ebuild b/app-admin/mms-agent/mms-agent-3.7.0.212_p1.ebuild
index 4e35c276cf8..6a7e0b44e62 100644
--- a/app-admin/mms-agent/mms-agent-3.7.0.212_p1.ebuild
+++ b/app-admin/mms-agent/mms-agent-3.7.0.212_p1.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/app-admin/mongo-tools/mongo-tools-3.0.10.ebuild b/app-admin/mongo-tools/mongo-tools-3.0.10.ebuild
index 0a92d4ba45d..c30ce82a7e8 100644
--- a/app-admin/mongo-tools/mongo-tools-3.0.10.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-3.0.10.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/app-admin/mongo-tools/mongo-tools-3.0.14.ebuild b/app-admin/mongo-tools/mongo-tools-3.0.14.ebuild
index a931ba398a2..5cc5d5b5c2a 100644
--- a/app-admin/mongo-tools/mongo-tools-3.0.14.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-3.0.14.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/app-admin/mongo-tools/mongo-tools-3.2.11.ebuild b/app-admin/mongo-tools/mongo-tools-3.2.11.ebuild
index 6ca37d75363..f2aacdd6904 100644
--- a/app-admin/mongo-tools/mongo-tools-3.2.11.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-3.2.11.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/app-admin/mongo-tools/mongo-tools-3.2.12.ebuild b/app-admin/mongo-tools/mongo-tools-3.2.12.ebuild
index 5a82e19fa59..1978809739a 100644
--- a/app-admin/mongo-tools/mongo-tools-3.2.12.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-3.2.12.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/app-admin/mongo-tools/mongo-tools-3.4.1.ebuild b/app-admin/mongo-tools/mongo-tools-3.4.1.ebuild
index f43e57c2182..75ff9493b43 100644
--- a/app-admin/mongo-tools/mongo-tools-3.4.1.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-3.4.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/app-admin/mongo-tools/mongo-tools-3.4.2.ebuild b/app-admin/mongo-tools/mongo-tools-3.4.2.ebuild
index 5a82e19fa59..1978809739a 100644
--- a/app-admin/mongo-tools/mongo-tools-3.4.2.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-3.4.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/app-admin/monit/monit-5.20.0.ebuild b/app-admin/monit/monit-5.20.0.ebuild
index 94b8c3da259..b3fe1c1e495 100644
--- a/app-admin/monit/monit-5.20.0.ebuild
+++ b/app-admin/monit/monit-5.20.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
inherit pam systemd
diff --git a/app-admin/mtail/mtail-0_pre20161108.ebuild b/app-admin/mtail/mtail-0_pre20161108.ebuild
index 7a475819944..175b8d7c05f 100644
--- a/app-admin/mtail/mtail-0_pre20161108.ebuild
+++ b/app-admin/mtail/mtail-0_pre20161108.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/app-admin/multilog-watch/multilog-watch-1.12.ebuild b/app-admin/multilog-watch/multilog-watch-1.12.ebuild
index bad3fb80fed..3f7aad316e4 100644
--- a/app-admin/multilog-watch/multilog-watch-1.12.ebuild
+++ b/app-admin/multilog-watch/multilog-watch-1.12.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils
DESCRIPTION="Watches a multilog file for irregularities"
diff --git a/app-admin/needrestart/needrestart-2.10.ebuild b/app-admin/needrestart/needrestart-2.10.ebuild
index db40353d48c..c0f74b5a612 100644
--- a/app-admin/needrestart/needrestart-2.10.ebuild
+++ b/app-admin/needrestart/needrestart-2.10.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/app-admin/needrestart/needrestart-2.11.ebuild b/app-admin/needrestart/needrestart-2.11.ebuild
index db40353d48c..c0f74b5a612 100644
--- a/app-admin/needrestart/needrestart-2.11.ebuild
+++ b/app-admin/needrestart/needrestart-2.11.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/app-admin/needrestart/needrestart-2.8-r1.ebuild b/app-admin/needrestart/needrestart-2.8-r1.ebuild
index 5ac51769632..b37ce9efc96 100644
--- a/app-admin/needrestart/needrestart-2.8-r1.ebuild
+++ b/app-admin/needrestart/needrestart-2.8-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/app-admin/needrestart/needrestart-2.9-r1.ebuild b/app-admin/needrestart/needrestart-2.9-r1.ebuild
index db40353d48c..c0f74b5a612 100644
--- a/app-admin/needrestart/needrestart-2.9-r1.ebuild
+++ b/app-admin/needrestart/needrestart-2.9-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/app-admin/needrestart/needrestart-9999.ebuild b/app-admin/needrestart/needrestart-9999.ebuild
index db40353d48c..c0f74b5a612 100644
--- a/app-admin/needrestart/needrestart-9999.ebuild
+++ b/app-admin/needrestart/needrestart-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/app-admin/newsyslog/newsyslog-1.1.ebuild b/app-admin/newsyslog/newsyslog-1.1.ebuild
index 0acc24bcd88..6a4bcfef9de 100644
--- a/app-admin/newsyslog/newsyslog-1.1.ebuild
+++ b/app-admin/newsyslog/newsyslog-1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils
diff --git a/app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild b/app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild
index 18c2daac314..e187ef559f4 100644
--- a/app-admin/ngxtop/ngxtop-0.0.2-r1.ebuild
+++ b/app-admin/ngxtop/ngxtop-0.0.2-r1.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/app-admin/ngxtop/ngxtop-0.0.3_pre141201.ebuild b/app-admin/ngxtop/ngxtop-0.0.3_pre141201.ebuild
index 51a87fe774a..e5715337522 100644
--- a/app-admin/ngxtop/ngxtop-0.0.3_pre141201.ebuild
+++ b/app-admin/ngxtop/ngxtop-0.0.3_pre141201.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/app-admin/openrc-settingsd/openrc-settingsd-1.0.1.ebuild b/app-admin/openrc-settingsd/openrc-settingsd-1.0.1.ebuild
index e775448fab5..33d89176a68 100644
--- a/app-admin/openrc-settingsd/openrc-settingsd-1.0.1.ebuild
+++ b/app-admin/openrc-settingsd/openrc-settingsd-1.0.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/app-admin/packagekit-base/packagekit-base-1.0.11.ebuild b/app-admin/packagekit-base/packagekit-base-1.0.11.ebuild
index b5fe41c0948..888c3f9057e 100644
--- a/app-admin/packagekit-base/packagekit-base-1.0.11.ebuild
+++ b/app-admin/packagekit-base/packagekit-base-1.0.11.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/app-admin/packagekit-base/packagekit-base-1.1.1.ebuild b/app-admin/packagekit-base/packagekit-base-1.1.1.ebuild
index 46fa49f9edc..a78d97003aa 100644
--- a/app-admin/packagekit-base/packagekit-base-1.1.1.ebuild
+++ b/app-admin/packagekit-base/packagekit-base-1.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"
diff --git a/app-admin/packagekit-base/packagekit-base-1.1.4.ebuild b/app-admin/packagekit-base/packagekit-base-1.1.4.ebuild
index 685caeae2ae..2e070c3b583 100644
--- a/app-admin/packagekit-base/packagekit-base-1.1.4.ebuild
+++ b/app-admin/packagekit-base/packagekit-base-1.1.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/app-admin/packagekit-base/packagekit-base-1.1.5.ebuild b/app-admin/packagekit-base/packagekit-base-1.1.5.ebuild
index 1e0777a8839..6ef6d42eaa7 100644
--- a/app-admin/packagekit-base/packagekit-base-1.1.5.ebuild
+++ b/app-admin/packagekit-base/packagekit-base-1.1.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/app-admin/packagekit-gtk/packagekit-gtk-1.0.11.ebuild b/app-admin/packagekit-gtk/packagekit-gtk-1.0.11.ebuild
index 693d6d3ceae..ae300d45a64 100644
--- a/app-admin/packagekit-gtk/packagekit-gtk-1.0.11.ebuild
+++ b/app-admin/packagekit-gtk/packagekit-gtk-1.0.11.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/app-admin/packagekit-gtk/packagekit-gtk-1.1.1.ebuild b/app-admin/packagekit-gtk/packagekit-gtk-1.1.1.ebuild
index 0478c07f596..2ff6d6c1f1b 100644
--- a/app-admin/packagekit-gtk/packagekit-gtk-1.1.1.ebuild
+++ b/app-admin/packagekit-gtk/packagekit-gtk-1.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"
diff --git a/app-admin/packagekit-gtk/packagekit-gtk-1.1.4.ebuild b/app-admin/packagekit-gtk/packagekit-gtk-1.1.4.ebuild
index 0478c07f596..2ff6d6c1f1b 100644
--- a/app-admin/packagekit-gtk/packagekit-gtk-1.1.4.ebuild
+++ b/app-admin/packagekit-gtk/packagekit-gtk-1.1.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/app-admin/packagekit-gtk/packagekit-gtk-1.1.5.ebuild b/app-admin/packagekit-gtk/packagekit-gtk-1.1.5.ebuild
index 62c6035ae43..0999fdab9cc 100644
--- a/app-admin/packagekit-gtk/packagekit-gtk-1.1.5.ebuild
+++ b/app-admin/packagekit-gtk/packagekit-gtk-1.1.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/app-admin/packagekit-qt/packagekit-qt-0.9.6.ebuild b/app-admin/packagekit-qt/packagekit-qt-0.9.6.ebuild
index 4a9cb99d7e1..08e0031923a 100644
--- a/app-admin/packagekit-qt/packagekit-qt-0.9.6.ebuild
+++ b/app-admin/packagekit-qt/packagekit-qt-0.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=6
diff --git a/app-admin/packagekit/packagekit-1.0.11-r1.ebuild b/app-admin/packagekit/packagekit-1.0.11-r1.ebuild
index 40e14261b2b..e0cba926c35 100644
--- a/app-admin/packagekit/packagekit-1.0.11-r1.ebuild
+++ b/app-admin/packagekit/packagekit-1.0.11-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/app-admin/packagekit/packagekit-1.1.1.ebuild b/app-admin/packagekit/packagekit-1.1.1.ebuild
index 40e14261b2b..e0cba926c35 100644
--- a/app-admin/packagekit/packagekit-1.1.1.ebuild
+++ b/app-admin/packagekit/packagekit-1.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
diff --git a/app-admin/packagekit/packagekit-1.1.4.ebuild b/app-admin/packagekit/packagekit-1.1.4.ebuild
index 40e14261b2b..e0cba926c35 100644
--- a/app-admin/packagekit/packagekit-1.1.4.ebuild
+++ b/app-admin/packagekit/packagekit-1.1.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/app-admin/packagekit/packagekit-1.1.5.ebuild b/app-admin/packagekit/packagekit-1.1.5.ebuild
index 2d06243f249..8d79dcc1d57 100644
--- a/app-admin/packagekit/packagekit-1.1.5.ebuild
+++ b/app-admin/packagekit/packagekit-1.1.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/app-admin/pass/pass-1.6.5.ebuild b/app-admin/pass/pass-1.6.5.ebuild
index 6192070f19d..a94a7f3217a 100644
--- a/app-admin/pass/pass-1.6.5.ebuild
+++ b/app-admin/pass/pass-1.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/app-admin/pass/pass-1.7.ebuild b/app-admin/pass/pass-1.7.ebuild
index 0fd3049bdc3..519ef4f5244 100644
--- a/app-admin/pass/pass-1.7.ebuild
+++ b/app-admin/pass/pass-1.7.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/app-admin/pass/pass-9999.ebuild b/app-admin/pass/pass-9999.ebuild
index a3f305b9337..a476bc8e22b 100644
--- a/app-admin/pass/pass-9999.ebuild
+++ b/app-admin/pass/pass-9999.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/app-admin/passook/passook-20121001.ebuild b/app-admin/passook/passook-20121001.ebuild
index c903c537e73..57fb38cf6e7 100644
--- a/app-admin/passook/passook-20121001.ebuild
+++ b/app-admin/passook/passook-20121001.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/app-admin/passwordsafe/passwordsafe-1.00_beta.ebuild b/app-admin/passwordsafe/passwordsafe-1.00_beta.ebuild
index 3634dffc310..8ab30577399 100644
--- a/app-admin/passwordsafe/passwordsafe-1.00_beta.ebuild
+++ b/app-admin/passwordsafe/passwordsafe-1.00_beta.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/app-admin/passwordsafe/passwordsafe-1.01_beta.ebuild b/app-admin/passwordsafe/passwordsafe-1.01_beta.ebuild
index 3634dffc310..8ab30577399 100644
--- a/app-admin/passwordsafe/passwordsafe-1.01_beta.ebuild
+++ b/app-admin/passwordsafe/passwordsafe-1.01_beta.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/app-admin/paxtest/paxtest-0.9.15-r1.ebuild b/app-admin/paxtest/paxtest-0.9.15-r1.ebuild
index fba18a276d6..f90f07439b8 100644
--- a/app-admin/paxtest/paxtest-0.9.15-r1.ebuild
+++ b/app-admin/paxtest/paxtest-0.9.15-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/app-admin/perl-cleaner/perl-cleaner-2.20.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.20.ebuild
index 2e6a87eb267..dd4dcd26b03 100644
--- a/app-admin/perl-cleaner/perl-cleaner-2.20.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.20.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/app-admin/perl-cleaner/perl-cleaner-2.22.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.22.ebuild
index 7c14c404236..bd6769e2406 100644
--- a/app-admin/perl-cleaner/perl-cleaner-2.22.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.22.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/app-admin/perl-cleaner/perl-cleaner-2.23.ebuild b/app-admin/perl-cleaner/perl-cleaner-2.23.ebuild
index f6dc0a8edbf..46945c3d0b0 100644
--- a/app-admin/perl-cleaner/perl-cleaner-2.23.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-2.23.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/app-admin/perl-cleaner/perl-cleaner-9999.ebuild b/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
index 7c14c404236..bd6769e2406 100644
--- a/app-admin/perl-cleaner/perl-cleaner-9999.ebuild
+++ b/app-admin/perl-cleaner/perl-cleaner-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/app-admin/petrovich/petrovich-1.0.0.ebuild b/app-admin/petrovich/petrovich-1.0.0.ebuild
index 6ff33bf586d..ffe3db4f1cd 100644
--- a/app-admin/petrovich/petrovich-1.0.0.ebuild
+++ b/app-admin/petrovich/petrovich-1.0.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils
diff --git a/app-admin/pprocm/pprocm-1.0-r1.ebuild b/app-admin/pprocm/pprocm-1.0-r1.ebuild
index 4b416880e14..cfa629a0605 100644
--- a/app-admin/pprocm/pprocm-1.0-r1.ebuild
+++ b/app-admin/pprocm/pprocm-1.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
MY_P="PProcM-"${PV}
S=${WORKDIR}/${MY_P}
diff --git a/app-admin/pprocm/pprocm-1.0-r2.ebuild b/app-admin/pprocm/pprocm-1.0-r2.ebuild
index 67b967db70e..f8ba57d9b29 100644
--- a/app-admin/pprocm/pprocm-1.0-r2.ebuild
+++ b/app-admin/pprocm/pprocm-1.0-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
diff --git a/app-admin/prelude-manager/prelude-manager-3.0.0.ebuild b/app-admin/prelude-manager/prelude-manager-3.0.0.ebuild
index 74a4fc83155..c9aec56bed7 100644
--- a/app-admin/prelude-manager/prelude-manager-3.0.0.ebuild
+++ b/app-admin/prelude-manager/prelude-manager-3.0.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/app-admin/prelude-manager/prelude-manager-3.1.0.ebuild b/app-admin/prelude-manager/prelude-manager-3.1.0.ebuild
index 5a945bd91cb..45047c38dbc 100644
--- a/app-admin/prelude-manager/prelude-manager-3.1.0.ebuild
+++ b/app-admin/prelude-manager/prelude-manager-3.1.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/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild b/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild
index 7f723d87ff8..9cdb4c9c0fd 100644
--- a/app-admin/procinfo-ng/procinfo-ng-2.0.304-r1.ebuild
+++ b/app-admin/procinfo-ng/procinfo-ng-2.0.304-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/app-admin/procinfo/procinfo-18-r2.ebuild b/app-admin/procinfo/procinfo-18-r2.ebuild
index 5696955e19b..7f1603c5099 100644
--- a/app-admin/procinfo/procinfo-18-r2.ebuild
+++ b/app-admin/procinfo/procinfo-18-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils toolchain-funcs
diff --git a/app-admin/psmon/psmon-1.39-r1.ebuild b/app-admin/psmon/psmon-1.39-r1.ebuild
index 3d2627cd3f1..c1f5927344e 100644
--- a/app-admin/psmon/psmon-1.39-r1.ebuild
+++ b/app-admin/psmon/psmon-1.39-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/app-admin/puppet-agent/puppet-agent-1.7.2.ebuild b/app-admin/puppet-agent/puppet-agent-1.7.2.ebuild
index 0ee2a75c5e8..2bc4faf5122 100644
--- a/app-admin/puppet-agent/puppet-agent-1.7.2.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-1.7.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
inherit eutils systemd unpacker user
diff --git a/app-admin/puppet-agent/puppet-agent-1.8.2-r1.ebuild b/app-admin/puppet-agent/puppet-agent-1.8.2-r1.ebuild
index af25c744880..3d620d353c2 100644
--- a/app-admin/puppet-agent/puppet-agent-1.8.2-r1.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-1.8.2-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
inherit eutils systemd unpacker user
diff --git a/app-admin/puppet-agent/puppet-agent-1.8.2.ebuild b/app-admin/puppet-agent/puppet-agent-1.8.2.ebuild
index ed1c6f2dcc2..a2e32392bf7 100644
--- a/app-admin/puppet-agent/puppet-agent-1.8.2.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-1.8.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
inherit eutils systemd unpacker user
diff --git a/app-admin/puppet-agent/puppet-agent-1.8.3-r2.ebuild b/app-admin/puppet-agent/puppet-agent-1.8.3-r2.ebuild
index da0a3ddaee7..2d099b35fe0 100644
--- a/app-admin/puppet-agent/puppet-agent-1.8.3-r2.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-1.8.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=5
inherit eutils systemd unpacker user
diff --git a/app-admin/puppet-agent/puppet-agent-1.9.0.ebuild b/app-admin/puppet-agent/puppet-agent-1.9.0.ebuild
index da0a3ddaee7..2d099b35fe0 100644
--- a/app-admin/puppet-agent/puppet-agent-1.9.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-1.9.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils systemd unpacker user
diff --git a/app-admin/puppet-agent/puppet-agent-1.9.1.ebuild b/app-admin/puppet-agent/puppet-agent-1.9.1.ebuild
index 17881af0ec5..6c086d53b70 100644
--- a/app-admin/puppet-agent/puppet-agent-1.9.1.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-1.9.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
inherit eutils systemd unpacker user
diff --git a/app-admin/puppet-agent/puppet-agent-1.9.2.ebuild b/app-admin/puppet-agent/puppet-agent-1.9.2.ebuild
index da0a3ddaee7..2d099b35fe0 100644
--- a/app-admin/puppet-agent/puppet-agent-1.9.2.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-1.9.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
inherit eutils systemd unpacker user
diff --git a/app-admin/puppet-lint/metadata.xml b/app-admin/puppet-lint/metadata.xml
index 2fe1abed284..78dad76cdc2 100644
--- a/app-admin/puppet-lint/metadata.xml
+++ b/app-admin/puppet-lint/metadata.xml
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<!--
-$Id$
---><pkgmetadata>
+<pkgmetadata>
<maintainer type="project">
<email>sysadmin@gentoo.org</email>
<name>Gentoo Sysadmin Project</name>
diff --git a/app-admin/puppet-lint/puppet-lint-2.0.2.ebuild b/app-admin/puppet-lint/puppet-lint-2.0.2.ebuild
index 6c99e19fe66..cf379613b0f 100644
--- a/app-admin/puppet-lint/puppet-lint-2.0.2.ebuild
+++ b/app-admin/puppet-lint/puppet-lint-2.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
USE_RUBY="ruby20 ruby21 ruby22 ruby23"
diff --git a/app-admin/puppet-lint/puppet-lint-2.1.0.ebuild b/app-admin/puppet-lint/puppet-lint-2.1.0.ebuild
index 252731d4901..1f3b7e7e3d4 100644
--- a/app-admin/puppet-lint/puppet-lint-2.1.0.ebuild
+++ b/app-admin/puppet-lint/puppet-lint-2.1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
USE_RUBY="ruby20 ruby21 ruby22 ruby23"
diff --git a/app-admin/puppet-lint/puppet-lint-2.1.1.ebuild b/app-admin/puppet-lint/puppet-lint-2.1.1.ebuild
index 96317fcca83..57be7f078fe 100644
--- a/app-admin/puppet-lint/puppet-lint-2.1.1.ebuild
+++ b/app-admin/puppet-lint/puppet-lint-2.1.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
USE_RUBY="ruby21 ruby22 ruby23"
diff --git a/app-admin/puppet/puppet-3.8.7-r1.ebuild b/app-admin/puppet/puppet-3.8.7-r1.ebuild
index f41553cdba9..22afe1f2c46 100644
--- a/app-admin/puppet/puppet-3.8.7-r1.ebuild
+++ b/app-admin/puppet/puppet-3.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/app-admin/puppet/puppet-3.8.7.ebuild b/app-admin/puppet/puppet-3.8.7.ebuild
index 3534a5ac876..4a2dbbdaa6d 100644
--- a/app-admin/puppet/puppet-3.8.7.ebuild
+++ b/app-admin/puppet/puppet-3.8.7.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/app-admin/puppet/puppet-4.4.2.ebuild b/app-admin/puppet/puppet-4.4.2.ebuild
index 67270df664b..bc270802153 100644
--- a/app-admin/puppet/puppet-4.4.2.ebuild
+++ b/app-admin/puppet/puppet-4.4.2.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/app-admin/puppet/puppet-4.7.0.ebuild b/app-admin/puppet/puppet-4.7.0.ebuild
index 794b37638b7..d673fb3ccab 100644
--- a/app-admin/puppet/puppet-4.7.0.ebuild
+++ b/app-admin/puppet/puppet-4.7.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/app-admin/puppet/puppet-4.8.1.ebuild b/app-admin/puppet/puppet-4.8.1.ebuild
index cb0d11461a9..616f7d96d36 100644
--- a/app-admin/puppet/puppet-4.8.1.ebuild
+++ b/app-admin/puppet/puppet-4.8.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/app-admin/puppet/puppet-4.9.1.ebuild b/app-admin/puppet/puppet-4.9.1.ebuild
index a3790b6f8cd..49da570056a 100644
--- a/app-admin/puppet/puppet-4.9.1.ebuild
+++ b/app-admin/puppet/puppet-4.9.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/app-admin/puppetdb/puppetdb-4.2.2.ebuild b/app-admin/puppetdb/puppetdb-4.2.2.ebuild
index ff235d67b55..798d22ccf49 100644
--- a/app-admin/puppetdb/puppetdb-4.2.2.ebuild
+++ b/app-admin/puppetdb/puppetdb-4.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=5
diff --git a/app-admin/puppetdb/puppetdb-4.2.4.ebuild b/app-admin/puppetdb/puppetdb-4.2.4.ebuild
index 7f657446ffe..38addd0555b 100644
--- a/app-admin/puppetdb/puppetdb-4.2.4.ebuild
+++ b/app-admin/puppetdb/puppetdb-4.2.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/app-admin/puppetdb/puppetdb-4.3.0-r1.ebuild b/app-admin/puppetdb/puppetdb-4.3.0-r1.ebuild
index f230b0a4b04..0ee43e9bb56 100644
--- a/app-admin/puppetdb/puppetdb-4.3.0-r1.ebuild
+++ b/app-admin/puppetdb/puppetdb-4.3.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/app-admin/puppetserver/puppetserver-2.3.2.ebuild b/app-admin/puppetserver/puppetserver-2.3.2.ebuild
index c2967eee9ac..cede8aa827d 100644
--- a/app-admin/puppetserver/puppetserver-2.3.2.ebuild
+++ b/app-admin/puppetserver/puppetserver-2.3.2.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/app-admin/puppetserver/puppetserver-2.4.0.ebuild b/app-admin/puppetserver/puppetserver-2.4.0.ebuild
index c2967eee9ac..cede8aa827d 100644
--- a/app-admin/puppetserver/puppetserver-2.4.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-2.4.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/app-admin/puppetserver/puppetserver-2.7.1.ebuild b/app-admin/puppetserver/puppetserver-2.7.1.ebuild
index f8fd587639a..bc3555abfd8 100644
--- a/app-admin/puppetserver/puppetserver-2.7.1.ebuild
+++ b/app-admin/puppetserver/puppetserver-2.7.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
diff --git a/app-admin/pwcrypt/pwcrypt-1.2.2-r1.ebuild b/app-admin/pwcrypt/pwcrypt-1.2.2-r1.ebuild
index f8c293aff03..bd467dcf45c 100644
--- a/app-admin/pwcrypt/pwcrypt-1.2.2-r1.ebuild
+++ b/app-admin/pwcrypt/pwcrypt-1.2.2-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/app-admin/pwcrypt/pwcrypt-1.2.2.ebuild b/app-admin/pwcrypt/pwcrypt-1.2.2.ebuild
index 1cce7360361..46467862af0 100644
--- a/app-admin/pwcrypt/pwcrypt-1.2.2.ebuild
+++ b/app-admin/pwcrypt/pwcrypt-1.2.2.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/app-admin/pwgen/pwgen-2.07.ebuild b/app-admin/pwgen/pwgen-2.07.ebuild
index 380f6a73265..9df81de1440 100644
--- a/app-admin/pwgen/pwgen-2.07.ebuild
+++ b/app-admin/pwgen/pwgen-2.07.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/app-admin/pydf/pydf-12-r1.ebuild b/app-admin/pydf/pydf-12-r1.ebuild
index 4360f9e57a9..7621a081a3c 100644
--- a/app-admin/pydf/pydf-12-r1.ebuild
+++ b/app-admin/pydf/pydf-12-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,3_5} )
diff --git a/app-admin/python-updater/python-updater-0.11.ebuild b/app-admin/python-updater/python-updater-0.11.ebuild
index 34982ddacde..cd73f4e5860 100644
--- a/app-admin/python-updater/python-updater-0.11.ebuild
+++ b/app-admin/python-updater/python-updater-0.11.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/app-admin/python-updater/python-updater-0.12.ebuild b/app-admin/python-updater/python-updater-0.12.ebuild
index f7b7f51740a..8e2df7dfc60 100644
--- a/app-admin/python-updater/python-updater-0.12.ebuild
+++ b/app-admin/python-updater/python-updater-0.12.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/app-admin/python-updater/python-updater-0.13.ebuild b/app-admin/python-updater/python-updater-0.13.ebuild
index 1af098b7378..a1f5c838588 100644
--- a/app-admin/python-updater/python-updater-0.13.ebuild
+++ b/app-admin/python-updater/python-updater-0.13.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/app-admin/python-updater/python-updater-0.14.ebuild b/app-admin/python-updater/python-updater-0.14.ebuild
index 8f1475869ec..724df89ea4e 100644
--- a/app-admin/python-updater/python-updater-0.14.ebuild
+++ b/app-admin/python-updater/python-updater-0.14.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/app-admin/python-updater/python-updater-9999.ebuild b/app-admin/python-updater/python-updater-9999.ebuild
index f7b7f51740a..8e2df7dfc60 100644
--- a/app-admin/python-updater/python-updater-9999.ebuild
+++ b/app-admin/python-updater/python-updater-9999.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/app-admin/qpage/qpage-3.3.ebuild b/app-admin/qpage/qpage-3.3.ebuild
index dfb76962909..01cddbc8732 100644
--- a/app-admin/qpage/qpage-3.3.ebuild
+++ b/app-admin/qpage/qpage-3.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils toolchain-funcs
diff --git a/app-admin/qtpass/qtpass-1.0.5.ebuild b/app-admin/qtpass/qtpass-1.0.5.ebuild
index ed2aa21369c..a2c92901ebe 100644
--- a/app-admin/qtpass/qtpass-1.0.5.ebuild
+++ b/app-admin/qtpass/qtpass-1.0.5.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/app-admin/qtpass/qtpass-1.1.0.ebuild b/app-admin/qtpass/qtpass-1.1.0.ebuild
index c1737456934..4c10bfbd055 100644
--- a/app-admin/qtpass/qtpass-1.1.0.ebuild
+++ b/app-admin/qtpass/qtpass-1.1.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/app-admin/qtpass/qtpass-1.1.5.ebuild b/app-admin/qtpass/qtpass-1.1.5.ebuild
index f788d5e3ce0..e9a54e27089 100644
--- a/app-admin/qtpass/qtpass-1.1.5.ebuild
+++ b/app-admin/qtpass/qtpass-1.1.5.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/app-admin/qtpass/qtpass-1.1.6.ebuild b/app-admin/qtpass/qtpass-1.1.6.ebuild
index 31fd8d6e34a..67195457fc9 100644
--- a/app-admin/qtpass/qtpass-1.1.6.ebuild
+++ b/app-admin/qtpass/qtpass-1.1.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/app-admin/qtpass/qtpass-9999.ebuild b/app-admin/qtpass/qtpass-9999.ebuild
index 68a01da4480..8da3eb46f11 100644
--- a/app-admin/qtpass/qtpass-9999.ebuild
+++ b/app-admin/qtpass/qtpass-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/app-admin/quickswitch/quickswitch-1.05.ebuild b/app-admin/quickswitch/quickswitch-1.05.ebuild
index 7dd0c7a2282..ab9f3d539eb 100644
--- a/app-admin/quickswitch/quickswitch-1.05.ebuild
+++ b/app-admin/quickswitch/quickswitch-1.05.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
IUSE="ncurses"
diff --git a/app-admin/r10k/r10k-1.1.3-r1.ebuild b/app-admin/r10k/r10k-1.1.3-r1.ebuild
index 2eb18ec22bf..18a0bbfe90f 100644
--- a/app-admin/r10k/r10k-1.1.3-r1.ebuild
+++ b/app-admin/r10k/r10k-1.1.3-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/app-admin/r10k/r10k-1.5.1.ebuild b/app-admin/r10k/r10k-1.5.1.ebuild
index 062aa8b7d38..2d19cc79c6d 100644
--- a/app-admin/r10k/r10k-1.5.1.ebuild
+++ b/app-admin/r10k/r10k-1.5.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/app-admin/radmind/radmind-1.14.1-r1.ebuild b/app-admin/radmind/radmind-1.14.1-r1.ebuild
index 45bb5811863..9d94df3075c 100644
--- a/app-admin/radmind/radmind-1.14.1-r1.ebuild
+++ b/app-admin/radmind/radmind-1.14.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/app-admin/radmind/radmind-1.14.1.ebuild b/app-admin/radmind/radmind-1.14.1.ebuild
index 4551dc1c580..946cffdfc9d 100644
--- a/app-admin/radmind/radmind-1.14.1.ebuild
+++ b/app-admin/radmind/radmind-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/app-admin/ranpwd/ranpwd-1.2.ebuild b/app-admin/ranpwd/ranpwd-1.2.ebuild
index 67ec4f1fe01..14866c580ca 100644
--- a/app-admin/ranpwd/ranpwd-1.2.ebuild
+++ b/app-admin/ranpwd/ranpwd-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
diff --git a/app-admin/recursos/recursos-2.0-r1.ebuild b/app-admin/recursos/recursos-2.0-r1.ebuild
index 150cf1be89c..7da26bdf3a7 100644
--- a/app-admin/recursos/recursos-2.0-r1.ebuild
+++ b/app-admin/recursos/recursos-2.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=4
diff --git a/app-admin/reportmagic/reportmagic-2.21.ebuild b/app-admin/reportmagic/reportmagic-2.21.ebuild
index cc9b2c952bc..4f1aae12269 100644
--- a/app-admin/reportmagic/reportmagic-2.21.ebuild
+++ b/app-admin/reportmagic/reportmagic-2.21.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/app-admin/restart_services/restart_services-0.13.0-r1.ebuild b/app-admin/restart_services/restart_services-0.13.0-r1.ebuild
index 87fa490cff6..02d25b888c7 100644
--- a/app-admin/restart_services/restart_services-0.13.0-r1.ebuild
+++ b/app-admin/restart_services/restart_services-0.13.0-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/app-admin/restart_services/restart_services-0.13.1.ebuild b/app-admin/restart_services/restart_services-0.13.1.ebuild
index 87fa490cff6..02d25b888c7 100644
--- a/app-admin/restart_services/restart_services-0.13.1.ebuild
+++ b/app-admin/restart_services/restart_services-0.13.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/app-admin/rex/rex-1.3.3.ebuild b/app-admin/rex/rex-1.3.3.ebuild
index 79e8253616c..6081b372fac 100644
--- a/app-admin/rex/rex-1.3.3.ebuild
+++ b/app-admin/rex/rex-1.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=5
diff --git a/app-admin/rex/rex-1.4.0-r1.ebuild b/app-admin/rex/rex-1.4.0-r1.ebuild
index 04c39e26b50..7fdb6b904a4 100644
--- a/app-admin/rex/rex-1.4.0-r1.ebuild
+++ b/app-admin/rex/rex-1.4.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/app-admin/rex/rex-1.4.1.ebuild b/app-admin/rex/rex-1.4.1.ebuild
index 65569d57e0b..acaf671c78b 100644
--- a/app-admin/rex/rex-1.4.1.ebuild
+++ b/app-admin/rex/rex-1.4.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
diff --git a/app-admin/rex/rex-9999.ebuild b/app-admin/rex/rex-9999.ebuild
index 6cde2ea0fe3..9f36dfc5c24 100644
--- a/app-admin/rex/rex-9999.ebuild
+++ b/app-admin/rex/rex-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/app-admin/rsyslog/rsyslog-8.16.0-r1.ebuild b/app-admin/rsyslog/rsyslog-8.16.0-r1.ebuild
index c108fc5c9df..cb3230fa90e 100644
--- a/app-admin/rsyslog/rsyslog-8.16.0-r1.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.16.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/app-admin/rsyslog/rsyslog-8.19.0.ebuild b/app-admin/rsyslog/rsyslog-8.19.0.ebuild
index 1d36d3cc626..df6562984b9 100644
--- a/app-admin/rsyslog/rsyslog-8.19.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.19.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/app-admin/rsyslog/rsyslog-8.22.0.ebuild b/app-admin/rsyslog/rsyslog-8.22.0.ebuild
index d0decc1f204..05b81bde1cc 100644
--- a/app-admin/rsyslog/rsyslog-8.22.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.22.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/app-admin/rsyslog/rsyslog-8.23.0.ebuild b/app-admin/rsyslog/rsyslog-8.23.0.ebuild
index 22a470a6e61..95c92c9ba6a 100644
--- a/app-admin/rsyslog/rsyslog-8.23.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.23.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/app-admin/rsyslog/rsyslog-8.24.0.ebuild b/app-admin/rsyslog/rsyslog-8.24.0.ebuild
index 08a894118ed..6b83fa1d813 100644
--- a/app-admin/rsyslog/rsyslog-8.24.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.24.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/app-admin/sagan-rules/sagan-rules-20130430.ebuild b/app-admin/sagan-rules/sagan-rules-20130430.ebuild
index 7f21b1ef2d8..e15ff4d3168 100644
--- a/app-admin/sagan-rules/sagan-rules-20130430.ebuild
+++ b/app-admin/sagan-rules/sagan-rules-20130430.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/app-admin/sagan-rules/sagan-rules-20140617.ebuild b/app-admin/sagan-rules/sagan-rules-20140617.ebuild
index 0194a6aa432..b443e4c761d 100644
--- a/app-admin/sagan-rules/sagan-rules-20140617.ebuild
+++ b/app-admin/sagan-rules/sagan-rules-20140617.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/app-admin/sagan-rules/sagan-rules-99999999.ebuild b/app-admin/sagan-rules/sagan-rules-99999999.ebuild
index 7f1dd0d0841..c26a05f9cc1 100644
--- a/app-admin/sagan-rules/sagan-rules-99999999.ebuild
+++ b/app-admin/sagan-rules/sagan-rules-99999999.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/app-admin/sagan/sagan-0.2.3.ebuild b/app-admin/sagan/sagan-0.2.3.ebuild
index 19c5c57be20..2196d8eb46f 100644
--- a/app-admin/sagan/sagan-0.2.3.ebuild
+++ b/app-admin/sagan/sagan-0.2.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/app-admin/sagan/sagan-1.0.0_rc3.ebuild b/app-admin/sagan/sagan-1.0.0_rc3.ebuild
index ea347ac5829..d41b3e3d471 100644
--- a/app-admin/sagan/sagan-1.0.0_rc3.ebuild
+++ b/app-admin/sagan/sagan-1.0.0_rc3.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/app-admin/salt/salt-2015.5.10.ebuild b/app-admin/salt/salt-2015.5.10.ebuild
index 46063aef3e3..984c51e521a 100644
--- a/app-admin/salt/salt-2015.5.10.ebuild
+++ b/app-admin/salt/salt-2015.5.10.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/app-admin/salt/salt-2015.8.13.ebuild b/app-admin/salt/salt-2015.8.13.ebuild
index eed7d2dfecc..00702786117 100644
--- a/app-admin/salt/salt-2015.8.13.ebuild
+++ b/app-admin/salt/salt-2015.8.13.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/app-admin/salt/salt-2016.11.2.ebuild b/app-admin/salt/salt-2016.11.2.ebuild
index a1f5c2e6b4e..872e4bab594 100644
--- a/app-admin/salt/salt-2016.11.2.ebuild
+++ b/app-admin/salt/salt-2016.11.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 )
diff --git a/app-admin/salt/salt-2016.3.5.ebuild b/app-admin/salt/salt-2016.3.5.ebuild
index 25897948b48..16ccbd833be 100644
--- a/app-admin/salt/salt-2016.3.5.ebuild
+++ b/app-admin/salt/salt-2016.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
PYTHON_COMPAT=( python2_7 )
diff --git a/app-admin/salt/salt-9999.ebuild b/app-admin/salt/salt-9999.ebuild
index a7ecc332974..a8ef4493e17 100644
--- a/app-admin/salt/salt-9999.ebuild
+++ b/app-admin/salt/salt-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/app-admin/serf/serf-0.8.0.ebuild b/app-admin/serf/serf-0.8.0.ebuild
index a8b7fc5d3a8..e4be0991b39 100644
--- a/app-admin/serf/serf-0.8.0.ebuild
+++ b/app-admin/serf/serf-0.8.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/app-admin/setools/setools-3.3.8-r7.ebuild b/app-admin/setools/setools-3.3.8-r7.ebuild
index a200b51135a..dcd76238655 100644
--- a/app-admin/setools/setools-3.3.8-r7.ebuild
+++ b/app-admin/setools/setools-3.3.8-r7.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 python3_4 )
diff --git a/app-admin/setools/setools-4.0.1.ebuild b/app-admin/setools/setools-4.0.1.ebuild
index 10eec48c9e3..4f9175aaf82 100644
--- a/app-admin/setools/setools-4.0.1.ebuild
+++ b/app-admin/setools/setools-4.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="6"
PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
diff --git a/app-admin/setools/setools-4.1.0.ebuild b/app-admin/setools/setools-4.1.0.ebuild
index af77d447ce6..f3c2e10d8de 100644
--- a/app-admin/setools/setools-4.1.0.ebuild
+++ b/app-admin/setools/setools-4.1.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 python3_5 )
diff --git a/app-admin/setools/setools-9999.ebuild b/app-admin/setools/setools-9999.ebuild
index af77d447ce6..f3c2e10d8de 100644
--- a/app-admin/setools/setools-9999.ebuild
+++ b/app-admin/setools/setools-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 python3_5 )
diff --git a/app-admin/socklog/socklog-2.1.0.ebuild b/app-admin/socklog/socklog-2.1.0.ebuild
index 2a024b29779..f7853dd9904 100644
--- a/app-admin/socklog/socklog-2.1.0.ebuild
+++ b/app-admin/socklog/socklog-2.1.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/app-admin/sshguard/sshguard-1.7.1.ebuild b/app-admin/sshguard/sshguard-1.7.1.ebuild
index a0ab1f7e9af..a730edfc107 100644
--- a/app-admin/sshguard/sshguard-1.7.1.ebuild
+++ b/app-admin/sshguard/sshguard-1.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=6
inherit flag-o-matic
diff --git a/app-admin/sshguard/sshguard-1.99.0-r1.ebuild b/app-admin/sshguard/sshguard-1.99.0-r1.ebuild
index 8a7fde61833..d7e41588491 100644
--- a/app-admin/sshguard/sshguard-1.99.0-r1.ebuild
+++ b/app-admin/sshguard/sshguard-1.99.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
inherit flag-o-matic
diff --git a/app-admin/stow/stow-2.2.2-r1.ebuild b/app-admin/stow/stow-2.2.2-r1.ebuild
index 0518a29899b..d4c2355c595 100644
--- a/app-admin/stow/stow-2.2.2-r1.ebuild
+++ b/app-admin/stow/stow-2.2.2-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/app-admin/sud/sud-1.3-r1.ebuild b/app-admin/sud/sud-1.3-r1.ebuild
index bb52554e2a0..ef9d6f7005d 100644
--- a/app-admin/sud/sud-1.3-r1.ebuild
+++ b/app-admin/sud/sud-1.3-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
diff --git a/app-admin/sudo/sudo-1.8.18_p1.ebuild b/app-admin/sudo/sudo-1.8.18_p1.ebuild
index 9592f5d7952..f01c3b37c7c 100644
--- a/app-admin/sudo/sudo-1.8.18_p1.ebuild
+++ b/app-admin/sudo/sudo-1.8.18_p1.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/app-admin/sudo/sudo-1.8.19_p2.ebuild b/app-admin/sudo/sudo-1.8.19_p2.ebuild
index 36d54c1c41c..5103d4888ee 100644
--- a/app-admin/sudo/sudo-1.8.19_p2.ebuild
+++ b/app-admin/sudo/sudo-1.8.19_p2.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/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild
index 4fc553cbe2e..4b39080b529 100644
--- a/app-admin/sudo/sudo-9999.ebuild
+++ b/app-admin/sudo/sudo-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/app-admin/superadduser/superadduser-1.0.9.ebuild b/app-admin/superadduser/superadduser-1.0.9.ebuild
index 1cf8c94eb09..2b2feb3db80 100644
--- a/app-admin/superadduser/superadduser-1.0.9.ebuild
+++ b/app-admin/superadduser/superadduser-1.0.9.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="Interactive adduser script from Slackware"
HOMEPAGE="http://www.interlude.org.uk/unix/slackware/"
diff --git a/app-admin/supernova/supernova-2.0.9.ebuild b/app-admin/supernova/supernova-2.0.9.ebuild
index 56a25edac92..1ddd3b07ee0 100644
--- a/app-admin/supernova/supernova-2.0.9.ebuild
+++ b/app-admin/supernova/supernova-2.0.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
PYTHON_COMPAT=( python2_7 )
diff --git a/app-admin/supernova/supernova-2.1.0.ebuild b/app-admin/supernova/supernova-2.1.0.ebuild
index 1339eff5ee1..14804372099 100644
--- a/app-admin/supernova/supernova-2.1.0.ebuild
+++ b/app-admin/supernova/supernova-2.1.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
PYTHON_COMPAT=( python2_7 )
diff --git a/app-admin/supernova/supernova-2.2.0.ebuild b/app-admin/supernova/supernova-2.2.0.ebuild
index 1339eff5ee1..14804372099 100644
--- a/app-admin/supernova/supernova-2.2.0.ebuild
+++ b/app-admin/supernova/supernova-2.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
PYTHON_COMPAT=( python2_7 )
diff --git a/app-admin/supervisor/supervisor-3.1.3.ebuild b/app-admin/supervisor/supervisor-3.1.3.ebuild
index fcdf20cf2e4..00493354169 100644
--- a/app-admin/supervisor/supervisor-3.1.3.ebuild
+++ b/app-admin/supervisor/supervisor-3.1.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/app-admin/supervisor/supervisor-3.2.1.ebuild b/app-admin/supervisor/supervisor-3.2.1.ebuild
index 049c53de7c3..203f2f5ad50 100644
--- a/app-admin/supervisor/supervisor-3.2.1.ebuild
+++ b/app-admin/supervisor/supervisor-3.2.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/app-admin/supervisor/supervisor-3.2.2.ebuild b/app-admin/supervisor/supervisor-3.2.2.ebuild
index 049c53de7c3..203f2f5ad50 100644
--- a/app-admin/supervisor/supervisor-3.2.2.ebuild
+++ b/app-admin/supervisor/supervisor-3.2.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/app-admin/supervisor/supervisor-3.2.3.ebuild b/app-admin/supervisor/supervisor-3.2.3.ebuild
index 049c53de7c3..203f2f5ad50 100644
--- a/app-admin/supervisor/supervisor-3.2.3.ebuild
+++ b/app-admin/supervisor/supervisor-3.2.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/app-admin/supervisor/supervisor-3.3.0.ebuild b/app-admin/supervisor/supervisor-3.3.0.ebuild
index 117a6551d6d..70bbbe97611 100644
--- a/app-admin/supervisor/supervisor-3.3.0.ebuild
+++ b/app-admin/supervisor/supervisor-3.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="5"
diff --git a/app-admin/supervisor/supervisor-3.3.1-r1.ebuild b/app-admin/supervisor/supervisor-3.3.1-r1.ebuild
index 06fe66a8999..1ac705a3616 100644
--- a/app-admin/supervisor/supervisor-3.3.1-r1.ebuild
+++ b/app-admin/supervisor/supervisor-3.3.1-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/app-admin/supervisor/supervisor-3.3.1.ebuild b/app-admin/supervisor/supervisor-3.3.1.ebuild
index 117a6551d6d..70bbbe97611 100644
--- a/app-admin/supervisor/supervisor-3.3.1.ebuild
+++ b/app-admin/supervisor/supervisor-3.3.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/app-admin/swatchdog/swatchdog-3.2.4.ebuild b/app-admin/swatchdog/swatchdog-3.2.4.ebuild
index d2ba64dae03..0dcfd1b8062 100644
--- a/app-admin/swatchdog/swatchdog-3.2.4.ebuild
+++ b/app-admin/swatchdog/swatchdog-3.2.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/app-admin/sxid/sxid-4.2-r1.ebuild b/app-admin/sxid/sxid-4.2-r1.ebuild
index f5c80e2b36e..da19f4b987a 100644
--- a/app-admin/sxid/sxid-4.2-r1.ebuild
+++ b/app-admin/sxid/sxid-4.2-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/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild b/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild
index 4ca42aac021..5244c9c68da 100644
--- a/app-admin/sysklogd/sysklogd-1.5.1-r1.ebuild
+++ b/app-admin/sysklogd/sysklogd-1.5.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/app-admin/sysklogd/sysklogd-1.5.1.ebuild b/app-admin/sysklogd/sysklogd-1.5.1.ebuild
index db3b49d505e..99df849cf10 100644
--- a/app-admin/sysklogd/sysklogd-1.5.1.ebuild
+++ b/app-admin/sysklogd/sysklogd-1.5.1.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/app-admin/syslog-ng/syslog-ng-3.4.8.ebuild b/app-admin/syslog-ng/syslog-ng-3.4.8.ebuild
index b0d2b096496..cfe719f2446 100644
--- a/app-admin/syslog-ng/syslog-ng-3.4.8.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.4.8.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils multilib systemd
diff --git a/app-admin/syslog-ng/syslog-ng-3.6.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.6.2.ebuild
index e8e6ec8a475..febb3545a58 100644
--- a/app-admin/syslog-ng/syslog-ng-3.6.2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.6.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
inherit eutils multilib systemd versionator
diff --git a/app-admin/syslog-ng/syslog-ng-3.6.4.ebuild b/app-admin/syslog-ng/syslog-ng-3.6.4.ebuild
index 2f33e6031be..641db918336 100644
--- a/app-admin/syslog-ng/syslog-ng-3.6.4.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.6.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
inherit eutils multilib systemd versionator
diff --git a/app-admin/syslog-ng/syslog-ng-3.7.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.7.2.ebuild
index b1ca716dca8..2bdcb1dc168 100644
--- a/app-admin/syslog-ng/syslog-ng-3.7.2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.7.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
PYTHON_COMPAT=( python2_7 )
diff --git a/app-admin/syslog-ng/syslog-ng-3.7.3.ebuild b/app-admin/syslog-ng/syslog-ng-3.7.3.ebuild
index 6e808d9b88c..dfec3b58094 100644
--- a/app-admin/syslog-ng/syslog-ng-3.7.3.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.7.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
PYTHON_COMPAT=( python2_7 )
diff --git a/app-admin/syslog-summary/syslog-summary-1.14-r1.ebuild b/app-admin/syslog-summary/syslog-summary-1.14-r1.ebuild
index 4b2097c8543..f23f58c39b8 100644
--- a/app-admin/syslog-summary/syslog-summary-1.14-r1.ebuild
+++ b/app-admin/syslog-summary/syslog-summary-1.14-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/app-admin/syslogread/syslogread-0.92-r1.ebuild b/app-admin/syslogread/syslogread-0.92-r1.ebuild
index 6c40e596a57..f92cca74685 100644
--- a/app-admin/syslogread/syslogread-0.92-r1.ebuild
+++ b/app-admin/syslogread/syslogread-0.92-r1.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/app-admin/sysrqd/sysrqd-14.ebuild b/app-admin/sysrqd/sysrqd-14.ebuild
index 8c221311352..3475122a580 100644
--- a/app-admin/sysrqd/sysrqd-14.ebuild
+++ b/app-admin/sysrqd/sysrqd-14.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils toolchain-funcs
diff --git a/app-admin/sysstat/sysstat-11.4.0.ebuild b/app-admin/sysstat/sysstat-11.4.0.ebuild
index efb7b7bc4e7..34da2f0d076 100644
--- a/app-admin/sysstat/sysstat-11.4.0.ebuild
+++ b/app-admin/sysstat/sysstat-11.4.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils flag-o-matic multilib systemd toolchain-funcs
diff --git a/app-admin/sysstat/sysstat-11.4.2.ebuild b/app-admin/sysstat/sysstat-11.4.2.ebuild
index 716e055289a..dc7438d99f5 100644
--- a/app-admin/sysstat/sysstat-11.4.2.ebuild
+++ b/app-admin/sysstat/sysstat-11.4.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
inherit flag-o-matic multilib systemd toolchain-funcs
diff --git a/app-admin/sysstat/sysstat-11.4.3.ebuild b/app-admin/sysstat/sysstat-11.4.3.ebuild
index 4dd0200f5ae..74bbea22aec 100644
--- a/app-admin/sysstat/sysstat-11.4.3.ebuild
+++ b/app-admin/sysstat/sysstat-11.4.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 flag-o-matic multilib systemd toolchain-funcs
diff --git a/app-admin/sysstat/sysstat-11.5.3.ebuild b/app-admin/sysstat/sysstat-11.5.3.ebuild
index b9a751627b5..6c0436182de 100644
--- a/app-admin/sysstat/sysstat-11.5.3.ebuild
+++ b/app-admin/sysstat/sysstat-11.5.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit flag-o-matic multilib systemd toolchain-funcs
diff --git a/app-admin/sysstat/sysstat-11.5.4.ebuild b/app-admin/sysstat/sysstat-11.5.4.ebuild
index 6ea03a492e8..9b1bbcd748c 100644
--- a/app-admin/sysstat/sysstat-11.5.4.ebuild
+++ b/app-admin/sysstat/sysstat-11.5.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
inherit flag-o-matic multilib systemd toolchain-funcs
diff --git a/app-admin/system-config-printer/system-config-printer-1.4.8.ebuild b/app-admin/system-config-printer/system-config-printer-1.4.8.ebuild
index ad6c8e046ae..eecbfe15bdc 100644
--- a/app-admin/system-config-printer/system-config-printer-1.4.8.ebuild
+++ b/app-admin/system-config-printer/system-config-printer-1.4.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"
GCONF_DEBUG="no"
diff --git a/app-admin/system-tools-backends/system-tools-backends-2.10.2.ebuild b/app-admin/system-tools-backends/system-tools-backends-2.10.2.ebuild
index 529c9a127f4..436bb9c06c1 100644
--- a/app-admin/system-tools-backends/system-tools-backends-2.10.2.ebuild
+++ b/app-admin/system-tools-backends/system-tools-backends-2.10.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"
GCONF_DEBUG="no"
diff --git a/app-admin/systemdgenie/systemdgenie-0.99.0.ebuild b/app-admin/systemdgenie/systemdgenie-0.99.0.ebuild
index fec7c70015b..3d6e2edbee3 100644
--- a/app-admin/systemdgenie/systemdgenie-0.99.0.ebuild
+++ b/app-admin/systemdgenie/systemdgenie-0.99.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/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.4.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.4.1.ebuild
index cb7c7b5a201..cce5e34e9e3 100644
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.4.1.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.4.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/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.0.ebuild
index cb7c7b5a201..cce5e34e9e3 100644
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.0.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.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/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.1.ebuild
index cb7c7b5a201..cce5e34e9e3 100644
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.1.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.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/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.2.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.2.ebuild
index cb7c7b5a201..cce5e34e9e3 100644
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.2.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.2.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/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.3.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.3.ebuild
index cb7c7b5a201..cce5e34e9e3 100644
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.3.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.3.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/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.4.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.4.ebuild
index cb7c7b5a201..cce5e34e9e3 100644
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.5.4.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.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/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.0.ebuild
index cb7c7b5a201..cce5e34e9e3 100644
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.0.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.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/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.1.ebuild
index cb7c7b5a201..cce5e34e9e3 100644
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.6.1.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.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/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.0.ebuild
index cb7c7b5a201..cce5e34e9e3 100644
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.0.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.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/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.1.ebuild
index cb7c7b5a201..cce5e34e9e3 100644
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.1.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.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/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.2.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.2.ebuild
index cb7c7b5a201..cce5e34e9e3 100644
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.2.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.2.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/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.3.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.3.ebuild
index cb7c7b5a201..cce5e34e9e3 100644
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.3.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.7.3.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/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.0.ebuild
index cb7c7b5a201..cce5e34e9e3 100644
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.0.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.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/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.1.ebuild
index cb7c7b5a201..cce5e34e9e3 100644
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.1.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.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/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.2.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.2.ebuild
index cb7c7b5a201..cce5e34e9e3 100644
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.2.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.2.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/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.3.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.3.ebuild
index cb7c7b5a201..cce5e34e9e3 100644
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.3.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.3.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/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.0.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.0.ebuild
index cb7c7b5a201..cce5e34e9e3 100644
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.0.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.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
diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.1.ebuild
index cb7c7b5a201..cce5e34e9e3 100644
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.1.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.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/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.2.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.2.ebuild
index cb7c7b5a201..cce5e34e9e3 100644
--- a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.2.ebuild
+++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.9.2.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/app-admin/tenshi/tenshi-0.12.ebuild b/app-admin/tenshi/tenshi-0.12.ebuild
index 5af09323b1b..00fc0e6fd7a 100644
--- a/app-admin/tenshi/tenshi-0.12.ebuild
+++ b/app-admin/tenshi/tenshi-0.12.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 eutils user
diff --git a/app-admin/tenshi/tenshi-0.14.ebuild b/app-admin/tenshi/tenshi-0.14.ebuild
index 402b52d93a9..462d7eb8175 100644
--- a/app-admin/tenshi/tenshi-0.14.ebuild
+++ b/app-admin/tenshi/tenshi-0.14.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 eutils user
diff --git a/app-admin/tenshi/tenshi-0.15.ebuild b/app-admin/tenshi/tenshi-0.15.ebuild
index 487e4afd487..16c4de5754a 100644
--- a/app-admin/tenshi/tenshi-0.15.ebuild
+++ b/app-admin/tenshi/tenshi-0.15.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils user
diff --git a/app-admin/testdisk/testdisk-7.0-r3.ebuild b/app-admin/testdisk/testdisk-7.0-r3.ebuild
index 9ca63fa3eb2..22e8db9dfe2 100644
--- a/app-admin/testdisk/testdisk-7.0-r3.ebuild
+++ b/app-admin/testdisk/testdisk-7.0-r3.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/app-admin/tmpreaper/tmpreaper-1.6.13-r1.ebuild b/app-admin/tmpreaper/tmpreaper-1.6.13-r1.ebuild
index afd3fac7606..22448900a7e 100644
--- a/app-admin/tmpreaper/tmpreaper-1.6.13-r1.ebuild
+++ b/app-admin/tmpreaper/tmpreaper-1.6.13-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
inherit eutils
diff --git a/app-admin/tmpreaper/tmpreaper-1.6.13.ebuild b/app-admin/tmpreaper/tmpreaper-1.6.13.ebuild
index 4bb7d483054..9300d2fdbf5 100644
--- a/app-admin/tmpreaper/tmpreaper-1.6.13.ebuild
+++ b/app-admin/tmpreaper/tmpreaper-1.6.13.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="3"
inherit eutils
diff --git a/app-admin/tmpwatch/tmpwatch-2.11-r2.ebuild b/app-admin/tmpwatch/tmpwatch-2.11-r2.ebuild
index 215c9062fb9..b1028a59fbb 100644
--- a/app-admin/tmpwatch/tmpwatch-2.11-r2.ebuild
+++ b/app-admin/tmpwatch/tmpwatch-2.11-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
diff --git a/app-admin/tmpwatch/tmpwatch-2.11.ebuild b/app-admin/tmpwatch/tmpwatch-2.11.ebuild
index 763689d53ed..5e251f8628b 100644
--- a/app-admin/tmpwatch/tmpwatch-2.11.ebuild
+++ b/app-admin/tmpwatch/tmpwatch-2.11.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/app-admin/tripwire/tripwire-2.4.3.1.ebuild b/app-admin/tripwire/tripwire-2.4.3.1.ebuild
index 93cc8696bad..ca1db8d1623 100644
--- a/app-admin/tripwire/tripwire-2.4.3.1.ebuild
+++ b/app-admin/tripwire/tripwire-2.4.3.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/app-admin/tripwire/tripwire-2.4.3.2.ebuild b/app-admin/tripwire/tripwire-2.4.3.2.ebuild
index 842387cd9de..9bc7f617580 100644
--- a/app-admin/tripwire/tripwire-2.4.3.2.ebuild
+++ b/app-admin/tripwire/tripwire-2.4.3.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/app-admin/tripwire/tripwire-2.4.3.3.ebuild b/app-admin/tripwire/tripwire-2.4.3.3.ebuild
index 842387cd9de..9bc7f617580 100644
--- a/app-admin/tripwire/tripwire-2.4.3.3.ebuild
+++ b/app-admin/tripwire/tripwire-2.4.3.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
diff --git a/app-admin/ulogd/ulogd-2.0.5_p20161017.ebuild b/app-admin/ulogd/ulogd-2.0.5_p20161017.ebuild
index d572851ae04..192a002f058 100644
--- a/app-admin/ulogd/ulogd-2.0.5_p20161017.ebuild
+++ b/app-admin/ulogd/ulogd-2.0.5_p20161017.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/app-admin/usbview/usbview-2.0.ebuild b/app-admin/usbview/usbview-2.0.ebuild
index c34a1da298d..a57e2594af0 100644
--- a/app-admin/usbview/usbview-2.0.ebuild
+++ b/app-admin/usbview/usbview-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=5
inherit eutils linux-info
diff --git a/app-admin/vault/vault-0.5.3.ebuild b/app-admin/vault/vault-0.5.3.ebuild
index 973cbcf3ad2..14f1ef6112d 100644
--- a/app-admin/vault/vault-0.5.3.ebuild
+++ b/app-admin/vault/vault-0.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
diff --git a/app-admin/vault/vault-0.6.2.ebuild b/app-admin/vault/vault-0.6.2.ebuild
index b9b2b5375ce..b7711f61180 100644
--- a/app-admin/vault/vault-0.6.2.ebuild
+++ b/app-admin/vault/vault-0.6.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/app-admin/vault/vault-0.6.5.ebuild b/app-admin/vault/vault-0.6.5.ebuild
index 09483c9bae4..4932e1e495b 100644
--- a/app-admin/vault/vault-0.6.5.ebuild
+++ b/app-admin/vault/vault-0.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=6
diff --git a/app-admin/verynice/verynice-1.1-r2.ebuild b/app-admin/verynice/verynice-1.1-r2.ebuild
index 4332b128807..65f4d5d73ee 100644
--- a/app-admin/verynice/verynice-1.1-r2.ebuild
+++ b/app-admin/verynice/verynice-1.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=5
diff --git a/app-admin/verynice/verynice-1.1-r3.ebuild b/app-admin/verynice/verynice-1.1-r3.ebuild
index 6a1b122e582..48d766226b4 100644
--- a/app-admin/verynice/verynice-1.1-r3.ebuild
+++ b/app-admin/verynice/verynice-1.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=6
diff --git a/app-admin/watchfolder/watchfolder-0.3.3.ebuild b/app-admin/watchfolder/watchfolder-0.3.3.ebuild
index 98bb30a5fa2..87993d3e5a6 100644
--- a/app-admin/watchfolder/watchfolder-0.3.3.ebuild
+++ b/app-admin/watchfolder/watchfolder-0.3.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils toolchain-funcs
diff --git a/app-admin/webalizer/webalizer-2.23.05.ebuild b/app-admin/webalizer/webalizer-2.23.05.ebuild
index 3e237f8bf93..353e087a35a 100644
--- a/app-admin/webalizer/webalizer-2.23.05.ebuild
+++ b/app-admin/webalizer/webalizer-2.23.05.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# uses webapp.eclass to create directories with right permissions
# probably slight overkill but works well
diff --git a/app-admin/webalizer/webalizer-2.23.08.ebuild b/app-admin/webalizer/webalizer-2.23.08.ebuild
index a5037981bc3..75b21dd3cc1 100644
--- a/app-admin/webalizer/webalizer-2.23.08.ebuild
+++ b/app-admin/webalizer/webalizer-2.23.08.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# uses webapp.eclass to create directories with right permissions
# probably slight overkill but works well
diff --git a/app-admin/webapp-config/webapp-config-1.52-r1.ebuild b/app-admin/webapp-config/webapp-config-1.52-r1.ebuild
index 4d3830e95d2..2cca142219d 100644
--- a/app-admin/webapp-config/webapp-config-1.52-r1.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.52-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/app-admin/webapp-config/webapp-config-1.53-r2.ebuild b/app-admin/webapp-config/webapp-config-1.53-r2.ebuild
index 83e12b9485d..795e702cd8f 100644
--- a/app-admin/webapp-config/webapp-config-1.53-r2.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.53-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/app-admin/webapp-config/webapp-config-1.54-r1.ebuild b/app-admin/webapp-config/webapp-config-1.54-r1.ebuild
index a1c3898419b..f33bfb49fc5 100644
--- a/app-admin/webapp-config/webapp-config-1.54-r1.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.54-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/app-admin/webapp-config/webapp-config-1.54-r2.ebuild b/app-admin/webapp-config/webapp-config-1.54-r2.ebuild
index 6b6713e5815..db03dd87705 100644
--- a/app-admin/webapp-config/webapp-config-1.54-r2.ebuild
+++ b/app-admin/webapp-config/webapp-config-1.54-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/app-admin/webapp-config/webapp-config-9999.ebuild b/app-admin/webapp-config/webapp-config-9999.ebuild
index a1b3ec25500..2d10cc49628 100644
--- a/app-admin/webapp-config/webapp-config-9999.ebuild
+++ b/app-admin/webapp-config/webapp-config-9999.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/app-admin/webmin/webmin-1.791.ebuild b/app-admin/webmin/webmin-1.791.ebuild
index 8e25d1b8e6c..c69abb400e6 100644
--- a/app-admin/webmin/webmin-1.791.ebuild
+++ b/app-admin/webmin/webmin-1.791.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/app-admin/whowatch/whowatch-1.8.5.ebuild b/app-admin/whowatch/whowatch-1.8.5.ebuild
index 36cb2baa4a1..e63c78391d8 100644
--- a/app-admin/whowatch/whowatch-1.8.5.ebuild
+++ b/app-admin/whowatch/whowatch-1.8.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
inherit autotools eutils
diff --git a/app-admin/xstow/xstow-1.0.1.ebuild b/app-admin/xstow/xstow-1.0.1.ebuild
index 99427b597b0..34a6c3f8144 100644
--- a/app-admin/xstow/xstow-1.0.1.ebuild
+++ b/app-admin/xstow/xstow-1.0.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/app-admin/xtail/xtail-2.1-r1.ebuild b/app-admin/xtail/xtail-2.1-r1.ebuild
index b92d58f19f9..9506b3e7e06 100644
--- a/app-admin/xtail/xtail-2.1-r1.ebuild
+++ b/app-admin/xtail/xtail-2.1-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/app-admin/xtail/xtail-2.1.ebuild b/app-admin/xtail/xtail-2.1.ebuild
index 6d166707ddd..656f0b7240e 100644
--- a/app-admin/xtail/xtail-2.1.ebuild
+++ b/app-admin/xtail/xtail-2.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
inherit toolchain-funcs
diff --git a/app-admin/yaala/yaala-0.7.3-r1.ebuild b/app-admin/yaala/yaala-0.7.3-r1.ebuild
index 0b19caef71b..e974cd81bf3 100644
--- a/app-admin/yaala/yaala-0.7.3-r1.ebuild
+++ b/app-admin/yaala/yaala-0.7.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"
diff --git a/app-admin/yaala/yaala-0.7.3-r2.ebuild b/app-admin/yaala/yaala-0.7.3-r2.ebuild
index 60285844060..9265cdda0f5 100644
--- a/app-admin/yaala/yaala-0.7.3-r2.ebuild
+++ b/app-admin/yaala/yaala-0.7.3-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/app-admin/yadm/yadm-1.05.ebuild b/app-admin/yadm/yadm-1.05.ebuild
index ffdaba7f26f..46faf6c8a17 100644
--- a/app-admin/yadm/yadm-1.05.ebuild
+++ b/app-admin/yadm/yadm-1.05.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/app-admin/yadm/yadm-1.06.ebuild b/app-admin/yadm/yadm-1.06.ebuild
index 4461c36719c..dee8ebb4dfb 100644
--- a/app-admin/yadm/yadm-1.06.ebuild
+++ b/app-admin/yadm/yadm-1.06.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/app-admin/yadm/yadm-1.07.ebuild b/app-admin/yadm/yadm-1.07.ebuild
index 02d7f2bc381..7c590708820 100644
--- a/app-admin/yadm/yadm-1.07.ebuild
+++ b/app-admin/yadm/yadm-1.07.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6