summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2017-02-28 11:47:27 -0800
committerRobin H. Johnson <robbat2@gentoo.org>2017-02-28 11:50:50 -0800
commit61b861acd7b49083dab687e133f30f3331cb7480 (patch)
tree8a7f8399749ed165000187dad48ad8ac4b831465 /app-emulation
parentkde-apps/kcharselect: Add missing DEPEND (diff)
downloadgentoo-61b861acd7b49083dab687e133f30f3331cb7480.tar.gz
gentoo-61b861acd7b49083dab687e133f30f3331cb7480.tar.bz2
gentoo-61b861acd7b49083dab687e133f30f3331cb7480.zip
Drop $Id$ per council decision in bug #611234.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
Diffstat (limited to 'app-emulation')
-rw-r--r--app-emulation/aqemu/aqemu-0.9.2.ebuild1
-rw-r--r--app-emulation/armv8-fast-model/armv8-fast-model-0.8.5206.ebuild1
-rw-r--r--app-emulation/bochs/bochs-2.6.8.ebuild1
-rw-r--r--app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild1
-rw-r--r--app-emulation/cloud-init/cloud-init-0.7.6-r2.ebuild1
-rw-r--r--app-emulation/cloud-init/cloud-init-0.7.6_p1212-r1.ebuild1
-rw-r--r--app-emulation/cloud-init/cloud-init-0.7.6_p1212.ebuild1
-rw-r--r--app-emulation/cloud-init/cloud-init-0.7.7.ebuild1
-rw-r--r--app-emulation/cloud-init/cloud-init-0.7.8-r2.ebuild1
-rw-r--r--app-emulation/cloud-init/cloud-init-0.7.9.ebuild1
-rw-r--r--app-emulation/cloud-init/cloud-init-9999.ebuild1
-rw-r--r--app-emulation/coldfire/coldfire-0.3.1.ebuild1
-rw-r--r--app-emulation/containerd/containerd-0.2.5-r1.ebuild1
-rw-r--r--app-emulation/containerd/containerd-0.2.5.ebuild1
-rw-r--r--app-emulation/containerd/containerd-9999.ebuild1
-rw-r--r--app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild1
-rw-r--r--app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild1
-rw-r--r--app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild1
-rw-r--r--app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild1
-rw-r--r--app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild1
-rw-r--r--app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild1
-rw-r--r--app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild1
-rw-r--r--app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild1
-rw-r--r--app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild1
-rw-r--r--app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild1
-rw-r--r--app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild1
-rw-r--r--app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild1
-rw-r--r--app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild1
-rw-r--r--app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild1
-rw-r--r--app-emulation/crossover-office-bin/crossover-office-bin-6.0.0.ebuild1
-rw-r--r--app-emulation/crossover-office-bin/crossover-office-bin-6.0.1.ebuild1
-rw-r--r--app-emulation/crossover-office-bin/crossover-office-bin-6.1.0.ebuild1
-rw-r--r--app-emulation/crossover-office-bin/crossover-office-bin-6.2.0.ebuild1
-rw-r--r--app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.0.ebuild1
-rw-r--r--app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.1.ebuild1
-rw-r--r--app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.3.ebuild1
-rw-r--r--app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.0.0.ebuild1
-rw-r--r--app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.1.0.ebuild1
-rw-r--r--app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.2.0.ebuild1
-rw-r--r--app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.0.2.ebuild1
-rw-r--r--app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.1.0.ebuild1
-rw-r--r--app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-8.0.0.ebuild1
-rw-r--r--app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.0.ebuild1
-rw-r--r--app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.1.ebuild1
-rw-r--r--app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.1.0.ebuild1
-rw-r--r--app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.2.0.ebuild1
-rw-r--r--app-emulation/dinero/dinero-4.7-r1.ebuild1
-rw-r--r--app-emulation/diskimage-builder/diskimage-builder-1.26.1.ebuild1
-rw-r--r--app-emulation/diskimage-builder/diskimage-builder-1.27.0.ebuild1
-rw-r--r--app-emulation/dlx/dlx-1.0.0-r1.ebuild1
-rw-r--r--app-emulation/dlx/dlx-1.0.0.ebuild1
-rw-r--r--app-emulation/docker-compose/docker-compose-1.10.0.ebuild1
-rw-r--r--app-emulation/docker-compose/docker-compose-1.10.1.ebuild1
-rw-r--r--app-emulation/docker-compose/docker-compose-1.11.1.ebuild1
-rw-r--r--app-emulation/docker-compose/docker-compose-1.11.2.ebuild1
-rw-r--r--app-emulation/docker-gc/docker-gc-9999.ebuild1
-rw-r--r--app-emulation/docker-machine-kvm/docker-machine-kvm-0.7.0.ebuild1
-rw-r--r--app-emulation/docker-machine/docker-machine-0.7.0.ebuild1
-rw-r--r--app-emulation/docker-machine/docker-machine-0.8.2.ebuild1
-rw-r--r--app-emulation/docker-machine/docker-machine-0.9.0.ebuild1
-rw-r--r--app-emulation/docker-proxy/docker-proxy-0.8.0_p20161111.ebuild1
-rw-r--r--app-emulation/docker-proxy/docker-proxy-9999.ebuild1
-rw-r--r--app-emulation/docker-registry/docker-registry-2.5.1.ebuild1
-rw-r--r--app-emulation/docker-registry/docker-registry-2.6.0.ebuild1
-rw-r--r--app-emulation/docker-runc/docker-runc-1.0.0_rc2_p20170201.ebuild1
-rw-r--r--app-emulation/docker-swarm/docker-swarm-1.2.0.ebuild1
-rw-r--r--app-emulation/docker-swarm/docker-swarm-1.2.5.ebuild1
-rw-r--r--app-emulation/docker/docker-1.12.6.ebuild1
-rw-r--r--app-emulation/docker/docker-1.13.1-r1.ebuild1
-rw-r--r--app-emulation/docker/docker-1.13.1-r2.ebuild1
-rw-r--r--app-emulation/docker/docker-1.13.1.ebuild1
-rw-r--r--app-emulation/docker/docker-9999.ebuild1
-rw-r--r--app-emulation/domi/domi-20060816.ebuild1
-rw-r--r--app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild1
-rw-r--r--app-emulation/dynamips/dynamips-0.2.12.ebuild1
-rw-r--r--app-emulation/dynamips/dynamips-0.2.14-r1.ebuild1
-rw-r--r--app-emulation/e-uae/e-uae-0.8.29_rc4-r2.ebuild1
-rw-r--r--app-emulation/edumips64/edumips64-1.1.ebuild1
-rw-r--r--app-emulation/edumips64/edumips64-1.2.ebuild1
-rw-r--r--app-emulation/flannel/flannel-0.5.5.ebuild1
-rw-r--r--app-emulation/flannel/flannel-0.6.2.ebuild1
-rw-r--r--app-emulation/free42/free42-1.5.12.ebuild1
-rw-r--r--app-emulation/free42/free42-1.5.13.ebuild1
-rw-r--r--app-emulation/fuse-utils/fuse-utils-1.1.1.ebuild1
-rw-r--r--app-emulation/fuse/fuse-1.0.0.ebuild1
-rw-r--r--app-emulation/fuse/fuse-1.1.1.ebuild1
-rw-r--r--app-emulation/ganeti-htools/ganeti-htools-0.3.1.ebuild1
-rw-r--r--app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.11.ebuild1
-rw-r--r--app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.12.ebuild1
-rw-r--r--app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.9.ebuild1
-rw-r--r--app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild1
-rw-r--r--app-emulation/ganeti-os-noop/ganeti-os-noop-0.2.ebuild1
-rw-r--r--app-emulation/ganeti/ganeti-2.15.2-r5.ebuild1
-rw-r--r--app-emulation/ganeti/ganeti-2.15.2-r6.ebuild1
-rw-r--r--app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild1
-rw-r--r--app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild1
-rw-r--r--app-emulation/genymotion-bin/genymotion-bin-2.8.1.ebuild1
-rw-r--r--app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild1
-rw-r--r--app-emulation/gxemul/gxemul-0.6.0-r1.ebuild1
-rw-r--r--app-emulation/hercules/hercules-3.10.ebuild1
-rw-r--r--app-emulation/hyperd/hyperd-0.7.0-r1.ebuild1
-rw-r--r--app-emulation/kompose/kompose-0.2.0_p20170214.ebuild1
-rw-r--r--app-emulation/libcacard/libcacard-0.1.2.ebuild1
-rw-r--r--app-emulation/libcacard/libcacard-2.5.1.ebuild1
-rw-r--r--app-emulation/libdsk/libdsk-1.4.2.ebuild1
-rw-r--r--app-emulation/libguestfs-appliance/libguestfs-appliance-1.26.0-r1.ebuild1
-rw-r--r--app-emulation/libguestfs-appliance/libguestfs-appliance-1.28.1-r1.ebuild1
-rw-r--r--app-emulation/libguestfs-appliance/libguestfs-appliance-1.28.1.ebuild1
-rw-r--r--app-emulation/libguestfs/libguestfs-1.28.5-r2.ebuild1
-rw-r--r--app-emulation/libspectrum/libspectrum-1.0.0.ebuild1
-rw-r--r--app-emulation/libspectrum/libspectrum-1.1.1.ebuild1
-rw-r--r--app-emulation/libvirt-glib/libvirt-glib-0.2.3-r1.ebuild1
-rw-r--r--app-emulation/libvirt-glib/libvirt-glib-0.2.3.ebuild1
-rw-r--r--app-emulation/libvirt-glib/libvirt-glib-1.0.0.ebuild1
-rw-r--r--app-emulation/libvirt-snmp/libvirt-snmp-0.0.2-r2.ebuild1
-rw-r--r--app-emulation/libvirt-snmp/libvirt-snmp-0.0.3.ebuild1
-rw-r--r--app-emulation/libvirt/libvirt-1.3.5-r2.ebuild1
-rw-r--r--app-emulation/libvirt/libvirt-2.1.0-r2.ebuild1
-rw-r--r--app-emulation/libvirt/libvirt-2.3.0.ebuild1
-rw-r--r--app-emulation/libvirt/libvirt-2.5.0-r2.ebuild1
-rw-r--r--app-emulation/libvirt/libvirt-3.0.0.ebuild1
-rw-r--r--app-emulation/libvirt/libvirt-9999.ebuild1
-rw-r--r--app-emulation/lxc/lxc-1.0.8.ebuild1
-rw-r--r--app-emulation/lxc/lxc-2.0.3-r1.ebuild1
-rw-r--r--app-emulation/lxc/lxc-2.0.4.ebuild1
-rw-r--r--app-emulation/lxc/lxc-2.0.5.ebuild1
-rw-r--r--app-emulation/lxc/lxc-2.0.6-r1.ebuild1
-rw-r--r--app-emulation/lxc/lxc-2.0.7.ebuild1
-rw-r--r--app-emulation/lxd/lxd-2.5.ebuild1
-rw-r--r--app-emulation/lxd/lxd-2.7.ebuild1
-rw-r--r--app-emulation/lxd/lxd-2.8.ebuild1
-rw-r--r--app-emulation/open-vm-tools/open-vm-tools-10.0.7.ebuild1
-rw-r--r--app-emulation/open-vm-tools/open-vm-tools-10.1.0-r1.ebuild1
-rw-r--r--app-emulation/open-vm-tools/open-vm-tools-10.1.0.ebuild1
-rw-r--r--app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0-r1.ebuild1
-rw-r--r--app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0-r2.ebuild1
-rw-r--r--app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0.ebuild1
-rw-r--r--app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.1.ebuild1
-rw-r--r--app-emulation/phpvirtualbox/phpvirtualbox-4.1.11.ebuild1
-rw-r--r--app-emulation/phpvirtualbox/phpvirtualbox-4.2.7.ebuild1
-rw-r--r--app-emulation/phpvirtualbox/phpvirtualbox-4.3.0.ebuild1
-rw-r--r--app-emulation/phpvirtualbox/phpvirtualbox-5.0.3.ebuild1
-rw-r--r--app-emulation/phpvirtualbox/phpvirtualbox-5.0.5.ebuild1
-rw-r--r--app-emulation/playonlinux/playonlinux-4.2.10-r1.ebuild1
-rw-r--r--app-emulation/playonlinux/playonlinux-4.2.4-r1.ebuild1
-rw-r--r--app-emulation/playonlinux/playonlinux-4.2.6-r1.ebuild1
-rw-r--r--app-emulation/playonlinux/playonlinux-4.2.8-r1.ebuild1
-rw-r--r--app-emulation/q4wine/q4wine-1.3.1.ebuild1
-rw-r--r--app-emulation/q4wine/q4wine-1.3.3.ebuild1
-rw-r--r--app-emulation/qemu-guest-agent/qemu-guest-agent-2.5.0.ebuild1
-rw-r--r--app-emulation/qemu-init-scripts/qemu-init-scripts-0.3.0.ebuild1
-rw-r--r--app-emulation/qtemu/qtemu-1.0.5.ebuild1
-rw-r--r--app-emulation/rex-client/rex-client-9999.ebuild1
-rw-r--r--app-emulation/rkt/rkt-1.23.0.ebuild1
-rw-r--r--app-emulation/rkt/rkt-1.24.0.ebuild1
-rw-r--r--app-emulation/rkt/rkt-1.25.0.ebuild1
-rw-r--r--app-emulation/runc/runc-1.0.0_rc2-r2.ebuild1
-rw-r--r--app-emulation/runc/runc-1.0.0_rc2_p20170222.ebuild1
-rw-r--r--app-emulation/runc/runc-9999.ebuild1
-rw-r--r--app-emulation/runv/runv-0.7.0.ebuild1
-rw-r--r--app-emulation/s6-overlay/s6-overlay-1.18.1.3.ebuild1
-rw-r--r--app-emulation/simh/simh-3.9.0-r1.ebuild1
-rw-r--r--app-emulation/softgun/softgun-0.21.ebuild1
-rw-r--r--app-emulation/softgun/softgun-0.22.ebuild1
-rw-r--r--app-emulation/spectemu/spectemu-0.99.3-r1.ebuild1
-rw-r--r--app-emulation/spectemu/spectemu-0.99.3.ebuild1
-rw-r--r--app-emulation/spice-protocol/spice-protocol-0.12.11.ebuild1
-rw-r--r--app-emulation/spice-protocol/spice-protocol-0.12.12.ebuild1
-rw-r--r--app-emulation/spice-protocol/spice-protocol-9999.ebuild1
-rw-r--r--app-emulation/spice-vdagent/spice-vdagent-0.16.0.ebuild1
-rw-r--r--app-emulation/spice-vdagent/spice-vdagent-0.17.0.ebuild1
-rw-r--r--app-emulation/spice/spice-0.12.7-r1.ebuild1
-rw-r--r--app-emulation/spice/spice-0.12.8.ebuild1
-rw-r--r--app-emulation/spice/spice-0.13.1-r2.ebuild1
-rw-r--r--app-emulation/spice/spice-0.13.2.ebuild1
-rw-r--r--app-emulation/spice/spice-0.13.3.ebuild1
-rw-r--r--app-emulation/spice/spice-9999.ebuild1
-rw-r--r--app-emulation/spim/spim-8.0-r1.ebuild1
-rw-r--r--app-emulation/uade/uade-2.13.ebuild1
-rw-r--r--app-emulation/uae/uae-0.8.29-r2.ebuild1
-rw-r--r--app-emulation/vagrant/vagrant-1.8.6.ebuild1
-rw-r--r--app-emulation/vagrant/vagrant-1.8.7.ebuild1
-rw-r--r--app-emulation/vagrant/vagrant-1.9.1-r1.ebuild1
-rw-r--r--app-emulation/vice/vice-2.4.22.ebuild1
-rw-r--r--app-emulation/vice/vice-2.4.27-r2.ebuild1
-rw-r--r--app-emulation/vice/vice-2.4.27-r3.ebuild1
-rw-r--r--app-emulation/vice/vice-2.4.27.ebuild1
-rw-r--r--app-emulation/vice/vice-2.4.31.ebuild1
-rw-r--r--app-emulation/virt-manager/virt-manager-1.3.2.ebuild1
-rw-r--r--app-emulation/virt-manager/virt-manager-1.4.0-r2.ebuild1
-rw-r--r--app-emulation/virt-manager/virt-manager-9999.ebuild1
-rw-r--r--app-emulation/virt-viewer/virt-viewer-3.1.ebuild1
-rw-r--r--app-emulation/virt-viewer/virt-viewer-4.0.ebuild1
-rw-r--r--app-emulation/virt-viewer/virt-viewer-5.0.ebuild1
-rw-r--r--app-emulation/virt-what/virt-what-1.12.ebuild1
-rw-r--r--app-emulation/virtio-win/virtio-win-0.1.117.ebuild1
-rw-r--r--app-emulation/virtio-win/virtio-win-0.1.118.ebuild1
-rw-r--r--app-emulation/virtio-win/virtio-win-0.1.126.ebuild1
-rw-r--r--app-emulation/virtio-win/virtio-win-0.1.96.ebuild1
-rw-r--r--app-emulation/virtualbox-additions/virtualbox-additions-5.0.16.ebuild1
-rw-r--r--app-emulation/virtualbox-additions/virtualbox-additions-5.0.32.ebuild1
-rw-r--r--app-emulation/virtualbox-additions/virtualbox-additions-5.1.12.ebuild1
-rw-r--r--app-emulation/virtualbox-additions/virtualbox-additions-5.1.14.ebuild1
-rw-r--r--app-emulation/virtualbox-bin/virtualbox-bin-5.0.16.105871-r1.ebuild1
-rw-r--r--app-emulation/virtualbox-bin/virtualbox-bin-5.0.32.112930.ebuild1
-rw-r--r--app-emulation/virtualbox-bin/virtualbox-bin-5.1.12.112440.ebuild1
-rw-r--r--app-emulation/virtualbox-bin/virtualbox-bin-5.1.14.112924.ebuild1
-rw-r--r--app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.16.105871.ebuild1
-rw-r--r--app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.32.112930.ebuild1
-rw-r--r--app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.12.112440.ebuild1
-rw-r--r--app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.14.112924.ebuild1
-rw-r--r--app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.16.ebuild1
-rw-r--r--app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.32.ebuild1
-rw-r--r--app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.12.ebuild1
-rw-r--r--app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.14.ebuild1
-rw-r--r--app-emulation/virtualbox-modules/virtualbox-modules-5.0.16.ebuild1
-rw-r--r--app-emulation/virtualbox-modules/virtualbox-modules-5.0.32.ebuild1
-rw-r--r--app-emulation/virtualbox-modules/virtualbox-modules-5.1.12.ebuild1
-rw-r--r--app-emulation/virtualbox-modules/virtualbox-modules-5.1.14.ebuild1
-rw-r--r--app-emulation/virtualbox/virtualbox-5.0.16-r1.ebuild1
-rw-r--r--app-emulation/virtualbox/virtualbox-5.0.32.ebuild1
-rw-r--r--app-emulation/virtualbox/virtualbox-5.1.12.ebuild1
-rw-r--r--app-emulation/virtualbox/virtualbox-5.1.14.ebuild1
-rw-r--r--app-emulation/vmips-cross-bin/vmips-cross-bin-1.0.ebuild1
-rw-r--r--app-emulation/vmips/vmips-1.3.1.ebuild1
-rw-r--r--app-emulation/vmips/vmips-1.3.ebuild1
-rw-r--r--app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild1
-rw-r--r--app-emulation/vmware-modules/vmware-modules-279.6.ebuild1
-rw-r--r--app-emulation/vmware-modules/vmware-modules-304.2.ebuild1
-rw-r--r--app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild1
-rw-r--r--app-emulation/vmware-modules/vmware-modules-308.1.0.ebuild1
-rw-r--r--app-emulation/vmware-player/vmware-player-12.1.0.3272444-r2.ebuild1
-rw-r--r--app-emulation/vmware-player/vmware-player-7.1.2.2780323-r1.ebuild1
-rw-r--r--app-emulation/vmware-tools/vmware-tools-9.2.3.1031769.ebuild1
-rw-r--r--app-emulation/vmware-tools/vmware-tools-9.6.5.2700073.ebuild1
-rw-r--r--app-emulation/vmware-tools/vmware-tools-9.9.3.2780323.ebuild1
-rw-r--r--app-emulation/vmware-tools/vmware-tools-9.9.4.3206955.ebuild1
-rw-r--r--app-emulation/vmware-vix/vmware-vix-1.11.4.744019.ebuild1
-rw-r--r--app-emulation/vmware-workstation/vmware-workstation-10.0.6.2700073-r1.ebuild1
-rw-r--r--app-emulation/vmware-workstation/vmware-workstation-11.1.2.2780323-r4.ebuild1
-rw-r--r--app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r3.ebuild1
-rw-r--r--app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r4.ebuild1
-rw-r--r--app-emulation/vmware-workstation/vmware-workstation-12.1.0.3272444-r2.ebuild1
-rw-r--r--app-emulation/vmware-workstation/vmware-workstation-9.0.3.1410761.ebuild1
-rw-r--r--app-emulation/vov/vov-2.0.0.ebuild1
-rw-r--r--app-emulation/vpcs/vpcs-0.6.ebuild1
-rw-r--r--app-emulation/wine/wine-1.8-r3.ebuild1
-rw-r--r--app-emulation/wine/wine-1.8.1-r3.ebuild1
-rw-r--r--app-emulation/wine/wine-1.8.2-r2.ebuild1
-rw-r--r--app-emulation/wine/wine-1.8.3-r1.ebuild1
-rw-r--r--app-emulation/wine/wine-1.8.3.ebuild1
-rw-r--r--app-emulation/wine/wine-1.8.4.ebuild1
-rw-r--r--app-emulation/wine/wine-1.8.5.ebuild1
-rw-r--r--app-emulation/wine/wine-1.8.6.ebuild1
-rw-r--r--app-emulation/wine/wine-1.9.10-r3.ebuild1
-rw-r--r--app-emulation/wine/wine-1.9.11-r3.ebuild1
-rw-r--r--app-emulation/wine/wine-1.9.12-r2.ebuild1
-rw-r--r--app-emulation/wine/wine-1.9.13-r2.ebuild1
-rw-r--r--app-emulation/wine/wine-1.9.14-r2.ebuild1
-rw-r--r--app-emulation/wine/wine-1.9.15-r1.ebuild1
-rw-r--r--app-emulation/wine/wine-1.9.16.ebuild1
-rw-r--r--app-emulation/wine/wine-1.9.17.ebuild1
-rw-r--r--app-emulation/wine/wine-1.9.18.ebuild1
-rw-r--r--app-emulation/wine/wine-1.9.19-r1.ebuild1
-rw-r--r--app-emulation/wine/wine-1.9.20.ebuild1
-rw-r--r--app-emulation/wine/wine-1.9.21.ebuild1
-rw-r--r--app-emulation/wine/wine-1.9.22.ebuild1
-rw-r--r--app-emulation/wine/wine-1.9.23.ebuild1
-rw-r--r--app-emulation/wine/wine-1.9.4-r3.ebuild1
-rw-r--r--app-emulation/wine/wine-1.9.5-r3.ebuild1
-rw-r--r--app-emulation/wine/wine-1.9.6-r3.ebuild1
-rw-r--r--app-emulation/wine/wine-1.9.7-r3.ebuild1
-rw-r--r--app-emulation/wine/wine-1.9.8-r2.ebuild1
-rw-r--r--app-emulation/wine/wine-1.9.9-r3.ebuild1
-rw-r--r--app-emulation/wine/wine-2.0.ebuild1
-rw-r--r--app-emulation/wine/wine-9999.ebuild1
-rw-r--r--app-emulation/winetricks/winetricks-20160724.ebuild1
-rw-r--r--app-emulation/winetricks/winetricks-99999999.ebuild1
-rw-r--r--app-emulation/x48/x48-0.6.4.ebuild1
-rw-r--r--app-emulation/xcpc/xcpc-20070122.ebuild1
-rw-r--r--app-emulation/xe-guest-utilities/xe-guest-utilities-5.6.0_p595.ebuild1
-rw-r--r--app-emulation/xe-guest-utilities/xe-guest-utilities-6.1.0_p1033.ebuild1
-rw-r--r--app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120.ebuild1
-rw-r--r--app-emulation/xen-pvgrub/xen-pvgrub-4.7.1-r1.ebuild1
-rw-r--r--app-emulation/xen-pvgrub/xen-pvgrub-4.8.0.ebuild1
-rw-r--r--app-emulation/xen-tools/xen-tools-4.7.1-r8.ebuild1
-rw-r--r--app-emulation/xen-tools/xen-tools-4.8.0-r4.ebuild1
-rw-r--r--app-emulation/xen/xen-4.7.1-r5.ebuild1
-rw-r--r--app-emulation/xen/xen-4.8.0-r2.ebuild1
-rw-r--r--app-emulation/xen/xen-4.8.0-r3.ebuild1
-rw-r--r--app-emulation/xtrs/xtrs-4.9d-r3.ebuild1
-rw-r--r--app-emulation/xtrs/xtrs-4.9d-r4.ebuild1
292 files changed, 0 insertions, 292 deletions
diff --git a/app-emulation/aqemu/aqemu-0.9.2.ebuild b/app-emulation/aqemu/aqemu-0.9.2.ebuild
index f405b407e8b3..842cd408aace 100644
--- a/app-emulation/aqemu/aqemu-0.9.2.ebuild
+++ b/app-emulation/aqemu/aqemu-0.9.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/armv8-fast-model/armv8-fast-model-0.8.5206.ebuild b/app-emulation/armv8-fast-model/armv8-fast-model-0.8.5206.ebuild
index da6bf36f74b7..7d236f0f89cb 100644
--- a/app-emulation/armv8-fast-model/armv8-fast-model-0.8.5206.ebuild
+++ b/app-emulation/armv8-fast-model/armv8-fast-model-0.8.5206.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/app-emulation/bochs/bochs-2.6.8.ebuild b/app-emulation/bochs/bochs-2.6.8.ebuild
index 847f5e47db7d..c0aabd43111b 100644
--- a/app-emulation/bochs/bochs-2.6.8.ebuild
+++ b/app-emulation/bochs/bochs-2.6.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/app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild b/app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild
index 9c1c7ea9607c..9af4ed7a5fd2 100644
--- a/app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild
+++ b/app-emulation/cloud-init/cloud-init-0.7.6-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
diff --git a/app-emulation/cloud-init/cloud-init-0.7.6-r2.ebuild b/app-emulation/cloud-init/cloud-init-0.7.6-r2.ebuild
index 495d67be422f..17d3360f1f96 100644
--- a/app-emulation/cloud-init/cloud-init-0.7.6-r2.ebuild
+++ b/app-emulation/cloud-init/cloud-init-0.7.6-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 )
diff --git a/app-emulation/cloud-init/cloud-init-0.7.6_p1212-r1.ebuild b/app-emulation/cloud-init/cloud-init-0.7.6_p1212-r1.ebuild
index 12d4f69ec5de..13ce91449db9 100644
--- a/app-emulation/cloud-init/cloud-init-0.7.6_p1212-r1.ebuild
+++ b/app-emulation/cloud-init/cloud-init-0.7.6_p1212-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 )
diff --git a/app-emulation/cloud-init/cloud-init-0.7.6_p1212.ebuild b/app-emulation/cloud-init/cloud-init-0.7.6_p1212.ebuild
index 0faedc0d4783..07789217b6fe 100644
--- a/app-emulation/cloud-init/cloud-init-0.7.6_p1212.ebuild
+++ b/app-emulation/cloud-init/cloud-init-0.7.6_p1212.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 )
diff --git a/app-emulation/cloud-init/cloud-init-0.7.7.ebuild b/app-emulation/cloud-init/cloud-init-0.7.7.ebuild
index 9a770c9b0f6c..ff83a712cf1e 100644
--- a/app-emulation/cloud-init/cloud-init-0.7.7.ebuild
+++ b/app-emulation/cloud-init/cloud-init-0.7.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
PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
diff --git a/app-emulation/cloud-init/cloud-init-0.7.8-r2.ebuild b/app-emulation/cloud-init/cloud-init-0.7.8-r2.ebuild
index 45219e64509b..88cb62749cb1 100644
--- a/app-emulation/cloud-init/cloud-init-0.7.8-r2.ebuild
+++ b/app-emulation/cloud-init/cloud-init-0.7.8-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
diff --git a/app-emulation/cloud-init/cloud-init-0.7.9.ebuild b/app-emulation/cloud-init/cloud-init-0.7.9.ebuild
index ff96674f5dbe..df1fcce20697 100644
--- a/app-emulation/cloud-init/cloud-init-0.7.9.ebuild
+++ b/app-emulation/cloud-init/cloud-init-0.7.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
PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
diff --git a/app-emulation/cloud-init/cloud-init-9999.ebuild b/app-emulation/cloud-init/cloud-init-9999.ebuild
index b7bd6bf6d99b..20a2e5936f9c 100644
--- a/app-emulation/cloud-init/cloud-init-9999.ebuild
+++ b/app-emulation/cloud-init/cloud-init-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
diff --git a/app-emulation/coldfire/coldfire-0.3.1.ebuild b/app-emulation/coldfire/coldfire-0.3.1.ebuild
index 620a3ef5a768..ac3e77cd5aa0 100644
--- a/app-emulation/coldfire/coldfire-0.3.1.ebuild
+++ b/app-emulation/coldfire/coldfire-0.3.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/app-emulation/containerd/containerd-0.2.5-r1.ebuild b/app-emulation/containerd/containerd-0.2.5-r1.ebuild
index ce2032d432b9..26848562073e 100644
--- a/app-emulation/containerd/containerd-0.2.5-r1.ebuild
+++ b/app-emulation/containerd/containerd-0.2.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
EGO_PN="github.com/docker/${PN}"
diff --git a/app-emulation/containerd/containerd-0.2.5.ebuild b/app-emulation/containerd/containerd-0.2.5.ebuild
index 9b3726172e85..12edabbe3a4b 100644
--- a/app-emulation/containerd/containerd-0.2.5.ebuild
+++ b/app-emulation/containerd/containerd-0.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
EGO_PN="github.com/docker/${PN}"
diff --git a/app-emulation/containerd/containerd-9999.ebuild b/app-emulation/containerd/containerd-9999.ebuild
index ab4ce7e80243..42467124d22e 100644
--- a/app-emulation/containerd/containerd-9999.ebuild
+++ b/app-emulation/containerd/containerd-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
EGO_PN="github.com/docker/${PN}"
diff --git a/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild
index e98a2dcf65ff..415e20c564ab 100644
--- a/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-12.5.0-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
diff --git a/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild
index 4cdba4850605..64d4c1ae4419 100644
--- a/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-12.5.1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
diff --git a/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild
index 4cdba4850605..64d4c1ae4419 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.0.0-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
diff --git a/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild
index 4cdba4850605..64d4c1ae4419 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.0.1-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.0.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
PYTHON_COMPAT=( python2_7 )
diff --git a/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild
index 4cdba4850605..64d4c1ae4419 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.1.0-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
diff --git a/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild
index 4cdba4850605..64d4c1ae4419 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.1.2-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
diff --git a/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild
index 4cdba4850605..64d4c1ae4419 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.1.3-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.1.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
PYTHON_COMPAT=( python2_7 )
diff --git a/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild b/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild
index 4cdba4850605..64d4c1ae4419 100644
--- a/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-13.2.0-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
diff --git a/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild
index 4738fdc6971c..3b0f4a6cab25 100644
--- a/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-14.0.3-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
diff --git a/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild b/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild
index 67924d072c61..7151f2e03c58 100644
--- a/app-emulation/crossover-bin/crossover-bin-14.1.4-r1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-14.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
PYTHON_COMPAT=( python2_7 )
diff --git a/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild b/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild
index 9f37115c10d0..880ea1194e0d 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.0.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.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
PYTHON_COMPAT=( python2_7 )
diff --git a/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild b/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild
index 38f3e28206b1..a3b9c8dffa0b 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.0.1.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.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
PYTHON_COMPAT=( python2_7 )
diff --git a/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild b/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild
index 38f3e28206b1..a3b9c8dffa0b 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
diff --git a/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild b/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild
index 25fde9a5bd5c..067b05771375 100644
--- a/app-emulation/crossover-bin/crossover-bin-15.2.0.ebuild
+++ b/app-emulation/crossover-bin/crossover-bin-15.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
PYTHON_COMPAT=( python2_7 )
diff --git a/app-emulation/crossover-office-bin/crossover-office-bin-6.0.0.ebuild b/app-emulation/crossover-office-bin/crossover-office-bin-6.0.0.ebuild
index f5d4461d96fa..4355889e0225 100644
--- a/app-emulation/crossover-office-bin/crossover-office-bin-6.0.0.ebuild
+++ b/app-emulation/crossover-office-bin/crossover-office-bin-6.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/app-emulation/crossover-office-bin/crossover-office-bin-6.0.1.ebuild b/app-emulation/crossover-office-bin/crossover-office-bin-6.0.1.ebuild
index f5d4461d96fa..4355889e0225 100644
--- a/app-emulation/crossover-office-bin/crossover-office-bin-6.0.1.ebuild
+++ b/app-emulation/crossover-office-bin/crossover-office-bin-6.0.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/crossover-office-bin/crossover-office-bin-6.1.0.ebuild b/app-emulation/crossover-office-bin/crossover-office-bin-6.1.0.ebuild
index f5d4461d96fa..4355889e0225 100644
--- a/app-emulation/crossover-office-bin/crossover-office-bin-6.1.0.ebuild
+++ b/app-emulation/crossover-office-bin/crossover-office-bin-6.1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/crossover-office-bin/crossover-office-bin-6.2.0.ebuild b/app-emulation/crossover-office-bin/crossover-office-bin-6.2.0.ebuild
index d2b805e162ba..7905086e4578 100644
--- a/app-emulation/crossover-office-bin/crossover-office-bin-6.2.0.ebuild
+++ b/app-emulation/crossover-office-bin/crossover-office-bin-6.2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.0.ebuild
index f087c1be71a8..8bb600e1bbe9 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.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/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.1.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.1.ebuild
index cfa7703bca70..86aed005d279 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.1.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.3.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.3.ebuild
index cfa7703bca70..86aed005d279 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.0.3.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-5.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/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.0.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.0.0.ebuild
index e4fd6bc041b3..3c893c586361 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.0.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.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/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.1.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.1.0.ebuild
index 986d281d61e3..b9b3f6b2f204 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.1.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.2.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.2.0.ebuild
index 986d281d61e3..b9b3f6b2f204 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.2.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-6.2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.0.2.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.0.2.ebuild
index 986d281d61e3..b9b3f6b2f204 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.0.2.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.1.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.1.0.ebuild
index 986d281d61e3..b9b3f6b2f204 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.1.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-7.1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-8.0.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-8.0.0.ebuild
index 986d281d61e3..b9b3f6b2f204 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-8.0.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-8.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/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.0.ebuild
index 986d281d61e3..b9b3f6b2f204 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.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/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.1.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.1.ebuild
index 986d281d61e3..b9b3f6b2f204 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.1.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.0.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.1.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.1.0.ebuild
index 3d3228153307..795a8abcd5eb 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.1.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.2.0.ebuild b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.2.0.ebuild
index 3d3228153307..795a8abcd5eb 100644
--- a/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.2.0.ebuild
+++ b/app-emulation/crossover-office-pro-bin/crossover-office-pro-bin-9.2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/dinero/dinero-4.7-r1.ebuild b/app-emulation/dinero/dinero-4.7-r1.ebuild
index dde85fcfdd5c..6a9d150497b6 100644
--- a/app-emulation/dinero/dinero-4.7-r1.ebuild
+++ b/app-emulation/dinero/dinero-4.7-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/app-emulation/diskimage-builder/diskimage-builder-1.26.1.ebuild b/app-emulation/diskimage-builder/diskimage-builder-1.26.1.ebuild
index 269ad3243370..4ef279eacdb6 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-1.26.1.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-1.26.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
PYTHON_COMPAT=( python2_7 )
diff --git a/app-emulation/diskimage-builder/diskimage-builder-1.27.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-1.27.0.ebuild
index 269ad3243370..4ef279eacdb6 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-1.27.0.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-1.27.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 )
diff --git a/app-emulation/dlx/dlx-1.0.0-r1.ebuild b/app-emulation/dlx/dlx-1.0.0-r1.ebuild
index 638b2a733fd4..bd461ceae4e9 100644
--- a/app-emulation/dlx/dlx-1.0.0-r1.ebuild
+++ b/app-emulation/dlx/dlx-1.0.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit toolchain-funcs
diff --git a/app-emulation/dlx/dlx-1.0.0.ebuild b/app-emulation/dlx/dlx-1.0.0.ebuild
index 3a5cea4ede51..44239952d654 100644
--- a/app-emulation/dlx/dlx-1.0.0.ebuild
+++ b/app-emulation/dlx/dlx-1.0.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
S=${WORKDIR}/dlx
DESCRIPTION="DLX Simulator"
diff --git a/app-emulation/docker-compose/docker-compose-1.10.0.ebuild b/app-emulation/docker-compose/docker-compose-1.10.0.ebuild
index 53ac9ab95f94..7f343eaf763f 100644
--- a/app-emulation/docker-compose/docker-compose-1.10.0.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.10.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python{2_7,3_4} )
diff --git a/app-emulation/docker-compose/docker-compose-1.10.1.ebuild b/app-emulation/docker-compose/docker-compose-1.10.1.ebuild
index c27ad31584f4..387d29c4878a 100644
--- a/app-emulation/docker-compose/docker-compose-1.10.1.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.10.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python{2_7,3_4} )
diff --git a/app-emulation/docker-compose/docker-compose-1.11.1.ebuild b/app-emulation/docker-compose/docker-compose-1.11.1.ebuild
index c27ad31584f4..387d29c4878a 100644
--- a/app-emulation/docker-compose/docker-compose-1.11.1.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.11.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
PYTHON_COMPAT=( python{2_7,3_4} )
diff --git a/app-emulation/docker-compose/docker-compose-1.11.2.ebuild b/app-emulation/docker-compose/docker-compose-1.11.2.ebuild
index 415390b89077..911a0ad8c0e6 100644
--- a/app-emulation/docker-compose/docker-compose-1.11.2.ebuild
+++ b/app-emulation/docker-compose/docker-compose-1.11.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python{2_7,3_4} )
diff --git a/app-emulation/docker-gc/docker-gc-9999.ebuild b/app-emulation/docker-gc/docker-gc-9999.ebuild
index 33ce67478313..9324081bc947 100644
--- a/app-emulation/docker-gc/docker-gc-9999.ebuild
+++ b/app-emulation/docker-gc/docker-gc-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/docker-machine-kvm/docker-machine-kvm-0.7.0.ebuild b/app-emulation/docker-machine-kvm/docker-machine-kvm-0.7.0.ebuild
index 7d1cc4be5281..8b62f95fd5f8 100644
--- a/app-emulation/docker-machine-kvm/docker-machine-kvm-0.7.0.ebuild
+++ b/app-emulation/docker-machine-kvm/docker-machine-kvm-0.7.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/docker-machine/docker-machine-0.7.0.ebuild b/app-emulation/docker-machine/docker-machine-0.7.0.ebuild
index 106b440e21f0..f0744373ad14 100644
--- a/app-emulation/docker-machine/docker-machine-0.7.0.ebuild
+++ b/app-emulation/docker-machine/docker-machine-0.7.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/docker-machine/docker-machine-0.8.2.ebuild b/app-emulation/docker-machine/docker-machine-0.8.2.ebuild
index 2ce8ab6e484d..49f62efc0507 100644
--- a/app-emulation/docker-machine/docker-machine-0.8.2.ebuild
+++ b/app-emulation/docker-machine/docker-machine-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=6
diff --git a/app-emulation/docker-machine/docker-machine-0.9.0.ebuild b/app-emulation/docker-machine/docker-machine-0.9.0.ebuild
index 24243d677df8..42b0669e9d18 100644
--- a/app-emulation/docker-machine/docker-machine-0.9.0.ebuild
+++ b/app-emulation/docker-machine/docker-machine-0.9.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20161111.ebuild b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20161111.ebuild
index cea770f6357c..52dffb474090 100644
--- a/app-emulation/docker-proxy/docker-proxy-0.8.0_p20161111.ebuild
+++ b/app-emulation/docker-proxy/docker-proxy-0.8.0_p20161111.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
EGO_PN="github.com/docker/libnetwork"
diff --git a/app-emulation/docker-proxy/docker-proxy-9999.ebuild b/app-emulation/docker-proxy/docker-proxy-9999.ebuild
index a98a931de155..d759e8814953 100644
--- a/app-emulation/docker-proxy/docker-proxy-9999.ebuild
+++ b/app-emulation/docker-proxy/docker-proxy-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
EGO_PN="github.com/docker/libnetwork"
diff --git a/app-emulation/docker-registry/docker-registry-2.5.1.ebuild b/app-emulation/docker-registry/docker-registry-2.5.1.ebuild
index cd832b424286..c0630843dc6b 100644
--- a/app-emulation/docker-registry/docker-registry-2.5.1.ebuild
+++ b/app-emulation/docker-registry/docker-registry-2.5.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit golang-vcs-snapshot systemd user
diff --git a/app-emulation/docker-registry/docker-registry-2.6.0.ebuild b/app-emulation/docker-registry/docker-registry-2.6.0.ebuild
index 68bc720a6489..bade450252a4 100644
--- a/app-emulation/docker-registry/docker-registry-2.6.0.ebuild
+++ b/app-emulation/docker-registry/docker-registry-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=6
inherit golang-vcs-snapshot systemd user
diff --git a/app-emulation/docker-runc/docker-runc-1.0.0_rc2_p20170201.ebuild b/app-emulation/docker-runc/docker-runc-1.0.0_rc2_p20170201.ebuild
index d6ffc9f57581..e91b71ecd35a 100644
--- a/app-emulation/docker-runc/docker-runc-1.0.0_rc2_p20170201.ebuild
+++ b/app-emulation/docker-runc/docker-runc-1.0.0_rc2_p20170201.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
EGO_PN="github.com/docker/${PN/docker-}"
diff --git a/app-emulation/docker-swarm/docker-swarm-1.2.0.ebuild b/app-emulation/docker-swarm/docker-swarm-1.2.0.ebuild
index bb7c15ca6654..0def6b786c3f 100644
--- a/app-emulation/docker-swarm/docker-swarm-1.2.0.ebuild
+++ b/app-emulation/docker-swarm/docker-swarm-1.2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/docker-swarm/docker-swarm-1.2.5.ebuild b/app-emulation/docker-swarm/docker-swarm-1.2.5.ebuild
index 7837458f8acc..ee87135b33ab 100644
--- a/app-emulation/docker-swarm/docker-swarm-1.2.5.ebuild
+++ b/app-emulation/docker-swarm/docker-swarm-1.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=6
diff --git a/app-emulation/docker/docker-1.12.6.ebuild b/app-emulation/docker/docker-1.12.6.ebuild
index 38db4e0fa52c..e8bde83ded2b 100644
--- a/app-emulation/docker/docker-1.12.6.ebuild
+++ b/app-emulation/docker/docker-1.12.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/docker/docker-1.13.1-r1.ebuild b/app-emulation/docker/docker-1.13.1-r1.ebuild
index 8fc8c33edded..046209402a0d 100644
--- a/app-emulation/docker/docker-1.13.1-r1.ebuild
+++ b/app-emulation/docker/docker-1.13.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/docker/docker-1.13.1-r2.ebuild b/app-emulation/docker/docker-1.13.1-r2.ebuild
index 2b4fec64db60..f52673eaa923 100644
--- a/app-emulation/docker/docker-1.13.1-r2.ebuild
+++ b/app-emulation/docker/docker-1.13.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=6
diff --git a/app-emulation/docker/docker-1.13.1.ebuild b/app-emulation/docker/docker-1.13.1.ebuild
index 5a63ad0d40af..cc454b27bbe0 100644
--- a/app-emulation/docker/docker-1.13.1.ebuild
+++ b/app-emulation/docker/docker-1.13.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/docker/docker-9999.ebuild b/app-emulation/docker/docker-9999.ebuild
index 5cd6a95f5663..722178aa6be9 100644
--- a/app-emulation/docker/docker-9999.ebuild
+++ b/app-emulation/docker/docker-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/domi/domi-20060816.ebuild b/app-emulation/domi/domi-20060816.ebuild
index 2a870ab36e69..21b8a3ac1a4e 100644
--- a/app-emulation/domi/domi-20060816.ebuild
+++ b/app-emulation/domi/domi-20060816.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild
index 8bb88616b209..59a9fdf16d5e 100644
--- a/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild
+++ b/app-emulation/dosemu/dosemu-1.4.1_pre20130107-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/dynamips/dynamips-0.2.12.ebuild b/app-emulation/dynamips/dynamips-0.2.12.ebuild
index f0dfa4d6f7df..134ef537bf0d 100644
--- a/app-emulation/dynamips/dynamips-0.2.12.ebuild
+++ b/app-emulation/dynamips/dynamips-0.2.12.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/dynamips/dynamips-0.2.14-r1.ebuild b/app-emulation/dynamips/dynamips-0.2.14-r1.ebuild
index cb86df7010a7..792a84e1a963 100644
--- a/app-emulation/dynamips/dynamips-0.2.14-r1.ebuild
+++ b/app-emulation/dynamips/dynamips-0.2.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
diff --git a/app-emulation/e-uae/e-uae-0.8.29_rc4-r2.ebuild b/app-emulation/e-uae/e-uae-0.8.29_rc4-r2.ebuild
index cf3ef4650d84..ed2d49d5ea66 100644
--- a/app-emulation/e-uae/e-uae-0.8.29_rc4-r2.ebuild
+++ b/app-emulation/e-uae/e-uae-0.8.29_rc4-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/app-emulation/edumips64/edumips64-1.1.ebuild b/app-emulation/edumips64/edumips64-1.1.ebuild
index 5a5faefba9b6..4ce8b841534a 100644
--- a/app-emulation/edumips64/edumips64-1.1.ebuild
+++ b/app-emulation/edumips64/edumips64-1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/app-emulation/edumips64/edumips64-1.2.ebuild b/app-emulation/edumips64/edumips64-1.2.ebuild
index f54cafdc7603..d557edb9f82e 100644
--- a/app-emulation/edumips64/edumips64-1.2.ebuild
+++ b/app-emulation/edumips64/edumips64-1.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/app-emulation/flannel/flannel-0.5.5.ebuild b/app-emulation/flannel/flannel-0.5.5.ebuild
index 5191237de2e6..74895217074c 100644
--- a/app-emulation/flannel/flannel-0.5.5.ebuild
+++ b/app-emulation/flannel/flannel-0.5.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/flannel/flannel-0.6.2.ebuild b/app-emulation/flannel/flannel-0.6.2.ebuild
index 242a5fe852b5..3c0af6ce510d 100644
--- a/app-emulation/flannel/flannel-0.6.2.ebuild
+++ b/app-emulation/flannel/flannel-0.6.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/free42/free42-1.5.12.ebuild b/app-emulation/free42/free42-1.5.12.ebuild
index ef1a486fc7f9..177107d41f36 100644
--- a/app-emulation/free42/free42-1.5.12.ebuild
+++ b/app-emulation/free42/free42-1.5.12.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/free42/free42-1.5.13.ebuild b/app-emulation/free42/free42-1.5.13.ebuild
index 6e7ef59c438e..4e80cf4e96a2 100644
--- a/app-emulation/free42/free42-1.5.13.ebuild
+++ b/app-emulation/free42/free42-1.5.13.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/fuse-utils/fuse-utils-1.1.1.ebuild b/app-emulation/fuse-utils/fuse-utils-1.1.1.ebuild
index 054937d59d00..d3525d2c9692 100644
--- a/app-emulation/fuse-utils/fuse-utils-1.1.1.ebuild
+++ b/app-emulation/fuse-utils/fuse-utils-1.1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/app-emulation/fuse/fuse-1.0.0.ebuild b/app-emulation/fuse/fuse-1.0.0.ebuild
index fb3210e8d308..cd26c2c4e558 100644
--- a/app-emulation/fuse/fuse-1.0.0.ebuild
+++ b/app-emulation/fuse/fuse-1.0.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
inherit eutils flag-o-matic
diff --git a/app-emulation/fuse/fuse-1.1.1.ebuild b/app-emulation/fuse/fuse-1.1.1.ebuild
index 8606bf42e42b..08ce497fcc96 100644
--- a/app-emulation/fuse/fuse-1.1.1.ebuild
+++ b/app-emulation/fuse/fuse-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="5"
inherit autotools eutils
diff --git a/app-emulation/ganeti-htools/ganeti-htools-0.3.1.ebuild b/app-emulation/ganeti-htools/ganeti-htools-0.3.1.ebuild
index 2f51b83ff780..7068c10267c8 100644
--- a/app-emulation/ganeti-htools/ganeti-htools-0.3.1.ebuild
+++ b/app-emulation/ganeti-htools/ganeti-htools-0.3.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.11.ebuild b/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.11.ebuild
index 9ef767a854fa..91c4f1ab4d1c 100644
--- a/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.11.ebuild
+++ b/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.11.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
diff --git a/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.12.ebuild b/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.12.ebuild
index f9ceb15f28b4..8d6740a836aa 100644
--- a/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.12.ebuild
+++ b/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.12.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
diff --git a/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.9.ebuild b/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.9.ebuild
index b5b5ca3113ba..83f7406cdae4 100644
--- a/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.9.ebuild
+++ b/app-emulation/ganeti-instance-debootstrap/ganeti-instance-debootstrap-0.9.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
diff --git a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild
index c6f28fb04743..760dd5928a14 100644
--- a/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild
+++ b/app-emulation/ganeti-instance-image/ganeti-instance-image-0.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/app-emulation/ganeti-os-noop/ganeti-os-noop-0.2.ebuild b/app-emulation/ganeti-os-noop/ganeti-os-noop-0.2.ebuild
index c1e8bab2be80..18148261ba7f 100644
--- a/app-emulation/ganeti-os-noop/ganeti-os-noop-0.2.ebuild
+++ b/app-emulation/ganeti-os-noop/ganeti-os-noop-0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
index b1f65e36c6a1..a91a6db5a252 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=(python2_7)
diff --git a/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild b/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
index f87f125cb4b3..ec6c5e7a33f3 100644
--- a/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
+++ b/app-emulation/ganeti/ganeti-2.15.2-r6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=(python2_7)
diff --git a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild b/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
index ebe1bac01098..5aee625621fc 100644
--- a/app-emulation/ganeti/ganeti-2.16.0_rc1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.16.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
PYTHON_COMPAT=(python2_7)
diff --git a/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild b/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
index 829a788e570c..61994d1d5374 100644
--- a/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
+++ b/app-emulation/ganeti/ganeti-2.17.0_beta1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=(python2_7)
diff --git a/app-emulation/genymotion-bin/genymotion-bin-2.8.1.ebuild b/app-emulation/genymotion-bin/genymotion-bin-2.8.1.ebuild
index 40f0dba95998..06c7e953407f 100644
--- a/app-emulation/genymotion-bin/genymotion-bin-2.8.1.ebuild
+++ b/app-emulation/genymotion-bin/genymotion-bin-2.8.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild b/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild
index 6ada0a84dc42..8fe09f145e0f 100644
--- a/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild
+++ b/app-emulation/grub-xen-host/grub-xen-host-1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/gxemul/gxemul-0.6.0-r1.ebuild b/app-emulation/gxemul/gxemul-0.6.0-r1.ebuild
index 4d8e375f7496..97c1a3de88f7 100644
--- a/app-emulation/gxemul/gxemul-0.6.0-r1.ebuild
+++ b/app-emulation/gxemul/gxemul-0.6.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/app-emulation/hercules/hercules-3.10.ebuild b/app-emulation/hercules/hercules-3.10.ebuild
index 7187cc4c409e..332b50e1fa09 100644
--- a/app-emulation/hercules/hercules-3.10.ebuild
+++ b/app-emulation/hercules/hercules-3.10.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/app-emulation/hyperd/hyperd-0.7.0-r1.ebuild b/app-emulation/hyperd/hyperd-0.7.0-r1.ebuild
index a5c0703ef09e..60e350cd094e 100644
--- a/app-emulation/hyperd/hyperd-0.7.0-r1.ebuild
+++ b/app-emulation/hyperd/hyperd-0.7.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/kompose/kompose-0.2.0_p20170214.ebuild b/app-emulation/kompose/kompose-0.2.0_p20170214.ebuild
index 30d5f9fc6c8f..c9b2b6e6b080 100644
--- a/app-emulation/kompose/kompose-0.2.0_p20170214.ebuild
+++ b/app-emulation/kompose/kompose-0.2.0_p20170214.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 golang-build golang-vcs-snapshot
diff --git a/app-emulation/libcacard/libcacard-0.1.2.ebuild b/app-emulation/libcacard/libcacard-0.1.2.ebuild
index 065ba5d801b2..16d0db2ba989 100644
--- a/app-emulation/libcacard/libcacard-0.1.2.ebuild
+++ b/app-emulation/libcacard/libcacard-0.1.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/libcacard/libcacard-2.5.1.ebuild b/app-emulation/libcacard/libcacard-2.5.1.ebuild
index f24df6c1c5ac..321bc698cbac 100644
--- a/app-emulation/libcacard/libcacard-2.5.1.ebuild
+++ b/app-emulation/libcacard/libcacard-2.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"
diff --git a/app-emulation/libdsk/libdsk-1.4.2.ebuild b/app-emulation/libdsk/libdsk-1.4.2.ebuild
index d68ef274f69f..1743f38a341a 100644
--- a/app-emulation/libdsk/libdsk-1.4.2.ebuild
+++ b/app-emulation/libdsk/libdsk-1.4.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/libguestfs-appliance/libguestfs-appliance-1.26.0-r1.ebuild b/app-emulation/libguestfs-appliance/libguestfs-appliance-1.26.0-r1.ebuild
index e2b975595f27..b49125430174 100644
--- a/app-emulation/libguestfs-appliance/libguestfs-appliance-1.26.0-r1.ebuild
+++ b/app-emulation/libguestfs-appliance/libguestfs-appliance-1.26.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/app-emulation/libguestfs-appliance/libguestfs-appliance-1.28.1-r1.ebuild b/app-emulation/libguestfs-appliance/libguestfs-appliance-1.28.1-r1.ebuild
index 9778bc868515..8cb84a07c3a0 100644
--- a/app-emulation/libguestfs-appliance/libguestfs-appliance-1.28.1-r1.ebuild
+++ b/app-emulation/libguestfs-appliance/libguestfs-appliance-1.28.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/libguestfs-appliance/libguestfs-appliance-1.28.1.ebuild b/app-emulation/libguestfs-appliance/libguestfs-appliance-1.28.1.ebuild
index e2b975595f27..b49125430174 100644
--- a/app-emulation/libguestfs-appliance/libguestfs-appliance-1.28.1.ebuild
+++ b/app-emulation/libguestfs-appliance/libguestfs-appliance-1.28.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/app-emulation/libguestfs/libguestfs-1.28.5-r2.ebuild b/app-emulation/libguestfs/libguestfs-1.28.5-r2.ebuild
index 9fd45f16712c..b20592117704 100644
--- a/app-emulation/libguestfs/libguestfs-1.28.5-r2.ebuild
+++ b/app-emulation/libguestfs/libguestfs-1.28.5-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/app-emulation/libspectrum/libspectrum-1.0.0.ebuild b/app-emulation/libspectrum/libspectrum-1.0.0.ebuild
index a0455acbd775..77299956610b 100644
--- a/app-emulation/libspectrum/libspectrum-1.0.0.ebuild
+++ b/app-emulation/libspectrum/libspectrum-1.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="3"
diff --git a/app-emulation/libspectrum/libspectrum-1.1.1.ebuild b/app-emulation/libspectrum/libspectrum-1.1.1.ebuild
index 509cc383833a..aed1012d45a2 100644
--- a/app-emulation/libspectrum/libspectrum-1.1.1.ebuild
+++ b/app-emulation/libspectrum/libspectrum-1.1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/app-emulation/libvirt-glib/libvirt-glib-0.2.3-r1.ebuild b/app-emulation/libvirt-glib/libvirt-glib-0.2.3-r1.ebuild
index d7e6e43d5111..677bcfa6826d 100644
--- a/app-emulation/libvirt-glib/libvirt-glib-0.2.3-r1.ebuild
+++ b/app-emulation/libvirt-glib/libvirt-glib-0.2.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
GCONF_DEBUG="no"
diff --git a/app-emulation/libvirt-glib/libvirt-glib-0.2.3.ebuild b/app-emulation/libvirt-glib/libvirt-glib-0.2.3.ebuild
index 797792c712c3..fc1407c822db 100644
--- a/app-emulation/libvirt-glib/libvirt-glib-0.2.3.ebuild
+++ b/app-emulation/libvirt-glib/libvirt-glib-0.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=5
GCONF_DEBUG="no"
diff --git a/app-emulation/libvirt-glib/libvirt-glib-1.0.0.ebuild b/app-emulation/libvirt-glib/libvirt-glib-1.0.0.ebuild
index d7e6e43d5111..677bcfa6826d 100644
--- a/app-emulation/libvirt-glib/libvirt-glib-1.0.0.ebuild
+++ b/app-emulation/libvirt-glib/libvirt-glib-1.0.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
GCONF_DEBUG="no"
diff --git a/app-emulation/libvirt-snmp/libvirt-snmp-0.0.2-r2.ebuild b/app-emulation/libvirt-snmp/libvirt-snmp-0.0.2-r2.ebuild
index d4162ceb5225..76879ca38720 100644
--- a/app-emulation/libvirt-snmp/libvirt-snmp-0.0.2-r2.ebuild
+++ b/app-emulation/libvirt-snmp/libvirt-snmp-0.0.2-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/app-emulation/libvirt-snmp/libvirt-snmp-0.0.3.ebuild b/app-emulation/libvirt-snmp/libvirt-snmp-0.0.3.ebuild
index fdff7d8dd493..b765a373d5a9 100644
--- a/app-emulation/libvirt-snmp/libvirt-snmp-0.0.3.ebuild
+++ b/app-emulation/libvirt-snmp/libvirt-snmp-0.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=4
diff --git a/app-emulation/libvirt/libvirt-1.3.5-r2.ebuild b/app-emulation/libvirt/libvirt-1.3.5-r2.ebuild
index 5f11f0c6bd34..1a050a6a72a2 100644
--- a/app-emulation/libvirt/libvirt-1.3.5-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-1.3.5-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/libvirt/libvirt-2.1.0-r2.ebuild b/app-emulation/libvirt/libvirt-2.1.0-r2.ebuild
index f9d91d7eba50..9200ede720f3 100644
--- a/app-emulation/libvirt/libvirt-2.1.0-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-2.1.0-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/libvirt/libvirt-2.3.0.ebuild b/app-emulation/libvirt/libvirt-2.3.0.ebuild
index 96b318e307d5..dd6c7db7beca 100644
--- a/app-emulation/libvirt/libvirt-2.3.0.ebuild
+++ b/app-emulation/libvirt/libvirt-2.3.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/libvirt/libvirt-2.5.0-r2.ebuild b/app-emulation/libvirt/libvirt-2.5.0-r2.ebuild
index 20004296d994..c1db81b520e1 100644
--- a/app-emulation/libvirt/libvirt-2.5.0-r2.ebuild
+++ b/app-emulation/libvirt/libvirt-2.5.0-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/libvirt/libvirt-3.0.0.ebuild b/app-emulation/libvirt/libvirt-3.0.0.ebuild
index 5de2cca1445c..1003f2599bb4 100644
--- a/app-emulation/libvirt/libvirt-3.0.0.ebuild
+++ b/app-emulation/libvirt/libvirt-3.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
diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild
index 1fcac6e2f214..bc87df8123f0 100644
--- a/app-emulation/libvirt/libvirt-9999.ebuild
+++ b/app-emulation/libvirt/libvirt-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/lxc/lxc-1.0.8.ebuild b/app-emulation/lxc/lxc-1.0.8.ebuild
index 763f836c7a48..1c55e5916100 100644
--- a/app-emulation/lxc/lxc-1.0.8.ebuild
+++ b/app-emulation/lxc/lxc-1.0.8.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/app-emulation/lxc/lxc-2.0.3-r1.ebuild b/app-emulation/lxc/lxc-2.0.3-r1.ebuild
index 16db83633dfa..fbf2ce71f6d3 100644
--- a/app-emulation/lxc/lxc-2.0.3-r1.ebuild
+++ b/app-emulation/lxc/lxc-2.0.3-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/app-emulation/lxc/lxc-2.0.4.ebuild b/app-emulation/lxc/lxc-2.0.4.ebuild
index bc91c8f82d45..5cafe41f06e2 100644
--- a/app-emulation/lxc/lxc-2.0.4.ebuild
+++ b/app-emulation/lxc/lxc-2.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="6"
diff --git a/app-emulation/lxc/lxc-2.0.5.ebuild b/app-emulation/lxc/lxc-2.0.5.ebuild
index bc91c8f82d45..5cafe41f06e2 100644
--- a/app-emulation/lxc/lxc-2.0.5.ebuild
+++ b/app-emulation/lxc/lxc-2.0.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
diff --git a/app-emulation/lxc/lxc-2.0.6-r1.ebuild b/app-emulation/lxc/lxc-2.0.6-r1.ebuild
index 569b71e4de98..c3ca8d9ee12c 100644
--- a/app-emulation/lxc/lxc-2.0.6-r1.ebuild
+++ b/app-emulation/lxc/lxc-2.0.6-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
diff --git a/app-emulation/lxc/lxc-2.0.7.ebuild b/app-emulation/lxc/lxc-2.0.7.ebuild
index 26950e7b31b5..76107348b4d3 100644
--- a/app-emulation/lxc/lxc-2.0.7.ebuild
+++ b/app-emulation/lxc/lxc-2.0.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
diff --git a/app-emulation/lxd/lxd-2.5.ebuild b/app-emulation/lxd/lxd-2.5.ebuild
index 809f11ace32c..044b202a8525 100644
--- a/app-emulation/lxd/lxd-2.5.ebuild
+++ b/app-emulation/lxd/lxd-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=6
diff --git a/app-emulation/lxd/lxd-2.7.ebuild b/app-emulation/lxd/lxd-2.7.ebuild
index edad0e20206a..219213d249ea 100644
--- a/app-emulation/lxd/lxd-2.7.ebuild
+++ b/app-emulation/lxd/lxd-2.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/lxd/lxd-2.8.ebuild b/app-emulation/lxd/lxd-2.8.ebuild
index bc6955f93bbd..b3bf035810ff 100644
--- a/app-emulation/lxd/lxd-2.8.ebuild
+++ b/app-emulation/lxd/lxd-2.8.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/open-vm-tools/open-vm-tools-10.0.7.ebuild b/app-emulation/open-vm-tools/open-vm-tools-10.0.7.ebuild
index 9570dda62e04..049650c8cbcf 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-10.0.7.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-10.0.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/open-vm-tools/open-vm-tools-10.1.0-r1.ebuild b/app-emulation/open-vm-tools/open-vm-tools-10.1.0-r1.ebuild
index 8cc9d434ceae..1d1990aebe4a 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-10.1.0-r1.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-10.1.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
MODULES_OPTIONAL_USE="modules"
diff --git a/app-emulation/open-vm-tools/open-vm-tools-10.1.0.ebuild b/app-emulation/open-vm-tools/open-vm-tools-10.1.0.ebuild
index 36bbff37c060..748ea86aa502 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-10.1.0.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-10.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
MODULES_OPTIONAL_USE="modules"
diff --git a/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0-r1.ebuild b/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0-r1.ebuild
index 9191c85c611b..2fdca4135604 100644
--- a/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0-r1.ebuild
+++ b/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.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
PYTHON_COMPAT=( python2_7 ) # does not work with py3 yet
diff --git a/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0-r2.ebuild b/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0-r2.ebuild
index 1c0d5ed1e617..6217b03813cf 100644
--- a/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0-r2.ebuild
+++ b/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.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
PYTHON_COMPAT=( python2_7 ) # does not work with py3 yet
diff --git a/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0.ebuild b/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0.ebuild
index bdd3af41d717..46959c8c3844 100644
--- a/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0.ebuild
+++ b/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.1.ebuild b/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.1.ebuild
index 695d63929f1f..62e709d54f0a 100644
--- a/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.1.ebuild
+++ b/app-emulation/openstack-guest-agents-unix/openstack-guest-agents-unix-1.39.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
PYTHON_COMPAT=( python2_7 )
diff --git a/app-emulation/phpvirtualbox/phpvirtualbox-4.1.11.ebuild b/app-emulation/phpvirtualbox/phpvirtualbox-4.1.11.ebuild
index 036938d36cac..de7e19448c92 100644
--- a/app-emulation/phpvirtualbox/phpvirtualbox-4.1.11.ebuild
+++ b/app-emulation/phpvirtualbox/phpvirtualbox-4.1.11.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/app-emulation/phpvirtualbox/phpvirtualbox-4.2.7.ebuild b/app-emulation/phpvirtualbox/phpvirtualbox-4.2.7.ebuild
index 984a92caf726..c87ab7614462 100644
--- a/app-emulation/phpvirtualbox/phpvirtualbox-4.2.7.ebuild
+++ b/app-emulation/phpvirtualbox/phpvirtualbox-4.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="5"
diff --git a/app-emulation/phpvirtualbox/phpvirtualbox-4.3.0.ebuild b/app-emulation/phpvirtualbox/phpvirtualbox-4.3.0.ebuild
index ecda72e53916..05e465bd19fa 100644
--- a/app-emulation/phpvirtualbox/phpvirtualbox-4.3.0.ebuild
+++ b/app-emulation/phpvirtualbox/phpvirtualbox-4.3.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/app-emulation/phpvirtualbox/phpvirtualbox-5.0.3.ebuild b/app-emulation/phpvirtualbox/phpvirtualbox-5.0.3.ebuild
index db6c8798a0db..d299a2e28b04 100644
--- a/app-emulation/phpvirtualbox/phpvirtualbox-5.0.3.ebuild
+++ b/app-emulation/phpvirtualbox/phpvirtualbox-5.0.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/app-emulation/phpvirtualbox/phpvirtualbox-5.0.5.ebuild b/app-emulation/phpvirtualbox/phpvirtualbox-5.0.5.ebuild
index b69ee5f3054f..b6cb641a6e5a 100644
--- a/app-emulation/phpvirtualbox/phpvirtualbox-5.0.5.ebuild
+++ b/app-emulation/phpvirtualbox/phpvirtualbox-5.0.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/app-emulation/playonlinux/playonlinux-4.2.10-r1.ebuild b/app-emulation/playonlinux/playonlinux-4.2.10-r1.ebuild
index dc8d4830bc9b..c4937b024170 100644
--- a/app-emulation/playonlinux/playonlinux-4.2.10-r1.ebuild
+++ b/app-emulation/playonlinux/playonlinux-4.2.10-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
PYTHON_COMPAT=( python2_7 )
diff --git a/app-emulation/playonlinux/playonlinux-4.2.4-r1.ebuild b/app-emulation/playonlinux/playonlinux-4.2.4-r1.ebuild
index 16a0fc1a39cf..a8727c2458b4 100644
--- a/app-emulation/playonlinux/playonlinux-4.2.4-r1.ebuild
+++ b/app-emulation/playonlinux/playonlinux-4.2.4-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
PYTHON_COMPAT=( python2_7 )
diff --git a/app-emulation/playonlinux/playonlinux-4.2.6-r1.ebuild b/app-emulation/playonlinux/playonlinux-4.2.6-r1.ebuild
index 1ab608b3e4ce..3d42fb6a204f 100644
--- a/app-emulation/playonlinux/playonlinux-4.2.6-r1.ebuild
+++ b/app-emulation/playonlinux/playonlinux-4.2.6-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
PYTHON_COMPAT=( python2_7 )
diff --git a/app-emulation/playonlinux/playonlinux-4.2.8-r1.ebuild b/app-emulation/playonlinux/playonlinux-4.2.8-r1.ebuild
index 1ab608b3e4ce..3d42fb6a204f 100644
--- a/app-emulation/playonlinux/playonlinux-4.2.8-r1.ebuild
+++ b/app-emulation/playonlinux/playonlinux-4.2.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"
PYTHON_COMPAT=( python2_7 )
diff --git a/app-emulation/q4wine/q4wine-1.3.1.ebuild b/app-emulation/q4wine/q4wine-1.3.1.ebuild
index c98512f6ac6b..f693755dd1ba 100644
--- a/app-emulation/q4wine/q4wine-1.3.1.ebuild
+++ b/app-emulation/q4wine/q4wine-1.3.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/q4wine/q4wine-1.3.3.ebuild b/app-emulation/q4wine/q4wine-1.3.3.ebuild
index fba9b5c96a22..b9d045fc48d8 100644
--- a/app-emulation/q4wine/q4wine-1.3.3.ebuild
+++ b/app-emulation/q4wine/q4wine-1.3.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/qemu-guest-agent/qemu-guest-agent-2.5.0.ebuild b/app-emulation/qemu-guest-agent/qemu-guest-agent-2.5.0.ebuild
index 0031ca90047d..bf8f034c84c1 100644
--- a/app-emulation/qemu-guest-agent/qemu-guest-agent-2.5.0.ebuild
+++ b/app-emulation/qemu-guest-agent/qemu-guest-agent-2.5.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/qemu-init-scripts/qemu-init-scripts-0.3.0.ebuild b/app-emulation/qemu-init-scripts/qemu-init-scripts-0.3.0.ebuild
index 6e07fc73e79d..3bc1fb5d3070 100644
--- a/app-emulation/qemu-init-scripts/qemu-init-scripts-0.3.0.ebuild
+++ b/app-emulation/qemu-init-scripts/qemu-init-scripts-0.3.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/qtemu/qtemu-1.0.5.ebuild b/app-emulation/qtemu/qtemu-1.0.5.ebuild
index 9adc53e7c3cd..41282431fae0 100644
--- a/app-emulation/qtemu/qtemu-1.0.5.ebuild
+++ b/app-emulation/qtemu/qtemu-1.0.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/rex-client/rex-client-9999.ebuild b/app-emulation/rex-client/rex-client-9999.ebuild
index 8eea78563fc8..4b6505b6105d 100644
--- a/app-emulation/rex-client/rex-client-9999.ebuild
+++ b/app-emulation/rex-client/rex-client-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/rkt/rkt-1.23.0.ebuild b/app-emulation/rkt/rkt-1.23.0.ebuild
index 6cb2d5033ca5..0b9f1bcf4fce 100644
--- a/app-emulation/rkt/rkt-1.23.0.ebuild
+++ b/app-emulation/rkt/rkt-1.23.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/rkt/rkt-1.24.0.ebuild b/app-emulation/rkt/rkt-1.24.0.ebuild
index 0d459fd8f66a..4b8e6287dcff 100644
--- a/app-emulation/rkt/rkt-1.24.0.ebuild
+++ b/app-emulation/rkt/rkt-1.24.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/rkt/rkt-1.25.0.ebuild b/app-emulation/rkt/rkt-1.25.0.ebuild
index 0d459fd8f66a..4b8e6287dcff 100644
--- a/app-emulation/rkt/rkt-1.25.0.ebuild
+++ b/app-emulation/rkt/rkt-1.25.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/runc/runc-1.0.0_rc2-r2.ebuild b/app-emulation/runc/runc-1.0.0_rc2-r2.ebuild
index 986bc4219b76..0ecb0b79d1f7 100644
--- a/app-emulation/runc/runc-1.0.0_rc2-r2.ebuild
+++ b/app-emulation/runc/runc-1.0.0_rc2-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
EGO_PN="github.com/opencontainers/${PN}"
diff --git a/app-emulation/runc/runc-1.0.0_rc2_p20170222.ebuild b/app-emulation/runc/runc-1.0.0_rc2_p20170222.ebuild
index 1baca3eeee64..50ad9ca1ac32 100644
--- a/app-emulation/runc/runc-1.0.0_rc2_p20170222.ebuild
+++ b/app-emulation/runc/runc-1.0.0_rc2_p20170222.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
EGO_PN="github.com/opencontainers/${PN}"
diff --git a/app-emulation/runc/runc-9999.ebuild b/app-emulation/runc/runc-9999.ebuild
index f186801bbbe6..8973c7491259 100644
--- a/app-emulation/runc/runc-9999.ebuild
+++ b/app-emulation/runc/runc-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/runv/runv-0.7.0.ebuild b/app-emulation/runv/runv-0.7.0.ebuild
index 6b0b9d9b038d..3df1bcf0df82 100644
--- a/app-emulation/runv/runv-0.7.0.ebuild
+++ b/app-emulation/runv/runv-0.7.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/s6-overlay/s6-overlay-1.18.1.3.ebuild b/app-emulation/s6-overlay/s6-overlay-1.18.1.3.ebuild
index 10c6e2dab5ad..e5482e5fa911 100644
--- a/app-emulation/s6-overlay/s6-overlay-1.18.1.3.ebuild
+++ b/app-emulation/s6-overlay/s6-overlay-1.18.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=6
diff --git a/app-emulation/simh/simh-3.9.0-r1.ebuild b/app-emulation/simh/simh-3.9.0-r1.ebuild
index cfcf75412dce..ee884176530e 100644
--- a/app-emulation/simh/simh-3.9.0-r1.ebuild
+++ b/app-emulation/simh/simh-3.9.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/app-emulation/softgun/softgun-0.21.ebuild b/app-emulation/softgun/softgun-0.21.ebuild
index 16e6be2b0b79..ceb15acaf31c 100644
--- a/app-emulation/softgun/softgun-0.21.ebuild
+++ b/app-emulation/softgun/softgun-0.21.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/app-emulation/softgun/softgun-0.22.ebuild b/app-emulation/softgun/softgun-0.22.ebuild
index a87216dcd5bf..15758fcf1687 100644
--- a/app-emulation/softgun/softgun-0.22.ebuild
+++ b/app-emulation/softgun/softgun-0.22.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/spectemu/spectemu-0.99.3-r1.ebuild b/app-emulation/spectemu/spectemu-0.99.3-r1.ebuild
index 10aaa2bc722b..1052d0a334f7 100644
--- a/app-emulation/spectemu/spectemu-0.99.3-r1.ebuild
+++ b/app-emulation/spectemu/spectemu-0.99.3-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/app-emulation/spectemu/spectemu-0.99.3.ebuild b/app-emulation/spectemu/spectemu-0.99.3.ebuild
index 1dbab72574f4..2ab41303ddcd 100644
--- a/app-emulation/spectemu/spectemu-0.99.3.ebuild
+++ b/app-emulation/spectemu/spectemu-0.99.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
### Several versions of specemu exist, xspect & vgaspect, utilising X11
### and/or svgalib. libreadline provides optional runtime features.
diff --git a/app-emulation/spice-protocol/spice-protocol-0.12.11.ebuild b/app-emulation/spice-protocol/spice-protocol-0.12.11.ebuild
index 15b1dac72288..b4968d98b449 100644
--- a/app-emulation/spice-protocol/spice-protocol-0.12.11.ebuild
+++ b/app-emulation/spice-protocol/spice-protocol-0.12.11.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/spice-protocol/spice-protocol-0.12.12.ebuild b/app-emulation/spice-protocol/spice-protocol-0.12.12.ebuild
index e1b1afee22f0..aff9351b768e 100644
--- a/app-emulation/spice-protocol/spice-protocol-0.12.12.ebuild
+++ b/app-emulation/spice-protocol/spice-protocol-0.12.12.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/spice-protocol/spice-protocol-9999.ebuild b/app-emulation/spice-protocol/spice-protocol-9999.ebuild
index 89e148e198c6..8f7d4c8b79d7 100644
--- a/app-emulation/spice-protocol/spice-protocol-9999.ebuild
+++ b/app-emulation/spice-protocol/spice-protocol-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/spice-vdagent/spice-vdagent-0.16.0.ebuild b/app-emulation/spice-vdagent/spice-vdagent-0.16.0.ebuild
index 932365f3b867..44956db5786d 100644
--- a/app-emulation/spice-vdagent/spice-vdagent-0.16.0.ebuild
+++ b/app-emulation/spice-vdagent/spice-vdagent-0.16.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/spice-vdagent/spice-vdagent-0.17.0.ebuild b/app-emulation/spice-vdagent/spice-vdagent-0.17.0.ebuild
index 176f634302f6..db875d2b9a4e 100644
--- a/app-emulation/spice-vdagent/spice-vdagent-0.17.0.ebuild
+++ b/app-emulation/spice-vdagent/spice-vdagent-0.17.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/spice/spice-0.12.7-r1.ebuild b/app-emulation/spice/spice-0.12.7-r1.ebuild
index 568e3cc33d46..9c66f4f62822 100644
--- a/app-emulation/spice/spice-0.12.7-r1.ebuild
+++ b/app-emulation/spice/spice-0.12.7-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/spice/spice-0.12.8.ebuild b/app-emulation/spice/spice-0.12.8.ebuild
index 7cbe1ee5ca42..6da878426ea0 100644
--- a/app-emulation/spice/spice-0.12.8.ebuild
+++ b/app-emulation/spice/spice-0.12.8.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/spice/spice-0.13.1-r2.ebuild b/app-emulation/spice/spice-0.13.1-r2.ebuild
index 0a9437888f8b..e5fb5576a82b 100644
--- a/app-emulation/spice/spice-0.13.1-r2.ebuild
+++ b/app-emulation/spice/spice-0.13.1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/spice/spice-0.13.2.ebuild b/app-emulation/spice/spice-0.13.2.ebuild
index 9b2f97d98163..ce5bfb113224 100644
--- a/app-emulation/spice/spice-0.13.2.ebuild
+++ b/app-emulation/spice/spice-0.13.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/spice/spice-0.13.3.ebuild b/app-emulation/spice/spice-0.13.3.ebuild
index a027f4f52ced..7730d4bf2c04 100644
--- a/app-emulation/spice/spice-0.13.3.ebuild
+++ b/app-emulation/spice/spice-0.13.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/spice/spice-9999.ebuild b/app-emulation/spice/spice-9999.ebuild
index 03da5f143703..6d7fac8ab1aa 100644
--- a/app-emulation/spice/spice-9999.ebuild
+++ b/app-emulation/spice/spice-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/spim/spim-8.0-r1.ebuild b/app-emulation/spim/spim-8.0-r1.ebuild
index fb0b06b97595..afb39577ff43 100644
--- a/app-emulation/spim/spim-8.0-r1.ebuild
+++ b/app-emulation/spim/spim-8.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=3
diff --git a/app-emulation/uade/uade-2.13.ebuild b/app-emulation/uade/uade-2.13.ebuild
index 1648f6732fc6..c11c43b58d14 100644
--- a/app-emulation/uade/uade-2.13.ebuild
+++ b/app-emulation/uade/uade-2.13.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/app-emulation/uae/uae-0.8.29-r2.ebuild b/app-emulation/uae/uae-0.8.29-r2.ebuild
index bd951a854a86..98485c01745e 100644
--- a/app-emulation/uae/uae-0.8.29-r2.ebuild
+++ b/app-emulation/uae/uae-0.8.29-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/app-emulation/vagrant/vagrant-1.8.6.ebuild b/app-emulation/vagrant/vagrant-1.8.6.ebuild
index fda85cc16a30..c8f935476963 100644
--- a/app-emulation/vagrant/vagrant-1.8.6.ebuild
+++ b/app-emulation/vagrant/vagrant-1.8.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
USE_RUBY="ruby20 ruby21 ruby22"
diff --git a/app-emulation/vagrant/vagrant-1.8.7.ebuild b/app-emulation/vagrant/vagrant-1.8.7.ebuild
index 7a735d71eeb0..e13bb3e5e059 100644
--- a/app-emulation/vagrant/vagrant-1.8.7.ebuild
+++ b/app-emulation/vagrant/vagrant-1.8.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
USE_RUBY="ruby20 ruby21 ruby22 ruby23"
diff --git a/app-emulation/vagrant/vagrant-1.9.1-r1.ebuild b/app-emulation/vagrant/vagrant-1.9.1-r1.ebuild
index de188aa351a5..d8869c49cee3 100644
--- a/app-emulation/vagrant/vagrant-1.9.1-r1.ebuild
+++ b/app-emulation/vagrant/vagrant-1.9.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"
USE_RUBY="ruby21 ruby22 ruby23"
diff --git a/app-emulation/vice/vice-2.4.22.ebuild b/app-emulation/vice/vice-2.4.22.ebuild
index a5d8a2818f76..7509f41d98f1 100644
--- a/app-emulation/vice/vice-2.4.22.ebuild
+++ b/app-emulation/vice/vice-2.4.22.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 flag-o-matic games
diff --git a/app-emulation/vice/vice-2.4.27-r2.ebuild b/app-emulation/vice/vice-2.4.27-r2.ebuild
index 0791ebbb7578..f0abe1ebd210 100644
--- a/app-emulation/vice/vice-2.4.27-r2.ebuild
+++ b/app-emulation/vice/vice-2.4.27-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 autotools eutils toolchain-funcs flag-o-matic
diff --git a/app-emulation/vice/vice-2.4.27-r3.ebuild b/app-emulation/vice/vice-2.4.27-r3.ebuild
index 610845f7aaf1..7bca5caf5843 100644
--- a/app-emulation/vice/vice-2.4.27-r3.ebuild
+++ b/app-emulation/vice/vice-2.4.27-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
inherit autotools eutils toolchain-funcs flag-o-matic xdg-utils
diff --git a/app-emulation/vice/vice-2.4.27.ebuild b/app-emulation/vice/vice-2.4.27.ebuild
index f70e44987588..07d8f61531cc 100644
--- a/app-emulation/vice/vice-2.4.27.ebuild
+++ b/app-emulation/vice/vice-2.4.27.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 flag-o-matic games
diff --git a/app-emulation/vice/vice-2.4.31.ebuild b/app-emulation/vice/vice-2.4.31.ebuild
index 2782d0f66285..dec43a60b440 100644
--- a/app-emulation/vice/vice-2.4.31.ebuild
+++ b/app-emulation/vice/vice-2.4.31.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 toolchain-funcs flag-o-matic
diff --git a/app-emulation/virt-manager/virt-manager-1.3.2.ebuild b/app-emulation/virt-manager/virt-manager-1.3.2.ebuild
index f545462e8c5e..092ed5e7646f 100644
--- a/app-emulation/virt-manager/virt-manager-1.3.2.ebuild
+++ b/app-emulation/virt-manager/virt-manager-1.3.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/virt-manager/virt-manager-1.4.0-r2.ebuild b/app-emulation/virt-manager/virt-manager-1.4.0-r2.ebuild
index 233ae001f4d2..4fdfe7e83b28 100644
--- a/app-emulation/virt-manager/virt-manager-1.4.0-r2.ebuild
+++ b/app-emulation/virt-manager/virt-manager-1.4.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=5
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index 6576a70f062f..c918b567d993 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/virt-viewer/virt-viewer-3.1.ebuild b/app-emulation/virt-viewer/virt-viewer-3.1.ebuild
index 9921e93195af..e004782ebf54 100644
--- a/app-emulation/virt-viewer/virt-viewer-3.1.ebuild
+++ b/app-emulation/virt-viewer/virt-viewer-3.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils gnome2 fdo-mime
diff --git a/app-emulation/virt-viewer/virt-viewer-4.0.ebuild b/app-emulation/virt-viewer/virt-viewer-4.0.ebuild
index 518f6fe0baec..13739f01c47b 100644
--- a/app-emulation/virt-viewer/virt-viewer-4.0.ebuild
+++ b/app-emulation/virt-viewer/virt-viewer-4.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit gnome2
diff --git a/app-emulation/virt-viewer/virt-viewer-5.0.ebuild b/app-emulation/virt-viewer/virt-viewer-5.0.ebuild
index 89025fb7d6f3..39d1e9c7a916 100644
--- a/app-emulation/virt-viewer/virt-viewer-5.0.ebuild
+++ b/app-emulation/virt-viewer/virt-viewer-5.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit gnome2
diff --git a/app-emulation/virt-what/virt-what-1.12.ebuild b/app-emulation/virt-what/virt-what-1.12.ebuild
index 357daeb24cfc..f1407df6ddbe 100644
--- a/app-emulation/virt-what/virt-what-1.12.ebuild
+++ b/app-emulation/virt-what/virt-what-1.12.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/virtio-win/virtio-win-0.1.117.ebuild b/app-emulation/virtio-win/virtio-win-0.1.117.ebuild
index 24fd248d601d..240e35c8dfda 100644
--- a/app-emulation/virtio-win/virtio-win-0.1.117.ebuild
+++ b/app-emulation/virtio-win/virtio-win-0.1.117.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/virtio-win/virtio-win-0.1.118.ebuild b/app-emulation/virtio-win/virtio-win-0.1.118.ebuild
index a49ef4195b15..a2efd51ccb8a 100644
--- a/app-emulation/virtio-win/virtio-win-0.1.118.ebuild
+++ b/app-emulation/virtio-win/virtio-win-0.1.118.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/virtio-win/virtio-win-0.1.126.ebuild b/app-emulation/virtio-win/virtio-win-0.1.126.ebuild
index a49ef4195b15..a2efd51ccb8a 100644
--- a/app-emulation/virtio-win/virtio-win-0.1.126.ebuild
+++ b/app-emulation/virtio-win/virtio-win-0.1.126.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/virtio-win/virtio-win-0.1.96.ebuild b/app-emulation/virtio-win/virtio-win-0.1.96.ebuild
index 9748a01a4502..5744f3efd289 100644
--- a/app-emulation/virtio-win/virtio-win-0.1.96.ebuild
+++ b/app-emulation/virtio-win/virtio-win-0.1.96.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.0.16.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.0.16.ebuild
index 681471fe6929..faae31d217c8 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.0.16.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.0.16.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.0.32.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.0.32.ebuild
index c5d3f7b8e6aa..4fd01d14b29e 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.0.32.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.0.32.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.1.12.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.1.12.ebuild
index 681471fe6929..faae31d217c8 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.1.12.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.1.12.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/virtualbox-additions/virtualbox-additions-5.1.14.ebuild b/app-emulation/virtualbox-additions/virtualbox-additions-5.1.14.ebuild
index 2b6ae8123ecc..967492859a76 100644
--- a/app-emulation/virtualbox-additions/virtualbox-additions-5.1.14.ebuild
+++ b/app-emulation/virtualbox-additions/virtualbox-additions-5.1.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
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.0.16.105871-r1.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.0.16.105871-r1.ebuild
index d6687a0cb435..161b15b03020 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.0.16.105871-r1.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.0.16.105871-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.0.32.112930.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.0.32.112930.ebuild
index 87de63c81020..6d69cd21118d 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.0.32.112930.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.0.32.112930.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.12.112440.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.1.12.112440.ebuild
index 2d3201fa3a2c..062ce860234f 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.12.112440.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.1.12.112440.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.14.112924.ebuild b/app-emulation/virtualbox-bin/virtualbox-bin-5.1.14.112924.ebuild
index 2d3201fa3a2c..062ce860234f 100644
--- a/app-emulation/virtualbox-bin/virtualbox-bin-5.1.14.112924.ebuild
+++ b/app-emulation/virtualbox-bin/virtualbox-bin-5.1.14.112924.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.16.105871.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.16.105871.ebuild
index 1d4488147c31..b96a79f85230 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.16.105871.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.16.105871.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.32.112930.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.32.112930.ebuild
index 2b6e0af29ed2..3c6c739d35e3 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.32.112930.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.0.32.112930.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.12.112440.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.12.112440.ebuild
index 1d4488147c31..b96a79f85230 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.12.112440.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.12.112440.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.14.112924.ebuild b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.14.112924.ebuild
index 751064340a4c..4d09c1248e68 100644
--- a/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.14.112924.ebuild
+++ b/app-emulation/virtualbox-extpack-oracle/virtualbox-extpack-oracle-5.1.14.112924.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.16.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.16.ebuild
index 2bf21c9da0f0..99ecd277e971 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.16.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.16.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.32.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.32.ebuild
index 83aa272f4284..4e3cfb95688f 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.32.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.0.32.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.12.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.12.ebuild
index 934595be7c29..fa4037886998 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.12.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.12.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.14.ebuild b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.14.ebuild
index ca7c0f40066b..23205c421719 100644
--- a/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.14.ebuild
+++ b/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-5.1.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
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.0.16.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.0.16.ebuild
index 64cfe00d430a..8aab1453509d 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.0.16.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.0.16.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# XXX: the tarball here is just the kernel modules split out of the binary
# package that comes from virtualbox-bin
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.0.32.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.0.32.ebuild
index 3b9bf6ef21c7..fc282ccbb370 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.0.32.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.0.32.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# XXX: the tarball here is just the kernel modules split out of the binary
# package that comes from virtualbox-bin
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.12.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.12.ebuild
index 64cfe00d430a..8aab1453509d 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.12.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.12.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# XXX: the tarball here is just the kernel modules split out of the binary
# package that comes from virtualbox-bin
diff --git a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.14.ebuild b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.14.ebuild
index 2d827dbf28f4..6600e4fb53b0 100644
--- a/app-emulation/virtualbox-modules/virtualbox-modules-5.1.14.ebuild
+++ b/app-emulation/virtualbox-modules/virtualbox-modules-5.1.14.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# XXX: the tarball here is just the kernel modules split out of the binary
# package that comes from virtualbox-bin
diff --git a/app-emulation/virtualbox/virtualbox-5.0.16-r1.ebuild b/app-emulation/virtualbox/virtualbox-5.0.16-r1.ebuild
index 3d25bf925c82..50afbc8a856c 100644
--- a/app-emulation/virtualbox/virtualbox-5.0.16-r1.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.0.16-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/virtualbox/virtualbox-5.0.32.ebuild b/app-emulation/virtualbox/virtualbox-5.0.32.ebuild
index 3b08534e9741..d108743e764a 100644
--- a/app-emulation/virtualbox/virtualbox-5.0.32.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.0.32.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/virtualbox/virtualbox-5.1.12.ebuild b/app-emulation/virtualbox/virtualbox-5.1.12.ebuild
index 78f1339d3555..e9ab28e5c4c7 100644
--- a/app-emulation/virtualbox/virtualbox-5.1.12.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.1.12.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/virtualbox/virtualbox-5.1.14.ebuild b/app-emulation/virtualbox/virtualbox-5.1.14.ebuild
index 96ab03d27ff8..2e1726701081 100644
--- a/app-emulation/virtualbox/virtualbox-5.1.14.ebuild
+++ b/app-emulation/virtualbox/virtualbox-5.1.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
diff --git a/app-emulation/vmips-cross-bin/vmips-cross-bin-1.0.ebuild b/app-emulation/vmips-cross-bin/vmips-cross-bin-1.0.ebuild
index 569682d594bc..9abcce3b8645 100644
--- a/app-emulation/vmips-cross-bin/vmips-cross-bin-1.0.ebuild
+++ b/app-emulation/vmips-cross-bin/vmips-cross-bin-1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
SRC_URI="ppc? ( mirror://gentoo/${P}.ppc.tar.bz2 )"
DESCRIPTION="vmips cross-development tools"
diff --git a/app-emulation/vmips/vmips-1.3.1.ebuild b/app-emulation/vmips/vmips-1.3.1.ebuild
index 00b0e6bbfd22..62f4b86c8487 100644
--- a/app-emulation/vmips/vmips-1.3.1.ebuild
+++ b/app-emulation/vmips/vmips-1.3.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="A virtual machine simulator based on a MIPS R3000 processor"
HOMEPAGE="http://vmips.sourceforge.net/"
diff --git a/app-emulation/vmips/vmips-1.3.ebuild b/app-emulation/vmips/vmips-1.3.ebuild
index 14174e0321d5..66fdf3eff294 100644
--- a/app-emulation/vmips/vmips-1.3.ebuild
+++ b/app-emulation/vmips/vmips-1.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="A virtual machine simulator based on a MIPS R3000 processor"
HOMEPAGE="http://vmips.sourceforge.net/"
diff --git a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
index 7d798a43d94b..68aa1dae9529 100644
--- a/app-emulation/vmware-modules/vmware-modules-271.3-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-271.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="4"
diff --git a/app-emulation/vmware-modules/vmware-modules-279.6.ebuild b/app-emulation/vmware-modules/vmware-modules-279.6.ebuild
index f10f4ee229bb..9543d955b8b8 100644
--- a/app-emulation/vmware-modules/vmware-modules-279.6.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-279.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/vmware-modules/vmware-modules-304.2.ebuild b/app-emulation/vmware-modules/vmware-modules-304.2.ebuild
index cab32841e4fa..64f231386494 100644
--- a/app-emulation/vmware-modules/vmware-modules-304.2.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-304.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
index 86bea59c220d..461d897ea8c7 100644
--- a/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-304.3-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/vmware-modules/vmware-modules-308.1.0.ebuild b/app-emulation/vmware-modules/vmware-modules-308.1.0.ebuild
index 0412ecaa2839..8c5f3412c69b 100644
--- a/app-emulation/vmware-modules/vmware-modules-308.1.0.ebuild
+++ b/app-emulation/vmware-modules/vmware-modules-308.1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/vmware-player/vmware-player-12.1.0.3272444-r2.ebuild b/app-emulation/vmware-player/vmware-player-12.1.0.3272444-r2.ebuild
index 90577d8377cf..85ad0cf2794a 100644
--- a/app-emulation/vmware-player/vmware-player-12.1.0.3272444-r2.ebuild
+++ b/app-emulation/vmware-player/vmware-player-12.1.0.3272444-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/vmware-player/vmware-player-7.1.2.2780323-r1.ebuild b/app-emulation/vmware-player/vmware-player-7.1.2.2780323-r1.ebuild
index fcefd48b6ba0..225ca12f528e 100644
--- a/app-emulation/vmware-player/vmware-player-7.1.2.2780323-r1.ebuild
+++ b/app-emulation/vmware-player/vmware-player-7.1.2.2780323-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/vmware-tools/vmware-tools-9.2.3.1031769.ebuild b/app-emulation/vmware-tools/vmware-tools-9.2.3.1031769.ebuild
index 58b387ffae5a..51b46d81ef42 100644
--- a/app-emulation/vmware-tools/vmware-tools-9.2.3.1031769.ebuild
+++ b/app-emulation/vmware-tools/vmware-tools-9.2.3.1031769.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit versionator vmware-bundle
diff --git a/app-emulation/vmware-tools/vmware-tools-9.6.5.2700073.ebuild b/app-emulation/vmware-tools/vmware-tools-9.6.5.2700073.ebuild
index 6a3c9feefb11..317af3d175d7 100644
--- a/app-emulation/vmware-tools/vmware-tools-9.6.5.2700073.ebuild
+++ b/app-emulation/vmware-tools/vmware-tools-9.6.5.2700073.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit versionator vmware-bundle
diff --git a/app-emulation/vmware-tools/vmware-tools-9.9.3.2780323.ebuild b/app-emulation/vmware-tools/vmware-tools-9.9.3.2780323.ebuild
index 6e308866eefc..40bad920c8ef 100644
--- a/app-emulation/vmware-tools/vmware-tools-9.9.3.2780323.ebuild
+++ b/app-emulation/vmware-tools/vmware-tools-9.9.3.2780323.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit versionator vmware-bundle
diff --git a/app-emulation/vmware-tools/vmware-tools-9.9.4.3206955.ebuild b/app-emulation/vmware-tools/vmware-tools-9.9.4.3206955.ebuild
index 33b8eadb1683..b6749751331d 100644
--- a/app-emulation/vmware-tools/vmware-tools-9.9.4.3206955.ebuild
+++ b/app-emulation/vmware-tools/vmware-tools-9.9.4.3206955.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit versionator vmware-bundle
diff --git a/app-emulation/vmware-vix/vmware-vix-1.11.4.744019.ebuild b/app-emulation/vmware-vix/vmware-vix-1.11.4.744019.ebuild
index f7d635d21525..b6b82945092d 100644
--- a/app-emulation/vmware-vix/vmware-vix-1.11.4.744019.ebuild
+++ b/app-emulation/vmware-vix/vmware-vix-1.11.4.744019.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/app-emulation/vmware-workstation/vmware-workstation-10.0.6.2700073-r1.ebuild b/app-emulation/vmware-workstation/vmware-workstation-10.0.6.2700073-r1.ebuild
index 4be63899e0aa..905fd08b6481 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-10.0.6.2700073-r1.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-10.0.6.2700073-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/vmware-workstation/vmware-workstation-11.1.2.2780323-r4.ebuild b/app-emulation/vmware-workstation/vmware-workstation-11.1.2.2780323-r4.ebuild
index 530e270810dc..3bc1abaa1eb7 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-11.1.2.2780323-r4.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-11.1.2.2780323-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r3.ebuild b/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r3.ebuild
index 5ef6f109e6a2..bd2d9b4b5d14 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r3.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r4.ebuild b/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r4.ebuild
index 4f488fdc0745..6e19aa832ebc 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r4.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/vmware-workstation/vmware-workstation-12.1.0.3272444-r2.ebuild b/app-emulation/vmware-workstation/vmware-workstation-12.1.0.3272444-r2.ebuild
index d698aa8c0937..9d8b6b484a8c 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-12.1.0.3272444-r2.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-12.1.0.3272444-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/vmware-workstation/vmware-workstation-9.0.3.1410761.ebuild b/app-emulation/vmware-workstation/vmware-workstation-9.0.3.1410761.ebuild
index 3ce84b2115aa..f75690377903 100644
--- a/app-emulation/vmware-workstation/vmware-workstation-9.0.3.1410761.ebuild
+++ b/app-emulation/vmware-workstation/vmware-workstation-9.0.3.1410761.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/app-emulation/vov/vov-2.0.0.ebuild b/app-emulation/vov/vov-2.0.0.ebuild
index 1ebfb8700022..5433e11046ca 100644
--- a/app-emulation/vov/vov-2.0.0.ebuild
+++ b/app-emulation/vov/vov-2.0.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit flag-o-matic
diff --git a/app-emulation/vpcs/vpcs-0.6.ebuild b/app-emulation/vpcs/vpcs-0.6.ebuild
index 9385b1d70ad4..6187e32e943d 100644
--- a/app-emulation/vpcs/vpcs-0.6.ebuild
+++ b/app-emulation/vpcs/vpcs-0.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/app-emulation/wine/wine-1.8-r3.ebuild b/app-emulation/wine/wine-1.8-r3.ebuild
index 1b9087978266..adddb01d8281 100644
--- a/app-emulation/wine/wine-1.8-r3.ebuild
+++ b/app-emulation/wine/wine-1.8-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/app-emulation/wine/wine-1.8.1-r3.ebuild b/app-emulation/wine/wine-1.8.1-r3.ebuild
index ff3a70e85c75..ee88d61ac556 100644
--- a/app-emulation/wine/wine-1.8.1-r3.ebuild
+++ b/app-emulation/wine/wine-1.8.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/app-emulation/wine/wine-1.8.2-r2.ebuild b/app-emulation/wine/wine-1.8.2-r2.ebuild
index 285ec5fd89ed..c98ce9ec4eda 100644
--- a/app-emulation/wine/wine-1.8.2-r2.ebuild
+++ b/app-emulation/wine/wine-1.8.2-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/wine/wine-1.8.3-r1.ebuild b/app-emulation/wine/wine-1.8.3-r1.ebuild
index d386cdbbb252..2e8cc42575e7 100644
--- a/app-emulation/wine/wine-1.8.3-r1.ebuild
+++ b/app-emulation/wine/wine-1.8.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=6
diff --git a/app-emulation/wine/wine-1.8.3.ebuild b/app-emulation/wine/wine-1.8.3.ebuild
index c500592e2fd0..124019b7a915 100644
--- a/app-emulation/wine/wine-1.8.3.ebuild
+++ b/app-emulation/wine/wine-1.8.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/wine/wine-1.8.4.ebuild b/app-emulation/wine/wine-1.8.4.ebuild
index 55b9ee5d7351..6b20bb4b2039 100644
--- a/app-emulation/wine/wine-1.8.4.ebuild
+++ b/app-emulation/wine/wine-1.8.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/wine/wine-1.8.5.ebuild b/app-emulation/wine/wine-1.8.5.ebuild
index 55b9ee5d7351..6b20bb4b2039 100644
--- a/app-emulation/wine/wine-1.8.5.ebuild
+++ b/app-emulation/wine/wine-1.8.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/wine/wine-1.8.6.ebuild b/app-emulation/wine/wine-1.8.6.ebuild
index 55b9ee5d7351..6b20bb4b2039 100644
--- a/app-emulation/wine/wine-1.8.6.ebuild
+++ b/app-emulation/wine/wine-1.8.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/wine/wine-1.9.10-r3.ebuild b/app-emulation/wine/wine-1.9.10-r3.ebuild
index 652b09b2d2b3..334cfd5730a2 100644
--- a/app-emulation/wine/wine-1.9.10-r3.ebuild
+++ b/app-emulation/wine/wine-1.9.10-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/app-emulation/wine/wine-1.9.11-r3.ebuild b/app-emulation/wine/wine-1.9.11-r3.ebuild
index 652b09b2d2b3..334cfd5730a2 100644
--- a/app-emulation/wine/wine-1.9.11-r3.ebuild
+++ b/app-emulation/wine/wine-1.9.11-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/app-emulation/wine/wine-1.9.12-r2.ebuild b/app-emulation/wine/wine-1.9.12-r2.ebuild
index 62a02080748a..2ab196a6fd7c 100644
--- a/app-emulation/wine/wine-1.9.12-r2.ebuild
+++ b/app-emulation/wine/wine-1.9.12-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/wine/wine-1.9.13-r2.ebuild b/app-emulation/wine/wine-1.9.13-r2.ebuild
index 3231a8d110f3..ebe150c8d864 100644
--- a/app-emulation/wine/wine-1.9.13-r2.ebuild
+++ b/app-emulation/wine/wine-1.9.13-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/wine/wine-1.9.14-r2.ebuild b/app-emulation/wine/wine-1.9.14-r2.ebuild
index 3231a8d110f3..ebe150c8d864 100644
--- a/app-emulation/wine/wine-1.9.14-r2.ebuild
+++ b/app-emulation/wine/wine-1.9.14-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/wine/wine-1.9.15-r1.ebuild b/app-emulation/wine/wine-1.9.15-r1.ebuild
index 3231a8d110f3..ebe150c8d864 100644
--- a/app-emulation/wine/wine-1.9.15-r1.ebuild
+++ b/app-emulation/wine/wine-1.9.15-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/wine/wine-1.9.16.ebuild b/app-emulation/wine/wine-1.9.16.ebuild
index 3231a8d110f3..ebe150c8d864 100644
--- a/app-emulation/wine/wine-1.9.16.ebuild
+++ b/app-emulation/wine/wine-1.9.16.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/wine/wine-1.9.17.ebuild b/app-emulation/wine/wine-1.9.17.ebuild
index c5e260cc89dd..c8b84c8e1945 100644
--- a/app-emulation/wine/wine-1.9.17.ebuild
+++ b/app-emulation/wine/wine-1.9.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
diff --git a/app-emulation/wine/wine-1.9.18.ebuild b/app-emulation/wine/wine-1.9.18.ebuild
index dc22bda68d16..c557311c9b9a 100644
--- a/app-emulation/wine/wine-1.9.18.ebuild
+++ b/app-emulation/wine/wine-1.9.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
diff --git a/app-emulation/wine/wine-1.9.19-r1.ebuild b/app-emulation/wine/wine-1.9.19-r1.ebuild
index b6f6e7664a29..223d8d236788 100644
--- a/app-emulation/wine/wine-1.9.19-r1.ebuild
+++ b/app-emulation/wine/wine-1.9.19-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/wine/wine-1.9.20.ebuild b/app-emulation/wine/wine-1.9.20.ebuild
index b6f6e7664a29..223d8d236788 100644
--- a/app-emulation/wine/wine-1.9.20.ebuild
+++ b/app-emulation/wine/wine-1.9.20.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/wine/wine-1.9.21.ebuild b/app-emulation/wine/wine-1.9.21.ebuild
index b6f6e7664a29..223d8d236788 100644
--- a/app-emulation/wine/wine-1.9.21.ebuild
+++ b/app-emulation/wine/wine-1.9.21.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/wine/wine-1.9.22.ebuild b/app-emulation/wine/wine-1.9.22.ebuild
index b6f6e7664a29..223d8d236788 100644
--- a/app-emulation/wine/wine-1.9.22.ebuild
+++ b/app-emulation/wine/wine-1.9.22.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/wine/wine-1.9.23.ebuild b/app-emulation/wine/wine-1.9.23.ebuild
index b6f6e7664a29..223d8d236788 100644
--- a/app-emulation/wine/wine-1.9.23.ebuild
+++ b/app-emulation/wine/wine-1.9.23.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/wine/wine-1.9.4-r3.ebuild b/app-emulation/wine/wine-1.9.4-r3.ebuild
index 3f0e22a4ea22..ae588db33d14 100644
--- a/app-emulation/wine/wine-1.9.4-r3.ebuild
+++ b/app-emulation/wine/wine-1.9.4-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/app-emulation/wine/wine-1.9.5-r3.ebuild b/app-emulation/wine/wine-1.9.5-r3.ebuild
index 6a0b0f81f2f8..fbbcf25a79c3 100644
--- a/app-emulation/wine/wine-1.9.5-r3.ebuild
+++ b/app-emulation/wine/wine-1.9.5-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/wine/wine-1.9.6-r3.ebuild b/app-emulation/wine/wine-1.9.6-r3.ebuild
index ace562e93c72..f7eabfb28add 100644
--- a/app-emulation/wine/wine-1.9.6-r3.ebuild
+++ b/app-emulation/wine/wine-1.9.6-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/app-emulation/wine/wine-1.9.7-r3.ebuild b/app-emulation/wine/wine-1.9.7-r3.ebuild
index ace562e93c72..f7eabfb28add 100644
--- a/app-emulation/wine/wine-1.9.7-r3.ebuild
+++ b/app-emulation/wine/wine-1.9.7-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/app-emulation/wine/wine-1.9.8-r2.ebuild b/app-emulation/wine/wine-1.9.8-r2.ebuild
index ff520e5f7473..cf70abfc84cc 100644
--- a/app-emulation/wine/wine-1.9.8-r2.ebuild
+++ b/app-emulation/wine/wine-1.9.8-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/wine/wine-1.9.9-r3.ebuild b/app-emulation/wine/wine-1.9.9-r3.ebuild
index ba5d53af5390..4708e4a5553d 100644
--- a/app-emulation/wine/wine-1.9.9-r3.ebuild
+++ b/app-emulation/wine/wine-1.9.9-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/app-emulation/wine/wine-2.0.ebuild b/app-emulation/wine/wine-2.0.ebuild
index ef94c9b0db35..a5e69c16bff3 100644
--- a/app-emulation/wine/wine-2.0.ebuild
+++ b/app-emulation/wine/wine-2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/wine/wine-9999.ebuild b/app-emulation/wine/wine-9999.ebuild
index 19c2d3920b79..dde1b9ec0f95 100644
--- a/app-emulation/wine/wine-9999.ebuild
+++ b/app-emulation/wine/wine-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/winetricks/winetricks-20160724.ebuild b/app-emulation/winetricks/winetricks-20160724.ebuild
index b8aef92710f5..d9b66d38d0ac 100644
--- a/app-emulation/winetricks/winetricks-20160724.ebuild
+++ b/app-emulation/winetricks/winetricks-20160724.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/winetricks/winetricks-99999999.ebuild b/app-emulation/winetricks/winetricks-99999999.ebuild
index 45214564b7f7..08a714102ab4 100644
--- a/app-emulation/winetricks/winetricks-99999999.ebuild
+++ b/app-emulation/winetricks/winetricks-99999999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/x48/x48-0.6.4.ebuild b/app-emulation/x48/x48-0.6.4.ebuild
index 17dad066fc03..cc84f6518da5 100644
--- a/app-emulation/x48/x48-0.6.4.ebuild
+++ b/app-emulation/x48/x48-0.6.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/app-emulation/xcpc/xcpc-20070122.ebuild b/app-emulation/xcpc/xcpc-20070122.ebuild
index 07f33bf43c1e..bfe344f89853 100644
--- a/app-emulation/xcpc/xcpc-20070122.ebuild
+++ b/app-emulation/xcpc/xcpc-20070122.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/app-emulation/xe-guest-utilities/xe-guest-utilities-5.6.0_p595.ebuild b/app-emulation/xe-guest-utilities/xe-guest-utilities-5.6.0_p595.ebuild
index cf272c4da64f..b6ff8ddbe87f 100644
--- a/app-emulation/xe-guest-utilities/xe-guest-utilities-5.6.0_p595.ebuild
+++ b/app-emulation/xe-guest-utilities/xe-guest-utilities-5.6.0_p595.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 rpm linux-info
diff --git a/app-emulation/xe-guest-utilities/xe-guest-utilities-6.1.0_p1033.ebuild b/app-emulation/xe-guest-utilities/xe-guest-utilities-6.1.0_p1033.ebuild
index 21d0af88ef6e..b1b54c8ccde8 100644
--- a/app-emulation/xe-guest-utilities/xe-guest-utilities-6.1.0_p1033.ebuild
+++ b/app-emulation/xe-guest-utilities/xe-guest-utilities-6.1.0_p1033.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 rpm linux-info
diff --git a/app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120.ebuild b/app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120.ebuild
index 21d0af88ef6e..b1b54c8ccde8 100644
--- a/app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120.ebuild
+++ b/app-emulation/xe-guest-utilities/xe-guest-utilities-6.2.0_p1120.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 rpm linux-info
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.7.1-r1.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.7.1-r1.ebuild
index ae3c84ce6284..4ff9220be619 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.7.1-r1.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.7.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.8.0.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.8.0.ebuild
index 0dea6a855950..54969e66386a 100644
--- a/app-emulation/xen-pvgrub/xen-pvgrub-4.8.0.ebuild
+++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.8.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/xen-tools/xen-tools-4.7.1-r8.ebuild b/app-emulation/xen-tools/xen-tools-4.7.1-r8.ebuild
index 740deea4440e..d678580af409 100644
--- a/app-emulation/xen-tools/xen-tools-4.7.1-r8.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.7.1-r8.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/xen-tools/xen-tools-4.8.0-r4.ebuild b/app-emulation/xen-tools/xen-tools-4.8.0-r4.ebuild
index dd876e7ff263..f13dc589fede 100644
--- a/app-emulation/xen-tools/xen-tools-4.8.0-r4.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.8.0-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/xen/xen-4.7.1-r5.ebuild b/app-emulation/xen/xen-4.7.1-r5.ebuild
index d3ca6e92b16b..576564c76383 100644
--- a/app-emulation/xen/xen-4.7.1-r5.ebuild
+++ b/app-emulation/xen/xen-4.7.1-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
diff --git a/app-emulation/xen/xen-4.8.0-r2.ebuild b/app-emulation/xen/xen-4.8.0-r2.ebuild
index 2519bf5d85cf..c5c4c6c0d5df 100644
--- a/app-emulation/xen/xen-4.8.0-r2.ebuild
+++ b/app-emulation/xen/xen-4.8.0-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/xen/xen-4.8.0-r3.ebuild b/app-emulation/xen/xen-4.8.0-r3.ebuild
index 7351620bb3d5..7aee9d624b4b 100644
--- a/app-emulation/xen/xen-4.8.0-r3.ebuild
+++ b/app-emulation/xen/xen-4.8.0-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/xtrs/xtrs-4.9d-r3.ebuild b/app-emulation/xtrs/xtrs-4.9d-r3.ebuild
index 8bd202655934..1e5da8a8aa73 100644
--- a/app-emulation/xtrs/xtrs-4.9d-r3.ebuild
+++ b/app-emulation/xtrs/xtrs-4.9d-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/app-emulation/xtrs/xtrs-4.9d-r4.ebuild b/app-emulation/xtrs/xtrs-4.9d-r4.ebuild
index c026fe643e82..c4ec04ab51a0 100644
--- a/app-emulation/xtrs/xtrs-4.9d-r4.ebuild
+++ b/app-emulation/xtrs/xtrs-4.9d-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6