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 /net-analyzer
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 'net-analyzer')
-rw-r--r--net-analyzer/2ping/2ping-3.2.0.ebuild1
-rw-r--r--net-analyzer/2ping/2ping-3.2.1.ebuild1
-rw-r--r--net-analyzer/aimsniff/aimsniff-0.9d.ebuild1
-rw-r--r--net-analyzer/alive/alive-2.0.1.ebuild1
-rw-r--r--net-analyzer/alive/alive-2.0.2.ebuild1
-rw-r--r--net-analyzer/amap/amap-5.4-r1.ebuild1
-rw-r--r--net-analyzer/amap/amap-5.4.ebuild1
-rw-r--r--net-analyzer/angst/angst-0.4b-r2.ebuild1
-rw-r--r--net-analyzer/apinger/apinger-0.4.1.ebuild1
-rw-r--r--net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild1
-rw-r--r--net-analyzer/argus-clients/argus-clients-3.0.8.ebuild1
-rw-r--r--net-analyzer/argus/argus-3.0.8.1.ebuild1
-rw-r--r--net-analyzer/argus/argus-3.0.8.2.ebuild1
-rw-r--r--net-analyzer/arp-scan/arp-scan-1.9.ebuild1
-rw-r--r--net-analyzer/arp-sk/arp-sk-0.0.16-r2.ebuild1
-rw-r--r--net-analyzer/arping/arping-2.17.ebuild1
-rw-r--r--net-analyzer/arping/arping-2.18.ebuild1
-rw-r--r--net-analyzer/arping/arping-9999.ebuild1
-rw-r--r--net-analyzer/arpoison/arpoison-0.6-r2.ebuild1
-rw-r--r--net-analyzer/arpon/arpon-2.7-r1.ebuild1
-rw-r--r--net-analyzer/arpon/arpon-2.7.2.ebuild1
-rw-r--r--net-analyzer/arptools/arptools-1.0.2.ebuild1
-rw-r--r--net-analyzer/arpwatch/arpwatch-2.1.15-r8.ebuild1
-rw-r--r--net-analyzer/authforce/authforce-0.9.9-r1.ebuild1
-rw-r--r--net-analyzer/barnyard/barnyard-0.2.0-r3.ebuild1
-rw-r--r--net-analyzer/barnyard2/barnyard2-1.9.ebuild1
-rw-r--r--net-analyzer/bigeye/bigeye-0.3-r3.ebuild1
-rw-r--r--net-analyzer/bing/bing-1.1.3-r1.ebuild1
-rw-r--r--net-analyzer/bmon/bmon-3.9.ebuild1
-rw-r--r--net-analyzer/bmon/bmon-4.0.ebuild1
-rw-r--r--net-analyzer/braa/braa-0.82.ebuild1
-rw-r--r--net-analyzer/bro/bro-2.4.1-r2.ebuild1
-rw-r--r--net-analyzer/bsnmp/bsnmp-1.11a.ebuild1
-rw-r--r--net-analyzer/bsnmp/bsnmp-1.12-r1.ebuild1
-rw-r--r--net-analyzer/bsnmp/bsnmp-1.12.ebuild1
-rw-r--r--net-analyzer/bwbar/bwbar-1.2.3.ebuild1
-rw-r--r--net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild1
-rw-r--r--net-analyzer/bwmon/bwmon-1.3-r2.ebuild1
-rw-r--r--net-analyzer/bwping/bwping-1.7-r1.ebuild1
-rw-r--r--net-analyzer/bwping/bwping-1.8.ebuild1
-rw-r--r--net-analyzer/bwping/bwping-1.9.ebuild1
-rw-r--r--net-analyzer/cacti-spine/cacti-spine-0.8.8h.ebuild1
-rw-r--r--net-analyzer/cacti-spine/cacti-spine-1.0.0.ebuild1
-rw-r--r--net-analyzer/cacti-spine/cacti-spine-1.0.1.ebuild1
-rw-r--r--net-analyzer/cacti-spine/cacti-spine-1.0.2.ebuild1
-rw-r--r--net-analyzer/cacti-spine/cacti-spine-1.0.3.ebuild1
-rw-r--r--net-analyzer/cacti/cacti-0.8.8h.ebuild1
-rw-r--r--net-analyzer/cacti/cacti-1.0.0.ebuild1
-rw-r--r--net-analyzer/cacti/cacti-1.0.1.ebuild1
-rw-r--r--net-analyzer/cacti/cacti-1.0.2.ebuild1
-rw-r--r--net-analyzer/cacti/cacti-1.0.3.ebuild1
-rw-r--r--net-analyzer/calamaris/calamaris-2.59.ebuild1
-rw-r--r--net-analyzer/calamaris/calamaris-2.99.4.0.ebuild1
-rw-r--r--net-analyzer/carl/carl-0.9-r1.ebuild1
-rw-r--r--net-analyzer/cbm/cbm-0.1-r1.ebuild1
-rw-r--r--net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild1
-rw-r--r--net-analyzer/chaosreader/chaosreader-0.94.ebuild1
-rw-r--r--net-analyzer/check_mk/check_mk-1.2.4_p5-r1.ebuild1
-rw-r--r--net-analyzer/check_mk/check_mk-1.2.8_p16.ebuild1
-rw-r--r--net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p16.ebuild1
-rw-r--r--net-analyzer/cloudshark/cloudshark-1.0.2.174.ebuild1
-rw-r--r--net-analyzer/cloudshark/cloudshark-1.0.3.180.ebuild1
-rw-r--r--net-analyzer/cloudshark/cloudshark-1.0.4.ebuild1
-rw-r--r--net-analyzer/cnet/cnet-3.3.1.ebuild1
-rw-r--r--net-analyzer/cnet/cnet-3.3.4.ebuild1
-rw-r--r--net-analyzer/cryptcat/cryptcat-1.2.1-r1.ebuild1
-rw-r--r--net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild1
-rw-r--r--net-analyzer/cutter/cutter-1.03-r1.ebuild1
-rw-r--r--net-analyzer/cutter/cutter-1.04.ebuild1
-rw-r--r--net-analyzer/darkstat/darkstat-3.0.718.ebuild1
-rw-r--r--net-analyzer/darkstat/darkstat-3.0.719.ebuild1
-rw-r--r--net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r3.ebuild1
-rw-r--r--net-analyzer/dhcpdump/dhcpdump-1.8.ebuild1
-rw-r--r--net-analyzer/dietsniff/dietsniff-0.4.ebuild1
-rw-r--r--net-analyzer/dnsenum/dnsenum-1.2.2.ebuild1
-rw-r--r--net-analyzer/dnstracer/dnstracer-1.9-r1.ebuild1
-rw-r--r--net-analyzer/dosdetector/dosdetector-20060621-r1.ebuild1
-rw-r--r--net-analyzer/dosdetector/dosdetector-20060621.ebuild1
-rw-r--r--net-analyzer/driftnet/driftnet-0.1.6_p20090401-r1.ebuild1
-rw-r--r--net-analyzer/driftnet/driftnet-0.1.6_p20090401.ebuild1
-rw-r--r--net-analyzer/dsniff/dsniff-2.4_beta1-r4.ebuild1
-rw-r--r--net-analyzer/dsniff/dsniff-2.4_beta1-r7.ebuild1
-rw-r--r--net-analyzer/dsniff/dsniff-2.4_beta1-r8.ebuild1
-rw-r--r--net-analyzer/echoping/echoping-6.0.2_p434-r2.ebuild1
-rw-r--r--net-analyzer/echoping/echoping-6.0.2_p434-r3.ebuild1
-rw-r--r--net-analyzer/egressor/egressor-1.0-r2.ebuild1
-rw-r--r--net-analyzer/etherape/etherape-0.9.14.ebuild1
-rw-r--r--net-analyzer/etherape/etherape-0.9.15.ebuild1
-rw-r--r--net-analyzer/ethloop/ethloop-10-r3.ebuild1
-rw-r--r--net-analyzer/ettercap/ettercap-0.8.2.ebuild1
-rw-r--r--net-analyzer/ettercap/ettercap-9999.ebuild1
-rw-r--r--net-analyzer/fail2ban/fail2ban-0.9.3-r1.ebuild1
-rw-r--r--net-analyzer/fail2ban/fail2ban-0.9.4.ebuild1
-rw-r--r--net-analyzer/fail2ban/fail2ban-0.9.5.ebuild1
-rw-r--r--net-analyzer/fail2ban/fail2ban-0.9.6.ebuild1
-rw-r--r--net-analyzer/fail2ban/fail2ban-99999999.ebuild1
-rw-r--r--net-analyzer/fe3d/fe3d-0.11.2.ebuild1
-rw-r--r--net-analyzer/ffp/ffp-0.0.8-r1.ebuild1
-rw-r--r--net-analyzer/firewalk/firewalk-5.0-r1.ebuild1
-rw-r--r--net-analyzer/flent/flent-0.15.0.ebuild1
-rw-r--r--net-analyzer/flow-tools/flow-tools-0.68.5.1-r2.ebuild1
-rw-r--r--net-analyzer/flow-tools/flow-tools-0.68.5.1-r9.ebuild1
-rw-r--r--net-analyzer/flowgrind/flowgrind-0.7.1.ebuild1
-rw-r--r--net-analyzer/flowgrind/flowgrind-0.8.0.ebuild1
-rw-r--r--net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild1
-rw-r--r--net-analyzer/fping/fping-3.10.ebuild1
-rw-r--r--net-analyzer/fping/fping-3.13.ebuild1
-rw-r--r--net-analyzer/fprobe/fprobe-1.1-r3.ebuild1
-rw-r--r--net-analyzer/fprobe/fprobe-1.1.ebuild1
-rw-r--r--net-analyzer/fragroute/fragroute-1.2.6.ebuild1
-rw-r--r--net-analyzer/ftester/ftester-1.0.ebuild1
-rw-r--r--net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild1
-rw-r--r--net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild1
-rw-r--r--net-analyzer/gensink/gensink-4.1-r2.ebuild1
-rw-r--r--net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild1
-rw-r--r--net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r3.ebuild1
-rw-r--r--net-analyzer/goaccess/goaccess-0.5-r1.ebuild1
-rw-r--r--net-analyzer/goaccess/goaccess-0.6.1.ebuild1
-rw-r--r--net-analyzer/goaccess/goaccess-0.8.5.ebuild1
-rw-r--r--net-analyzer/goaccess/goaccess-0.9.ebuild1
-rw-r--r--net-analyzer/goaccess/goaccess-1.1.1.ebuild1
-rw-r--r--net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild1
-rw-r--r--net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild1
-rw-r--r--net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.9.ebuild1
-rw-r--r--net-analyzer/gsm-receiver/gsm-receiver-9999.ebuild1
-rw-r--r--net-analyzer/gspoof/gspoof-3.2-r2.ebuild1
-rw-r--r--net-analyzer/hexinject/hexinject-1.5.ebuild1
-rw-r--r--net-analyzer/hping/hping-3_pre20051105-r3.ebuild1
-rw-r--r--net-analyzer/hping/hping-3_pre20051105-r5.ebuild1
-rw-r--r--net-analyzer/httping/httping-2.5.ebuild1
-rw-r--r--net-analyzer/hunt/hunt-1.5-r1.ebuild1
-rw-r--r--net-analyzer/hunt/hunt-1.5-r3.ebuild1
-rw-r--r--net-analyzer/hydra/hydra-8.1-r1.ebuild1
-rw-r--r--net-analyzer/hydra/hydra-8.1.ebuild1
-rw-r--r--net-analyzer/ibmonitor/ibmonitor-1.4.ebuild1
-rw-r--r--net-analyzer/icinga-web/icinga-web-1.14.0.ebuild1
-rw-r--r--net-analyzer/icinga/icinga-1.13.4.ebuild1
-rw-r--r--net-analyzer/icinga/icinga-1.14.0.ebuild1
-rw-r--r--net-analyzer/icinga2/icinga2-2.5.4-r1.ebuild1
-rw-r--r--net-analyzer/icinga2/icinga2-2.6.0.ebuild1
-rw-r--r--net-analyzer/icinga2/icinga2-2.6.1.ebuild1
-rw-r--r--net-analyzer/icinga2/icinga2-2.6.2.ebuild1
-rw-r--r--net-analyzer/icinga2/icinga2-9999.ebuild1
-rw-r--r--net-analyzer/ifmetric/ifmetric-0.3-r2.ebuild1
-rw-r--r--net-analyzer/ifstat/ifstat-1.1-r2.ebuild1
-rw-r--r--net-analyzer/ifstatus/ifstatus-1.1.0-r1.ebuild1
-rw-r--r--net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild1
-rw-r--r--net-analyzer/iftop/iftop-1.0_pre4.ebuild1
-rw-r--r--net-analyzer/ike-scan/ike-scan-1.9-r1.ebuild1
-rw-r--r--net-analyzer/ike-scan/ike-scan-1.9-r2.ebuild1
-rw-r--r--net-analyzer/ipaudit/ipaudit-1.0_beta2.ebuild1
-rw-r--r--net-analyzer/ipband/ipband-0.8.1-r1.ebuild1
-rw-r--r--net-analyzer/ipcad/ipcad-3.7.3.ebuild1
-rw-r--r--net-analyzer/ipgen/ipgen-9999.ebuild1
-rw-r--r--net-analyzer/ipguard/ipguard-1.04.ebuild1
-rw-r--r--net-analyzer/iplog/iplog-2.2.3-r2.ebuild1
-rw-r--r--net-analyzer/ippl/ippl-1.4.14-r3.ebuild1
-rw-r--r--net-analyzer/ippl/ippl-1.4.14-r5.ebuild1
-rw-r--r--net-analyzer/ipsumdump/ipsumdump-1.85.ebuild1
-rw-r--r--net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild1
-rw-r--r--net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r2.ebuild1
-rw-r--r--net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild1
-rw-r--r--net-analyzer/iptstate/iptstate-2.2.5.ebuild1
-rw-r--r--net-analyzer/iptstate/iptstate-2.2.6.ebuild1
-rw-r--r--net-analyzer/ipv6toolkit/ipv6toolkit-1.4.1.ebuild1
-rw-r--r--net-analyzer/ipv6toolkit/ipv6toolkit-2.0_p20160422.ebuild1
-rw-r--r--net-analyzer/isic/isic-0.07-r1.ebuild1
-rw-r--r--net-analyzer/jffnms/jffnms-0.9.4.ebuild1
-rw-r--r--net-analyzer/jmx2munin/jmx2munin-1.0_p20120811-r1.ebuild1
-rw-r--r--net-analyzer/jnettop/jnettop-0.13.0-r1.ebuild1
-rw-r--r--net-analyzer/knocker/knocker-0.7.1-r2.ebuild1
-rw-r--r--net-analyzer/knocker/knocker-0.7.1-r3.ebuild1
-rw-r--r--net-analyzer/labrea/labrea-2.5-r2.ebuild1
-rw-r--r--net-analyzer/lft/lft-3.77.ebuild1
-rw-r--r--net-analyzer/libnasl/libnasl-2.2.9-r1.ebuild1
-rw-r--r--net-analyzer/lilac/lilac-1.0.3.ebuild1
-rw-r--r--net-analyzer/linkchecker/linkchecker-9.3-r1.ebuild1
-rw-r--r--net-analyzer/linkchecker/linkchecker-9.3-r2.ebuild1
-rw-r--r--net-analyzer/linkchecker/linkchecker-9999.ebuild1
-rw-r--r--net-analyzer/macchanger/macchanger-1.7.0-r1.ebuild1
-rw-r--r--net-analyzer/macchanger/macchanger-1.7.0.ebuild1
-rw-r--r--net-analyzer/masscan/masscan-1.0.3-r1.ebuild1
-rw-r--r--net-analyzer/masscan/masscan-1.0.3-r2.ebuild1
-rw-r--r--net-analyzer/mate-netspeed/mate-netspeed-1.12.0.ebuild1
-rw-r--r--net-analyzer/mbrowse/mbrowse-0.4.3.ebuild1
-rw-r--r--net-analyzer/metasploit/metasploit-4.12.16.ebuild1
-rw-r--r--net-analyzer/metasploit/metasploit-4.12.7.ebuild1
-rw-r--r--net-analyzer/metasploit/metasploit-9999.ebuild1
-rw-r--r--net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p10.ebuild1
-rw-r--r--net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild1
-rw-r--r--net-analyzer/monitoring-plugins/monitoring-plugins-2.1.2.ebuild1
-rw-r--r--net-analyzer/monitoring-plugins/monitoring-plugins-2.2.ebuild1
-rw-r--r--net-analyzer/mping/mping-2.01.ebuild1
-rw-r--r--net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0.ebuild1
-rw-r--r--net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild1
-rw-r--r--net-analyzer/mtr/mtr-0.87-r1.ebuild1
-rw-r--r--net-analyzer/mtr/mtr-0.87.ebuild1
-rw-r--r--net-analyzer/mtr/mtr-9999.ebuild1
-rw-r--r--net-analyzer/multimon-ng/multimon-ng-1.0.0-r1.ebuild1
-rw-r--r--net-analyzer/multimon-ng/multimon-ng-9999.ebuild1
-rw-r--r--net-analyzer/munin/munin-2.0.19-r2.ebuild1
-rw-r--r--net-analyzer/munin/munin-2.0.19.ebuild1
-rw-r--r--net-analyzer/munin/munin-2.0.25-r2.ebuild1
-rw-r--r--net-analyzer/munin/munin-2.0.25.ebuild1
-rw-r--r--net-analyzer/munin/munin-2.1.9999.ebuild1
-rw-r--r--net-analyzer/nagios-check_dnssec/nagios-check_dnssec-0.1_p28.ebuild1
-rw-r--r--net-analyzer/nagios-check_fail2ban/nagios-check_fail2ban-3.ebuild1
-rw-r--r--net-analyzer/nagios-check_glsa2/nagios-check_glsa2-20120930-r1.ebuild1
-rw-r--r--net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.1.ebuild1
-rw-r--r--net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.2.ebuild1
-rw-r--r--net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.6.ebuild1
-rw-r--r--net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.3.2.ebuild1
-rw-r--r--net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4.ebuild1
-rw-r--r--net-analyzer/nagios-check_logfiles/nagios-check_logfiles-2.3.2.1-r1.ebuild1
-rw-r--r--net-analyzer/nagios-check_logfiles/nagios-check_logfiles-3.7.3.1-r1.ebuild1
-rw-r--r--net-analyzer/nagios-check_logfiles/nagios-check_logfiles-3.7.3.1.ebuild1
-rw-r--r--net-analyzer/nagios-check_logfiles/nagios-check_logfiles-3.7.6.3.ebuild1
-rw-r--r--net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.1.9.2.ebuild1
-rw-r--r--net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2.ebuild1
-rw-r--r--net-analyzer/nagios-check_openvpn-simple/nagios-check_openvpn-simple-0.0.1-r1.ebuild1
-rw-r--r--net-analyzer/nagios-check_pidfile/nagios-check_pidfile-1.ebuild1
-rw-r--r--net-analyzer/nagios-check_rbl/nagios-check_rbl-1.3.7-r1.ebuild1
-rw-r--r--net-analyzer/nagios-core/nagios-core-3.5.1.ebuild1
-rw-r--r--net-analyzer/nagios-core/nagios-core-4.2.4.ebuild1
-rw-r--r--net-analyzer/nagios-core/nagios-core-4.3.1.ebuild1
-rw-r--r--net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0-r1.ebuild1
-rw-r--r--net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20151215.ebuild1
-rw-r--r--net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20160215.ebuild1
-rw-r--r--net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.1.ebuild1
-rw-r--r--net-analyzer/nagios-plugins-flameeyes/nagios-plugins-flameeyes-9999.ebuild1
-rw-r--r--net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild1
-rw-r--r--net-analyzer/nagios-plugins/nagios-plugins-2.0.3-r2.ebuild1
-rw-r--r--net-analyzer/nagios-plugins/nagios-plugins-2.1.4.ebuild1
-rw-r--r--net-analyzer/nagios-sap-ccms-plugin/nagios-sap-ccms-plugin-0.7.3-r1.ebuild1
-rw-r--r--net-analyzer/nagios-sap-ccms-plugin/nagios-sap-ccms-plugin-0.8.ebuild1
-rw-r--r--net-analyzer/nagios/nagios-4.2.4.ebuild1
-rw-r--r--net-analyzer/nagios/nagios-4.3.1.ebuild1
-rw-r--r--net-analyzer/nagircbot/nagircbot-0.0.33.ebuild1
-rw-r--r--net-analyzer/nagstamon/nagstamon-1.0.1.ebuild1
-rw-r--r--net-analyzer/nagstamon/nagstamon-1.0.1_p20150222.ebuild1
-rw-r--r--net-analyzer/nagstamon/nagstamon-2.0.1.ebuild1
-rw-r--r--net-analyzer/nagtrap/nagtrap-0.1.3.ebuild1
-rw-r--r--net-analyzer/nagvis/nagvis-1.6.6.ebuild1
-rw-r--r--net-analyzer/namebench/namebench-1.3.1-r2.ebuild1
-rw-r--r--net-analyzer/nast/nast-0.2.0-r1.ebuild1
-rw-r--r--net-analyzer/nbtscan/nbtscan-1.5.1-r3.ebuild1
-rw-r--r--net-analyzer/nbwmon/nbwmon-0.5.2.ebuild1
-rw-r--r--net-analyzer/ndoutils/ndoutils-2.0.0.ebuild1
-rw-r--r--net-analyzer/ndsad/ndsad-1.33-r1.ebuild1
-rw-r--r--net-analyzer/nepenthes/nepenthes-0.2.2-r1.ebuild1
-rw-r--r--net-analyzer/nepenthes/nepenthes-0.2.2.ebuild1
-rw-r--r--net-analyzer/nessus-bin/nessus-bin-4.4.1.ebuild1
-rw-r--r--net-analyzer/nessus-bin/nessus-bin-5.0.1.ebuild1
-rw-r--r--net-analyzer/nessus-client/nessus-client-1.0.2-r1.ebuild1
-rw-r--r--net-analyzer/nessus-client/nessus-client-1.0.2-r2.ebuild1
-rw-r--r--net-analyzer/nessus-core/nessus-core-2.2.9-r1.ebuild1
-rw-r--r--net-analyzer/nessus-libraries/nessus-libraries-2.2.9-r1.ebuild1
-rw-r--r--net-analyzer/nessus-plugins/nessus-plugins-2.2.9-r1.ebuild1
-rw-r--r--net-analyzer/nessus/nessus-2.2.9.ebuild1
-rw-r--r--net-analyzer/net-snmp/net-snmp-5.7.3-r3.ebuild1
-rw-r--r--net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild1
-rw-r--r--net-analyzer/net-snmp/net-snmp-5.7.3-r6.ebuild1
-rw-r--r--net-analyzer/netcat/netcat-110-r9.ebuild1
-rw-r--r--net-analyzer/netcat6/netcat6-1.0-r2.ebuild1
-rw-r--r--net-analyzer/netdata/netdata-1.2.0-r1.ebuild1
-rw-r--r--net-analyzer/netdata/netdata-1.3.0.ebuild1
-rw-r--r--net-analyzer/netdata/netdata-1.4.0-r1.ebuild1
-rw-r--r--net-analyzer/netdata/netdata-1.5.0.ebuild1
-rw-r--r--net-analyzer/netdata/netdata-9999.ebuild1
-rw-r--r--net-analyzer/netdiscover/netdiscover-0.3_beta6-r3.ebuild1
-rw-r--r--net-analyzer/nethogs/nethogs-0.8.1.ebuild1
-rw-r--r--net-analyzer/nethogs/nethogs-0.8.5.ebuild1
-rw-r--r--net-analyzer/neti/neti-2.0-r1.ebuild1
-rw-r--r--net-analyzer/neti/neti-2.0.ebuild1
-rw-r--r--net-analyzer/netio/netio-1.32.ebuild1
-rw-r--r--net-analyzer/netperf/netperf-2.6.0-r1.ebuild1
-rw-r--r--net-analyzer/netperf/netperf-2.7.0-r1.ebuild1
-rw-r--r--net-analyzer/netperf/netperf-2.7.0-r2.ebuild1
-rw-r--r--net-analyzer/netperf/netperf-2.7.0.ebuild1
-rw-r--r--net-analyzer/netpipe/netpipe-3.7.2.ebuild1
-rw-r--r--net-analyzer/netselect/netselect-0.3-r3.ebuild1
-rw-r--r--net-analyzer/netselect/netselect-0.3-r4.ebuild1
-rw-r--r--net-analyzer/netsniff-ng/netsniff-ng-0.6.0.ebuild1
-rw-r--r--net-analyzer/netsniff-ng/netsniff-ng-0.6.1.ebuild1
-rw-r--r--net-analyzer/netsniff-ng/netsniff-ng-9999.ebuild1
-rw-r--r--net-analyzer/nettop/nettop-0.2.3-r2.ebuild1
-rw-r--r--net-analyzer/netwag/netwag-5.39.0.ebuild1
-rw-r--r--net-analyzer/netwatch/netwatch-1.3.0.1-r3.ebuild1
-rw-r--r--net-analyzer/netwox/netwox-5.39.0.ebuild1
-rw-r--r--net-analyzer/nfdump/nfdump-1.6.14-r1.ebuild1
-rw-r--r--net-analyzer/nfdump/nfdump-1.6.15.ebuild1
-rw-r--r--net-analyzer/ngrep/ngrep-1.45-r3.ebuild1
-rw-r--r--net-analyzer/nikto/nikto-1.36.ebuild1
-rw-r--r--net-analyzer/nikto/nikto-2.1.5.ebuild1
-rw-r--r--net-analyzer/nipper/nipper-0.12.0.ebuild1
-rw-r--r--net-analyzer/nload/nload-0.7.4.ebuild1
-rw-r--r--net-analyzer/nmap/nmap-7.31.ebuild1
-rw-r--r--net-analyzer/nmap/nmap-7.40.ebuild1
-rw-r--r--net-analyzer/nmap/nmap-9999.ebuild1
-rw-r--r--net-analyzer/nmapsi/nmapsi-0.4.1.ebuild1
-rw-r--r--net-analyzer/nmapsi/nmapsi-0.5_alpha1.ebuild1
-rw-r--r--net-analyzer/nmbscan/nmbscan-1.2.5.ebuild1
-rw-r--r--net-analyzer/nodebrain/nodebrain-0.9.03.ebuild1
-rw-r--r--net-analyzer/nodebrain/nodebrain-0.9.04.ebuild1
-rw-r--r--net-analyzer/nrpe/nrpe-2.15-r2.ebuild1
-rw-r--r--net-analyzer/nrpe/nrpe-2.15-r3.ebuild1
-rw-r--r--net-analyzer/nsat/nsat-1.5-r3.ebuild1
-rw-r--r--net-analyzer/nsca/nsca-2.7.2-r103.ebuild1
-rw-r--r--net-analyzer/nstats/nstats-0.4-r2.ebuild1
-rw-r--r--net-analyzer/ntop/ntop-5.0.1-r2.ebuild1
-rw-r--r--net-analyzer/ntopng/ntopng-2.4.ebuild1
-rw-r--r--net-analyzer/nttcp/nttcp-1.47-r1.ebuild1
-rw-r--r--net-analyzer/nttcp/nttcp-1.47-r3.ebuild1
-rw-r--r--net-analyzer/odhcploc/odhcploc-20111021.ebuild1
-rw-r--r--net-analyzer/oinkmaster/oinkmaster-2.0.ebuild1
-rw-r--r--net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild1
-rw-r--r--net-analyzer/openbsd-netcat/openbsd-netcat-1.105.ebuild1
-rw-r--r--net-analyzer/openbsd-netcat/openbsd-netcat-1.84.ebuild1
-rw-r--r--net-analyzer/openvas-cli/openvas-cli-1.4.3.ebuild1
-rw-r--r--net-analyzer/openvas-libraries/openvas-libraries-8.0.5.ebuild1
-rw-r--r--net-analyzer/openvas-manager/openvas-manager-6.0.6-r2.ebuild1
-rw-r--r--net-analyzer/openvas-scanner/openvas-scanner-5.0.4-r1.ebuild1
-rw-r--r--net-analyzer/openvas-tools/openvas-tools-0_pre20512.ebuild1
-rw-r--r--net-analyzer/openvas/openvas-8.0.5-r1.ebuild1
-rw-r--r--net-analyzer/ospd/ospd-1.0.0.ebuild1
-rw-r--r--net-analyzer/ostinato/ostinato-0.5.1.ebuild1
-rw-r--r--net-analyzer/ostinato/ostinato-0.8.ebuild1
-rw-r--r--net-analyzer/p0f/p0f-2.0.8-r2.ebuild1
-rw-r--r--net-analyzer/p0f/p0f-3.06_beta.ebuild1
-rw-r--r--net-analyzer/p0f/p0f-3.07_beta.ebuild1
-rw-r--r--net-analyzer/packit/packit-1.0-r2.ebuild1
-rw-r--r--net-analyzer/pathload/pathload-1.3.2.ebuild1
-rw-r--r--net-analyzer/pbnj/pbnj-2.04.ebuild1
-rw-r--r--net-analyzer/pchar/pchar-1.5-r1.ebuild1
-rw-r--r--net-analyzer/pinger/pinger-0.32e.ebuild1
-rw-r--r--net-analyzer/pinger/pinger-0.33.ebuild1
-rw-r--r--net-analyzer/pktstat/pktstat-1.8.5-r1.ebuild1
-rw-r--r--net-analyzer/pmacct/pmacct-1.5.1.ebuild1
-rw-r--r--net-analyzer/pmacct/pmacct-1.5.2.ebuild1
-rw-r--r--net-analyzer/pmacct/pmacct-1.5.3_pre20150925-r1.ebuild1
-rw-r--r--net-analyzer/pmacct/pmacct-1.5.3_pre20150925.ebuild1
-rw-r--r--net-analyzer/pmacct/pmacct-1.6.0.ebuild1
-rw-r--r--net-analyzer/pmacct/pmacct-1.6.1.ebuild1
-rw-r--r--net-analyzer/pnp4nagios/pnp4nagios-0.6.24.ebuild1
-rw-r--r--net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r1.ebuild1
-rw-r--r--net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r2.ebuild1
-rw-r--r--net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r3.ebuild1
-rw-r--r--net-analyzer/pnp4nagios/pnp4nagios-0.6.25.ebuild1
-rw-r--r--net-analyzer/poink/poink-2.03.ebuild1
-rw-r--r--net-analyzer/portmon/portmon-2.0.ebuild1
-rw-r--r--net-analyzer/portsentry/portsentry-1.2-r1.ebuild1
-rw-r--r--net-analyzer/postal/postal-0.72.ebuild1
-rw-r--r--net-analyzer/prelude-correlator/prelude-correlator-3.0.1-r1.ebuild1
-rw-r--r--net-analyzer/prelude-correlator/prelude-correlator-3.1.0.ebuild1
-rw-r--r--net-analyzer/prelude-lml-rules/prelude-lml-rules-3.0.1.ebuild1
-rw-r--r--net-analyzer/prelude-lml-rules/prelude-lml-rules-3.1.0.ebuild1
-rw-r--r--net-analyzer/prelude-lml/prelude-lml-3.0.0.ebuild1
-rw-r--r--net-analyzer/prelude-lml/prelude-lml-3.1.0.ebuild1
-rw-r--r--net-analyzer/prelude-nessus/prelude-nessus-20021107.ebuild1
-rw-r--r--net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.14.0_rc1.ebuild1
-rw-r--r--net-analyzer/prometheus/prometheus-1.5.0.ebuild1
-rw-r--r--net-analyzer/prometheus/prometheus-1.5.1.ebuild1
-rw-r--r--net-analyzer/prometheus/prometheus-1.5.2.ebuild1
-rw-r--r--net-analyzer/pypacker/pypacker-2.9.ebuild1
-rw-r--r--net-analyzer/quidscor/quidscor-1.2.48-r1.ebuild1
-rw-r--r--net-analyzer/raddump/raddump-0.3.1.ebuild1
-rw-r--r--net-analyzer/rain/rain-1.2.9_beta1.ebuild1
-rw-r--r--net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.1.ebuild1
-rw-r--r--net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.2.ebuild1
-rw-r--r--net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild1
-rw-r--r--net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3.ebuild1
-rw-r--r--net-analyzer/rrdcollect/rrdcollect-0.2.9.ebuild1
-rw-r--r--net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild1
-rw-r--r--net-analyzer/rrdtool/rrdtool-1.5.5-r1.ebuild1
-rw-r--r--net-analyzer/rrdtool/rrdtool-1.5.5.ebuild1
-rw-r--r--net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild1
-rw-r--r--net-analyzer/rtpbreak/rtpbreak-1.3a-r1.ebuild1
-rw-r--r--net-analyzer/sancp/sancp-1.6.1-r4.ebuild1
-rw-r--r--net-analyzer/sarg/sarg-2.3.10.ebuild1
-rw-r--r--net-analyzer/sbd/sbd-1.37-r1.ebuild1
-rw-r--r--net-analyzer/scanlogd/scanlogd-2.2.7.ebuild1
-rw-r--r--net-analyzer/scanssh/scanssh-2.1.ebuild1
-rw-r--r--net-analyzer/scapy/scapy-2.2.0-r3.ebuild1
-rw-r--r--net-analyzer/scapy/scapy-2.3.0-r1.ebuild1
-rw-r--r--net-analyzer/scapy/scapy-2.3.1-r1.ebuild1
-rw-r--r--net-analyzer/scapy/scapy-2.3.2-r1.ebuild1
-rw-r--r--net-analyzer/scapy/scapy-9999.ebuild1
-rw-r--r--net-analyzer/scli/scli-0.4.0-r1.ebuild1
-rw-r--r--net-analyzer/sec/sec-2.7.10.ebuild1
-rw-r--r--net-analyzer/sec/sec-2.7.11.ebuild1
-rw-r--r--net-analyzer/sec/sec-2.7.6-r1.ebuild1
-rw-r--r--net-analyzer/sflowtool/sflowtool-3.32.ebuild1
-rw-r--r--net-analyzer/sflowtool/sflowtool-3.33.ebuild1
-rw-r--r--net-analyzer/sflowtool/sflowtool-3.34.ebuild1
-rw-r--r--net-analyzer/sflowtool/sflowtool-3.35.ebuild1
-rw-r--r--net-analyzer/sguil-client/sguil-client-0.8.0.ebuild1
-rw-r--r--net-analyzer/sguil-client/sguil-client-0.9.0.ebuild1
-rw-r--r--net-analyzer/sguil-sensor/sguil-sensor-0.8.0.ebuild1
-rw-r--r--net-analyzer/sguil-sensor/sguil-sensor-0.9.0.ebuild1
-rw-r--r--net-analyzer/sguil-server/sguil-server-0.8.0.ebuild1
-rw-r--r--net-analyzer/sguil-server/sguil-server-0.9.0.ebuild1
-rw-r--r--net-analyzer/sinfo/sinfo-0.0.48.ebuild1
-rw-r--r--net-analyzer/siphon/siphon-666-r1.ebuild1
-rw-r--r--net-analyzer/slurm/slurm-0.3.3-r2.ebuild1
-rw-r--r--net-analyzer/slurm/slurm-0.4.3.ebuild1
-rw-r--r--net-analyzer/smokeping/smokeping-2.6.10.ebuild1
-rw-r--r--net-analyzer/smokeping/smokeping-2.6.11.ebuild1
-rw-r--r--net-analyzer/smokeping/smokeping-2.6.9.ebuild1
-rw-r--r--net-analyzer/sniffit/sniffit-0.3.7-r4.ebuild1
-rw-r--r--net-analyzer/snmptt/snmptt-1.2.ebuild1
-rw-r--r--net-analyzer/snmptt/snmptt-1.4.ebuild1
-rw-r--r--net-analyzer/snort/snort-2.9.4.6-r1.ebuild1
-rw-r--r--net-analyzer/snort/snort-2.9.7.0.ebuild1
-rw-r--r--net-analyzer/snort/snort-2.9.7.2.ebuild1
-rw-r--r--net-analyzer/snort/snort-2.9.7.3.ebuild1
-rw-r--r--net-analyzer/snort/snort-2.9.7.5.ebuild1
-rw-r--r--net-analyzer/snort/snort-2.9.8.0.ebuild1
-rw-r--r--net-analyzer/snort/snort-2.9.8.2.ebuild1
-rw-r--r--net-analyzer/snort/snort-2.9.8.3-r1.ebuild1
-rw-r--r--net-analyzer/snort/snort-2.9.8.3.ebuild1
-rw-r--r--net-analyzer/snortalog/snortalog-2.4.3-r1.ebuild1
-rw-r--r--net-analyzer/snortsam/snortsam-2.50-r1.ebuild1
-rw-r--r--net-analyzer/snortsam/snortsam-2.70.ebuild1
-rw-r--r--net-analyzer/softflowd/softflowd-0.9.9-r1.ebuild1
-rw-r--r--net-analyzer/speedtest-cli/speedtest-cli-0.3.4-r1.ebuild1
-rw-r--r--net-analyzer/speedtest-cli/speedtest-cli-1.0.1.ebuild1
-rw-r--r--net-analyzer/speedtest-cli/speedtest-cli-1.0.2.ebuild1
-rw-r--r--net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild1
-rw-r--r--net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild1
-rw-r--r--net-analyzer/squidsites/squidsites-1.01-r2.ebuild1
-rw-r--r--net-analyzer/squidview/squidview-0.80.ebuild1
-rw-r--r--net-analyzer/ssldump/ssldump-0.9_beta3.ebuild1
-rw-r--r--net-analyzer/sslscan/sslscan-1.11.3.ebuild1
-rw-r--r--net-analyzer/sslscan/sslscan-1.11.7.ebuild1
-rw-r--r--net-analyzer/sslscan/sslscan-1.11.8-r1.ebuild1
-rw-r--r--net-analyzer/sslscan/sslscan-1.11.8.ebuild1
-rw-r--r--net-analyzer/sslsniff/sslsniff-0.8-r2.ebuild1
-rw-r--r--net-analyzer/ssmping/ssmping-0.9.1.ebuild1
-rw-r--r--net-analyzer/suricata/suricata-2.0.11.ebuild1
-rw-r--r--net-analyzer/suricata/suricata-3.0.1.ebuild1
-rw-r--r--net-analyzer/suricata/suricata-3.1.3.ebuild1
-rw-r--r--net-analyzer/suricata/suricata-3.2-r1.ebuild1
-rw-r--r--net-analyzer/suricata/suricata-3.2.1.ebuild1
-rw-r--r--net-analyzer/suricata/suricata-3.2.ebuild1
-rw-r--r--net-analyzer/symon/symon-2.87.ebuild1
-rw-r--r--net-analyzer/synscan/synscan-5.01.ebuild1
-rw-r--r--net-analyzer/syweb/syweb-0.65.ebuild1
-rw-r--r--net-analyzer/tcpdump/tcpdump-4.9.0.ebuild1
-rw-r--r--net-analyzer/tcpdump/tcpdump-9999.ebuild1
-rw-r--r--net-analyzer/tcpflow/tcpflow-1.4.5_p1-r1.ebuild1
-rw-r--r--net-analyzer/tcping/tcping-1.3.5.ebuild1
-rw-r--r--net-analyzer/tcpreen/tcpreen-1.4.4.ebuild1
-rw-r--r--net-analyzer/tcpreplay/tcpreplay-4.1.1.ebuild1
-rw-r--r--net-analyzer/tcpreplay/tcpreplay-4.1.2.ebuild1
-rw-r--r--net-analyzer/tcpslice/tcpslice-1.2a_p3-r1.ebuild1
-rw-r--r--net-analyzer/tcpstat/tcpstat-1.5-r1.ebuild1
-rw-r--r--net-analyzer/tcpstat/tcpstat-1.5-r2.ebuild1
-rw-r--r--net-analyzer/tcpstat/tcpstat-1.5.ebuild1
-rw-r--r--net-analyzer/tcptrace/tcptrace-6.6.7-r2.ebuild1
-rw-r--r--net-analyzer/tcptrace/tcptrace-6.6.7_p4_p1.ebuild1
-rw-r--r--net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r2.ebuild1
-rw-r--r--net-analyzer/tcptrack/tcptrack-1.4.2.ebuild1
-rw-r--r--net-analyzer/testssl/testssl-2.6.ebuild1
-rw-r--r--net-analyzer/thc-ipv6/thc-ipv6-2.3.ebuild1
-rw-r--r--net-analyzer/thc-ipv6/thc-ipv6-2.5.ebuild1
-rw-r--r--net-analyzer/thc-ipv6/thc-ipv6-2.7.ebuild1
-rw-r--r--net-analyzer/thc-ipv6/thc-ipv6-3.0.ebuild1
-rw-r--r--net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild1
-rw-r--r--net-analyzer/thcrut/thcrut-1.2.5-r1.ebuild1
-rw-r--r--net-analyzer/thrulay/thrulay-0.9-r1.ebuild1
-rw-r--r--net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild1
-rw-r--r--net-analyzer/tptest/tptest-3.1.7-r2.ebuild1
-rw-r--r--net-analyzer/tracebox/tracebox-0.2.ebuild1
-rw-r--r--net-analyzer/traceproto/traceproto-1.1.2_beta1.ebuild1
-rw-r--r--net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2-r1.ebuild1
-rw-r--r--net-analyzer/traceroute/traceroute-2.0.20.ebuild1
-rw-r--r--net-analyzer/traceroute/traceroute-2.0.22.ebuild1
-rw-r--r--net-analyzer/traceroute/traceroute-2.1.0.ebuild1
-rw-r--r--net-analyzer/trafshow/trafshow-5.2.3.ebuild1
-rw-r--r--net-analyzer/tsung/tsung-1.6.0.ebuild1
-rw-r--r--net-analyzer/ttcp/ttcp-1.12-r2.ebuild1
-rw-r--r--net-analyzer/upnpscan/upnpscan-0.4-r3.ebuild1
-rw-r--r--net-analyzer/vnstat/vnstat-1.15.ebuild1
-rw-r--r--net-analyzer/vnstat/vnstat-1.16.ebuild1
-rw-r--r--net-analyzer/vnstat/vnstat-1.17.ebuild1
-rw-r--r--net-analyzer/w3af/w3af-1.1-r1.ebuild1
-rw-r--r--net-analyzer/w3af/w3af-1.5.ebuild1
-rw-r--r--net-analyzer/wapiti/wapiti-2.3.0.ebuild1
-rw-r--r--net-analyzer/wapiti/wapiti-9999.ebuild1
-rw-r--r--net-analyzer/webfuzzer/webfuzzer-0.2.0-r1.ebuild1
-rw-r--r--net-analyzer/wireshark/wireshark-2.2.4.ebuild1
-rw-r--r--net-analyzer/wireshark/wireshark-99999999.ebuild1
-rw-r--r--net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild1
-rw-r--r--net-analyzer/xprobe/xprobe-0.3.ebuild1
-rw-r--r--net-analyzer/yersinia/yersinia-0.7.3.ebuild1
-rw-r--r--net-analyzer/zabbix/zabbix-2.2.16.ebuild1
-rw-r--r--net-analyzer/zabbix/zabbix-3.0.6.ebuild1
-rw-r--r--net-analyzer/zabbix/zabbix-3.2.2.ebuild1
-rw-r--r--net-analyzer/zabbix/zabbix-3.2.3.ebuild1
-rw-r--r--net-analyzer/zmap/zmap-1.2.1.ebuild1
-rw-r--r--net-analyzer/zmap/zmap-2.1.1.ebuild1
-rw-r--r--net-analyzer/zmap/zmap-9999.ebuild1
-rw-r--r--net-analyzer/zniper/zniper-1.0-r1.ebuild1
503 files changed, 0 insertions, 503 deletions
diff --git a/net-analyzer/2ping/2ping-3.2.0.ebuild b/net-analyzer/2ping/2ping-3.2.0.ebuild
index b463b0200bbb..78e858acbf02 100644
--- a/net-analyzer/2ping/2ping-3.2.0.ebuild
+++ b/net-analyzer/2ping/2ping-3.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/net-analyzer/2ping/2ping-3.2.1.ebuild b/net-analyzer/2ping/2ping-3.2.1.ebuild
index b463b0200bbb..78e858acbf02 100644
--- a/net-analyzer/2ping/2ping-3.2.1.ebuild
+++ b/net-analyzer/2ping/2ping-3.2.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/net-analyzer/aimsniff/aimsniff-0.9d.ebuild b/net-analyzer/aimsniff/aimsniff-0.9d.ebuild
index 0f6a8a23e1bf..e08fa33d31c5 100644
--- a/net-analyzer/aimsniff/aimsniff-0.9d.ebuild
+++ b/net-analyzer/aimsniff/aimsniff-0.9d.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/net-analyzer/alive/alive-2.0.1.ebuild b/net-analyzer/alive/alive-2.0.1.ebuild
index 81ce417debb3..56023534aa01 100644
--- a/net-analyzer/alive/alive-2.0.1.ebuild
+++ b/net-analyzer/alive/alive-2.0.1.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/net-analyzer/alive/alive-2.0.2.ebuild b/net-analyzer/alive/alive-2.0.2.ebuild
index 37d7e02893b0..7c00e7498f3c 100644
--- a/net-analyzer/alive/alive-2.0.2.ebuild
+++ b/net-analyzer/alive/alive-2.0.2.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 autotools eutils
diff --git a/net-analyzer/amap/amap-5.4-r1.ebuild b/net-analyzer/amap/amap-5.4-r1.ebuild
index 5042c179c45d..e29b58609849 100644
--- a/net-analyzer/amap/amap-5.4-r1.ebuild
+++ b/net-analyzer/amap/amap-5.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/net-analyzer/amap/amap-5.4.ebuild b/net-analyzer/amap/amap-5.4.ebuild
index 3c628314531e..2181149109b0 100644
--- a/net-analyzer/amap/amap-5.4.ebuild
+++ b/net-analyzer/amap/amap-5.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-analyzer/angst/angst-0.4b-r2.ebuild b/net-analyzer/angst/angst-0.4b-r2.ebuild
index 84b29ec14f97..f06986f35421 100644
--- a/net-analyzer/angst/angst-0.4b-r2.ebuild
+++ b/net-analyzer/angst/angst-0.4b-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/net-analyzer/apinger/apinger-0.4.1.ebuild b/net-analyzer/apinger/apinger-0.4.1.ebuild
index 05290113aadf..8b2eb5418a76 100644
--- a/net-analyzer/apinger/apinger-0.4.1.ebuild
+++ b/net-analyzer/apinger/apinger-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
inherit autotools
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild
index 1cf593af416b..efa07fed3bd7 100644
--- a/net-analyzer/argus-clients/argus-clients-3.0.8.2.ebuild
+++ b/net-analyzer/argus-clients/argus-clients-3.0.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 autotools eutils toolchain-funcs
diff --git a/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild b/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild
index 690bb134abd0..7dbfc5a721a2 100644
--- a/net-analyzer/argus-clients/argus-clients-3.0.8.ebuild
+++ b/net-analyzer/argus-clients/argus-clients-3.0.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
inherit autotools eutils toolchain-funcs
diff --git a/net-analyzer/argus/argus-3.0.8.1.ebuild b/net-analyzer/argus/argus-3.0.8.1.ebuild
index 6b6ba91deb03..605285628f0b 100644
--- a/net-analyzer/argus/argus-3.0.8.1.ebuild
+++ b/net-analyzer/argus/argus-3.0.8.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
inherit autotools eutils user
diff --git a/net-analyzer/argus/argus-3.0.8.2.ebuild b/net-analyzer/argus/argus-3.0.8.2.ebuild
index f72e24a8f6cb..927bbe427308 100644
--- a/net-analyzer/argus/argus-3.0.8.2.ebuild
+++ b/net-analyzer/argus/argus-3.0.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 autotools eutils user
diff --git a/net-analyzer/arp-scan/arp-scan-1.9.ebuild b/net-analyzer/arp-scan/arp-scan-1.9.ebuild
index e029a42ef278..7f5c451230f5 100644
--- a/net-analyzer/arp-scan/arp-scan-1.9.ebuild
+++ b/net-analyzer/arp-scan/arp-scan-1.9.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/net-analyzer/arp-sk/arp-sk-0.0.16-r2.ebuild b/net-analyzer/arp-sk/arp-sk-0.0.16-r2.ebuild
index 0a795a42185b..773e349fc87b 100644
--- a/net-analyzer/arp-sk/arp-sk-0.0.16-r2.ebuild
+++ b/net-analyzer/arp-sk/arp-sk-0.0.16-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 autotools eutils multilib
diff --git a/net-analyzer/arping/arping-2.17.ebuild b/net-analyzer/arping/arping-2.17.ebuild
index 4a328137c930..daee9ee7286b 100644
--- a/net-analyzer/arping/arping-2.17.ebuild
+++ b/net-analyzer/arping/arping-2.17.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 fcaps
diff --git a/net-analyzer/arping/arping-2.18.ebuild b/net-analyzer/arping/arping-2.18.ebuild
index a82e75bd9fae..1552c81188ae 100644
--- a/net-analyzer/arping/arping-2.18.ebuild
+++ b/net-analyzer/arping/arping-2.18.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 fcaps
diff --git a/net-analyzer/arping/arping-9999.ebuild b/net-analyzer/arping/arping-9999.ebuild
index 97dd75339fd9..252fac54a2de 100644
--- a/net-analyzer/arping/arping-9999.ebuild
+++ b/net-analyzer/arping/arping-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
inherit autotools fcaps git-r3
diff --git a/net-analyzer/arpoison/arpoison-0.6-r2.ebuild b/net-analyzer/arpoison/arpoison-0.6-r2.ebuild
index 76c4dcaf915c..628bef5fd8bf 100644
--- a/net-analyzer/arpoison/arpoison-0.6-r2.ebuild
+++ b/net-analyzer/arpoison/arpoison-0.6-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/net-analyzer/arpon/arpon-2.7-r1.ebuild b/net-analyzer/arpon/arpon-2.7-r1.ebuild
index 7b44475b469c..7428954dbf1b 100644
--- a/net-analyzer/arpon/arpon-2.7-r1.ebuild
+++ b/net-analyzer/arpon/arpon-2.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="4"
inherit cmake-utils readme.gentoo
diff --git a/net-analyzer/arpon/arpon-2.7.2.ebuild b/net-analyzer/arpon/arpon-2.7.2.ebuild
index 9305381856b0..67965d67aa1f 100644
--- a/net-analyzer/arpon/arpon-2.7.2.ebuild
+++ b/net-analyzer/arpon/arpon-2.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
inherit cmake-utils readme.gentoo-r1
diff --git a/net-analyzer/arptools/arptools-1.0.2.ebuild b/net-analyzer/arptools/arptools-1.0.2.ebuild
index f7f59fa48b01..803627388131 100644
--- a/net-analyzer/arptools/arptools-1.0.2.ebuild
+++ b/net-analyzer/arptools/arptools-1.0.2.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/net-analyzer/arpwatch/arpwatch-2.1.15-r8.ebuild b/net-analyzer/arpwatch/arpwatch-2.1.15-r8.ebuild
index a427d5956423..d6e8e99955c9 100644
--- a/net-analyzer/arpwatch/arpwatch-2.1.15-r8.ebuild
+++ b/net-analyzer/arpwatch/arpwatch-2.1.15-r8.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 user versionator
diff --git a/net-analyzer/authforce/authforce-0.9.9-r1.ebuild b/net-analyzer/authforce/authforce-0.9.9-r1.ebuild
index d844bf67f763..fea985a8e03a 100644
--- a/net-analyzer/authforce/authforce-0.9.9-r1.ebuild
+++ b/net-analyzer/authforce/authforce-0.9.9-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/net-analyzer/barnyard/barnyard-0.2.0-r3.ebuild b/net-analyzer/barnyard/barnyard-0.2.0-r3.ebuild
index c1b68ec4b28c..52e010ccc6b7 100644
--- a/net-analyzer/barnyard/barnyard-0.2.0-r3.ebuild
+++ b/net-analyzer/barnyard/barnyard-0.2.0-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
diff --git a/net-analyzer/barnyard2/barnyard2-1.9.ebuild b/net-analyzer/barnyard2/barnyard2-1.9.ebuild
index 7b15053016d8..e09f129def05 100644
--- a/net-analyzer/barnyard2/barnyard2-1.9.ebuild
+++ b/net-analyzer/barnyard2/barnyard2-1.9.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/net-analyzer/bigeye/bigeye-0.3-r3.ebuild b/net-analyzer/bigeye/bigeye-0.3-r3.ebuild
index afaaf2925af2..597005a10170 100644
--- a/net-analyzer/bigeye/bigeye-0.3-r3.ebuild
+++ b/net-analyzer/bigeye/bigeye-0.3-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/net-analyzer/bing/bing-1.1.3-r1.ebuild b/net-analyzer/bing/bing-1.1.3-r1.ebuild
index 10346ba52505..02b9d58b1f04 100644
--- a/net-analyzer/bing/bing-1.1.3-r1.ebuild
+++ b/net-analyzer/bing/bing-1.1.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=2
diff --git a/net-analyzer/bmon/bmon-3.9.ebuild b/net-analyzer/bmon/bmon-3.9.ebuild
index b9f1007f1fa2..95e18c2a29a5 100644
--- a/net-analyzer/bmon/bmon-3.9.ebuild
+++ b/net-analyzer/bmon/bmon-3.9.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit autotools eutils linux-info toolchain-funcs
diff --git a/net-analyzer/bmon/bmon-4.0.ebuild b/net-analyzer/bmon/bmon-4.0.ebuild
index b9f1007f1fa2..95e18c2a29a5 100644
--- a/net-analyzer/bmon/bmon-4.0.ebuild
+++ b/net-analyzer/bmon/bmon-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
inherit autotools eutils linux-info toolchain-funcs
diff --git a/net-analyzer/braa/braa-0.82.ebuild b/net-analyzer/braa/braa-0.82.ebuild
index e5a6940cf809..574816f9353c 100644
--- a/net-analyzer/braa/braa-0.82.ebuild
+++ b/net-analyzer/braa/braa-0.82.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/net-analyzer/bro/bro-2.4.1-r2.ebuild b/net-analyzer/bro/bro-2.4.1-r2.ebuild
index 543aecc54031..231ad94155e5 100644
--- a/net-analyzer/bro/bro-2.4.1-r2.ebuild
+++ b/net-analyzer/bro/bro-2.4.1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/net-analyzer/bsnmp/bsnmp-1.11a.ebuild b/net-analyzer/bsnmp/bsnmp-1.11a.ebuild
index 4569dff5cd42..53220c31acd2 100644
--- a/net-analyzer/bsnmp/bsnmp-1.11a.ebuild
+++ b/net-analyzer/bsnmp/bsnmp-1.11a.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils flag-o-matic
diff --git a/net-analyzer/bsnmp/bsnmp-1.12-r1.ebuild b/net-analyzer/bsnmp/bsnmp-1.12-r1.ebuild
index d515becc1242..cf14d402d591 100644
--- a/net-analyzer/bsnmp/bsnmp-1.12-r1.ebuild
+++ b/net-analyzer/bsnmp/bsnmp-1.12-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 flag-o-matic
diff --git a/net-analyzer/bsnmp/bsnmp-1.12.ebuild b/net-analyzer/bsnmp/bsnmp-1.12.ebuild
index 41749c41b932..5996c6281ae1 100644
--- a/net-analyzer/bsnmp/bsnmp-1.12.ebuild
+++ b/net-analyzer/bsnmp/bsnmp-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 flag-o-matic
diff --git a/net-analyzer/bwbar/bwbar-1.2.3.ebuild b/net-analyzer/bwbar/bwbar-1.2.3.ebuild
index c121da9b8baf..add43e56929f 100644
--- a/net-analyzer/bwbar/bwbar-1.2.3.ebuild
+++ b/net-analyzer/bwbar/bwbar-1.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
inherit eutils
diff --git a/net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild b/net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild
index dac12e53392a..51311ad80550 100644
--- a/net-analyzer/bwm-ng/bwm-ng-0.6.1-r1.ebuild
+++ b/net-analyzer/bwm-ng/bwm-ng-0.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/net-analyzer/bwmon/bwmon-1.3-r2.ebuild b/net-analyzer/bwmon/bwmon-1.3-r2.ebuild
index e54f6d2ef235..3b4912656104 100644
--- a/net-analyzer/bwmon/bwmon-1.3-r2.ebuild
+++ b/net-analyzer/bwmon/bwmon-1.3-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/net-analyzer/bwping/bwping-1.7-r1.ebuild b/net-analyzer/bwping/bwping-1.7-r1.ebuild
index 01aed645d4a1..c6ddb2e09196 100644
--- a/net-analyzer/bwping/bwping-1.7-r1.ebuild
+++ b/net-analyzer/bwping/bwping-1.7-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/net-analyzer/bwping/bwping-1.8.ebuild b/net-analyzer/bwping/bwping-1.8.ebuild
index 34c9476579d5..ab4b64b32645 100644
--- a/net-analyzer/bwping/bwping-1.8.ebuild
+++ b/net-analyzer/bwping/bwping-1.8.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-analyzer/bwping/bwping-1.9.ebuild b/net-analyzer/bwping/bwping-1.9.ebuild
index c33b52b60409..1f2bd02ad9eb 100644
--- a/net-analyzer/bwping/bwping-1.9.ebuild
+++ b/net-analyzer/bwping/bwping-1.9.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/net-analyzer/cacti-spine/cacti-spine-0.8.8h.ebuild b/net-analyzer/cacti-spine/cacti-spine-0.8.8h.ebuild
index b2191c403f70..c7738d6dba91 100644
--- a/net-analyzer/cacti-spine/cacti-spine-0.8.8h.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-0.8.8h.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 autotools eutils
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.0.0.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.0.0.ebuild
index 621b6a9fecc1..ef241df7c78f 100644
--- a/net-analyzer/cacti-spine/cacti-spine-1.0.0.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-1.0.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit autotools eutils
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.0.1.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.0.1.ebuild
index 1dbd7773e31b..34727025866f 100644
--- a/net-analyzer/cacti-spine/cacti-spine-1.0.1.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-1.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
inherit autotools eutils
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.0.2.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.0.2.ebuild
index 1dbd7773e31b..34727025866f 100644
--- a/net-analyzer/cacti-spine/cacti-spine-1.0.2.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-1.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit autotools eutils
diff --git a/net-analyzer/cacti-spine/cacti-spine-1.0.3.ebuild b/net-analyzer/cacti-spine/cacti-spine-1.0.3.ebuild
index 1dbd7773e31b..34727025866f 100644
--- a/net-analyzer/cacti-spine/cacti-spine-1.0.3.ebuild
+++ b/net-analyzer/cacti-spine/cacti-spine-1.0.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit autotools eutils
diff --git a/net-analyzer/cacti/cacti-0.8.8h.ebuild b/net-analyzer/cacti/cacti-0.8.8h.ebuild
index c0f81999031b..7593857b11bb 100644
--- a/net-analyzer/cacti/cacti-0.8.8h.ebuild
+++ b/net-analyzer/cacti/cacti-0.8.8h.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/net-analyzer/cacti/cacti-1.0.0.ebuild b/net-analyzer/cacti/cacti-1.0.0.ebuild
index 55a7e4332b09..f2641066e9cc 100644
--- a/net-analyzer/cacti/cacti-1.0.0.ebuild
+++ b/net-analyzer/cacti/cacti-1.0.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit eutils webapp
diff --git a/net-analyzer/cacti/cacti-1.0.1.ebuild b/net-analyzer/cacti/cacti-1.0.1.ebuild
index 55a7e4332b09..f2641066e9cc 100644
--- a/net-analyzer/cacti/cacti-1.0.1.ebuild
+++ b/net-analyzer/cacti/cacti-1.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
inherit eutils webapp
diff --git a/net-analyzer/cacti/cacti-1.0.2.ebuild b/net-analyzer/cacti/cacti-1.0.2.ebuild
index 55a7e4332b09..f2641066e9cc 100644
--- a/net-analyzer/cacti/cacti-1.0.2.ebuild
+++ b/net-analyzer/cacti/cacti-1.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit eutils webapp
diff --git a/net-analyzer/cacti/cacti-1.0.3.ebuild b/net-analyzer/cacti/cacti-1.0.3.ebuild
index 55a7e4332b09..f2641066e9cc 100644
--- a/net-analyzer/cacti/cacti-1.0.3.ebuild
+++ b/net-analyzer/cacti/cacti-1.0.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit eutils webapp
diff --git a/net-analyzer/calamaris/calamaris-2.59.ebuild b/net-analyzer/calamaris/calamaris-2.59.ebuild
index f22d3d876e0f..5829b5a2276d 100644
--- a/net-analyzer/calamaris/calamaris-2.59.ebuild
+++ b/net-analyzer/calamaris/calamaris-2.59.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-analyzer/calamaris/calamaris-2.99.4.0.ebuild b/net-analyzer/calamaris/calamaris-2.99.4.0.ebuild
index dd0778225298..aed1057e0f8f 100644
--- a/net-analyzer/calamaris/calamaris-2.99.4.0.ebuild
+++ b/net-analyzer/calamaris/calamaris-2.99.4.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-analyzer/carl/carl-0.9-r1.ebuild b/net-analyzer/carl/carl-0.9-r1.ebuild
index 63cad5798063..f44d7e2ce6c7 100644
--- a/net-analyzer/carl/carl-0.9-r1.ebuild
+++ b/net-analyzer/carl/carl-0.9-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python{2_7,3_4} pypy pypy3)
diff --git a/net-analyzer/cbm/cbm-0.1-r1.ebuild b/net-analyzer/cbm/cbm-0.1-r1.ebuild
index 3ddd3e8d920e..3e3c60fb9e6b 100644
--- a/net-analyzer/cbm/cbm-0.1-r1.ebuild
+++ b/net-analyzer/cbm/cbm-0.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild b/net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild
index 7ec4a46d8d3e..4d703c86b826 100644
--- a/net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild
+++ b/net-analyzer/chaosreader/chaosreader-0.94-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/net-analyzer/chaosreader/chaosreader-0.94.ebuild b/net-analyzer/chaosreader/chaosreader-0.94.ebuild
index 769e88825317..62cf4fe05999 100644
--- a/net-analyzer/chaosreader/chaosreader-0.94.ebuild
+++ b/net-analyzer/chaosreader/chaosreader-0.94.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/net-analyzer/check_mk/check_mk-1.2.4_p5-r1.ebuild b/net-analyzer/check_mk/check_mk-1.2.4_p5-r1.ebuild
index f86a4aefcd63..a0a71e70bbdc 100644
--- a/net-analyzer/check_mk/check_mk-1.2.4_p5-r1.ebuild
+++ b/net-analyzer/check_mk/check_mk-1.2.4_p5-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/net-analyzer/check_mk/check_mk-1.2.8_p16.ebuild b/net-analyzer/check_mk/check_mk-1.2.8_p16.ebuild
index 4607dd5dc570..5c3d328b0bb9 100644
--- a/net-analyzer/check_mk/check_mk-1.2.8_p16.ebuild
+++ b/net-analyzer/check_mk/check_mk-1.2.8_p16.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/net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p16.ebuild b/net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p16.ebuild
index d0c26c880bc4..0bb80b3ddcd0 100644
--- a/net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p16.ebuild
+++ b/net-analyzer/check_mk_agent/check_mk_agent-1.2.8_p16.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/net-analyzer/cloudshark/cloudshark-1.0.2.174.ebuild b/net-analyzer/cloudshark/cloudshark-1.0.2.174.ebuild
index 67366efedb2f..81f442abebfe 100644
--- a/net-analyzer/cloudshark/cloudshark-1.0.2.174.ebuild
+++ b/net-analyzer/cloudshark/cloudshark-1.0.2.174.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/net-analyzer/cloudshark/cloudshark-1.0.3.180.ebuild b/net-analyzer/cloudshark/cloudshark-1.0.3.180.ebuild
index 79691a21d1b7..5ca1303bbd5f 100644
--- a/net-analyzer/cloudshark/cloudshark-1.0.3.180.ebuild
+++ b/net-analyzer/cloudshark/cloudshark-1.0.3.180.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/net-analyzer/cloudshark/cloudshark-1.0.4.ebuild b/net-analyzer/cloudshark/cloudshark-1.0.4.ebuild
index 7f3e11186148..191d0601fc8a 100644
--- a/net-analyzer/cloudshark/cloudshark-1.0.4.ebuild
+++ b/net-analyzer/cloudshark/cloudshark-1.0.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/net-analyzer/cnet/cnet-3.3.1.ebuild b/net-analyzer/cnet/cnet-3.3.1.ebuild
index ebdc48083215..3bde2f1eb731 100644
--- a/net-analyzer/cnet/cnet-3.3.1.ebuild
+++ b/net-analyzer/cnet/cnet-3.3.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
inherit eutils multilib toolchain-funcs
diff --git a/net-analyzer/cnet/cnet-3.3.4.ebuild b/net-analyzer/cnet/cnet-3.3.4.ebuild
index 4424f3c65e48..d0f7d21a3314 100644
--- a/net-analyzer/cnet/cnet-3.3.4.ebuild
+++ b/net-analyzer/cnet/cnet-3.3.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 eutils multilib toolchain-funcs
diff --git a/net-analyzer/cryptcat/cryptcat-1.2.1-r1.ebuild b/net-analyzer/cryptcat/cryptcat-1.2.1-r1.ebuild
index dedaf46c1384..b53c88f3c22f 100644
--- a/net-analyzer/cryptcat/cryptcat-1.2.1-r1.ebuild
+++ b/net-analyzer/cryptcat/cryptcat-1.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
inherit eutils toolchain-funcs
diff --git a/net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild b/net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild
index cb7acceec937..0c94c1940d9e 100644
--- a/net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild
+++ b/net-analyzer/cryptcat/cryptcat-1.2.1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils toolchain-funcs
diff --git a/net-analyzer/cutter/cutter-1.03-r1.ebuild b/net-analyzer/cutter/cutter-1.03-r1.ebuild
index 61ed5ad2e425..7e3806ff08d3 100644
--- a/net-analyzer/cutter/cutter-1.03-r1.ebuild
+++ b/net-analyzer/cutter/cutter-1.03-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
inherit eutils toolchain-funcs
diff --git a/net-analyzer/cutter/cutter-1.04.ebuild b/net-analyzer/cutter/cutter-1.04.ebuild
index 695fe9c9e3e3..f11002ca418e 100644
--- a/net-analyzer/cutter/cutter-1.04.ebuild
+++ b/net-analyzer/cutter/cutter-1.04.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/net-analyzer/darkstat/darkstat-3.0.718.ebuild b/net-analyzer/darkstat/darkstat-3.0.718.ebuild
index fa96b8bfaab3..7da5caa4b23f 100644
--- a/net-analyzer/darkstat/darkstat-3.0.718.ebuild
+++ b/net-analyzer/darkstat/darkstat-3.0.718.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 user
diff --git a/net-analyzer/darkstat/darkstat-3.0.719.ebuild b/net-analyzer/darkstat/darkstat-3.0.719.ebuild
index 00f43b0840c1..f5aeaed6f71a 100644
--- a/net-analyzer/darkstat/darkstat-3.0.719.ebuild
+++ b/net-analyzer/darkstat/darkstat-3.0.719.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 autotools user
diff --git a/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r3.ebuild b/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r3.ebuild
index 0aa037d03e46..83aad9792a35 100644
--- a/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r3.ebuild
+++ b/net-analyzer/dhcp_probe/dhcp_probe-1.3.0-r3.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/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild b/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild
index d04bf4061e57..2973a6344152 100644
--- a/net-analyzer/dhcpdump/dhcpdump-1.8.ebuild
+++ b/net-analyzer/dhcpdump/dhcpdump-1.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 toolchain-funcs
diff --git a/net-analyzer/dietsniff/dietsniff-0.4.ebuild b/net-analyzer/dietsniff/dietsniff-0.4.ebuild
index 7609f701f5b6..525ed6964dc3 100644
--- a/net-analyzer/dietsniff/dietsniff-0.4.ebuild
+++ b/net-analyzer/dietsniff/dietsniff-0.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
diff --git a/net-analyzer/dnsenum/dnsenum-1.2.2.ebuild b/net-analyzer/dnsenum/dnsenum-1.2.2.ebuild
index f242454995a1..166ae344f4ec 100644
--- a/net-analyzer/dnsenum/dnsenum-1.2.2.ebuild
+++ b/net-analyzer/dnsenum/dnsenum-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/net-analyzer/dnstracer/dnstracer-1.9-r1.ebuild b/net-analyzer/dnstracer/dnstracer-1.9-r1.ebuild
index 348614afb3cc..8f535fd427d6 100644
--- a/net-analyzer/dnstracer/dnstracer-1.9-r1.ebuild
+++ b/net-analyzer/dnstracer/dnstracer-1.9-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/net-analyzer/dosdetector/dosdetector-20060621-r1.ebuild b/net-analyzer/dosdetector/dosdetector-20060621-r1.ebuild
index ba113ec6cd71..81aecb194510 100644
--- a/net-analyzer/dosdetector/dosdetector-20060621-r1.ebuild
+++ b/net-analyzer/dosdetector/dosdetector-20060621-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
inherit eutils
diff --git a/net-analyzer/dosdetector/dosdetector-20060621.ebuild b/net-analyzer/dosdetector/dosdetector-20060621.ebuild
index ada4ceb9c162..c7d8681ca3b5 100644
--- a/net-analyzer/dosdetector/dosdetector-20060621.ebuild
+++ b/net-analyzer/dosdetector/dosdetector-20060621.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
diff --git a/net-analyzer/driftnet/driftnet-0.1.6_p20090401-r1.ebuild b/net-analyzer/driftnet/driftnet-0.1.6_p20090401-r1.ebuild
index 3034927e6532..8479e85a6794 100644
--- a/net-analyzer/driftnet/driftnet-0.1.6_p20090401-r1.ebuild
+++ b/net-analyzer/driftnet/driftnet-0.1.6_p20090401-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 fcaps flag-o-matic toolchain-funcs
diff --git a/net-analyzer/driftnet/driftnet-0.1.6_p20090401.ebuild b/net-analyzer/driftnet/driftnet-0.1.6_p20090401.ebuild
index 4788dfd51cfc..609df1bb04e0 100644
--- a/net-analyzer/driftnet/driftnet-0.1.6_p20090401.ebuild
+++ b/net-analyzer/driftnet/driftnet-0.1.6_p20090401.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 flag-o-matic toolchain-funcs
diff --git a/net-analyzer/dsniff/dsniff-2.4_beta1-r4.ebuild b/net-analyzer/dsniff/dsniff-2.4_beta1-r4.ebuild
index 7b434b55a064..88d59bffe3fa 100644
--- a/net-analyzer/dsniff/dsniff-2.4_beta1-r4.ebuild
+++ b/net-analyzer/dsniff/dsniff-2.4_beta1-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit autotools eutils flag-o-matic toolchain-funcs
diff --git a/net-analyzer/dsniff/dsniff-2.4_beta1-r7.ebuild b/net-analyzer/dsniff/dsniff-2.4_beta1-r7.ebuild
index f3d7fe9b7ab7..076b0aa2199e 100644
--- a/net-analyzer/dsniff/dsniff-2.4_beta1-r7.ebuild
+++ b/net-analyzer/dsniff/dsniff-2.4_beta1-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 autotools eutils flag-o-matic toolchain-funcs
diff --git a/net-analyzer/dsniff/dsniff-2.4_beta1-r8.ebuild b/net-analyzer/dsniff/dsniff-2.4_beta1-r8.ebuild
index eea9a468eea8..9878f4b54d23 100644
--- a/net-analyzer/dsniff/dsniff-2.4_beta1-r8.ebuild
+++ b/net-analyzer/dsniff/dsniff-2.4_beta1-r8.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 autotools eutils flag-o-matic toolchain-funcs
diff --git a/net-analyzer/echoping/echoping-6.0.2_p434-r2.ebuild b/net-analyzer/echoping/echoping-6.0.2_p434-r2.ebuild
index 0d26cdb1e18d..1b004aa80cfb 100644
--- a/net-analyzer/echoping/echoping-6.0.2_p434-r2.ebuild
+++ b/net-analyzer/echoping/echoping-6.0.2_p434-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
inherit autotools eutils
diff --git a/net-analyzer/echoping/echoping-6.0.2_p434-r3.ebuild b/net-analyzer/echoping/echoping-6.0.2_p434-r3.ebuild
index cfb0b9275971..0a565e6bf158 100644
--- a/net-analyzer/echoping/echoping-6.0.2_p434-r3.ebuild
+++ b/net-analyzer/echoping/echoping-6.0.2_p434-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit autotools eutils
diff --git a/net-analyzer/egressor/egressor-1.0-r2.ebuild b/net-analyzer/egressor/egressor-1.0-r2.ebuild
index 386c85fdc60b..bac30f82bf2b 100644
--- a/net-analyzer/egressor/egressor-1.0-r2.ebuild
+++ b/net-analyzer/egressor/egressor-1.0-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/net-analyzer/etherape/etherape-0.9.14.ebuild b/net-analyzer/etherape/etherape-0.9.14.ebuild
index bff1ebfe4d11..bc2c11074e7a 100644
--- a/net-analyzer/etherape/etherape-0.9.14.ebuild
+++ b/net-analyzer/etherape/etherape-0.9.14.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 gnome2
diff --git a/net-analyzer/etherape/etherape-0.9.15.ebuild b/net-analyzer/etherape/etherape-0.9.15.ebuild
index 412dd67026bc..725b922c8868 100644
--- a/net-analyzer/etherape/etherape-0.9.15.ebuild
+++ b/net-analyzer/etherape/etherape-0.9.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
inherit gnome2
diff --git a/net-analyzer/ethloop/ethloop-10-r3.ebuild b/net-analyzer/ethloop/ethloop-10-r3.ebuild
index 21451ec53fba..d49ae392f80f 100644
--- a/net-analyzer/ethloop/ethloop-10-r3.ebuild
+++ b/net-analyzer/ethloop/ethloop-10-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/net-analyzer/ettercap/ettercap-0.8.2.ebuild b/net-analyzer/ettercap/ettercap-0.8.2.ebuild
index bcaf02f09057..f2f9af225aa5 100644
--- a/net-analyzer/ettercap/ettercap-0.8.2.ebuild
+++ b/net-analyzer/ettercap/ettercap-0.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/net-analyzer/ettercap/ettercap-9999.ebuild b/net-analyzer/ettercap/ettercap-9999.ebuild
index adbb8ca5c899..548bda336349 100644
--- a/net-analyzer/ettercap/ettercap-9999.ebuild
+++ b/net-analyzer/ettercap/ettercap-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/net-analyzer/fail2ban/fail2ban-0.9.3-r1.ebuild b/net-analyzer/fail2ban/fail2ban-0.9.3-r1.ebuild
index b14c0836b9d2..e2e0606eacdc 100644
--- a/net-analyzer/fail2ban/fail2ban-0.9.3-r1.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.9.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
PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
diff --git a/net-analyzer/fail2ban/fail2ban-0.9.4.ebuild b/net-analyzer/fail2ban/fail2ban-0.9.4.ebuild
index 24931b0941e6..f65dee1387aa 100644
--- a/net-analyzer/fail2ban/fail2ban-0.9.4.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.9.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
PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
diff --git a/net-analyzer/fail2ban/fail2ban-0.9.5.ebuild b/net-analyzer/fail2ban/fail2ban-0.9.5.ebuild
index 7cca52e52174..f9375b0e5adc 100644
--- a/net-analyzer/fail2ban/fail2ban-0.9.5.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.9.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
PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
diff --git a/net-analyzer/fail2ban/fail2ban-0.9.6.ebuild b/net-analyzer/fail2ban/fail2ban-0.9.6.ebuild
index 017ce52f6ed2..416c743d3f1f 100644
--- a/net-analyzer/fail2ban/fail2ban-0.9.6.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-0.9.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
diff --git a/net-analyzer/fail2ban/fail2ban-99999999.ebuild b/net-analyzer/fail2ban/fail2ban-99999999.ebuild
index b50271280045..34b83c3cedc9 100644
--- a/net-analyzer/fail2ban/fail2ban-99999999.ebuild
+++ b/net-analyzer/fail2ban/fail2ban-99999999.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=( python{2_7,3_4,3_5} pypy )
diff --git a/net-analyzer/fe3d/fe3d-0.11.2.ebuild b/net-analyzer/fe3d/fe3d-0.11.2.ebuild
index 90d0b0e906b3..b3a60faee33b 100644
--- a/net-analyzer/fe3d/fe3d-0.11.2.ebuild
+++ b/net-analyzer/fe3d/fe3d-0.11.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
WX_GTK_VER="2.8"
diff --git a/net-analyzer/ffp/ffp-0.0.8-r1.ebuild b/net-analyzer/ffp/ffp-0.0.8-r1.ebuild
index cfea239c0ac0..cbc60fb821f7 100644
--- a/net-analyzer/ffp/ffp-0.0.8-r1.ebuild
+++ b/net-analyzer/ffp/ffp-0.0.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=5
inherit toolchain-funcs
diff --git a/net-analyzer/firewalk/firewalk-5.0-r1.ebuild b/net-analyzer/firewalk/firewalk-5.0-r1.ebuild
index 997a853ed286..e43aa7500b1c 100644
--- a/net-analyzer/firewalk/firewalk-5.0-r1.ebuild
+++ b/net-analyzer/firewalk/firewalk-5.0-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
inherit eutils
diff --git a/net-analyzer/flent/flent-0.15.0.ebuild b/net-analyzer/flent/flent-0.15.0.ebuild
index 5dc2f8ba65ac..c39d6922575d 100644
--- a/net-analyzer/flent/flent-0.15.0.ebuild
+++ b/net-analyzer/flent/flent-0.15.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/net-analyzer/flow-tools/flow-tools-0.68.5.1-r2.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r2.ebuild
index a48bcbdf5fb4..e6447657ab54 100644
--- a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r2.ebuild
+++ b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
inherit eutils user
diff --git a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r9.ebuild b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r9.ebuild
index 087e3c9d9048..dbdd8519afd9 100644
--- a/net-analyzer/flow-tools/flow-tools-0.68.5.1-r9.ebuild
+++ b/net-analyzer/flow-tools/flow-tools-0.68.5.1-r9.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/net-analyzer/flowgrind/flowgrind-0.7.1.ebuild b/net-analyzer/flowgrind/flowgrind-0.7.1.ebuild
index 0cb63cf8ca64..4acc5ca2d459 100644
--- a/net-analyzer/flowgrind/flowgrind-0.7.1.ebuild
+++ b/net-analyzer/flowgrind/flowgrind-0.7.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-analyzer/flowgrind/flowgrind-0.8.0.ebuild b/net-analyzer/flowgrind/flowgrind-0.8.0.ebuild
index f1ab9a7c7924..22232ba540d3 100644
--- a/net-analyzer/flowgrind/flowgrind-0.8.0.ebuild
+++ b/net-analyzer/flowgrind/flowgrind-0.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=6
diff --git a/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild b/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild
index ecdf87395e49..458a777ff879 100644
--- a/net-analyzer/fping/fping-2.4_beta2_p161-r2.ebuild
+++ b/net-analyzer/fping/fping-2.4_beta2_p161-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/net-analyzer/fping/fping-3.10.ebuild b/net-analyzer/fping/fping-3.10.ebuild
index 01c66ae9fe7b..ec38bab42ded 100644
--- a/net-analyzer/fping/fping-3.10.ebuild
+++ b/net-analyzer/fping/fping-3.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/net-analyzer/fping/fping-3.13.ebuild b/net-analyzer/fping/fping-3.13.ebuild
index 01c66ae9fe7b..ec38bab42ded 100644
--- a/net-analyzer/fping/fping-3.13.ebuild
+++ b/net-analyzer/fping/fping-3.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/net-analyzer/fprobe/fprobe-1.1-r3.ebuild b/net-analyzer/fprobe/fprobe-1.1-r3.ebuild
index 8524efb16220..c9f12cb15c7d 100644
--- a/net-analyzer/fprobe/fprobe-1.1-r3.ebuild
+++ b/net-analyzer/fprobe/fprobe-1.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=6
diff --git a/net-analyzer/fprobe/fprobe-1.1.ebuild b/net-analyzer/fprobe/fprobe-1.1.ebuild
index 91525958ede1..97dcfe72a52f 100644
--- a/net-analyzer/fprobe/fprobe-1.1.ebuild
+++ b/net-analyzer/fprobe/fprobe-1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="A libpcap-based tool to collect network traffic data and emit it as NetFlow flows"
HOMEPAGE="http://fprobe.sourceforge.net"
diff --git a/net-analyzer/fragroute/fragroute-1.2.6.ebuild b/net-analyzer/fragroute/fragroute-1.2.6.ebuild
index 885516d0d2fd..480dc836096d 100644
--- a/net-analyzer/fragroute/fragroute-1.2.6.ebuild
+++ b/net-analyzer/fragroute/fragroute-1.2.6.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/net-analyzer/ftester/ftester-1.0.ebuild b/net-analyzer/ftester/ftester-1.0.ebuild
index 968b4915611f..aabe8017d39e 100644
--- a/net-analyzer/ftester/ftester-1.0.ebuild
+++ b/net-analyzer/ftester/ftester-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/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild b/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild
index 97901599e1aa..d511245fa473 100644
--- a/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild
+++ b/net-analyzer/fwlogwatch/fwlogwatch-1.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild b/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild
index 78665a04577c..000c335caa62 100644
--- a/net-analyzer/fwlogwatch/fwlogwatch-1.5.ebuild
+++ b/net-analyzer/fwlogwatch/fwlogwatch-1.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/net-analyzer/gensink/gensink-4.1-r2.ebuild b/net-analyzer/gensink/gensink-4.1-r2.ebuild
index e59a69f134e4..5a99e658ec60 100644
--- a/net-analyzer/gensink/gensink-4.1-r2.ebuild
+++ b/net-analyzer/gensink/gensink-4.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/net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild b/net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild
index 51528d0f85fe..a7f4719ea2d9 100644
--- a/net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild
+++ b/net-analyzer/gnome-nettool/gnome-nettool-3.8.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
GCONF_DEBUG="yes"
diff --git a/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r3.ebuild b/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r3.ebuild
index 9c5727906c08..475dabd261a7 100644
--- a/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r3.ebuild
+++ b/net-analyzer/gnu-netcat/gnu-netcat-0.7.1-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-analyzer/goaccess/goaccess-0.5-r1.ebuild b/net-analyzer/goaccess/goaccess-0.5-r1.ebuild
index 25d49a414867..efe48d4f17d3 100644
--- a/net-analyzer/goaccess/goaccess-0.5-r1.ebuild
+++ b/net-analyzer/goaccess/goaccess-0.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-analyzer/goaccess/goaccess-0.6.1.ebuild b/net-analyzer/goaccess/goaccess-0.6.1.ebuild
index 477b938374a9..76e6117c2e5a 100644
--- a/net-analyzer/goaccess/goaccess-0.6.1.ebuild
+++ b/net-analyzer/goaccess/goaccess-0.6.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/net-analyzer/goaccess/goaccess-0.8.5.ebuild b/net-analyzer/goaccess/goaccess-0.8.5.ebuild
index 12392c91b81b..6e14a77788ec 100644
--- a/net-analyzer/goaccess/goaccess-0.8.5.ebuild
+++ b/net-analyzer/goaccess/goaccess-0.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"
diff --git a/net-analyzer/goaccess/goaccess-0.9.ebuild b/net-analyzer/goaccess/goaccess-0.9.ebuild
index f9e77acf9803..06d537e9023c 100644
--- a/net-analyzer/goaccess/goaccess-0.9.ebuild
+++ b/net-analyzer/goaccess/goaccess-0.9.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/net-analyzer/goaccess/goaccess-1.1.1.ebuild b/net-analyzer/goaccess/goaccess-1.1.1.ebuild
index 28c284b7bcc5..a1184f2bb1ae 100644
--- a/net-analyzer/goaccess/goaccess-1.1.1.ebuild
+++ b/net-analyzer/goaccess/goaccess-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$
EAPI=6
diff --git a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild b/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
index 3ce90561355b..5104e42843b8 100644
--- a/net-analyzer/gr-fosphor/gr-fosphor-9999.ebuild
+++ b/net-analyzer/gr-fosphor/gr-fosphor-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
PYTHON_COMPAT=( python2_7 )
diff --git a/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild b/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild
index 544dd8d6aa88..437a290d1014 100644
--- a/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
diff --git a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.9.ebuild b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.9.ebuild
index 77cbf92da765..e65316ebf6f1 100644
--- a/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.9.ebuild
+++ b/net-analyzer/greenbone-security-assistant/greenbone-security-assistant-6.0.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
diff --git a/net-analyzer/gsm-receiver/gsm-receiver-9999.ebuild b/net-analyzer/gsm-receiver/gsm-receiver-9999.ebuild
index 80ead399238d..0b04eab14d5f 100644
--- a/net-analyzer/gsm-receiver/gsm-receiver-9999.ebuild
+++ b/net-analyzer/gsm-receiver/gsm-receiver-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
PYTHON_COMPAT=( python2_7 )
diff --git a/net-analyzer/gspoof/gspoof-3.2-r2.ebuild b/net-analyzer/gspoof/gspoof-3.2-r2.ebuild
index 31e98d07b950..618d875e8c41 100644
--- a/net-analyzer/gspoof/gspoof-3.2-r2.ebuild
+++ b/net-analyzer/gspoof/gspoof-3.2-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/net-analyzer/hexinject/hexinject-1.5.ebuild b/net-analyzer/hexinject/hexinject-1.5.ebuild
index 5c68e66abfd2..b33f5f0bda0c 100644
--- a/net-analyzer/hexinject/hexinject-1.5.ebuild
+++ b/net-analyzer/hexinject/hexinject-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/net-analyzer/hping/hping-3_pre20051105-r3.ebuild b/net-analyzer/hping/hping-3_pre20051105-r3.ebuild
index 336fe95512f9..38dfcc336db8 100644
--- a/net-analyzer/hping/hping-3_pre20051105-r3.ebuild
+++ b/net-analyzer/hping/hping-3_pre20051105-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/net-analyzer/hping/hping-3_pre20051105-r5.ebuild b/net-analyzer/hping/hping-3_pre20051105-r5.ebuild
index 76538df88a7c..8f8890ed8297 100644
--- a/net-analyzer/hping/hping-3_pre20051105-r5.ebuild
+++ b/net-analyzer/hping/hping-3_pre20051105-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/net-analyzer/httping/httping-2.5.ebuild b/net-analyzer/httping/httping-2.5.ebuild
index ec801ca900ad..646d60b84450 100644
--- a/net-analyzer/httping/httping-2.5.ebuild
+++ b/net-analyzer/httping/httping-2.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
inherit eutils toolchain-funcs
diff --git a/net-analyzer/hunt/hunt-1.5-r1.ebuild b/net-analyzer/hunt/hunt-1.5-r1.ebuild
index 86a3507124cf..299342dba80e 100644
--- a/net-analyzer/hunt/hunt-1.5-r1.ebuild
+++ b/net-analyzer/hunt/hunt-1.5-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/net-analyzer/hunt/hunt-1.5-r3.ebuild b/net-analyzer/hunt/hunt-1.5-r3.ebuild
index 61c006718f41..7e824be3caa3 100644
--- a/net-analyzer/hunt/hunt-1.5-r3.ebuild
+++ b/net-analyzer/hunt/hunt-1.5-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/net-analyzer/hydra/hydra-8.1-r1.ebuild b/net-analyzer/hydra/hydra-8.1-r1.ebuild
index 919c6831785a..5bd65a0cb6fb 100644
--- a/net-analyzer/hydra/hydra-8.1-r1.ebuild
+++ b/net-analyzer/hydra/hydra-8.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
inherit eutils toolchain-funcs
diff --git a/net-analyzer/hydra/hydra-8.1.ebuild b/net-analyzer/hydra/hydra-8.1.ebuild
index 38f5caff028f..64a4453dc1f3 100644
--- a/net-analyzer/hydra/hydra-8.1.ebuild
+++ b/net-analyzer/hydra/hydra-8.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
inherit eutils toolchain-funcs
diff --git a/net-analyzer/ibmonitor/ibmonitor-1.4.ebuild b/net-analyzer/ibmonitor/ibmonitor-1.4.ebuild
index 8eff57e65253..6e388ee87fa9 100644
--- a/net-analyzer/ibmonitor/ibmonitor-1.4.ebuild
+++ b/net-analyzer/ibmonitor/ibmonitor-1.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-analyzer/icinga-web/icinga-web-1.14.0.ebuild b/net-analyzer/icinga-web/icinga-web-1.14.0.ebuild
index 334ba4a43b52..215958015581 100644
--- a/net-analyzer/icinga-web/icinga-web-1.14.0.ebuild
+++ b/net-analyzer/icinga-web/icinga-web-1.14.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/net-analyzer/icinga/icinga-1.13.4.ebuild b/net-analyzer/icinga/icinga-1.13.4.ebuild
index 427933080347..4f6eef1f43e4 100644
--- a/net-analyzer/icinga/icinga-1.13.4.ebuild
+++ b/net-analyzer/icinga/icinga-1.13.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/net-analyzer/icinga/icinga-1.14.0.ebuild b/net-analyzer/icinga/icinga-1.14.0.ebuild
index 0a18be7b5c0b..f22db86ed82d 100644
--- a/net-analyzer/icinga/icinga-1.14.0.ebuild
+++ b/net-analyzer/icinga/icinga-1.14.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/net-analyzer/icinga2/icinga2-2.5.4-r1.ebuild b/net-analyzer/icinga2/icinga2-2.5.4-r1.ebuild
index 76f6f9a3c368..12bfa48676c0 100644
--- a/net-analyzer/icinga2/icinga2-2.5.4-r1.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.5.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
if [[ ${PV} != 9999 ]]; then
diff --git a/net-analyzer/icinga2/icinga2-2.6.0.ebuild b/net-analyzer/icinga2/icinga2-2.6.0.ebuild
index 438efb4b474e..36d3970dc4e5 100644
--- a/net-analyzer/icinga2/icinga2-2.6.0.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.6.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
if [[ ${PV} != 9999 ]]; then
diff --git a/net-analyzer/icinga2/icinga2-2.6.1.ebuild b/net-analyzer/icinga2/icinga2-2.6.1.ebuild
index b7960779875d..0b04670293a4 100644
--- a/net-analyzer/icinga2/icinga2-2.6.1.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.6.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
if [[ ${PV} != 9999 ]]; then
diff --git a/net-analyzer/icinga2/icinga2-2.6.2.ebuild b/net-analyzer/icinga2/icinga2-2.6.2.ebuild
index 438efb4b474e..36d3970dc4e5 100644
--- a/net-analyzer/icinga2/icinga2-2.6.2.ebuild
+++ b/net-analyzer/icinga2/icinga2-2.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=5
if [[ ${PV} != 9999 ]]; then
diff --git a/net-analyzer/icinga2/icinga2-9999.ebuild b/net-analyzer/icinga2/icinga2-9999.ebuild
index 0ff713084659..af171a68b517 100644
--- a/net-analyzer/icinga2/icinga2-9999.ebuild
+++ b/net-analyzer/icinga2/icinga2-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
if [[ ${PV} != 9999 ]]; then
diff --git a/net-analyzer/ifmetric/ifmetric-0.3-r2.ebuild b/net-analyzer/ifmetric/ifmetric-0.3-r2.ebuild
index c52ed2251708..ade8bba29931 100644
--- a/net-analyzer/ifmetric/ifmetric-0.3-r2.ebuild
+++ b/net-analyzer/ifmetric/ifmetric-0.3-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/net-analyzer/ifstat/ifstat-1.1-r2.ebuild b/net-analyzer/ifstat/ifstat-1.1-r2.ebuild
index 4005bb857a14..98a8a89c5741 100644
--- a/net-analyzer/ifstat/ifstat-1.1-r2.ebuild
+++ b/net-analyzer/ifstat/ifstat-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=4
inherit autotools eutils
diff --git a/net-analyzer/ifstatus/ifstatus-1.1.0-r1.ebuild b/net-analyzer/ifstatus/ifstatus-1.1.0-r1.ebuild
index f5cad000f1d8..7fb2edc345f8 100644
--- a/net-analyzer/ifstatus/ifstatus-1.1.0-r1.ebuild
+++ b/net-analyzer/ifstatus/ifstatus-1.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$
EAPI=5
inherit eutils toolchain-funcs
diff --git a/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild b/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild
index 121ff01a9bf1..2e8cfdd7a51b 100644
--- a/net-analyzer/iftop/iftop-1.0_pre4-r2.ebuild
+++ b/net-analyzer/iftop/iftop-1.0_pre4-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/net-analyzer/iftop/iftop-1.0_pre4.ebuild b/net-analyzer/iftop/iftop-1.0_pre4.ebuild
index dcd6dd683bb1..84f5ff4d23af 100644
--- a/net-analyzer/iftop/iftop-1.0_pre4.ebuild
+++ b/net-analyzer/iftop/iftop-1.0_pre4.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/net-analyzer/ike-scan/ike-scan-1.9-r1.ebuild b/net-analyzer/ike-scan/ike-scan-1.9-r1.ebuild
index 76a33ef5e526..72e47e829d53 100644
--- a/net-analyzer/ike-scan/ike-scan-1.9-r1.ebuild
+++ b/net-analyzer/ike-scan/ike-scan-1.9-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/net-analyzer/ike-scan/ike-scan-1.9-r2.ebuild b/net-analyzer/ike-scan/ike-scan-1.9-r2.ebuild
index 143c316977c5..6fa3edca229f 100644
--- a/net-analyzer/ike-scan/ike-scan-1.9-r2.ebuild
+++ b/net-analyzer/ike-scan/ike-scan-1.9-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/net-analyzer/ipaudit/ipaudit-1.0_beta2.ebuild b/net-analyzer/ipaudit/ipaudit-1.0_beta2.ebuild
index 59047ab98be6..286e77456f83 100644
--- a/net-analyzer/ipaudit/ipaudit-1.0_beta2.ebuild
+++ b/net-analyzer/ipaudit/ipaudit-1.0_beta2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils
DESCRIPTION="IPAudit monitors network activity on a network by host, protocol and port"
diff --git a/net-analyzer/ipband/ipband-0.8.1-r1.ebuild b/net-analyzer/ipband/ipband-0.8.1-r1.ebuild
index b795b2d07786..1e0feff597c1 100644
--- a/net-analyzer/ipband/ipband-0.8.1-r1.ebuild
+++ b/net-analyzer/ipband/ipband-0.8.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-analyzer/ipcad/ipcad-3.7.3.ebuild b/net-analyzer/ipcad/ipcad-3.7.3.ebuild
index 9305c2ff2bae..e9723ab496af 100644
--- a/net-analyzer/ipcad/ipcad-3.7.3.ebuild
+++ b/net-analyzer/ipcad/ipcad-3.7.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
inherit autotools eutils
diff --git a/net-analyzer/ipgen/ipgen-9999.ebuild b/net-analyzer/ipgen/ipgen-9999.ebuild
index d03f8ca0cb25..9b3058c197fa 100644
--- a/net-analyzer/ipgen/ipgen-9999.ebuild
+++ b/net-analyzer/ipgen/ipgen-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit autotools git-r3
diff --git a/net-analyzer/ipguard/ipguard-1.04.ebuild b/net-analyzer/ipguard/ipguard-1.04.ebuild
index 37f7f7f0afbc..0de7e748f4a2 100644
--- a/net-analyzer/ipguard/ipguard-1.04.ebuild
+++ b/net-analyzer/ipguard/ipguard-1.04.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 toolchain-funcs
diff --git a/net-analyzer/iplog/iplog-2.2.3-r2.ebuild b/net-analyzer/iplog/iplog-2.2.3-r2.ebuild
index 4bb47dd40553..3aa9eb1e45fc 100644
--- a/net-analyzer/iplog/iplog-2.2.3-r2.ebuild
+++ b/net-analyzer/iplog/iplog-2.2.3-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
diff --git a/net-analyzer/ippl/ippl-1.4.14-r3.ebuild b/net-analyzer/ippl/ippl-1.4.14-r3.ebuild
index 93d07942e405..9f807cd264aa 100644
--- a/net-analyzer/ippl/ippl-1.4.14-r3.ebuild
+++ b/net-analyzer/ippl/ippl-1.4.14-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/net-analyzer/ippl/ippl-1.4.14-r5.ebuild b/net-analyzer/ippl/ippl-1.4.14-r5.ebuild
index e760c6d2a6af..e436f03ac433 100644
--- a/net-analyzer/ippl/ippl-1.4.14-r5.ebuild
+++ b/net-analyzer/ippl/ippl-1.4.14-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
inherit eutils toolchain-funcs user
diff --git a/net-analyzer/ipsumdump/ipsumdump-1.85.ebuild b/net-analyzer/ipsumdump/ipsumdump-1.85.ebuild
index 0136631ed0fc..371b03c67b61 100644
--- a/net-analyzer/ipsumdump/ipsumdump-1.85.ebuild
+++ b/net-analyzer/ipsumdump/ipsumdump-1.85.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/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild
index 74cbcc2c2ed2..def3a784a7ea 100644
--- a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild
+++ b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils toolchain-funcs
diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r2.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r2.ebuild
index ec53ab3d6f68..1cb32750a719 100644
--- a/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-r2.ebuild
+++ b/net-analyzer/iptraf-ng/iptraf-ng-1.1.4-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 toolchain-funcs
diff --git a/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild
index d69ea2287c7e..ea4ed84750bc 100644
--- a/net-analyzer/iptraf-ng/iptraf-ng-9999.ebuild
+++ b/net-analyzer/iptraf-ng/iptraf-ng-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
inherit eutils git-r3 toolchain-funcs
diff --git a/net-analyzer/iptstate/iptstate-2.2.5.ebuild b/net-analyzer/iptstate/iptstate-2.2.5.ebuild
index 4fd1b2e8e9ad..a3a8e345be01 100644
--- a/net-analyzer/iptstate/iptstate-2.2.5.ebuild
+++ b/net-analyzer/iptstate/iptstate-2.2.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
inherit eutils toolchain-funcs
diff --git a/net-analyzer/iptstate/iptstate-2.2.6.ebuild b/net-analyzer/iptstate/iptstate-2.2.6.ebuild
index 5c73f26afe2e..229188a3b618 100644
--- a/net-analyzer/iptstate/iptstate-2.2.6.ebuild
+++ b/net-analyzer/iptstate/iptstate-2.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
inherit toolchain-funcs
diff --git a/net-analyzer/ipv6toolkit/ipv6toolkit-1.4.1.ebuild b/net-analyzer/ipv6toolkit/ipv6toolkit-1.4.1.ebuild
index fa39f4f54272..6d28f5116813 100644
--- a/net-analyzer/ipv6toolkit/ipv6toolkit-1.4.1.ebuild
+++ b/net-analyzer/ipv6toolkit/ipv6toolkit-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=4
diff --git a/net-analyzer/ipv6toolkit/ipv6toolkit-2.0_p20160422.ebuild b/net-analyzer/ipv6toolkit/ipv6toolkit-2.0_p20160422.ebuild
index ca04eb19573f..0e211fa6f1bb 100644
--- a/net-analyzer/ipv6toolkit/ipv6toolkit-2.0_p20160422.ebuild
+++ b/net-analyzer/ipv6toolkit/ipv6toolkit-2.0_p20160422.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/net-analyzer/isic/isic-0.07-r1.ebuild b/net-analyzer/isic/isic-0.07-r1.ebuild
index c49de0277844..ac8c670339bd 100644
--- a/net-analyzer/isic/isic-0.07-r1.ebuild
+++ b/net-analyzer/isic/isic-0.07-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/net-analyzer/jffnms/jffnms-0.9.4.ebuild b/net-analyzer/jffnms/jffnms-0.9.4.ebuild
index ed2b1962b859..24c421687e9d 100644
--- a/net-analyzer/jffnms/jffnms-0.9.4.ebuild
+++ b/net-analyzer/jffnms/jffnms-0.9.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit user
diff --git a/net-analyzer/jmx2munin/jmx2munin-1.0_p20120811-r1.ebuild b/net-analyzer/jmx2munin/jmx2munin-1.0_p20120811-r1.ebuild
index 4a6017458dd1..ad8601a5fcc0 100644
--- a/net-analyzer/jmx2munin/jmx2munin-1.0_p20120811-r1.ebuild
+++ b/net-analyzer/jmx2munin/jmx2munin-1.0_p20120811-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/net-analyzer/jnettop/jnettop-0.13.0-r1.ebuild b/net-analyzer/jnettop/jnettop-0.13.0-r1.ebuild
index e015ba9407d6..e0c718000574 100644
--- a/net-analyzer/jnettop/jnettop-0.13.0-r1.ebuild
+++ b/net-analyzer/jnettop/jnettop-0.13.0-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
inherit autotools eutils
diff --git a/net-analyzer/knocker/knocker-0.7.1-r2.ebuild b/net-analyzer/knocker/knocker-0.7.1-r2.ebuild
index de9a3307edad..f8f17e39bcb8 100644
--- a/net-analyzer/knocker/knocker-0.7.1-r2.ebuild
+++ b/net-analyzer/knocker/knocker-0.7.1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/net-analyzer/knocker/knocker-0.7.1-r3.ebuild b/net-analyzer/knocker/knocker-0.7.1-r3.ebuild
index 55ca0de66051..9731d03bf7b7 100644
--- a/net-analyzer/knocker/knocker-0.7.1-r3.ebuild
+++ b/net-analyzer/knocker/knocker-0.7.1-r3.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/net-analyzer/labrea/labrea-2.5-r2.ebuild b/net-analyzer/labrea/labrea-2.5-r2.ebuild
index 52591b903e24..cdbff85668a0 100644
--- a/net-analyzer/labrea/labrea-2.5-r2.ebuild
+++ b/net-analyzer/labrea/labrea-2.5-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/net-analyzer/lft/lft-3.77.ebuild b/net-analyzer/lft/lft-3.77.ebuild
index f639a23d403c..b79c445424c0 100644
--- a/net-analyzer/lft/lft-3.77.ebuild
+++ b/net-analyzer/lft/lft-3.77.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/net-analyzer/libnasl/libnasl-2.2.9-r1.ebuild b/net-analyzer/libnasl/libnasl-2.2.9-r1.ebuild
index 6f6f00f9ad53..497332220f40 100644
--- a/net-analyzer/libnasl/libnasl-2.2.9-r1.ebuild
+++ b/net-analyzer/libnasl/libnasl-2.2.9-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/net-analyzer/lilac/lilac-1.0.3.ebuild b/net-analyzer/lilac/lilac-1.0.3.ebuild
index fbd129428869..cb574a7876cd 100644
--- a/net-analyzer/lilac/lilac-1.0.3.ebuild
+++ b/net-analyzer/lilac/lilac-1.0.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/net-analyzer/linkchecker/linkchecker-9.3-r1.ebuild b/net-analyzer/linkchecker/linkchecker-9.3-r1.ebuild
index 5a4f929df0fb..6e2135b21c6e 100644
--- a/net-analyzer/linkchecker/linkchecker-9.3-r1.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-9.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=5
diff --git a/net-analyzer/linkchecker/linkchecker-9.3-r2.ebuild b/net-analyzer/linkchecker/linkchecker-9.3-r2.ebuild
index 16e55e2ff5f9..ccafd2063944 100644
--- a/net-analyzer/linkchecker/linkchecker-9.3-r2.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-9.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
diff --git a/net-analyzer/linkchecker/linkchecker-9999.ebuild b/net-analyzer/linkchecker/linkchecker-9999.ebuild
index ad27a47b546a..82cfea75b987 100644
--- a/net-analyzer/linkchecker/linkchecker-9999.ebuild
+++ b/net-analyzer/linkchecker/linkchecker-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/net-analyzer/macchanger/macchanger-1.7.0-r1.ebuild b/net-analyzer/macchanger/macchanger-1.7.0-r1.ebuild
index 5f12529d6aeb..e854b260252b 100644
--- a/net-analyzer/macchanger/macchanger-1.7.0-r1.ebuild
+++ b/net-analyzer/macchanger/macchanger-1.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/net-analyzer/macchanger/macchanger-1.7.0.ebuild b/net-analyzer/macchanger/macchanger-1.7.0.ebuild
index 5e1db4a1e61b..009b018eb6e0 100644
--- a/net-analyzer/macchanger/macchanger-1.7.0.ebuild
+++ b/net-analyzer/macchanger/macchanger-1.7.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/net-analyzer/masscan/masscan-1.0.3-r1.ebuild b/net-analyzer/masscan/masscan-1.0.3-r1.ebuild
index 17050b707961..96e9e63bb4b8 100644
--- a/net-analyzer/masscan/masscan-1.0.3-r1.ebuild
+++ b/net-analyzer/masscan/masscan-1.0.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=5
inherit toolchain-funcs
diff --git a/net-analyzer/masscan/masscan-1.0.3-r2.ebuild b/net-analyzer/masscan/masscan-1.0.3-r2.ebuild
index 99cb0ee23bb7..894968ab55bd 100644
--- a/net-analyzer/masscan/masscan-1.0.3-r2.ebuild
+++ b/net-analyzer/masscan/masscan-1.0.3-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/net-analyzer/mate-netspeed/mate-netspeed-1.12.0.ebuild b/net-analyzer/mate-netspeed/mate-netspeed-1.12.0.ebuild
index 913e4c0b89fa..751e0a110e07 100644
--- a/net-analyzer/mate-netspeed/mate-netspeed-1.12.0.ebuild
+++ b/net-analyzer/mate-netspeed/mate-netspeed-1.12.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/net-analyzer/mbrowse/mbrowse-0.4.3.ebuild b/net-analyzer/mbrowse/mbrowse-0.4.3.ebuild
index 979e2073368a..fea497f3bb7a 100644
--- a/net-analyzer/mbrowse/mbrowse-0.4.3.ebuild
+++ b/net-analyzer/mbrowse/mbrowse-0.4.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-analyzer/metasploit/metasploit-4.12.16.ebuild b/net-analyzer/metasploit/metasploit-4.12.16.ebuild
index ca5514df4104..7a726872ef02 100644
--- a/net-analyzer/metasploit/metasploit-4.12.16.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.12.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/net-analyzer/metasploit/metasploit-4.12.7.ebuild b/net-analyzer/metasploit/metasploit-4.12.7.ebuild
index cdda09e1361a..5690abb91dc3 100644
--- a/net-analyzer/metasploit/metasploit-4.12.7.ebuild
+++ b/net-analyzer/metasploit/metasploit-4.12.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/net-analyzer/metasploit/metasploit-9999.ebuild b/net-analyzer/metasploit/metasploit-9999.ebuild
index 028c58222d05..93a14f462c04 100644
--- a/net-analyzer/metasploit/metasploit-9999.ebuild
+++ b/net-analyzer/metasploit/metasploit-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/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p10.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p10.ebuild
index 762d85179bde..cf5e4f6f6fba 100644
--- a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p10.ebuild
+++ b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p10.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/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild
index 2be3f2dd9d05..733705041a3e 100644
--- a/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.ebuild
+++ b/net-analyzer/mk-livestatus/mk-livestatus-1.2.8_p16.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/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.2.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.2.ebuild
index fc95268d8201..e48fdba53145 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.2.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.1.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/net-analyzer/monitoring-plugins/monitoring-plugins-2.2.ebuild b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2.ebuild
index 3dbb15a7b880..573b78451208 100644
--- a/net-analyzer/monitoring-plugins/monitoring-plugins-2.2.ebuild
+++ b/net-analyzer/monitoring-plugins/monitoring-plugins-2.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/net-analyzer/mping/mping-2.01.ebuild b/net-analyzer/mping/mping-2.01.ebuild
index 4f0da7416808..3133eb907421 100644
--- a/net-analyzer/mping/mping-2.01.ebuild
+++ b/net-analyzer/mping/mping-2.01.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
diff --git a/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0.ebuild b/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0.ebuild
index 0aeab8cc23e0..9ccb0a69e267 100644
--- a/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.2.0.ebuild
+++ b/net-analyzer/mrtg-ping-probe/mrtg-ping-probe-2.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
diff --git a/net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild b/net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild
index ff115858e2ea..aa3e52b338d4 100644
--- a/net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild
+++ b/net-analyzer/mrtg/mrtg-2.17.4-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils
diff --git a/net-analyzer/mtr/mtr-0.87-r1.ebuild b/net-analyzer/mtr/mtr-0.87-r1.ebuild
index f45a9667fa8b..7ae0169ea4b1 100644
--- a/net-analyzer/mtr/mtr-0.87-r1.ebuild
+++ b/net-analyzer/mtr/mtr-0.87-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 autotools eutils fcaps flag-o-matic
diff --git a/net-analyzer/mtr/mtr-0.87.ebuild b/net-analyzer/mtr/mtr-0.87.ebuild
index 8ca3867e7714..e81c2db77623 100644
--- a/net-analyzer/mtr/mtr-0.87.ebuild
+++ b/net-analyzer/mtr/mtr-0.87.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 autotools eutils fcaps flag-o-matic
diff --git a/net-analyzer/mtr/mtr-9999.ebuild b/net-analyzer/mtr/mtr-9999.ebuild
index 7ba93fe887e3..53906d9e1e68 100644
--- a/net-analyzer/mtr/mtr-9999.ebuild
+++ b/net-analyzer/mtr/mtr-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
inherit autotools eutils fcaps flag-o-matic git-r3
diff --git a/net-analyzer/multimon-ng/multimon-ng-1.0.0-r1.ebuild b/net-analyzer/multimon-ng/multimon-ng-1.0.0-r1.ebuild
index d8f994874509..6ba3057182a6 100644
--- a/net-analyzer/multimon-ng/multimon-ng-1.0.0-r1.ebuild
+++ b/net-analyzer/multimon-ng/multimon-ng-1.0.0-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/net-analyzer/multimon-ng/multimon-ng-9999.ebuild b/net-analyzer/multimon-ng/multimon-ng-9999.ebuild
index d8f994874509..6ba3057182a6 100644
--- a/net-analyzer/multimon-ng/multimon-ng-9999.ebuild
+++ b/net-analyzer/multimon-ng/multimon-ng-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-analyzer/munin/munin-2.0.19-r2.ebuild b/net-analyzer/munin/munin-2.0.19-r2.ebuild
index 3a31df0ee80a..8dfbf081d5ba 100644
--- a/net-analyzer/munin/munin-2.0.19-r2.ebuild
+++ b/net-analyzer/munin/munin-2.0.19-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/net-analyzer/munin/munin-2.0.19.ebuild b/net-analyzer/munin/munin-2.0.19.ebuild
index f85716720cbe..c4d53dc1874c 100644
--- a/net-analyzer/munin/munin-2.0.19.ebuild
+++ b/net-analyzer/munin/munin-2.0.19.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/net-analyzer/munin/munin-2.0.25-r2.ebuild b/net-analyzer/munin/munin-2.0.25-r2.ebuild
index 23034405cf32..4103aa49d49a 100644
--- a/net-analyzer/munin/munin-2.0.25-r2.ebuild
+++ b/net-analyzer/munin/munin-2.0.25-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/net-analyzer/munin/munin-2.0.25.ebuild b/net-analyzer/munin/munin-2.0.25.ebuild
index 9d4ac4cae8b0..1f40b8c55e4d 100644
--- a/net-analyzer/munin/munin-2.0.25.ebuild
+++ b/net-analyzer/munin/munin-2.0.25.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/net-analyzer/munin/munin-2.1.9999.ebuild b/net-analyzer/munin/munin-2.1.9999.ebuild
index 9716ee8c5443..d041ec7f4195 100644
--- a/net-analyzer/munin/munin-2.1.9999.ebuild
+++ b/net-analyzer/munin/munin-2.1.9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-analyzer/nagios-check_dnssec/nagios-check_dnssec-0.1_p28.ebuild b/net-analyzer/nagios-check_dnssec/nagios-check_dnssec-0.1_p28.ebuild
index 8585bbfa7571..86cc18b48671 100644
--- a/net-analyzer/nagios-check_dnssec/nagios-check_dnssec-0.1_p28.ebuild
+++ b/net-analyzer/nagios-check_dnssec/nagios-check_dnssec-0.1_p28.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/net-analyzer/nagios-check_fail2ban/nagios-check_fail2ban-3.ebuild b/net-analyzer/nagios-check_fail2ban/nagios-check_fail2ban-3.ebuild
index f237bf354e89..ac86c2830797 100644
--- a/net-analyzer/nagios-check_fail2ban/nagios-check_fail2ban-3.ebuild
+++ b/net-analyzer/nagios-check_fail2ban/nagios-check_fail2ban-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/net-analyzer/nagios-check_glsa2/nagios-check_glsa2-20120930-r1.ebuild b/net-analyzer/nagios-check_glsa2/nagios-check_glsa2-20120930-r1.ebuild
index 09a7e2f542d4..5b6ab2dd057a 100644
--- a/net-analyzer/nagios-check_glsa2/nagios-check_glsa2-20120930-r1.ebuild
+++ b/net-analyzer/nagios-check_glsa2/nagios-check_glsa2-20120930-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.1.ebuild b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.1.ebuild
index 3667b61686ec..0993cde08f51 100644
--- a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.1.ebuild
+++ b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.1.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/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.2.ebuild b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.2.ebuild
index d823e112b725..ca84b3bf75e0 100644
--- a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.2.ebuild
+++ b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.6.ebuild b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.6.ebuild
index b1da177765b4..54faddb493b8 100644
--- a/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.6.ebuild
+++ b/net-analyzer/nagios-check_ipmi_sensor/nagios-check_ipmi_sensor-3.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/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.3.2.ebuild b/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.3.2.ebuild
index ba928354432d..f4770fb1ae58 100644
--- a/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.3.2.ebuild
+++ b/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.3.2.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/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4.ebuild b/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4.ebuild
index ba928354432d..f4770fb1ae58 100644
--- a/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4.ebuild
+++ b/net-analyzer/nagios-check_linux_bonding/nagios-check_linux_bonding-1.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-2.3.2.1-r1.ebuild b/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-2.3.2.1-r1.ebuild
index afc46f07d167..c24af88f74d9 100644
--- a/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-2.3.2.1-r1.ebuild
+++ b/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-2.3.2.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 eutils multilib
DESCRIPTION="A nagios plugin for checking logfiles"
diff --git a/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-3.7.3.1-r1.ebuild b/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-3.7.3.1-r1.ebuild
index ad9ab9886339..e66d0a538013 100644
--- a/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-3.7.3.1-r1.ebuild
+++ b/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-3.7.3.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/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-3.7.3.1.ebuild b/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-3.7.3.1.ebuild
index ccd87e8efa80..0dc016c0d557 100644
--- a/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-3.7.3.1.ebuild
+++ b/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-3.7.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=5
inherit eutils multilib
diff --git a/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-3.7.6.3.ebuild b/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-3.7.6.3.ebuild
index 178ea1fe964b..7a1daa1bfadb 100644
--- a/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-3.7.6.3.ebuild
+++ b/net-analyzer/nagios-check_logfiles/nagios-check_logfiles-3.7.6.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/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.1.9.2.ebuild b/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.1.9.2.ebuild
index 1a3ae79348a6..0048f8658de8 100644
--- a/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.1.9.2.ebuild
+++ b/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.1.9.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/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2.ebuild b/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2.ebuild
index d6bf85ac5800..eed773ec2099 100644
--- a/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2.ebuild
+++ b/net-analyzer/nagios-check_mysql_health/nagios-check_mysql_health-2.2.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/net-analyzer/nagios-check_openvpn-simple/nagios-check_openvpn-simple-0.0.1-r1.ebuild b/net-analyzer/nagios-check_openvpn-simple/nagios-check_openvpn-simple-0.0.1-r1.ebuild
index 0c893dc11a95..e08a6ef0d41d 100644
--- a/net-analyzer/nagios-check_openvpn-simple/nagios-check_openvpn-simple-0.0.1-r1.ebuild
+++ b/net-analyzer/nagios-check_openvpn-simple/nagios-check_openvpn-simple-0.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=6
diff --git a/net-analyzer/nagios-check_pidfile/nagios-check_pidfile-1.ebuild b/net-analyzer/nagios-check_pidfile/nagios-check_pidfile-1.ebuild
index c69e5056136e..0c557fdb768e 100644
--- a/net-analyzer/nagios-check_pidfile/nagios-check_pidfile-1.ebuild
+++ b/net-analyzer/nagios-check_pidfile/nagios-check_pidfile-1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.3.7-r1.ebuild b/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.3.7-r1.ebuild
index 21e069b3916d..726f8bfdd37d 100644
--- a/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.3.7-r1.ebuild
+++ b/net-analyzer/nagios-check_rbl/nagios-check_rbl-1.3.7-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/net-analyzer/nagios-core/nagios-core-3.5.1.ebuild b/net-analyzer/nagios-core/nagios-core-3.5.1.ebuild
index a6e24f3b43d5..515322c7481c 100644
--- a/net-analyzer/nagios-core/nagios-core-3.5.1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-3.5.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/net-analyzer/nagios-core/nagios-core-4.2.4.ebuild b/net-analyzer/nagios-core/nagios-core-4.2.4.ebuild
index 0c8137832e6c..70479fba17f8 100644
--- a/net-analyzer/nagios-core/nagios-core-4.2.4.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.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=6
diff --git a/net-analyzer/nagios-core/nagios-core-4.3.1.ebuild b/net-analyzer/nagios-core/nagios-core-4.3.1.ebuild
index fb181d5f0ec0..8b7861b128aa 100644
--- a/net-analyzer/nagios-core/nagios-core-4.3.1.ebuild
+++ b/net-analyzer/nagios-core/nagios-core-4.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/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0-r1.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0-r1.ebuild
index ab33b2b07844..d1b0e53b96be 100644
--- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0-r1.ebuild
+++ b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.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/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20151215.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20151215.ebuild
index 7698f47e7a08..dfc0eeaab718 100644
--- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20151215.ebuild
+++ b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20151215.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/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20160215.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20160215.ebuild
index d2d29efcdf9e..470b7a2f2308 100644
--- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20160215.ebuild
+++ b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.0_p20160215.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/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.1.ebuild b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.1.ebuild
index 56908e1abec9..2db9d1b6c6a8 100644
--- a/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-4.0.1.ebuild
+++ b/net-analyzer/nagios-plugin-check_raid/nagios-plugin-check_raid-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
diff --git a/net-analyzer/nagios-plugins-flameeyes/nagios-plugins-flameeyes-9999.ebuild b/net-analyzer/nagios-plugins-flameeyes/nagios-plugins-flameeyes-9999.ebuild
index 400df3be91e7..dd0b836e946c 100644
--- a/net-analyzer/nagios-plugins-flameeyes/nagios-plugins-flameeyes-9999.ebuild
+++ b/net-analyzer/nagios-plugins-flameeyes/nagios-plugins-flameeyes-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/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild b/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild
index aa6272077bda..c89ed52c8249 100644
--- a/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild
+++ b/net-analyzer/nagios-plugins-snmp/nagios-plugins-snmp-0.6.0-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/net-analyzer/nagios-plugins/nagios-plugins-2.0.3-r2.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.0.3-r2.ebuild
index e77258e0ceff..e50223884561 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-2.0.3-r2.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.0.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/net-analyzer/nagios-plugins/nagios-plugins-2.1.4.ebuild b/net-analyzer/nagios-plugins/nagios-plugins-2.1.4.ebuild
index 4774b546539c..95efd32aaec8 100644
--- a/net-analyzer/nagios-plugins/nagios-plugins-2.1.4.ebuild
+++ b/net-analyzer/nagios-plugins/nagios-plugins-2.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/net-analyzer/nagios-sap-ccms-plugin/nagios-sap-ccms-plugin-0.7.3-r1.ebuild b/net-analyzer/nagios-sap-ccms-plugin/nagios-sap-ccms-plugin-0.7.3-r1.ebuild
index b333a82e53b3..464dbdd90121 100644
--- a/net-analyzer/nagios-sap-ccms-plugin/nagios-sap-ccms-plugin-0.7.3-r1.ebuild
+++ b/net-analyzer/nagios-sap-ccms-plugin/nagios-sap-ccms-plugin-0.7.3-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit multilib
diff --git a/net-analyzer/nagios-sap-ccms-plugin/nagios-sap-ccms-plugin-0.8.ebuild b/net-analyzer/nagios-sap-ccms-plugin/nagios-sap-ccms-plugin-0.8.ebuild
index 0535a365781b..39bbc8a46c26 100644
--- a/net-analyzer/nagios-sap-ccms-plugin/nagios-sap-ccms-plugin-0.8.ebuild
+++ b/net-analyzer/nagios-sap-ccms-plugin/nagios-sap-ccms-plugin-0.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
diff --git a/net-analyzer/nagios/nagios-4.2.4.ebuild b/net-analyzer/nagios/nagios-4.2.4.ebuild
index 2c26c7e170b8..e2be13acf415 100644
--- a/net-analyzer/nagios/nagios-4.2.4.ebuild
+++ b/net-analyzer/nagios/nagios-4.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=6
diff --git a/net-analyzer/nagios/nagios-4.3.1.ebuild b/net-analyzer/nagios/nagios-4.3.1.ebuild
index ba22c990128c..ee6fdb891424 100644
--- a/net-analyzer/nagios/nagios-4.3.1.ebuild
+++ b/net-analyzer/nagios/nagios-4.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/net-analyzer/nagircbot/nagircbot-0.0.33.ebuild b/net-analyzer/nagircbot/nagircbot-0.0.33.ebuild
index ea0a54b0dbd1..6d748bc63809 100644
--- a/net-analyzer/nagircbot/nagircbot-0.0.33.ebuild
+++ b/net-analyzer/nagircbot/nagircbot-0.0.33.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/net-analyzer/nagstamon/nagstamon-1.0.1.ebuild b/net-analyzer/nagstamon/nagstamon-1.0.1.ebuild
index 485a23c9ef6e..64feb0f07102 100644
--- a/net-analyzer/nagstamon/nagstamon-1.0.1.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-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/net-analyzer/nagstamon/nagstamon-1.0.1_p20150222.ebuild b/net-analyzer/nagstamon/nagstamon-1.0.1_p20150222.ebuild
index d4761915afca..a6f99f32d47f 100644
--- a/net-analyzer/nagstamon/nagstamon-1.0.1_p20150222.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-1.0.1_p20150222.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/net-analyzer/nagstamon/nagstamon-2.0.1.ebuild b/net-analyzer/nagstamon/nagstamon-2.0.1.ebuild
index 5f0b32d1412c..1883f64fc44e 100644
--- a/net-analyzer/nagstamon/nagstamon-2.0.1.ebuild
+++ b/net-analyzer/nagstamon/nagstamon-2.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"
diff --git a/net-analyzer/nagtrap/nagtrap-0.1.3.ebuild b/net-analyzer/nagtrap/nagtrap-0.1.3.ebuild
index 9ff932ab8193..9761e69d1c80 100644
--- a/net-analyzer/nagtrap/nagtrap-0.1.3.ebuild
+++ b/net-analyzer/nagtrap/nagtrap-0.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=2
diff --git a/net-analyzer/nagvis/nagvis-1.6.6.ebuild b/net-analyzer/nagvis/nagvis-1.6.6.ebuild
index 35731f314f42..794bc24172f4 100644
--- a/net-analyzer/nagvis/nagvis-1.6.6.ebuild
+++ b/net-analyzer/nagvis/nagvis-1.6.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/net-analyzer/namebench/namebench-1.3.1-r2.ebuild b/net-analyzer/namebench/namebench-1.3.1-r2.ebuild
index 133f6b0a7e5f..2b9d0a2ebfa7 100644
--- a/net-analyzer/namebench/namebench-1.3.1-r2.ebuild
+++ b/net-analyzer/namebench/namebench-1.3.1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/net-analyzer/nast/nast-0.2.0-r1.ebuild b/net-analyzer/nast/nast-0.2.0-r1.ebuild
index 772d9a57c2f8..1b4c53803c5b 100644
--- a/net-analyzer/nast/nast-0.2.0-r1.ebuild
+++ b/net-analyzer/nast/nast-0.2.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
inherit autotools eutils
diff --git a/net-analyzer/nbtscan/nbtscan-1.5.1-r3.ebuild b/net-analyzer/nbtscan/nbtscan-1.5.1-r3.ebuild
index b3110596d59e..a44802134398 100644
--- a/net-analyzer/nbtscan/nbtscan-1.5.1-r3.ebuild
+++ b/net-analyzer/nbtscan/nbtscan-1.5.1-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-analyzer/nbwmon/nbwmon-0.5.2.ebuild b/net-analyzer/nbwmon/nbwmon-0.5.2.ebuild
index 8e60afa247d9..f2c7742f396c 100644
--- a/net-analyzer/nbwmon/nbwmon-0.5.2.ebuild
+++ b/net-analyzer/nbwmon/nbwmon-0.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
inherit eutils toolchain-funcs
diff --git a/net-analyzer/ndoutils/ndoutils-2.0.0.ebuild b/net-analyzer/ndoutils/ndoutils-2.0.0.ebuild
index a7285fe8e9fc..b813b079881b 100644
--- a/net-analyzer/ndoutils/ndoutils-2.0.0.ebuild
+++ b/net-analyzer/ndoutils/ndoutils-2.0.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 user
diff --git a/net-analyzer/ndsad/ndsad-1.33-r1.ebuild b/net-analyzer/ndsad/ndsad-1.33-r1.ebuild
index af4ca22a8b0b..5ccdff9433d7 100644
--- a/net-analyzer/ndsad/ndsad-1.33-r1.ebuild
+++ b/net-analyzer/ndsad/ndsad-1.33-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
inherit autotools eutils
diff --git a/net-analyzer/nepenthes/nepenthes-0.2.2-r1.ebuild b/net-analyzer/nepenthes/nepenthes-0.2.2-r1.ebuild
index eb60c7f8000d..a253f1013de0 100644
--- a/net-analyzer/nepenthes/nepenthes-0.2.2-r1.ebuild
+++ b/net-analyzer/nepenthes/nepenthes-0.2.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
inherit autotools eutils user
diff --git a/net-analyzer/nepenthes/nepenthes-0.2.2.ebuild b/net-analyzer/nepenthes/nepenthes-0.2.2.ebuild
index 500ee35a2b9f..f9944901bcb1 100644
--- a/net-analyzer/nepenthes/nepenthes-0.2.2.ebuild
+++ b/net-analyzer/nepenthes/nepenthes-0.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="2"
inherit autotools eutils user
diff --git a/net-analyzer/nessus-bin/nessus-bin-4.4.1.ebuild b/net-analyzer/nessus-bin/nessus-bin-4.4.1.ebuild
index fedfed164e41..1f8abf2a4bd8 100644
--- a/net-analyzer/nessus-bin/nessus-bin-4.4.1.ebuild
+++ b/net-analyzer/nessus-bin/nessus-bin-4.4.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit multilib rpm
diff --git a/net-analyzer/nessus-bin/nessus-bin-5.0.1.ebuild b/net-analyzer/nessus-bin/nessus-bin-5.0.1.ebuild
index 27b0440ab423..ec3887f0d4ae 100644
--- a/net-analyzer/nessus-bin/nessus-bin-5.0.1.ebuild
+++ b/net-analyzer/nessus-bin/nessus-bin-5.0.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit multilib rpm
diff --git a/net-analyzer/nessus-client/nessus-client-1.0.2-r1.ebuild b/net-analyzer/nessus-client/nessus-client-1.0.2-r1.ebuild
index 16577ef520da..52a9411efebd 100644
--- a/net-analyzer/nessus-client/nessus-client-1.0.2-r1.ebuild
+++ b/net-analyzer/nessus-client/nessus-client-1.0.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=2
inherit eutils toolchain-funcs
diff --git a/net-analyzer/nessus-client/nessus-client-1.0.2-r2.ebuild b/net-analyzer/nessus-client/nessus-client-1.0.2-r2.ebuild
index c9d631594407..c7485b9e7762 100644
--- a/net-analyzer/nessus-client/nessus-client-1.0.2-r2.ebuild
+++ b/net-analyzer/nessus-client/nessus-client-1.0.2-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
inherit eutils toolchain-funcs
diff --git a/net-analyzer/nessus-core/nessus-core-2.2.9-r1.ebuild b/net-analyzer/nessus-core/nessus-core-2.2.9-r1.ebuild
index c9d246400281..695ef1f31909 100644
--- a/net-analyzer/nessus-core/nessus-core-2.2.9-r1.ebuild
+++ b/net-analyzer/nessus-core/nessus-core-2.2.9-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/net-analyzer/nessus-libraries/nessus-libraries-2.2.9-r1.ebuild b/net-analyzer/nessus-libraries/nessus-libraries-2.2.9-r1.ebuild
index 263c60c1bbd9..5b4734740551 100644
--- a/net-analyzer/nessus-libraries/nessus-libraries-2.2.9-r1.ebuild
+++ b/net-analyzer/nessus-libraries/nessus-libraries-2.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=5
diff --git a/net-analyzer/nessus-plugins/nessus-plugins-2.2.9-r1.ebuild b/net-analyzer/nessus-plugins/nessus-plugins-2.2.9-r1.ebuild
index 76846a165b28..1bf4d4933b7a 100644
--- a/net-analyzer/nessus-plugins/nessus-plugins-2.2.9-r1.ebuild
+++ b/net-analyzer/nessus-plugins/nessus-plugins-2.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=5
diff --git a/net-analyzer/nessus/nessus-2.2.9.ebuild b/net-analyzer/nessus/nessus-2.2.9.ebuild
index 71b1f499f3bd..34bdcb037491 100644
--- a/net-analyzer/nessus/nessus-2.2.9.ebuild
+++ b/net-analyzer/nessus/nessus-2.2.9.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="A remote security scanner"
HOMEPAGE="http://www.nessus.org/"
diff --git a/net-analyzer/net-snmp/net-snmp-5.7.3-r3.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3-r3.ebuild
index 02231cfe16d8..360dc9661d75 100644
--- a/net-analyzer/net-snmp/net-snmp-5.7.3-r3.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.7.3-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
PYTHON_COMPAT=( python2_7 )
diff --git a/net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild
index 837631426f94..00afce2aacf4 100644
--- a/net-analyzer/net-snmp/net-snmp-5.7.3-r5.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.7.3-r5.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/net-analyzer/net-snmp/net-snmp-5.7.3-r6.ebuild b/net-analyzer/net-snmp/net-snmp-5.7.3-r6.ebuild
index e81984d4418b..044f8d6bb311 100644
--- a/net-analyzer/net-snmp/net-snmp-5.7.3-r6.ebuild
+++ b/net-analyzer/net-snmp/net-snmp-5.7.3-r6.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/net-analyzer/netcat/netcat-110-r9.ebuild b/net-analyzer/netcat/netcat-110-r9.ebuild
index 3e52f24b61d5..be5f42d1157c 100644
--- a/net-analyzer/netcat/netcat-110-r9.ebuild
+++ b/net-analyzer/netcat/netcat-110-r9.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/net-analyzer/netcat6/netcat6-1.0-r2.ebuild b/net-analyzer/netcat6/netcat6-1.0-r2.ebuild
index c59ac859cc5c..f325cd1cdc2a 100644
--- a/net-analyzer/netcat6/netcat6-1.0-r2.ebuild
+++ b/net-analyzer/netcat6/netcat6-1.0-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 autotools toolchain-funcs
diff --git a/net-analyzer/netdata/netdata-1.2.0-r1.ebuild b/net-analyzer/netdata/netdata-1.2.0-r1.ebuild
index ad8fb3303138..2a2efdc050e1 100644
--- a/net-analyzer/netdata/netdata-1.2.0-r1.ebuild
+++ b/net-analyzer/netdata/netdata-1.2.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/net-analyzer/netdata/netdata-1.3.0.ebuild b/net-analyzer/netdata/netdata-1.3.0.ebuild
index 0890ac521b5d..3f4c01a03cb8 100644
--- a/net-analyzer/netdata/netdata-1.3.0.ebuild
+++ b/net-analyzer/netdata/netdata-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=6
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
diff --git a/net-analyzer/netdata/netdata-1.4.0-r1.ebuild b/net-analyzer/netdata/netdata-1.4.0-r1.ebuild
index e51f185e7c6d..1296113a1059 100644
--- a/net-analyzer/netdata/netdata-1.4.0-r1.ebuild
+++ b/net-analyzer/netdata/netdata-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
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
diff --git a/net-analyzer/netdata/netdata-1.5.0.ebuild b/net-analyzer/netdata/netdata-1.5.0.ebuild
index ce0d866baa5e..f23d6499dcd1 100644
--- a/net-analyzer/netdata/netdata-1.5.0.ebuild
+++ b/net-analyzer/netdata/netdata-1.5.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
diff --git a/net-analyzer/netdata/netdata-9999.ebuild b/net-analyzer/netdata/netdata-9999.ebuild
index ce0d866baa5e..f23d6499dcd1 100644
--- a/net-analyzer/netdata/netdata-9999.ebuild
+++ b/net-analyzer/netdata/netdata-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=( python{2_7,3_4,3_5} )
diff --git a/net-analyzer/netdiscover/netdiscover-0.3_beta6-r3.ebuild b/net-analyzer/netdiscover/netdiscover-0.3_beta6-r3.ebuild
index 8e1333ad2d91..77fc58fcf331 100644
--- a/net-analyzer/netdiscover/netdiscover-0.3_beta6-r3.ebuild
+++ b/net-analyzer/netdiscover/netdiscover-0.3_beta6-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
inherit eutils autotools
diff --git a/net-analyzer/nethogs/nethogs-0.8.1.ebuild b/net-analyzer/nethogs/nethogs-0.8.1.ebuild
index 113d24134844..8a31eb5993fc 100644
--- a/net-analyzer/nethogs/nethogs-0.8.1.ebuild
+++ b/net-analyzer/nethogs/nethogs-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=5
inherit toolchain-funcs
diff --git a/net-analyzer/nethogs/nethogs-0.8.5.ebuild b/net-analyzer/nethogs/nethogs-0.8.5.ebuild
index a7dde5701e76..c88fc19baf69 100644
--- a/net-analyzer/nethogs/nethogs-0.8.5.ebuild
+++ b/net-analyzer/nethogs/nethogs-0.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=6
diff --git a/net-analyzer/neti/neti-2.0-r1.ebuild b/net-analyzer/neti/neti-2.0-r1.ebuild
index 1ba478dd6780..453c5877d209 100644
--- a/net-analyzer/neti/neti-2.0-r1.ebuild
+++ b/net-analyzer/neti/neti-2.0-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/net-analyzer/neti/neti-2.0.ebuild b/net-analyzer/neti/neti-2.0.ebuild
index 3e0cd53b4612..fdb2705520c2 100644
--- a/net-analyzer/neti/neti-2.0.ebuild
+++ b/net-analyzer/neti/neti-2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="NETI@Home research project from GATech"
HOMEPAGE="http://www.neti.gatech.edu"
diff --git a/net-analyzer/netio/netio-1.32.ebuild b/net-analyzer/netio/netio-1.32.ebuild
index f346d6ffa1aa..2f43e6a30a2d 100644
--- a/net-analyzer/netio/netio-1.32.ebuild
+++ b/net-analyzer/netio/netio-1.32.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/net-analyzer/netperf/netperf-2.6.0-r1.ebuild b/net-analyzer/netperf/netperf-2.6.0-r1.ebuild
index 2aaa038e7274..869d878465b5 100644
--- a/net-analyzer/netperf/netperf-2.6.0-r1.ebuild
+++ b/net-analyzer/netperf/netperf-2.6.0-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
inherit eutils flag-o-matic
diff --git a/net-analyzer/netperf/netperf-2.7.0-r1.ebuild b/net-analyzer/netperf/netperf-2.7.0-r1.ebuild
index aac04c4bc06f..f1fa2ad05ae9 100644
--- a/net-analyzer/netperf/netperf-2.7.0-r1.ebuild
+++ b/net-analyzer/netperf/netperf-2.7.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 eutils flag-o-matic user
diff --git a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild b/net-analyzer/netperf/netperf-2.7.0-r2.ebuild
index 152fe68985b2..c27563056689 100644
--- a/net-analyzer/netperf/netperf-2.7.0-r2.ebuild
+++ b/net-analyzer/netperf/netperf-2.7.0-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 eutils flag-o-matic user
diff --git a/net-analyzer/netperf/netperf-2.7.0.ebuild b/net-analyzer/netperf/netperf-2.7.0.ebuild
index 3a312bbb16f8..7c1622c9fe97 100644
--- a/net-analyzer/netperf/netperf-2.7.0.ebuild
+++ b/net-analyzer/netperf/netperf-2.7.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
inherit eutils flag-o-matic
diff --git a/net-analyzer/netpipe/netpipe-3.7.2.ebuild b/net-analyzer/netpipe/netpipe-3.7.2.ebuild
index afe44ceeee72..894cf55c72a7 100644
--- a/net-analyzer/netpipe/netpipe-3.7.2.ebuild
+++ b/net-analyzer/netpipe/netpipe-3.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/net-analyzer/netselect/netselect-0.3-r3.ebuild b/net-analyzer/netselect/netselect-0.3-r3.ebuild
index 342b5af7a9f5..d987e3985719 100644
--- a/net-analyzer/netselect/netselect-0.3-r3.ebuild
+++ b/net-analyzer/netselect/netselect-0.3-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
inherit eutils flag-o-matic toolchain-funcs
diff --git a/net-analyzer/netselect/netselect-0.3-r4.ebuild b/net-analyzer/netselect/netselect-0.3-r4.ebuild
index 66996ae787de..bf1878bd045a 100644
--- a/net-analyzer/netselect/netselect-0.3-r4.ebuild
+++ b/net-analyzer/netselect/netselect-0.3-r4.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 flag-o-matic toolchain-funcs
diff --git a/net-analyzer/netsniff-ng/netsniff-ng-0.6.0.ebuild b/net-analyzer/netsniff-ng/netsniff-ng-0.6.0.ebuild
index 90f7145a568b..b1243b2e8aba 100644
--- a/net-analyzer/netsniff-ng/netsniff-ng-0.6.0.ebuild
+++ b/net-analyzer/netsniff-ng/netsniff-ng-0.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/net-analyzer/netsniff-ng/netsniff-ng-0.6.1.ebuild b/net-analyzer/netsniff-ng/netsniff-ng-0.6.1.ebuild
index fee9eb38fc8a..a9f01cd54821 100644
--- a/net-analyzer/netsniff-ng/netsniff-ng-0.6.1.ebuild
+++ b/net-analyzer/netsniff-ng/netsniff-ng-0.6.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/net-analyzer/netsniff-ng/netsniff-ng-9999.ebuild b/net-analyzer/netsniff-ng/netsniff-ng-9999.ebuild
index 635426fb98e4..e820c5d4f3f2 100644
--- a/net-analyzer/netsniff-ng/netsniff-ng-9999.ebuild
+++ b/net-analyzer/netsniff-ng/netsniff-ng-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/net-analyzer/nettop/nettop-0.2.3-r2.ebuild b/net-analyzer/nettop/nettop-0.2.3-r2.ebuild
index 4d6da82a1fa5..9f5605fa16a6 100644
--- a/net-analyzer/nettop/nettop-0.2.3-r2.ebuild
+++ b/net-analyzer/nettop/nettop-0.2.3-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-analyzer/netwag/netwag-5.39.0.ebuild b/net-analyzer/netwag/netwag-5.39.0.ebuild
index cc0278e49905..a00de5c0bd6a 100644
--- a/net-analyzer/netwag/netwag-5.39.0.ebuild
+++ b/net-analyzer/netwag/netwag-5.39.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# NOTE: netwib, netwox and netwag go together, bump all or bump none
diff --git a/net-analyzer/netwatch/netwatch-1.3.0.1-r3.ebuild b/net-analyzer/netwatch/netwatch-1.3.0.1-r3.ebuild
index e5327328d873..dda5375c225e 100644
--- a/net-analyzer/netwatch/netwatch-1.3.0.1-r3.ebuild
+++ b/net-analyzer/netwatch/netwatch-1.3.0.1-r3.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 autotools eutils versionator
diff --git a/net-analyzer/netwox/netwox-5.39.0.ebuild b/net-analyzer/netwox/netwox-5.39.0.ebuild
index 2ad0b1cec80d..962009bd0fde 100644
--- a/net-analyzer/netwox/netwox-5.39.0.ebuild
+++ b/net-analyzer/netwox/netwox-5.39.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# NOTE: netwib, netwox and netwag go together, bump all or bump none
diff --git a/net-analyzer/nfdump/nfdump-1.6.14-r1.ebuild b/net-analyzer/nfdump/nfdump-1.6.14-r1.ebuild
index 663c4df364b9..b31a5d90901d 100644
--- a/net-analyzer/nfdump/nfdump-1.6.14-r1.ebuild
+++ b/net-analyzer/nfdump/nfdump-1.6.14-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
inherit autotools eutils
diff --git a/net-analyzer/nfdump/nfdump-1.6.15.ebuild b/net-analyzer/nfdump/nfdump-1.6.15.ebuild
index 377331310b68..baa417bf4173 100644
--- a/net-analyzer/nfdump/nfdump-1.6.15.ebuild
+++ b/net-analyzer/nfdump/nfdump-1.6.15.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit autotools eutils
diff --git a/net-analyzer/ngrep/ngrep-1.45-r3.ebuild b/net-analyzer/ngrep/ngrep-1.45-r3.ebuild
index 48f39a3e044e..070bfb219184 100644
--- a/net-analyzer/ngrep/ngrep-1.45-r3.ebuild
+++ b/net-analyzer/ngrep/ngrep-1.45-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/net-analyzer/nikto/nikto-1.36.ebuild b/net-analyzer/nikto/nikto-1.36.ebuild
index be40238112e1..aff9ac3ee287 100644
--- a/net-analyzer/nikto/nikto-1.36.ebuild
+++ b/net-analyzer/nikto/nikto-1.36.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="Web Server vulnerability scanner"
HOMEPAGE="http://www.cirt.net/Nikto2"
diff --git a/net-analyzer/nikto/nikto-2.1.5.ebuild b/net-analyzer/nikto/nikto-2.1.5.ebuild
index 94704c8d4d64..3ee500e7eeb1 100644
--- a/net-analyzer/nikto/nikto-2.1.5.ebuild
+++ b/net-analyzer/nikto/nikto-2.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=5
diff --git a/net-analyzer/nipper/nipper-0.12.0.ebuild b/net-analyzer/nipper/nipper-0.12.0.ebuild
index aed56da99bfe..729fe5303f20 100644
--- a/net-analyzer/nipper/nipper-0.12.0.ebuild
+++ b/net-analyzer/nipper/nipper-0.12.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/net-analyzer/nload/nload-0.7.4.ebuild b/net-analyzer/nload/nload-0.7.4.ebuild
index f790f6757325..b8bc8eed7b25 100644
--- a/net-analyzer/nload/nload-0.7.4.ebuild
+++ b/net-analyzer/nload/nload-0.7.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-analyzer/nmap/nmap-7.31.ebuild b/net-analyzer/nmap/nmap-7.31.ebuild
index 0c2f2ac32a83..feb242cab364 100644
--- a/net-analyzer/nmap/nmap-7.31.ebuild
+++ b/net-analyzer/nmap/nmap-7.31.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/net-analyzer/nmap/nmap-7.40.ebuild b/net-analyzer/nmap/nmap-7.40.ebuild
index 117ee986fc54..a53f7387fa81 100644
--- a/net-analyzer/nmap/nmap-7.40.ebuild
+++ b/net-analyzer/nmap/nmap-7.40.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/net-analyzer/nmap/nmap-9999.ebuild b/net-analyzer/nmap/nmap-9999.ebuild
index 57c15e56c2de..d2122aa939eb 100644
--- a/net-analyzer/nmap/nmap-9999.ebuild
+++ b/net-analyzer/nmap/nmap-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/net-analyzer/nmapsi/nmapsi-0.4.1.ebuild b/net-analyzer/nmapsi/nmapsi-0.4.1.ebuild
index ef422088db1a..95fd8de1d7b2 100644
--- a/net-analyzer/nmapsi/nmapsi-0.4.1.ebuild
+++ b/net-analyzer/nmapsi/nmapsi-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/net-analyzer/nmapsi/nmapsi-0.5_alpha1.ebuild b/net-analyzer/nmapsi/nmapsi-0.5_alpha1.ebuild
index 757aa479143e..0da2c99b83b4 100644
--- a/net-analyzer/nmapsi/nmapsi-0.5_alpha1.ebuild
+++ b/net-analyzer/nmapsi/nmapsi-0.5_alpha1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PLOCALES="ca cs de es fr it ru"
diff --git a/net-analyzer/nmbscan/nmbscan-1.2.5.ebuild b/net-analyzer/nmbscan/nmbscan-1.2.5.ebuild
index 0f1cade60258..7e8c9f28df4c 100644
--- a/net-analyzer/nmbscan/nmbscan-1.2.5.ebuild
+++ b/net-analyzer/nmbscan/nmbscan-1.2.5.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/net-analyzer/nodebrain/nodebrain-0.9.03.ebuild b/net-analyzer/nodebrain/nodebrain-0.9.03.ebuild
index 574af3698d75..1169e2f71849 100644
--- a/net-analyzer/nodebrain/nodebrain-0.9.03.ebuild
+++ b/net-analyzer/nodebrain/nodebrain-0.9.03.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/net-analyzer/nodebrain/nodebrain-0.9.04.ebuild b/net-analyzer/nodebrain/nodebrain-0.9.04.ebuild
index 574af3698d75..1169e2f71849 100644
--- a/net-analyzer/nodebrain/nodebrain-0.9.04.ebuild
+++ b/net-analyzer/nodebrain/nodebrain-0.9.04.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/net-analyzer/nrpe/nrpe-2.15-r2.ebuild b/net-analyzer/nrpe/nrpe-2.15-r2.ebuild
index b1bffa06e704..d36cf25b13db 100644
--- a/net-analyzer/nrpe/nrpe-2.15-r2.ebuild
+++ b/net-analyzer/nrpe/nrpe-2.15-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 systemd toolchain-funcs multilib user autotools
diff --git a/net-analyzer/nrpe/nrpe-2.15-r3.ebuild b/net-analyzer/nrpe/nrpe-2.15-r3.ebuild
index 906120d2359c..72cbc68a5f25 100644
--- a/net-analyzer/nrpe/nrpe-2.15-r3.ebuild
+++ b/net-analyzer/nrpe/nrpe-2.15-r3.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 systemd toolchain-funcs multilib user autotools
diff --git a/net-analyzer/nsat/nsat-1.5-r3.ebuild b/net-analyzer/nsat/nsat-1.5-r3.ebuild
index 03ce4e5bfaec..89af9c7ee256 100644
--- a/net-analyzer/nsat/nsat-1.5-r3.ebuild
+++ b/net-analyzer/nsat/nsat-1.5-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
inherit autotools eutils toolchain-funcs
diff --git a/net-analyzer/nsca/nsca-2.7.2-r103.ebuild b/net-analyzer/nsca/nsca-2.7.2-r103.ebuild
index 9e34b12dd233..1f25434494ee 100644
--- a/net-analyzer/nsca/nsca-2.7.2-r103.ebuild
+++ b/net-analyzer/nsca/nsca-2.7.2-r103.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/net-analyzer/nstats/nstats-0.4-r2.ebuild b/net-analyzer/nstats/nstats-0.4-r2.ebuild
index fe972bea97d8..7da846ede8c9 100644
--- a/net-analyzer/nstats/nstats-0.4-r2.ebuild
+++ b/net-analyzer/nstats/nstats-0.4-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/net-analyzer/ntop/ntop-5.0.1-r2.ebuild b/net-analyzer/ntop/ntop-5.0.1-r2.ebuild
index c7897169fed9..69283cf166f3 100644
--- a/net-analyzer/ntop/ntop-5.0.1-r2.ebuild
+++ b/net-analyzer/ntop/ntop-5.0.1-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
PYTHON_COMPAT=( python2_7 )
diff --git a/net-analyzer/ntopng/ntopng-2.4.ebuild b/net-analyzer/ntopng/ntopng-2.4.ebuild
index 75e58cca8c34..ca40a0e93d43 100644
--- a/net-analyzer/ntopng/ntopng-2.4.ebuild
+++ b/net-analyzer/ntopng/ntopng-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=5
inherit autotools eutils user toolchain-funcs
diff --git a/net-analyzer/nttcp/nttcp-1.47-r1.ebuild b/net-analyzer/nttcp/nttcp-1.47-r1.ebuild
index 5434fcc143dc..5d6f49f09066 100644
--- a/net-analyzer/nttcp/nttcp-1.47-r1.ebuild
+++ b/net-analyzer/nttcp/nttcp-1.47-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
inherit eutils toolchain-funcs
diff --git a/net-analyzer/nttcp/nttcp-1.47-r3.ebuild b/net-analyzer/nttcp/nttcp-1.47-r3.ebuild
index 906a90c352c7..f502164771a3 100644
--- a/net-analyzer/nttcp/nttcp-1.47-r3.ebuild
+++ b/net-analyzer/nttcp/nttcp-1.47-r3.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/net-analyzer/odhcploc/odhcploc-20111021.ebuild b/net-analyzer/odhcploc/odhcploc-20111021.ebuild
index 618729112b65..aff915d2ef97 100644
--- a/net-analyzer/odhcploc/odhcploc-20111021.ebuild
+++ b/net-analyzer/odhcploc/odhcploc-20111021.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 toolchain-funcs
diff --git a/net-analyzer/oinkmaster/oinkmaster-2.0.ebuild b/net-analyzer/oinkmaster/oinkmaster-2.0.ebuild
index 6375f4f0838d..35f0ef818c0b 100644
--- a/net-analyzer/oinkmaster/oinkmaster-2.0.ebuild
+++ b/net-analyzer/oinkmaster/oinkmaster-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
inherit eutils
diff --git a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild
index e80ac3a3a399..769c9b57c689 100644
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-r1.ebuild
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105-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/net-analyzer/openbsd-netcat/openbsd-netcat-1.105.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105.ebuild
index 70fc38d91b96..34432cdfd0dd 100644
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.105.ebuild
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.105.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/net-analyzer/openbsd-netcat/openbsd-netcat-1.84.ebuild b/net-analyzer/openbsd-netcat/openbsd-netcat-1.84.ebuild
index 219eb4ab613f..201bfeb79f87 100644
--- a/net-analyzer/openbsd-netcat/openbsd-netcat-1.84.ebuild
+++ b/net-analyzer/openbsd-netcat/openbsd-netcat-1.84.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/net-analyzer/openvas-cli/openvas-cli-1.4.3.ebuild b/net-analyzer/openvas-cli/openvas-cli-1.4.3.ebuild
index 670d169ebb1a..726bf0767d7c 100644
--- a/net-analyzer/openvas-cli/openvas-cli-1.4.3.ebuild
+++ b/net-analyzer/openvas-cli/openvas-cli-1.4.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/net-analyzer/openvas-libraries/openvas-libraries-8.0.5.ebuild b/net-analyzer/openvas-libraries/openvas-libraries-8.0.5.ebuild
index 6e7215bcb44f..e279652477ff 100644
--- a/net-analyzer/openvas-libraries/openvas-libraries-8.0.5.ebuild
+++ b/net-analyzer/openvas-libraries/openvas-libraries-8.0.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-analyzer/openvas-manager/openvas-manager-6.0.6-r2.ebuild b/net-analyzer/openvas-manager/openvas-manager-6.0.6-r2.ebuild
index 9494548f024e..d852593f5651 100644
--- a/net-analyzer/openvas-manager/openvas-manager-6.0.6-r2.ebuild
+++ b/net-analyzer/openvas-manager/openvas-manager-6.0.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
diff --git a/net-analyzer/openvas-scanner/openvas-scanner-5.0.4-r1.ebuild b/net-analyzer/openvas-scanner/openvas-scanner-5.0.4-r1.ebuild
index 29a0bdbec786..4d550d82f4f0 100644
--- a/net-analyzer/openvas-scanner/openvas-scanner-5.0.4-r1.ebuild
+++ b/net-analyzer/openvas-scanner/openvas-scanner-5.0.4-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-analyzer/openvas-tools/openvas-tools-0_pre20512.ebuild b/net-analyzer/openvas-tools/openvas-tools-0_pre20512.ebuild
index 96e2421185f9..48c6d833eacf 100644
--- a/net-analyzer/openvas-tools/openvas-tools-0_pre20512.ebuild
+++ b/net-analyzer/openvas-tools/openvas-tools-0_pre20512.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/net-analyzer/openvas/openvas-8.0.5-r1.ebuild b/net-analyzer/openvas/openvas-8.0.5-r1.ebuild
index 921963be24db..eb5667c7e762 100644
--- a/net-analyzer/openvas/openvas-8.0.5-r1.ebuild
+++ b/net-analyzer/openvas/openvas-8.0.5-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/net-analyzer/ospd/ospd-1.0.0.ebuild b/net-analyzer/ospd/ospd-1.0.0.ebuild
index a22ef50f4e1b..675c92e710f5 100644
--- a/net-analyzer/ospd/ospd-1.0.0.ebuild
+++ b/net-analyzer/ospd/ospd-1.0.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/net-analyzer/ostinato/ostinato-0.5.1.ebuild b/net-analyzer/ostinato/ostinato-0.5.1.ebuild
index a9c25bc85cf7..1feec41aa768 100644
--- a/net-analyzer/ostinato/ostinato-0.5.1.ebuild
+++ b/net-analyzer/ostinato/ostinato-0.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=5
inherit qt4-r2
diff --git a/net-analyzer/ostinato/ostinato-0.8.ebuild b/net-analyzer/ostinato/ostinato-0.8.ebuild
index 31df0530d3f1..9b5821f9b93a 100644
--- a/net-analyzer/ostinato/ostinato-0.8.ebuild
+++ b/net-analyzer/ostinato/ostinato-0.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 qt4-r2
diff --git a/net-analyzer/p0f/p0f-2.0.8-r2.ebuild b/net-analyzer/p0f/p0f-2.0.8-r2.ebuild
index c03dc56480d0..f41d46219e24 100644
--- a/net-analyzer/p0f/p0f-2.0.8-r2.ebuild
+++ b/net-analyzer/p0f/p0f-2.0.8-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="3"
diff --git a/net-analyzer/p0f/p0f-3.06_beta.ebuild b/net-analyzer/p0f/p0f-3.06_beta.ebuild
index 4aec2ec96275..967ee045ac92 100644
--- a/net-analyzer/p0f/p0f-3.06_beta.ebuild
+++ b/net-analyzer/p0f/p0f-3.06_beta.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 toolchain-funcs
diff --git a/net-analyzer/p0f/p0f-3.07_beta.ebuild b/net-analyzer/p0f/p0f-3.07_beta.ebuild
index 8a45eedbc128..8dc66045ce0b 100644
--- a/net-analyzer/p0f/p0f-3.07_beta.ebuild
+++ b/net-analyzer/p0f/p0f-3.07_beta.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 toolchain-funcs
diff --git a/net-analyzer/packit/packit-1.0-r2.ebuild b/net-analyzer/packit/packit-1.0-r2.ebuild
index 9282b5d9806d..7df31e37cab7 100644
--- a/net-analyzer/packit/packit-1.0-r2.ebuild
+++ b/net-analyzer/packit/packit-1.0-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
diff --git a/net-analyzer/pathload/pathload-1.3.2.ebuild b/net-analyzer/pathload/pathload-1.3.2.ebuild
index 3e50d8890827..4a4b5881535d 100644
--- a/net-analyzer/pathload/pathload-1.3.2.ebuild
+++ b/net-analyzer/pathload/pathload-1.3.2.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/net-analyzer/pbnj/pbnj-2.04.ebuild b/net-analyzer/pbnj/pbnj-2.04.ebuild
index b7099d1d46cc..1c04a49c3a0b 100644
--- a/net-analyzer/pbnj/pbnj-2.04.ebuild
+++ b/net-analyzer/pbnj/pbnj-2.04.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 perl-module
diff --git a/net-analyzer/pchar/pchar-1.5-r1.ebuild b/net-analyzer/pchar/pchar-1.5-r1.ebuild
index ef41a88924f5..37006d24eeac 100644
--- a/net-analyzer/pchar/pchar-1.5-r1.ebuild
+++ b/net-analyzer/pchar/pchar-1.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/net-analyzer/pinger/pinger-0.32e.ebuild b/net-analyzer/pinger/pinger-0.32e.ebuild
index 46185885c6d5..85b142c36460 100644
--- a/net-analyzer/pinger/pinger-0.32e.ebuild
+++ b/net-analyzer/pinger/pinger-0.32e.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/net-analyzer/pinger/pinger-0.33.ebuild b/net-analyzer/pinger/pinger-0.33.ebuild
index 7e4a980e24d6..55c82f856862 100644
--- a/net-analyzer/pinger/pinger-0.33.ebuild
+++ b/net-analyzer/pinger/pinger-0.33.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/net-analyzer/pktstat/pktstat-1.8.5-r1.ebuild b/net-analyzer/pktstat/pktstat-1.8.5-r1.ebuild
index f9436c35b6cb..38568044a9f1 100644
--- a/net-analyzer/pktstat/pktstat-1.8.5-r1.ebuild
+++ b/net-analyzer/pktstat/pktstat-1.8.5-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
inherit autotools eutils
diff --git a/net-analyzer/pmacct/pmacct-1.5.1.ebuild b/net-analyzer/pmacct/pmacct-1.5.1.ebuild
index 6eebee7b50db..22ffb38dbf1d 100644
--- a/net-analyzer/pmacct/pmacct-1.5.1.ebuild
+++ b/net-analyzer/pmacct/pmacct-1.5.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
inherit toolchain-funcs
diff --git a/net-analyzer/pmacct/pmacct-1.5.2.ebuild b/net-analyzer/pmacct/pmacct-1.5.2.ebuild
index 5332b543e0b8..f27118bbbe3c 100644
--- a/net-analyzer/pmacct/pmacct-1.5.2.ebuild
+++ b/net-analyzer/pmacct/pmacct-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
inherit toolchain-funcs
diff --git a/net-analyzer/pmacct/pmacct-1.5.3_pre20150925-r1.ebuild b/net-analyzer/pmacct/pmacct-1.5.3_pre20150925-r1.ebuild
index e44303f6fccc..bf3780777ae8 100644
--- a/net-analyzer/pmacct/pmacct-1.5.3_pre20150925-r1.ebuild
+++ b/net-analyzer/pmacct/pmacct-1.5.3_pre20150925-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 toolchain-funcs
diff --git a/net-analyzer/pmacct/pmacct-1.5.3_pre20150925.ebuild b/net-analyzer/pmacct/pmacct-1.5.3_pre20150925.ebuild
index 06a5c5140f5a..f28070082930 100644
--- a/net-analyzer/pmacct/pmacct-1.5.3_pre20150925.ebuild
+++ b/net-analyzer/pmacct/pmacct-1.5.3_pre20150925.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 toolchain-funcs
diff --git a/net-analyzer/pmacct/pmacct-1.6.0.ebuild b/net-analyzer/pmacct/pmacct-1.6.0.ebuild
index ececd6f50786..91a703ca1ffe 100644
--- a/net-analyzer/pmacct/pmacct-1.6.0.ebuild
+++ b/net-analyzer/pmacct/pmacct-1.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
inherit toolchain-funcs
diff --git a/net-analyzer/pmacct/pmacct-1.6.1.ebuild b/net-analyzer/pmacct/pmacct-1.6.1.ebuild
index ececd6f50786..91a703ca1ffe 100644
--- a/net-analyzer/pmacct/pmacct-1.6.1.ebuild
+++ b/net-analyzer/pmacct/pmacct-1.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=6
inherit toolchain-funcs
diff --git a/net-analyzer/pnp4nagios/pnp4nagios-0.6.24.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.24.ebuild
index e59c11902445..7a79e5d51e9a 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.24.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.24.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/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r1.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r1.ebuild
index 7bbcb57bd36b..ea74516d0c55 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r1.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-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/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r2.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r2.ebuild
index 8ea8356747b2..7630fe3e6f9b 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r2.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-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/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r3.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r3.ebuild
index ee5fadd712ee..2044e45a7e0d 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-r3.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25-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/net-analyzer/pnp4nagios/pnp4nagios-0.6.25.ebuild b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25.ebuild
index 20346d15c7be..8c83a932fe0c 100644
--- a/net-analyzer/pnp4nagios/pnp4nagios-0.6.25.ebuild
+++ b/net-analyzer/pnp4nagios/pnp4nagios-0.6.25.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/net-analyzer/poink/poink-2.03.ebuild b/net-analyzer/poink/poink-2.03.ebuild
index 73c493f824c9..d675af067eea 100644
--- a/net-analyzer/poink/poink-2.03.ebuild
+++ b/net-analyzer/poink/poink-2.03.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils toolchain-funcs
diff --git a/net-analyzer/portmon/portmon-2.0.ebuild b/net-analyzer/portmon/portmon-2.0.ebuild
index d97636f7f7ce..eb5b845910b8 100644
--- a/net-analyzer/portmon/portmon-2.0.ebuild
+++ b/net-analyzer/portmon/portmon-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
diff --git a/net-analyzer/portsentry/portsentry-1.2-r1.ebuild b/net-analyzer/portsentry/portsentry-1.2-r1.ebuild
index 031b5cab60b0..29e14b375300 100644
--- a/net-analyzer/portsentry/portsentry-1.2-r1.ebuild
+++ b/net-analyzer/portsentry/portsentry-1.2-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/net-analyzer/postal/postal-0.72.ebuild b/net-analyzer/postal/postal-0.72.ebuild
index 7d827c21f93e..82e1541dd2e7 100644
--- a/net-analyzer/postal/postal-0.72.ebuild
+++ b/net-analyzer/postal/postal-0.72.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 autotools eutils
diff --git a/net-analyzer/prelude-correlator/prelude-correlator-3.0.1-r1.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-3.0.1-r1.ebuild
index 0e395b3522ca..68d50b36d690 100644
--- a/net-analyzer/prelude-correlator/prelude-correlator-3.0.1-r1.ebuild
+++ b/net-analyzer/prelude-correlator/prelude-correlator-3.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=6
diff --git a/net-analyzer/prelude-correlator/prelude-correlator-3.1.0.ebuild b/net-analyzer/prelude-correlator/prelude-correlator-3.1.0.ebuild
index 6e2633d55577..e36ee8a7ccf8 100644
--- a/net-analyzer/prelude-correlator/prelude-correlator-3.1.0.ebuild
+++ b/net-analyzer/prelude-correlator/prelude-correlator-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/net-analyzer/prelude-lml-rules/prelude-lml-rules-3.0.1.ebuild b/net-analyzer/prelude-lml-rules/prelude-lml-rules-3.0.1.ebuild
index fb092e7b85d5..2088e31212d2 100644
--- a/net-analyzer/prelude-lml-rules/prelude-lml-rules-3.0.1.ebuild
+++ b/net-analyzer/prelude-lml-rules/prelude-lml-rules-3.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
diff --git a/net-analyzer/prelude-lml-rules/prelude-lml-rules-3.1.0.ebuild b/net-analyzer/prelude-lml-rules/prelude-lml-rules-3.1.0.ebuild
index a97004e3e4bd..892e695f5e20 100644
--- a/net-analyzer/prelude-lml-rules/prelude-lml-rules-3.1.0.ebuild
+++ b/net-analyzer/prelude-lml-rules/prelude-lml-rules-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/net-analyzer/prelude-lml/prelude-lml-3.0.0.ebuild b/net-analyzer/prelude-lml/prelude-lml-3.0.0.ebuild
index 6d57560ab95a..62c96afbdf87 100644
--- a/net-analyzer/prelude-lml/prelude-lml-3.0.0.ebuild
+++ b/net-analyzer/prelude-lml/prelude-lml-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/net-analyzer/prelude-lml/prelude-lml-3.1.0.ebuild b/net-analyzer/prelude-lml/prelude-lml-3.1.0.ebuild
index 051962d3f3c5..97d2cf351889 100644
--- a/net-analyzer/prelude-lml/prelude-lml-3.1.0.ebuild
+++ b/net-analyzer/prelude-lml/prelude-lml-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/net-analyzer/prelude-nessus/prelude-nessus-20021107.ebuild b/net-analyzer/prelude-nessus/prelude-nessus-20021107.ebuild
index ecef3f441790..d16e50a2ba17 100644
--- a/net-analyzer/prelude-nessus/prelude-nessus-20021107.ebuild
+++ b/net-analyzer/prelude-nessus/prelude-nessus-20021107.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/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.14.0_rc1.ebuild b/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.14.0_rc1.ebuild
index 719517ce9c2e..5e1ff77f080e 100644
--- a/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.14.0_rc1.ebuild
+++ b/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.14.0_rc1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit user golang-build golang-vcs-snapshot
diff --git a/net-analyzer/prometheus/prometheus-1.5.0.ebuild b/net-analyzer/prometheus/prometheus-1.5.0.ebuild
index 456797173952..a4622a9ae7bf 100644
--- a/net-analyzer/prometheus/prometheus-1.5.0.ebuild
+++ b/net-analyzer/prometheus/prometheus-1.5.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 user golang-build golang-vcs-snapshot
diff --git a/net-analyzer/prometheus/prometheus-1.5.1.ebuild b/net-analyzer/prometheus/prometheus-1.5.1.ebuild
index efc63a5f81fe..0311191a6fc7 100644
--- a/net-analyzer/prometheus/prometheus-1.5.1.ebuild
+++ b/net-analyzer/prometheus/prometheus-1.5.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 user golang-build golang-vcs-snapshot
diff --git a/net-analyzer/prometheus/prometheus-1.5.2.ebuild b/net-analyzer/prometheus/prometheus-1.5.2.ebuild
index c9e69f93a6f6..bfc5abdd69ce 100644
--- a/net-analyzer/prometheus/prometheus-1.5.2.ebuild
+++ b/net-analyzer/prometheus/prometheus-1.5.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit user golang-build golang-vcs-snapshot
diff --git a/net-analyzer/pypacker/pypacker-2.9.ebuild b/net-analyzer/pypacker/pypacker-2.9.ebuild
index 11cfed5f32d9..feba37b957dc 100644
--- a/net-analyzer/pypacker/pypacker-2.9.ebuild
+++ b/net-analyzer/pypacker/pypacker-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/net-analyzer/quidscor/quidscor-1.2.48-r1.ebuild b/net-analyzer/quidscor/quidscor-1.2.48-r1.ebuild
index 42d421b2ec14..9c118b6762a3 100644
--- a/net-analyzer/quidscor/quidscor-1.2.48-r1.ebuild
+++ b/net-analyzer/quidscor/quidscor-1.2.48-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
inherit eutils toolchain-funcs
diff --git a/net-analyzer/raddump/raddump-0.3.1.ebuild b/net-analyzer/raddump/raddump-0.3.1.ebuild
index dffa756eaf04..f65595721d5a 100644
--- a/net-analyzer/raddump/raddump-0.3.1.ebuild
+++ b/net-analyzer/raddump/raddump-0.3.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit autotools
diff --git a/net-analyzer/rain/rain-1.2.9_beta1.ebuild b/net-analyzer/rain/rain-1.2.9_beta1.ebuild
index 258a69c15330..72284beaad76 100644
--- a/net-analyzer/rain/rain-1.2.9_beta1.ebuild
+++ b/net-analyzer/rain/rain-1.2.9_beta1.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 autotools eutils
diff --git a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.1.ebuild b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.1.ebuild
index 5be42c233ce3..283dfe597855 100644
--- a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.1.ebuild
+++ b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.2.ebuild b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.2.ebuild
index 12bdf86732bd..7bb832dcae2a 100644
--- a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.2.ebuild
+++ b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild
index 3a226ce01b81..aaf26c337d5a 100644
--- a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3-r1.ebuild
+++ b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.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=6
diff --git a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3.ebuild b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3.ebuild
index aa6355e7af84..c48c7717c1d8 100644
--- a/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.2.3.ebuild
+++ b/net-analyzer/ripe-atlas-tools/ripe-atlas-tools-1.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=6
diff --git a/net-analyzer/rrdcollect/rrdcollect-0.2.9.ebuild b/net-analyzer/rrdcollect/rrdcollect-0.2.9.ebuild
index f3c04ae5fedb..e8380ce1376f 100644
--- a/net-analyzer/rrdcollect/rrdcollect-0.2.9.ebuild
+++ b/net-analyzer/rrdcollect/rrdcollect-0.2.9.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/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild
index df33834fc224..37033a9c12fd 100644
--- a/net-analyzer/rrdtool/rrdtool-1.4.8-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.4.8-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/net-analyzer/rrdtool/rrdtool-1.5.5-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.5.5-r1.ebuild
index c9798d54bf7e..d9e1303a80d3 100644
--- a/net-analyzer/rrdtool/rrdtool-1.5.5-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.5.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/net-analyzer/rrdtool/rrdtool-1.5.5.ebuild b/net-analyzer/rrdtool/rrdtool-1.5.5.ebuild
index b7e890fc259d..bc62b58b7d6e 100644
--- a/net-analyzer/rrdtool/rrdtool-1.5.5.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.5.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/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
index 44f68861f698..133f55737479 100644
--- a/net-analyzer/rrdtool/rrdtool-1.6.0-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.6.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="5"
diff --git a/net-analyzer/rtpbreak/rtpbreak-1.3a-r1.ebuild b/net-analyzer/rtpbreak/rtpbreak-1.3a-r1.ebuild
index de69666fdfb7..ab0cf7fe51a1 100644
--- a/net-analyzer/rtpbreak/rtpbreak-1.3a-r1.ebuild
+++ b/net-analyzer/rtpbreak/rtpbreak-1.3a-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/net-analyzer/sancp/sancp-1.6.1-r4.ebuild b/net-analyzer/sancp/sancp-1.6.1-r4.ebuild
index ccb3f7ab4485..fda9168f38cd 100644
--- a/net-analyzer/sancp/sancp-1.6.1-r4.ebuild
+++ b/net-analyzer/sancp/sancp-1.6.1-r4.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/net-analyzer/sarg/sarg-2.3.10.ebuild b/net-analyzer/sarg/sarg-2.3.10.ebuild
index 6bf1111656da..870baa2e64d8 100644
--- a/net-analyzer/sarg/sarg-2.3.10.ebuild
+++ b/net-analyzer/sarg/sarg-2.3.10.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit autotools eutils
diff --git a/net-analyzer/sbd/sbd-1.37-r1.ebuild b/net-analyzer/sbd/sbd-1.37-r1.ebuild
index 67f8adfdf35f..514310c7e942 100644
--- a/net-analyzer/sbd/sbd-1.37-r1.ebuild
+++ b/net-analyzer/sbd/sbd-1.37-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/net-analyzer/scanlogd/scanlogd-2.2.7.ebuild b/net-analyzer/scanlogd/scanlogd-2.2.7.ebuild
index db871d3d03b3..b7c18a9d4cd0 100644
--- a/net-analyzer/scanlogd/scanlogd-2.2.7.ebuild
+++ b/net-analyzer/scanlogd/scanlogd-2.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
inherit eutils savedconfig toolchain-funcs user
diff --git a/net-analyzer/scanssh/scanssh-2.1.ebuild b/net-analyzer/scanssh/scanssh-2.1.ebuild
index 09086e75c906..880f43c66660 100644
--- a/net-analyzer/scanssh/scanssh-2.1.ebuild
+++ b/net-analyzer/scanssh/scanssh-2.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils
diff --git a/net-analyzer/scapy/scapy-2.2.0-r3.ebuild b/net-analyzer/scapy/scapy-2.2.0-r3.ebuild
index d9f60640a6c1..900d952428c2 100644
--- a/net-analyzer/scapy/scapy-2.2.0-r3.ebuild
+++ b/net-analyzer/scapy/scapy-2.2.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/net-analyzer/scapy/scapy-2.3.0-r1.ebuild b/net-analyzer/scapy/scapy-2.3.0-r1.ebuild
index ce408d20380f..8d06e9584908 100644
--- a/net-analyzer/scapy/scapy-2.3.0-r1.ebuild
+++ b/net-analyzer/scapy/scapy-2.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="5"
diff --git a/net-analyzer/scapy/scapy-2.3.1-r1.ebuild b/net-analyzer/scapy/scapy-2.3.1-r1.ebuild
index ce408d20380f..8d06e9584908 100644
--- a/net-analyzer/scapy/scapy-2.3.1-r1.ebuild
+++ b/net-analyzer/scapy/scapy-2.3.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/net-analyzer/scapy/scapy-2.3.2-r1.ebuild b/net-analyzer/scapy/scapy-2.3.2-r1.ebuild
index 179f5908d5da..8ddeaf38a4fa 100644
--- a/net-analyzer/scapy/scapy-2.3.2-r1.ebuild
+++ b/net-analyzer/scapy/scapy-2.3.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"
diff --git a/net-analyzer/scapy/scapy-9999.ebuild b/net-analyzer/scapy/scapy-9999.ebuild
index 97f6f372cf01..7d971be6c7c6 100644
--- a/net-analyzer/scapy/scapy-9999.ebuild
+++ b/net-analyzer/scapy/scapy-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/net-analyzer/scli/scli-0.4.0-r1.ebuild b/net-analyzer/scli/scli-0.4.0-r1.ebuild
index 292f4e282218..54aae413bbfe 100644
--- a/net-analyzer/scli/scli-0.4.0-r1.ebuild
+++ b/net-analyzer/scli/scli-0.4.0-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
inherit autotools eutils
diff --git a/net-analyzer/sec/sec-2.7.10.ebuild b/net-analyzer/sec/sec-2.7.10.ebuild
index dd9479ccbe63..9be8c728d056 100644
--- a/net-analyzer/sec/sec-2.7.10.ebuild
+++ b/net-analyzer/sec/sec-2.7.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/net-analyzer/sec/sec-2.7.11.ebuild b/net-analyzer/sec/sec-2.7.11.ebuild
index 76102c511e69..e109badd5d25 100644
--- a/net-analyzer/sec/sec-2.7.11.ebuild
+++ b/net-analyzer/sec/sec-2.7.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/net-analyzer/sec/sec-2.7.6-r1.ebuild b/net-analyzer/sec/sec-2.7.6-r1.ebuild
index f6fa44b71fdf..9d01d54b1552 100644
--- a/net-analyzer/sec/sec-2.7.6-r1.ebuild
+++ b/net-analyzer/sec/sec-2.7.6-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/net-analyzer/sflowtool/sflowtool-3.32.ebuild b/net-analyzer/sflowtool/sflowtool-3.32.ebuild
index 3f714b68a773..e98fdd685a63 100644
--- a/net-analyzer/sflowtool/sflowtool-3.32.ebuild
+++ b/net-analyzer/sflowtool/sflowtool-3.32.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 flag-o-matic
diff --git a/net-analyzer/sflowtool/sflowtool-3.33.ebuild b/net-analyzer/sflowtool/sflowtool-3.33.ebuild
index a409f1e3b0ee..932eee492444 100644
--- a/net-analyzer/sflowtool/sflowtool-3.33.ebuild
+++ b/net-analyzer/sflowtool/sflowtool-3.33.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 flag-o-matic
diff --git a/net-analyzer/sflowtool/sflowtool-3.34.ebuild b/net-analyzer/sflowtool/sflowtool-3.34.ebuild
index 11b49ae3fae2..96c9498e8607 100644
--- a/net-analyzer/sflowtool/sflowtool-3.34.ebuild
+++ b/net-analyzer/sflowtool/sflowtool-3.34.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 flag-o-matic
diff --git a/net-analyzer/sflowtool/sflowtool-3.35.ebuild b/net-analyzer/sflowtool/sflowtool-3.35.ebuild
index 48ebb839292f..d2746ffb0b83 100644
--- a/net-analyzer/sflowtool/sflowtool-3.35.ebuild
+++ b/net-analyzer/sflowtool/sflowtool-3.35.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 flag-o-matic
diff --git a/net-analyzer/sguil-client/sguil-client-0.8.0.ebuild b/net-analyzer/sguil-client/sguil-client-0.8.0.ebuild
index 4b8b0b9fe158..486064c7fd78 100644
--- a/net-analyzer/sguil-client/sguil-client-0.8.0.ebuild
+++ b/net-analyzer/sguil-client/sguil-client-0.8.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/net-analyzer/sguil-client/sguil-client-0.9.0.ebuild b/net-analyzer/sguil-client/sguil-client-0.9.0.ebuild
index 66d3c531be30..0eff0c582b96 100644
--- a/net-analyzer/sguil-client/sguil-client-0.9.0.ebuild
+++ b/net-analyzer/sguil-client/sguil-client-0.9.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
inherit multilib
diff --git a/net-analyzer/sguil-sensor/sguil-sensor-0.8.0.ebuild b/net-analyzer/sguil-sensor/sguil-sensor-0.8.0.ebuild
index 539f7af01da1..2589f9861647 100644
--- a/net-analyzer/sguil-sensor/sguil-sensor-0.8.0.ebuild
+++ b/net-analyzer/sguil-sensor/sguil-sensor-0.8.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/net-analyzer/sguil-sensor/sguil-sensor-0.9.0.ebuild b/net-analyzer/sguil-sensor/sguil-sensor-0.9.0.ebuild
index 5e7b40e6e78a..3235c34d475a 100644
--- a/net-analyzer/sguil-sensor/sguil-sensor-0.9.0.ebuild
+++ b/net-analyzer/sguil-sensor/sguil-sensor-0.9.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/net-analyzer/sguil-server/sguil-server-0.8.0.ebuild b/net-analyzer/sguil-server/sguil-server-0.8.0.ebuild
index eb91bfcda80a..f6727a2fe11c 100644
--- a/net-analyzer/sguil-server/sguil-server-0.8.0.ebuild
+++ b/net-analyzer/sguil-server/sguil-server-0.8.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/net-analyzer/sguil-server/sguil-server-0.9.0.ebuild b/net-analyzer/sguil-server/sguil-server-0.9.0.ebuild
index a3e0105503cc..22db45ec08fd 100644
--- a/net-analyzer/sguil-server/sguil-server-0.9.0.ebuild
+++ b/net-analyzer/sguil-server/sguil-server-0.9.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/net-analyzer/sinfo/sinfo-0.0.48.ebuild b/net-analyzer/sinfo/sinfo-0.0.48.ebuild
index e2f1f682ec76..bbee5392b743 100644
--- a/net-analyzer/sinfo/sinfo-0.0.48.ebuild
+++ b/net-analyzer/sinfo/sinfo-0.0.48.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 autotools eutils
diff --git a/net-analyzer/siphon/siphon-666-r1.ebuild b/net-analyzer/siphon/siphon-666-r1.ebuild
index 8a04bbb3e1c8..32c4e5b27bb0 100644
--- a/net-analyzer/siphon/siphon-666-r1.ebuild
+++ b/net-analyzer/siphon/siphon-666-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
inherit eutils toolchain-funcs
diff --git a/net-analyzer/slurm/slurm-0.3.3-r2.ebuild b/net-analyzer/slurm/slurm-0.3.3-r2.ebuild
index a4a79bce3510..b8f2e06dde3e 100644
--- a/net-analyzer/slurm/slurm-0.3.3-r2.ebuild
+++ b/net-analyzer/slurm/slurm-0.3.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
inherit autotools eutils
diff --git a/net-analyzer/slurm/slurm-0.4.3.ebuild b/net-analyzer/slurm/slurm-0.4.3.ebuild
index 2fd1cb2a5625..91c9d7933c20 100644
--- a/net-analyzer/slurm/slurm-0.4.3.ebuild
+++ b/net-analyzer/slurm/slurm-0.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 cmake-utils
diff --git a/net-analyzer/smokeping/smokeping-2.6.10.ebuild b/net-analyzer/smokeping/smokeping-2.6.10.ebuild
index eb887b5c84d7..de43dded917d 100644
--- a/net-analyzer/smokeping/smokeping-2.6.10.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.6.10.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils user systemd
diff --git a/net-analyzer/smokeping/smokeping-2.6.11.ebuild b/net-analyzer/smokeping/smokeping-2.6.11.ebuild
index 945ad246e8ed..e4e552b98ef2 100644
--- a/net-analyzer/smokeping/smokeping-2.6.11.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.6.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
inherit eutils user systemd
diff --git a/net-analyzer/smokeping/smokeping-2.6.9.ebuild b/net-analyzer/smokeping/smokeping-2.6.9.ebuild
index 2bb250bdd98a..b0de9f67c8ab 100644
--- a/net-analyzer/smokeping/smokeping-2.6.9.ebuild
+++ b/net-analyzer/smokeping/smokeping-2.6.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
inherit eutils user systemd
diff --git a/net-analyzer/sniffit/sniffit-0.3.7-r4.ebuild b/net-analyzer/sniffit/sniffit-0.3.7-r4.ebuild
index 32b54e2670c0..404ae9f3cbc8 100644
--- a/net-analyzer/sniffit/sniffit-0.3.7-r4.ebuild
+++ b/net-analyzer/sniffit/sniffit-0.3.7-r4.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 autotools eutils toolchain-funcs
diff --git a/net-analyzer/snmptt/snmptt-1.2.ebuild b/net-analyzer/snmptt/snmptt-1.2.ebuild
index 8cf5a8091b84..4171ddce88d0 100644
--- a/net-analyzer/snmptt/snmptt-1.2.ebuild
+++ b/net-analyzer/snmptt/snmptt-1.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
MY_P="${P/-/_}"
diff --git a/net-analyzer/snmptt/snmptt-1.4.ebuild b/net-analyzer/snmptt/snmptt-1.4.ebuild
index a91c3fcdebfd..bae24f294755 100644
--- a/net-analyzer/snmptt/snmptt-1.4.ebuild
+++ b/net-analyzer/snmptt/snmptt-1.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
diff --git a/net-analyzer/snort/snort-2.9.4.6-r1.ebuild b/net-analyzer/snort/snort-2.9.4.6-r1.ebuild
index 4f7967c6220d..22f8af97cb65 100644
--- a/net-analyzer/snort/snort-2.9.4.6-r1.ebuild
+++ b/net-analyzer/snort/snort-2.9.4.6-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"
inherit autotools multilib user
diff --git a/net-analyzer/snort/snort-2.9.7.0.ebuild b/net-analyzer/snort/snort-2.9.7.0.ebuild
index 3c0716f6ab02..dc97c8f72577 100644
--- a/net-analyzer/snort/snort-2.9.7.0.ebuild
+++ b/net-analyzer/snort/snort-2.9.7.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 autotools multilib user
diff --git a/net-analyzer/snort/snort-2.9.7.2.ebuild b/net-analyzer/snort/snort-2.9.7.2.ebuild
index dcc015235dbf..dc9b17549630 100644
--- a/net-analyzer/snort/snort-2.9.7.2.ebuild
+++ b/net-analyzer/snort/snort-2.9.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"
inherit autotools multilib user
diff --git a/net-analyzer/snort/snort-2.9.7.3.ebuild b/net-analyzer/snort/snort-2.9.7.3.ebuild
index dcc015235dbf..dc9b17549630 100644
--- a/net-analyzer/snort/snort-2.9.7.3.ebuild
+++ b/net-analyzer/snort/snort-2.9.7.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"
inherit autotools multilib user
diff --git a/net-analyzer/snort/snort-2.9.7.5.ebuild b/net-analyzer/snort/snort-2.9.7.5.ebuild
index dcc015235dbf..dc9b17549630 100644
--- a/net-analyzer/snort/snort-2.9.7.5.ebuild
+++ b/net-analyzer/snort/snort-2.9.7.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"
inherit autotools multilib user
diff --git a/net-analyzer/snort/snort-2.9.8.0.ebuild b/net-analyzer/snort/snort-2.9.8.0.ebuild
index dcc015235dbf..dc9b17549630 100644
--- a/net-analyzer/snort/snort-2.9.8.0.ebuild
+++ b/net-analyzer/snort/snort-2.9.8.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"
inherit autotools multilib user
diff --git a/net-analyzer/snort/snort-2.9.8.2.ebuild b/net-analyzer/snort/snort-2.9.8.2.ebuild
index dcc015235dbf..dc9b17549630 100644
--- a/net-analyzer/snort/snort-2.9.8.2.ebuild
+++ b/net-analyzer/snort/snort-2.9.8.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 autotools multilib user
diff --git a/net-analyzer/snort/snort-2.9.8.3-r1.ebuild b/net-analyzer/snort/snort-2.9.8.3-r1.ebuild
index 642762973ab0..c937182cf824 100644
--- a/net-analyzer/snort/snort-2.9.8.3-r1.ebuild
+++ b/net-analyzer/snort/snort-2.9.8.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=6
inherit autotools multilib user
diff --git a/net-analyzer/snort/snort-2.9.8.3.ebuild b/net-analyzer/snort/snort-2.9.8.3.ebuild
index 9944e7e59817..8d043e735f26 100644
--- a/net-analyzer/snort/snort-2.9.8.3.ebuild
+++ b/net-analyzer/snort/snort-2.9.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"
inherit autotools multilib user
diff --git a/net-analyzer/snortalog/snortalog-2.4.3-r1.ebuild b/net-analyzer/snortalog/snortalog-2.4.3-r1.ebuild
index d4e5af050a39..5aef758892c9 100644
--- a/net-analyzer/snortalog/snortalog-2.4.3-r1.ebuild
+++ b/net-analyzer/snortalog/snortalog-2.4.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
inherit eutils
diff --git a/net-analyzer/snortsam/snortsam-2.50-r1.ebuild b/net-analyzer/snortsam/snortsam-2.50-r1.ebuild
index b9a5c9050434..ca2ebdba5880 100644
--- a/net-analyzer/snortsam/snortsam-2.50-r1.ebuild
+++ b/net-analyzer/snortsam/snortsam-2.50-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils toolchain-funcs
diff --git a/net-analyzer/snortsam/snortsam-2.70.ebuild b/net-analyzer/snortsam/snortsam-2.70.ebuild
index 9e76045835b6..041a219e5cb9 100644
--- a/net-analyzer/snortsam/snortsam-2.70.ebuild
+++ b/net-analyzer/snortsam/snortsam-2.70.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/net-analyzer/softflowd/softflowd-0.9.9-r1.ebuild b/net-analyzer/softflowd/softflowd-0.9.9-r1.ebuild
index 8ac74ed4c725..cb7d09e3425e 100644
--- a/net-analyzer/softflowd/softflowd-0.9.9-r1.ebuild
+++ b/net-analyzer/softflowd/softflowd-0.9.9-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit autotools eutils
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-0.3.4-r1.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-0.3.4-r1.ebuild
index 77b944f4796c..9d15ffc0b7d4 100644
--- a/net-analyzer/speedtest-cli/speedtest-cli-0.3.4-r1.ebuild
+++ b/net-analyzer/speedtest-cli/speedtest-cli-0.3.4-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-analyzer/speedtest-cli/speedtest-cli-1.0.1.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-1.0.1.ebuild
index 56ea73473971..0ddf1db51517 100644
--- a/net-analyzer/speedtest-cli/speedtest-cli-1.0.1.ebuild
+++ b/net-analyzer/speedtest-cli/speedtest-cli-1.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/net-analyzer/speedtest-cli/speedtest-cli-1.0.2.ebuild b/net-analyzer/speedtest-cli/speedtest-cli-1.0.2.ebuild
index 56ea73473971..0ddf1db51517 100644
--- a/net-analyzer/speedtest-cli/speedtest-cli-1.0.2.ebuild
+++ b/net-analyzer/speedtest-cli/speedtest-cli-1.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild b/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild
index 4fc6761281d1..e85466b632e4 100644
--- a/net-analyzer/sqlninja/sqlninja-0.2.6_p1-r1.ebuild
+++ b/net-analyzer/sqlninja/sqlninja-0.2.6_p1-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 versionator
diff --git a/net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild b/net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild
index a437993ca34a..a532f9ba04d6 100644
--- a/net-analyzer/squid-graph/squid-graph-3.2-r1.ebuild
+++ b/net-analyzer/squid-graph/squid-graph-3.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
inherit eutils
diff --git a/net-analyzer/squidsites/squidsites-1.01-r2.ebuild b/net-analyzer/squidsites/squidsites-1.01-r2.ebuild
index cc7141dd9466..f6bd96865543 100644
--- a/net-analyzer/squidsites/squidsites-1.01-r2.ebuild
+++ b/net-analyzer/squidsites/squidsites-1.01-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/net-analyzer/squidview/squidview-0.80.ebuild b/net-analyzer/squidview/squidview-0.80.ebuild
index 9459dce4e666..baa6c58d7b3e 100644
--- a/net-analyzer/squidview/squidview-0.80.ebuild
+++ b/net-analyzer/squidview/squidview-0.80.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/net-analyzer/ssldump/ssldump-0.9_beta3.ebuild b/net-analyzer/ssldump/ssldump-0.9_beta3.ebuild
index c662c04a8573..08f96fcfee51 100644
--- a/net-analyzer/ssldump/ssldump-0.9_beta3.ebuild
+++ b/net-analyzer/ssldump/ssldump-0.9_beta3.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/net-analyzer/sslscan/sslscan-1.11.3.ebuild b/net-analyzer/sslscan/sslscan-1.11.3.ebuild
index 61e15a6dbd06..0dab3623499f 100644
--- a/net-analyzer/sslscan/sslscan-1.11.3.ebuild
+++ b/net-analyzer/sslscan/sslscan-1.11.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/net-analyzer/sslscan/sslscan-1.11.7.ebuild b/net-analyzer/sslscan/sslscan-1.11.7.ebuild
index 7848c20b58ae..9c27e9504939 100644
--- a/net-analyzer/sslscan/sslscan-1.11.7.ebuild
+++ b/net-analyzer/sslscan/sslscan-1.11.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/net-analyzer/sslscan/sslscan-1.11.8-r1.ebuild b/net-analyzer/sslscan/sslscan-1.11.8-r1.ebuild
index d943303d1f94..c392e695ff27 100644
--- a/net-analyzer/sslscan/sslscan-1.11.8-r1.ebuild
+++ b/net-analyzer/sslscan/sslscan-1.11.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/net-analyzer/sslscan/sslscan-1.11.8.ebuild b/net-analyzer/sslscan/sslscan-1.11.8.ebuild
index 7848c20b58ae..9c27e9504939 100644
--- a/net-analyzer/sslscan/sslscan-1.11.8.ebuild
+++ b/net-analyzer/sslscan/sslscan-1.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=6
diff --git a/net-analyzer/sslsniff/sslsniff-0.8-r2.ebuild b/net-analyzer/sslsniff/sslsniff-0.8-r2.ebuild
index 34cc8f65c72a..c0f2ea35d7d7 100644
--- a/net-analyzer/sslsniff/sslsniff-0.8-r2.ebuild
+++ b/net-analyzer/sslsniff/sslsniff-0.8-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/net-analyzer/ssmping/ssmping-0.9.1.ebuild b/net-analyzer/ssmping/ssmping-0.9.1.ebuild
index 5d242e12c51e..a9dc609c45f5 100644
--- a/net-analyzer/ssmping/ssmping-0.9.1.ebuild
+++ b/net-analyzer/ssmping/ssmping-0.9.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils toolchain-funcs
diff --git a/net-analyzer/suricata/suricata-2.0.11.ebuild b/net-analyzer/suricata/suricata-2.0.11.ebuild
index a1a7eb39d390..cebe46b654e3 100644
--- a/net-analyzer/suricata/suricata-2.0.11.ebuild
+++ b/net-analyzer/suricata/suricata-2.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/net-analyzer/suricata/suricata-3.0.1.ebuild b/net-analyzer/suricata/suricata-3.0.1.ebuild
index 79c1aff3d6b9..90010bf2a045 100644
--- a/net-analyzer/suricata/suricata-3.0.1.ebuild
+++ b/net-analyzer/suricata/suricata-3.0.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-analyzer/suricata/suricata-3.1.3.ebuild b/net-analyzer/suricata/suricata-3.1.3.ebuild
index 7c185aa5eb30..5b883f9be78a 100644
--- a/net-analyzer/suricata/suricata-3.1.3.ebuild
+++ b/net-analyzer/suricata/suricata-3.1.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/net-analyzer/suricata/suricata-3.2-r1.ebuild b/net-analyzer/suricata/suricata-3.2-r1.ebuild
index 9d39b833eeab..419c56ac26d8 100644
--- a/net-analyzer/suricata/suricata-3.2-r1.ebuild
+++ b/net-analyzer/suricata/suricata-3.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
diff --git a/net-analyzer/suricata/suricata-3.2.1.ebuild b/net-analyzer/suricata/suricata-3.2.1.ebuild
index 9d39b833eeab..419c56ac26d8 100644
--- a/net-analyzer/suricata/suricata-3.2.1.ebuild
+++ b/net-analyzer/suricata/suricata-3.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=5
diff --git a/net-analyzer/suricata/suricata-3.2.ebuild b/net-analyzer/suricata/suricata-3.2.ebuild
index ba4903c97f34..a8763bf9ff89 100644
--- a/net-analyzer/suricata/suricata-3.2.ebuild
+++ b/net-analyzer/suricata/suricata-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/net-analyzer/symon/symon-2.87.ebuild b/net-analyzer/symon/symon-2.87.ebuild
index 3ac8f5483f5d..db2f77a4729a 100644
--- a/net-analyzer/symon/symon-2.87.ebuild
+++ b/net-analyzer/symon/symon-2.87.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 perl-module toolchain-funcs
diff --git a/net-analyzer/synscan/synscan-5.01.ebuild b/net-analyzer/synscan/synscan-5.01.ebuild
index b4a11c7ca7df..14cfdbfae4c4 100644
--- a/net-analyzer/synscan/synscan-5.01.ebuild
+++ b/net-analyzer/synscan/synscan-5.01.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 autotools eutils
diff --git a/net-analyzer/syweb/syweb-0.65.ebuild b/net-analyzer/syweb/syweb-0.65.ebuild
index c4c1824d8cf8..da3bdcae2f6d 100644
--- a/net-analyzer/syweb/syweb-0.65.ebuild
+++ b/net-analyzer/syweb/syweb-0.65.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/net-analyzer/tcpdump/tcpdump-4.9.0.ebuild b/net-analyzer/tcpdump/tcpdump-4.9.0.ebuild
index 8690f3b33923..df635ca9cd8a 100644
--- a/net-analyzer/tcpdump/tcpdump-4.9.0.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-4.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=6
inherit flag-o-matic toolchain-funcs user
diff --git a/net-analyzer/tcpdump/tcpdump-9999.ebuild b/net-analyzer/tcpdump/tcpdump-9999.ebuild
index c963896e53d3..340e3058a3fe 100644
--- a/net-analyzer/tcpdump/tcpdump-9999.ebuild
+++ b/net-analyzer/tcpdump/tcpdump-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
inherit eutils flag-o-matic git-r3 toolchain-funcs user
diff --git a/net-analyzer/tcpflow/tcpflow-1.4.5_p1-r1.ebuild b/net-analyzer/tcpflow/tcpflow-1.4.5_p1-r1.ebuild
index e82e4ef9d8cd..46df802fcbef 100644
--- a/net-analyzer/tcpflow/tcpflow-1.4.5_p1-r1.ebuild
+++ b/net-analyzer/tcpflow/tcpflow-1.4.5_p1-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 autotools eutils
diff --git a/net-analyzer/tcping/tcping-1.3.5.ebuild b/net-analyzer/tcping/tcping-1.3.5.ebuild
index 757cf94048a1..3c883e7c10db 100644
--- a/net-analyzer/tcping/tcping-1.3.5.ebuild
+++ b/net-analyzer/tcping/tcping-1.3.5.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/net-analyzer/tcpreen/tcpreen-1.4.4.ebuild b/net-analyzer/tcpreen/tcpreen-1.4.4.ebuild
index 9072d74ae049..ba523ef2cd1e 100644
--- a/net-analyzer/tcpreen/tcpreen-1.4.4.ebuild
+++ b/net-analyzer/tcpreen/tcpreen-1.4.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit toolchain-funcs
diff --git a/net-analyzer/tcpreplay/tcpreplay-4.1.1.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.1.1.ebuild
index b073194091b2..5adf9557c30f 100644
--- a/net-analyzer/tcpreplay/tcpreplay-4.1.1.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-4.1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit autotools eutils flag-o-matic
diff --git a/net-analyzer/tcpreplay/tcpreplay-4.1.2.ebuild b/net-analyzer/tcpreplay/tcpreplay-4.1.2.ebuild
index 964c4868b476..a27f9136a0bf 100644
--- a/net-analyzer/tcpreplay/tcpreplay-4.1.2.ebuild
+++ b/net-analyzer/tcpreplay/tcpreplay-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
inherit autotools flag-o-matic
diff --git a/net-analyzer/tcpslice/tcpslice-1.2a_p3-r1.ebuild b/net-analyzer/tcpslice/tcpslice-1.2a_p3-r1.ebuild
index 4784210e518d..706c33979464 100644
--- a/net-analyzer/tcpslice/tcpslice-1.2a_p3-r1.ebuild
+++ b/net-analyzer/tcpslice/tcpslice-1.2a_p3-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
inherit autotools eutils
diff --git a/net-analyzer/tcpstat/tcpstat-1.5-r1.ebuild b/net-analyzer/tcpstat/tcpstat-1.5-r1.ebuild
index bd92dc5b2477..6c1492869042 100644
--- a/net-analyzer/tcpstat/tcpstat-1.5-r1.ebuild
+++ b/net-analyzer/tcpstat/tcpstat-1.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils autotools flag-o-matic
diff --git a/net-analyzer/tcpstat/tcpstat-1.5-r2.ebuild b/net-analyzer/tcpstat/tcpstat-1.5-r2.ebuild
index 45e401da62e8..d9762afda9d3 100644
--- a/net-analyzer/tcpstat/tcpstat-1.5-r2.ebuild
+++ b/net-analyzer/tcpstat/tcpstat-1.5-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 autotools flag-o-matic
diff --git a/net-analyzer/tcpstat/tcpstat-1.5.ebuild b/net-analyzer/tcpstat/tcpstat-1.5.ebuild
index 76251d576a47..5a8dcf9dc27c 100644
--- a/net-analyzer/tcpstat/tcpstat-1.5.ebuild
+++ b/net-analyzer/tcpstat/tcpstat-1.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
IUSE="berkdb"
diff --git a/net-analyzer/tcptrace/tcptrace-6.6.7-r2.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7-r2.ebuild
index f2331fb14081..c00386bbbde0 100644
--- a/net-analyzer/tcptrace/tcptrace-6.6.7-r2.ebuild
+++ b/net-analyzer/tcptrace/tcptrace-6.6.7-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/net-analyzer/tcptrace/tcptrace-6.6.7_p4_p1.ebuild b/net-analyzer/tcptrace/tcptrace-6.6.7_p4_p1.ebuild
index 3493016463a1..e65a749553be 100644
--- a/net-analyzer/tcptrace/tcptrace-6.6.7_p4_p1.ebuild
+++ b/net-analyzer/tcptrace/tcptrace-6.6.7_p4_p1.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 autotools eutils flag-o-matic versionator
diff --git a/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r2.ebuild b/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r2.ebuild
index b68676ff4ae8..d2c90c2dc80e 100644
--- a/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-r2.ebuild
+++ b/net-analyzer/tcptraceroute/tcptraceroute-1.5_beta7-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
inherit autotools eutils
diff --git a/net-analyzer/tcptrack/tcptrack-1.4.2.ebuild b/net-analyzer/tcptrack/tcptrack-1.4.2.ebuild
index 9aa6d5179183..235ac5dff8d2 100644
--- a/net-analyzer/tcptrack/tcptrack-1.4.2.ebuild
+++ b/net-analyzer/tcptrack/tcptrack-1.4.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit autotools eutils
diff --git a/net-analyzer/testssl/testssl-2.6.ebuild b/net-analyzer/testssl/testssl-2.6.ebuild
index 86d6a09332ee..567e038f0a97 100644
--- a/net-analyzer/testssl/testssl-2.6.ebuild
+++ b/net-analyzer/testssl/testssl-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/net-analyzer/thc-ipv6/thc-ipv6-2.3.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-2.3.ebuild
index eedaae6c9f56..0cf3cf3241d1 100644
--- a/net-analyzer/thc-ipv6/thc-ipv6-2.3.ebuild
+++ b/net-analyzer/thc-ipv6/thc-ipv6-2.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/net-analyzer/thc-ipv6/thc-ipv6-2.5.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-2.5.ebuild
index ff64c2da222f..4b3cd8777b52 100644
--- a/net-analyzer/thc-ipv6/thc-ipv6-2.5.ebuild
+++ b/net-analyzer/thc-ipv6/thc-ipv6-2.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/net-analyzer/thc-ipv6/thc-ipv6-2.7.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-2.7.ebuild
index ff64c2da222f..4b3cd8777b52 100644
--- a/net-analyzer/thc-ipv6/thc-ipv6-2.7.ebuild
+++ b/net-analyzer/thc-ipv6/thc-ipv6-2.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/net-analyzer/thc-ipv6/thc-ipv6-3.0.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-3.0.ebuild
index 72b7ea5135c4..5151e3d3ceca 100644
--- a/net-analyzer/thc-ipv6/thc-ipv6-3.0.ebuild
+++ b/net-analyzer/thc-ipv6/thc-ipv6-3.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
[[ ${PV} == *9999 ]] && SCM="git-r3"
diff --git a/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild
index 72b7ea5135c4..5151e3d3ceca 100644
--- a/net-analyzer/thc-ipv6/thc-ipv6-9999.ebuild
+++ b/net-analyzer/thc-ipv6/thc-ipv6-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
[[ ${PV} == *9999 ]] && SCM="git-r3"
diff --git a/net-analyzer/thcrut/thcrut-1.2.5-r1.ebuild b/net-analyzer/thcrut/thcrut-1.2.5-r1.ebuild
index 741163887ebe..81a092c175cd 100644
--- a/net-analyzer/thcrut/thcrut-1.2.5-r1.ebuild
+++ b/net-analyzer/thcrut/thcrut-1.2.5-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
inherit autotools eutils
diff --git a/net-analyzer/thrulay/thrulay-0.9-r1.ebuild b/net-analyzer/thrulay/thrulay-0.9-r1.ebuild
index 59059fea408a..f7e905e1772a 100644
--- a/net-analyzer/thrulay/thrulay-0.9-r1.ebuild
+++ b/net-analyzer/thrulay/thrulay-0.9-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
inherit toolchain-funcs autotools
diff --git a/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild b/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild
index eb8d01543285..56abdfd1f3cd 100644
--- a/net-analyzer/tleds/tleds-1.05_beta11-r2.ebuild
+++ b/net-analyzer/tleds/tleds-1.05_beta11-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/net-analyzer/tptest/tptest-3.1.7-r2.ebuild b/net-analyzer/tptest/tptest-3.1.7-r2.ebuild
index e7135687839a..d580934eae8f 100644
--- a/net-analyzer/tptest/tptest-3.1.7-r2.ebuild
+++ b/net-analyzer/tptest/tptest-3.1.7-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 toolchain-funcs eutils
diff --git a/net-analyzer/tracebox/tracebox-0.2.ebuild b/net-analyzer/tracebox/tracebox-0.2.ebuild
index 7b153b35c8e3..6713366d9482 100644
--- a/net-analyzer/tracebox/tracebox-0.2.ebuild
+++ b/net-analyzer/tracebox/tracebox-0.2.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 autotools eutils
diff --git a/net-analyzer/traceproto/traceproto-1.1.2_beta1.ebuild b/net-analyzer/traceproto/traceproto-1.1.2_beta1.ebuild
index 92df6c4bf1d3..15e52604060b 100644
--- a/net-analyzer/traceproto/traceproto-1.1.2_beta1.ebuild
+++ b/net-analyzer/traceproto/traceproto-1.1.2_beta1.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
diff --git a/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2-r1.ebuild b/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2-r1.ebuild
index ebb5570f2870..5dc3aa31866e 100644
--- a/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.2-r1.ebuild
+++ b/net-analyzer/traceroute-nanog/traceroute-nanog-6.4.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=5
diff --git a/net-analyzer/traceroute/traceroute-2.0.20.ebuild b/net-analyzer/traceroute/traceroute-2.0.20.ebuild
index ad19d1f39608..2591edda883f 100644
--- a/net-analyzer/traceroute/traceroute-2.0.20.ebuild
+++ b/net-analyzer/traceroute/traceroute-2.0.20.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/net-analyzer/traceroute/traceroute-2.0.22.ebuild b/net-analyzer/traceroute/traceroute-2.0.22.ebuild
index da6a15364a09..80b2fb236062 100644
--- a/net-analyzer/traceroute/traceroute-2.0.22.ebuild
+++ b/net-analyzer/traceroute/traceroute-2.0.22.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/net-analyzer/traceroute/traceroute-2.1.0.ebuild b/net-analyzer/traceroute/traceroute-2.1.0.ebuild
index 14a9f791b356..35d643119bff 100644
--- a/net-analyzer/traceroute/traceroute-2.1.0.ebuild
+++ b/net-analyzer/traceroute/traceroute-2.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/net-analyzer/trafshow/trafshow-5.2.3.ebuild b/net-analyzer/trafshow/trafshow-5.2.3.ebuild
index 40c9101268d2..9cde85d61f47 100644
--- a/net-analyzer/trafshow/trafshow-5.2.3.ebuild
+++ b/net-analyzer/trafshow/trafshow-5.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
inherit autotools eutils
diff --git a/net-analyzer/tsung/tsung-1.6.0.ebuild b/net-analyzer/tsung/tsung-1.6.0.ebuild
index e9bd34102d56..392db3cc4553 100644
--- a/net-analyzer/tsung/tsung-1.6.0.ebuild
+++ b/net-analyzer/tsung/tsung-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="3"
diff --git a/net-analyzer/ttcp/ttcp-1.12-r2.ebuild b/net-analyzer/ttcp/ttcp-1.12-r2.ebuild
index 1f8cb4251e5e..14f85101f144 100644
--- a/net-analyzer/ttcp/ttcp-1.12-r2.ebuild
+++ b/net-analyzer/ttcp/ttcp-1.12-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 toolchain-funcs
diff --git a/net-analyzer/upnpscan/upnpscan-0.4-r3.ebuild b/net-analyzer/upnpscan/upnpscan-0.4-r3.ebuild
index a80205e8a493..91839f3352c1 100644
--- a/net-analyzer/upnpscan/upnpscan-0.4-r3.ebuild
+++ b/net-analyzer/upnpscan/upnpscan-0.4-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/net-analyzer/vnstat/vnstat-1.15.ebuild b/net-analyzer/vnstat/vnstat-1.15.ebuild
index 1ed51b3089fd..3210f90bdf7f 100644
--- a/net-analyzer/vnstat/vnstat-1.15.ebuild
+++ b/net-analyzer/vnstat/vnstat-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=5
inherit toolchain-funcs user
diff --git a/net-analyzer/vnstat/vnstat-1.16.ebuild b/net-analyzer/vnstat/vnstat-1.16.ebuild
index b7e2cb39b501..1c810d090398 100644
--- a/net-analyzer/vnstat/vnstat-1.16.ebuild
+++ b/net-analyzer/vnstat/vnstat-1.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
inherit toolchain-funcs user
diff --git a/net-analyzer/vnstat/vnstat-1.17.ebuild b/net-analyzer/vnstat/vnstat-1.17.ebuild
index 10aa38acd3af..334b1c5b1740 100644
--- a/net-analyzer/vnstat/vnstat-1.17.ebuild
+++ b/net-analyzer/vnstat/vnstat-1.17.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 toolchain-funcs user
diff --git a/net-analyzer/w3af/w3af-1.1-r1.ebuild b/net-analyzer/w3af/w3af-1.1-r1.ebuild
index 227d54b653d3..dc100037ab5b 100644
--- a/net-analyzer/w3af/w3af-1.1-r1.ebuild
+++ b/net-analyzer/w3af/w3af-1.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/net-analyzer/w3af/w3af-1.5.ebuild b/net-analyzer/w3af/w3af-1.5.ebuild
index ae6158f1434d..dab9d5cd1e58 100644
--- a/net-analyzer/w3af/w3af-1.5.ebuild
+++ b/net-analyzer/w3af/w3af-1.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-analyzer/wapiti/wapiti-2.3.0.ebuild b/net-analyzer/wapiti/wapiti-2.3.0.ebuild
index 1dbef430ef56..00b046e1aac3 100644
--- a/net-analyzer/wapiti/wapiti-2.3.0.ebuild
+++ b/net-analyzer/wapiti/wapiti-2.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
diff --git a/net-analyzer/wapiti/wapiti-9999.ebuild b/net-analyzer/wapiti/wapiti-9999.ebuild
index 2ad64cdde289..7d202ad1e489 100644
--- a/net-analyzer/wapiti/wapiti-9999.ebuild
+++ b/net-analyzer/wapiti/wapiti-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/net-analyzer/webfuzzer/webfuzzer-0.2.0-r1.ebuild b/net-analyzer/webfuzzer/webfuzzer-0.2.0-r1.ebuild
index ce05818d8cd3..6b40638cf0bc 100644
--- a/net-analyzer/webfuzzer/webfuzzer-0.2.0-r1.ebuild
+++ b/net-analyzer/webfuzzer/webfuzzer-0.2.0-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
inherit eutils toolchain-funcs
diff --git a/net-analyzer/wireshark/wireshark-2.2.4.ebuild b/net-analyzer/wireshark/wireshark-2.2.4.ebuild
index 4dd425a089c8..e0aadc7230b7 100644
--- a/net-analyzer/wireshark/wireshark-2.2.4.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.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=6
inherit autotools eutils fcaps flag-o-matic multilib qmake-utils user
diff --git a/net-analyzer/wireshark/wireshark-99999999.ebuild b/net-analyzer/wireshark/wireshark-99999999.ebuild
index 5471dbcdc71d..6b4c32ee8425 100644
--- a/net-analyzer/wireshark/wireshark-99999999.ebuild
+++ b/net-analyzer/wireshark/wireshark-99999999.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 autotools eutils fcaps flag-o-matic git-r3 multilib qmake-utils user
diff --git a/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild b/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild
index 6b3ef4dcc97e..4844a6cb930f 100644
--- a/net-analyzer/xnetload/xnetload-1.11.3-r1.ebuild
+++ b/net-analyzer/xnetload/xnetload-1.11.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=5
inherit toolchain-funcs
diff --git a/net-analyzer/xprobe/xprobe-0.3.ebuild b/net-analyzer/xprobe/xprobe-0.3.ebuild
index f16e943c9ea0..fd60ee96cc6d 100644
--- a/net-analyzer/xprobe/xprobe-0.3.ebuild
+++ b/net-analyzer/xprobe/xprobe-0.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
inherit eutils
diff --git a/net-analyzer/yersinia/yersinia-0.7.3.ebuild b/net-analyzer/yersinia/yersinia-0.7.3.ebuild
index 720c2210c005..bc346d8cf0d3 100644
--- a/net-analyzer/yersinia/yersinia-0.7.3.ebuild
+++ b/net-analyzer/yersinia/yersinia-0.7.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
inherit autotools eutils
diff --git a/net-analyzer/zabbix/zabbix-2.2.16.ebuild b/net-analyzer/zabbix/zabbix-2.2.16.ebuild
index d558c594de0f..4f7cac6a16d0 100644
--- a/net-analyzer/zabbix/zabbix-2.2.16.ebuild
+++ b/net-analyzer/zabbix/zabbix-2.2.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/net-analyzer/zabbix/zabbix-3.0.6.ebuild b/net-analyzer/zabbix/zabbix-3.0.6.ebuild
index 212ccb756906..c914ecab5213 100644
--- a/net-analyzer/zabbix/zabbix-3.0.6.ebuild
+++ b/net-analyzer/zabbix/zabbix-3.0.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/net-analyzer/zabbix/zabbix-3.2.2.ebuild b/net-analyzer/zabbix/zabbix-3.2.2.ebuild
index aaa5b9153d53..6a018fcf0c91 100644
--- a/net-analyzer/zabbix/zabbix-3.2.2.ebuild
+++ b/net-analyzer/zabbix/zabbix-3.2.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
diff --git a/net-analyzer/zabbix/zabbix-3.2.3.ebuild b/net-analyzer/zabbix/zabbix-3.2.3.ebuild
index aaa5b9153d53..6a018fcf0c91 100644
--- a/net-analyzer/zabbix/zabbix-3.2.3.ebuild
+++ b/net-analyzer/zabbix/zabbix-3.2.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/net-analyzer/zmap/zmap-1.2.1.ebuild b/net-analyzer/zmap/zmap-1.2.1.ebuild
index db504be56b71..0f6e591a1788 100644
--- a/net-analyzer/zmap/zmap-1.2.1.ebuild
+++ b/net-analyzer/zmap/zmap-1.2.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/net-analyzer/zmap/zmap-2.1.1.ebuild b/net-analyzer/zmap/zmap-2.1.1.ebuild
index f1ac51819f8a..b52063eda35e 100644
--- a/net-analyzer/zmap/zmap-2.1.1.ebuild
+++ b/net-analyzer/zmap/zmap-2.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/net-analyzer/zmap/zmap-9999.ebuild b/net-analyzer/zmap/zmap-9999.ebuild
index c20be04b9149..2d3f004575e2 100644
--- a/net-analyzer/zmap/zmap-9999.ebuild
+++ b/net-analyzer/zmap/zmap-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/net-analyzer/zniper/zniper-1.0-r1.ebuild b/net-analyzer/zniper/zniper-1.0-r1.ebuild
index 5a996e5925f8..dae03274def1 100644
--- a/net-analyzer/zniper/zniper-1.0-r1.ebuild
+++ b/net-analyzer/zniper/zniper-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$
EAPI=5
inherit toolchain-funcs