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 /xfce-extra
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 'xfce-extra')
-rw-r--r--xfce-extra/eatmonkey/eatmonkey-0.1.4.ebuild1
-rw-r--r--xfce-extra/multiload-nandhp/multiload-nandhp-0.2.ebuild1
-rw-r--r--xfce-extra/multiload-nandhp/multiload-nandhp-0.3.ebuild1
-rw-r--r--xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r1.ebuild1
-rw-r--r--xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r2.ebuild1
-rw-r--r--xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1.ebuild1
-rw-r--r--xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.2.0_p20101105.ebuild1
-rw-r--r--xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.4.ebuild1
-rw-r--r--xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.5.ebuild1
-rw-r--r--xfce-extra/thunar-volman/thunar-volman-0.8.1.ebuild1
-rw-r--r--xfce-extra/transd/transd-0_p20120503.ebuild1
-rw-r--r--xfce-extra/tumbler/tumbler-0.1.31-r1.ebuild1
-rw-r--r--xfce-extra/xfce-theme-manager/xfce-theme-manager-0.3.5.ebuild1
-rw-r--r--xfce-extra/xfce-theme-manager/xfce-theme-manager-0.3.6.ebuild1
-rw-r--r--xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.1.1.ebuild1
-rw-r--r--xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.0.5.ebuild1
-rw-r--r--xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.0.ebuild1
-rw-r--r--xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5.ebuild1
-rw-r--r--xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.2.6.ebuild1
-rw-r--r--xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.0.ebuild1
-rw-r--r--xfce-extra/xfce4-composite-editor/xfce4-composite-editor-0.ebuild1
-rw-r--r--xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.1.3.ebuild1
-rw-r--r--xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.5.ebuild1
-rw-r--r--xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.6.2.ebuild1
-rw-r--r--xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.7.0.ebuild1
-rw-r--r--xfce-extra/xfce4-dict/xfce4-dict-0.7.2.ebuild1
-rw-r--r--xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.5.5.ebuild1
-rw-r--r--xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.1.ebuild1
-rw-r--r--xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.4.1.ebuild1
-rw-r--r--xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.6.0.ebuild1
-rw-r--r--xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.7.ebuild1
-rw-r--r--xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.8.ebuild1
-rw-r--r--xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.4.5.ebuild1
-rw-r--r--xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.0.2.ebuild1
-rw-r--r--xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.0.ebuild1
-rw-r--r--xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-3.4.0.ebuild1
-rw-r--r--xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.0.0.ebuild1
-rw-r--r--xfce-extra/xfce4-gvfs-mount/xfce4-gvfs-mount-0.0.4.ebuild1
-rw-r--r--xfce-extra/xfce4-hdaps/xfce4-hdaps-0.0.9.ebuild1
-rw-r--r--xfce-extra/xfce4-indicator-plugin/xfce4-indicator-plugin-1.0.0.ebuild1
-rw-r--r--xfce-extra/xfce4-indicator-plugin/xfce4-indicator-plugin-2.3.2.ebuild1
-rw-r--r--xfce-extra/xfce4-indicator-plugin/xfce4-indicator-plugin-2.3.3-r1.ebuild1
-rw-r--r--xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.0.6.ebuild1
-rw-r--r--xfce-extra/xfce4-linelight-plugin/xfce4-linelight-plugin-0.1.7.ebuild1
-rw-r--r--xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0.ebuild1
-rw-r--r--xfce-extra/xfce4-messenger-plugin/xfce4-messenger-plugin-0.1.0.ebuild1
-rw-r--r--xfce-extra/xfce4-mixer/xfce4-mixer-4.11.0.ebuild1
-rw-r--r--xfce-extra/xfce4-modemlights-plugin/xfce4-modemlights-plugin-0.1.3.99.ebuild1
-rw-r--r--xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-0.6.7.ebuild1
-rw-r--r--xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.0.ebuild1
-rw-r--r--xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.2.ebuild1
-rw-r--r--xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.4.5.ebuild1
-rw-r--r--xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.5.0.ebuild1
-rw-r--r--xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.2.4.ebuild1
-rw-r--r--xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.3.0.ebuild1
-rw-r--r--xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.3.1.ebuild1
-rw-r--r--xfce-extra/xfce4-netspeed-plugin/xfce4-netspeed-plugin-0.3.1.ebuild1
-rw-r--r--xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1.ebuild1
-rw-r--r--xfce-extra/xfce4-notifyd/xfce4-notifyd-0.2.4.ebuild1
-rw-r--r--xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.0.ebuild1
-rw-r--r--xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.1.ebuild1
-rw-r--r--xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.2.ebuild1
-rw-r--r--xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.3.ebuild1
-rw-r--r--xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.4.ebuild1
-rw-r--r--xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.5.ebuild1
-rw-r--r--xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.7.0.ebuild1
-rw-r--r--xfce-extra/xfce4-playercontrol-plugin/xfce4-playercontrol-plugin-0.3.0.ebuild1
-rw-r--r--xfce-extra/xfce4-power-manager/xfce4-power-manager-1.5.2.ebuild1
-rw-r--r--xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.0.ebuild1
-rw-r--r--xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.2.3.ebuild1
-rw-r--r--xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.2.4.ebuild1
-rw-r--r--xfce-extra/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-r1.ebuild1
-rw-r--r--xfce-extra/xfce4-radio-plugin/xfce4-radio-plugin-0.5.1-r1.ebuild1
-rw-r--r--xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.8.2.ebuild1
-rw-r--r--xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.6.ebuild1
-rw-r--r--xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.97.ebuild1
-rw-r--r--xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.4.6.ebuild1
-rw-r--r--xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.0.ebuild1
-rw-r--r--xfce-extra/xfce4-soundmenu-plugin/xfce4-soundmenu-plugin-0.7.0.ebuild1
-rw-r--r--xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.1.1-r1.ebuild1
-rw-r--r--xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.1.2.ebuild1
-rw-r--r--xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.0.ebuild1
-rw-r--r--xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.1.ebuild1
-rw-r--r--xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.0.1.ebuild1
-rw-r--r--xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.1.0.ebuild1
-rw-r--r--xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.0.ebuild1
-rw-r--r--xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.2.ebuild1
-rw-r--r--xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.6.0.ebuild1
-rw-r--r--xfce-extra/xfce4-vala/xfce4-vala-4.10.3-r2.ebuild1
-rw-r--r--xfce-extra/xfce4-vala/xfce4-vala-4.10.3-r3.ebuild1
-rw-r--r--xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-1.0.1.ebuild1
-rw-r--r--xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-1.1.0.ebuild1
-rw-r--r--xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.0.ebuild1
-rw-r--r--xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.1.ebuild1
-rw-r--r--xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.2.ebuild1
-rw-r--r--xfce-extra/xfce4-volumed/xfce4-volumed-0.1.13.ebuild1
-rw-r--r--xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.5.12.ebuild1
-rw-r--r--xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.0.ebuild1
-rw-r--r--xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.7.ebuild1
-rw-r--r--xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.8.ebuild1
-rw-r--r--xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.9.ebuild1
-rw-r--r--xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.6.0.ebuild1
-rw-r--r--xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.7.0.ebuild1
-rw-r--r--xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.0.ebuild1
-rw-r--r--xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.2.4.ebuild1
-rw-r--r--xfce-extra/xfce4-wmdock-plugin/xfce4-wmdock-plugin-0.6.0.ebuild1
-rw-r--r--xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.7.1-r1.ebuild1
-rw-r--r--xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.7.1.ebuild1
-rw-r--r--xfce-extra/xfdashboard/xfdashboard-0.4.0.ebuild1
-rw-r--r--xfce-extra/xfswitch-plugin/xfswitch-plugin-0.0.1-r1.ebuild1
-rw-r--r--xfce-extra/xfswitch-plugin/xfswitch-plugin-0.0.1-r2.ebuild1
111 files changed, 0 insertions, 111 deletions
diff --git a/xfce-extra/eatmonkey/eatmonkey-0.1.4.ebuild b/xfce-extra/eatmonkey/eatmonkey-0.1.4.ebuild
index 3077e14ac23..1de1364d50e 100644
--- a/xfce-extra/eatmonkey/eatmonkey-0.1.4.ebuild
+++ b/xfce-extra/eatmonkey/eatmonkey-0.1.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit xfconf
diff --git a/xfce-extra/multiload-nandhp/multiload-nandhp-0.2.ebuild b/xfce-extra/multiload-nandhp/multiload-nandhp-0.2.ebuild
index aa669969545..08d49aba3cf 100644
--- a/xfce-extra/multiload-nandhp/multiload-nandhp-0.2.ebuild
+++ b/xfce-extra/multiload-nandhp/multiload-nandhp-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 autotools eutils
diff --git a/xfce-extra/multiload-nandhp/multiload-nandhp-0.3.ebuild b/xfce-extra/multiload-nandhp/multiload-nandhp-0.3.ebuild
index 956d9b44f17..17e3eba379f 100644
--- a/xfce-extra/multiload-nandhp/multiload-nandhp-0.3.ebuild
+++ b/xfce-extra/multiload-nandhp/multiload-nandhp-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
inherit autotools eutils
diff --git a/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r1.ebuild b/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r1.ebuild
index b55f1e7e901..07704bc225e 100644
--- a/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r1.ebuild
+++ b/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r2.ebuild b/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r2.ebuild
index 086ecbb50d4..ae8baa55620 100644
--- a/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-0.3.1-r2.ebuild
+++ b/xfce-extra/thunar-archive-plugin/thunar-archive-plugin-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=5
diff --git a/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1.ebuild b/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1.ebuild
index e1386737653..9d88f6b7d14 100644
--- a/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.2.1.ebuild
+++ b/xfce-extra/thunar-media-tags-plugin/thunar-media-tags-plugin-0.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
EAUTORECONF=yes
diff --git a/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.2.0_p20101105.ebuild b/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.2.0_p20101105.ebuild
index 52b646a9030..b4509348362 100644
--- a/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.2.0_p20101105.ebuild
+++ b/xfce-extra/thunar-shares-plugin/thunar-shares-plugin-0.2.0_p20101105.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/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.4.ebuild b/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.4.ebuild
index 365a07843f9..a2a6af4caf7 100644
--- a/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.4.ebuild
+++ b/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit xfconf
diff --git a/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.5.ebuild b/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.5.ebuild
index 5ab8bba8f72..b23c0e0ca05 100644
--- a/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.5.ebuild
+++ b/xfce-extra/thunar-vcs-plugin/thunar-vcs-plugin-0.1.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit xfconf
diff --git a/xfce-extra/thunar-volman/thunar-volman-0.8.1.ebuild b/xfce-extra/thunar-volman/thunar-volman-0.8.1.ebuild
index 51667d047b5..2ad9bbb352a 100644
--- a/xfce-extra/thunar-volman/thunar-volman-0.8.1.ebuild
+++ b/xfce-extra/thunar-volman/thunar-volman-0.8.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit xfconf
diff --git a/xfce-extra/transd/transd-0_p20120503.ebuild b/xfce-extra/transd/transd-0_p20120503.ebuild
index 633df0cffdb..21bfd569684 100644
--- a/xfce-extra/transd/transd-0_p20120503.ebuild
+++ b/xfce-extra/transd/transd-0_p20120503.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
EAUTORECONF=yes
diff --git a/xfce-extra/tumbler/tumbler-0.1.31-r1.ebuild b/xfce-extra/tumbler/tumbler-0.1.31-r1.ebuild
index 6b34f826908..8f4643e14fc 100644
--- a/xfce-extra/tumbler/tumbler-0.1.31-r1.ebuild
+++ b/xfce-extra/tumbler/tumbler-0.1.31-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 xfconf
diff --git a/xfce-extra/xfce-theme-manager/xfce-theme-manager-0.3.5.ebuild b/xfce-extra/xfce-theme-manager/xfce-theme-manager-0.3.5.ebuild
index f93b668feec..a6108079221 100644
--- a/xfce-extra/xfce-theme-manager/xfce-theme-manager-0.3.5.ebuild
+++ b/xfce-extra/xfce-theme-manager/xfce-theme-manager-0.3.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 xfconf
diff --git a/xfce-extra/xfce-theme-manager/xfce-theme-manager-0.3.6.ebuild b/xfce-extra/xfce-theme-manager/xfce-theme-manager-0.3.6.ebuild
index 5a194d2d1af..b2e69fb07be 100644
--- a/xfce-extra/xfce-theme-manager/xfce-theme-manager-0.3.6.ebuild
+++ b/xfce-extra/xfce-theme-manager/xfce-theme-manager-0.3.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 xfconf
diff --git a/xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.1.1.ebuild b/xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.1.1.ebuild
index b1638018572..f39c233f495 100644
--- a/xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.1.1.ebuild
+++ b/xfce-extra/xfce4-alsa-plugin/xfce4-alsa-plugin-0.1.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.0.5.ebuild b/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.0.5.ebuild
index 62592e43e8c..e17b95b278b 100644
--- a/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.0.5.ebuild
+++ b/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.0.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit linux-info xfconf
diff --git a/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.0.ebuild b/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.0.ebuild
index d407c3f455f..47fa7ae6fc8 100644
--- a/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.0.ebuild
+++ b/xfce-extra/xfce4-battery-plugin/xfce4-battery-plugin-1.1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit linux-info fdo-mime gnome2-utils
diff --git a/xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5.ebuild b/xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5.ebuild
index 2b84f68f5bb..42e8746a8da 100644
--- a/xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5.ebuild
+++ b/xfce-extra/xfce4-cellmodem-plugin/xfce4-cellmodem-plugin-0.0.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
EAUTORECONF=yes
diff --git a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.2.6.ebuild b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.2.6.ebuild
index 9898e159c63..0bfea38dba3 100644
--- a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.2.6.ebuild
+++ b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.2.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit xfconf
diff --git a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.0.ebuild b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.0.ebuild
index f4e28c4291e..4a9fb1d85b9 100644
--- a/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.0.ebuild
+++ b/xfce-extra/xfce4-clipman-plugin/xfce4-clipman-plugin-1.4.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit xfconf
diff --git a/xfce-extra/xfce4-composite-editor/xfce4-composite-editor-0.ebuild b/xfce-extra/xfce4-composite-editor/xfce4-composite-editor-0.ebuild
index 82a508b4641..2e9c0e111c3 100644
--- a/xfce-extra/xfce4-composite-editor/xfce4-composite-editor-0.ebuild
+++ b/xfce-extra/xfce4-composite-editor/xfce4-composite-editor-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 xfconf
diff --git a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.1.3.ebuild b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.1.3.ebuild
index a94cf160af6..b9729de774a 100644
--- a/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.1.3.ebuild
+++ b/xfce-extra/xfce4-cpufreq-plugin/xfce4-cpufreq-plugin-1.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
inherit xfconf
diff --git a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.5.ebuild b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.5.ebuild
index a5ce14aad2f..7ecdb7c5429 100644
--- a/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-1.0.5.ebuild
+++ b/xfce-extra/xfce4-cpugraph-plugin/xfce4-cpugraph-plugin-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
inherit xfconf
diff --git a/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.6.2.ebuild b/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.6.2.ebuild
index 6691a863651..d2622a54696 100644
--- a/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.6.2.ebuild
+++ b/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.6.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit xfconf
diff --git a/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.7.0.ebuild b/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.7.0.ebuild
index 311588950dc..28d4b392f03 100644
--- a/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.7.0.ebuild
+++ b/xfce-extra/xfce4-datetime-plugin/xfce4-datetime-plugin-0.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
inherit fdo-mime gnome2-utils
diff --git a/xfce-extra/xfce4-dict/xfce4-dict-0.7.2.ebuild b/xfce-extra/xfce4-dict/xfce4-dict-0.7.2.ebuild
index 212c46e4143..1790faf2338 100644
--- a/xfce-extra/xfce4-dict/xfce4-dict-0.7.2.ebuild
+++ b/xfce-extra/xfce4-dict/xfce4-dict-0.7.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
EAUTORECONF=yes
diff --git a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.5.5.ebuild b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.5.5.ebuild
index 889cfc65209..0bd255c3e95 100644
--- a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.5.5.ebuild
+++ b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.5.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit xfconf
diff --git a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.1.ebuild b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.1.ebuild
index 2efd858b70b..edfa79319d2 100644
--- a/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.1.ebuild
+++ b/xfce-extra/xfce4-diskperf-plugin/xfce4-diskperf-plugin-2.6.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit fdo-mime gnome2-utils
diff --git a/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.4.1.ebuild b/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.4.1.ebuild
index cde5f229bdf..da76ad1d0bb 100644
--- a/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.4.1.ebuild
+++ b/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.4.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit xfconf
diff --git a/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.6.0.ebuild b/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.6.0.ebuild
index 41a3e93a0db..7e11bde56a5 100644
--- a/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.6.0.ebuild
+++ b/xfce-extra/xfce4-embed-plugin/xfce4-embed-plugin-1.6.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit xfconf
diff --git a/xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.7.ebuild b/xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.7.ebuild
index 6336308e8a0..be9f6168116 100644
--- a/xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.7.ebuild
+++ b/xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.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 xfconf
diff --git a/xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.8.ebuild b/xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.8.ebuild
index 4f36f1eefb6..50c3e9421c5 100644
--- a/xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.8.ebuild
+++ b/xfce-extra/xfce4-equake-plugin/xfce4-equake-plugin-1.3.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 xfconf
diff --git a/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.4.5.ebuild b/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.4.5.ebuild
index b7e4b61b1bd..8e77fbdb547 100644
--- a/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.4.5.ebuild
+++ b/xfce-extra/xfce4-eyes-plugin/xfce4-eyes-plugin-4.4.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit xfconf
diff --git a/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.0.2.ebuild b/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.0.2.ebuild
index cda5c6f2414..f6dcf82366e 100644
--- a/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.0.2.ebuild
+++ b/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-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=5
inherit xfconf
diff --git a/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.0.ebuild b/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.0.ebuild
index f17d9216f6c..718707732e1 100644
--- a/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.1.0.ebuild
+++ b/xfce-extra/xfce4-fsguard-plugin/xfce4-fsguard-plugin-1.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
inherit fdo-mime gnome2-utils
diff --git a/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-3.4.0.ebuild b/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-3.4.0.ebuild
index 63ce561c2e8..a4e58f9b6a4 100644
--- a/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-3.4.0.ebuild
+++ b/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-3.4.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit xfconf
diff --git a/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.0.0.ebuild b/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.0.0.ebuild
index 2544116296e..52f20a7f7ca 100644
--- a/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.0.0.ebuild
+++ b/xfce-extra/xfce4-genmon-plugin/xfce4-genmon-plugin-4.0.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/xfce-extra/xfce4-gvfs-mount/xfce4-gvfs-mount-0.0.4.ebuild b/xfce-extra/xfce4-gvfs-mount/xfce4-gvfs-mount-0.0.4.ebuild
index 8613eaa10f4..962e1799694 100644
--- a/xfce-extra/xfce4-gvfs-mount/xfce4-gvfs-mount-0.0.4.ebuild
+++ b/xfce-extra/xfce4-gvfs-mount/xfce4-gvfs-mount-0.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 multilib xfconf
diff --git a/xfce-extra/xfce4-hdaps/xfce4-hdaps-0.0.9.ebuild b/xfce-extra/xfce4-hdaps/xfce4-hdaps-0.0.9.ebuild
index a26b725665c..b840e70738e 100644
--- a/xfce-extra/xfce4-hdaps/xfce4-hdaps-0.0.9.ebuild
+++ b/xfce-extra/xfce4-hdaps/xfce4-hdaps-0.0.9.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit linux-info xfconf
diff --git a/xfce-extra/xfce4-indicator-plugin/xfce4-indicator-plugin-1.0.0.ebuild b/xfce-extra/xfce4-indicator-plugin/xfce4-indicator-plugin-1.0.0.ebuild
index bb3f8383518..bbd720ef2f6 100644
--- a/xfce-extra/xfce4-indicator-plugin/xfce4-indicator-plugin-1.0.0.ebuild
+++ b/xfce-extra/xfce4-indicator-plugin/xfce4-indicator-plugin-1.0.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 xfconf
diff --git a/xfce-extra/xfce4-indicator-plugin/xfce4-indicator-plugin-2.3.2.ebuild b/xfce-extra/xfce4-indicator-plugin/xfce4-indicator-plugin-2.3.2.ebuild
index 358163adf17..24118757673 100644
--- a/xfce-extra/xfce4-indicator-plugin/xfce4-indicator-plugin-2.3.2.ebuild
+++ b/xfce-extra/xfce4-indicator-plugin/xfce4-indicator-plugin-2.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
inherit xfconf
diff --git a/xfce-extra/xfce4-indicator-plugin/xfce4-indicator-plugin-2.3.3-r1.ebuild b/xfce-extra/xfce4-indicator-plugin/xfce4-indicator-plugin-2.3.3-r1.ebuild
index 3f7bdee62c0..29893713b64 100644
--- a/xfce-extra/xfce4-indicator-plugin/xfce4-indicator-plugin-2.3.3-r1.ebuild
+++ b/xfce-extra/xfce4-indicator-plugin/xfce4-indicator-plugin-2.3.3-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit xfconf
diff --git a/xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.0.6.ebuild b/xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.0.6.ebuild
index 3766b65af16..fce34b159d6 100644
--- a/xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.0.6.ebuild
+++ b/xfce-extra/xfce4-kbdleds-plugin/xfce4-kbdleds-plugin-0.0.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit xfconf
diff --git a/xfce-extra/xfce4-linelight-plugin/xfce4-linelight-plugin-0.1.7.ebuild b/xfce-extra/xfce4-linelight-plugin/xfce4-linelight-plugin-0.1.7.ebuild
index d9480e702c1..2c510c96058 100644
--- a/xfce-extra/xfce4-linelight-plugin/xfce4-linelight-plugin-0.1.7.ebuild
+++ b/xfce-extra/xfce4-linelight-plugin/xfce4-linelight-plugin-0.1.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
EAUTORECONF=yes
diff --git a/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0.ebuild b/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0.ebuild
index 93ecc06cd35..30e946c5345 100644
--- a/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-1.2.0.ebuild
+++ b/xfce-extra/xfce4-mailwatch-plugin/xfce4-mailwatch-plugin-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=5
inherit xfconf
diff --git a/xfce-extra/xfce4-messenger-plugin/xfce4-messenger-plugin-0.1.0.ebuild b/xfce-extra/xfce4-messenger-plugin/xfce4-messenger-plugin-0.1.0.ebuild
index 80a0154d3d1..62829b01dec 100644
--- a/xfce-extra/xfce4-messenger-plugin/xfce4-messenger-plugin-0.1.0.ebuild
+++ b/xfce-extra/xfce4-messenger-plugin/xfce4-messenger-plugin-0.1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
EAUTORECONF=yes
diff --git a/xfce-extra/xfce4-mixer/xfce4-mixer-4.11.0.ebuild b/xfce-extra/xfce4-mixer/xfce4-mixer-4.11.0.ebuild
index 92ac5ffc2a7..93017736e59 100644
--- a/xfce-extra/xfce4-mixer/xfce4-mixer-4.11.0.ebuild
+++ b/xfce-extra/xfce4-mixer/xfce4-mixer-4.11.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit xfconf
diff --git a/xfce-extra/xfce4-modemlights-plugin/xfce4-modemlights-plugin-0.1.3.99.ebuild b/xfce-extra/xfce4-modemlights-plugin/xfce4-modemlights-plugin-0.1.3.99.ebuild
index 605115ce9fb..26cd6ff7324 100644
--- a/xfce-extra/xfce4-modemlights-plugin/xfce4-modemlights-plugin-0.1.3.99.ebuild
+++ b/xfce-extra/xfce4-modemlights-plugin/xfce4-modemlights-plugin-0.1.3.99.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit multilib xfconf
diff --git a/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-0.6.7.ebuild b/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-0.6.7.ebuild
index ac855bfd77c..73f86c21b02 100644
--- a/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-0.6.7.ebuild
+++ b/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-0.6.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 xfconf
diff --git a/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.0.ebuild b/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.0.ebuild
index ad3d4b611e9..b97afc5e96e 100644
--- a/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.0.ebuild
+++ b/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit xfconf
diff --git a/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.2.ebuild b/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.2.ebuild
index 964f6dc5b71..86aca0c3809 100644
--- a/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.1.2.ebuild
+++ b/xfce-extra/xfce4-mount-plugin/xfce4-mount-plugin-1.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/xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.4.5.ebuild b/xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.4.5.ebuild
index 741a4eb78bf..687cc484735 100644
--- a/xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.4.5.ebuild
+++ b/xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.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
inherit xfconf
diff --git a/xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.5.0.ebuild b/xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.5.0.ebuild
index f0758d86a2d..e08decd2695 100644
--- a/xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-0.5.0.ebuild
+++ b/xfce-extra/xfce4-mpc-plugin/xfce4-mpc-plugin-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=6
inherit fdo-mime gnome2-utils
diff --git a/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.2.4.ebuild b/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.2.4.ebuild
index a34c989617f..53cd13eff66 100644
--- a/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.2.4.ebuild
+++ b/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.2.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit xfconf
diff --git a/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.3.0.ebuild b/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.3.0.ebuild
index c1a893fcb85..bf74b576946 100644
--- a/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.3.0.ebuild
+++ b/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.3.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit fdo-mime gnome2-utils
diff --git a/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.3.1.ebuild b/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.3.1.ebuild
index c1a893fcb85..bf74b576946 100644
--- a/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-1.3.1.ebuild
+++ b/xfce-extra/xfce4-netload-plugin/xfce4-netload-plugin-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 fdo-mime gnome2-utils
diff --git a/xfce-extra/xfce4-netspeed-plugin/xfce4-netspeed-plugin-0.3.1.ebuild b/xfce-extra/xfce4-netspeed-plugin/xfce4-netspeed-plugin-0.3.1.ebuild
index 26429c10e0c..4c314c84520 100644
--- a/xfce-extra/xfce4-netspeed-plugin/xfce4-netspeed-plugin-0.3.1.ebuild
+++ b/xfce-extra/xfce4-netspeed-plugin/xfce4-netspeed-plugin-0.3.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit multilib xfconf
diff --git a/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1.ebuild b/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1.ebuild
index 5f38da4eb0f..488cef62db2 100644
--- a/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1.ebuild
+++ b/xfce-extra/xfce4-notes-plugin/xfce4-notes-plugin-1.8.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit versionator xfconf
diff --git a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.2.4.ebuild b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.2.4.ebuild
index 1c4422930ac..cb6eeb8afd0 100644
--- a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.2.4.ebuild
+++ b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.2.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit xfconf
diff --git a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.0.ebuild b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.0.ebuild
index 4f8705cc4e5..c08652b5f2f 100644
--- a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.0.ebuild
+++ b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit xfconf
diff --git a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.1.ebuild b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.1.ebuild
index 6434b594415..6b2ca2608c9 100644
--- a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.1.ebuild
+++ b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit xfconf
diff --git a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.2.ebuild b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.2.ebuild
index 6434b594415..6b2ca2608c9 100644
--- a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.2.ebuild
+++ b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit xfconf
diff --git a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.3.ebuild b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.3.ebuild
index 6434b594415..6b2ca2608c9 100644
--- a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.3.ebuild
+++ b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.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
inherit xfconf
diff --git a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.4.ebuild b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.4.ebuild
index 6434b594415..6b2ca2608c9 100644
--- a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.4.ebuild
+++ b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit xfconf
diff --git a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.5.ebuild b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.5.ebuild
index 420eb06fd62..48b3e57a492 100644
--- a/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.5.ebuild
+++ b/xfce-extra/xfce4-notifyd/xfce4-notifyd-0.3.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.7.0.ebuild b/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.7.0.ebuild
index dc57764f3a2..e21bf6b8b3c 100644
--- a/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.7.0.ebuild
+++ b/xfce-extra/xfce4-places-plugin/xfce4-places-plugin-1.7.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit xfconf
diff --git a/xfce-extra/xfce4-playercontrol-plugin/xfce4-playercontrol-plugin-0.3.0.ebuild b/xfce-extra/xfce4-playercontrol-plugin/xfce4-playercontrol-plugin-0.3.0.ebuild
index 0a73b4dffed..8dd3a481fb9 100644
--- a/xfce-extra/xfce4-playercontrol-plugin/xfce4-playercontrol-plugin-0.3.0.ebuild
+++ b/xfce-extra/xfce4-playercontrol-plugin/xfce4-playercontrol-plugin-0.3.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit multilib xfconf
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.5.2.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.5.2.ebuild
index 0b8839af9c3..9711ab6bd96 100644
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.5.2.ebuild
+++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.5.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit linux-info xfconf
diff --git a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.0.ebuild b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.0.ebuild
index 2f480043ae4..ec5481f2dbd 100644
--- a/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.0.ebuild
+++ b/xfce-extra/xfce4-power-manager/xfce4-power-manager-1.6.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit linux-info xfconf
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.2.3.ebuild b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.2.3.ebuild
index 804c0e012b9..e71266911ba 100644
--- a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.2.3.ebuild
+++ b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.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
inherit xfconf
diff --git a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.2.4.ebuild b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.2.4.ebuild
index dc5189ae398..3afc34e2a60 100644
--- a/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.2.4.ebuild
+++ b/xfce-extra/xfce4-pulseaudio-plugin/xfce4-pulseaudio-plugin-0.2.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit xfconf
diff --git a/xfce-extra/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-r1.ebuild b/xfce-extra/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-r1.ebuild
index 96082479909..06c365ab517 100644
--- a/xfce-extra/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.4-r1.ebuild
+++ b/xfce-extra/xfce4-quicklauncher-plugin/xfce4-quicklauncher-plugin-1.9.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
#EAUTORECONF=yes
diff --git a/xfce-extra/xfce4-radio-plugin/xfce4-radio-plugin-0.5.1-r1.ebuild b/xfce-extra/xfce4-radio-plugin/xfce4-radio-plugin-0.5.1-r1.ebuild
index abae064e843..a6dbc7dc18e 100644
--- a/xfce-extra/xfce4-radio-plugin/xfce4-radio-plugin-0.5.1-r1.ebuild
+++ b/xfce-extra/xfce4-radio-plugin/xfce4-radio-plugin-0.5.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
inherit flag-o-matic multilib xfconf
diff --git a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.8.2.ebuild b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.8.2.ebuild
index d0ef431668b..916593e099a 100644
--- a/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-1.8.2.ebuild
+++ b/xfce-extra/xfce4-screenshooter/xfce4-screenshooter-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 xfconf
diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.6.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.6.ebuild
index 56948bf0d81..2c3d7fdccb1 100644
--- a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.6.ebuild
+++ b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-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=5
EAUTORECONF=yes
diff --git a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.97.ebuild b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.97.ebuild
index 0d9aec310a7..51883890593 100644
--- a/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.97.ebuild
+++ b/xfce-extra/xfce4-sensors-plugin/xfce4-sensors-plugin-1.2.97.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/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.4.6.ebuild b/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.4.6.ebuild
index 609ab8344b5..ed60da669a9 100644
--- a/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.4.6.ebuild
+++ b/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.4.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit xfconf
diff --git a/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.0.ebuild b/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.0.ebuild
index 509c7ff05f4..7d4c28d57ee 100644
--- a/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-0.5.0.ebuild
+++ b/xfce-extra/xfce4-smartbookmark-plugin/xfce4-smartbookmark-plugin-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=6
inherit fdo-mime gnome2-utils
diff --git a/xfce-extra/xfce4-soundmenu-plugin/xfce4-soundmenu-plugin-0.7.0.ebuild b/xfce-extra/xfce4-soundmenu-plugin/xfce4-soundmenu-plugin-0.7.0.ebuild
index f5012f11b4d..7a0cb5c86c3 100644
--- a/xfce-extra/xfce4-soundmenu-plugin/xfce4-soundmenu-plugin-0.7.0.ebuild
+++ b/xfce-extra/xfce4-soundmenu-plugin/xfce4-soundmenu-plugin-0.7.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit xfconf
diff --git a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.1.1-r1.ebuild b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.1.1-r1.ebuild
index aa5de7f38e6..6a2ce6bf75c 100644
--- a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.1.1-r1.ebuild
+++ b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-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
inherit xfconf
diff --git a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.1.2.ebuild b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.1.2.ebuild
index 0e98b42b64b..46d341d1058 100644
--- a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.1.2.ebuild
+++ b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.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=5
inherit xfconf
diff --git a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.0.ebuild b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.0.ebuild
index 3a9aaeccb07..6ea703a0764 100644
--- a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.0.ebuild
+++ b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-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
inherit fdo-mime gnome2-utils
diff --git a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.1.ebuild b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.1.ebuild
index 3a9aaeccb07..6ea703a0764 100644
--- a/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-1.2.1.ebuild
+++ b/xfce-extra/xfce4-systemload-plugin/xfce4-systemload-plugin-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=6
inherit fdo-mime gnome2-utils
diff --git a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.0.1.ebuild b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.0.1.ebuild
index 205f9f4de00..3a432484ed1 100644
--- a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.0.1.ebuild
+++ b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.0.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit xfconf
diff --git a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.1.0.ebuild b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.1.0.ebuild
index 12f0ccc3f16..9ffb25e6f3b 100644
--- a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.1.0.ebuild
+++ b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit xfconf
diff --git a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.0.ebuild b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.0.ebuild
index 0950229acf2..935b64f4290 100644
--- a/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-1.2.0.ebuild
+++ b/xfce-extra/xfce4-taskmanager/xfce4-taskmanager-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/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.2.ebuild b/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.2.ebuild
index bc824a57105..303ec563fbc 100644
--- a/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-1.0.2.ebuild
+++ b/xfce-extra/xfce4-time-out-plugin/xfce4-time-out-plugin-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=5
inherit xfconf
diff --git a/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.6.0.ebuild b/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.6.0.ebuild
index 3767d31f07f..dcda274bcbb 100644
--- a/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.6.0.ebuild
+++ b/xfce-extra/xfce4-timer-plugin/xfce4-timer-plugin-1.6.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit multilib xfconf
diff --git a/xfce-extra/xfce4-vala/xfce4-vala-4.10.3-r2.ebuild b/xfce-extra/xfce4-vala/xfce4-vala-4.10.3-r2.ebuild
index 77f295951c3..5801856bd0d 100644
--- a/xfce-extra/xfce4-vala/xfce4-vala-4.10.3-r2.ebuild
+++ b/xfce-extra/xfce4-vala/xfce4-vala-4.10.3-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
MY_VALA_VERSION=0.30
diff --git a/xfce-extra/xfce4-vala/xfce4-vala-4.10.3-r3.ebuild b/xfce-extra/xfce4-vala/xfce4-vala-4.10.3-r3.ebuild
index 939a566fc0a..65b1ff8f171 100644
--- a/xfce-extra/xfce4-vala/xfce4-vala-4.10.3-r3.ebuild
+++ b/xfce-extra/xfce4-vala/xfce4-vala-4.10.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
MY_VALA_VERSION=0.32
diff --git a/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-1.0.1.ebuild b/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-1.0.1.ebuild
index 7acde49a2ba..380e31cbc22 100644
--- a/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-1.0.1.ebuild
+++ b/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-1.0.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit multilib xfconf
diff --git a/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-1.1.0.ebuild b/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-1.1.0.ebuild
index 7acde49a2ba..380e31cbc22 100644
--- a/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-1.1.0.ebuild
+++ b/xfce-extra/xfce4-verve-plugin/xfce4-verve-plugin-1.1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit multilib xfconf
diff --git a/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.0.ebuild b/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.0.ebuild
index 9d7adaf1cb7..5b9de82d1c1 100644
--- a/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.0.ebuild
+++ b/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit xfconf
diff --git a/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.1.ebuild b/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.1.ebuild
index 328081dd497..a4633b940c0 100644
--- a/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.1.ebuild
+++ b/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.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 xfconf
diff --git a/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.2.ebuild b/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.2.ebuild
index 328081dd497..a4633b940c0 100644
--- a/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.2.ebuild
+++ b/xfce-extra/xfce4-volumed-pulse/xfce4-volumed-pulse-0.2.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit xfconf
diff --git a/xfce-extra/xfce4-volumed/xfce4-volumed-0.1.13.ebuild b/xfce-extra/xfce4-volumed/xfce4-volumed-0.1.13.ebuild
index 9930d37516e..8c37ffd7820 100644
--- a/xfce-extra/xfce4-volumed/xfce4-volumed-0.1.13.ebuild
+++ b/xfce-extra/xfce4-volumed/xfce4-volumed-0.1.13.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 xfconf
diff --git a/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.5.12.ebuild b/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.5.12.ebuild
index 1b09a85438e..95e434584e8 100644
--- a/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.5.12.ebuild
+++ b/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.5.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
inherit xfconf
diff --git a/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.0.ebuild b/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.0.ebuild
index fc52736a74d..da7f639462d 100644
--- a/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.6.0.ebuild
+++ b/xfce-extra/xfce4-wavelan-plugin/xfce4-wavelan-plugin-0.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 fdo-mime gnome2-utils
diff --git a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.7.ebuild b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.7.ebuild
index 6e298b9430e..c89f18583f9 100644
--- a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.7.ebuild
+++ b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.7.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit xfconf
diff --git a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.8.ebuild b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.8.ebuild
index 6e298b9430e..c89f18583f9 100644
--- a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.8.ebuild
+++ b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.8.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit xfconf
diff --git a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.9.ebuild b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.9.ebuild
index af86d24247e..386b02c1a3a 100644
--- a/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.9.ebuild
+++ b/xfce-extra/xfce4-weather-plugin/xfce4-weather-plugin-0.8.9.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.6.0.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.6.0.ebuild
index 6117427b062..5b28871bf76 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.6.0.ebuild
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.6.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.7.0.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.7.0.ebuild
index 9408f3f553e..40c5a4db51a 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.7.0.ebuild
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-1.7.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.0.ebuild b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.0.ebuild
index 789ab3e081a..2f1d0a85bfa 100644
--- a/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.0.ebuild
+++ b/xfce-extra/xfce4-whiskermenu-plugin/xfce4-whiskermenu-plugin-2.1.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.2.4.ebuild b/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.2.4.ebuild
index 96a4d38da02..e28fc25e61d 100644
--- a/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.2.4.ebuild
+++ b/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.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
EAUTORECONF=1
diff --git a/xfce-extra/xfce4-wmdock-plugin/xfce4-wmdock-plugin-0.6.0.ebuild b/xfce-extra/xfce4-wmdock-plugin/xfce4-wmdock-plugin-0.6.0.ebuild
index 7f4c4e84c59..01bae332a5e 100644
--- a/xfce-extra/xfce4-wmdock-plugin/xfce4-wmdock-plugin-0.6.0.ebuild
+++ b/xfce-extra/xfce4-wmdock-plugin/xfce4-wmdock-plugin-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 multilib xfconf
diff --git a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.7.1-r1.ebuild b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.7.1-r1.ebuild
index 5e0e674fc05..fee75187316 100644
--- a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.7.1-r1.ebuild
+++ b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.7.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
inherit multilib xfconf
diff --git a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.7.1.ebuild b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.7.1.ebuild
index c9d5250de1f..bffee570b78 100644
--- a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.7.1.ebuild
+++ b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.7.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit multilib xfconf
diff --git a/xfce-extra/xfdashboard/xfdashboard-0.4.0.ebuild b/xfce-extra/xfdashboard/xfdashboard-0.4.0.ebuild
index fd02a38eee3..f6568ac4dc5 100644
--- a/xfce-extra/xfdashboard/xfdashboard-0.4.0.ebuild
+++ b/xfce-extra/xfdashboard/xfdashboard-0.4.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit xfconf
diff --git a/xfce-extra/xfswitch-plugin/xfswitch-plugin-0.0.1-r1.ebuild b/xfce-extra/xfswitch-plugin/xfswitch-plugin-0.0.1-r1.ebuild
index cacb53fa1c0..f9d3a62a9af 100644
--- a/xfce-extra/xfswitch-plugin/xfswitch-plugin-0.0.1-r1.ebuild
+++ b/xfce-extra/xfswitch-plugin/xfswitch-plugin-0.0.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=5
inherit multilib xfconf
diff --git a/xfce-extra/xfswitch-plugin/xfswitch-plugin-0.0.1-r2.ebuild b/xfce-extra/xfswitch-plugin/xfswitch-plugin-0.0.1-r2.ebuild
index a8f1cf2e9b3..c6bca36d81c 100644
--- a/xfce-extra/xfswitch-plugin/xfswitch-plugin-0.0.1-r2.ebuild
+++ b/xfce-extra/xfswitch-plugin/xfswitch-plugin-0.0.1-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
inherit multilib xfconf