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 /x11-misc
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 'x11-misc')
-rw-r--r--x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild1
-rw-r--r--x11-misc/3dfb/3dfb-0.6.1-r1.ebuild1
-rw-r--r--x11-misc/3dfm/3dfm-1.0-r1.ebuild1
-rw-r--r--x11-misc/3dfm/3dfm-1.0.ebuild1
-rw-r--r--x11-misc/Xorgautoconfig/Xorgautoconfig-0.2.4-r1.ebuild1
-rw-r--r--x11-misc/accessx/accessx-0951-r1.ebuild1
-rw-r--r--x11-misc/accessx/accessx-0951-r2.ebuild1
-rw-r--r--x11-misc/afbinit/afbinit-1.0.1-r7.ebuild1
-rw-r--r--x11-misc/alacarte/alacarte-3.10.0.ebuild1
-rw-r--r--x11-misc/alacarte/alacarte-3.11.91.ebuild1
-rw-r--r--x11-misc/albert/albert-0.8.11.ebuild1
-rw-r--r--x11-misc/albert/albert-0.9.3.ebuild1
-rw-r--r--x11-misc/alock/alock-1.0.0.ebuild1
-rw-r--r--x11-misc/andromeda/andromeda-0.3.ebuild1
-rw-r--r--x11-misc/appmenu-qt/appmenu-qt-0.2.6.ebuild1
-rw-r--r--x11-misc/apwal/apwal-0.4.5-r1.ebuild1
-rw-r--r--x11-misc/apwal/apwal-0.4.5-r2.ebuild1
-rw-r--r--x11-misc/arandr/arandr-0.1.7.1.ebuild1
-rw-r--r--x11-misc/arandr/arandr-0.1.8.ebuild1
-rw-r--r--x11-misc/arandr/arandr-0.1.9.ebuild1
-rw-r--r--x11-misc/autocutsel/autocutsel-0.10.0.ebuild1
-rw-r--r--x11-misc/autocutsel/autocutsel-0.9.0.ebuild1
-rw-r--r--x11-misc/basqet/basqet-0.2.0.ebuild1
-rw-r--r--x11-misc/bbacpi/bbacpi-0.1.5-r1.ebuild1
-rw-r--r--x11-misc/bbacpi/bbacpi-0.1.5-r3.ebuild1
-rw-r--r--x11-misc/bbappconf/bbappconf-0.0.2.ebuild1
-rw-r--r--x11-misc/bbcd/bbcd-0.3.1-r1.ebuild1
-rw-r--r--x11-misc/bbcd/bbcd-0.3.1-r2.ebuild1
-rw-r--r--x11-misc/bbdate/bbdate-0.2.4-r1.ebuild1
-rw-r--r--x11-misc/bbdate/bbdate-0.2.4-r2.ebuild1
-rw-r--r--x11-misc/bbkeys/bbkeys-0.9.0-r1.ebuild1
-rw-r--r--x11-misc/bbkeys/bbkeys-0.9.1-r1.ebuild1
-rw-r--r--x11-misc/bblaunch/bblaunch-0.0.3.ebuild1
-rw-r--r--x11-misc/bbmail/bbmail-0.9.3-r1.ebuild1
-rw-r--r--x11-misc/bbmail/bbmail-0.9.3.ebuild1
-rw-r--r--x11-misc/bbpager/bbpager-0.4.7-r1.ebuild1
-rw-r--r--x11-misc/bbpager/bbpager-0.4.7.ebuild1
-rw-r--r--x11-misc/bbppp/bbppp-0.2.5-r1.ebuild1
-rw-r--r--x11-misc/bbppp/bbppp-0.2.5.ebuild1
-rw-r--r--x11-misc/bbrun/bbrun-1.6-r1.ebuild1
-rw-r--r--x11-misc/bbtime/bbtime-0.1.5-r1.ebuild1
-rw-r--r--x11-misc/bbtime/bbtime-0.1.5.ebuild1
-rw-r--r--x11-misc/bbweather/bbweather-0.6.3-r1.ebuild1
-rw-r--r--x11-misc/blockdpy/blockdpy-1-r1.ebuild1
-rw-r--r--x11-misc/bumblebee/bumblebee-3.2.1.ebuild1
-rw-r--r--x11-misc/bumblebee/bumblebee-3.2.1_p20170123.ebuild1
-rw-r--r--x11-misc/bumblebee/bumblebee-9999.ebuild1
-rw-r--r--x11-misc/cairo-clock/cairo-clock-0.3.3.ebuild1
-rw-r--r--x11-misc/cairo-clock/cairo-clock-0.3.4.ebuild1
-rw-r--r--x11-misc/calise/calise-0.4.2.ebuild1
-rw-r--r--x11-misc/cbatticon/cbatticon-1.3.2.ebuild1
-rw-r--r--x11-misc/cbatticon/cbatticon-1.6.4.ebuild1
-rw-r--r--x11-misc/cbatticon/cbatticon-1.6.5.ebuild1
-rw-r--r--x11-misc/ccsm/ccsm-0.8.4-r4.ebuild1
-rw-r--r--x11-misc/ccsm/ccsm-0.8.4-r5.ebuild1
-rw-r--r--x11-misc/cdm/cdm-0.5.3.ebuild1
-rw-r--r--x11-misc/cdm/cdm-0.6.1_pre20130419.ebuild1
-rw-r--r--x11-misc/chgres/chgres-0.1-r1.ebuild1
-rw-r--r--x11-misc/chgres/chgres-0.1-r2.ebuild1
-rw-r--r--x11-misc/colord/colord-1.2.12.ebuild1
-rw-r--r--x11-misc/colord/colord-1.3.3.ebuild1
-rw-r--r--x11-misc/colord/colord-1.3.4.ebuild1
-rw-r--r--x11-misc/compton/compton-0.1_beta2.ebuild1
-rw-r--r--x11-misc/compton/compton-9999.ebuild1
-rw-r--r--x11-misc/dclock/dclock-2.2.2_p4.ebuild1
-rw-r--r--x11-misc/dclock/dclock-2.2.2_p9.ebuild1
-rw-r--r--x11-misc/devilspie/devilspie-0.22.ebuild1
-rw-r--r--x11-misc/devilspie/devilspie-0.23.ebuild1
-rw-r--r--x11-misc/devilspie2/devilspie2-0.36.ebuild1
-rw-r--r--x11-misc/devilspie2/devilspie2-0.41.ebuild1
-rw-r--r--x11-misc/devilspie2/devilspie2-0.42.ebuild1
-rw-r--r--x11-misc/dex/dex-0.6.ebuild1
-rw-r--r--x11-misc/dex/dex-0.7.ebuild1
-rw-r--r--x11-misc/dmenu/dmenu-4.6.ebuild1
-rw-r--r--x11-misc/dmenu/dmenu-9999.ebuild1
-rw-r--r--x11-misc/dockmanager/dockmanager-0.1.0-r1.ebuild1
-rw-r--r--x11-misc/driconf/driconf-0.9.1-r2.ebuild1
-rw-r--r--x11-misc/dsx/dsx-0.1-r1.ebuild1
-rw-r--r--x11-misc/dunst/dunst-1.1.0.ebuild1
-rw-r--r--x11-misc/dxpc/dxpc-3.9.2-r1.ebuild1
-rw-r--r--x11-misc/dxpc/dxpc-3.9.2-r2.ebuild1
-rw-r--r--x11-misc/dzen/dzen-0.9.5-r1.ebuild1
-rw-r--r--x11-misc/e16keyedit/e16keyedit-0.7.ebuild1
-rw-r--r--x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild1
-rw-r--r--x11-misc/easystroke/easystroke-0.6.0-r1.ebuild1
-rw-r--r--x11-misc/easystroke/easystroke-0.6.0-r2.ebuild1
-rw-r--r--x11-misc/easystroke/easystroke-0.6.0.ebuild1
-rw-r--r--x11-misc/efax-gtk/efax-gtk-3.2.13.ebuild1
-rw-r--r--x11-misc/efax-gtk/efax-gtk-3.2.9.ebuild1
-rw-r--r--x11-misc/etm/etm-696-r1.ebuild1
-rw-r--r--x11-misc/evolvotron/evolvotron-0.6.3-r1.ebuild1
-rw-r--r--x11-misc/evolvotron/evolvotron-0.6.3.ebuild1
-rw-r--r--x11-misc/fbdesk/fbdesk-1.4.1.ebuild1
-rw-r--r--x11-misc/fbpager/fbpager-20090221-r1.ebuild1
-rw-r--r--x11-misc/fbpager/fbpager-20090221.ebuild1
-rw-r--r--x11-misc/fbpanel/fbpanel-6.1-r2.ebuild1
-rw-r--r--x11-misc/fbpanel/fbpanel-7.0.ebuild1
-rw-r--r--x11-misc/fireflies/fireflies-2.07-r1.ebuild1
-rw-r--r--x11-misc/fireflies/fireflies-2.07-r2.ebuild1
-rw-r--r--x11-misc/fireflies/fireflies-2.08-r1.ebuild1
-rw-r--r--x11-misc/fireflies/fireflies-2.08.ebuild1
-rw-r--r--x11-misc/flow-pomodoro/flow-pomodoro-1.1.2.ebuild1
-rw-r--r--x11-misc/flow-pomodoro/flow-pomodoro-1.2.0.ebuild1
-rw-r--r--x11-misc/fluxter/fluxter-0.1.0.ebuild1
-rw-r--r--x11-misc/fpm2/fpm2-0.79-r1.ebuild1
-rw-r--r--x11-misc/fpm2/fpm2-0.79.ebuild1
-rw-r--r--x11-misc/fracplanet/fracplanet-0.4.0-r1.ebuild1
-rw-r--r--x11-misc/fraqtive/fraqtive-0.4.7.ebuild1
-rw-r--r--x11-misc/fraqtive/fraqtive-0.4.8.ebuild1
-rw-r--r--x11-misc/ftmenu/ftmenu-0.4.0-r1.ebuild1
-rw-r--r--x11-misc/gbase/gbase-0.5-r1.ebuild1
-rw-r--r--x11-misc/gbase/gbase-0.5.ebuild1
-rw-r--r--x11-misc/gbdfed/gbdfed-1.6.ebuild1
-rw-r--r--x11-misc/gccmakedep/gccmakedep-1.0.3.ebuild1
-rw-r--r--x11-misc/gcolor2/gcolor2-0.4-r4.ebuild1
-rw-r--r--x11-misc/genmenu/genmenu-1.1.0-r1.ebuild1
-rw-r--r--x11-misc/gigolo/gigolo-0.4.2.ebuild1
-rw-r--r--x11-misc/gmrun/gmrun-0.9.2-r1.ebuild1
-rw-r--r--x11-misc/googsystray/googsystray-1.3.1-r1.ebuild1
-rw-r--r--x11-misc/gpaste/gpaste-3.18.3.ebuild1
-rw-r--r--x11-misc/gpaste/gpaste-3.20.3.ebuild1
-rw-r--r--x11-misc/grabc/grabc-1.1-r1.ebuild1
-rw-r--r--x11-misc/grabc/grabc-1.1-r2.ebuild1
-rw-r--r--x11-misc/gromit/gromit-20041213-r1.ebuild1
-rw-r--r--x11-misc/grsync/grsync-1.2.4.ebuild1
-rw-r--r--x11-misc/grsync/grsync-1.2.5.ebuild1
-rw-r--r--x11-misc/grsync/grsync-1.2.6.ebuild1
-rw-r--r--x11-misc/grub2-theme-preview/grub2-theme-preview-1.1.ebuild1
-rw-r--r--x11-misc/grub2-theme-preview/grub2-theme-preview-1.2.1.ebuild1
-rw-r--r--x11-misc/grub2-theme-preview/grub2-theme-preview-1.2.ebuild1
-rw-r--r--x11-misc/grub2-theme-preview/grub2-theme-preview-1.3.0.ebuild1
-rw-r--r--x11-misc/grub2-theme-preview/grub2-theme-preview-1.3.1.ebuild1
-rw-r--r--x11-misc/grun/grun-0.9.3-r1.ebuild1
-rw-r--r--x11-misc/gtk2fontsel/gtk2fontsel-0.1-r1.ebuild1
-rw-r--r--x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild1
-rw-r--r--x11-misc/gxmessage/gxmessage-2.20.1.ebuild1
-rw-r--r--x11-misc/gxmessage/gxmessage-2.20.3.ebuild1
-rw-r--r--x11-misc/gxmessage/gxmessage-3.4.2.ebuild1
-rw-r--r--x11-misc/gxmessage/gxmessage-3.4.3.ebuild1
-rw-r--r--x11-misc/habak/habak-0.2.5-r1.ebuild1
-rw-r--r--x11-misc/habak/habak-0.2.5-r2.ebuild1
-rw-r--r--x11-misc/hsetroot/hsetroot-1.0.2.ebuild1
-rw-r--r--x11-misc/i3blocks/i3blocks-1.4-r1.ebuild1
-rw-r--r--x11-misc/i3lock/i3lock-2.6.ebuild1
-rw-r--r--x11-misc/i3lock/i3lock-2.7.ebuild1
-rw-r--r--x11-misc/i3lock/i3lock-2.8.ebuild1
-rw-r--r--x11-misc/i3status/i3status-2.10-r1.ebuild1
-rw-r--r--x11-misc/i3status/i3status-2.11.ebuild1
-rw-r--r--x11-misc/i3status/i3status-2.7.ebuild1
-rw-r--r--x11-misc/i855crt/i855crt-0.4-r1.ebuild1
-rw-r--r--x11-misc/icewmcp/icewmcp-3.2-r4.ebuild1
-rw-r--r--x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild1
-rw-r--r--x11-misc/icon-naming-utils/icon-naming-utils-0.8.90.ebuild1
-rw-r--r--x11-misc/iconbox/iconbox-0.2.ebuild1
-rw-r--r--x11-misc/idesk-extras/idesk-extras-1.37-r1.ebuild1
-rw-r--r--x11-misc/idesk/idesk-0.7.5-r2.ebuild1
-rw-r--r--x11-misc/imake/imake-1.0.7.ebuild1
-rw-r--r--x11-misc/imwheel/imwheel-1.0.0_pre12.ebuild1
-rw-r--r--x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild1
-rw-r--r--x11-misc/ipager/ipager-1.1.0.ebuild1
-rw-r--r--x11-misc/kapow/kapow-1.5.1.ebuild1
-rw-r--r--x11-misc/kapow/kapow-1.5.2.ebuild1
-rw-r--r--x11-misc/kaqaz/kaqaz-1.2.0-r2.ebuild1
-rw-r--r--x11-misc/kbdd/kbdd-0.7.1.ebuild1
-rw-r--r--x11-misc/kdocker/kdocker-4.8-r2.ebuild1
-rw-r--r--x11-misc/kronometer/kronometer-2.1.2.ebuild1
-rw-r--r--x11-misc/kronometer/kronometer-2.1.3.ebuild1
-rw-r--r--x11-misc/kronometer/kronometer-2.1.4.ebuild1
-rw-r--r--x11-misc/ktsuss/ktsuss-2.1.ebuild1
-rw-r--r--x11-misc/launchy/launchy-2.5.ebuild1
-rw-r--r--x11-misc/libinput-gestures/libinput-gestures-2.15.ebuild1
-rw-r--r--x11-misc/libinput-gestures/libinput-gestures-9999.ebuild1
-rw-r--r--x11-misc/light-locker/light-locker-1.7.0-r1.ebuild1
-rw-r--r--x11-misc/light-locker/light-locker-1.7.0.ebuild1
-rw-r--r--x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-r1.ebuild1
-rw-r--r--x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.2.ebuild1
-rw-r--r--x11-misc/lightdm-kde/lightdm-kde-0.3.2.1-r1.ebuild1
-rw-r--r--x11-misc/lightdm/lightdm-1.18.3.ebuild1
-rw-r--r--x11-misc/lightdm/lightdm-1.21.4.ebuild1
-rw-r--r--x11-misc/lightdm/lightdm-1.21.5.ebuild1
-rw-r--r--x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r1.ebuild1
-rw-r--r--x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r1.ebuild1
-rw-r--r--x11-misc/lineakd/lineakd-0.9.0-r1.ebuild1
-rw-r--r--x11-misc/lndir/lndir-1.0.3-r1.ebuild1
-rw-r--r--x11-misc/lndir/lndir-1.0.3.ebuild1
-rw-r--r--x11-misc/lsw/lsw-0.3.ebuild1
-rw-r--r--x11-misc/macopix/macopix-1.7.4-r1.ebuild1
-rw-r--r--x11-misc/macopix/macopix-1.7.4.ebuild1
-rw-r--r--x11-misc/magick-rotation/magick-rotation-1.6.2-r2.ebuild1
-rw-r--r--x11-misc/makedepend/makedepend-1.0.5.ebuild1
-rw-r--r--x11-misc/matchbox-keyboard/matchbox-keyboard-0.1-r1.ebuild1
-rw-r--r--x11-misc/matchbox-keyboard/matchbox-keyboard-0.1.ebuild1
-rw-r--r--x11-misc/mate-notification-daemon/mate-notification-daemon-1.12.1.ebuild1
-rw-r--r--x11-misc/mate-notification-daemon/mate-notification-daemon-1.14.1.ebuild1
-rw-r--r--x11-misc/mate-notification-daemon/mate-notification-daemon-1.16.1.ebuild1
-rw-r--r--x11-misc/menulibre/menulibre-13.01.4-r1.ebuild1
-rw-r--r--x11-misc/menulibre/menulibre-13.01.4.ebuild1
-rw-r--r--x11-misc/menulibre/menulibre-13.04.17.ebuild1
-rw-r--r--x11-misc/menulibre/menulibre-2.0.7.ebuild1
-rw-r--r--x11-misc/menulibre/menulibre-2.1.3.ebuild1
-rw-r--r--x11-misc/menumaker/menumaker-0.99.10.ebuild1
-rw-r--r--x11-misc/menumaker/menumaker-0.99.9.ebuild1
-rw-r--r--x11-misc/mgm/mgm-1.2-r1.ebuild1
-rw-r--r--x11-misc/mgm/mgm-1.2.ebuild1
-rw-r--r--x11-misc/mixer_app/mixer_app-1.8.0.ebuild1
-rw-r--r--x11-misc/mozo/mozo-1.12.0-r1.ebuild1
-rw-r--r--x11-misc/mozo/mozo-1.14.1.ebuild1
-rw-r--r--x11-misc/mozo/mozo-1.16.0-r1.ebuild1
-rw-r--r--x11-misc/netwmpager/netwmpager-2.05.ebuild1
-rw-r--r--x11-misc/nitrogen/nitrogen-1.5.2.ebuild1
-rw-r--r--x11-misc/nitrogen/nitrogen-1.6.0.ebuild1
-rw-r--r--x11-misc/nitrogen/nitrogen-1.6.1.ebuild1
-rw-r--r--x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild1
-rw-r--r--x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild1
-rw-r--r--x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild1
-rw-r--r--x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild1
-rw-r--r--x11-misc/notify-osd/notify-osd-0.9.34.ebuild1
-rw-r--r--x11-misc/nts/nts-82-r1.ebuild1
-rw-r--r--x11-misc/numlockx/numlockx-1.2.ebuild1
-rw-r--r--x11-misc/obconf-qt/obconf-qt-0.9.0_p20150729.ebuild1
-rw-r--r--x11-misc/obconf/obconf-2.0.4.ebuild1
-rw-r--r--x11-misc/obconf/obconf-9999.ebuild1
-rw-r--r--x11-misc/obmenu-generator/obmenu-generator-0.61.ebuild1
-rw-r--r--x11-misc/obmenu-generator/obmenu-generator-0.66.ebuild1
-rw-r--r--x11-misc/obmenu/obmenu-1.0-r1.ebuild1
-rw-r--r--x11-misc/obtheme/obtheme-2013.2.20.2.ebuild1
-rw-r--r--x11-misc/okindd/okindd-0.6.1.ebuild1
-rw-r--r--x11-misc/openbox-menu/openbox-menu-0.5.1.ebuild1
-rw-r--r--x11-misc/openbox-menu/openbox-menu-0.7.0.ebuild1
-rw-r--r--x11-misc/openbox-menu/openbox-menu-0.8.0.ebuild1
-rw-r--r--x11-misc/oroborus-desklaunch/oroborus-desklaunch-1.1.8.ebuild1
-rw-r--r--x11-misc/oroborus-deskmenu/oroborus-deskmenu-1.4.5.ebuild1
-rw-r--r--x11-misc/oroborus-keylaunch/oroborus-keylaunch-1.3.9.ebuild1
-rw-r--r--x11-misc/outwiker/outwiker-1.8.0.ebuild1
-rw-r--r--x11-misc/outwiker/outwiker-1.9.0.790.ebuild1
-rw-r--r--x11-misc/outwiker/outwiker-2.0.0.794.ebuild1
-rw-r--r--x11-misc/parcellite/parcellite-1.1.9.ebuild1
-rw-r--r--x11-misc/parcellite/parcellite-1.2.1.ebuild1
-rw-r--r--x11-misc/pathfinder/pathfinder-1.7.49.ebuild1
-rw-r--r--x11-misc/pcmanfm-qt/pcmanfm-qt-0.10.0.ebuild1
-rw-r--r--x11-misc/pcmanfm-qt/pcmanfm-qt-0.11.1.ebuild1
-rw-r--r--x11-misc/pcmanfm/pcmanfm-1.2.3.ebuild1
-rw-r--r--x11-misc/pcmanfm/pcmanfm-1.2.4.ebuild1
-rw-r--r--x11-misc/pcmanfm/pcmanfm-1.2.5.ebuild1
-rw-r--r--x11-misc/pcmanfm/pcmanfm-9999.ebuild1
-rw-r--r--x11-misc/peksystray/peksystray-0.2.1.ebuild1
-rw-r--r--x11-misc/peksystray/peksystray-0.4.0.ebuild1
-rw-r--r--x11-misc/piedock/piedock-1.6.6-r1.ebuild1
-rw-r--r--x11-misc/ptbatterysystemtray/ptbatterysystemtray-1.0.0_rc2.ebuild1
-rw-r--r--x11-misc/py3status/py3status-3.4.ebuild1
-rw-r--r--x11-misc/pypanel/pypanel-2.4-r2.ebuild1
-rw-r--r--x11-misc/qarma/qarma-1.ebuild1
-rw-r--r--x11-misc/qcomicbook/qcomicbook-0.9.0-r1.ebuild1
-rw-r--r--x11-misc/qcomicbook/qcomicbook-0.9.1.ebuild1
-rw-r--r--x11-misc/qlipper/qlipper-5.0.0.ebuild1
-rw-r--r--x11-misc/qps/qps-1.10.16.ebuild1
-rw-r--r--x11-misc/qsynergy/qsynergy-0.9.1-r1.ebuild1
-rw-r--r--x11-misc/qt5ct/qt5ct-0.30.ebuild1
-rw-r--r--x11-misc/qterm/qterm-0.5.12-r1.ebuild1
-rw-r--r--x11-misc/qterm/qterm-0.7.1.ebuild1
-rw-r--r--x11-misc/qtfm/qtfm-5.5.ebuild1
-rw-r--r--x11-misc/qtnotifydaemon/qtnotifydaemon-1.0.14.ebuild1
-rw-r--r--x11-misc/quitcount/quitcount-3.1.3.ebuild1
-rw-r--r--x11-misc/qxkb/qxkb-0.4.6.ebuild1
-rw-r--r--x11-misc/read-edid/read-edid-1.4.2.ebuild1
-rw-r--r--x11-misc/read-edid/read-edid-3.0.1.ebuild1
-rw-r--r--x11-misc/read-edid/read-edid-3.0.2.ebuild1
-rw-r--r--x11-misc/rednotebook/rednotebook-1.14.ebuild1
-rw-r--r--x11-misc/rednotebook/rednotebook-1.8.0.ebuild1
-rw-r--r--x11-misc/redshift/redshift-1.11-r1.ebuild1
-rw-r--r--x11-misc/rendercheck/rendercheck-1.5.ebuild1
-rw-r--r--x11-misc/revelation/revelation-0.4.14-r1.ebuild1
-rw-r--r--x11-misc/rodent/rodent-4.9.2.ebuild1
-rw-r--r--x11-misc/rodent/rodent-5.3.16.3.ebuild1
-rw-r--r--x11-misc/rofi/rofi-1.2.0.ebuild1
-rw-r--r--x11-misc/rofi/rofi-1.3.0.ebuild1
-rw-r--r--x11-misc/rofi/rofi-1.3.1.ebuild1
-rw-r--r--x11-misc/rss-glx/rss-glx-0.9.1.ebuild1
-rw-r--r--x11-misc/screen-message/screen-message-0.23.ebuild1
-rw-r--r--x11-misc/screen-message/screen-message-0.24.ebuild1
-rw-r--r--x11-misc/screengrab/screengrab-1.2.1-r1.ebuild1
-rw-r--r--x11-misc/sct/sct-0.3.ebuild1
-rw-r--r--x11-misc/sddm/sddm-0.13.0-r3.ebuild1
-rw-r--r--x11-misc/sddm/sddm-0.14.0-r2.ebuild1
-rw-r--r--x11-misc/seetxt/seetxt-0.72-r1.ebuild1
-rw-r--r--x11-misc/sent/sent-0.2.ebuild1
-rw-r--r--x11-misc/sent/sent-9999.ebuild1
-rw-r--r--x11-misc/set_opacity/set_opacity-1.0.ebuild1
-rw-r--r--x11-misc/set_opacity/set_opacity-9999.ebuild1
-rw-r--r--x11-misc/shared-mime-info/shared-mime-info-1.4.ebuild1
-rw-r--r--x11-misc/shared-mime-info/shared-mime-info-1.6.ebuild1
-rw-r--r--x11-misc/shared-mime-info/shared-mime-info-1.7.ebuild1
-rw-r--r--x11-misc/shared-mime-info/shared-mime-info-1.8.ebuild1
-rw-r--r--x11-misc/shutter/shutter-0.93.1-r3.ebuild1
-rw-r--r--x11-misc/shutterbug/shutterbug-1.7.49.ebuild1
-rw-r--r--x11-misc/simple-ccsm/simple-ccsm-0.8.4-r2.ebuild1
-rw-r--r--x11-misc/simpleswitcher/simpleswitcher-9999.ebuild1
-rw-r--r--x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild1
-rw-r--r--x11-misc/skippy/skippy-0.5.0-r1.ebuild1
-rw-r--r--x11-misc/skippy/skippy-0.5.0.ebuild1
-rw-r--r--x11-misc/slim/slim-1.3.6-r3.ebuild1
-rw-r--r--x11-misc/slim/slim-1.3.6-r5.ebuild1
-rw-r--r--x11-misc/slim/slim-9999.ebuild1
-rw-r--r--x11-misc/slock/slock-1.4.ebuild1
-rw-r--r--x11-misc/slop/slop-4.3.21.ebuild1
-rw-r--r--x11-misc/spacefm/spacefm-1.0.4-r1.ebuild1
-rw-r--r--x11-misc/spacefm/spacefm-1.0.4.ebuild1
-rw-r--r--x11-misc/spacefm/spacefm-1.0.5-r1.ebuild1
-rw-r--r--x11-misc/spacefm/spacefm-1.0.5-r2.ebuild1
-rw-r--r--x11-misc/spacefm/spacefm-9999.ebuild1
-rw-r--r--x11-misc/spnavcfg/spnavcfg-0.3.ebuild1
-rw-r--r--x11-misc/sprop/sprop-0.1-r1.ebuild1
-rw-r--r--x11-misc/sselp/sselp-0.2-r1.ebuild1
-rw-r--r--x11-misc/sselp/sselp-0.2.ebuild1
-rw-r--r--x11-misc/sselp/sselp-9999.ebuild1
-rw-r--r--x11-misc/stalonetray/stalonetray-0.8.1.ebuild1
-rw-r--r--x11-misc/stalonetray/stalonetray-0.8.3.ebuild1
-rw-r--r--x11-misc/sunflower/sunflower-0.2_alpha59.ebuild1
-rw-r--r--x11-misc/superswitcher/superswitcher-0.6.ebuild1
-rw-r--r--x11-misc/sux/sux-1.0-r4.ebuild1
-rw-r--r--x11-misc/sw-notify-send/sw-notify-send-1.2.1.ebuild1
-rw-r--r--x11-misc/sw-notify-send/sw-notify-send-9999.ebuild1
-rw-r--r--x11-misc/sxhkd/sxhkd-0.5.3.ebuild1
-rw-r--r--x11-misc/sxhkd/sxhkd-0.5.4.ebuild1
-rw-r--r--x11-misc/sxhkd/sxhkd-0.5.5.ebuild1
-rw-r--r--x11-misc/sxhkd/sxhkd-0.5.6.ebuild1
-rw-r--r--x11-misc/sxhkd/sxhkd-0.5.7.ebuild1
-rw-r--r--x11-misc/synergy/synergy-1.6.3.ebuild1
-rw-r--r--x11-misc/synergy/synergy-1.8.1-r3.ebuild1
-rw-r--r--x11-misc/synergy/synergy-1.8.2.ebuild1
-rw-r--r--x11-misc/synergy/synergy-1.8.5.ebuild1
-rw-r--r--x11-misc/synergy/synergy-1.8.6.ebuild1
-rw-r--r--x11-misc/tabbed/tabbed-0.6.ebuild1
-rw-r--r--x11-misc/tint2/tint2-0.11-r2.ebuild1
-rw-r--r--x11-misc/tint2/tint2-0.12.12.ebuild1
-rw-r--r--x11-misc/tint2/tint2-0.12.3.ebuild1
-rw-r--r--x11-misc/tintwizard/tintwizard-0.3.4-r2.ebuild1
-rw-r--r--x11-misc/tinymount/tinymount-0.2.8.ebuild1
-rw-r--r--x11-misc/tinynotify-send/tinynotify-send-1.2.1-r1.ebuild1
-rw-r--r--x11-misc/tinynotify-send/tinynotify-send-9999.ebuild1
-rw-r--r--x11-misc/touchcal/touchcal-0.50.ebuild1
-rw-r--r--x11-misc/touchcal/touchcal-0.80.ebuild1
-rw-r--r--x11-misc/touchfreeze/touchfreeze-0.2.5-r1.ebuild1
-rw-r--r--x11-misc/trayer-srg/trayer-srg-1.1.5.ebuild1
-rw-r--r--x11-misc/trayer-srg/trayer-srg-1.1.6-r1.ebuild1
-rw-r--r--x11-misc/trayer/trayer-1.0-r1.ebuild1
-rw-r--r--x11-misc/trayer/trayer-1.0-r2.ebuild1
-rw-r--r--x11-misc/treeline/treeline-1.4.1-r1.ebuild1
-rw-r--r--x11-misc/treeline/treeline-1.9.4.ebuild1
-rw-r--r--x11-misc/unclutter/unclutter-8-r2.ebuild1
-rw-r--r--x11-misc/unclutter/unclutter-8-r4.ebuild1
-rw-r--r--x11-misc/urxvt-font-size/urxvt-font-size-1.1.ebuild1
-rw-r--r--x11-misc/urxvt-font-size/urxvt-font-size-9999.ebuild1
-rw-r--r--x11-misc/urxvt-perls/urxvt-perls-2.2.ebuild1
-rw-r--r--x11-misc/urxvtconfig/urxvtconfig-1.0.ebuild1
-rw-r--r--x11-misc/util-macros/util-macros-1.19.1.ebuild1
-rw-r--r--x11-misc/vdpauinfo/vdpauinfo-1.0.ebuild1
-rw-r--r--x11-misc/viewglob/viewglob-2.0.4-r1.ebuild1
-rw-r--r--x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild1
-rw-r--r--x11-misc/virtualgl/virtualgl-2.5.1.ebuild1
-rw-r--r--x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild1
-rw-r--r--x11-misc/vym/vym-2.3.22.ebuild1
-rw-r--r--x11-misc/vym/vym-2.3.24.ebuild1
-rw-r--r--x11-misc/vym/vym-9999.ebuild1
-rw-r--r--x11-misc/wayv/wayv-0.3-r2.ebuild1
-rw-r--r--x11-misc/wbar/wbar-2.3.4-r1.ebuild1
-rw-r--r--x11-misc/wbar/wbar-2.3.4-r2.ebuild1
-rw-r--r--x11-misc/wbarconf/wbarconf-0.7.2.2-r2.ebuild1
-rw-r--r--x11-misc/wdm/wdm-1.28-r3.ebuild1
-rw-r--r--x11-misc/wdm/wdm-1.28-r4.ebuild1
-rw-r--r--x11-misc/whaw/whaw-0.2.ebuild1
-rw-r--r--x11-misc/wininfo/wininfo-0.7-r1.ebuild1
-rw-r--r--x11-misc/wininfo/wininfo-0.7.ebuild1
-rw-r--r--x11-misc/winswitch/winswitch-0.12.18-r1.ebuild1
-rw-r--r--x11-misc/wmakerconf/wmakerconf-2.12-r2.ebuild1
-rw-r--r--x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild1
-rw-r--r--x11-misc/wmctrl/wmctrl-1.07-r1.ebuild1
-rw-r--r--x11-misc/wmctrl/wmctrl-1.07-r2.ebuild1
-rw-r--r--x11-misc/wmiface/wmiface-2.1.ebuild1
-rw-r--r--x11-misc/wmname/wmname-0.1-r1.ebuild1
-rw-r--r--x11-misc/x11vnc/x11vnc-0.9.13_p20150111.ebuild1
-rw-r--r--x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild1
-rw-r--r--x11-misc/x2x/x2x-1.27-r3.ebuild1
-rw-r--r--x11-misc/xaos/xaos-3.5-r1.ebuild1
-rw-r--r--x11-misc/xaos/xaos-3.6.ebuild1
-rw-r--r--x11-misc/xautolock/xautolock-2.2_p5.ebuild1
-rw-r--r--x11-misc/xautolock/xautolock-2.2_p5_p1.ebuild1
-rw-r--r--x11-misc/xautomation/xautomation-1.05.ebuild1
-rw-r--r--x11-misc/xautomation/xautomation-1.09-r1.ebuild1
-rw-r--r--x11-misc/xbatt/xbatt-1.2.1-r1.ebuild1
-rw-r--r--x11-misc/xbatt/xbatt-1.3_rc1.ebuild1
-rw-r--r--x11-misc/xbattbar/xbattbar-1.4.3.ebuild1
-rw-r--r--x11-misc/xbattbar/xbattbar-1.4.4.ebuild1
-rw-r--r--x11-misc/xbattbar/xbattbar-1.4.5.ebuild1
-rw-r--r--x11-misc/xbattbar/xbattbar-1.4.8.ebuild1
-rw-r--r--x11-misc/xbindkeys/xbindkeys-1.8.6.ebuild1
-rw-r--r--x11-misc/xbitmaps/xbitmaps-1.1.1-r1.ebuild1
-rw-r--r--x11-misc/xbitmaps/xbitmaps-1.1.1.ebuild1
-rw-r--r--x11-misc/xcalendar/xcalendar-4.0-r1.ebuild1
-rw-r--r--x11-misc/xcalendar/xcalendar-4.0-r2.ebuild1
-rw-r--r--x11-misc/xcalib/xcalib-0.9.0_p20161210.ebuild1
-rw-r--r--x11-misc/xcape/xcape-1.0.ebuild1
-rw-r--r--x11-misc/xcape/xcape-1.1.ebuild1
-rw-r--r--x11-misc/xcave/xcave-2.4.0.ebuild1
-rw-r--r--x11-misc/xcb/xcb-2.4-r1.ebuild1
-rw-r--r--x11-misc/xclip/xclip-0.13.ebuild1
-rw-r--r--x11-misc/xcompmgr/xcompmgr-1.1.6.ebuild1
-rw-r--r--x11-misc/xcompmgr/xcompmgr-1.1.7.ebuild1
-rw-r--r--x11-misc/xdaliclock/xdaliclock-2.41.ebuild1
-rw-r--r--x11-misc/xdaliclock/xdaliclock-2.43.ebuild1
-rw-r--r--x11-misc/xdesktopwaves/xdesktopwaves-1.3-r1.ebuild1
-rw-r--r--x11-misc/xdesktopwaves/xdesktopwaves-1.3-r2.ebuild1
-rw-r--r--x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10.ebuild1
-rw-r--r--x11-misc/xdg-user-dirs/xdg-user-dirs-0.15.ebuild1
-rw-r--r--x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild1
-rw-r--r--x11-misc/xdialog/xdialog-2.3.1.ebuild1
-rw-r--r--x11-misc/xdiskusage/xdiskusage-1.48_p20111016.ebuild1
-rw-r--r--x11-misc/xdiskusage/xdiskusage-1.51.ebuild1
-rw-r--r--x11-misc/xdo/xdo-0.3.ebuild1
-rw-r--r--x11-misc/xdo/xdo-0.4.ebuild1
-rw-r--r--x11-misc/xdo/xdo-0.5.ebuild1
-rw-r--r--x11-misc/xdock/xdock-0.3.0.ebuild1
-rw-r--r--x11-misc/xdotool/xdotool-2.20110530.1.ebuild1
-rw-r--r--x11-misc/xdotool/xdotool-3.20150503.1-r1.ebuild1
-rw-r--r--x11-misc/xearth/xearth-1.1-r1.ebuild1
-rw-r--r--x11-misc/xfe/xfe-1.40.1.ebuild1
-rw-r--r--x11-misc/xfe/xfe-1.41.ebuild1
-rw-r--r--x11-misc/xfe/xfe-1.42.ebuild1
-rw-r--r--x11-misc/xfishtank/xfishtank-2.1-r2.ebuild1
-rw-r--r--x11-misc/xfractint/xfractint-20.04_p12.ebuild1
-rw-r--r--x11-misc/xgestures/xgestures-0.4.ebuild1
-rw-r--r--x11-misc/xhkeys/xhkeys-2.2.1.ebuild1
-rw-r--r--x11-misc/xiccd/xiccd-0.2.3.ebuild1
-rw-r--r--x11-misc/xidle/xidle-26052015.ebuild1
-rw-r--r--x11-misc/xkbd/xkbd-0.8.15-r1.ebuild1
-rw-r--r--x11-misc/xkbd/xkbd-0.8.16-r1.ebuild1
-rw-r--r--x11-misc/xkbset/xkbset-0.5-r1.ebuild1
-rw-r--r--x11-misc/xkbset/xkbset-0.5_p5_p1.ebuild1
-rw-r--r--x11-misc/xkeyboard-config/xkeyboard-config-2.14.ebuild1
-rw-r--r--x11-misc/xkeyboard-config/xkeyboard-config-2.16.ebuild1
-rw-r--r--x11-misc/xkeyboard-config/xkeyboard-config-2.17.ebuild1
-rw-r--r--x11-misc/xkeyboard-config/xkeyboard-config-2.18.ebuild1
-rw-r--r--x11-misc/xkeyboard-config/xkeyboard-config-2.19.ebuild1
-rw-r--r--x11-misc/xkeyboard-config/xkeyboard-config-2.20.ebuild1
-rw-r--r--x11-misc/xkeycaps/xkeycaps-2.47-r1.ebuild1
-rw-r--r--x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild1
-rw-r--r--x11-misc/xlockmore/xlockmore-5.47.ebuild1
-rw-r--r--x11-misc/xlockmore/xlockmore-5.50.ebuild1
-rw-r--r--x11-misc/xmobar/xmobar-0.23.1.ebuild1
-rw-r--r--x11-misc/xmobar/xmobar-0.24.2.ebuild1
-rw-r--r--x11-misc/xmobar/xmobar-0.24.3.ebuild1
-rw-r--r--x11-misc/xmonad-log-applet/xmonad-log-applet-2.0.0-r301.ebuild1
-rw-r--r--x11-misc/xmountains/xmountains-2.9.ebuild1
-rw-r--r--x11-misc/xnee/xnee-3.19-r1.ebuild1
-rw-r--r--x11-misc/xnots/xnots-0.2.1-r1.ebuild1
-rw-r--r--x11-misc/xnots/xnots-9999.ebuild1
-rw-r--r--x11-misc/xorg-cf-files/xorg-cf-files-1.0.5.ebuild1
-rw-r--r--x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild1
-rw-r--r--x11-misc/xosview/xosview-1.17.ebuild1
-rw-r--r--x11-misc/xosview/xosview-1.18.ebuild1
-rw-r--r--x11-misc/xosview/xosview-1.19.ebuild1
-rw-r--r--x11-misc/xpad/xpad-4.2.ebuild1
-rw-r--r--x11-misc/xpad/xpad-4.5.0.ebuild1
-rw-r--r--x11-misc/xplanet/xplanet-1.3.0.ebuild1
-rw-r--r--x11-misc/xplanet/xplanet-1.3.1-r1.ebuild1
-rw-r--r--x11-misc/xplanet/xplanet-1.3.1.ebuild1
-rw-r--r--x11-misc/xplanetFX/xplanetFX-2.6.12.ebuild1
-rw-r--r--x11-misc/xplanetFX/xplanetFX-2.6.7.ebuild1
-rw-r--r--x11-misc/xrestop/xrestop-0.4.ebuild1
-rw-r--r--x11-misc/xrmap/xrmap-2.33-r2.ebuild1
-rw-r--r--x11-misc/xrootconsole/xrootconsole-0.6-r1.ebuild1
-rw-r--r--x11-misc/xrootconsole/xrootconsole-0.6.ebuild1
-rw-r--r--x11-misc/xscreensaver-app/xscreensaver-app-2.3-r3.ebuild1
-rw-r--r--x11-misc/xscreensaver/xscreensaver-5.36.ebuild1
-rw-r--r--x11-misc/xsel/xsel-1.2.0-r1.ebuild1
-rw-r--r--x11-misc/xsel/xsel-1.2.0.ebuild1
-rw-r--r--x11-misc/xsel/xsel-9999.ebuild1
-rw-r--r--x11-misc/xsensors/xsensors-0.70-r1.ebuild1
-rw-r--r--x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild1
-rw-r--r--x11-misc/xsetleds/xsetleds-0.1.3.ebuild1
-rw-r--r--x11-misc/xsnap/xsnap-1.5.10.ebuild1
-rw-r--r--x11-misc/xsnap/xsnap-1.5.11.ebuild1
-rw-r--r--x11-misc/xsnap/xsnap-1.5.15-r1.ebuild1
-rw-r--r--x11-misc/xsnow/xsnow-1.42-r1.ebuild1
-rw-r--r--x11-misc/xsnow/xsnow-1.42-r2.ebuild1
-rw-r--r--x11-misc/xsri/xsri-2.1.0-r3.ebuild1
-rw-r--r--x11-misc/xss-lock/xss-lock-0.3.0_p20140302-r1.ebuild1
-rw-r--r--x11-misc/xssstate/xssstate-1.1.ebuild1
-rw-r--r--x11-misc/xstroke/xstroke-0.6-r1.ebuild1
-rw-r--r--x11-misc/xteddy/xteddy-2.2.ebuild1
-rw-r--r--x11-misc/xtermcontrol/xtermcontrol-3.2.ebuild1
-rw-r--r--x11-misc/xtermcontrol/xtermcontrol-3.3.ebuild1
-rw-r--r--x11-misc/xtitle/xtitle-1.0.2.ebuild1
-rw-r--r--x11-misc/xtitle/xtitle-1.0.4.ebuild1
-rw-r--r--x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild1
-rw-r--r--x11-misc/xtrace/xtrace-1.3.0.ebuild1
-rw-r--r--x11-misc/xtrlock/xtrlock-2.7.ebuild1
-rw-r--r--x11-misc/xtrlock/xtrlock-2.8.ebuild1
-rw-r--r--x11-misc/xtscal/xtscal-0.6.3-r1.ebuild1
-rw-r--r--x11-misc/xvfb-run/xvfb-run-1.17.2_p2.ebuild1
-rw-r--r--x11-misc/xvfb-run/xvfb-run-1.18.4_p2.ebuild1
-rw-r--r--x11-misc/xvkbd/xvkbd-3.6.ebuild1
-rw-r--r--x11-misc/xvkbd/xvkbd-3.7.ebuild1
-rw-r--r--x11-misc/xwinwrap/xwinwrap-0_p4-r1.ebuild1
-rw-r--r--x11-misc/xwinwrap/xwinwrap-0_p4.ebuild1
-rw-r--r--x11-misc/xwit/xwit-3.4.ebuild1
-rw-r--r--x11-misc/xwit/xwit-3.4_p15.ebuild1
-rw-r--r--x11-misc/xwrits/xwrits-2.26-r1.ebuild1
-rw-r--r--x11-misc/xwrits/xwrits-2.26.ebuild1
-rw-r--r--x11-misc/xxkb/xxkb-1.11-r3.ebuild1
-rw-r--r--x11-misc/xxkb/xxkb-1.11.1.ebuild1
-rw-r--r--x11-misc/xystray/xystray-1.0.ebuild1
-rw-r--r--x11-misc/zim/zim-0.65.ebuild1
513 files changed, 0 insertions, 513 deletions
diff --git a/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild b/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild
index 68896485ba4..ad64f92fe63 100644
--- a/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild
+++ b/x11-misc/3ddesktop/3ddesktop-0.2.9-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit autotools eutils
diff --git a/x11-misc/3dfb/3dfb-0.6.1-r1.ebuild b/x11-misc/3dfb/3dfb-0.6.1-r1.ebuild
index 0e5dfb68598..a4c1a38b626 100644
--- a/x11-misc/3dfb/3dfb-0.6.1-r1.ebuild
+++ b/x11-misc/3dfb/3dfb-0.6.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/3dfm/3dfm-1.0-r1.ebuild b/x11-misc/3dfm/3dfm-1.0-r1.ebuild
index 74ff0ce6be7..437ad994f15 100644
--- a/x11-misc/3dfm/3dfm-1.0-r1.ebuild
+++ b/x11-misc/3dfm/3dfm-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
diff --git a/x11-misc/3dfm/3dfm-1.0.ebuild b/x11-misc/3dfm/3dfm-1.0.ebuild
index 75bb7cb4f7a..87ac7350492 100644
--- a/x11-misc/3dfm/3dfm-1.0.ebuild
+++ b/x11-misc/3dfm/3dfm-1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="OpenGL-based 3D File Manager"
HOMEPAGE="https://sourceforge.net/projects/innolab/"
diff --git a/x11-misc/Xorgautoconfig/Xorgautoconfig-0.2.4-r1.ebuild b/x11-misc/Xorgautoconfig/Xorgautoconfig-0.2.4-r1.ebuild
index 4c7de7ae0d4..fc82fe4f27d 100644
--- a/x11-misc/Xorgautoconfig/Xorgautoconfig-0.2.4-r1.ebuild
+++ b/x11-misc/Xorgautoconfig/Xorgautoconfig-0.2.4-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils toolchain-funcs
diff --git a/x11-misc/accessx/accessx-0951-r1.ebuild b/x11-misc/accessx/accessx-0951-r1.ebuild
index 3f2742082ac..76d49a3994c 100644
--- a/x11-misc/accessx/accessx-0951-r1.ebuild
+++ b/x11-misc/accessx/accessx-0951-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
inherit eutils multilib toolchain-funcs
diff --git a/x11-misc/accessx/accessx-0951-r2.ebuild b/x11-misc/accessx/accessx-0951-r2.ebuild
index 71bc9ad7bec..805466a9844 100644
--- a/x11-misc/accessx/accessx-0951-r2.ebuild
+++ b/x11-misc/accessx/accessx-0951-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit toolchain-funcs
diff --git a/x11-misc/afbinit/afbinit-1.0.1-r7.ebuild b/x11-misc/afbinit/afbinit-1.0.1-r7.ebuild
index 6964aa949c7..53c60c7ec8c 100644
--- a/x11-misc/afbinit/afbinit-1.0.1-r7.ebuild
+++ b/x11-misc/afbinit/afbinit-1.0.1-r7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils
diff --git a/x11-misc/alacarte/alacarte-3.10.0.ebuild b/x11-misc/alacarte/alacarte-3.10.0.ebuild
index 09265d02274..53a0431e799 100644
--- a/x11-misc/alacarte/alacarte-3.10.0.ebuild
+++ b/x11-misc/alacarte/alacarte-3.10.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"
GCONF_DEBUG="no"
diff --git a/x11-misc/alacarte/alacarte-3.11.91.ebuild b/x11-misc/alacarte/alacarte-3.11.91.ebuild
index 2d689edd3f3..1861e7f1bfd 100644
--- a/x11-misc/alacarte/alacarte-3.11.91.ebuild
+++ b/x11-misc/alacarte/alacarte-3.11.91.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
GCONF_DEBUG="no"
diff --git a/x11-misc/albert/albert-0.8.11.ebuild b/x11-misc/albert/albert-0.8.11.ebuild
index 7d6a2166bff..075eef4ca39 100644
--- a/x11-misc/albert/albert-0.8.11.ebuild
+++ b/x11-misc/albert/albert-0.8.11.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/albert/albert-0.9.3.ebuild b/x11-misc/albert/albert-0.9.3.ebuild
index 81da0b41d64..fe3ca76fc6a 100644
--- a/x11-misc/albert/albert-0.9.3.ebuild
+++ b/x11-misc/albert/albert-0.9.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/x11-misc/alock/alock-1.0.0.ebuild b/x11-misc/alock/alock-1.0.0.ebuild
index 30d523016d1..cdbbba3dd5b 100644
--- a/x11-misc/alock/alock-1.0.0.ebuild
+++ b/x11-misc/alock/alock-1.0.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit eutils toolchain-funcs
diff --git a/x11-misc/andromeda/andromeda-0.3.ebuild b/x11-misc/andromeda/andromeda-0.3.ebuild
index 14db76e1bee..d9934f655a3 100644
--- a/x11-misc/andromeda/andromeda-0.3.ebuild
+++ b/x11-misc/andromeda/andromeda-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
inherit cmake-utils
diff --git a/x11-misc/appmenu-qt/appmenu-qt-0.2.6.ebuild b/x11-misc/appmenu-qt/appmenu-qt-0.2.6.ebuild
index ff6d2ff156c..30565963a7d 100644
--- a/x11-misc/appmenu-qt/appmenu-qt-0.2.6.ebuild
+++ b/x11-misc/appmenu-qt/appmenu-qt-0.2.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/apwal/apwal-0.4.5-r1.ebuild b/x11-misc/apwal/apwal-0.4.5-r1.ebuild
index 3e59f37bc41..f752127dce8 100644
--- a/x11-misc/apwal/apwal-0.4.5-r1.ebuild
+++ b/x11-misc/apwal/apwal-0.4.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="2"
diff --git a/x11-misc/apwal/apwal-0.4.5-r2.ebuild b/x11-misc/apwal/apwal-0.4.5-r2.ebuild
index 59e3ef5000a..dcfa11ff5e6 100644
--- a/x11-misc/apwal/apwal-0.4.5-r2.ebuild
+++ b/x11-misc/apwal/apwal-0.4.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=6
diff --git a/x11-misc/arandr/arandr-0.1.7.1.ebuild b/x11-misc/arandr/arandr-0.1.7.1.ebuild
index 190e6db25e9..99717362ffe 100644
--- a/x11-misc/arandr/arandr-0.1.7.1.ebuild
+++ b/x11-misc/arandr/arandr-0.1.7.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/arandr/arandr-0.1.8.ebuild b/x11-misc/arandr/arandr-0.1.8.ebuild
index c7da8ab744b..43785b77d91 100644
--- a/x11-misc/arandr/arandr-0.1.8.ebuild
+++ b/x11-misc/arandr/arandr-0.1.8.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/arandr/arandr-0.1.9.ebuild b/x11-misc/arandr/arandr-0.1.9.ebuild
index bb1953001fe..3bd1c5f9bba 100644
--- a/x11-misc/arandr/arandr-0.1.9.ebuild
+++ b/x11-misc/arandr/arandr-0.1.9.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/autocutsel/autocutsel-0.10.0.ebuild b/x11-misc/autocutsel/autocutsel-0.10.0.ebuild
index 02109250e27..4ba9da8d129 100644
--- a/x11-misc/autocutsel/autocutsel-0.10.0.ebuild
+++ b/x11-misc/autocutsel/autocutsel-0.10.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/autocutsel/autocutsel-0.9.0.ebuild b/x11-misc/autocutsel/autocutsel-0.9.0.ebuild
index 12b745e134b..1c0758c9093 100644
--- a/x11-misc/autocutsel/autocutsel-0.9.0.ebuild
+++ b/x11-misc/autocutsel/autocutsel-0.9.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="Synchronise the two copy/paste buffers mainly used by X applications"
HOMEPAGE="http://www.nongnu.org/autocutsel/"
diff --git a/x11-misc/basqet/basqet-0.2.0.ebuild b/x11-misc/basqet/basqet-0.2.0.ebuild
index 246f080a0e4..03607ac53ed 100644
--- a/x11-misc/basqet/basqet-0.2.0.ebuild
+++ b/x11-misc/basqet/basqet-0.2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/x11-misc/bbacpi/bbacpi-0.1.5-r1.ebuild b/x11-misc/bbacpi/bbacpi-0.1.5-r1.ebuild
index b609ece180e..a489ba70c38 100644
--- a/x11-misc/bbacpi/bbacpi-0.1.5-r1.ebuild
+++ b/x11-misc/bbacpi/bbacpi-0.1.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
diff --git a/x11-misc/bbacpi/bbacpi-0.1.5-r3.ebuild b/x11-misc/bbacpi/bbacpi-0.1.5-r3.ebuild
index 70e4e5f387a..b2e9f0ed4cd 100644
--- a/x11-misc/bbacpi/bbacpi-0.1.5-r3.ebuild
+++ b/x11-misc/bbacpi/bbacpi-0.1.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/x11-misc/bbappconf/bbappconf-0.0.2.ebuild b/x11-misc/bbappconf/bbappconf-0.0.2.ebuild
index c25c8910978..6fd93f63d63 100644
--- a/x11-misc/bbappconf/bbappconf-0.0.2.ebuild
+++ b/x11-misc/bbappconf/bbappconf-0.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/x11-misc/bbcd/bbcd-0.3.1-r1.ebuild b/x11-misc/bbcd/bbcd-0.3.1-r1.ebuild
index 13523fdf603..9139b9b8c71 100644
--- a/x11-misc/bbcd/bbcd-0.3.1-r1.ebuild
+++ b/x11-misc/bbcd/bbcd-0.3.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/x11-misc/bbcd/bbcd-0.3.1-r2.ebuild b/x11-misc/bbcd/bbcd-0.3.1-r2.ebuild
index 15cda089b62..75e1206fd32 100644
--- a/x11-misc/bbcd/bbcd-0.3.1-r2.ebuild
+++ b/x11-misc/bbcd/bbcd-0.3.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/x11-misc/bbdate/bbdate-0.2.4-r1.ebuild b/x11-misc/bbdate/bbdate-0.2.4-r1.ebuild
index 826be12780c..f9ac7275448 100644
--- a/x11-misc/bbdate/bbdate-0.2.4-r1.ebuild
+++ b/x11-misc/bbdate/bbdate-0.2.4-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils autotools
diff --git a/x11-misc/bbdate/bbdate-0.2.4-r2.ebuild b/x11-misc/bbdate/bbdate-0.2.4-r2.ebuild
index e346fa20462..aa425a81f56 100644
--- a/x11-misc/bbdate/bbdate-0.2.4-r2.ebuild
+++ b/x11-misc/bbdate/bbdate-0.2.4-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit autotools
diff --git a/x11-misc/bbkeys/bbkeys-0.9.0-r1.ebuild b/x11-misc/bbkeys/bbkeys-0.9.0-r1.ebuild
index b8fe4ba8b53..fefb06cb31d 100644
--- a/x11-misc/bbkeys/bbkeys-0.9.0-r1.ebuild
+++ b/x11-misc/bbkeys/bbkeys-0.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$
inherit eutils
diff --git a/x11-misc/bbkeys/bbkeys-0.9.1-r1.ebuild b/x11-misc/bbkeys/bbkeys-0.9.1-r1.ebuild
index c9f5279d770..25f21df4cb2 100644
--- a/x11-misc/bbkeys/bbkeys-0.9.1-r1.ebuild
+++ b/x11-misc/bbkeys/bbkeys-0.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=6
diff --git a/x11-misc/bblaunch/bblaunch-0.0.3.ebuild b/x11-misc/bblaunch/bblaunch-0.0.3.ebuild
index 82f390d9b84..bf560a38b57 100644
--- a/x11-misc/bblaunch/bblaunch-0.0.3.ebuild
+++ b/x11-misc/bblaunch/bblaunch-0.0.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
inherit eutils
diff --git a/x11-misc/bbmail/bbmail-0.9.3-r1.ebuild b/x11-misc/bbmail/bbmail-0.9.3-r1.ebuild
index 8f2493767d9..70db31ed5bf 100644
--- a/x11-misc/bbmail/bbmail-0.9.3-r1.ebuild
+++ b/x11-misc/bbmail/bbmail-0.9.3-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/bbmail/bbmail-0.9.3.ebuild b/x11-misc/bbmail/bbmail-0.9.3.ebuild
index 16f17108f28..29a6808d6b7 100644
--- a/x11-misc/bbmail/bbmail-0.9.3.ebuild
+++ b/x11-misc/bbmail/bbmail-0.9.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
inherit autotools eutils
diff --git a/x11-misc/bbpager/bbpager-0.4.7-r1.ebuild b/x11-misc/bbpager/bbpager-0.4.7-r1.ebuild
index d57e5bb7722..fdd04fe9a4d 100644
--- a/x11-misc/bbpager/bbpager-0.4.7-r1.ebuild
+++ b/x11-misc/bbpager/bbpager-0.4.7-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/bbpager/bbpager-0.4.7.ebuild b/x11-misc/bbpager/bbpager-0.4.7.ebuild
index 9dcdbd02e60..8a87d50b195 100644
--- a/x11-misc/bbpager/bbpager-0.4.7.ebuild
+++ b/x11-misc/bbpager/bbpager-0.4.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit base autotools
diff --git a/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild b/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild
index 6cb3c681a09..9845508cd8a 100644
--- a/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild
+++ b/x11-misc/bbppp/bbppp-0.2.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/x11-misc/bbppp/bbppp-0.2.5.ebuild b/x11-misc/bbppp/bbppp-0.2.5.ebuild
index f91dbb34418..76a191cf9fa 100644
--- a/x11-misc/bbppp/bbppp-0.2.5.ebuild
+++ b/x11-misc/bbppp/bbppp-0.2.5.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/x11-misc/bbrun/bbrun-1.6-r1.ebuild b/x11-misc/bbrun/bbrun-1.6-r1.ebuild
index 775d5a33065..c4340fdd041 100644
--- a/x11-misc/bbrun/bbrun-1.6-r1.ebuild
+++ b/x11-misc/bbrun/bbrun-1.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=4
diff --git a/x11-misc/bbtime/bbtime-0.1.5-r1.ebuild b/x11-misc/bbtime/bbtime-0.1.5-r1.ebuild
index acfb02e321d..8726d38c5b2 100644
--- a/x11-misc/bbtime/bbtime-0.1.5-r1.ebuild
+++ b/x11-misc/bbtime/bbtime-0.1.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
diff --git a/x11-misc/bbtime/bbtime-0.1.5.ebuild b/x11-misc/bbtime/bbtime-0.1.5.ebuild
index bb69fa3a8f0..2a1e8ca8e8e 100644
--- a/x11-misc/bbtime/bbtime-0.1.5.ebuild
+++ b/x11-misc/bbtime/bbtime-0.1.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/x11-misc/bbweather/bbweather-0.6.3-r1.ebuild b/x11-misc/bbweather/bbweather-0.6.3-r1.ebuild
index c1586ad261a..bf4468aec90 100644
--- a/x11-misc/bbweather/bbweather-0.6.3-r1.ebuild
+++ b/x11-misc/bbweather/bbweather-0.6.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=2
diff --git a/x11-misc/blockdpy/blockdpy-1-r1.ebuild b/x11-misc/blockdpy/blockdpy-1-r1.ebuild
index f96d837aaa7..37504c2a899 100644
--- a/x11-misc/blockdpy/blockdpy-1-r1.ebuild
+++ b/x11-misc/blockdpy/blockdpy-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/x11-misc/bumblebee/bumblebee-3.2.1.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1.ebuild
index f0b65d21254..9187302abbe 100644
--- a/x11-misc/bumblebee/bumblebee-3.2.1.ebuild
+++ b/x11-misc/bumblebee/bumblebee-3.2.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils multilib readme.gentoo systemd user
diff --git a/x11-misc/bumblebee/bumblebee-3.2.1_p20170123.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1_p20170123.ebuild
index c95fb49785a..38982456a42 100644
--- a/x11-misc/bumblebee/bumblebee-3.2.1_p20170123.ebuild
+++ b/x11-misc/bumblebee/bumblebee-3.2.1_p20170123.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/x11-misc/bumblebee/bumblebee-9999.ebuild b/x11-misc/bumblebee/bumblebee-9999.ebuild
index c95fb49785a..38982456a42 100644
--- a/x11-misc/bumblebee/bumblebee-9999.ebuild
+++ b/x11-misc/bumblebee/bumblebee-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/x11-misc/cairo-clock/cairo-clock-0.3.3.ebuild b/x11-misc/cairo-clock/cairo-clock-0.3.3.ebuild
index c6f809451e9..e2471b3ae89 100644
--- a/x11-misc/cairo-clock/cairo-clock-0.3.3.ebuild
+++ b/x11-misc/cairo-clock/cairo-clock-0.3.3.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/x11-misc/cairo-clock/cairo-clock-0.3.4.ebuild b/x11-misc/cairo-clock/cairo-clock-0.3.4.ebuild
index 025ee8c4ae9..786624c702d 100644
--- a/x11-misc/cairo-clock/cairo-clock-0.3.4.ebuild
+++ b/x11-misc/cairo-clock/cairo-clock-0.3.4.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/x11-misc/calise/calise-0.4.2.ebuild b/x11-misc/calise/calise-0.4.2.ebuild
index 532414a004d..e09f3e67990 100644
--- a/x11-misc/calise/calise-0.4.2.ebuild
+++ b/x11-misc/calise/calise-0.4.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/x11-misc/cbatticon/cbatticon-1.3.2.ebuild b/x11-misc/cbatticon/cbatticon-1.3.2.ebuild
index c8c2adcd94b..762f875c8cb 100644
--- a/x11-misc/cbatticon/cbatticon-1.3.2.ebuild
+++ b/x11-misc/cbatticon/cbatticon-1.3.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/x11-misc/cbatticon/cbatticon-1.6.4.ebuild b/x11-misc/cbatticon/cbatticon-1.6.4.ebuild
index 680cba96af4..7e20bc094f4 100644
--- a/x11-misc/cbatticon/cbatticon-1.6.4.ebuild
+++ b/x11-misc/cbatticon/cbatticon-1.6.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils toolchain-funcs
diff --git a/x11-misc/cbatticon/cbatticon-1.6.5.ebuild b/x11-misc/cbatticon/cbatticon-1.6.5.ebuild
index c3983a897f5..7be99aae195 100644
--- a/x11-misc/cbatticon/cbatticon-1.6.5.ebuild
+++ b/x11-misc/cbatticon/cbatticon-1.6.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
inherit eutils toolchain-funcs
diff --git a/x11-misc/ccsm/ccsm-0.8.4-r4.ebuild b/x11-misc/ccsm/ccsm-0.8.4-r4.ebuild
index 9bc964a048b..c7855de82bc 100644
--- a/x11-misc/ccsm/ccsm-0.8.4-r4.ebuild
+++ b/x11-misc/ccsm/ccsm-0.8.4-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/x11-misc/ccsm/ccsm-0.8.4-r5.ebuild b/x11-misc/ccsm/ccsm-0.8.4-r5.ebuild
index dc9ec7f0795..235de9f1687 100644
--- a/x11-misc/ccsm/ccsm-0.8.4-r5.ebuild
+++ b/x11-misc/ccsm/ccsm-0.8.4-r5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/x11-misc/cdm/cdm-0.5.3.ebuild b/x11-misc/cdm/cdm-0.5.3.ebuild
index bf6e3428fa1..8f342cd7352 100644
--- a/x11-misc/cdm/cdm-0.5.3.ebuild
+++ b/x11-misc/cdm/cdm-0.5.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/x11-misc/cdm/cdm-0.6.1_pre20130419.ebuild b/x11-misc/cdm/cdm-0.6.1_pre20130419.ebuild
index 972a60a3a14..2544ebcfa1a 100644
--- a/x11-misc/cdm/cdm-0.6.1_pre20130419.ebuild
+++ b/x11-misc/cdm/cdm-0.6.1_pre20130419.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/x11-misc/chgres/chgres-0.1-r1.ebuild b/x11-misc/chgres/chgres-0.1-r1.ebuild
index 75f47747139..feed36a7989 100644
--- a/x11-misc/chgres/chgres-0.1-r1.ebuild
+++ b/x11-misc/chgres/chgres-0.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="4"
diff --git a/x11-misc/chgres/chgres-0.1-r2.ebuild b/x11-misc/chgres/chgres-0.1-r2.ebuild
index 774b0f55e6f..c5d0465f406 100644
--- a/x11-misc/chgres/chgres-0.1-r2.ebuild
+++ b/x11-misc/chgres/chgres-0.1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/colord/colord-1.2.12.ebuild b/x11-misc/colord/colord-1.2.12.ebuild
index 1ec52d778e0..9001e282150 100644
--- a/x11-misc/colord/colord-1.2.12.ebuild
+++ b/x11-misc/colord/colord-1.2.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"
GCONF_DEBUG="no"
diff --git a/x11-misc/colord/colord-1.3.3.ebuild b/x11-misc/colord/colord-1.3.3.ebuild
index eb9f105e35b..aab58ce6894 100644
--- a/x11-misc/colord/colord-1.3.3.ebuild
+++ b/x11-misc/colord/colord-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
GNOME2_LA_PUNT="yes"
diff --git a/x11-misc/colord/colord-1.3.4.ebuild b/x11-misc/colord/colord-1.3.4.ebuild
index 294e450c620..fecd1e85101 100644
--- a/x11-misc/colord/colord-1.3.4.ebuild
+++ b/x11-misc/colord/colord-1.3.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
GNOME2_LA_PUNT="yes"
diff --git a/x11-misc/compton/compton-0.1_beta2.ebuild b/x11-misc/compton/compton-0.1_beta2.ebuild
index 81bdf55fa29..a880a690e6b 100644
--- a/x11-misc/compton/compton-0.1_beta2.ebuild
+++ b/x11-misc/compton/compton-0.1_beta2.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/x11-misc/compton/compton-9999.ebuild b/x11-misc/compton/compton-9999.ebuild
index fa7ee5e2f7e..6d4cb9be516 100644
--- a/x11-misc/compton/compton-9999.ebuild
+++ b/x11-misc/compton/compton-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/x11-misc/dclock/dclock-2.2.2_p4.ebuild b/x11-misc/dclock/dclock-2.2.2_p4.ebuild
index ae6ac54df88..7642a7367c7 100644
--- a/x11-misc/dclock/dclock-2.2.2_p4.ebuild
+++ b/x11-misc/dclock/dclock-2.2.2_p4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
inherit eutils toolchain-funcs
diff --git a/x11-misc/dclock/dclock-2.2.2_p9.ebuild b/x11-misc/dclock/dclock-2.2.2_p9.ebuild
index cb7a371220c..4f5f162d950 100644
--- a/x11-misc/dclock/dclock-2.2.2_p9.ebuild
+++ b/x11-misc/dclock/dclock-2.2.2_p9.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit flag-o-matic toolchain-funcs
diff --git a/x11-misc/devilspie/devilspie-0.22.ebuild b/x11-misc/devilspie/devilspie-0.22.ebuild
index ded3a2746a8..bdd31cb8449 100644
--- a/x11-misc/devilspie/devilspie-0.22.ebuild
+++ b/x11-misc/devilspie/devilspie-0.22.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
inherit autotools
diff --git a/x11-misc/devilspie/devilspie-0.23.ebuild b/x11-misc/devilspie/devilspie-0.23.ebuild
index f285f63e1b6..3cf72b0462c 100644
--- a/x11-misc/devilspie/devilspie-0.23.ebuild
+++ b/x11-misc/devilspie/devilspie-0.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
inherit autotools toolchain-funcs
diff --git a/x11-misc/devilspie2/devilspie2-0.36.ebuild b/x11-misc/devilspie2/devilspie2-0.36.ebuild
index 10c913be007..f0559f8a0ac 100644
--- a/x11-misc/devilspie2/devilspie2-0.36.ebuild
+++ b/x11-misc/devilspie2/devilspie2-0.36.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/x11-misc/devilspie2/devilspie2-0.41.ebuild b/x11-misc/devilspie2/devilspie2-0.41.ebuild
index db434e85a4c..44bd07c950c 100644
--- a/x11-misc/devilspie2/devilspie2-0.41.ebuild
+++ b/x11-misc/devilspie2/devilspie2-0.41.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/x11-misc/devilspie2/devilspie2-0.42.ebuild b/x11-misc/devilspie2/devilspie2-0.42.ebuild
index 4862ef3c793..17dab0b615b 100644
--- a/x11-misc/devilspie2/devilspie2-0.42.ebuild
+++ b/x11-misc/devilspie2/devilspie2-0.42.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/x11-misc/dex/dex-0.6.ebuild b/x11-misc/dex/dex-0.6.ebuild
index 38671eddc3c..ed4558c1be5 100644
--- a/x11-misc/dex/dex-0.6.ebuild
+++ b/x11-misc/dex/dex-0.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/dex/dex-0.7.ebuild b/x11-misc/dex/dex-0.7.ebuild
index 999146839f2..add7456851f 100644
--- a/x11-misc/dex/dex-0.7.ebuild
+++ b/x11-misc/dex/dex-0.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/dmenu/dmenu-4.6.ebuild b/x11-misc/dmenu/dmenu-4.6.ebuild
index c15460373c9..121c77abecb 100644
--- a/x11-misc/dmenu/dmenu-4.6.ebuild
+++ b/x11-misc/dmenu/dmenu-4.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
inherit eutils toolchain-funcs
diff --git a/x11-misc/dmenu/dmenu-9999.ebuild b/x11-misc/dmenu/dmenu-9999.ebuild
index 79a2f8b8ba1..e94945351f0 100644
--- a/x11-misc/dmenu/dmenu-9999.ebuild
+++ b/x11-misc/dmenu/dmenu-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit eutils git-r3 savedconfig toolchain-funcs
diff --git a/x11-misc/dockmanager/dockmanager-0.1.0-r1.ebuild b/x11-misc/dockmanager/dockmanager-0.1.0-r1.ebuild
index ec640b25d8a..c8a900c7df0 100644
--- a/x11-misc/dockmanager/dockmanager-0.1.0-r1.ebuild
+++ b/x11-misc/dockmanager/dockmanager-0.1.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
diff --git a/x11-misc/driconf/driconf-0.9.1-r2.ebuild b/x11-misc/driconf/driconf-0.9.1-r2.ebuild
index 588882a890f..dd0e15240e8 100644
--- a/x11-misc/driconf/driconf-0.9.1-r2.ebuild
+++ b/x11-misc/driconf/driconf-0.9.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/x11-misc/dsx/dsx-0.1-r1.ebuild b/x11-misc/dsx/dsx-0.1-r1.ebuild
index 13b3aa2a621..fe4368e5c75 100644
--- a/x11-misc/dsx/dsx-0.1-r1.ebuild
+++ b/x11-misc/dsx/dsx-0.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/x11-misc/dunst/dunst-1.1.0.ebuild b/x11-misc/dunst/dunst-1.1.0.ebuild
index 87e6ad3c508..9fbe684edef 100644
--- a/x11-misc/dunst/dunst-1.1.0.ebuild
+++ b/x11-misc/dunst/dunst-1.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/x11-misc/dxpc/dxpc-3.9.2-r1.ebuild b/x11-misc/dxpc/dxpc-3.9.2-r1.ebuild
index 64246b73140..0b9f0a5c2b7 100644
--- a/x11-misc/dxpc/dxpc-3.9.2-r1.ebuild
+++ b/x11-misc/dxpc/dxpc-3.9.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="Differential X Protocol Compressor"
HOMEPAGE="http://www.vigor.nu/dxpc/"
diff --git a/x11-misc/dxpc/dxpc-3.9.2-r2.ebuild b/x11-misc/dxpc/dxpc-3.9.2-r2.ebuild
index 828e1c39f46..5b73087d5dd 100644
--- a/x11-misc/dxpc/dxpc-3.9.2-r2.ebuild
+++ b/x11-misc/dxpc/dxpc-3.9.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/x11-misc/dzen/dzen-0.9.5-r1.ebuild b/x11-misc/dzen/dzen-0.9.5-r1.ebuild
index 9deff633050..12498cc73da 100644
--- a/x11-misc/dzen/dzen-0.9.5-r1.ebuild
+++ b/x11-misc/dzen/dzen-0.9.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils toolchain-funcs vcs-snapshot
diff --git a/x11-misc/e16keyedit/e16keyedit-0.7.ebuild b/x11-misc/e16keyedit/e16keyedit-0.7.ebuild
index 853e984527b..77ee2bbb1a4 100644
--- a/x11-misc/e16keyedit/e16keyedit-0.7.ebuild
+++ b/x11-misc/e16keyedit/e16keyedit-0.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="Key binding editor for enlightenment 16"
HOMEPAGE="https://www.enlightenment.org/"
diff --git a/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild b/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild
index 5f5e08b9ed7..5fc26891b70 100644
--- a/x11-misc/e16menuedit2/e16menuedit2-0.0.3.ebuild
+++ b/x11-misc/e16menuedit2/e16menuedit2-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=5
GCONF_DEBUG="yes"
diff --git a/x11-misc/easystroke/easystroke-0.6.0-r1.ebuild b/x11-misc/easystroke/easystroke-0.6.0-r1.ebuild
index 3450f4935cb..e771ab7f7f5 100644
--- a/x11-misc/easystroke/easystroke-0.6.0-r1.ebuild
+++ b/x11-misc/easystroke/easystroke-0.6.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils toolchain-funcs
diff --git a/x11-misc/easystroke/easystroke-0.6.0-r2.ebuild b/x11-misc/easystroke/easystroke-0.6.0-r2.ebuild
index 2f4521c7701..fe9bce35767 100644
--- a/x11-misc/easystroke/easystroke-0.6.0-r2.ebuild
+++ b/x11-misc/easystroke/easystroke-0.6.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
inherit eutils flag-o-matic toolchain-funcs
diff --git a/x11-misc/easystroke/easystroke-0.6.0.ebuild b/x11-misc/easystroke/easystroke-0.6.0.ebuild
index cba2189a02a..c30341ca864 100644
--- a/x11-misc/easystroke/easystroke-0.6.0.ebuild
+++ b/x11-misc/easystroke/easystroke-0.6.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils toolchain-funcs
diff --git a/x11-misc/efax-gtk/efax-gtk-3.2.13.ebuild b/x11-misc/efax-gtk/efax-gtk-3.2.13.ebuild
index 9376e85fd4d..55711ad507f 100644
--- a/x11-misc/efax-gtk/efax-gtk-3.2.13.ebuild
+++ b/x11-misc/efax-gtk/efax-gtk-3.2.13.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/efax-gtk/efax-gtk-3.2.9.ebuild b/x11-misc/efax-gtk/efax-gtk-3.2.9.ebuild
index aa80bbcd249..42e3dab12b4 100644
--- a/x11-misc/efax-gtk/efax-gtk-3.2.9.ebuild
+++ b/x11-misc/efax-gtk/efax-gtk-3.2.9.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/x11-misc/etm/etm-696-r1.ebuild b/x11-misc/etm/etm-696-r1.ebuild
index 06cc03ce742..79556d32610 100644
--- a/x11-misc/etm/etm-696-r1.ebuild
+++ b/x11-misc/etm/etm-696-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 )
diff --git a/x11-misc/evolvotron/evolvotron-0.6.3-r1.ebuild b/x11-misc/evolvotron/evolvotron-0.6.3-r1.ebuild
index 6d52be1f0b2..5cff1401b62 100644
--- a/x11-misc/evolvotron/evolvotron-0.6.3-r1.ebuild
+++ b/x11-misc/evolvotron/evolvotron-0.6.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
inherit qmake-utils
diff --git a/x11-misc/evolvotron/evolvotron-0.6.3.ebuild b/x11-misc/evolvotron/evolvotron-0.6.3.ebuild
index 55d6d232226..27e5dfcda59 100644
--- a/x11-misc/evolvotron/evolvotron-0.6.3.ebuild
+++ b/x11-misc/evolvotron/evolvotron-0.6.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit qt4-r2
diff --git a/x11-misc/fbdesk/fbdesk-1.4.1.ebuild b/x11-misc/fbdesk/fbdesk-1.4.1.ebuild
index 03a79ac28a6..2fac809fbe2 100644
--- a/x11-misc/fbdesk/fbdesk-1.4.1.ebuild
+++ b/x11-misc/fbdesk/fbdesk-1.4.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/fbpager/fbpager-20090221-r1.ebuild b/x11-misc/fbpager/fbpager-20090221-r1.ebuild
index 34e1708dc64..ba393d9008c 100644
--- a/x11-misc/fbpager/fbpager-20090221-r1.ebuild
+++ b/x11-misc/fbpager/fbpager-20090221-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/x11-misc/fbpager/fbpager-20090221.ebuild b/x11-misc/fbpager/fbpager-20090221.ebuild
index 38d8762a053..be33b554142 100644
--- a/x11-misc/fbpager/fbpager-20090221.ebuild
+++ b/x11-misc/fbpager/fbpager-20090221.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
inherit eutils
diff --git a/x11-misc/fbpanel/fbpanel-6.1-r2.ebuild b/x11-misc/fbpanel/fbpanel-6.1-r2.ebuild
index ec43317cb63..7c7ed97c829 100644
--- a/x11-misc/fbpanel/fbpanel-6.1-r2.ebuild
+++ b/x11-misc/fbpanel/fbpanel-6.1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils multilib toolchain-funcs
diff --git a/x11-misc/fbpanel/fbpanel-7.0.ebuild b/x11-misc/fbpanel/fbpanel-7.0.ebuild
index 408fcdd3aa7..969e09f1e5f 100644
--- a/x11-misc/fbpanel/fbpanel-7.0.ebuild
+++ b/x11-misc/fbpanel/fbpanel-7.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 )
diff --git a/x11-misc/fireflies/fireflies-2.07-r1.ebuild b/x11-misc/fireflies/fireflies-2.07-r1.ebuild
index a7a1e994a31..ef8ce2fe3d7 100644
--- a/x11-misc/fireflies/fireflies-2.07-r1.ebuild
+++ b/x11-misc/fireflies/fireflies-2.07-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit autotools eutils multilib
diff --git a/x11-misc/fireflies/fireflies-2.07-r2.ebuild b/x11-misc/fireflies/fireflies-2.07-r2.ebuild
index 80b6f5d4c31..e1a1c6d8488 100644
--- a/x11-misc/fireflies/fireflies-2.07-r2.ebuild
+++ b/x11-misc/fireflies/fireflies-2.07-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit autotools eutils multilib
diff --git a/x11-misc/fireflies/fireflies-2.08-r1.ebuild b/x11-misc/fireflies/fireflies-2.08-r1.ebuild
index b4b76218f83..744c8ac8932 100644
--- a/x11-misc/fireflies/fireflies-2.08-r1.ebuild
+++ b/x11-misc/fireflies/fireflies-2.08-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit autotools multilib
diff --git a/x11-misc/fireflies/fireflies-2.08.ebuild b/x11-misc/fireflies/fireflies-2.08.ebuild
index dcbe1340127..153939ee864 100644
--- a/x11-misc/fireflies/fireflies-2.08.ebuild
+++ b/x11-misc/fireflies/fireflies-2.08.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit autotools multilib
diff --git a/x11-misc/flow-pomodoro/flow-pomodoro-1.1.2.ebuild b/x11-misc/flow-pomodoro/flow-pomodoro-1.1.2.ebuild
index b03559feb48..e051e72bcb9 100644
--- a/x11-misc/flow-pomodoro/flow-pomodoro-1.1.2.ebuild
+++ b/x11-misc/flow-pomodoro/flow-pomodoro-1.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/x11-misc/flow-pomodoro/flow-pomodoro-1.2.0.ebuild b/x11-misc/flow-pomodoro/flow-pomodoro-1.2.0.ebuild
index bd60034dc13..daa67bf4bb7 100644
--- a/x11-misc/flow-pomodoro/flow-pomodoro-1.2.0.ebuild
+++ b/x11-misc/flow-pomodoro/flow-pomodoro-1.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/x11-misc/fluxter/fluxter-0.1.0.ebuild b/x11-misc/fluxter/fluxter-0.1.0.ebuild
index 821fe277d84..0bcbe35e507 100644
--- a/x11-misc/fluxter/fluxter-0.1.0.ebuild
+++ b/x11-misc/fluxter/fluxter-0.1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
inherit autotools eutils
diff --git a/x11-misc/fpm2/fpm2-0.79-r1.ebuild b/x11-misc/fpm2/fpm2-0.79-r1.ebuild
index 5d437aa3dd2..973e74b57ee 100644
--- a/x11-misc/fpm2/fpm2-0.79-r1.ebuild
+++ b/x11-misc/fpm2/fpm2-0.79-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/x11-misc/fpm2/fpm2-0.79.ebuild b/x11-misc/fpm2/fpm2-0.79.ebuild
index b1e6cc14163..c82bf0e9ac9 100644
--- a/x11-misc/fpm2/fpm2-0.79.ebuild
+++ b/x11-misc/fpm2/fpm2-0.79.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/x11-misc/fracplanet/fracplanet-0.4.0-r1.ebuild b/x11-misc/fracplanet/fracplanet-0.4.0-r1.ebuild
index 254e38f2f67..798e453cef7 100644
--- a/x11-misc/fracplanet/fracplanet-0.4.0-r1.ebuild
+++ b/x11-misc/fracplanet/fracplanet-0.4.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit qmake-utils
diff --git a/x11-misc/fraqtive/fraqtive-0.4.7.ebuild b/x11-misc/fraqtive/fraqtive-0.4.7.ebuild
index 0fa608e01b2..8d3effac98f 100644
--- a/x11-misc/fraqtive/fraqtive-0.4.7.ebuild
+++ b/x11-misc/fraqtive/fraqtive-0.4.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils gnome2-utils qmake-utils toolchain-funcs
diff --git a/x11-misc/fraqtive/fraqtive-0.4.8.ebuild b/x11-misc/fraqtive/fraqtive-0.4.8.ebuild
index 0fa608e01b2..8d3effac98f 100644
--- a/x11-misc/fraqtive/fraqtive-0.4.8.ebuild
+++ b/x11-misc/fraqtive/fraqtive-0.4.8.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils gnome2-utils qmake-utils toolchain-funcs
diff --git a/x11-misc/ftmenu/ftmenu-0.4.0-r1.ebuild b/x11-misc/ftmenu/ftmenu-0.4.0-r1.ebuild
index 0e27f181245..be90c2a835b 100644
--- a/x11-misc/ftmenu/ftmenu-0.4.0-r1.ebuild
+++ b/x11-misc/ftmenu/ftmenu-0.4.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/gbase/gbase-0.5-r1.ebuild b/x11-misc/gbase/gbase-0.5-r1.ebuild
index edb313c3868..f01bed6678f 100644
--- a/x11-misc/gbase/gbase-0.5-r1.ebuild
+++ b/x11-misc/gbase/gbase-0.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit toolchain-funcs
diff --git a/x11-misc/gbase/gbase-0.5.ebuild b/x11-misc/gbase/gbase-0.5.ebuild
index 4e64fcbc09c..f8e8534c2f5 100644
--- a/x11-misc/gbase/gbase-0.5.ebuild
+++ b/x11-misc/gbase/gbase-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=4
inherit eutils toolchain-funcs
diff --git a/x11-misc/gbdfed/gbdfed-1.6.ebuild b/x11-misc/gbdfed/gbdfed-1.6.ebuild
index 7ac4e479cb0..2166c768e87 100644
--- a/x11-misc/gbdfed/gbdfed-1.6.ebuild
+++ b/x11-misc/gbdfed/gbdfed-1.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
inherit eutils
diff --git a/x11-misc/gccmakedep/gccmakedep-1.0.3.ebuild b/x11-misc/gccmakedep/gccmakedep-1.0.3.ebuild
index 5246db84458..b2ee97f05ca 100644
--- a/x11-misc/gccmakedep/gccmakedep-1.0.3.ebuild
+++ b/x11-misc/gccmakedep/gccmakedep-1.0.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
XORG_STATIC=no
diff --git a/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild b/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild
index 7b7f401a362..56f2c4a0bdc 100644
--- a/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild
+++ b/x11-misc/gcolor2/gcolor2-0.4-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
GCONF_DEBUG="no"
diff --git a/x11-misc/genmenu/genmenu-1.1.0-r1.ebuild b/x11-misc/genmenu/genmenu-1.1.0-r1.ebuild
index b5beac32bbb..e35bdf67edd 100644
--- a/x11-misc/genmenu/genmenu-1.1.0-r1.ebuild
+++ b/x11-misc/genmenu/genmenu-1.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
diff --git a/x11-misc/gigolo/gigolo-0.4.2.ebuild b/x11-misc/gigolo/gigolo-0.4.2.ebuild
index d40cbd6c956..7562671bc40 100644
--- a/x11-misc/gigolo/gigolo-0.4.2.ebuild
+++ b/x11-misc/gigolo/gigolo-0.4.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
#EAUTORECONF=yes (Why was this in 0.4.1 w/o any calls to autotools.eclass again?
diff --git a/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild b/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild
index c46d84863b5..237b61d4f56 100644
--- a/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild
+++ b/x11-misc/gmrun/gmrun-0.9.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit autotools eutils
diff --git a/x11-misc/googsystray/googsystray-1.3.1-r1.ebuild b/x11-misc/googsystray/googsystray-1.3.1-r1.ebuild
index 06b78cd7649..9886a643050 100644
--- a/x11-misc/googsystray/googsystray-1.3.1-r1.ebuild
+++ b/x11-misc/googsystray/googsystray-1.3.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/gpaste/gpaste-3.18.3.ebuild b/x11-misc/gpaste/gpaste-3.18.3.ebuild
index b7cb042b50e..49026c97d69 100644
--- a/x11-misc/gpaste/gpaste-3.18.3.ebuild
+++ b/x11-misc/gpaste/gpaste-3.18.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/x11-misc/gpaste/gpaste-3.20.3.ebuild b/x11-misc/gpaste/gpaste-3.20.3.ebuild
index 277eb674289..29d4912c9f6 100644
--- a/x11-misc/gpaste/gpaste-3.20.3.ebuild
+++ b/x11-misc/gpaste/gpaste-3.20.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/x11-misc/grabc/grabc-1.1-r1.ebuild b/x11-misc/grabc/grabc-1.1-r1.ebuild
index 5d685bde8d1..f348671cd90 100644
--- a/x11-misc/grabc/grabc-1.1-r1.ebuild
+++ b/x11-misc/grabc/grabc-1.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils toolchain-funcs
diff --git a/x11-misc/grabc/grabc-1.1-r2.ebuild b/x11-misc/grabc/grabc-1.1-r2.ebuild
index b51d8973e67..b0c9a942d2b 100644
--- a/x11-misc/grabc/grabc-1.1-r2.ebuild
+++ b/x11-misc/grabc/grabc-1.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
inherit toolchain-funcs
diff --git a/x11-misc/gromit/gromit-20041213-r1.ebuild b/x11-misc/gromit/gromit-20041213-r1.ebuild
index 40abca160b6..e14be1452ea 100644
--- a/x11-misc/gromit/gromit-20041213-r1.ebuild
+++ b/x11-misc/gromit/gromit-20041213-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit toolchain-funcs
diff --git a/x11-misc/grsync/grsync-1.2.4.ebuild b/x11-misc/grsync/grsync-1.2.4.ebuild
index 83fce4fb92e..acf58b7ce60 100644
--- a/x11-misc/grsync/grsync-1.2.4.ebuild
+++ b/x11-misc/grsync/grsync-1.2.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit gnome2
diff --git a/x11-misc/grsync/grsync-1.2.5.ebuild b/x11-misc/grsync/grsync-1.2.5.ebuild
index 4c530c98fdc..a919578c0a2 100644
--- a/x11-misc/grsync/grsync-1.2.5.ebuild
+++ b/x11-misc/grsync/grsync-1.2.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit gnome2
diff --git a/x11-misc/grsync/grsync-1.2.6.ebuild b/x11-misc/grsync/grsync-1.2.6.ebuild
index c98d59d1f56..9d3768e546f 100644
--- a/x11-misc/grsync/grsync-1.2.6.ebuild
+++ b/x11-misc/grsync/grsync-1.2.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.1.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.1.ebuild
index 59b6bbfc2df..3c86f369f28 100644
--- a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.1.ebuild
+++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-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/x11-misc/grub2-theme-preview/grub2-theme-preview-1.2.1.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.2.1.ebuild
index 59b6bbfc2df..3c86f369f28 100644
--- a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.2.1.ebuild
+++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.2.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.2.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.2.ebuild
index 59b6bbfc2df..3c86f369f28 100644
--- a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.2.ebuild
+++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.3.0.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.3.0.ebuild
index 59b6bbfc2df..3c86f369f28 100644
--- a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.3.0.ebuild
+++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.3.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.3.1.ebuild b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.3.1.ebuild
index 59b6bbfc2df..3c86f369f28 100644
--- a/x11-misc/grub2-theme-preview/grub2-theme-preview-1.3.1.ebuild
+++ b/x11-misc/grub2-theme-preview/grub2-theme-preview-1.3.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/x11-misc/grun/grun-0.9.3-r1.ebuild b/x11-misc/grun/grun-0.9.3-r1.ebuild
index a9dfb961e18..ff8bab19f5b 100644
--- a/x11-misc/grun/grun-0.9.3-r1.ebuild
+++ b/x11-misc/grun/grun-0.9.3-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils
diff --git a/x11-misc/gtk2fontsel/gtk2fontsel-0.1-r1.ebuild b/x11-misc/gtk2fontsel/gtk2fontsel-0.1-r1.ebuild
index 7f8e38eba23..56c2a137042 100644
--- a/x11-misc/gtk2fontsel/gtk2fontsel-0.1-r1.ebuild
+++ b/x11-misc/gtk2fontsel/gtk2fontsel-0.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/x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild b/x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild
index 5ccaddab200..bf0610c4fd8 100644
--- a/x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild
+++ b/x11-misc/gtkdialog/gtkdialog-0.8.3-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit autotools
diff --git a/x11-misc/gxmessage/gxmessage-2.20.1.ebuild b/x11-misc/gxmessage/gxmessage-2.20.1.ebuild
index 392291711ab..84267cac08a 100644
--- a/x11-misc/gxmessage/gxmessage-2.20.1.ebuild
+++ b/x11-misc/gxmessage/gxmessage-2.20.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit gnome2-utils
diff --git a/x11-misc/gxmessage/gxmessage-2.20.3.ebuild b/x11-misc/gxmessage/gxmessage-2.20.3.ebuild
index 1e7c798b958..02fe313836b 100644
--- a/x11-misc/gxmessage/gxmessage-2.20.3.ebuild
+++ b/x11-misc/gxmessage/gxmessage-2.20.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit gnome2-utils
diff --git a/x11-misc/gxmessage/gxmessage-3.4.2.ebuild b/x11-misc/gxmessage/gxmessage-3.4.2.ebuild
index 3308bfcdef5..89a45eeb2b1 100644
--- a/x11-misc/gxmessage/gxmessage-3.4.2.ebuild
+++ b/x11-misc/gxmessage/gxmessage-3.4.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit gnome2-utils
diff --git a/x11-misc/gxmessage/gxmessage-3.4.3.ebuild b/x11-misc/gxmessage/gxmessage-3.4.3.ebuild
index 3308bfcdef5..89a45eeb2b1 100644
--- a/x11-misc/gxmessage/gxmessage-3.4.3.ebuild
+++ b/x11-misc/gxmessage/gxmessage-3.4.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit gnome2-utils
diff --git a/x11-misc/habak/habak-0.2.5-r1.ebuild b/x11-misc/habak/habak-0.2.5-r1.ebuild
index bdbc8010dab..3a57ac807c7 100644
--- a/x11-misc/habak/habak-0.2.5-r1.ebuild
+++ b/x11-misc/habak/habak-0.2.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
diff --git a/x11-misc/habak/habak-0.2.5-r2.ebuild b/x11-misc/habak/habak-0.2.5-r2.ebuild
index ab1bd975368..88de8534973 100644
--- a/x11-misc/habak/habak-0.2.5-r2.ebuild
+++ b/x11-misc/habak/habak-0.2.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=6
diff --git a/x11-misc/hsetroot/hsetroot-1.0.2.ebuild b/x11-misc/hsetroot/hsetroot-1.0.2.ebuild
index 277384ab5c1..7e43051d4dc 100644
--- a/x11-misc/hsetroot/hsetroot-1.0.2.ebuild
+++ b/x11-misc/hsetroot/hsetroot-1.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit autotools eutils
diff --git a/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild b/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
index f932aa4e535..a081fd8909a 100644
--- a/x11-misc/i3blocks/i3blocks-1.4-r1.ebuild
+++ b/x11-misc/i3blocks/i3blocks-1.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=6
diff --git a/x11-misc/i3lock/i3lock-2.6.ebuild b/x11-misc/i3lock/i3lock-2.6.ebuild
index 18ae7d7797c..3a3b877dd2a 100644
--- a/x11-misc/i3lock/i3lock-2.6.ebuild
+++ b/x11-misc/i3lock/i3lock-2.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/i3lock/i3lock-2.7.ebuild b/x11-misc/i3lock/i3lock-2.7.ebuild
index 6207486dcf6..c89d8549b6c 100644
--- a/x11-misc/i3lock/i3lock-2.7.ebuild
+++ b/x11-misc/i3lock/i3lock-2.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/i3lock/i3lock-2.8.ebuild b/x11-misc/i3lock/i3lock-2.8.ebuild
index f7b7bfe8829..a7cd92647da 100644
--- a/x11-misc/i3lock/i3lock-2.8.ebuild
+++ b/x11-misc/i3lock/i3lock-2.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/x11-misc/i3status/i3status-2.10-r1.ebuild b/x11-misc/i3status/i3status-2.10-r1.ebuild
index 16e6e003e3b..51ddc3c6c71 100644
--- a/x11-misc/i3status/i3status-2.10-r1.ebuild
+++ b/x11-misc/i3status/i3status-2.10-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/x11-misc/i3status/i3status-2.11.ebuild b/x11-misc/i3status/i3status-2.11.ebuild
index 67aa8db78b7..2f82c62e716 100644
--- a/x11-misc/i3status/i3status-2.11.ebuild
+++ b/x11-misc/i3status/i3status-2.11.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/i3status/i3status-2.7.ebuild b/x11-misc/i3status/i3status-2.7.ebuild
index d175469f03c..2c573146e64 100644
--- a/x11-misc/i3status/i3status-2.7.ebuild
+++ b/x11-misc/i3status/i3status-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/x11-misc/i855crt/i855crt-0.4-r1.ebuild b/x11-misc/i855crt/i855crt-0.4-r1.ebuild
index 8ce6e2304a7..1b8581227cd 100644
--- a/x11-misc/i855crt/i855crt-0.4-r1.ebuild
+++ b/x11-misc/i855crt/i855crt-0.4-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/x11-misc/icewmcp/icewmcp-3.2-r4.ebuild b/x11-misc/icewmcp/icewmcp-3.2-r4.ebuild
index 222d6643dc1..10cbeabb2a6 100644
--- a/x11-misc/icewmcp/icewmcp-3.2-r4.ebuild
+++ b/x11-misc/icewmcp/icewmcp-3.2-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
PYTHON_COMPAT=( python2_7 )
diff --git a/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild b/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild
index 1b5e9d18772..d4cb572e60e 100644
--- a/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-r1.ebuild
+++ b/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90-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/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90.ebuild b/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90.ebuild
index 6062429b70e..bef8a4c627d 100644
--- a/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90.ebuild
+++ b/x11-misc/icon-naming-utils/icon-naming-utils-0.8.90.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="Utils to help with the transition to the new freedesktop.org naming scheme"
HOMEPAGE="http://tango.freedesktop.org"
diff --git a/x11-misc/iconbox/iconbox-0.2.ebuild b/x11-misc/iconbox/iconbox-0.2.ebuild
index 0c1382373a9..0929dd87e10 100644
--- a/x11-misc/iconbox/iconbox-0.2.ebuild
+++ b/x11-misc/iconbox/iconbox-0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/x11-misc/idesk-extras/idesk-extras-1.37-r1.ebuild b/x11-misc/idesk-extras/idesk-extras-1.37-r1.ebuild
index 1b17adf57d0..930e5a46d1f 100644
--- a/x11-misc/idesk-extras/idesk-extras-1.37-r1.ebuild
+++ b/x11-misc/idesk-extras/idesk-extras-1.37-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/idesk/idesk-0.7.5-r2.ebuild b/x11-misc/idesk/idesk-0.7.5-r2.ebuild
index 4db3595ecf7..469bf799683 100644
--- a/x11-misc/idesk/idesk-0.7.5-r2.ebuild
+++ b/x11-misc/idesk/idesk-0.7.5-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
inherit eutils
diff --git a/x11-misc/imake/imake-1.0.7.ebuild b/x11-misc/imake/imake-1.0.7.ebuild
index d79a3a4b011..7c067f92b0a 100644
--- a/x11-misc/imake/imake-1.0.7.ebuild
+++ b/x11-misc/imake/imake-1.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=5
diff --git a/x11-misc/imwheel/imwheel-1.0.0_pre12.ebuild b/x11-misc/imwheel/imwheel-1.0.0_pre12.ebuild
index aea2d6f1416..572eddde223 100644
--- a/x11-misc/imwheel/imwheel-1.0.0_pre12.ebuild
+++ b/x11-misc/imwheel/imwheel-1.0.0_pre12.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils
diff --git a/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild b/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild
index 7c91eff1afb..001734201df 100644
--- a/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.ebuild
+++ b/x11-misc/imwheel/imwheel-1.0.0_pre13_p20100827.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/x11-misc/ipager/ipager-1.1.0.ebuild b/x11-misc/ipager/ipager-1.1.0.ebuild
index 6c15920edc9..b21b4520b32 100644
--- a/x11-misc/ipager/ipager-1.1.0.ebuild
+++ b/x11-misc/ipager/ipager-1.1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
inherit eutils
diff --git a/x11-misc/kapow/kapow-1.5.1.ebuild b/x11-misc/kapow/kapow-1.5.1.ebuild
index 42b88077884..50d1657c1e7 100644
--- a/x11-misc/kapow/kapow-1.5.1.ebuild
+++ b/x11-misc/kapow/kapow-1.5.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit qmake-utils
diff --git a/x11-misc/kapow/kapow-1.5.2.ebuild b/x11-misc/kapow/kapow-1.5.2.ebuild
index 42b88077884..50d1657c1e7 100644
--- a/x11-misc/kapow/kapow-1.5.2.ebuild
+++ b/x11-misc/kapow/kapow-1.5.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit qmake-utils
diff --git a/x11-misc/kaqaz/kaqaz-1.2.0-r2.ebuild b/x11-misc/kaqaz/kaqaz-1.2.0-r2.ebuild
index 684de8eee98..efe2db40817 100644
--- a/x11-misc/kaqaz/kaqaz-1.2.0-r2.ebuild
+++ b/x11-misc/kaqaz/kaqaz-1.2.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
inherit eutils qmake-utils
diff --git a/x11-misc/kbdd/kbdd-0.7.1.ebuild b/x11-misc/kbdd/kbdd-0.7.1.ebuild
index fbf1249cc4c..32b3f011cfb 100644
--- a/x11-misc/kbdd/kbdd-0.7.1.ebuild
+++ b/x11-misc/kbdd/kbdd-0.7.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/kdocker/kdocker-4.8-r2.ebuild b/x11-misc/kdocker/kdocker-4.8-r2.ebuild
index a0d0696b061..777c7974c8b 100644
--- a/x11-misc/kdocker/kdocker-4.8-r2.ebuild
+++ b/x11-misc/kdocker/kdocker-4.8-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/kronometer/kronometer-2.1.2.ebuild b/x11-misc/kronometer/kronometer-2.1.2.ebuild
index 51db0fadc93..db37b2ca1b4 100644
--- a/x11-misc/kronometer/kronometer-2.1.2.ebuild
+++ b/x11-misc/kronometer/kronometer-2.1.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/kronometer/kronometer-2.1.3.ebuild b/x11-misc/kronometer/kronometer-2.1.3.ebuild
index f4cd7689841..7121061dc53 100644
--- a/x11-misc/kronometer/kronometer-2.1.3.ebuild
+++ b/x11-misc/kronometer/kronometer-2.1.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/kronometer/kronometer-2.1.4.ebuild b/x11-misc/kronometer/kronometer-2.1.4.ebuild
index 1a199a73c65..c2b83fbe69f 100644
--- a/x11-misc/kronometer/kronometer-2.1.4.ebuild
+++ b/x11-misc/kronometer/kronometer-2.1.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/x11-misc/ktsuss/ktsuss-2.1.ebuild b/x11-misc/ktsuss/ktsuss-2.1.ebuild
index a7764d9a2ee..957f0076fb1 100644
--- a/x11-misc/ktsuss/ktsuss-2.1.ebuild
+++ b/x11-misc/ktsuss/ktsuss-2.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/launchy/launchy-2.5.ebuild b/x11-misc/launchy/launchy-2.5.ebuild
index 0f775fc3167..566d790d567 100644
--- a/x11-misc/launchy/launchy-2.5.ebuild
+++ b/x11-misc/launchy/launchy-2.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
inherit fdo-mime gnome2-utils qt4-r2
diff --git a/x11-misc/libinput-gestures/libinput-gestures-2.15.ebuild b/x11-misc/libinput-gestures/libinput-gestures-2.15.ebuild
index d586babd724..98e1c98335a 100644
--- a/x11-misc/libinput-gestures/libinput-gestures-2.15.ebuild
+++ b/x11-misc/libinput-gestures/libinput-gestures-2.15.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild b/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
index 247b67f8e86..c52057900f6 100644
--- a/x11-misc/libinput-gestures/libinput-gestures-9999.ebuild
+++ b/x11-misc/libinput-gestures/libinput-gestures-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/x11-misc/light-locker/light-locker-1.7.0-r1.ebuild b/x11-misc/light-locker/light-locker-1.7.0-r1.ebuild
index d5f10dc42ec..51411789d10 100644
--- a/x11-misc/light-locker/light-locker-1.7.0-r1.ebuild
+++ b/x11-misc/light-locker/light-locker-1.7.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/light-locker/light-locker-1.7.0.ebuild b/x11-misc/light-locker/light-locker-1.7.0.ebuild
index 39862cf2cdd..bb354a05739 100644
--- a/x11-misc/light-locker/light-locker-1.7.0.ebuild
+++ b/x11-misc/light-locker/light-locker-1.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/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-r1.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-r1.ebuild
index 0597ce20da8..9fa334fcd74 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.1-r1.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.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=4
diff --git a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.2.ebuild b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.2.ebuild
index cd551149cc2..9cd6d22a46b 100644
--- a/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.2.ebuild
+++ b/x11-misc/lightdm-gtk-greeter/lightdm-gtk-greeter-2.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/lightdm-kde/lightdm-kde-0.3.2.1-r1.ebuild b/x11-misc/lightdm-kde/lightdm-kde-0.3.2.1-r1.ebuild
index cdb1556377d..57e6f0344d4 100644
--- a/x11-misc/lightdm-kde/lightdm-kde-0.3.2.1-r1.ebuild
+++ b/x11-misc/lightdm-kde/lightdm-kde-0.3.2.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/x11-misc/lightdm/lightdm-1.18.3.ebuild b/x11-misc/lightdm/lightdm-1.18.3.ebuild
index 42af8915c84..f0ddd8d3095 100644
--- a/x11-misc/lightdm/lightdm-1.18.3.ebuild
+++ b/x11-misc/lightdm/lightdm-1.18.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit autotools eutils flag-o-matic pam qmake-utils readme.gentoo-r1 systemd versionator xdg-utils
diff --git a/x11-misc/lightdm/lightdm-1.21.4.ebuild b/x11-misc/lightdm/lightdm-1.21.4.ebuild
index 53f727b1fb7..84326c449cb 100644
--- a/x11-misc/lightdm/lightdm-1.21.4.ebuild
+++ b/x11-misc/lightdm/lightdm-1.21.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit autotools eutils flag-o-matic pam qmake-utils readme.gentoo-r1 systemd versionator xdg-utils
diff --git a/x11-misc/lightdm/lightdm-1.21.5.ebuild b/x11-misc/lightdm/lightdm-1.21.5.ebuild
index 53f727b1fb7..84326c449cb 100644
--- a/x11-misc/lightdm/lightdm-1.21.5.ebuild
+++ b/x11-misc/lightdm/lightdm-1.21.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit autotools eutils flag-o-matic pam qmake-utils readme.gentoo-r1 systemd versionator xdg-utils
diff --git a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r1.ebuild b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r1.ebuild
index 519a37822f5..20dfb499c5a 100644
--- a/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r1.ebuild
+++ b/x11-misc/lineak-defaultplugin/lineak-defaultplugin-0.9.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils multilib
diff --git a/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r1.ebuild b/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r1.ebuild
index 0ae84c08c39..d18f96f0baa 100644
--- a/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.9.0-r1.ebuild
+++ b/x11-misc/lineak-xosdplugin/lineak-xosdplugin-0.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$
inherit eutils multilib
diff --git a/x11-misc/lineakd/lineakd-0.9.0-r1.ebuild b/x11-misc/lineakd/lineakd-0.9.0-r1.ebuild
index 54d264795f9..45b5b54d2ab 100644
--- a/x11-misc/lineakd/lineakd-0.9.0-r1.ebuild
+++ b/x11-misc/lineakd/lineakd-0.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
inherit eutils multilib
diff --git a/x11-misc/lndir/lndir-1.0.3-r1.ebuild b/x11-misc/lndir/lndir-1.0.3-r1.ebuild
index 5cd2dc36b38..57ecc9436d8 100644
--- a/x11-misc/lndir/lndir-1.0.3-r1.ebuild
+++ b/x11-misc/lndir/lndir-1.0.3-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/lndir/lndir-1.0.3.ebuild b/x11-misc/lndir/lndir-1.0.3.ebuild
index 0e8cd9692d0..3fd97af3bb6 100644
--- a/x11-misc/lndir/lndir-1.0.3.ebuild
+++ b/x11-misc/lndir/lndir-1.0.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=3
diff --git a/x11-misc/lsw/lsw-0.3.ebuild b/x11-misc/lsw/lsw-0.3.ebuild
index 0bcea5fcfaa..49ecae21018 100644
--- a/x11-misc/lsw/lsw-0.3.ebuild
+++ b/x11-misc/lsw/lsw-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
inherit toolchain-funcs
diff --git a/x11-misc/macopix/macopix-1.7.4-r1.ebuild b/x11-misc/macopix/macopix-1.7.4-r1.ebuild
index 2d8d819ea66..204844f4241 100644
--- a/x11-misc/macopix/macopix-1.7.4-r1.ebuild
+++ b/x11-misc/macopix/macopix-1.7.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=6
inherit autotools flag-o-matic
diff --git a/x11-misc/macopix/macopix-1.7.4.ebuild b/x11-misc/macopix/macopix-1.7.4.ebuild
index 0fc051a1850..3a2e3ac4cd6 100644
--- a/x11-misc/macopix/macopix-1.7.4.ebuild
+++ b/x11-misc/macopix/macopix-1.7.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
DESCRIPTION="MaCoPiX (Mascot Constructive Pilot for X) is a desktop mascot application"
diff --git a/x11-misc/magick-rotation/magick-rotation-1.6.2-r2.ebuild b/x11-misc/magick-rotation/magick-rotation-1.6.2-r2.ebuild
index 0a15a9b5f62..43a71929ba5 100644
--- a/x11-misc/magick-rotation/magick-rotation-1.6.2-r2.ebuild
+++ b/x11-misc/magick-rotation/magick-rotation-1.6.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=5
diff --git a/x11-misc/makedepend/makedepend-1.0.5.ebuild b/x11-misc/makedepend/makedepend-1.0.5.ebuild
index a6e386499ca..c0d6990d325 100644
--- a/x11-misc/makedepend/makedepend-1.0.5.ebuild
+++ b/x11-misc/makedepend/makedepend-1.0.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
XORG_STATIC=no
diff --git a/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1-r1.ebuild b/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1-r1.ebuild
index ceaa915e5f7..4f1d2a03a24 100644
--- a/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1-r1.ebuild
+++ b/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
diff --git a/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1.ebuild b/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1.ebuild
index 73fadd2f8d6..ab4985a097b 100644
--- a/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1.ebuild
+++ b/x11-misc/matchbox-keyboard/matchbox-keyboard-0.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/x11-misc/mate-notification-daemon/mate-notification-daemon-1.12.1.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.12.1.ebuild
index 39aa0a8e0b5..3ce818bdd6e 100644
--- a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.12.1.ebuild
+++ b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.12.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/x11-misc/mate-notification-daemon/mate-notification-daemon-1.14.1.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.14.1.ebuild
index df6f6e196b7..f8ba713dc2e 100644
--- a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.14.1.ebuild
+++ b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.14.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/x11-misc/mate-notification-daemon/mate-notification-daemon-1.16.1.ebuild b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.16.1.ebuild
index ba3e0abfb63..d83471e8474 100644
--- a/x11-misc/mate-notification-daemon/mate-notification-daemon-1.16.1.ebuild
+++ b/x11-misc/mate-notification-daemon/mate-notification-daemon-1.16.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/x11-misc/menulibre/menulibre-13.01.4-r1.ebuild b/x11-misc/menulibre/menulibre-13.01.4-r1.ebuild
index 69778abbb28..05f0f7df4c7 100644
--- a/x11-misc/menulibre/menulibre-13.01.4-r1.ebuild
+++ b/x11-misc/menulibre/menulibre-13.01.4-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/menulibre/menulibre-13.01.4.ebuild b/x11-misc/menulibre/menulibre-13.01.4.ebuild
index 2050cf6d493..52d55e53db3 100644
--- a/x11-misc/menulibre/menulibre-13.01.4.ebuild
+++ b/x11-misc/menulibre/menulibre-13.01.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/menulibre/menulibre-13.04.17.ebuild b/x11-misc/menulibre/menulibre-13.04.17.ebuild
index 5b39ff972c9..a91dd73c144 100644
--- a/x11-misc/menulibre/menulibre-13.04.17.ebuild
+++ b/x11-misc/menulibre/menulibre-13.04.17.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/menulibre/menulibre-2.0.7.ebuild b/x11-misc/menulibre/menulibre-2.0.7.ebuild
index a2c21a9a661..ac7afaa8dcc 100644
--- a/x11-misc/menulibre/menulibre-2.0.7.ebuild
+++ b/x11-misc/menulibre/menulibre-2.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=5
diff --git a/x11-misc/menulibre/menulibre-2.1.3.ebuild b/x11-misc/menulibre/menulibre-2.1.3.ebuild
index a2c21a9a661..ac7afaa8dcc 100644
--- a/x11-misc/menulibre/menulibre-2.1.3.ebuild
+++ b/x11-misc/menulibre/menulibre-2.1.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/menumaker/menumaker-0.99.10.ebuild b/x11-misc/menumaker/menumaker-0.99.10.ebuild
index 7cb6eaad2a5..530ab11e4fc 100644
--- a/x11-misc/menumaker/menumaker-0.99.10.ebuild
+++ b/x11-misc/menumaker/menumaker-0.99.10.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/menumaker/menumaker-0.99.9.ebuild b/x11-misc/menumaker/menumaker-0.99.9.ebuild
index 3edcc4d8bdf..4b2d6e57587 100644
--- a/x11-misc/menumaker/menumaker-0.99.9.ebuild
+++ b/x11-misc/menumaker/menumaker-0.99.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,5} )
diff --git a/x11-misc/mgm/mgm-1.2-r1.ebuild b/x11-misc/mgm/mgm-1.2-r1.ebuild
index 589c1748957..b39da9a196d 100644
--- a/x11-misc/mgm/mgm-1.2-r1.ebuild
+++ b/x11-misc/mgm/mgm-1.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/mgm/mgm-1.2.ebuild b/x11-misc/mgm/mgm-1.2.ebuild
index bb0dd380349..c6bc780f7f0 100644
--- a/x11-misc/mgm/mgm-1.2.ebuild
+++ b/x11-misc/mgm/mgm-1.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="Moaning Goat Meter: load and status meter written in Perl"
HOMEPAGE="http://www.linuxmafia.com/mgm"
diff --git a/x11-misc/mixer_app/mixer_app-1.8.0.ebuild b/x11-misc/mixer_app/mixer_app-1.8.0.ebuild
index 38a87f2625b..256f6968c36 100644
--- a/x11-misc/mixer_app/mixer_app-1.8.0.ebuild
+++ b/x11-misc/mixer_app/mixer_app-1.8.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
inherit eutils toolchain-funcs
diff --git a/x11-misc/mozo/mozo-1.12.0-r1.ebuild b/x11-misc/mozo/mozo-1.12.0-r1.ebuild
index ceb357a4372..ec999eab3f1 100644
--- a/x11-misc/mozo/mozo-1.12.0-r1.ebuild
+++ b/x11-misc/mozo/mozo-1.12.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/x11-misc/mozo/mozo-1.14.1.ebuild b/x11-misc/mozo/mozo-1.14.1.ebuild
index 80e2d65a34f..a02a515a179 100644
--- a/x11-misc/mozo/mozo-1.14.1.ebuild
+++ b/x11-misc/mozo/mozo-1.14.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/x11-misc/mozo/mozo-1.16.0-r1.ebuild b/x11-misc/mozo/mozo-1.16.0-r1.ebuild
index 0e27e29a423..5d07223cc28 100644
--- a/x11-misc/mozo/mozo-1.16.0-r1.ebuild
+++ b/x11-misc/mozo/mozo-1.16.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/netwmpager/netwmpager-2.05.ebuild b/x11-misc/netwmpager/netwmpager-2.05.ebuild
index fe699dcfeaa..db30db2314e 100644
--- a/x11-misc/netwmpager/netwmpager-2.05.ebuild
+++ b/x11-misc/netwmpager/netwmpager-2.05.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit toolchain-funcs
diff --git a/x11-misc/nitrogen/nitrogen-1.5.2.ebuild b/x11-misc/nitrogen/nitrogen-1.5.2.ebuild
index 7bc126b6424..54ccec1b111 100644
--- a/x11-misc/nitrogen/nitrogen-1.5.2.ebuild
+++ b/x11-misc/nitrogen/nitrogen-1.5.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit autotools eutils flag-o-matic
diff --git a/x11-misc/nitrogen/nitrogen-1.6.0.ebuild b/x11-misc/nitrogen/nitrogen-1.6.0.ebuild
index 9f9b60aa668..6876a04f74a 100644
--- a/x11-misc/nitrogen/nitrogen-1.6.0.ebuild
+++ b/x11-misc/nitrogen/nitrogen-1.6.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit autotools fdo-mime flag-o-matic
diff --git a/x11-misc/nitrogen/nitrogen-1.6.1.ebuild b/x11-misc/nitrogen/nitrogen-1.6.1.ebuild
index ad60240a259..d78bf876470 100644
--- a/x11-misc/nitrogen/nitrogen-1.6.1.ebuild
+++ b/x11-misc/nitrogen/nitrogen-1.6.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit autotools fdo-mime flag-o-matic
diff --git a/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild b/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild
index ba71cf15e68..c07fd3c8dd7 100644
--- a/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-0.5.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
GCONF_DEBUG=no
diff --git a/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild b/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild
index 28cc5ceb18c..4a213ca6f85 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.14.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild b/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild
index 6d8051980ee..016909f2798 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.18.2.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.18.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/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild b/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild
index 68e569dcd4b..50a5d042bf9 100644
--- a/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild
+++ b/x11-misc/notification-daemon/notification-daemon-3.20.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/notify-osd/notify-osd-0.9.34.ebuild b/x11-misc/notify-osd/notify-osd-0.9.34.ebuild
index 8ba78d7b3c7..70ae583ebe5 100644
--- a/x11-misc/notify-osd/notify-osd-0.9.34.ebuild
+++ b/x11-misc/notify-osd/notify-osd-0.9.34.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
inherit autotools gnome2-utils multilib savedconfig
diff --git a/x11-misc/nts/nts-82-r1.ebuild b/x11-misc/nts/nts-82-r1.ebuild
index b9f37964609..96a6ccd3682 100644
--- a/x11-misc/nts/nts-82-r1.ebuild
+++ b/x11-misc/nts/nts-82-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 )
diff --git a/x11-misc/numlockx/numlockx-1.2.ebuild b/x11-misc/numlockx/numlockx-1.2.ebuild
index 30d5189d880..d2799cdefcc 100644
--- a/x11-misc/numlockx/numlockx-1.2.ebuild
+++ b/x11-misc/numlockx/numlockx-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
inherit autotools
diff --git a/x11-misc/obconf-qt/obconf-qt-0.9.0_p20150729.ebuild b/x11-misc/obconf-qt/obconf-qt-0.9.0_p20150729.ebuild
index 11b39940473..80423a3721a 100644
--- a/x11-misc/obconf-qt/obconf-qt-0.9.0_p20150729.ebuild
+++ b/x11-misc/obconf-qt/obconf-qt-0.9.0_p20150729.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 cmake-utils
diff --git a/x11-misc/obconf/obconf-2.0.4.ebuild b/x11-misc/obconf/obconf-2.0.4.ebuild
index 7ac4c103ac1..4ee587cc379 100644
--- a/x11-misc/obconf/obconf-2.0.4.ebuild
+++ b/x11-misc/obconf/obconf-2.0.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit fdo-mime
diff --git a/x11-misc/obconf/obconf-9999.ebuild b/x11-misc/obconf/obconf-9999.ebuild
index 99ddfd4f72c..eb5947a313a 100644
--- a/x11-misc/obconf/obconf-9999.ebuild
+++ b/x11-misc/obconf/obconf-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/x11-misc/obmenu-generator/obmenu-generator-0.61.ebuild b/x11-misc/obmenu-generator/obmenu-generator-0.61.ebuild
index f490bc94fce..df3491b844c 100644
--- a/x11-misc/obmenu-generator/obmenu-generator-0.61.ebuild
+++ b/x11-misc/obmenu-generator/obmenu-generator-0.61.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/x11-misc/obmenu-generator/obmenu-generator-0.66.ebuild b/x11-misc/obmenu-generator/obmenu-generator-0.66.ebuild
index f36aab1a41b..23597f91564 100644
--- a/x11-misc/obmenu-generator/obmenu-generator-0.66.ebuild
+++ b/x11-misc/obmenu-generator/obmenu-generator-0.66.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/obmenu/obmenu-1.0-r1.ebuild b/x11-misc/obmenu/obmenu-1.0-r1.ebuild
index 95c3a0fa74f..939832fa087 100644
--- a/x11-misc/obmenu/obmenu-1.0-r1.ebuild
+++ b/x11-misc/obmenu/obmenu-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=5
PYTHON_COMPAT=( python2_7 )
diff --git a/x11-misc/obtheme/obtheme-2013.2.20.2.ebuild b/x11-misc/obtheme/obtheme-2013.2.20.2.ebuild
index 5a7bd4ed260..a9a77cd1368 100644
--- a/x11-misc/obtheme/obtheme-2013.2.20.2.ebuild
+++ b/x11-misc/obtheme/obtheme-2013.2.20.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/x11-misc/okindd/okindd-0.6.1.ebuild b/x11-misc/okindd/okindd-0.6.1.ebuild
index 716796226f3..43ae236466c 100644
--- a/x11-misc/okindd/okindd-0.6.1.ebuild
+++ b/x11-misc/okindd/okindd-0.6.1.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/x11-misc/openbox-menu/openbox-menu-0.5.1.ebuild b/x11-misc/openbox-menu/openbox-menu-0.5.1.ebuild
index b518b73b92d..c2e011164a9 100644
--- a/x11-misc/openbox-menu/openbox-menu-0.5.1.ebuild
+++ b/x11-misc/openbox-menu/openbox-menu-0.5.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils toolchain-funcs
diff --git a/x11-misc/openbox-menu/openbox-menu-0.7.0.ebuild b/x11-misc/openbox-menu/openbox-menu-0.7.0.ebuild
index 2faceb872fc..f77da3a827a 100644
--- a/x11-misc/openbox-menu/openbox-menu-0.7.0.ebuild
+++ b/x11-misc/openbox-menu/openbox-menu-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
inherit eutils toolchain-funcs
diff --git a/x11-misc/openbox-menu/openbox-menu-0.8.0.ebuild b/x11-misc/openbox-menu/openbox-menu-0.8.0.ebuild
index 2faceb872fc..f77da3a827a 100644
--- a/x11-misc/openbox-menu/openbox-menu-0.8.0.ebuild
+++ b/x11-misc/openbox-menu/openbox-menu-0.8.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils toolchain-funcs
diff --git a/x11-misc/oroborus-desklaunch/oroborus-desklaunch-1.1.8.ebuild b/x11-misc/oroborus-desklaunch/oroborus-desklaunch-1.1.8.ebuild
index 80128379d1c..55fa59ad47e 100644
--- a/x11-misc/oroborus-desklaunch/oroborus-desklaunch-1.1.8.ebuild
+++ b/x11-misc/oroborus-desklaunch/oroborus-desklaunch-1.1.8.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/x11-misc/oroborus-deskmenu/oroborus-deskmenu-1.4.5.ebuild b/x11-misc/oroborus-deskmenu/oroborus-deskmenu-1.4.5.ebuild
index 6a1d021fee1..403359cdab1 100644
--- a/x11-misc/oroborus-deskmenu/oroborus-deskmenu-1.4.5.ebuild
+++ b/x11-misc/oroborus-deskmenu/oroborus-deskmenu-1.4.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
MY_PN=${PN/oroborus-//}
diff --git a/x11-misc/oroborus-keylaunch/oroborus-keylaunch-1.3.9.ebuild b/x11-misc/oroborus-keylaunch/oroborus-keylaunch-1.3.9.ebuild
index f367bd5e943..bcab32de50c 100644
--- a/x11-misc/oroborus-keylaunch/oroborus-keylaunch-1.3.9.ebuild
+++ b/x11-misc/oroborus-keylaunch/oroborus-keylaunch-1.3.9.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/x11-misc/outwiker/outwiker-1.8.0.ebuild b/x11-misc/outwiker/outwiker-1.8.0.ebuild
index 9a37a5d3379..7eef8419833 100644
--- a/x11-misc/outwiker/outwiker-1.8.0.ebuild
+++ b/x11-misc/outwiker/outwiker-1.8.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
PYTHON_COMPAT=( python2_7 )
diff --git a/x11-misc/outwiker/outwiker-1.9.0.790.ebuild b/x11-misc/outwiker/outwiker-1.9.0.790.ebuild
index c9cba69733c..9732077436c 100644
--- a/x11-misc/outwiker/outwiker-1.9.0.790.ebuild
+++ b/x11-misc/outwiker/outwiker-1.9.0.790.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/x11-misc/outwiker/outwiker-2.0.0.794.ebuild b/x11-misc/outwiker/outwiker-2.0.0.794.ebuild
index 6c24160788b..2d15636c1ba 100644
--- a/x11-misc/outwiker/outwiker-2.0.0.794.ebuild
+++ b/x11-misc/outwiker/outwiker-2.0.0.794.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/x11-misc/parcellite/parcellite-1.1.9.ebuild b/x11-misc/parcellite/parcellite-1.1.9.ebuild
index a76ef01e489..db446ef81cd 100644
--- a/x11-misc/parcellite/parcellite-1.1.9.ebuild
+++ b/x11-misc/parcellite/parcellite-1.1.9.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils fdo-mime
diff --git a/x11-misc/parcellite/parcellite-1.2.1.ebuild b/x11-misc/parcellite/parcellite-1.2.1.ebuild
index f2ef795e8b5..fc4700b9bc6 100644
--- a/x11-misc/parcellite/parcellite-1.2.1.ebuild
+++ b/x11-misc/parcellite/parcellite-1.2.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit autotools eutils fdo-mime
diff --git a/x11-misc/pathfinder/pathfinder-1.7.49.ebuild b/x11-misc/pathfinder/pathfinder-1.7.49.ebuild
index 924cb567e07..2f71efdff41 100644
--- a/x11-misc/pathfinder/pathfinder-1.7.49.ebuild
+++ b/x11-misc/pathfinder/pathfinder-1.7.49.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/x11-misc/pcmanfm-qt/pcmanfm-qt-0.10.0.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.10.0.ebuild
index 38bd137fdb1..ab3cd6f7eb5 100644
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.10.0.ebuild
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.10.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.11.1.ebuild b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.11.1.ebuild
index 424bbd590b5..e8cf21ba158 100644
--- a/x11-misc/pcmanfm-qt/pcmanfm-qt-0.11.1.ebuild
+++ b/x11-misc/pcmanfm-qt/pcmanfm-qt-0.11.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/x11-misc/pcmanfm/pcmanfm-1.2.3.ebuild b/x11-misc/pcmanfm/pcmanfm-1.2.3.ebuild
index 2b710813cbd..dfe38dce2bc 100644
--- a/x11-misc/pcmanfm/pcmanfm-1.2.3.ebuild
+++ b/x11-misc/pcmanfm/pcmanfm-1.2.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
PLOCALES="ar be bg bn ca cs da de el en_GB es et eu fa fi fo fr gl he hr hu id
diff --git a/x11-misc/pcmanfm/pcmanfm-1.2.4.ebuild b/x11-misc/pcmanfm/pcmanfm-1.2.4.ebuild
index 81eafd6feec..7570e59e547 100644
--- a/x11-misc/pcmanfm/pcmanfm-1.2.4.ebuild
+++ b/x11-misc/pcmanfm/pcmanfm-1.2.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
PLOCALES="ar be bg bn ca cs da de el en_GB es et eu fa fi fo fr gl he hr hu id
diff --git a/x11-misc/pcmanfm/pcmanfm-1.2.5.ebuild b/x11-misc/pcmanfm/pcmanfm-1.2.5.ebuild
index dd105503c4e..232e40452c5 100644
--- a/x11-misc/pcmanfm/pcmanfm-1.2.5.ebuild
+++ b/x11-misc/pcmanfm/pcmanfm-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"
PLOCALES="ar be bg bn ca cs da de el en_GB es et eu fa fi fo fr gl he hr hu id
diff --git a/x11-misc/pcmanfm/pcmanfm-9999.ebuild b/x11-misc/pcmanfm/pcmanfm-9999.ebuild
index d6b54b03049..0613ad8b5f8 100644
--- a/x11-misc/pcmanfm/pcmanfm-9999.ebuild
+++ b/x11-misc/pcmanfm/pcmanfm-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
PLOCALES="ar be bg bn ca cs da de el en_GB es et eu fa fi fo fr gl he hr hu id
diff --git a/x11-misc/peksystray/peksystray-0.2.1.ebuild b/x11-misc/peksystray/peksystray-0.2.1.ebuild
index ec018af1ed9..b16024c518f 100644
--- a/x11-misc/peksystray/peksystray-0.2.1.ebuild
+++ b/x11-misc/peksystray/peksystray-0.2.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils multilib
diff --git a/x11-misc/peksystray/peksystray-0.4.0.ebuild b/x11-misc/peksystray/peksystray-0.4.0.ebuild
index 714634616ca..6d0c9e545da 100644
--- a/x11-misc/peksystray/peksystray-0.4.0.ebuild
+++ b/x11-misc/peksystray/peksystray-0.4.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
inherit autotools eutils
diff --git a/x11-misc/piedock/piedock-1.6.6-r1.ebuild b/x11-misc/piedock/piedock-1.6.6-r1.ebuild
index 8c945ddda0e..3c66de4c709 100644
--- a/x11-misc/piedock/piedock-1.6.6-r1.ebuild
+++ b/x11-misc/piedock/piedock-1.6.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/x11-misc/ptbatterysystemtray/ptbatterysystemtray-1.0.0_rc2.ebuild b/x11-misc/ptbatterysystemtray/ptbatterysystemtray-1.0.0_rc2.ebuild
index 3698bf95acf..7d6fc320438 100644
--- a/x11-misc/ptbatterysystemtray/ptbatterysystemtray-1.0.0_rc2.ebuild
+++ b/x11-misc/ptbatterysystemtray/ptbatterysystemtray-1.0.0_rc2.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 qt4-r2
diff --git a/x11-misc/py3status/py3status-3.4.ebuild b/x11-misc/py3status/py3status-3.4.ebuild
index e5958535736..d7c8afddd7d 100644
--- a/x11-misc/py3status/py3status-3.4.ebuild
+++ b/x11-misc/py3status/py3status-3.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
diff --git a/x11-misc/pypanel/pypanel-2.4-r2.ebuild b/x11-misc/pypanel/pypanel-2.4-r2.ebuild
index 2566b623963..c1c3381177d 100644
--- a/x11-misc/pypanel/pypanel-2.4-r2.ebuild
+++ b/x11-misc/pypanel/pypanel-2.4-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/qarma/qarma-1.ebuild b/x11-misc/qarma/qarma-1.ebuild
index f365fb74d4a..e1c4f05d258 100644
--- a/x11-misc/qarma/qarma-1.ebuild
+++ b/x11-misc/qarma/qarma-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/x11-misc/qcomicbook/qcomicbook-0.9.0-r1.ebuild b/x11-misc/qcomicbook/qcomicbook-0.9.0-r1.ebuild
index 3433048e7dd..6047fae6281 100644
--- a/x11-misc/qcomicbook/qcomicbook-0.9.0-r1.ebuild
+++ b/x11-misc/qcomicbook/qcomicbook-0.9.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/qcomicbook/qcomicbook-0.9.1.ebuild b/x11-misc/qcomicbook/qcomicbook-0.9.1.ebuild
index ec6e6aa411c..059b55ba431 100644
--- a/x11-misc/qcomicbook/qcomicbook-0.9.1.ebuild
+++ b/x11-misc/qcomicbook/qcomicbook-0.9.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/qlipper/qlipper-5.0.0.ebuild b/x11-misc/qlipper/qlipper-5.0.0.ebuild
index 542f3b51257..700f033f475 100644
--- a/x11-misc/qlipper/qlipper-5.0.0.ebuild
+++ b/x11-misc/qlipper/qlipper-5.0.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/qps/qps-1.10.16.ebuild b/x11-misc/qps/qps-1.10.16.ebuild
index d7a60838d9d..5f69992d97d 100644
--- a/x11-misc/qps/qps-1.10.16.ebuild
+++ b/x11-misc/qps/qps-1.10.16.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/x11-misc/qsynergy/qsynergy-0.9.1-r1.ebuild b/x11-misc/qsynergy/qsynergy-0.9.1-r1.ebuild
index 61cdf9af11e..ecacdcad396 100644
--- a/x11-misc/qsynergy/qsynergy-0.9.1-r1.ebuild
+++ b/x11-misc/qsynergy/qsynergy-0.9.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/qt5ct/qt5ct-0.30.ebuild b/x11-misc/qt5ct/qt5ct-0.30.ebuild
index c449014e463..c37e2dffc55 100644
--- a/x11-misc/qt5ct/qt5ct-0.30.ebuild
+++ b/x11-misc/qt5ct/qt5ct-0.30.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/x11-misc/qterm/qterm-0.5.12-r1.ebuild b/x11-misc/qterm/qterm-0.5.12-r1.ebuild
index 3bf0b9c5b9a..61ba755c243 100644
--- a/x11-misc/qterm/qterm-0.5.12-r1.ebuild
+++ b/x11-misc/qterm/qterm-0.5.12-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/x11-misc/qterm/qterm-0.7.1.ebuild b/x11-misc/qterm/qterm-0.7.1.ebuild
index 6506d21575c..3cb511f8a1f 100644
--- a/x11-misc/qterm/qterm-0.7.1.ebuild
+++ b/x11-misc/qterm/qterm-0.7.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/qtfm/qtfm-5.5.ebuild b/x11-misc/qtfm/qtfm-5.5.ebuild
index 80e89408ed6..7fae7fc6b02 100644
--- a/x11-misc/qtfm/qtfm-5.5.ebuild
+++ b/x11-misc/qtfm/qtfm-5.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
inherit fdo-mime qt4-r2
diff --git a/x11-misc/qtnotifydaemon/qtnotifydaemon-1.0.14.ebuild b/x11-misc/qtnotifydaemon/qtnotifydaemon-1.0.14.ebuild
index 51c247a5a82..a210a436ee8 100644
--- a/x11-misc/qtnotifydaemon/qtnotifydaemon-1.0.14.ebuild
+++ b/x11-misc/qtnotifydaemon/qtnotifydaemon-1.0.14.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
inherit qt4-r2
diff --git a/x11-misc/quitcount/quitcount-3.1.3.ebuild b/x11-misc/quitcount/quitcount-3.1.3.ebuild
index af6a20e0e8a..36f0e61fa25 100644
--- a/x11-misc/quitcount/quitcount-3.1.3.ebuild
+++ b/x11-misc/quitcount/quitcount-3.1.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit gnome2-utils
diff --git a/x11-misc/qxkb/qxkb-0.4.6.ebuild b/x11-misc/qxkb/qxkb-0.4.6.ebuild
index 65e5be7c112..f9ae5509e25 100644
--- a/x11-misc/qxkb/qxkb-0.4.6.ebuild
+++ b/x11-misc/qxkb/qxkb-0.4.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
inherit cmake-utils
diff --git a/x11-misc/read-edid/read-edid-1.4.2.ebuild b/x11-misc/read-edid/read-edid-1.4.2.ebuild
index b3976804f4d..057a1743fdc 100644
--- a/x11-misc/read-edid/read-edid-1.4.2.ebuild
+++ b/x11-misc/read-edid/read-edid-1.4.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/x11-misc/read-edid/read-edid-3.0.1.ebuild b/x11-misc/read-edid/read-edid-3.0.1.ebuild
index 34c694f8e9b..97bf697d658 100644
--- a/x11-misc/read-edid/read-edid-3.0.1.ebuild
+++ b/x11-misc/read-edid/read-edid-3.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
inherit cmake-utils
diff --git a/x11-misc/read-edid/read-edid-3.0.2.ebuild b/x11-misc/read-edid/read-edid-3.0.2.ebuild
index 0c59448a03e..be792cbc119 100644
--- a/x11-misc/read-edid/read-edid-3.0.2.ebuild
+++ b/x11-misc/read-edid/read-edid-3.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
inherit cmake-utils
diff --git a/x11-misc/rednotebook/rednotebook-1.14.ebuild b/x11-misc/rednotebook/rednotebook-1.14.ebuild
index 7e0bc57ff8b..39d840c5937 100644
--- a/x11-misc/rednotebook/rednotebook-1.14.ebuild
+++ b/x11-misc/rednotebook/rednotebook-1.14.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/rednotebook/rednotebook-1.8.0.ebuild b/x11-misc/rednotebook/rednotebook-1.8.0.ebuild
index dfa41543bc5..4619a5e6caa 100644
--- a/x11-misc/rednotebook/rednotebook-1.8.0.ebuild
+++ b/x11-misc/rednotebook/rednotebook-1.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/x11-misc/redshift/redshift-1.11-r1.ebuild b/x11-misc/redshift/redshift-1.11-r1.ebuild
index d8336110bd8..d9f7e168280 100644
--- a/x11-misc/redshift/redshift-1.11-r1.ebuild
+++ b/x11-misc/redshift/redshift-1.11-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=( python3_4 python3_5 )
diff --git a/x11-misc/rendercheck/rendercheck-1.5.ebuild b/x11-misc/rendercheck/rendercheck-1.5.ebuild
index c7c68cdedca..5171d61cedf 100644
--- a/x11-misc/rendercheck/rendercheck-1.5.ebuild
+++ b/x11-misc/rendercheck/rendercheck-1.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/revelation/revelation-0.4.14-r1.ebuild b/x11-misc/revelation/revelation-0.4.14-r1.ebuild
index 2bbfc3773be..0a270428d9e 100644
--- a/x11-misc/revelation/revelation-0.4.14-r1.ebuild
+++ b/x11-misc/revelation/revelation-0.4.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
PYTHON_COMPAT=( python2_7 )
diff --git a/x11-misc/rodent/rodent-4.9.2.ebuild b/x11-misc/rodent/rodent-4.9.2.ebuild
index ac332dc4431..0062d599c1a 100644
--- a/x11-misc/rodent/rodent-4.9.2.ebuild
+++ b/x11-misc/rodent/rodent-4.9.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
EAUTORECONF=yes
diff --git a/x11-misc/rodent/rodent-5.3.16.3.ebuild b/x11-misc/rodent/rodent-5.3.16.3.ebuild
index ff83f92fd88..af6c292d56e 100644
--- a/x11-misc/rodent/rodent-5.3.16.3.ebuild
+++ b/x11-misc/rodent/rodent-5.3.16.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit autotools
diff --git a/x11-misc/rofi/rofi-1.2.0.ebuild b/x11-misc/rofi/rofi-1.2.0.ebuild
index 7095c50ef20..59c53e7b41b 100644
--- a/x11-misc/rofi/rofi-1.2.0.ebuild
+++ b/x11-misc/rofi/rofi-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
inherit autotools eutils toolchain-funcs
diff --git a/x11-misc/rofi/rofi-1.3.0.ebuild b/x11-misc/rofi/rofi-1.3.0.ebuild
index 7095c50ef20..59c53e7b41b 100644
--- a/x11-misc/rofi/rofi-1.3.0.ebuild
+++ b/x11-misc/rofi/rofi-1.3.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit autotools eutils toolchain-funcs
diff --git a/x11-misc/rofi/rofi-1.3.1.ebuild b/x11-misc/rofi/rofi-1.3.1.ebuild
index 3bffd04c76b..6f41c2dfab6 100644
--- a/x11-misc/rofi/rofi-1.3.1.ebuild
+++ b/x11-misc/rofi/rofi-1.3.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit autotools toolchain-funcs
diff --git a/x11-misc/rss-glx/rss-glx-0.9.1.ebuild b/x11-misc/rss-glx/rss-glx-0.9.1.ebuild
index bdd70eea770..59f0d1afaf1 100644
--- a/x11-misc/rss-glx/rss-glx-0.9.1.ebuild
+++ b/x11-misc/rss-glx/rss-glx-0.9.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
inherit autotools eutils multilib
diff --git a/x11-misc/screen-message/screen-message-0.23.ebuild b/x11-misc/screen-message/screen-message-0.23.ebuild
index 5dbe3f9b8e7..59c9f5362c9 100644
--- a/x11-misc/screen-message/screen-message-0.23.ebuild
+++ b/x11-misc/screen-message/screen-message-0.23.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/x11-misc/screen-message/screen-message-0.24.ebuild b/x11-misc/screen-message/screen-message-0.24.ebuild
index 6f6045d5909..bd4cac87586 100644
--- a/x11-misc/screen-message/screen-message-0.24.ebuild
+++ b/x11-misc/screen-message/screen-message-0.24.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/x11-misc/screengrab/screengrab-1.2.1-r1.ebuild b/x11-misc/screengrab/screengrab-1.2.1-r1.ebuild
index 33b29e4883b..f74d9c2b149 100644
--- a/x11-misc/screengrab/screengrab-1.2.1-r1.ebuild
+++ b/x11-misc/screengrab/screengrab-1.2.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/x11-misc/sct/sct-0.3.ebuild b/x11-misc/sct/sct-0.3.ebuild
index 2dde0bf297c..27cb847d084 100644
--- a/x11-misc/sct/sct-0.3.ebuild
+++ b/x11-misc/sct/sct-0.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/sddm/sddm-0.13.0-r3.ebuild b/x11-misc/sddm/sddm-0.13.0-r3.ebuild
index 164a5658399..349b8d3cd5a 100644
--- a/x11-misc/sddm/sddm-0.13.0-r3.ebuild
+++ b/x11-misc/sddm/sddm-0.13.0-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 cmake-utils user
diff --git a/x11-misc/sddm/sddm-0.14.0-r2.ebuild b/x11-misc/sddm/sddm-0.14.0-r2.ebuild
index da52b152d67..8946151552d 100644
--- a/x11-misc/sddm/sddm-0.14.0-r2.ebuild
+++ b/x11-misc/sddm/sddm-0.14.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
inherit cmake-utils user
diff --git a/x11-misc/seetxt/seetxt-0.72-r1.ebuild b/x11-misc/seetxt/seetxt-0.72-r1.ebuild
index 8a974393e53..a61c7e23447 100644
--- a/x11-misc/seetxt/seetxt-0.72-r1.ebuild
+++ b/x11-misc/seetxt/seetxt-0.72-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/x11-misc/sent/sent-0.2.ebuild b/x11-misc/sent/sent-0.2.ebuild
index aeb1433d5bf..0a7f112dc40 100644
--- a/x11-misc/sent/sent-0.2.ebuild
+++ b/x11-misc/sent/sent-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
inherit savedconfig toolchain-funcs
diff --git a/x11-misc/sent/sent-9999.ebuild b/x11-misc/sent/sent-9999.ebuild
index 0cd3dc0e659..4f8a213ac4f 100644
--- a/x11-misc/sent/sent-9999.ebuild
+++ b/x11-misc/sent/sent-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit git-r3 savedconfig toolchain-funcs
diff --git a/x11-misc/set_opacity/set_opacity-1.0.ebuild b/x11-misc/set_opacity/set_opacity-1.0.ebuild
index 5cf114b548b..6f014ba2556 100644
--- a/x11-misc/set_opacity/set_opacity-1.0.ebuild
+++ b/x11-misc/set_opacity/set_opacity-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="4"
diff --git a/x11-misc/set_opacity/set_opacity-9999.ebuild b/x11-misc/set_opacity/set_opacity-9999.ebuild
index 3626e687308..5d3a926a7b1 100644
--- a/x11-misc/set_opacity/set_opacity-9999.ebuild
+++ b/x11-misc/set_opacity/set_opacity-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/x11-misc/shared-mime-info/shared-mime-info-1.4.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.4.ebuild
index 8cb6b318bea..21f9b12cdba 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.4.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils fdo-mime
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.6.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.6.ebuild
index a6c1df52072..7d4ea8b7b5d 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.6.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils fdo-mime
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.7.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.7.ebuild
index a6c1df52072..7d4ea8b7b5d 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.7.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils fdo-mime
diff --git a/x11-misc/shared-mime-info/shared-mime-info-1.8.ebuild b/x11-misc/shared-mime-info/shared-mime-info-1.8.ebuild
index e950a4b8120..e7842876031 100644
--- a/x11-misc/shared-mime-info/shared-mime-info-1.8.ebuild
+++ b/x11-misc/shared-mime-info/shared-mime-info-1.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
inherit eutils fdo-mime
diff --git a/x11-misc/shutter/shutter-0.93.1-r3.ebuild b/x11-misc/shutter/shutter-0.93.1-r3.ebuild
index bb5435a6694..56732b72603 100644
--- a/x11-misc/shutter/shutter-0.93.1-r3.ebuild
+++ b/x11-misc/shutter/shutter-0.93.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
inherit eutils
diff --git a/x11-misc/shutterbug/shutterbug-1.7.49.ebuild b/x11-misc/shutterbug/shutterbug-1.7.49.ebuild
index 86447916e3b..97de0d1eef9 100644
--- a/x11-misc/shutterbug/shutterbug-1.7.49.ebuild
+++ b/x11-misc/shutterbug/shutterbug-1.7.49.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/x11-misc/simple-ccsm/simple-ccsm-0.8.4-r2.ebuild b/x11-misc/simple-ccsm/simple-ccsm-0.8.4-r2.ebuild
index fe915c56f6e..a56e4fee010 100644
--- a/x11-misc/simple-ccsm/simple-ccsm-0.8.4-r2.ebuild
+++ b/x11-misc/simple-ccsm/simple-ccsm-0.8.4-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/x11-misc/simpleswitcher/simpleswitcher-9999.ebuild b/x11-misc/simpleswitcher/simpleswitcher-9999.ebuild
index b88c1ef11a3..c1f66e461b2 100644
--- a/x11-misc/simpleswitcher/simpleswitcher-9999.ebuild
+++ b/x11-misc/simpleswitcher/simpleswitcher-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/x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild b/x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild
index 548f712a195..8382ae2c209 100644
--- a/x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild
+++ b/x11-misc/sisctrl/sisctrl-0.0.20051202.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils flag-o-matic
diff --git a/x11-misc/skippy/skippy-0.5.0-r1.ebuild b/x11-misc/skippy/skippy-0.5.0-r1.ebuild
index 7088be7679c..870e0346347 100644
--- a/x11-misc/skippy/skippy-0.5.0-r1.ebuild
+++ b/x11-misc/skippy/skippy-0.5.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit toolchain-funcs
diff --git a/x11-misc/skippy/skippy-0.5.0.ebuild b/x11-misc/skippy/skippy-0.5.0.ebuild
index 2b01e3e4817..8bacad6b5a2 100644
--- a/x11-misc/skippy/skippy-0.5.0.ebuild
+++ b/x11-misc/skippy/skippy-0.5.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
inherit eutils toolchain-funcs
diff --git a/x11-misc/slim/slim-1.3.6-r3.ebuild b/x11-misc/slim/slim-1.3.6-r3.ebuild
index f23ae7d9771..8da12a6b392 100644
--- a/x11-misc/slim/slim-1.3.6-r3.ebuild
+++ b/x11-misc/slim/slim-1.3.6-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/x11-misc/slim/slim-1.3.6-r5.ebuild b/x11-misc/slim/slim-1.3.6-r5.ebuild
index 4db59954c78..6663621cf77 100644
--- a/x11-misc/slim/slim-1.3.6-r5.ebuild
+++ b/x11-misc/slim/slim-1.3.6-r5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/slim/slim-9999.ebuild b/x11-misc/slim/slim-9999.ebuild
index 056005836c3..c9e1e0bad32 100644
--- a/x11-misc/slim/slim-9999.ebuild
+++ b/x11-misc/slim/slim-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/slock/slock-1.4.ebuild b/x11-misc/slock/slock-1.4.ebuild
index f445eefd6ea..452035f1777 100644
--- a/x11-misc/slock/slock-1.4.ebuild
+++ b/x11-misc/slock/slock-1.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit fcaps savedconfig toolchain-funcs
diff --git a/x11-misc/slop/slop-4.3.21.ebuild b/x11-misc/slop/slop-4.3.21.ebuild
index 2a90460ad59..20411872e46 100644
--- a/x11-misc/slop/slop-4.3.21.ebuild
+++ b/x11-misc/slop/slop-4.3.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/x11-misc/spacefm/spacefm-1.0.4-r1.ebuild b/x11-misc/spacefm/spacefm-1.0.4-r1.ebuild
index e147de85b9c..0da9d7c807d 100644
--- a/x11-misc/spacefm/spacefm-1.0.4-r1.ebuild
+++ b/x11-misc/spacefm/spacefm-1.0.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=6
diff --git a/x11-misc/spacefm/spacefm-1.0.4.ebuild b/x11-misc/spacefm/spacefm-1.0.4.ebuild
index d678c6b04fc..37739f494bd 100644
--- a/x11-misc/spacefm/spacefm-1.0.4.ebuild
+++ b/x11-misc/spacefm/spacefm-1.0.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/spacefm/spacefm-1.0.5-r1.ebuild b/x11-misc/spacefm/spacefm-1.0.5-r1.ebuild
index 9b79d32f30c..ebd8d059e51 100644
--- a/x11-misc/spacefm/spacefm-1.0.5-r1.ebuild
+++ b/x11-misc/spacefm/spacefm-1.0.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild b/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild
index 45a33f6fdd3..8be650a7fb8 100644
--- a/x11-misc/spacefm/spacefm-1.0.5-r2.ebuild
+++ b/x11-misc/spacefm/spacefm-1.0.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=6
diff --git a/x11-misc/spacefm/spacefm-9999.ebuild b/x11-misc/spacefm/spacefm-9999.ebuild
index 444e767d410..b8447f476d6 100644
--- a/x11-misc/spacefm/spacefm-9999.ebuild
+++ b/x11-misc/spacefm/spacefm-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/x11-misc/spnavcfg/spnavcfg-0.3.ebuild b/x11-misc/spnavcfg/spnavcfg-0.3.ebuild
index 4af7bbb9860..b6cb667f0d7 100644
--- a/x11-misc/spnavcfg/spnavcfg-0.3.ebuild
+++ b/x11-misc/spnavcfg/spnavcfg-0.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/sprop/sprop-0.1-r1.ebuild b/x11-misc/sprop/sprop-0.1-r1.ebuild
index f8d218eb8e6..81b596772ce 100644
--- a/x11-misc/sprop/sprop-0.1-r1.ebuild
+++ b/x11-misc/sprop/sprop-0.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit toolchain-funcs
diff --git a/x11-misc/sselp/sselp-0.2-r1.ebuild b/x11-misc/sselp/sselp-0.2-r1.ebuild
index 0a23f985555..4e0b72294b1 100644
--- a/x11-misc/sselp/sselp-0.2-r1.ebuild
+++ b/x11-misc/sselp/sselp-0.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit toolchain-funcs
diff --git a/x11-misc/sselp/sselp-0.2.ebuild b/x11-misc/sselp/sselp-0.2.ebuild
index 4b7e2fee6d6..6f267e60a59 100644
--- a/x11-misc/sselp/sselp-0.2.ebuild
+++ b/x11-misc/sselp/sselp-0.2.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/x11-misc/sselp/sselp-9999.ebuild b/x11-misc/sselp/sselp-9999.ebuild
index 65a33750b80..c87464851d0 100644
--- a/x11-misc/sselp/sselp-9999.ebuild
+++ b/x11-misc/sselp/sselp-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit git-r3 toolchain-funcs
diff --git a/x11-misc/stalonetray/stalonetray-0.8.1.ebuild b/x11-misc/stalonetray/stalonetray-0.8.1.ebuild
index 6f86670ec19..949af4ef762 100644
--- a/x11-misc/stalonetray/stalonetray-0.8.1.ebuild
+++ b/x11-misc/stalonetray/stalonetray-0.8.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/x11-misc/stalonetray/stalonetray-0.8.3.ebuild b/x11-misc/stalonetray/stalonetray-0.8.3.ebuild
index 61549459441..d0b8be08fe4 100644
--- a/x11-misc/stalonetray/stalonetray-0.8.3.ebuild
+++ b/x11-misc/stalonetray/stalonetray-0.8.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/x11-misc/sunflower/sunflower-0.2_alpha59.ebuild b/x11-misc/sunflower/sunflower-0.2_alpha59.ebuild
index 689ac28550e..9d84a940842 100644
--- a/x11-misc/sunflower/sunflower-0.2_alpha59.ebuild
+++ b/x11-misc/sunflower/sunflower-0.2_alpha59.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/x11-misc/superswitcher/superswitcher-0.6.ebuild b/x11-misc/superswitcher/superswitcher-0.6.ebuild
index dac560e2cac..4165cec4ffa 100644
--- a/x11-misc/superswitcher/superswitcher-0.6.ebuild
+++ b/x11-misc/superswitcher/superswitcher-0.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
inherit autotools eutils
diff --git a/x11-misc/sux/sux-1.0-r4.ebuild b/x11-misc/sux/sux-1.0-r4.ebuild
index 43e3f723a45..f3ff910a3c1 100644
--- a/x11-misc/sux/sux-1.0-r4.ebuild
+++ b/x11-misc/sux/sux-1.0-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils
diff --git a/x11-misc/sw-notify-send/sw-notify-send-1.2.1.ebuild b/x11-misc/sw-notify-send/sw-notify-send-1.2.1.ebuild
index 7180d8b6de4..2440ec5a05e 100644
--- a/x11-misc/sw-notify-send/sw-notify-send-1.2.1.ebuild
+++ b/x11-misc/sw-notify-send/sw-notify-send-1.2.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/x11-misc/sw-notify-send/sw-notify-send-9999.ebuild b/x11-misc/sw-notify-send/sw-notify-send-9999.ebuild
index e5f93d1a673..9361ecdd072 100644
--- a/x11-misc/sw-notify-send/sw-notify-send-9999.ebuild
+++ b/x11-misc/sw-notify-send/sw-notify-send-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/sxhkd/sxhkd-0.5.3.ebuild b/x11-misc/sxhkd/sxhkd-0.5.3.ebuild
index a32e23f32c9..e81a8137a2e 100644
--- a/x11-misc/sxhkd/sxhkd-0.5.3.ebuild
+++ b/x11-misc/sxhkd/sxhkd-0.5.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils toolchain-funcs systemd
diff --git a/x11-misc/sxhkd/sxhkd-0.5.4.ebuild b/x11-misc/sxhkd/sxhkd-0.5.4.ebuild
index c8b37197dd4..8cb33704997 100644
--- a/x11-misc/sxhkd/sxhkd-0.5.4.ebuild
+++ b/x11-misc/sxhkd/sxhkd-0.5.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils toolchain-funcs systemd
diff --git a/x11-misc/sxhkd/sxhkd-0.5.5.ebuild b/x11-misc/sxhkd/sxhkd-0.5.5.ebuild
index 538355f4888..3929deb6038 100644
--- a/x11-misc/sxhkd/sxhkd-0.5.5.ebuild
+++ b/x11-misc/sxhkd/sxhkd-0.5.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils toolchain-funcs systemd
diff --git a/x11-misc/sxhkd/sxhkd-0.5.6.ebuild b/x11-misc/sxhkd/sxhkd-0.5.6.ebuild
index 48c79e3a5f5..550430006e2 100644
--- a/x11-misc/sxhkd/sxhkd-0.5.6.ebuild
+++ b/x11-misc/sxhkd/sxhkd-0.5.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
inherit toolchain-funcs systemd
diff --git a/x11-misc/sxhkd/sxhkd-0.5.7.ebuild b/x11-misc/sxhkd/sxhkd-0.5.7.ebuild
index 26cfda4dee8..2583e00848e 100644
--- a/x11-misc/sxhkd/sxhkd-0.5.7.ebuild
+++ b/x11-misc/sxhkd/sxhkd-0.5.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
inherit toolchain-funcs systemd
diff --git a/x11-misc/synergy/synergy-1.6.3.ebuild b/x11-misc/synergy/synergy-1.6.3.ebuild
index 1d09f1f5146..266180f7bba 100644
--- a/x11-misc/synergy/synergy-1.6.3.ebuild
+++ b/x11-misc/synergy/synergy-1.6.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils flag-o-matic gnome2-utils cmake-utils qt4-r2
diff --git a/x11-misc/synergy/synergy-1.8.1-r3.ebuild b/x11-misc/synergy/synergy-1.8.1-r3.ebuild
index f78f88871ac..74d155ef823 100644
--- a/x11-misc/synergy/synergy-1.8.1-r3.ebuild
+++ b/x11-misc/synergy/synergy-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=5
inherit eutils flag-o-matic gnome2-utils cmake-utils qt4-r2
diff --git a/x11-misc/synergy/synergy-1.8.2.ebuild b/x11-misc/synergy/synergy-1.8.2.ebuild
index f78f88871ac..74d155ef823 100644
--- a/x11-misc/synergy/synergy-1.8.2.ebuild
+++ b/x11-misc/synergy/synergy-1.8.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils flag-o-matic gnome2-utils cmake-utils qt4-r2
diff --git a/x11-misc/synergy/synergy-1.8.5.ebuild b/x11-misc/synergy/synergy-1.8.5.ebuild
index 174985abd7f..51c84973290 100644
--- a/x11-misc/synergy/synergy-1.8.5.ebuild
+++ b/x11-misc/synergy/synergy-1.8.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils flag-o-matic gnome2-utils cmake-utils qt4-r2
diff --git a/x11-misc/synergy/synergy-1.8.6.ebuild b/x11-misc/synergy/synergy-1.8.6.ebuild
index e9a3c93da4c..331f3165612 100644
--- a/x11-misc/synergy/synergy-1.8.6.ebuild
+++ b/x11-misc/synergy/synergy-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=5
inherit eutils flag-o-matic gnome2-utils cmake-utils qt4-r2
diff --git a/x11-misc/tabbed/tabbed-0.6.ebuild b/x11-misc/tabbed/tabbed-0.6.ebuild
index de4295939f2..4b5c46fdd21 100644
--- a/x11-misc/tabbed/tabbed-0.6.ebuild
+++ b/x11-misc/tabbed/tabbed-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
inherit savedconfig toolchain-funcs
diff --git a/x11-misc/tint2/tint2-0.11-r2.ebuild b/x11-misc/tint2/tint2-0.11-r2.ebuild
index 53ceaed92b6..b4ac0ede3cc 100644
--- a/x11-misc/tint2/tint2-0.11-r2.ebuild
+++ b/x11-misc/tint2/tint2-0.11-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/x11-misc/tint2/tint2-0.12.12.ebuild b/x11-misc/tint2/tint2-0.12.12.ebuild
index 785c1a260d6..25e17665bd3 100644
--- a/x11-misc/tint2/tint2-0.12.12.ebuild
+++ b/x11-misc/tint2/tint2-0.12.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/x11-misc/tint2/tint2-0.12.3.ebuild b/x11-misc/tint2/tint2-0.12.3.ebuild
index 6e0ba1f86c1..8f076c0c139 100644
--- a/x11-misc/tint2/tint2-0.12.3.ebuild
+++ b/x11-misc/tint2/tint2-0.12.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/tintwizard/tintwizard-0.3.4-r2.ebuild b/x11-misc/tintwizard/tintwizard-0.3.4-r2.ebuild
index 1690a00ab37..cb32eb555ea 100644
--- a/x11-misc/tintwizard/tintwizard-0.3.4-r2.ebuild
+++ b/x11-misc/tintwizard/tintwizard-0.3.4-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/tinymount/tinymount-0.2.8.ebuild b/x11-misc/tinymount/tinymount-0.2.8.ebuild
index 0bad1c60fcd..10392535326 100644
--- a/x11-misc/tinymount/tinymount-0.2.8.ebuild
+++ b/x11-misc/tinymount/tinymount-0.2.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
PLOCALES="ru uk"
diff --git a/x11-misc/tinynotify-send/tinynotify-send-1.2.1-r1.ebuild b/x11-misc/tinynotify-send/tinynotify-send-1.2.1-r1.ebuild
index 0581268d49f..a8d7b17412f 100644
--- a/x11-misc/tinynotify-send/tinynotify-send-1.2.1-r1.ebuild
+++ b/x11-misc/tinynotify-send/tinynotify-send-1.2.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=4
diff --git a/x11-misc/tinynotify-send/tinynotify-send-9999.ebuild b/x11-misc/tinynotify-send/tinynotify-send-9999.ebuild
index 8fb89d27c5d..5be8ecd6e15 100644
--- a/x11-misc/tinynotify-send/tinynotify-send-9999.ebuild
+++ b/x11-misc/tinynotify-send/tinynotify-send-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/x11-misc/touchcal/touchcal-0.50.ebuild b/x11-misc/touchcal/touchcal-0.50.ebuild
index 60c8b047fc0..818373db2c5 100644
--- a/x11-misc/touchcal/touchcal-0.50.ebuild
+++ b/x11-misc/touchcal/touchcal-0.50.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/x11-misc/touchcal/touchcal-0.80.ebuild b/x11-misc/touchcal/touchcal-0.80.ebuild
index de41f566697..45e012149a1 100644
--- a/x11-misc/touchcal/touchcal-0.80.ebuild
+++ b/x11-misc/touchcal/touchcal-0.80.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="6"
diff --git a/x11-misc/touchfreeze/touchfreeze-0.2.5-r1.ebuild b/x11-misc/touchfreeze/touchfreeze-0.2.5-r1.ebuild
index 57ac2f3cc60..a473260e01e 100644
--- a/x11-misc/touchfreeze/touchfreeze-0.2.5-r1.ebuild
+++ b/x11-misc/touchfreeze/touchfreeze-0.2.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/x11-misc/trayer-srg/trayer-srg-1.1.5.ebuild b/x11-misc/trayer-srg/trayer-srg-1.1.5.ebuild
index 2e150e2a68a..33c2f8e20c6 100644
--- a/x11-misc/trayer-srg/trayer-srg-1.1.5.ebuild
+++ b/x11-misc/trayer-srg/trayer-srg-1.1.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/x11-misc/trayer-srg/trayer-srg-1.1.6-r1.ebuild b/x11-misc/trayer-srg/trayer-srg-1.1.6-r1.ebuild
index 58fa1121f9b..a28a517ab56 100644
--- a/x11-misc/trayer-srg/trayer-srg-1.1.6-r1.ebuild
+++ b/x11-misc/trayer-srg/trayer-srg-1.1.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/x11-misc/trayer/trayer-1.0-r1.ebuild b/x11-misc/trayer/trayer-1.0-r1.ebuild
index 022c8622c50..aef6b762a1c 100644
--- a/x11-misc/trayer/trayer-1.0-r1.ebuild
+++ b/x11-misc/trayer/trayer-1.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
inherit toolchain-funcs
diff --git a/x11-misc/trayer/trayer-1.0-r2.ebuild b/x11-misc/trayer/trayer-1.0-r2.ebuild
index be69dd0547d..b90b05395cf 100644
--- a/x11-misc/trayer/trayer-1.0-r2.ebuild
+++ b/x11-misc/trayer/trayer-1.0-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit toolchain-funcs
diff --git a/x11-misc/treeline/treeline-1.4.1-r1.ebuild b/x11-misc/treeline/treeline-1.4.1-r1.ebuild
index 722f2b42ba2..e25cabea40c 100644
--- a/x11-misc/treeline/treeline-1.4.1-r1.ebuild
+++ b/x11-misc/treeline/treeline-1.4.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/x11-misc/treeline/treeline-1.9.4.ebuild b/x11-misc/treeline/treeline-1.9.4.ebuild
index e18e01c6be9..f93d114afa8 100644
--- a/x11-misc/treeline/treeline-1.9.4.ebuild
+++ b/x11-misc/treeline/treeline-1.9.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/unclutter/unclutter-8-r2.ebuild b/x11-misc/unclutter/unclutter-8-r2.ebuild
index 9d68313ac09..d41f925d390 100644
--- a/x11-misc/unclutter/unclutter-8-r2.ebuild
+++ b/x11-misc/unclutter/unclutter-8-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
diff --git a/x11-misc/unclutter/unclutter-8-r4.ebuild b/x11-misc/unclutter/unclutter-8-r4.ebuild
index 1372a6c79a6..beea7d0f79e 100644
--- a/x11-misc/unclutter/unclutter-8-r4.ebuild
+++ b/x11-misc/unclutter/unclutter-8-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/urxvt-font-size/urxvt-font-size-1.1.ebuild b/x11-misc/urxvt-font-size/urxvt-font-size-1.1.ebuild
index 20cf2b574ff..697cfbd7070 100644
--- a/x11-misc/urxvt-font-size/urxvt-font-size-1.1.ebuild
+++ b/x11-misc/urxvt-font-size/urxvt-font-size-1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit multilib
diff --git a/x11-misc/urxvt-font-size/urxvt-font-size-9999.ebuild b/x11-misc/urxvt-font-size/urxvt-font-size-9999.ebuild
index 3cccaa79a6b..aaaec042cca 100644
--- a/x11-misc/urxvt-font-size/urxvt-font-size-9999.ebuild
+++ b/x11-misc/urxvt-font-size/urxvt-font-size-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit multilib
diff --git a/x11-misc/urxvt-perls/urxvt-perls-2.2.ebuild b/x11-misc/urxvt-perls/urxvt-perls-2.2.ebuild
index 1fbc2055fd8..197cc127f82 100644
--- a/x11-misc/urxvt-perls/urxvt-perls-2.2.ebuild
+++ b/x11-misc/urxvt-perls/urxvt-perls-2.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/urxvtconfig/urxvtconfig-1.0.ebuild b/x11-misc/urxvtconfig/urxvtconfig-1.0.ebuild
index e0573b265ad..2d03fe886dd 100644
--- a/x11-misc/urxvtconfig/urxvtconfig-1.0.ebuild
+++ b/x11-misc/urxvtconfig/urxvtconfig-1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/util-macros/util-macros-1.19.1.ebuild b/x11-misc/util-macros/util-macros-1.19.1.ebuild
index 2508d3c3d9d..a27180b34a8 100644
--- a/x11-misc/util-macros/util-macros-1.19.1.ebuild
+++ b/x11-misc/util-macros/util-macros-1.19.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 xorg-2
diff --git a/x11-misc/vdpauinfo/vdpauinfo-1.0.ebuild b/x11-misc/vdpauinfo/vdpauinfo-1.0.ebuild
index f2eb3973022..d3dbaaac30c 100644
--- a/x11-misc/vdpauinfo/vdpauinfo-1.0.ebuild
+++ b/x11-misc/vdpauinfo/vdpauinfo-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/x11-misc/viewglob/viewglob-2.0.4-r1.ebuild b/x11-misc/viewglob/viewglob-2.0.4-r1.ebuild
index 20cdb09ecaa..002f4494df2 100644
--- a/x11-misc/viewglob/viewglob-2.0.4-r1.ebuild
+++ b/x11-misc/viewglob/viewglob-2.0.4-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild b/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild
index 0b29737e94a..6df4d7616cb 100644
--- a/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild
+++ b/x11-misc/virtualgl/virtualgl-2.4.1-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit cmake-multilib multilib systemd
diff --git a/x11-misc/virtualgl/virtualgl-2.5.1.ebuild b/x11-misc/virtualgl/virtualgl-2.5.1.ebuild
index af1d5aaedf6..a90df85ec7a 100644
--- a/x11-misc/virtualgl/virtualgl-2.5.1.ebuild
+++ b/x11-misc/virtualgl/virtualgl-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 cmake-multilib multilib systemd
diff --git a/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild b/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild
index 232f807f473..b850412ff45 100644
--- a/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild
+++ b/x11-misc/vnc2swf/vnc2swf-0.5.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils
diff --git a/x11-misc/vym/vym-2.3.22.ebuild b/x11-misc/vym/vym-2.3.22.ebuild
index 073ee6392a1..8d87694be06 100644
--- a/x11-misc/vym/vym-2.3.22.ebuild
+++ b/x11-misc/vym/vym-2.3.22.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 cmake-utils
diff --git a/x11-misc/vym/vym-2.3.24.ebuild b/x11-misc/vym/vym-2.3.24.ebuild
index fd7e47a0004..70fb69c5c70 100644
--- a/x11-misc/vym/vym-2.3.24.ebuild
+++ b/x11-misc/vym/vym-2.3.24.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils cmake-utils
diff --git a/x11-misc/vym/vym-9999.ebuild b/x11-misc/vym/vym-9999.ebuild
index d12bbab56d8..f715ebabefe 100644
--- a/x11-misc/vym/vym-9999.ebuild
+++ b/x11-misc/vym/vym-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils cmake-utils git-r3
diff --git a/x11-misc/wayv/wayv-0.3-r2.ebuild b/x11-misc/wayv/wayv-0.3-r2.ebuild
index 548ead453f1..dd82e525972 100644
--- a/x11-misc/wayv/wayv-0.3-r2.ebuild
+++ b/x11-misc/wayv/wayv-0.3-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit toolchain-funcs
diff --git a/x11-misc/wbar/wbar-2.3.4-r1.ebuild b/x11-misc/wbar/wbar-2.3.4-r1.ebuild
index 7970c13ffd7..40424acd149 100644
--- a/x11-misc/wbar/wbar-2.3.4-r1.ebuild
+++ b/x11-misc/wbar/wbar-2.3.4-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/wbar/wbar-2.3.4-r2.ebuild b/x11-misc/wbar/wbar-2.3.4-r2.ebuild
index 5df203029c0..202555ff53d 100644
--- a/x11-misc/wbar/wbar-2.3.4-r2.ebuild
+++ b/x11-misc/wbar/wbar-2.3.4-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/wbarconf/wbarconf-0.7.2.2-r2.ebuild b/x11-misc/wbarconf/wbarconf-0.7.2.2-r2.ebuild
index 296121d8087..d5ff90ab324 100644
--- a/x11-misc/wbarconf/wbarconf-0.7.2.2-r2.ebuild
+++ b/x11-misc/wbarconf/wbarconf-0.7.2.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/x11-misc/wdm/wdm-1.28-r3.ebuild b/x11-misc/wdm/wdm-1.28-r3.ebuild
index 04b5fce3aa7..b1fdff29404 100644
--- a/x11-misc/wdm/wdm-1.28-r3.ebuild
+++ b/x11-misc/wdm/wdm-1.28-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
inherit eutils pam
diff --git a/x11-misc/wdm/wdm-1.28-r4.ebuild b/x11-misc/wdm/wdm-1.28-r4.ebuild
index b0fb0bb2ba1..997d53b8b43 100644
--- a/x11-misc/wdm/wdm-1.28-r4.ebuild
+++ b/x11-misc/wdm/wdm-1.28-r4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/whaw/whaw-0.2.ebuild b/x11-misc/whaw/whaw-0.2.ebuild
index 08c605ad121..ca7e6ab903d 100644
--- a/x11-misc/whaw/whaw-0.2.ebuild
+++ b/x11-misc/whaw/whaw-0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/x11-misc/wininfo/wininfo-0.7-r1.ebuild b/x11-misc/wininfo/wininfo-0.7-r1.ebuild
index e297f33079c..9e1b1faf803 100644
--- a/x11-misc/wininfo/wininfo-0.7-r1.ebuild
+++ b/x11-misc/wininfo/wininfo-0.7-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/wininfo/wininfo-0.7.ebuild b/x11-misc/wininfo/wininfo-0.7.ebuild
index 6a92aa56bbb..b4281c3c6c5 100644
--- a/x11-misc/wininfo/wininfo-0.7.ebuild
+++ b/x11-misc/wininfo/wininfo-0.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
inherit eutils
diff --git a/x11-misc/winswitch/winswitch-0.12.18-r1.ebuild b/x11-misc/winswitch/winswitch-0.12.18-r1.ebuild
index 532a6440b17..290afbeebc9 100644
--- a/x11-misc/winswitch/winswitch-0.12.18-r1.ebuild
+++ b/x11-misc/winswitch/winswitch-0.12.18-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/x11-misc/wmakerconf/wmakerconf-2.12-r2.ebuild b/x11-misc/wmakerconf/wmakerconf-2.12-r2.ebuild
index 55be47edee3..991e592960c 100644
--- a/x11-misc/wmakerconf/wmakerconf-2.12-r2.ebuild
+++ b/x11-misc/wmakerconf/wmakerconf-2.12-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils
diff --git a/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild b/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild
index de12699232d..d25195833a3 100644
--- a/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild
+++ b/x11-misc/wmakerconf/wmakerconf-2.12-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/wmctrl/wmctrl-1.07-r1.ebuild b/x11-misc/wmctrl/wmctrl-1.07-r1.ebuild
index bab0a2937e3..ac96fe4f4f7 100644
--- a/x11-misc/wmctrl/wmctrl-1.07-r1.ebuild
+++ b/x11-misc/wmctrl/wmctrl-1.07-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils
diff --git a/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild b/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild
index c9f0e254d73..0e65b9b04de 100644
--- a/x11-misc/wmctrl/wmctrl-1.07-r2.ebuild
+++ b/x11-misc/wmctrl/wmctrl-1.07-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/x11-misc/wmiface/wmiface-2.1.ebuild b/x11-misc/wmiface/wmiface-2.1.ebuild
index 83dea5b4bd3..7ca378bc55e 100644
--- a/x11-misc/wmiface/wmiface-2.1.ebuild
+++ b/x11-misc/wmiface/wmiface-2.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/wmname/wmname-0.1-r1.ebuild b/x11-misc/wmname/wmname-0.1-r1.ebuild
index 401226183f4..0153b14c533 100644
--- a/x11-misc/wmname/wmname-0.1-r1.ebuild
+++ b/x11-misc/wmname/wmname-0.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/x11-misc/x11vnc/x11vnc-0.9.13_p20150111.ebuild b/x11-misc/x11vnc/x11vnc-0.9.13_p20150111.ebuild
index 6346d63037e..4fac03cbeaa 100644
--- a/x11-misc/x11vnc/x11vnc-0.9.13_p20150111.ebuild
+++ b/x11-misc/x11vnc/x11vnc-0.9.13_p20150111.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/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild b/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild
index ac24926814c..06112d6a0e6 100644
--- a/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild
+++ b/x11-misc/x2vnc/x2vnc-1.7.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils
diff --git a/x11-misc/x2x/x2x-1.27-r3.ebuild b/x11-misc/x2x/x2x-1.27-r3.ebuild
index e0834f4d008..491301daa02 100644
--- a/x11-misc/x2x/x2x-1.27-r3.ebuild
+++ b/x11-misc/x2x/x2x-1.27-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils toolchain-funcs
diff --git a/x11-misc/xaos/xaos-3.5-r1.ebuild b/x11-misc/xaos/xaos-3.5-r1.ebuild
index b49867b1111..9680d46ccdb 100644
--- a/x11-misc/xaos/xaos-3.5-r1.ebuild
+++ b/x11-misc/xaos/xaos-3.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/x11-misc/xaos/xaos-3.6.ebuild b/x11-misc/xaos/xaos-3.6.ebuild
index 3873d56e3c7..7146b4ea6f5 100644
--- a/x11-misc/xaos/xaos-3.6.ebuild
+++ b/x11-misc/xaos/xaos-3.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/x11-misc/xautolock/xautolock-2.2_p5.ebuild b/x11-misc/xautolock/xautolock-2.2_p5.ebuild
index 0fac157e6c2..7f4db94f50d 100644
--- a/x11-misc/xautolock/xautolock-2.2_p5.ebuild
+++ b/x11-misc/xautolock/xautolock-2.2_p5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit toolchain-funcs
diff --git a/x11-misc/xautolock/xautolock-2.2_p5_p1.ebuild b/x11-misc/xautolock/xautolock-2.2_p5_p1.ebuild
index 449a8b48fb2..8635e0199cc 100644
--- a/x11-misc/xautolock/xautolock-2.2_p5_p1.ebuild
+++ b/x11-misc/xautolock/xautolock-2.2_p5_p1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit toolchain-funcs versionator
diff --git a/x11-misc/xautomation/xautomation-1.05.ebuild b/x11-misc/xautomation/xautomation-1.05.ebuild
index b74f97831bf..8502781f6c2 100644
--- a/x11-misc/xautomation/xautomation-1.05.ebuild
+++ b/x11-misc/xautomation/xautomation-1.05.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/x11-misc/xautomation/xautomation-1.09-r1.ebuild b/x11-misc/xautomation/xautomation-1.09-r1.ebuild
index 5cb91344269..07d595c00e8 100644
--- a/x11-misc/xautomation/xautomation-1.09-r1.ebuild
+++ b/x11-misc/xautomation/xautomation-1.09-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/x11-misc/xbatt/xbatt-1.2.1-r1.ebuild b/x11-misc/xbatt/xbatt-1.2.1-r1.ebuild
index df07cf26f61..2030809b773 100644
--- a/x11-misc/xbatt/xbatt-1.2.1-r1.ebuild
+++ b/x11-misc/xbatt/xbatt-1.2.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
diff --git a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
index f1c2cc3b3bf..a3d3a1f562f 100644
--- a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
+++ b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
diff --git a/x11-misc/xbattbar/xbattbar-1.4.3.ebuild b/x11-misc/xbattbar/xbattbar-1.4.3.ebuild
index 91f8d25f15d..741039451f3 100644
--- a/x11-misc/xbattbar/xbattbar-1.4.3.ebuild
+++ b/x11-misc/xbattbar/xbattbar-1.4.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
inherit eutils flag-o-matic multilib toolchain-funcs
diff --git a/x11-misc/xbattbar/xbattbar-1.4.4.ebuild b/x11-misc/xbattbar/xbattbar-1.4.4.ebuild
index c13fbe10b3c..1ad8948f287 100644
--- a/x11-misc/xbattbar/xbattbar-1.4.4.ebuild
+++ b/x11-misc/xbattbar/xbattbar-1.4.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
diff --git a/x11-misc/xbattbar/xbattbar-1.4.5.ebuild b/x11-misc/xbattbar/xbattbar-1.4.5.ebuild
index 0e757f7df0c..002d77a4795 100644
--- a/x11-misc/xbattbar/xbattbar-1.4.5.ebuild
+++ b/x11-misc/xbattbar/xbattbar-1.4.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
diff --git a/x11-misc/xbattbar/xbattbar-1.4.8.ebuild b/x11-misc/xbattbar/xbattbar-1.4.8.ebuild
index 18b2d309dbd..9482253d7c8 100644
--- a/x11-misc/xbattbar/xbattbar-1.4.8.ebuild
+++ b/x11-misc/xbattbar/xbattbar-1.4.8.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
diff --git a/x11-misc/xbindkeys/xbindkeys-1.8.6.ebuild b/x11-misc/xbindkeys/xbindkeys-1.8.6.ebuild
index 95b31d2dae1..b1814ef7474 100644
--- a/x11-misc/xbindkeys/xbindkeys-1.8.6.ebuild
+++ b/x11-misc/xbindkeys/xbindkeys-1.8.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/x11-misc/xbitmaps/xbitmaps-1.1.1-r1.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.1-r1.ebuild
index 14f797683ed..0d2b0dd3dc0 100644
--- a/x11-misc/xbitmaps/xbitmaps-1.1.1-r1.ebuild
+++ b/x11-misc/xbitmaps/xbitmaps-1.1.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/xbitmaps/xbitmaps-1.1.1.ebuild b/x11-misc/xbitmaps/xbitmaps-1.1.1.ebuild
index 1c128df8611..d5598c17182 100644
--- a/x11-misc/xbitmaps/xbitmaps-1.1.1.ebuild
+++ b/x11-misc/xbitmaps/xbitmaps-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=3
diff --git a/x11-misc/xcalendar/xcalendar-4.0-r1.ebuild b/x11-misc/xcalendar/xcalendar-4.0-r1.ebuild
index bcf7f1e0ad4..192bae284cc 100644
--- a/x11-misc/xcalendar/xcalendar-4.0-r1.ebuild
+++ b/x11-misc/xcalendar/xcalendar-4.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
inherit eutils multilib
diff --git a/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild b/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild
index 99e1df4464f..bc43d94b458 100644
--- a/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild
+++ b/x11-misc/xcalendar/xcalendar-4.0-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit toolchain-funcs
diff --git a/x11-misc/xcalib/xcalib-0.9.0_p20161210.ebuild b/x11-misc/xcalib/xcalib-0.9.0_p20161210.ebuild
index 7200c2c7bf9..52da368b475 100644
--- a/x11-misc/xcalib/xcalib-0.9.0_p20161210.ebuild
+++ b/x11-misc/xcalib/xcalib-0.9.0_p20161210.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/x11-misc/xcape/xcape-1.0.ebuild b/x11-misc/xcape/xcape-1.0.ebuild
index 3f730fc33dd..bdcf6a50230 100644
--- a/x11-misc/xcape/xcape-1.0.ebuild
+++ b/x11-misc/xcape/xcape-1.0.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/x11-misc/xcape/xcape-1.1.ebuild b/x11-misc/xcape/xcape-1.1.ebuild
index 7356149a4f2..977f0de6788 100644
--- a/x11-misc/xcape/xcape-1.1.ebuild
+++ b/x11-misc/xcape/xcape-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/x11-misc/xcave/xcave-2.4.0.ebuild b/x11-misc/xcave/xcave-2.4.0.ebuild
index 246953daed9..656794b7c4d 100644
--- a/x11-misc/xcave/xcave-2.4.0.ebuild
+++ b/x11-misc/xcave/xcave-2.4.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/x11-misc/xcb/xcb-2.4-r1.ebuild b/x11-misc/xcb/xcb-2.4-r1.ebuild
index dde2a07bd3f..f6d054fdf6b 100644
--- a/x11-misc/xcb/xcb-2.4-r1.ebuild
+++ b/x11-misc/xcb/xcb-2.4-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit toolchain-funcs
diff --git a/x11-misc/xclip/xclip-0.13.ebuild b/x11-misc/xclip/xclip-0.13.ebuild
index 3d3b5d70345..0f925d76b52 100644
--- a/x11-misc/xclip/xclip-0.13.ebuild
+++ b/x11-misc/xclip/xclip-0.13.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/xcompmgr/xcompmgr-1.1.6.ebuild b/x11-misc/xcompmgr/xcompmgr-1.1.6.ebuild
index caf5f5a5103..a954ff9fa43 100644
--- a/x11-misc/xcompmgr/xcompmgr-1.1.6.ebuild
+++ b/x11-misc/xcompmgr/xcompmgr-1.1.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/x11-misc/xcompmgr/xcompmgr-1.1.7.ebuild b/x11-misc/xcompmgr/xcompmgr-1.1.7.ebuild
index cbcbaff2707..f49e264c1b7 100644
--- a/x11-misc/xcompmgr/xcompmgr-1.1.7.ebuild
+++ b/x11-misc/xcompmgr/xcompmgr-1.1.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/x11-misc/xdaliclock/xdaliclock-2.41.ebuild b/x11-misc/xdaliclock/xdaliclock-2.41.ebuild
index 89ba8859cdb..38457236661 100644
--- a/x11-misc/xdaliclock/xdaliclock-2.41.ebuild
+++ b/x11-misc/xdaliclock/xdaliclock-2.41.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/x11-misc/xdaliclock/xdaliclock-2.43.ebuild b/x11-misc/xdaliclock/xdaliclock-2.43.ebuild
index 96edd319d20..0311f6018de 100644
--- a/x11-misc/xdaliclock/xdaliclock-2.43.ebuild
+++ b/x11-misc/xdaliclock/xdaliclock-2.43.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/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r1.ebuild b/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r1.ebuild
index 43a8b912963..792e0dcda2d 100644
--- a/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r1.ebuild
+++ b/x11-misc/xdesktopwaves/xdesktopwaves-1.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="2"
diff --git a/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r2.ebuild b/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r2.ebuild
index c4a5b067cdb..5f59113be29 100644
--- a/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r2.ebuild
+++ b/x11-misc/xdesktopwaves/xdesktopwaves-1.3-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10.ebuild b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10.ebuild
index 4e31e245c9b..7e92c01704f 100644
--- a/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10.ebuild
+++ b/x11-misc/xdg-user-dirs-gtk/xdg-user-dirs-gtk-0.10.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit gnome.org readme.gentoo
diff --git a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.15.ebuild b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.15.ebuild
index db76d81feb4..7ed8fb165ad 100644
--- a/x11-misc/xdg-user-dirs/xdg-user-dirs-0.15.ebuild
+++ b/x11-misc/xdg-user-dirs/xdg-user-dirs-0.15.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit autotools eutils
diff --git a/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild b/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild
index f8caf160c02..c5e01113b9b 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.1.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit autotools
diff --git a/x11-misc/xdialog/xdialog-2.3.1.ebuild b/x11-misc/xdialog/xdialog-2.3.1.ebuild
index a4980a700aa..b98cd8fbe72 100644
--- a/x11-misc/xdialog/xdialog-2.3.1.ebuild
+++ b/x11-misc/xdialog/xdialog-2.3.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/xdiskusage/xdiskusage-1.48_p20111016.ebuild b/x11-misc/xdiskusage/xdiskusage-1.48_p20111016.ebuild
index ee06386f870..ec552d92bd6 100644
--- a/x11-misc/xdiskusage/xdiskusage-1.48_p20111016.ebuild
+++ b/x11-misc/xdiskusage/xdiskusage-1.48_p20111016.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
inherit autotools
diff --git a/x11-misc/xdiskusage/xdiskusage-1.51.ebuild b/x11-misc/xdiskusage/xdiskusage-1.51.ebuild
index 840f16eaaaa..2452e57b143 100644
--- a/x11-misc/xdiskusage/xdiskusage-1.51.ebuild
+++ b/x11-misc/xdiskusage/xdiskusage-1.51.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/xdo/xdo-0.3.ebuild b/x11-misc/xdo/xdo-0.3.ebuild
index caa8f0c26fe..eb109f1d01c 100644
--- a/x11-misc/xdo/xdo-0.3.ebuild
+++ b/x11-misc/xdo/xdo-0.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit toolchain-funcs
diff --git a/x11-misc/xdo/xdo-0.4.ebuild b/x11-misc/xdo/xdo-0.4.ebuild
index 778177ffc52..ecc09f373bf 100644
--- a/x11-misc/xdo/xdo-0.4.ebuild
+++ b/x11-misc/xdo/xdo-0.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit toolchain-funcs
diff --git a/x11-misc/xdo/xdo-0.5.ebuild b/x11-misc/xdo/xdo-0.5.ebuild
index 880c0bf7478..a3b6c5acf16 100644
--- a/x11-misc/xdo/xdo-0.5.ebuild
+++ b/x11-misc/xdo/xdo-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
inherit toolchain-funcs
diff --git a/x11-misc/xdock/xdock-0.3.0.ebuild b/x11-misc/xdock/xdock-0.3.0.ebuild
index 4427a3bf6cb..63c9381744b 100644
--- a/x11-misc/xdock/xdock-0.3.0.ebuild
+++ b/x11-misc/xdock/xdock-0.3.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit autotools eutils
diff --git a/x11-misc/xdotool/xdotool-2.20110530.1.ebuild b/x11-misc/xdotool/xdotool-2.20110530.1.ebuild
index d618ed45007..660360c91fe 100644
--- a/x11-misc/xdotool/xdotool-2.20110530.1.ebuild
+++ b/x11-misc/xdotool/xdotool-2.20110530.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/x11-misc/xdotool/xdotool-3.20150503.1-r1.ebuild b/x11-misc/xdotool/xdotool-3.20150503.1-r1.ebuild
index 5cb1c6e785b..d00fdab193d 100644
--- a/x11-misc/xdotool/xdotool-3.20150503.1-r1.ebuild
+++ b/x11-misc/xdotool/xdotool-3.20150503.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/xearth/xearth-1.1-r1.ebuild b/x11-misc/xearth/xearth-1.1-r1.ebuild
index e00b1c5b4ee..97ec7ce03fa 100644
--- a/x11-misc/xearth/xearth-1.1-r1.ebuild
+++ b/x11-misc/xearth/xearth-1.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/xfe/xfe-1.40.1.ebuild b/x11-misc/xfe/xfe-1.40.1.ebuild
index ce72a0b34a3..d4b519baba2 100644
--- a/x11-misc/xfe/xfe-1.40.1.ebuild
+++ b/x11-misc/xfe/xfe-1.40.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/x11-misc/xfe/xfe-1.41.ebuild b/x11-misc/xfe/xfe-1.41.ebuild
index aaee974bb32..b7246ac45bf 100644
--- a/x11-misc/xfe/xfe-1.41.ebuild
+++ b/x11-misc/xfe/xfe-1.41.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/x11-misc/xfe/xfe-1.42.ebuild b/x11-misc/xfe/xfe-1.42.ebuild
index aa618eda304..136f3676e14 100644
--- a/x11-misc/xfe/xfe-1.42.ebuild
+++ b/x11-misc/xfe/xfe-1.42.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/x11-misc/xfishtank/xfishtank-2.1-r2.ebuild b/x11-misc/xfishtank/xfishtank-2.1-r2.ebuild
index b5936fa5753..dbd26fe73cc 100644
--- a/x11-misc/xfishtank/xfishtank-2.1-r2.ebuild
+++ b/x11-misc/xfishtank/xfishtank-2.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/x11-misc/xfractint/xfractint-20.04_p12.ebuild b/x11-misc/xfractint/xfractint-20.04_p12.ebuild
index 0ed5221789c..ba46f9dec38 100644
--- a/x11-misc/xfractint/xfractint-20.04_p12.ebuild
+++ b/x11-misc/xfractint/xfractint-20.04_p12.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/x11-misc/xgestures/xgestures-0.4.ebuild b/x11-misc/xgestures/xgestures-0.4.ebuild
index df70e078d46..a9921db7a5d 100644
--- a/x11-misc/xgestures/xgestures-0.4.ebuild
+++ b/x11-misc/xgestures/xgestures-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/x11-misc/xhkeys/xhkeys-2.2.1.ebuild b/x11-misc/xhkeys/xhkeys-2.2.1.ebuild
index 8ec8e2c0009..e4c4db3ec3a 100644
--- a/x11-misc/xhkeys/xhkeys-2.2.1.ebuild
+++ b/x11-misc/xhkeys/xhkeys-2.2.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit eutils
diff --git a/x11-misc/xiccd/xiccd-0.2.3.ebuild b/x11-misc/xiccd/xiccd-0.2.3.ebuild
index 969007c8b69..71eb9b4bf53 100644
--- a/x11-misc/xiccd/xiccd-0.2.3.ebuild
+++ b/x11-misc/xiccd/xiccd-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=6
diff --git a/x11-misc/xidle/xidle-26052015.ebuild b/x11-misc/xidle/xidle-26052015.ebuild
index 86b0c0e124d..0ca23a545d6 100644
--- a/x11-misc/xidle/xidle-26052015.ebuild
+++ b/x11-misc/xidle/xidle-26052015.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit toolchain-funcs
diff --git a/x11-misc/xkbd/xkbd-0.8.15-r1.ebuild b/x11-misc/xkbd/xkbd-0.8.15-r1.ebuild
index d0da45f6569..85f6526cd4e 100644
--- a/x11-misc/xkbd/xkbd-0.8.15-r1.ebuild
+++ b/x11-misc/xkbd/xkbd-0.8.15-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
inherit eutils
diff --git a/x11-misc/xkbd/xkbd-0.8.16-r1.ebuild b/x11-misc/xkbd/xkbd-0.8.16-r1.ebuild
index 5c8bedd045a..421e082a6d6 100644
--- a/x11-misc/xkbd/xkbd-0.8.16-r1.ebuild
+++ b/x11-misc/xkbd/xkbd-0.8.16-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/x11-misc/xkbset/xkbset-0.5-r1.ebuild b/x11-misc/xkbset/xkbset-0.5-r1.ebuild
index 217d3958d64..f586aa0bb18 100644
--- a/x11-misc/xkbset/xkbset-0.5-r1.ebuild
+++ b/x11-misc/xkbset/xkbset-0.5-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils toolchain-funcs
diff --git a/x11-misc/xkbset/xkbset-0.5_p5_p1.ebuild b/x11-misc/xkbset/xkbset-0.5_p5_p1.ebuild
index f21621ae517..5d19ad1dddb 100644
--- a/x11-misc/xkbset/xkbset-0.5_p5_p1.ebuild
+++ b/x11-misc/xkbset/xkbset-0.5_p5_p1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit eutils toolchain-funcs versionator
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.14.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.14.ebuild
index 31cb3d28dd9..63e7f98781a 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.14.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.14.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.16.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.16.ebuild
index 31cb3d28dd9..63e7f98781a 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.16.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.16.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/x11-misc/xkeyboard-config/xkeyboard-config-2.17.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.17.ebuild
index 3a3e747a24c..52cfdf95ea9 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.17.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.17.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.18.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.18.ebuild
index 69a5f0393d6..9eff81cec7c 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.18.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.18.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/xkeyboard-config/xkeyboard-config-2.19.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.19.ebuild
index 1d2be4add68..293734f5092 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.19.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.19.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/x11-misc/xkeyboard-config/xkeyboard-config-2.20.ebuild b/x11-misc/xkeyboard-config/xkeyboard-config-2.20.ebuild
index 1d2be4add68..293734f5092 100644
--- a/x11-misc/xkeyboard-config/xkeyboard-config-2.20.ebuild
+++ b/x11-misc/xkeyboard-config/xkeyboard-config-2.20.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/xkeycaps/xkeycaps-2.47-r1.ebuild b/x11-misc/xkeycaps/xkeycaps-2.47-r1.ebuild
index 0da28d0189a..968a539c221 100644
--- a/x11-misc/xkeycaps/xkeycaps-2.47-r1.ebuild
+++ b/x11-misc/xkeycaps/xkeycaps-2.47-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils toolchain-funcs
diff --git a/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild b/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
index 67fe8206355..b5074ad18e5 100644
--- a/x11-misc/xkeycaps/xkeycaps-2.47-r2.ebuild
+++ b/x11-misc/xkeycaps/xkeycaps-2.47-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/x11-misc/xlockmore/xlockmore-5.47.ebuild b/x11-misc/xlockmore/xlockmore-5.47.ebuild
index 011aea8a041..102232ab3b5 100644
--- a/x11-misc/xlockmore/xlockmore-5.47.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.47.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit autotools eutils flag-o-matic pam
diff --git a/x11-misc/xlockmore/xlockmore-5.50.ebuild b/x11-misc/xlockmore/xlockmore-5.50.ebuild
index 4f95bc002fa..c5181b227ac 100644
--- a/x11-misc/xlockmore/xlockmore-5.50.ebuild
+++ b/x11-misc/xlockmore/xlockmore-5.50.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit autotools eutils flag-o-matic pam
diff --git a/x11-misc/xmobar/xmobar-0.23.1.ebuild b/x11-misc/xmobar/xmobar-0.23.1.ebuild
index de57cc6c8ff..042e167767a 100644
--- a/x11-misc/xmobar/xmobar-0.23.1.ebuild
+++ b/x11-misc/xmobar/xmobar-0.23.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/x11-misc/xmobar/xmobar-0.24.2.ebuild b/x11-misc/xmobar/xmobar-0.24.2.ebuild
index 22dbdb107df..6444bb6aae4 100644
--- a/x11-misc/xmobar/xmobar-0.24.2.ebuild
+++ b/x11-misc/xmobar/xmobar-0.24.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/x11-misc/xmobar/xmobar-0.24.3.ebuild b/x11-misc/xmobar/xmobar-0.24.3.ebuild
index dcd9f32aa67..99ba8160478 100644
--- a/x11-misc/xmobar/xmobar-0.24.3.ebuild
+++ b/x11-misc/xmobar/xmobar-0.24.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/x11-misc/xmonad-log-applet/xmonad-log-applet-2.0.0-r301.ebuild b/x11-misc/xmonad-log-applet/xmonad-log-applet-2.0.0-r301.ebuild
index 181ff5f2d93..f0c5379f92e 100644
--- a/x11-misc/xmonad-log-applet/xmonad-log-applet-2.0.0-r301.ebuild
+++ b/x11-misc/xmonad-log-applet/xmonad-log-applet-2.0.0-r301.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 gnome2
diff --git a/x11-misc/xmountains/xmountains-2.9.ebuild b/x11-misc/xmountains/xmountains-2.9.ebuild
index 8297a95ee44..6a7c0b6cd9c 100644
--- a/x11-misc/xmountains/xmountains-2.9.ebuild
+++ b/x11-misc/xmountains/xmountains-2.9.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
inherit toolchain-funcs
diff --git a/x11-misc/xnee/xnee-3.19-r1.ebuild b/x11-misc/xnee/xnee-3.19-r1.ebuild
index 8b161e3b27d..c4eab6452b7 100644
--- a/x11-misc/xnee/xnee-3.19-r1.ebuild
+++ b/x11-misc/xnee/xnee-3.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=5
inherit autotools eutils
diff --git a/x11-misc/xnots/xnots-0.2.1-r1.ebuild b/x11-misc/xnots/xnots-0.2.1-r1.ebuild
index 92153b83810..0438e287b2d 100644
--- a/x11-misc/xnots/xnots-0.2.1-r1.ebuild
+++ b/x11-misc/xnots/xnots-0.2.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit flag-o-matic toolchain-funcs
diff --git a/x11-misc/xnots/xnots-9999.ebuild b/x11-misc/xnots/xnots-9999.ebuild
index 4615827f4fb..59d0d019ec2 100644
--- a/x11-misc/xnots/xnots-9999.ebuild
+++ b/x11-misc/xnots/xnots-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit flag-o-matic git-r3 toolchain-funcs
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.5.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.5.ebuild
index e363bf333bf..580d8ecca5f 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.5.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
index fc008e5e52f..7b1588e9fac 100644
--- a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/xosview/xosview-1.17.ebuild b/x11-misc/xosview/xosview-1.17.ebuild
index dfb78376e06..dad5d126a26 100644
--- a/x11-misc/xosview/xosview-1.17.ebuild
+++ b/x11-misc/xosview/xosview-1.17.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/x11-misc/xosview/xosview-1.18.ebuild b/x11-misc/xosview/xosview-1.18.ebuild
index 343a012d586..fa37b4a95fb 100644
--- a/x11-misc/xosview/xosview-1.18.ebuild
+++ b/x11-misc/xosview/xosview-1.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/x11-misc/xosview/xosview-1.19.ebuild b/x11-misc/xosview/xosview-1.19.ebuild
index 676a2076c75..57b7ce9465c 100644
--- a/x11-misc/xosview/xosview-1.19.ebuild
+++ b/x11-misc/xosview/xosview-1.19.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/x11-misc/xpad/xpad-4.2.ebuild b/x11-misc/xpad/xpad-4.2.ebuild
index 08ff885ad6b..b6b31f9078b 100644
--- a/x11-misc/xpad/xpad-4.2.ebuild
+++ b/x11-misc/xpad/xpad-4.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils
diff --git a/x11-misc/xpad/xpad-4.5.0.ebuild b/x11-misc/xpad/xpad-4.5.0.ebuild
index c2115130639..c8c9148e12d 100644
--- a/x11-misc/xpad/xpad-4.5.0.ebuild
+++ b/x11-misc/xpad/xpad-4.5.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit versionator
diff --git a/x11-misc/xplanet/xplanet-1.3.0.ebuild b/x11-misc/xplanet/xplanet-1.3.0.ebuild
index 03a11d7ee06..9d1eed6bb69 100644
--- a/x11-misc/xplanet/xplanet-1.3.0.ebuild
+++ b/x11-misc/xplanet/xplanet-1.3.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
inherit base flag-o-matic
diff --git a/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild b/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild
index a9bea889914..ea225747e55 100644
--- a/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild
+++ b/x11-misc/xplanet/xplanet-1.3.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit flag-o-matic
diff --git a/x11-misc/xplanet/xplanet-1.3.1.ebuild b/x11-misc/xplanet/xplanet-1.3.1.ebuild
index 6f421b0bc92..e858bbc0a61 100644
--- a/x11-misc/xplanet/xplanet-1.3.1.ebuild
+++ b/x11-misc/xplanet/xplanet-1.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=5
inherit eutils flag-o-matic
diff --git a/x11-misc/xplanetFX/xplanetFX-2.6.12.ebuild b/x11-misc/xplanetFX/xplanetFX-2.6.12.ebuild
index 0d3e35e1431..3eb6dd778ff 100644
--- a/x11-misc/xplanetFX/xplanetFX-2.6.12.ebuild
+++ b/x11-misc/xplanetFX/xplanetFX-2.6.12.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/xplanetFX/xplanetFX-2.6.7.ebuild b/x11-misc/xplanetFX/xplanetFX-2.6.7.ebuild
index 8c9f3e8ad09..fb120b0580c 100644
--- a/x11-misc/xplanetFX/xplanetFX-2.6.7.ebuild
+++ b/x11-misc/xplanetFX/xplanetFX-2.6.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/x11-misc/xrestop/xrestop-0.4.ebuild b/x11-misc/xrestop/xrestop-0.4.ebuild
index 5f7b989c5e8..be03d09d0d1 100644
--- a/x11-misc/xrestop/xrestop-0.4.ebuild
+++ b/x11-misc/xrestop/xrestop-0.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit autotools eutils
diff --git a/x11-misc/xrmap/xrmap-2.33-r2.ebuild b/x11-misc/xrmap/xrmap-2.33-r2.ebuild
index c389d4113c1..16347cc59c2 100644
--- a/x11-misc/xrmap/xrmap-2.33-r2.ebuild
+++ b/x11-misc/xrmap/xrmap-2.33-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
inherit eutils toolchain-funcs
diff --git a/x11-misc/xrootconsole/xrootconsole-0.6-r1.ebuild b/x11-misc/xrootconsole/xrootconsole-0.6-r1.ebuild
index 983b7897288..9ffff7f6ace 100644
--- a/x11-misc/xrootconsole/xrootconsole-0.6-r1.ebuild
+++ b/x11-misc/xrootconsole/xrootconsole-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/x11-misc/xrootconsole/xrootconsole-0.6.ebuild b/x11-misc/xrootconsole/xrootconsole-0.6.ebuild
index 78f37d2612f..7b3314a1a53 100644
--- a/x11-misc/xrootconsole/xrootconsole-0.6.ebuild
+++ b/x11-misc/xrootconsole/xrootconsole-0.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
inherit eutils toolchain-funcs
diff --git a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r3.ebuild b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r3.ebuild
index b8c963a5714..0cb1d531963 100644
--- a/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r3.ebuild
+++ b/x11-misc/xscreensaver-app/xscreensaver-app-2.3-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit autotools toolchain-funcs
diff --git a/x11-misc/xscreensaver/xscreensaver-5.36.ebuild b/x11-misc/xscreensaver/xscreensaver-5.36.ebuild
index 0dd8e9d0fd7..444545a55b0 100644
--- a/x11-misc/xscreensaver/xscreensaver-5.36.ebuild
+++ b/x11-misc/xscreensaver/xscreensaver-5.36.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit autotools eutils flag-o-matic multilib pam
diff --git a/x11-misc/xsel/xsel-1.2.0-r1.ebuild b/x11-misc/xsel/xsel-1.2.0-r1.ebuild
index 4de5b1d9a49..2338d55bf91 100644
--- a/x11-misc/xsel/xsel-1.2.0-r1.ebuild
+++ b/x11-misc/xsel/xsel-1.2.0-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/xsel/xsel-1.2.0.ebuild b/x11-misc/xsel/xsel-1.2.0.ebuild
index aaa52852b02..c4da9e4b7d1 100644
--- a/x11-misc/xsel/xsel-1.2.0.ebuild
+++ b/x11-misc/xsel/xsel-1.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=4
diff --git a/x11-misc/xsel/xsel-9999.ebuild b/x11-misc/xsel/xsel-9999.ebuild
index 175afbf6c29..b2971adb4fe 100644
--- a/x11-misc/xsel/xsel-9999.ebuild
+++ b/x11-misc/xsel/xsel-9999.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit autotools git-r3
diff --git a/x11-misc/xsensors/xsensors-0.70-r1.ebuild b/x11-misc/xsensors/xsensors-0.70-r1.ebuild
index 124fd8ce6c0..344c180cf8e 100644
--- a/x11-misc/xsensors/xsensors-0.70-r1.ebuild
+++ b/x11-misc/xsensors/xsensors-0.70-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/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild b/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild
index 042721f9031..8c13fb3b324 100644
--- a/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild
+++ b/x11-misc/xsetleds/xsetleds-0.1.3-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils toolchain-funcs
diff --git a/x11-misc/xsetleds/xsetleds-0.1.3.ebuild b/x11-misc/xsetleds/xsetleds-0.1.3.ebuild
index db42b1f9678..669e0a8e352 100644
--- a/x11-misc/xsetleds/xsetleds-0.1.3.ebuild
+++ b/x11-misc/xsetleds/xsetleds-0.1.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils toolchain-funcs
diff --git a/x11-misc/xsnap/xsnap-1.5.10.ebuild b/x11-misc/xsnap/xsnap-1.5.10.ebuild
index e0daa27f595..b072ea80870 100644
--- a/x11-misc/xsnap/xsnap-1.5.10.ebuild
+++ b/x11-misc/xsnap/xsnap-1.5.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
inherit eutils toolchain-funcs
diff --git a/x11-misc/xsnap/xsnap-1.5.11.ebuild b/x11-misc/xsnap/xsnap-1.5.11.ebuild
index bcb89dd6398..42c00ac24bb 100644
--- a/x11-misc/xsnap/xsnap-1.5.11.ebuild
+++ b/x11-misc/xsnap/xsnap-1.5.11.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit toolchain-funcs
diff --git a/x11-misc/xsnap/xsnap-1.5.15-r1.ebuild b/x11-misc/xsnap/xsnap-1.5.15-r1.ebuild
index 6747829d969..e3d23fbadc7 100644
--- a/x11-misc/xsnap/xsnap-1.5.15-r1.ebuild
+++ b/x11-misc/xsnap/xsnap-1.5.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
inherit toolchain-funcs
diff --git a/x11-misc/xsnow/xsnow-1.42-r1.ebuild b/x11-misc/xsnow/xsnow-1.42-r1.ebuild
index 4b3c186e86c..4bd3f0f4d18 100644
--- a/x11-misc/xsnow/xsnow-1.42-r1.ebuild
+++ b/x11-misc/xsnow/xsnow-1.42-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
inherit toolchain-funcs
diff --git a/x11-misc/xsnow/xsnow-1.42-r2.ebuild b/x11-misc/xsnow/xsnow-1.42-r2.ebuild
index d3375126661..e73509ac8a9 100644
--- a/x11-misc/xsnow/xsnow-1.42-r2.ebuild
+++ b/x11-misc/xsnow/xsnow-1.42-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit toolchain-funcs
diff --git a/x11-misc/xsri/xsri-2.1.0-r3.ebuild b/x11-misc/xsri/xsri-2.1.0-r3.ebuild
index 4bfd7d42a4f..679a2844489 100644
--- a/x11-misc/xsri/xsri-2.1.0-r3.ebuild
+++ b/x11-misc/xsri/xsri-2.1.0-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit autotools eutils rpm
diff --git a/x11-misc/xss-lock/xss-lock-0.3.0_p20140302-r1.ebuild b/x11-misc/xss-lock/xss-lock-0.3.0_p20140302-r1.ebuild
index 2980882f091..5beaf9edeac 100644
--- a/x11-misc/xss-lock/xss-lock-0.3.0_p20140302-r1.ebuild
+++ b/x11-misc/xss-lock/xss-lock-0.3.0_p20140302-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/x11-misc/xssstate/xssstate-1.1.ebuild b/x11-misc/xssstate/xssstate-1.1.ebuild
index 702ecd0c4b7..e6267b03d3f 100644
--- a/x11-misc/xssstate/xssstate-1.1.ebuild
+++ b/x11-misc/xssstate/xssstate-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
inherit eutils toolchain-funcs
diff --git a/x11-misc/xstroke/xstroke-0.6-r1.ebuild b/x11-misc/xstroke/xstroke-0.6-r1.ebuild
index 3d7e1e8d17c..8d03a8cf83e 100644
--- a/x11-misc/xstroke/xstroke-0.6-r1.ebuild
+++ b/x11-misc/xstroke/xstroke-0.6-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
inherit autotools eutils
diff --git a/x11-misc/xteddy/xteddy-2.2.ebuild b/x11-misc/xteddy/xteddy-2.2.ebuild
index fcc6fd287e2..5924af61756 100644
--- a/x11-misc/xteddy/xteddy-2.2.ebuild
+++ b/x11-misc/xteddy/xteddy-2.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit autotools eutils
diff --git a/x11-misc/xtermcontrol/xtermcontrol-3.2.ebuild b/x11-misc/xtermcontrol/xtermcontrol-3.2.ebuild
index 7ef5948a399..61f31fcd8df 100644
--- a/x11-misc/xtermcontrol/xtermcontrol-3.2.ebuild
+++ b/x11-misc/xtermcontrol/xtermcontrol-3.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/xtermcontrol/xtermcontrol-3.3.ebuild b/x11-misc/xtermcontrol/xtermcontrol-3.3.ebuild
index bfe56d7d38d..27c24745cf0 100644
--- a/x11-misc/xtermcontrol/xtermcontrol-3.3.ebuild
+++ b/x11-misc/xtermcontrol/xtermcontrol-3.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/x11-misc/xtitle/xtitle-1.0.2.ebuild b/x11-misc/xtitle/xtitle-1.0.2.ebuild
index 4cb7db2c1fa..9d58eca1ebc 100644
--- a/x11-misc/xtitle/xtitle-1.0.2.ebuild
+++ b/x11-misc/xtitle/xtitle-1.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/x11-misc/xtitle/xtitle-1.0.4.ebuild b/x11-misc/xtitle/xtitle-1.0.4.ebuild
index f7aa727851c..05be00ecd6b 100644
--- a/x11-misc/xtitle/xtitle-1.0.4.ebuild
+++ b/x11-misc/xtitle/xtitle-1.0.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild b/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
index c30e9640a7b..574b3c3e28b 100644
--- a/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
+++ b/x11-misc/xtoolwait/xtoolwait-1.3-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
inherit toolchain-funcs
diff --git a/x11-misc/xtrace/xtrace-1.3.0.ebuild b/x11-misc/xtrace/xtrace-1.3.0.ebuild
index b51a5e67add..178f5231a88 100644
--- a/x11-misc/xtrace/xtrace-1.3.0.ebuild
+++ b/x11-misc/xtrace/xtrace-1.3.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
diff --git a/x11-misc/xtrlock/xtrlock-2.7.ebuild b/x11-misc/xtrlock/xtrlock-2.7.ebuild
index 7b1db7a5316..ed159a61dc3 100644
--- a/x11-misc/xtrlock/xtrlock-2.7.ebuild
+++ b/x11-misc/xtrlock/xtrlock-2.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit toolchain-funcs
diff --git a/x11-misc/xtrlock/xtrlock-2.8.ebuild b/x11-misc/xtrlock/xtrlock-2.8.ebuild
index ee11fc9118a..c966022038c 100644
--- a/x11-misc/xtrlock/xtrlock-2.8.ebuild
+++ b/x11-misc/xtrlock/xtrlock-2.8.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit toolchain-funcs
diff --git a/x11-misc/xtscal/xtscal-0.6.3-r1.ebuild b/x11-misc/xtscal/xtscal-0.6.3-r1.ebuild
index 2b57e64d81b..9e5d711c4ad 100644
--- a/x11-misc/xtscal/xtscal-0.6.3-r1.ebuild
+++ b/x11-misc/xtscal/xtscal-0.6.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/x11-misc/xvfb-run/xvfb-run-1.17.2_p2.ebuild b/x11-misc/xvfb-run/xvfb-run-1.17.2_p2.ebuild
index f5d932854a5..298fc659667 100644
--- a/x11-misc/xvfb-run/xvfb-run-1.17.2_p2.ebuild
+++ b/x11-misc/xvfb-run/xvfb-run-1.17.2_p2.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/x11-misc/xvfb-run/xvfb-run-1.18.4_p2.ebuild b/x11-misc/xvfb-run/xvfb-run-1.18.4_p2.ebuild
index f5d932854a5..298fc659667 100644
--- a/x11-misc/xvfb-run/xvfb-run-1.18.4_p2.ebuild
+++ b/x11-misc/xvfb-run/xvfb-run-1.18.4_p2.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/x11-misc/xvkbd/xvkbd-3.6.ebuild b/x11-misc/xvkbd/xvkbd-3.6.ebuild
index 6f3e578043f..2acb5b86249 100644
--- a/x11-misc/xvkbd/xvkbd-3.6.ebuild
+++ b/x11-misc/xvkbd/xvkbd-3.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils multilib toolchain-funcs
diff --git a/x11-misc/xvkbd/xvkbd-3.7.ebuild b/x11-misc/xvkbd/xvkbd-3.7.ebuild
index 5ca77880124..be1a956a1db 100644
--- a/x11-misc/xvkbd/xvkbd-3.7.ebuild
+++ b/x11-misc/xvkbd/xvkbd-3.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils multilib toolchain-funcs
diff --git a/x11-misc/xwinwrap/xwinwrap-0_p4-r1.ebuild b/x11-misc/xwinwrap/xwinwrap-0_p4-r1.ebuild
index 980a1953093..2118202409f 100644
--- a/x11-misc/xwinwrap/xwinwrap-0_p4-r1.ebuild
+++ b/x11-misc/xwinwrap/xwinwrap-0_p4-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/x11-misc/xwinwrap/xwinwrap-0_p4.ebuild b/x11-misc/xwinwrap/xwinwrap-0_p4.ebuild
index 9c4d4a68780..43f5199e022 100644
--- a/x11-misc/xwinwrap/xwinwrap-0_p4.ebuild
+++ b/x11-misc/xwinwrap/xwinwrap-0_p4.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/x11-misc/xwit/xwit-3.4.ebuild b/x11-misc/xwit/xwit-3.4.ebuild
index 8c371591f84..c73dfdc9bbd 100644
--- a/x11-misc/xwit/xwit-3.4.ebuild
+++ b/x11-misc/xwit/xwit-3.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=2
inherit eutils toolchain-funcs
diff --git a/x11-misc/xwit/xwit-3.4_p15.ebuild b/x11-misc/xwit/xwit-3.4_p15.ebuild
index f7b93a5dc72..05261dd57f2 100644
--- a/x11-misc/xwit/xwit-3.4_p15.ebuild
+++ b/x11-misc/xwit/xwit-3.4_p15.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit toolchain-funcs
diff --git a/x11-misc/xwrits/xwrits-2.26-r1.ebuild b/x11-misc/xwrits/xwrits-2.26-r1.ebuild
index ed11359e871..84598d8dfe5 100644
--- a/x11-misc/xwrits/xwrits-2.26-r1.ebuild
+++ b/x11-misc/xwrits/xwrits-2.26-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/x11-misc/xwrits/xwrits-2.26.ebuild b/x11-misc/xwrits/xwrits-2.26.ebuild
index ac39dff624c..07dc35be67d 100644
--- a/x11-misc/xwrits/xwrits-2.26.ebuild
+++ b/x11-misc/xwrits/xwrits-2.26.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
DESCRIPTION="Reminds you to take wrist breaks to help you prevent repetitive stress injury"
HOMEPAGE="http://www.lcdf.org/xwrits/"
diff --git a/x11-misc/xxkb/xxkb-1.11-r3.ebuild b/x11-misc/xxkb/xxkb-1.11-r3.ebuild
index c32c7ae3264..c480d326f81 100644
--- a/x11-misc/xxkb/xxkb-1.11-r3.ebuild
+++ b/x11-misc/xxkb/xxkb-1.11-r3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils multilib
diff --git a/x11-misc/xxkb/xxkb-1.11.1.ebuild b/x11-misc/xxkb/xxkb-1.11.1.ebuild
index 4d405bd4d7e..3205685ee47 100644
--- a/x11-misc/xxkb/xxkb-1.11.1.ebuild
+++ b/x11-misc/xxkb/xxkb-1.11.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit eutils multilib
diff --git a/x11-misc/xystray/xystray-1.0.ebuild b/x11-misc/xystray/xystray-1.0.ebuild
index 8046d7561a9..d077e288bab 100644
--- a/x11-misc/xystray/xystray-1.0.ebuild
+++ b/x11-misc/xystray/xystray-1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/x11-misc/zim/zim-0.65.ebuild b/x11-misc/zim/zim-0.65.ebuild
index a6cd13060ac..c05d460056d 100644
--- a/x11-misc/zim/zim-0.65.ebuild
+++ b/x11-misc/zim/zim-0.65.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5