summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
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 b463b0200bb..78e858acbf0 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 b463b0200bb..78e858acbf0 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 0f6a8a23e1b..e08fa33d31c 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 81ce417debb..56023534aa0 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 37d7e02893b..7c00e7498f3 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 5042c179c45..e29b5860984 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 3c628314531..2181149109b 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 84b29ec14f9..f06986f3542 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 05290113aad..8b2eb5418a7 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 1cf593af416..efa07fed3bd 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 690bb134abd..7dbfc5a721a 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 6b6ba91deb0..605285628f0 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 f72e24a8f6c..927bbe42730 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 e029a42ef27..7f5c451230f 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 0a795a42185..773e349fc87 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 4a328137c93..daee9ee7286 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 a82e75bd9fa..1552c81188a 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 97dd75339fd..252fac54a2d 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 76c4dcaf915..628bef5fd8b 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 7b44475b469..7428954dbf1 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 9305381856b..67965d67aa1 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 f7f59fa48b0..80362738813 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 a427d595642..d6e8e99955c 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 d844bf67f76..fea985a8e03 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 c1b68ec4b28..52e010ccc6b 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 7b15053016d..e09f129def0 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 afaaf2925af..597005a1017 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 10346ba5250..02b9d58b1f0 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 b9f1007f1fa..95e18c2a29a 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 b9f1007f1fa..95e18c2a29a 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 e5a6940cf80..574816f9353 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 543aecc5403..231ad94155e 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 4569dff5cd4..53220c31acd 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 d515becc124..cf14d402d59 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 41749c41b93..5996c6281ae 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 c121da9b8ba..add43e56929 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 dac12e53392..51311ad8055 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 e54f6d2ef23..3b491265610 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 01aed645d4a..c6ddb2e0919 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 34c9476579d..ab4b64b3264 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 c33b52b6040..1f2bd02ad9e 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 b2191c403f7..c7738d6dba9 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 621b6a9fecc..ef241df7c78 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 1dbd7773e31..34727025866 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 1dbd7773e31..34727025866 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 1dbd7773e31..34727025866 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 c0f81999031..7593857b11b 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 55a7e4332b0..f2641066e9c 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 55a7e4332b0..f2641066e9c 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 55a7e4332b0..f2641066e9c 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 55a7e4332b0..f2641066e9c 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 f22d3d876e0..5829b5a2276 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 dd077822529..aed1057e0f8 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 63cad579806..f44d7e2ce6c 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 3ddd3e8d920..3e3c60fb9e6 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 7ec4a46d8d3..4d703c86b82 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 769e8882531..62cf4fe0599 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 f86a4aefcd6..a0a71e70bbd 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 4607dd5dc57..5c3d328b0bb 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 d0c26c880bc..0bb80b3ddcd 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 67366efedb2..81f442abebf 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 79691a21d1b..5ca1303bbd5 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 7f3e1118614..191d0601fc8 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 ebdc4808321..3bde2f1eb73 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 4424f3c65e4..d0f7d21a331 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 dedaf46c138..b53c88f3c22 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 cb7acceec93..0c94c1940d9 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 61ed5ad2e42..7e3806ff08d 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 695fe9c9e3e..f11002ca418 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 fa96b8bfaab..7da5caa4b23 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 00f43b0840c..f5aeaed6f71 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 0aa037d03e4..83aad9792a3 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 d04bf4061e5..2973a634415 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 7609f701f5b..525ed6964dc 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 f242454995a..166ae344f4e 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 348614afb3c..8f535fd427d 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 ba113ec6cd7..81aecb19451 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 ada4ceb9c16..c7d8681ca3b 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 3034927e653..8479e85a679 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 4788dfd51cf..609df1bb04e 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 7b434b55a06..88d59bffe3f 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 f3d7fe9b7ab..076b0aa2199 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 eea9a468eea..9878f4b54d2 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 0d26cdb1e18..1b004aa80cf 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 cfb0b927597..0a565e6bf15 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 386c85fdc60..bac30f82bf2 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 bff1ebfe4d1..bc2c11074e7 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 412dd67026b..725b922c886 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 21451ec53fb..d49ae392f80 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 bcaf02f0905..f2f9af225aa 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 adbb8ca5c89..548bda33634 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 b14c0836b9d..e2e0606eacd 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 24931b0941e..f65dee1387a 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 7cca52e5217..f9375b0e5ad 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 017ce52f6ed..416c743d3f1 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 b5027128004..34b83c3cedc 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 90d0b0e906b..b3a60faee33 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 cfea239c0ac..cbc60fb821f 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 997a853ed28..e43aa7500b1 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 5dc2f8ba65a..c39d6922575 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 a48bcbdf5fb..e6447657ab5 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 087e3c9d904..dbdd8519afd 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 0cb63cf8ca6..4acc5ca2d45 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 f1ab9a7c792..22232ba540d 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 ecdf87395e4..458a777ff87 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 01c66ae9fe7..ec38bab42de 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 01c66ae9fe7..ec38bab42de 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 8524efb1622..c9f12cb15c7 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 91525958ede..97dcfe72a52 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 885516d0d2f..480dc836096 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 968b4915611..aabe8017d39 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 97901599e1a..d511245fa47 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 78665a04577..000c335caa6 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 e59a69f134e..5a99e658ec6 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 51528d0f85f..a7f4719ea2d 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 9c5727906c0..475dabd261a 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 25d49a41486..efe48d4f17d 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 477b938374a..76e6117c2e5 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 12392c91b81..6e14a77788e 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 f9e77acf980..06d537e9023 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 28c284b7bcc..a1184f2bb1a 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 3ce90561355..5104e42843b 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 544dd8d6aa8..437a290d101 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 77cbf92da76..e65316ebf6f 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 80ead399238..0b04eab14d5 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 31e98d07b95..618d875e8c4 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 5c68e66abfd..b33f5f0bda0 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 336fe95512f..38dfcc336db 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 76538df88a7..8f8890ed829 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 ec801ca900a..646d60b8445 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 86a3507124c..299342dba80 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 61c006718f4..7e824be3caa 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 919c6831785..5bd65a0cb6f 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 38f5caff028..64a4453dc1f 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 8eff57e6525..6e388ee87fa 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 334ba4a43b5..21595801558 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 42793308034..4f6eef1f43e 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 0a18be7b5c0..f22db86ed82 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 76f6f9a3c36..12bfa48676c 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 438efb4b474..36d3970dc4e 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 b7960779875..0b04670293a 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 438efb4b474..36d3970dc4e 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 0ff71308465..af171a68b51 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 c52ed225170..ade8bba2993 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 4005bb857a1..98a8a89c574 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 f5cad000f1d..7fb2edc345f 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 121ff01a9bf..2e8cfdd7a51 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 dcd6dd683bb..84f5ff4d23a 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 76a33ef5e52..72e47e829d5 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 143c316977c..6fa3edca229 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 59047ab98be..286e77456f8 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 b795b2d0778..1e0feff597c 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 9305c2ff2ba..e9723ab496a 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 d03f8ca0cb2..9b3058c197f 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 37f7f7f0afb..0de7e748f4a 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 4bb47dd4055..3aa9eb1e45f 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 93d07942e40..9f807cd264a 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 e760c6d2a6a..e436f03ac43 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 0136631ed0f..371b03c67b6 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 74cbcc2c2ed..def3a784a7e 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 ec53ab3d6f6..1cb32750a71 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 d69ea2287c7..ea4ed84750b 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 4fd1b2e8e9a..a3a8e345be0 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 5c73f26afe2..229188a3b61 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 fa39f4f5427..6d28f511681 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 ca04eb19573..0e211fa6f1b 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 c49de027784..ac8c670339b 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 ed2b1962b85..24c421687e9 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 4a6017458dd..ad8601a5fcc 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 e015ba9407d..e0c71800057 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 de9a3307eda..f8f17e39bcb 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 55ca0de6605..9731d03bf7b 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 52591b903e2..cdbff85668a 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 f639a23d403..b79c445424c 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 6f6f00f9ad5..497332220f4 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 fbd12942886..cb574a7876c 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 5a4f929df0f..6e2135b21c6 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 16e55e2ff5f..ccafd206394 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 ad27a47b546..82cfea75b98 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 5f12529d6ae..e854b260252 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 5e1db4a1e61..009b018eb6e 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 17050b70796..96e9e63bb4b 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 99cb0ee23bb..894968ab55b 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 913e4c0b89f..751e0a110e0 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 979e2073368..fea497f3bb7 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 ca5514df410..7a726872ef0 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 cdda09e1361..5690abb91dc 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 028c58222d0..93a14f462c0 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 762d85179bd..cf5e4f6f6fb 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 2be3f2dd9d0..733705041a3 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 fc95268d820..e48fdba5314 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 3dbb15a7b88..573b7845120 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 4f0da741680..3133eb90742 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 0aeab8cc23e..9ccb0a69e26 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 ff115858e2e..aa3e52b338d 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 f45a9667fa8..7ae0169ea4b 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 8ca3867e771..e81c2db7762 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 7ba93fe887e..53906d9e1e6 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 d8f99487450..6ba3057182a 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 d8f99487450..6ba3057182a 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 3a31df0ee80..8dfbf081d5b 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 f85716720cb..c4d53dc1874 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 23034405cf3..4103aa49d49 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 9d4ac4cae8b..1f40b8c55e4 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 9716ee8c544..d041ec7f419 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 8585bbfa757..86cc18b4867 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 f237bf354e8..ac86c283079 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 09a7e2f542d..5b6ab2dd057 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 3667b61686e..0993cde08f5 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 d823e112b72..ca84b3bf75e 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 b1da177765b..54faddb493b 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 ba928354432..f4770fb1ae5 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 ba928354432..f4770fb1ae5 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 afc46f07d16..c24af88f74d 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 ad9ab988633..e66d0a53801 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 ccd87e8efa8..0dc016c0d55 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 178ea1fe964..7a1daa1bfad 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 1a3ae79348a..0048f8658de 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 d6bf85ac580..eed773ec209 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 0c893dc11a9..e08a6ef0d41 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 c69e5056136..0c557fdb768 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 21e069b3916..726f8bfdd37 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 a6e24f3b43d..515322c7481 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 0c8137832e6..70479fba17f 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 fb181d5f0ec..8b7861b128a 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 ab33b2b0784..d1b0e53b96b 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 7698f47e7a0..dfc0eeaab71 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 d2d29efcdf9..470b7a2f230 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 56908e1abec..2db9d1b6c6a 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 400df3be91e..dd0b836e946 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 aa6272077bd..c89ed52c824 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 e77258e0cef..e5022388456 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 4774b546539..95efd32aaec 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 b333a82e53b..464dbdd9012 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 0535a365781..39bbc8a46c2 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 2c26c7e170b..e2be13acf41 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 ba22c990128..ee6fdb89142 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 ea0a54b0dbd..6d748bc6380 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 485a23c9ef6..64feb0f0710 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 d4761915afc..a6f99f32d47 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 5f0b32d1412..1883f64fc44 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 9ff932ab819..9761e69d1c8 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 35731f314f4..794bc24172f 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 133f6b0a7e5..2b9d0a2ebfa 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 772d9a57c2f..1b4c53803c5 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 b3110596d59..a4480213439 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 8e60afa247d..f2c7742f396 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 a7285fe8e9f..b813b079881 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 af4ca22a8b0..5ccdff9433d 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 eb60c7f8000..a253f1013de 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 500ee35a2b9..f9944901bcb 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 fedfed164e4..1f8abf2a4bd 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 27b0440ab42..ec3887f0d4a 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 16577ef520d..52a9411efeb 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 c9d63159440..c7485b9e776 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 c9d24640028..695ef1f3190 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 263c60c1bbd..5b473474055 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 76846a165b2..1bf4d4933b7 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 71b1f499f3b..34bdcb03749 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 02231cfe16d..360dc9661d7 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 837631426f9..00afce2aacf 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 e81984d4418..044f8d6bb31 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 3e52f24b61d..be5f42d1157 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 c59ac859cc5..f325cd1cdc2 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 ad8fb330313..2a2efdc050e 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 0890ac521b5..3f4c01a03cb 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 e51f185e7c6..1296113a105 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 ce0d866baa5..f23d6499dcd 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 ce0d866baa5..f23d6499dcd 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 8e1333ad2d9..77fc58fcf33 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 113d2413484..8a31eb5993f 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 a7dde5701e7..c88fc19baf6 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 1ba478dd678..453c5877d20 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 3e0cd53b461..fdb2705520c 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 f346d6ffa1a..2f43e6a30a2 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 2aaa038e727..869d878465b 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 aac04c4bc06..f1fa2ad05ae 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 152fe68985b..c2756305668 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 3a312bbb16f..7c1622c9fe9 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 afe44ceeee7..894cf55c72a 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 342b5af7a9f..d987e398571 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 66996ae787d..bf1878bd045 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 90f7145a568..b1243b2e8ab 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 fee9eb38fc8..a9f01cd5482 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 635426fb98e..e820c5d4f3f 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 4d6da82a1fa..9f5605fa16a 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 cc0278e4990..a00de5c0bd6 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 e5327328d87..dda5375c225 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 2ad0b1cec80..962009bd0fd 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 663c4df364b..b31a5d90901 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 377331310b6..baa417bf417 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 48f39a3e044..070bfb21918 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 be40238112e..aff9ac3ee28 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 94704c8d4d6..3ee500e7eeb 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 aed56da99bf..729fe5303f2 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 f790f675732..b8bc8eed7b2 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 0c2f2ac32a8..feb242cab36 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 117ee986fc5..a53f7387fa8 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 57c15e56c2d..d2122aa939e 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 ef422088db1..95fd8de1d7b 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 757aa479143..0da2c99b83b 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 0f1cade6025..7e8c9f28df4 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 574af3698d7..1169e2f7184 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 574af3698d7..1169e2f7184 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 b1bffa06e70..d36cf25b13d 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 906120d2359..72cbc68a5f2 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 03ce4e5bfae..89af9c7ee25 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 9e34b12dd23..1f25434494e 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 fe972bea97d..7da846ede8c 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 c7897169fed..69283cf166f 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 75e58cca8c3..ca40a0e93d4 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 5434fcc143d..5d6f49f0906 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 906a90c352c..f502164771a 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 618729112b6..aff915d2ef9 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 6375f4f0838..35f0ef818c0 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 e80ac3a3a39..769c9b57c68 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 70fc38d91b9..34432cdfd0d 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 219eb4ab613..201bfeb79f8 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 670d169ebb1..726bf0767d7 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 6e7215bcb44..e279652477f 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 9494548f024..d852593f565 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 29a0bdbec78..4d550d82f4f 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 96e2421185f..48c6d833eac 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 921963be24d..eb5667c7e76 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 a22ef50f4e1..675c92e710f 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 a9c25bc85cf..1feec41aa76 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 31df0530d3f..9b5821f9b93 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 c03dc56480d..f41d46219e2 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 4aec2ec9627..967ee045ac9 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 8a45eedbc12..8dc66045ce0 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 9282b5d9806..7df31e37cab 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 3e50d889082..4a4b5881535 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 b7099d1d46c..1c04a49c3a0 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 ef41a88924f..37006d24eea 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 46185885c6d..85b142c3646 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 7e4a980e24d..55c82f85686 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 f9436c35b6c..38568044a9f 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 6eebee7b50d..22ffb38dbf1 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 5332b543e0b..f27118bbbe3 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 e44303f6fcc..bf3780777ae 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 06a5c5140f5..f2807008293 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 ececd6f5078..91a703ca1ff 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 ececd6f5078..91a703ca1ff 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 e59c1190244..7a79e5d51e9 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 7bbcb57bd36..ea74516d0c5 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 8ea8356747b..7630fe3e6f9 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 ee5fadd712e..2044e45a7e0 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 20346d15c7b..8c83a932fe0 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 73c493f824c..d675af067ee 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 d97636f7f7c..eb5b845910b 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 031b5cab60b..29e14b37530 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 7d827c21f93..82e1541dd2e 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 0e395b3522c..68d50b36d69 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 6e2633d5557..e36ee8a7ccf 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 fb092e7b85d..2088e31212d 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 a97004e3e4b..892e695f5e2 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 6d57560ab95..62c96afbdf8 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 051962d3f3c..97d2cf35188 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 ecef3f44179..d16e50a2ba1 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 719517ce9c2..5e1ff77f080 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 45679717395..a4622a9ae7b 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 efc63a5f81f..0311191a6fc 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 c9e69f93a6f..bfc5abdd69c 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 11cfed5f32d..feba37b957d 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 42d421b2ec1..9c118b6762a 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 dffa756eaf0..f65595721d5 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 258a69c1533..72284beaad7 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 5be42c233ce..283dfe59785 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 12bdf86732b..7bb832dcae2 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 3a226ce01b8..aaf26c337d5 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 aa6355e7af8..c48c7717c1d 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 f3c04ae5fed..e8380ce1376 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 df33834fc22..37033a9c12f 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 c9798d54bf7..d9e1303a80d 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 b7e890fc259..bc62b58b7d6 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 44f68861f69..133f5573747 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 de69666fdfb..ab0cf7fe51a 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 ccb3f7ab448..fda9168f38c 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 6bf1111656d..870baa2e64d 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 67f8adfdf35..514310c7e94 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 db871d3d03b..b7c18a9d4cd 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 09086e75c90..880f43c6666 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 d9f60640a6c..900d952428c 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 ce408d20380..8d06e958490 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 ce408d20380..8d06e958490 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 179f5908d5d..8ddeaf38a4f 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 97f6f372cf0..7d971be6c7c 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 292f4e28221..54aae413bbf 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 dd9479ccbe6..9be8c728d05 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 76102c511e6..e109badd5d2 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 f6fa44b71fd..9d01d54b155 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 3f714b68a77..e98fdd685a6 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 a409f1e3b0e..932eee49244 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 11b49ae3fae..96c9498e860 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 48ebb839292..d2746ffb0b8 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 4b8b0b9fe15..486064c7fd7 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 66d3c531be3..0eff0c582b9 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 539f7af01da..2589f986164 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 5e7b40e6e78..3235c34d475 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 eb91bfcda80..f6727a2fe11 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 a3e0105503c..22db45ec08f 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 e2f1f682ec7..bbee5392b74 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 8a04bbb3e1c..32c4e5b27bb 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 a4a79bce351..b8f2e06dde3 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 2fd1cb2a562..91c9d7933c2 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 eb887b5c84d..de43dded917 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 945ad246e8e..e4e552b98ef 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 2bb250bdd98..b0de9f67c8a 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 32b54e2670c..404ae9f3cbc 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 8cf5a8091b8..4171ddce88d 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 a91c3fcdebf..bae24f29475 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 4f7967c6220..22f8af97cb6 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 3c0716f6ab0..dc97c8f7257 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 dcc015235db..dc9b1754963 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 dcc015235db..dc9b1754963 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 dcc015235db..dc9b1754963 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 dcc015235db..dc9b1754963 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 dcc015235db..dc9b1754963 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 642762973ab..c937182cf82 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 9944e7e5981..8d043e735f2 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 d4e5af050a3..5aef758892c 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 b9a5c905043..ca2ebdba588 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 9e76045835b..041a219e5cb 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 8ac74ed4c72..cb7d09e3425 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 77b944f4796..9d15ffc0b7d 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 56ea7347397..0ddf1db5151 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 56ea7347397..0ddf1db5151 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 4fc6761281d..e85466b632e 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 a437993ca34..a532f9ba04d 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 cc7141dd946..f6bd9686554 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 9459dce4e66..baa6c58d7b3 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 c662c04a857..08f96fcfee5 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 61e15a6dbd0..0dab3623499 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 7848c20b58a..9c27e950493 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 d943303d1f9..c392e695ff2 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 7848c20b58a..9c27e950493 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 34cc8f65c72..c0f2ea35d7d 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 5d242e12c51..a9dc609c45f 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 a1a7eb39d39..cebe46b654e 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 79c1aff3d6b..90010bf2a04 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 7c185aa5eb3..5b883f9be78 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 9d39b833eea..419c56ac26d 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 9d39b833eea..419c56ac26d 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 ba4903c97f3..a8763bf9ff8 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 3ac8f5483f5..db2f77a4729 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 b4a11c7ca7d..14cfdbfae4c 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 c4c1824d8cf..da3bdcae2f6 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 8690f3b3392..df635ca9cd8 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 c963896e53d..340e3058a3f 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 e82e4ef9d8c..46df802fcbe 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 757cf94048a..3c883e7c10d 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 9072d74ae04..ba523ef2cd1 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 b073194091b..5adf9557c30 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 964c4868b47..a27f9136a0b 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 4784210e518..706c3397946 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 bd92dc5b247..6c149286904 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 45e401da62e..d9762afda9d 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 76251d576a4..5a8dcf9dc27 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 f2331fb1408..c00386bbbde 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 3493016463a..e65a749553b 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 b68676ff4ae..d2c90c2dc80 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 9aa6d517918..235ac5dff8d 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 86d6a09332e..567e038f0a9 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 eedaae6c9f5..0cf3cf3241d 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 ff64c2da222..4b3cd8777b5 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 ff64c2da222..4b3cd8777b5 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 72b7ea5135c..5151e3d3cec 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 72b7ea5135c..5151e3d3cec 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 741163887eb..81a092c175c 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 59059fea408..f7e905e1772 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 eb8d0154328..56abdfd1f3c 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 e7135687839..d580934eae8 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 7b153b35c8e..6713366d948 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 92df6c4bf1d..15e52604060 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 ebb5570f287..5dc3aa31866 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 ad19d1f3960..2591edda883 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 da6a15364a0..80b2fb23606 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 14a9f791b35..35d643119bf 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 40c9101268d..9cde85d61f4 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 e9bd34102d5..392db3cc455 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 1f8cb4251e5..14f85101f14 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 a80205e8a49..91839f3352c 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 1ed51b3089f..3210f90bdf7 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 b7e2cb39b50..1c810d09039 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 10aa38acd3a..334b1c5b174 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 227d54b653d..dc100037ab5 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 ae6158f1434..dab9d5cd1e5 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 1dbef430ef5..00b046e1aac 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 2ad64cdde28..7d202ad1e48 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 ce05818d8cd..6b40638cf0b 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 4dd425a089c..e0aadc7230b 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 5471dbcdc71..6b4c32ee842 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 6b3ef4dcc97..4844a6cb930 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 f16e943c9ea..fd60ee96cc6 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 720c2210c00..bc346d8cf0d 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 d558c594de0..4f7cac6a16d 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 212ccb75690..c914ecab521 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 aaa5b9153d5..6a018fcf0c9 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 aaa5b9153d5..6a018fcf0c9 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 db504be56b7..0f6e591a178 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 f1ac51819f8..b52063eda35 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 c20be04b914..2d3f004575e 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 5a996e5925f..dae03274def 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