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 /gnome-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 'gnome-extra')
-rw-r--r--gnome-extra/activity-log-manager/activity-log-manager-0.9.7-r1.ebuild1
-rw-r--r--gnome-extra/assogiate/assogiate-0.2.1-r1.ebuild1
-rw-r--r--gnome-extra/cameramonitor/cameramonitor-0.3.2-r2.ebuild1
-rw-r--r--gnome-extra/chrome-gnome-shell/chrome-gnome-shell-7.1.ebuild1
-rw-r--r--gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8-r1.ebuild1
-rw-r--r--gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8.1.ebuild1
-rw-r--r--gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.1.ebuild1
-rw-r--r--gnome-extra/cinnamon-control-center/cinnamon-control-center-3.0.1.ebuild1
-rw-r--r--gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.0.ebuild1
-rw-r--r--gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.1.ebuild1
-rw-r--r--gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.1.ebuild1
-rw-r--r--gnome-extra/cinnamon-desktop/cinnamon-desktop-3.0.2.ebuild1
-rw-r--r--gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.0.ebuild1
-rw-r--r--gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.4.ebuild1
-rw-r--r--gnome-extra/cinnamon-menus/cinnamon-menus-2.8.0.ebuild1
-rw-r--r--gnome-extra/cinnamon-menus/cinnamon-menus-3.0.2.ebuild1
-rw-r--r--gnome-extra/cinnamon-menus/cinnamon-menus-3.2.0.ebuild1
-rw-r--r--gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild1
-rw-r--r--gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.0.1.ebuild1
-rw-r--r--gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r1.ebuild1
-rw-r--r--gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r2.ebuild1
-rw-r--r--gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2-r1.ebuild1
-rw-r--r--gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2.ebuild1
-rw-r--r--gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.6.ebuild1
-rw-r--r--gnome-extra/cinnamon-session/cinnamon-session-2.8.2.ebuild1
-rw-r--r--gnome-extra/cinnamon-session/cinnamon-session-2.8.3.ebuild1
-rw-r--r--gnome-extra/cinnamon-session/cinnamon-session-3.0.1.ebuild1
-rw-r--r--gnome-extra/cinnamon-session/cinnamon-session-3.2.0.ebuild1
-rw-r--r--gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild1
-rw-r--r--gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.4.ebuild1
-rw-r--r--gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.0.1.ebuild1
-rw-r--r--gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.2.0.ebuild1
-rw-r--r--gnome-extra/cinnamon-translations/cinnamon-translations-2.8.3.ebuild1
-rw-r--r--gnome-extra/cinnamon-translations/cinnamon-translations-3.0.3.ebuild1
-rw-r--r--gnome-extra/cinnamon-translations/cinnamon-translations-3.2.0.ebuild1
-rw-r--r--gnome-extra/cinnamon/cinnamon-2.8.8-r1.ebuild1
-rw-r--r--gnome-extra/cinnamon/cinnamon-3.0.6-r1.ebuild1
-rw-r--r--gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild1
-rw-r--r--gnome-extra/cinnamon/cinnamon-3.0.7-r2.ebuild1
-rw-r--r--gnome-extra/cinnamon/cinnamon-3.2.0-r2.ebuild1
-rw-r--r--gnome-extra/cinnamon/cinnamon-3.2.6-r1.ebuild1
-rw-r--r--gnome-extra/cinnamon/cinnamon-3.2.7-r1.ebuild1
-rw-r--r--gnome-extra/cjs/cjs-2.8.0.ebuild1
-rw-r--r--gnome-extra/cjs/cjs-3.0.1.ebuild1
-rw-r--r--gnome-extra/cjs/cjs-3.2.0.ebuild1
-rw-r--r--gnome-extra/docky/docky-2.2.1.1-r1.ebuild1
-rw-r--r--gnome-extra/eiciel/eiciel-0.9.11-r1.ebuild1
-rw-r--r--gnome-extra/eiciel/eiciel-0.9.11.ebuild1
-rw-r--r--gnome-extra/evolution-data-server/evolution-data-server-3.20.6.ebuild1
-rw-r--r--gnome-extra/evolution-data-server/evolution-data-server-3.22.4.ebuild1
-rw-r--r--gnome-extra/evolution-ews/evolution-ews-3.20.5.ebuild1
-rw-r--r--gnome-extra/evolution-ews/evolution-ews-3.22.1.ebuild1
-rw-r--r--gnome-extra/evolution-ews/evolution-ews-3.22.2.ebuild1
-rw-r--r--gnome-extra/evolution-ews/evolution-ews-3.22.3.ebuild1
-rw-r--r--gnome-extra/evolution-ews/evolution-ews-3.22.4.ebuild1
-rw-r--r--gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild1
-rw-r--r--gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r4.ebuild1
-rw-r--r--gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r5.ebuild1
-rw-r--r--gnome-extra/gnome-boxes/gnome-boxes-3.20.2.ebuild1
-rw-r--r--gnome-extra/gnome-boxes/gnome-boxes-3.20.3.ebuild1
-rw-r--r--gnome-extra/gnome-boxes/gnome-boxes-3.22.1.ebuild1
-rw-r--r--gnome-extra/gnome-boxes/gnome-boxes-3.22.2.ebuild1
-rw-r--r--gnome-extra/gnome-boxes/gnome-boxes-3.22.3.ebuild1
-rw-r--r--gnome-extra/gnome-builder/gnome-builder-3.18.1.ebuild1
-rw-r--r--gnome-extra/gnome-builder/gnome-builder-3.22.4.ebuild1
-rw-r--r--gnome-extra/gnome-calculator/gnome-calculator-3.20.2.ebuild1
-rw-r--r--gnome-extra/gnome-calculator/gnome-calculator-3.22.1.ebuild1
-rw-r--r--gnome-extra/gnome-calculator/gnome-calculator-3.22.2.ebuild1
-rw-r--r--gnome-extra/gnome-calendar/gnome-calendar-3.20.4.ebuild1
-rw-r--r--gnome-extra/gnome-calendar/gnome-calendar-3.22.1.ebuild1
-rw-r--r--gnome-extra/gnome-calendar/gnome-calendar-3.22.2.ebuild1
-rw-r--r--gnome-extra/gnome-characters/gnome-characters-3.20.1.ebuild1
-rw-r--r--gnome-extra/gnome-characters/gnome-characters-3.22.0.ebuild1
-rw-r--r--gnome-extra/gnome-clocks/gnome-clocks-3.20.2.ebuild1
-rw-r--r--gnome-extra/gnome-clocks/gnome-clocks-3.22.1.ebuild1
-rw-r--r--gnome-extra/gnome-color-chooser/gnome-color-chooser-0.2.5.ebuild1
-rw-r--r--gnome-extra/gnome-color-manager/gnome-color-manager-3.20.0.ebuild1
-rw-r--r--gnome-extra/gnome-color-manager/gnome-color-manager-3.22.1.ebuild1
-rw-r--r--gnome-extra/gnome-color-manager/gnome-color-manager-3.22.2.ebuild1
-rw-r--r--gnome-extra/gnome-commander/gnome-commander-1.4.8.ebuild1
-rw-r--r--gnome-extra/gnome-commander/gnome-commander-1.6.1.ebuild1
-rw-r--r--gnome-extra/gnome-contacts/gnome-contacts-3.20.0.ebuild1
-rw-r--r--gnome-extra/gnome-contacts/gnome-contacts-3.22.1.ebuild1
-rw-r--r--gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.8.ebuild1
-rw-r--r--gnome-extra/gnome-documents/gnome-documents-3.20.1.ebuild1
-rw-r--r--gnome-extra/gnome-documents/gnome-documents-3.22.0.ebuild1
-rw-r--r--gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild1
-rw-r--r--gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.20.0.ebuild1
-rw-r--r--gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.22.0.ebuild1
-rw-r--r--gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20131013.ebuild1
-rw-r--r--gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907.ebuild1
-rw-r--r--gnome-extra/gnome-logs/gnome-logs-3.20.1.ebuild1
-rw-r--r--gnome-extra/gnome-logs/gnome-logs-3.22.1.ebuild1
-rw-r--r--gnome-extra/gnome-packagekit/gnome-packagekit-3.20.0.ebuild1
-rw-r--r--gnome-extra/gnome-packagekit/gnome-packagekit-3.22.1.ebuild1
-rw-r--r--gnome-extra/gnome-power-manager/gnome-power-manager-3.20.0.ebuild1
-rw-r--r--gnome-extra/gnome-power-manager/gnome-power-manager-3.22.1.ebuild1
-rw-r--r--gnome-extra/gnome-power-manager/gnome-power-manager-3.22.2.ebuild1
-rw-r--r--gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild1
-rw-r--r--gnome-extra/gnome-shell-extensions-topicons/gnome-shell-extensions-topicons-28-r1.ebuild1
-rw-r--r--gnome-extra/gnome-shell-extensions-topicons/gnome-shell-extensions-topicons-28.ebuild1
-rw-r--r--gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.20.1.ebuild1
-rw-r--r--gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.22.2.ebuild1
-rw-r--r--gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.18.2.ebuild1
-rw-r--r--gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.20.0.ebuild1
-rw-r--r--gnome-extra/gnome-software/gnome-software-3.20.5.ebuild1
-rw-r--r--gnome-extra/gnome-software/gnome-software-3.22.2.ebuild1
-rw-r--r--gnome-extra/gnome-software/gnome-software-3.22.4.ebuild1
-rw-r--r--gnome-extra/gnome-system-monitor/gnome-system-monitor-3.20.1.ebuild1
-rw-r--r--gnome-extra/gnome-system-monitor/gnome-system-monitor-3.22.0.ebuild1
-rw-r--r--gnome-extra/gnome-system-monitor/gnome-system-monitor-3.22.2.ebuild1
-rw-r--r--gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.20.1.ebuild1
-rw-r--r--gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.22.0.ebuild1
-rw-r--r--gnome-extra/gnome-user-docs/gnome-user-docs-3.20.2.ebuild1
-rw-r--r--gnome-extra/gnome-user-docs/gnome-user-docs-3.22.0.ebuild1
-rw-r--r--gnome-extra/gnome-user-share/gnome-user-share-3.18.3.ebuild1
-rw-r--r--gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild1
-rw-r--r--gnome-extra/gnome-weather/gnome-weather-3.18.1.ebuild1
-rw-r--r--gnome-extra/gnome-weather/gnome-weather-3.20.1.ebuild1
-rw-r--r--gnome-extra/gnome-weather/gnome-weather-3.20.2.ebuild1
-rw-r--r--gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r3.ebuild1
-rw-r--r--gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild1
-rw-r--r--gnome-extra/gtkhtml/gtkhtml-4.8.5.ebuild1
-rw-r--r--gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild1
-rw-r--r--gnome-extra/gucharmap/gucharmap-9.0.2.ebuild1
-rw-r--r--gnome-extra/libgda/libgda-5.2.4-r2.ebuild1
-rw-r--r--gnome-extra/libgsf/libgsf-1.14.41-r1.ebuild1
-rw-r--r--gnome-extra/mousetweaks/mousetweaks-3.12.0.ebuild1
-rw-r--r--gnome-extra/nautilus-actions/nautilus-actions-3.2.3.ebuild1
-rw-r--r--gnome-extra/nautilus-actions/nautilus-actions-3.2.4.ebuild1
-rw-r--r--gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild1
-rw-r--r--gnome-extra/nautilus-sendto/nautilus-sendto-3.8.3.ebuild1
-rw-r--r--gnome-extra/nautilus-sendto/nautilus-sendto-3.8.4.ebuild1
-rw-r--r--gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.10.1.ebuild1
-rw-r--r--gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.8.3.ebuild1
-rw-r--r--gnome-extra/nemo/nemo-2.8.7.ebuild1
-rw-r--r--gnome-extra/nemo/nemo-3.0.6.ebuild1
-rw-r--r--gnome-extra/nemo/nemo-3.2.0.ebuild1
-rw-r--r--gnome-extra/nm-applet/nm-applet-1.2.4.ebuild1
-rw-r--r--gnome-extra/nm-applet/nm-applet-1.4.2.ebuild1
-rw-r--r--gnome-extra/office-runner/office-runner-1.0.2.ebuild1
-rw-r--r--gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild1
-rw-r--r--gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92.ebuild1
-rw-r--r--gnome-extra/sushi/sushi-3.20.0.ebuild1
-rw-r--r--gnome-extra/sushi/sushi-3.21.91.ebuild1
-rw-r--r--gnome-extra/synapse/synapse-0.2.99.1.ebuild1
-rw-r--r--gnome-extra/synapse/synapse-0.2.99.2.ebuild1
-rw-r--r--gnome-extra/yelp-xsl/yelp-xsl-3.20.1.ebuild1
-rw-r--r--gnome-extra/yelp/yelp-3.20.1.ebuild1
-rw-r--r--gnome-extra/yelp/yelp-3.22.0.ebuild1
-rw-r--r--gnome-extra/zeitgeist-datasources/zeitgeist-datasources-0.8.1.ebuild1
-rw-r--r--gnome-extra/zeitgeist-explorer/zeitgeist-explorer-0.2-r1.ebuild1
-rw-r--r--gnome-extra/zeitgeist/zeitgeist-0.9.16.ebuild1
-rw-r--r--gnome-extra/zenity/zenity-3.20.0.ebuild1
-rw-r--r--gnome-extra/zenity/zenity-3.22.0.ebuild1
155 files changed, 0 insertions, 155 deletions
diff --git a/gnome-extra/activity-log-manager/activity-log-manager-0.9.7-r1.ebuild b/gnome-extra/activity-log-manager/activity-log-manager-0.9.7-r1.ebuild
index 38197b8001b..947436189f9 100644
--- a/gnome-extra/activity-log-manager/activity-log-manager-0.9.7-r1.ebuild
+++ b/gnome-extra/activity-log-manager/activity-log-manager-0.9.7-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/gnome-extra/assogiate/assogiate-0.2.1-r1.ebuild b/gnome-extra/assogiate/assogiate-0.2.1-r1.ebuild
index d778ef305cb..4737a2b5217 100644
--- a/gnome-extra/assogiate/assogiate-0.2.1-r1.ebuild
+++ b/gnome-extra/assogiate/assogiate-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"
GCONF_DEBUG="yes"
diff --git a/gnome-extra/cameramonitor/cameramonitor-0.3.2-r2.ebuild b/gnome-extra/cameramonitor/cameramonitor-0.3.2-r2.ebuild
index cf50a7cc3f4..0366a83c88a 100644
--- a/gnome-extra/cameramonitor/cameramonitor-0.3.2-r2.ebuild
+++ b/gnome-extra/cameramonitor/cameramonitor-0.3.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/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-7.1.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-7.1.ebuild
index 324bdd7dc16..2ee09612678 100644
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-7.1.ebuild
+++ b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-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=6
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8-r1.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8-r1.ebuild
index 495e02ee738..4bfae3a2fc3 100644
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8-r1.ebuild
+++ b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8.1.ebuild b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8.1.ebuild
index 41bbe3026a7..212495f9a51 100644
--- a/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8.1.ebuild
+++ b/gnome-extra/chrome-gnome-shell/chrome-gnome-shell-8.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.1.ebuild
index e5747f6de33..5979d298976 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.8.1.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-2.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"
GCONF_DEBUG="yes"
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.0.1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.0.1.ebuild
index 34f76548fe5..b1b173b37c1 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.0.1.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.0.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.0.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.0.ebuild
index d1734ba390f..ee1441423e0 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.0.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.1.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.1.ebuild
index 82f9ed8c177..fc5ab9e8080 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.1.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-3.2.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
GNOME2_LA_PUNT="yes" # gmodule is used, which uses dlopen
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.1.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.1.ebuild
index 231d9d0986a..f69468054a8 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.1.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-2.8.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 )
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.0.2.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.0.2.ebuild
index e6f1f1d6697..aed013a6760 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.0.2.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.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
PYTHON_COMPAT=( python2_7 )
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.0.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.0.ebuild
index c5431310022..657503d0dd4 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.0.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python3_4 )
diff --git a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.4.ebuild b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.4.ebuild
index 52c3349f97d..0cdd1744d43 100644
--- a/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.4.ebuild
+++ b/gnome-extra/cinnamon-desktop/cinnamon-desktop-3.2.4.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python3_4 )
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-2.8.0.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-2.8.0.ebuild
index 794c5648d56..ea6a61ac2d9 100644
--- a/gnome-extra/cinnamon-menus/cinnamon-menus-2.8.0.ebuild
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-2.8.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
GCONF_DEBUG="yes"
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-3.0.2.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-3.0.2.ebuild
index ffee6b9e5d5..4231dacb3fb 100644
--- a/gnome-extra/cinnamon-menus/cinnamon-menus-3.0.2.ebuild
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-3.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
inherit autotools gnome2
diff --git a/gnome-extra/cinnamon-menus/cinnamon-menus-3.2.0.ebuild b/gnome-extra/cinnamon-menus/cinnamon-menus-3.2.0.ebuild
index 4cc55fc4bb4..e6a59a9bbe7 100644
--- a/gnome-extra/cinnamon-menus/cinnamon-menus-3.2.0.ebuild
+++ b/gnome-extra/cinnamon-menus/cinnamon-menus-3.2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit autotools gnome2
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild
index 8b0d4a7909c..360df03ab72 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.0-r1.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-2.8.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"
GCONF_DEBUG="yes"
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.0.1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.0.1.ebuild
index ec228506394..d26bfb917fe 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.0.1.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.0.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 )
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r1.ebuild
index 8ea78518bd1..64896e60b3b 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r1.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python3_4 )
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r2.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r2.ebuild
index f09589c9f7a..fb490f3da16 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r2.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.13-r2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python3_4 )
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2-r1.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2-r1.ebuild
index 5f26e1d2880..473a98b87ae 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2-r1.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python3_4 )
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2.ebuild
index cc0a1f9559c..9d428ea641e 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python3_4 )
diff --git a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.6.ebuild b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.6.ebuild
index 84a5f3aac86..ae7d388f56e 100644
--- a/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.6.ebuild
+++ b/gnome-extra/cinnamon-screensaver/cinnamon-screensaver-3.2.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PYTHON_COMPAT=( python3_4 )
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-2.8.2.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-2.8.2.ebuild
index 75c495d0e8f..7fabffaee06 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-2.8.2.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-2.8.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
GCONF_DEBUG="no"
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-2.8.3.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-2.8.3.ebuild
index 3c47bea53a3..2451a7ce34b 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-2.8.3.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-2.8.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit autotools eutils gnome2
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.0.1.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-3.0.1.ebuild
index d5030635096..04d79cfb51f 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-3.0.1.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-3.0.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit autotools eutils gnome2
diff --git a/gnome-extra/cinnamon-session/cinnamon-session-3.2.0.ebuild b/gnome-extra/cinnamon-session/cinnamon-session-3.2.0.ebuild
index 9d709f32101..fb4f3cf0ef9 100644
--- a/gnome-extra/cinnamon-session/cinnamon-session-3.2.0.ebuild
+++ b/gnome-extra/cinnamon-session/cinnamon-session-3.2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit autotools eutils gnome2
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild
index 2c1e840cae7..88f1e7a56f1 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
GCONF_DEBUG="yes"
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.4.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.4.ebuild
index b514ddb95a4..0c265d4540e 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.4.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-2.8.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
GNOME2_LA_PUNT="yes"
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.0.1.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.0.1.ebuild
index b3929d15579..49d57f84de3 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.0.1.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.0.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
GNOME2_LA_PUNT="yes"
diff --git a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.2.0.ebuild b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.2.0.ebuild
index f87a78db418..8dc7f204f0a 100644
--- a/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.2.0.ebuild
+++ b/gnome-extra/cinnamon-settings-daemon/cinnamon-settings-daemon-3.2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
GNOME2_LA_PUNT="yes"
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-2.8.3.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-2.8.3.ebuild
index 6e67a21a28f..71139b82da9 100644
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-2.8.3.ebuild
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-2.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
PLOCALES="af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en@shaw en_AU en_CA en_GB eo es es_AR et eu fa fi fil fo fr fr_CA frp fy ga gd gl gu he hi hr hu hy ia id is it ja jv ka kk km kn ko ksw ku ky la li lo lt lv mai mg mk ml mn mr ms my nb nds ne nl nn nso oc om or pa pl ps pt pt_BR ro ru rue rw sco shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv sw ta te tg th tl tlh tpi tr ts ug uk ur uz uz@cyrillic vi wa xh yi zh_CN zh_HK zh_TW zu"
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-3.0.3.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-3.0.3.ebuild
index f714b77a2a3..a86fa147254 100644
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-3.0.3.ebuild
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-3.0.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PLOCALES="af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en@shaw en_AU en_CA en_GB eo es es_AR et eu fa fi fil fo fr fr_CA frp fy ga gd gl gu he hi hr hu hy ia id ii is it ja jv ka kk km kn ko ksw ku ky la li lo lt lv mai mg mk ml mn mr ms my nb nds ne nl nn nso oc om or pa pap pl ps pt pt_BR ro ru rue rw sa sc sco shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv sw ta te tg th tl tlh tpi tr ts tt ug uk ur uz uz@cyrillic vi wa xh yi zh_CN zh_HK zh_TW zu"
diff --git a/gnome-extra/cinnamon-translations/cinnamon-translations-3.2.0.ebuild b/gnome-extra/cinnamon-translations/cinnamon-translations-3.2.0.ebuild
index 77def6d5756..af749589b26 100644
--- a/gnome-extra/cinnamon-translations/cinnamon-translations-3.2.0.ebuild
+++ b/gnome-extra/cinnamon-translations/cinnamon-translations-3.2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
PLOCALES="af am an ar as ast az be be@latin bg bn bn_IN br bs ca ca@valencia crh cs csb cy da de dz el en@shaw en_AU en_CA en_GB eo es es_AR et eu fa fi fil fo fr fr_CA frp fy ga gd gl gu he hi hr hu hy ia id ii is it ja jv ka kk km kn ko ksw ku ky la li lo lt lv mai mg mk ml mn mr ms my nb nds ne nl nn nso oc om or pa pap pl ps pt pt_BR ro ru rue rw sa sc sco shn si sk sl so sq sr sr@ijekavianlatin sr@latin sv sw ta te tg th tl tlh tpi tr ts tt ug uk ur uz uz@cyrillic vi wa xh yi zh_CN zh_HK zh_TW zu"
diff --git a/gnome-extra/cinnamon/cinnamon-2.8.8-r1.ebuild b/gnome-extra/cinnamon/cinnamon-2.8.8-r1.ebuild
index cbd233819e7..c7179a515f0 100644
--- a/gnome-extra/cinnamon/cinnamon-2.8.8-r1.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-2.8.8-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
GNOME2_LA_PUNT="yes"
diff --git a/gnome-extra/cinnamon/cinnamon-3.0.6-r1.ebuild b/gnome-extra/cinnamon/cinnamon-3.0.6-r1.ebuild
index eae06998390..45c4dc6b9a6 100644
--- a/gnome-extra/cinnamon/cinnamon-3.0.6-r1.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.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
GNOME2_LA_PUNT="yes"
diff --git a/gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild b/gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild
index 27905483f1a..81153441342 100644
--- a/gnome-extra/cinnamon/cinnamon-3.0.7-r1.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.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
GNOME2_LA_PUNT="yes"
diff --git a/gnome-extra/cinnamon/cinnamon-3.0.7-r2.ebuild b/gnome-extra/cinnamon/cinnamon-3.0.7-r2.ebuild
index 265cdd7125f..bbb2be881b1 100644
--- a/gnome-extra/cinnamon/cinnamon-3.0.7-r2.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.0.7-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
GNOME2_LA_PUNT="yes"
diff --git a/gnome-extra/cinnamon/cinnamon-3.2.0-r2.ebuild b/gnome-extra/cinnamon/cinnamon-3.2.0-r2.ebuild
index a9a5133179f..8fe62a2ae76 100644
--- a/gnome-extra/cinnamon/cinnamon-3.2.0-r2.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.2.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
GNOME2_LA_PUNT="yes"
diff --git a/gnome-extra/cinnamon/cinnamon-3.2.6-r1.ebuild b/gnome-extra/cinnamon/cinnamon-3.2.6-r1.ebuild
index 6e46b84aab2..48f0ced3bf6 100644
--- a/gnome-extra/cinnamon/cinnamon-3.2.6-r1.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.2.6-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
GNOME2_LA_PUNT="yes"
diff --git a/gnome-extra/cinnamon/cinnamon-3.2.7-r1.ebuild b/gnome-extra/cinnamon/cinnamon-3.2.7-r1.ebuild
index 6e46b84aab2..48f0ced3bf6 100644
--- a/gnome-extra/cinnamon/cinnamon-3.2.7-r1.ebuild
+++ b/gnome-extra/cinnamon/cinnamon-3.2.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
GNOME2_LA_PUNT="yes"
diff --git a/gnome-extra/cjs/cjs-2.8.0.ebuild b/gnome-extra/cjs/cjs-2.8.0.ebuild
index b7c2cade7bf..a90a0008218 100644
--- a/gnome-extra/cjs/cjs-2.8.0.ebuild
+++ b/gnome-extra/cjs/cjs-2.8.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
GCONF_DEBUG="no"
diff --git a/gnome-extra/cjs/cjs-3.0.1.ebuild b/gnome-extra/cjs/cjs-3.0.1.ebuild
index 295ec2a12ba..b56d402ca7a 100644
--- a/gnome-extra/cjs/cjs-3.0.1.ebuild
+++ b/gnome-extra/cjs/cjs-3.0.1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit autotools gnome2 pax-utils virtualx
diff --git a/gnome-extra/cjs/cjs-3.2.0.ebuild b/gnome-extra/cjs/cjs-3.2.0.ebuild
index a964f561759..fba702906f9 100644
--- a/gnome-extra/cjs/cjs-3.2.0.ebuild
+++ b/gnome-extra/cjs/cjs-3.2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit autotools gnome2 pax-utils virtualx
diff --git a/gnome-extra/docky/docky-2.2.1.1-r1.ebuild b/gnome-extra/docky/docky-2.2.1.1-r1.ebuild
index d571759ffb7..ecb0ae1c5a2 100644
--- a/gnome-extra/docky/docky-2.2.1.1-r1.ebuild
+++ b/gnome-extra/docky/docky-2.2.1.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 autotools eutils gnome2 mono-env
diff --git a/gnome-extra/eiciel/eiciel-0.9.11-r1.ebuild b/gnome-extra/eiciel/eiciel-0.9.11-r1.ebuild
index 157a0aff741..fa509d7fbe6 100644
--- a/gnome-extra/eiciel/eiciel-0.9.11-r1.ebuild
+++ b/gnome-extra/eiciel/eiciel-0.9.11-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
GCONF_DEBUG="no"
diff --git a/gnome-extra/eiciel/eiciel-0.9.11.ebuild b/gnome-extra/eiciel/eiciel-0.9.11.ebuild
index 56c1bd7e19b..b24a03ddc18 100644
--- a/gnome-extra/eiciel/eiciel-0.9.11.ebuild
+++ b/gnome-extra/eiciel/eiciel-0.9.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
GCONF_DEBUG="no"
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.20.6.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.20.6.ebuild
index f2945e79cf8..ef1ee3f5bcf 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.20.6.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.20.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
GNOME2_LA_PUNT="yes"
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.22.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.22.4.ebuild
index c96aff5312a..b4d3349e69a 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.22.4.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.22.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/gnome-extra/evolution-ews/evolution-ews-3.20.5.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.20.5.ebuild
index 89cf8a72423..806360873e6 100644
--- a/gnome-extra/evolution-ews/evolution-ews-3.20.5.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.20.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
GNOME2_LA_PUNT="yes"
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.22.1.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.22.1.ebuild
index e068f9c90b5..cebf15a0357 100644
--- a/gnome-extra/evolution-ews/evolution-ews-3.22.1.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.22.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
GNOME2_LA_PUNT="yes"
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.22.2.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.22.2.ebuild
index e068f9c90b5..cebf15a0357 100644
--- a/gnome-extra/evolution-ews/evolution-ews-3.22.2.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.22.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
GNOME2_LA_PUNT="yes"
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.22.3.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.22.3.ebuild
index e068f9c90b5..cebf15a0357 100644
--- a/gnome-extra/evolution-ews/evolution-ews-3.22.3.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.22.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/gnome-extra/evolution-ews/evolution-ews-3.22.4.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.22.4.ebuild
index 208204cb51e..f33a998d30f 100644
--- a/gnome-extra/evolution-ews/evolution-ews-3.22.4.ebuild
+++ b/gnome-extra/evolution-ews/evolution-ews-3.22.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/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild b/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild
index 036d1e13e2b..46fca22ad7e 100644
--- a/gnome-extra/gconf-editor/gconf-editor-3.0.1-r1.ebuild
+++ b/gnome-extra/gconf-editor/gconf-editor-3.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
inherit gnome2
diff --git a/gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r4.ebuild b/gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r4.ebuild
index 0fadb239a89..ddad2fd9208 100644
--- a/gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r4.ebuild
+++ b/gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.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
diff --git a/gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r5.ebuild b/gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r5.ebuild
index d10f7866a17..a06e51dc4aa 100644
--- a/gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-r5.ebuild
+++ b/gnome-extra/gnome-activity-journal/gnome-activity-journal-0.8.0-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
PYTHON_COMPAT=( python2_7 )
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.20.2.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.20.2.ebuild
index 661fe79529c..9655c361e4b 100644
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.20.2.ebuild
+++ b/gnome-extra/gnome-boxes/gnome-boxes-3.20.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
VALA_USE_DEPEND="vapigen"
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.20.3.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.20.3.ebuild
index 661fe79529c..9655c361e4b 100644
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.20.3.ebuild
+++ b/gnome-extra/gnome-boxes/gnome-boxes-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=6
VALA_USE_DEPEND="vapigen"
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.22.1.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.22.1.ebuild
index a0af5cd1e7a..d15e7da009d 100644
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.22.1.ebuild
+++ b/gnome-extra/gnome-boxes/gnome-boxes-3.22.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
VALA_USE_DEPEND="vapigen"
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.22.2.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.22.2.ebuild
index a0af5cd1e7a..d15e7da009d 100644
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.22.2.ebuild
+++ b/gnome-extra/gnome-boxes/gnome-boxes-3.22.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
VALA_USE_DEPEND="vapigen"
diff --git a/gnome-extra/gnome-boxes/gnome-boxes-3.22.3.ebuild b/gnome-extra/gnome-boxes/gnome-boxes-3.22.3.ebuild
index a0af5cd1e7a..d15e7da009d 100644
--- a/gnome-extra/gnome-boxes/gnome-boxes-3.22.3.ebuild
+++ b/gnome-extra/gnome-boxes/gnome-boxes-3.22.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
VALA_USE_DEPEND="vapigen"
diff --git a/gnome-extra/gnome-builder/gnome-builder-3.18.1.ebuild b/gnome-extra/gnome-builder/gnome-builder-3.18.1.ebuild
index 10d5674ac8c..7d6c3e0be6e 100644
--- a/gnome-extra/gnome-builder/gnome-builder-3.18.1.ebuild
+++ b/gnome-extra/gnome-builder/gnome-builder-3.18.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"
GCONF_DEBUG="no"
diff --git a/gnome-extra/gnome-builder/gnome-builder-3.22.4.ebuild b/gnome-extra/gnome-builder/gnome-builder-3.22.4.ebuild
index 1a6e8fb4b25..d1fe397459a 100644
--- a/gnome-extra/gnome-builder/gnome-builder-3.22.4.ebuild
+++ b/gnome-extra/gnome-builder/gnome-builder-3.22.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
PYTHON_COMPAT=( python{3_3,3_4,3_5} )
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.20.2.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.20.2.ebuild
index 79141bda9f7..3ecf789256a 100644
--- a/gnome-extra/gnome-calculator/gnome-calculator-3.20.2.ebuild
+++ b/gnome-extra/gnome-calculator/gnome-calculator-3.20.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit gnome2
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.22.1.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.22.1.ebuild
index 2dc7758d671..e5a7547aba1 100644
--- a/gnome-extra/gnome-calculator/gnome-calculator-3.22.1.ebuild
+++ b/gnome-extra/gnome-calculator/gnome-calculator-3.22.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 gnome2
diff --git a/gnome-extra/gnome-calculator/gnome-calculator-3.22.2.ebuild b/gnome-extra/gnome-calculator/gnome-calculator-3.22.2.ebuild
index 2dc7758d671..e5a7547aba1 100644
--- a/gnome-extra/gnome-calculator/gnome-calculator-3.22.2.ebuild
+++ b/gnome-extra/gnome-calculator/gnome-calculator-3.22.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit gnome2
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.20.4.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.20.4.ebuild
index db34e22f773..3b6269bf4b7 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-3.20.4.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.20.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
inherit gnome2
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.22.1.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.22.1.ebuild
index 4a96039c4ff..8b18b4e9cf3 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-3.22.1.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.22.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 gnome2
diff --git a/gnome-extra/gnome-calendar/gnome-calendar-3.22.2.ebuild b/gnome-extra/gnome-calendar/gnome-calendar-3.22.2.ebuild
index 4a96039c4ff..8b18b4e9cf3 100644
--- a/gnome-extra/gnome-calendar/gnome-calendar-3.22.2.ebuild
+++ b/gnome-extra/gnome-calendar/gnome-calendar-3.22.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 gnome2
diff --git a/gnome-extra/gnome-characters/gnome-characters-3.20.1.ebuild b/gnome-extra/gnome-characters/gnome-characters-3.20.1.ebuild
index 060d4accee9..a6cbf3ad326 100644
--- a/gnome-extra/gnome-characters/gnome-characters-3.20.1.ebuild
+++ b/gnome-extra/gnome-characters/gnome-characters-3.20.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
VALA_USE_DEPEND="vapigen"
diff --git a/gnome-extra/gnome-characters/gnome-characters-3.22.0.ebuild b/gnome-extra/gnome-characters/gnome-characters-3.22.0.ebuild
index 61caa76511c..fa3f99d7194 100644
--- a/gnome-extra/gnome-characters/gnome-characters-3.22.0.ebuild
+++ b/gnome-extra/gnome-characters/gnome-characters-3.22.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
VALA_USE_DEPEND="vapigen"
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-3.20.2.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-3.20.2.ebuild
index f209f5cd6d7..eeb7907f5ad 100644
--- a/gnome-extra/gnome-clocks/gnome-clocks-3.20.2.ebuild
+++ b/gnome-extra/gnome-clocks/gnome-clocks-3.20.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
VALA_MIN_API_VERSION="0.24"
diff --git a/gnome-extra/gnome-clocks/gnome-clocks-3.22.1.ebuild b/gnome-extra/gnome-clocks/gnome-clocks-3.22.1.ebuild
index 207f624f67e..23afadc1a9d 100644
--- a/gnome-extra/gnome-clocks/gnome-clocks-3.22.1.ebuild
+++ b/gnome-extra/gnome-clocks/gnome-clocks-3.22.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
VALA_MIN_API_VERSION="0.24"
diff --git a/gnome-extra/gnome-color-chooser/gnome-color-chooser-0.2.5.ebuild b/gnome-extra/gnome-color-chooser/gnome-color-chooser-0.2.5.ebuild
index 616b78cdff6..9a9cbb6a5a0 100644
--- a/gnome-extra/gnome-color-chooser/gnome-color-chooser-0.2.5.ebuild
+++ b/gnome-extra/gnome-color-chooser/gnome-color-chooser-0.2.5.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
GCONF_DEBUG="no"
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.20.0.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.20.0.ebuild
index 6e07f98d6db..7d9d9bf6ce8 100644
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.20.0.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.20.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit gnome2 virtualx
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.22.1.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.22.1.ebuild
index ac450300fdd..2abc9a88b4a 100644
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.22.1.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.22.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 gnome2 virtualx
diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.22.2.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.22.2.ebuild
index ac450300fdd..2abc9a88b4a 100644
--- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.22.2.ebuild
+++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.22.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 gnome2 virtualx
diff --git a/gnome-extra/gnome-commander/gnome-commander-1.4.8.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.4.8.ebuild
index 7fd6b33e037..2e2b2fa5930 100644
--- a/gnome-extra/gnome-commander/gnome-commander-1.4.8.ebuild
+++ b/gnome-extra/gnome-commander/gnome-commander-1.4.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/gnome-extra/gnome-commander/gnome-commander-1.6.1.ebuild b/gnome-extra/gnome-commander/gnome-commander-1.6.1.ebuild
index 6488fa14433..75cd4064570 100644
--- a/gnome-extra/gnome-commander/gnome-commander-1.6.1.ebuild
+++ b/gnome-extra/gnome-commander/gnome-commander-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
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.20.0.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.20.0.ebuild
index b4101f40e66..4e3617a7ab7 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.20.0.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.20.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
VALA_USE_DEPEND="vapigen"
diff --git a/gnome-extra/gnome-contacts/gnome-contacts-3.22.1.ebuild b/gnome-extra/gnome-contacts/gnome-contacts-3.22.1.ebuild
index eb6dadbc6aa..93e550588db 100644
--- a/gnome-extra/gnome-contacts/gnome-contacts-3.22.1.ebuild
+++ b/gnome-extra/gnome-contacts/gnome-contacts-3.22.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
VALA_USE_DEPEND="vapigen"
diff --git a/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.8.ebuild b/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.8.ebuild
index e3fd698515a..117d97485ea 100644
--- a/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.1.8.ebuild
+++ b/gnome-extra/gnome-directory-thumbnailer/gnome-directory-thumbnailer-0.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=6
inherit gnome2
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.20.1.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.20.1.ebuild
index c8afcfb4390..2ad2f3c7b8c 100644
--- a/gnome-extra/gnome-documents/gnome-documents-3.20.1.ebuild
+++ b/gnome-extra/gnome-documents/gnome-documents-3.20.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 gnome2
diff --git a/gnome-extra/gnome-documents/gnome-documents-3.22.0.ebuild b/gnome-extra/gnome-documents/gnome-documents-3.22.0.ebuild
index bd4afa84ff8..dcb8200afd7 100644
--- a/gnome-extra/gnome-documents/gnome-documents-3.22.0.ebuild
+++ b/gnome-extra/gnome-documents/gnome-documents-3.22.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit gnome2
diff --git a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild
index 6bec04c6d01..4fb604a4e99 100644
--- a/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.ebuild
+++ b/gnome-extra/gnome-dvb-daemon/gnome-dvb-daemon-0.2.90.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/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.20.0.ebuild b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.20.0.ebuild
index d97381bfc38..bd1a2cb6ece 100644
--- a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.20.0.ebuild
+++ b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.20.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit gnome2
diff --git a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.22.0.ebuild b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.22.0.ebuild
index 607388933aa..aa97c3dd8d9 100644
--- a/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.22.0.ebuild
+++ b/gnome-extra/gnome-getting-started-docs/gnome-getting-started-docs-3.22.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit gnome2
diff --git a/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20131013.ebuild b/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20131013.ebuild
index 756e8ffb252..a2522a7fc52 100644
--- a/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20131013.ebuild
+++ b/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20131013.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/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907.ebuild b/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907.ebuild
index 2ea10385c43..d8528c8f3f5 100644
--- a/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907.ebuild
+++ b/gnome-extra/gnome-integration-spotify/gnome-integration-spotify-20140907.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/gnome-extra/gnome-logs/gnome-logs-3.20.1.ebuild b/gnome-extra/gnome-logs/gnome-logs-3.20.1.ebuild
index a7e5b542ce3..9bc63fa5934 100644
--- a/gnome-extra/gnome-logs/gnome-logs-3.20.1.ebuild
+++ b/gnome-extra/gnome-logs/gnome-logs-3.20.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
PYTHON_COMPAT=( python2_7 )
diff --git a/gnome-extra/gnome-logs/gnome-logs-3.22.1.ebuild b/gnome-extra/gnome-logs/gnome-logs-3.22.1.ebuild
index bc11cb5290e..2364bfc7a2b 100644
--- a/gnome-extra/gnome-logs/gnome-logs-3.22.1.ebuild
+++ b/gnome-extra/gnome-logs/gnome-logs-3.22.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
PYTHON_COMPAT=( python2_7 )
diff --git a/gnome-extra/gnome-packagekit/gnome-packagekit-3.20.0.ebuild b/gnome-extra/gnome-packagekit/gnome-packagekit-3.20.0.ebuild
index 96fba2614c0..afa0586fa90 100644
--- a/gnome-extra/gnome-packagekit/gnome-packagekit-3.20.0.ebuild
+++ b/gnome-extra/gnome-packagekit/gnome-packagekit-3.20.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 gnome2 virtualx
diff --git a/gnome-extra/gnome-packagekit/gnome-packagekit-3.22.1.ebuild b/gnome-extra/gnome-packagekit/gnome-packagekit-3.22.1.ebuild
index d3a9ce5560e..0fc509b13a2 100644
--- a/gnome-extra/gnome-packagekit/gnome-packagekit-3.22.1.ebuild
+++ b/gnome-extra/gnome-packagekit/gnome-packagekit-3.22.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 gnome2 virtualx
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.20.0.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.20.0.ebuild
index 146dc3439f3..1d5ab2760e1 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-3.20.0.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-3.20.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit gnome2 virtualx
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.22.1.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.22.1.ebuild
index c1d20a9cd19..0c18b28c4bc 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-3.22.1.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-3.22.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 gnome2 virtualx
diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-3.22.2.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-3.22.2.ebuild
index c1d20a9cd19..0c18b28c4bc 100644
--- a/gnome-extra/gnome-power-manager/gnome-power-manager-3.22.2.ebuild
+++ b/gnome-extra/gnome-power-manager/gnome-power-manager-3.22.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 gnome2 virtualx
diff --git a/gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild b/gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild
index 2f52396ba28..ff4b15e1782 100644
--- a/gnome-extra/gnome-search-tool/gnome-search-tool-3.6.0.ebuild
+++ b/gnome-extra/gnome-search-tool/gnome-search-tool-3.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"
GCONF_DEBUG="no"
diff --git a/gnome-extra/gnome-shell-extensions-topicons/gnome-shell-extensions-topicons-28-r1.ebuild b/gnome-extra/gnome-shell-extensions-topicons/gnome-shell-extensions-topicons-28-r1.ebuild
index 6da0d31e866..96f9b3dc369 100644
--- a/gnome-extra/gnome-shell-extensions-topicons/gnome-shell-extensions-topicons-28-r1.ebuild
+++ b/gnome-extra/gnome-shell-extensions-topicons/gnome-shell-extensions-topicons-28-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 vcs-snapshot
diff --git a/gnome-extra/gnome-shell-extensions-topicons/gnome-shell-extensions-topicons-28.ebuild b/gnome-extra/gnome-shell-extensions-topicons/gnome-shell-extensions-topicons-28.ebuild
index 40eeee87075..95b9aa76d1c 100644
--- a/gnome-extra/gnome-shell-extensions-topicons/gnome-shell-extensions-topicons-28.ebuild
+++ b/gnome-extra/gnome-shell-extensions-topicons/gnome-shell-extensions-topicons-28.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 vcs-snapshot
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.20.1.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.20.1.ebuild
index 481d235ab09..0a3c7520983 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.20.1.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.20.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 gnome2 readme.gentoo-r1
diff --git a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.22.2.ebuild b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.22.2.ebuild
index 15f9dcb5f59..97121991219 100644
--- a/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.22.2.ebuild
+++ b/gnome-extra/gnome-shell-extensions/gnome-shell-extensions-3.22.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 gnome2 readme.gentoo-r1
diff --git a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.18.2.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.18.2.ebuild
index 7772948f519..5f4c609ae39 100644
--- a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.18.2.ebuild
+++ b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.18.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/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.20.0.ebuild b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.20.0.ebuild
index 2289304d3b3..9312554cb72 100644
--- a/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.20.0.ebuild
+++ b/gnome-extra/gnome-shell-frippery/gnome-shell-frippery-3.20.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/gnome-extra/gnome-software/gnome-software-3.20.5.ebuild b/gnome-extra/gnome-software/gnome-software-3.20.5.ebuild
index 5ab3dd2490c..402095c98b9 100644
--- a/gnome-extra/gnome-software/gnome-software-3.20.5.ebuild
+++ b/gnome-extra/gnome-software/gnome-software-3.20.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
PYTHON_COMPAT=( python2_7 )
diff --git a/gnome-extra/gnome-software/gnome-software-3.22.2.ebuild b/gnome-extra/gnome-software/gnome-software-3.22.2.ebuild
index 10a2e6a12f0..11f54aa7411 100644
--- a/gnome-extra/gnome-software/gnome-software-3.22.2.ebuild
+++ b/gnome-extra/gnome-software/gnome-software-3.22.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
PYTHON_COMPAT=( python2_7 )
diff --git a/gnome-extra/gnome-software/gnome-software-3.22.4.ebuild b/gnome-extra/gnome-software/gnome-software-3.22.4.ebuild
index 10a2e6a12f0..11f54aa7411 100644
--- a/gnome-extra/gnome-software/gnome-software-3.22.4.ebuild
+++ b/gnome-extra/gnome-software/gnome-software-3.22.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
PYTHON_COMPAT=( python2_7 )
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.20.1.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.20.1.ebuild
index 92985e8f697..e477c831188 100644
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.20.1.ebuild
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.20.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 gnome2
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.22.0.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.22.0.ebuild
index bd407999eaa..2b437ab1ffb 100644
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.22.0.ebuild
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.22.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit gnome2
diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.22.2.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.22.2.ebuild
index bd407999eaa..2b437ab1ffb 100644
--- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.22.2.ebuild
+++ b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.22.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 gnome2
diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.20.1.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.20.1.ebuild
index 9939f720dae..647c8269c8d 100644
--- a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.20.1.ebuild
+++ b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.20.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
GNOME2_LA_PUNT="yes"
diff --git a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.22.0.ebuild b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.22.0.ebuild
index 8b997c601ca..a6ee43632cc 100644
--- a/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.22.0.ebuild
+++ b/gnome-extra/gnome-tweak-tool/gnome-tweak-tool-3.22.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
GNOME2_LA_PUNT="yes"
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.20.2.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.20.2.ebuild
index 312b31d970e..65004d06518 100644
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-3.20.2.ebuild
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-3.20.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 gnome2
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.22.0.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.22.0.ebuild
index faa69e2f548..13cc3ef0899 100644
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-3.22.0.ebuild
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-3.22.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit gnome2
diff --git a/gnome-extra/gnome-user-share/gnome-user-share-3.18.3.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-3.18.3.ebuild
index 89de63e56eb..c102ec8b6bb 100644
--- a/gnome-extra/gnome-user-share/gnome-user-share-3.18.3.ebuild
+++ b/gnome-extra/gnome-user-share/gnome-user-share-3.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
GNOME2_LA_PUNT="yes"
diff --git a/gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild b/gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild
index 9142b223a9c..475150b68a8 100644
--- a/gnome-extra/gnome-utils/gnome-utils-3.8.0.ebuild
+++ b/gnome-extra/gnome-utils/gnome-utils-3.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="5"
diff --git a/gnome-extra/gnome-weather/gnome-weather-3.18.1.ebuild b/gnome-extra/gnome-weather/gnome-weather-3.18.1.ebuild
index 55cbd050745..73557a66020 100644
--- a/gnome-extra/gnome-weather/gnome-weather-3.18.1.ebuild
+++ b/gnome-extra/gnome-weather/gnome-weather-3.18.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"
GCONF_DEBUG="no"
diff --git a/gnome-extra/gnome-weather/gnome-weather-3.20.1.ebuild b/gnome-extra/gnome-weather/gnome-weather-3.20.1.ebuild
index 805ccd1b29a..7e305ccb565 100644
--- a/gnome-extra/gnome-weather/gnome-weather-3.20.1.ebuild
+++ b/gnome-extra/gnome-weather/gnome-weather-3.20.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
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
diff --git a/gnome-extra/gnome-weather/gnome-weather-3.20.2.ebuild b/gnome-extra/gnome-weather/gnome-weather-3.20.2.ebuild
index 938643d1a2f..bcd6d19ffa3 100644
--- a/gnome-extra/gnome-weather/gnome-weather-3.20.2.ebuild
+++ b/gnome-extra/gnome-weather/gnome-weather-3.20.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
PYTHON_COMPAT=( python{2_7,3_4,3_5} )
diff --git a/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r3.ebuild b/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r3.ebuild
index 55f3772e87d..5fe0cde0a66 100644
--- a/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.1-r3.ebuild
+++ b/gnome-extra/gpointing-device-settings/gpointing-device-settings-1.5.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"
GCONF_DEBUG="no"
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
index df9ad647a04..2020a0d68e8 100644
--- a/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-4.10.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
GCONF_DEBUG="no"
diff --git a/gnome-extra/gtkhtml/gtkhtml-4.8.5.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.8.5.ebuild
index df9ad647a04..2020a0d68e8 100644
--- a/gnome-extra/gtkhtml/gtkhtml-4.8.5.ebuild
+++ b/gnome-extra/gtkhtml/gtkhtml-4.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"
GCONF_DEBUG="no"
diff --git a/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild b/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild
index e08d151bbc2..dd9f4ae3da2 100644
--- a/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-3.0.1-r200.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/gnome-extra/gucharmap/gucharmap-9.0.2.ebuild b/gnome-extra/gucharmap/gucharmap-9.0.2.ebuild
index 2298706e6ec..8f5ef94324b 100644
--- a/gnome-extra/gucharmap/gucharmap-9.0.2.ebuild
+++ b/gnome-extra/gucharmap/gucharmap-9.0.2.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
VALA_USE_DEPEND="vapigen"
diff --git a/gnome-extra/libgda/libgda-5.2.4-r2.ebuild b/gnome-extra/libgda/libgda-5.2.4-r2.ebuild
index 7dd1cb00174..478c3717548 100644
--- a/gnome-extra/libgda/libgda-5.2.4-r2.ebuild
+++ b/gnome-extra/libgda/libgda-5.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
GNOME2_LA_PUNT="yes"
diff --git a/gnome-extra/libgsf/libgsf-1.14.41-r1.ebuild b/gnome-extra/libgsf/libgsf-1.14.41-r1.ebuild
index dd4b0c664e7..9cbf55d64c6 100644
--- a/gnome-extra/libgsf/libgsf-1.14.41-r1.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.14.41-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 gnome2
diff --git a/gnome-extra/mousetweaks/mousetweaks-3.12.0.ebuild b/gnome-extra/mousetweaks/mousetweaks-3.12.0.ebuild
index 2c6d3cfe753..72ef40bdea1 100644
--- a/gnome-extra/mousetweaks/mousetweaks-3.12.0.ebuild
+++ b/gnome-extra/mousetweaks/mousetweaks-3.12.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
GCONF_DEBUG="no"
diff --git a/gnome-extra/nautilus-actions/nautilus-actions-3.2.3.ebuild b/gnome-extra/nautilus-actions/nautilus-actions-3.2.3.ebuild
index eaa17bd1d86..e26c5a7c91a 100644
--- a/gnome-extra/nautilus-actions/nautilus-actions-3.2.3.ebuild
+++ b/gnome-extra/nautilus-actions/nautilus-actions-3.2.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
GCONF_DEBUG="no"
diff --git a/gnome-extra/nautilus-actions/nautilus-actions-3.2.4.ebuild b/gnome-extra/nautilus-actions/nautilus-actions-3.2.4.ebuild
index eaa17bd1d86..e26c5a7c91a 100644
--- a/gnome-extra/nautilus-actions/nautilus-actions-3.2.4.ebuild
+++ b/gnome-extra/nautilus-actions/nautilus-actions-3.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
GCONF_DEBUG="no"
diff --git a/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild b/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild
index a96c98c3990..87e244368cf 100644
--- a/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.2.ebuild
+++ b/gnome-extra/nautilus-dropbox/nautilus-dropbox-1.6.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/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.3.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.3.ebuild
index d61fef51998..9a2d4702a0d 100644
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.3.ebuild
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI="5"
GCONF_DEBUG="yes"
diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.4.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.4.ebuild
index 586fb272dcc..28b8bc9d843 100644
--- a/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.4.ebuild
+++ b/gnome-extra/nautilus-sendto/nautilus-sendto-3.8.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
inherit gnome2
diff --git a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.10.1.ebuild b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.10.1.ebuild
index c04667efda6..6405e407a66 100644
--- a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.10.1.ebuild
+++ b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.10.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
GNOME_ORG_MODULE="tracker"
diff --git a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.8.3.ebuild b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.8.3.ebuild
index 3ec889e7da3..e328bd09e4a 100644
--- a/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.8.3.ebuild
+++ b/gnome-extra/nautilus-tracker-tags/nautilus-tracker-tags-1.8.3.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
GNOME_ORG_MODULE="tracker"
diff --git a/gnome-extra/nemo/nemo-2.8.7.ebuild b/gnome-extra/nemo/nemo-2.8.7.ebuild
index c48b5600a67..1de930b387b 100644
--- a/gnome-extra/nemo/nemo-2.8.7.ebuild
+++ b/gnome-extra/nemo/nemo-2.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=6
GNOME2_LA_PUNT="yes"
diff --git a/gnome-extra/nemo/nemo-3.0.6.ebuild b/gnome-extra/nemo/nemo-3.0.6.ebuild
index c48b5600a67..1de930b387b 100644
--- a/gnome-extra/nemo/nemo-3.0.6.ebuild
+++ b/gnome-extra/nemo/nemo-3.0.6.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
GNOME2_LA_PUNT="yes"
diff --git a/gnome-extra/nemo/nemo-3.2.0.ebuild b/gnome-extra/nemo/nemo-3.2.0.ebuild
index f7cd08da328..37246757577 100644
--- a/gnome-extra/nemo/nemo-3.2.0.ebuild
+++ b/gnome-extra/nemo/nemo-3.2.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
GNOME2_LA_PUNT="yes"
diff --git a/gnome-extra/nm-applet/nm-applet-1.2.4.ebuild b/gnome-extra/nm-applet/nm-applet-1.2.4.ebuild
index 5899e4b9e57..a9d414575b1 100644
--- a/gnome-extra/nm-applet/nm-applet-1.2.4.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-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
GNOME2_LA_PUNT="yes"
diff --git a/gnome-extra/nm-applet/nm-applet-1.4.2.ebuild b/gnome-extra/nm-applet/nm-applet-1.4.2.ebuild
index 56cc123a161..af8ccaadac3 100644
--- a/gnome-extra/nm-applet/nm-applet-1.4.2.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-1.4.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
GNOME2_LA_PUNT="yes"
diff --git a/gnome-extra/office-runner/office-runner-1.0.2.ebuild b/gnome-extra/office-runner/office-runner-1.0.2.ebuild
index 9154bdcbda0..d9bcef38172 100644
--- a/gnome-extra/office-runner/office-runner-1.0.2.ebuild
+++ b/gnome-extra/office-runner/office-runner-1.0.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"
GCONF_DEBUG="no"
diff --git a/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild b/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild
index 44677e9a846..5013ca8e321 100644
--- a/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild
+++ b/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=4
inherit gnome.org
diff --git a/gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92.ebuild b/gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92.ebuild
index 02a83705c1d..34e799ff4df 100644
--- a/gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92.ebuild
+++ b/gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92.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/gnome-extra/sushi/sushi-3.20.0.ebuild b/gnome-extra/sushi/sushi-3.20.0.ebuild
index 74a24a7c9b5..6dc6a644be8 100644
--- a/gnome-extra/sushi/sushi-3.20.0.ebuild
+++ b/gnome-extra/sushi/sushi-3.20.0.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit gnome2
diff --git a/gnome-extra/sushi/sushi-3.21.91.ebuild b/gnome-extra/sushi/sushi-3.21.91.ebuild
index 91dfdad5a84..f9d0bb53ec1 100644
--- a/gnome-extra/sushi/sushi-3.21.91.ebuild
+++ b/gnome-extra/sushi/sushi-3.21.91.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=6
inherit gnome2
diff --git a/gnome-extra/synapse/synapse-0.2.99.1.ebuild b/gnome-extra/synapse/synapse-0.2.99.1.ebuild
index 1bb49674360..cb31093b82a 100644
--- a/gnome-extra/synapse/synapse-0.2.99.1.ebuild
+++ b/gnome-extra/synapse/synapse-0.2.99.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/gnome-extra/synapse/synapse-0.2.99.2.ebuild b/gnome-extra/synapse/synapse-0.2.99.2.ebuild
index 80296de5ddc..ffbd527b6a9 100644
--- a/gnome-extra/synapse/synapse-0.2.99.2.ebuild
+++ b/gnome-extra/synapse/synapse-0.2.99.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/gnome-extra/yelp-xsl/yelp-xsl-3.20.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-3.20.1.ebuild
index d72cb3d83e8..feb7c898189 100644
--- a/gnome-extra/yelp-xsl/yelp-xsl-3.20.1.ebuild
+++ b/gnome-extra/yelp-xsl/yelp-xsl-3.20.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 gnome2
diff --git a/gnome-extra/yelp/yelp-3.20.1.ebuild b/gnome-extra/yelp/yelp-3.20.1.ebuild
index 0317ee33d98..186903484c9 100644
--- a/gnome-extra/yelp/yelp-3.20.1.ebuild
+++ b/gnome-extra/yelp/yelp-3.20.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
GNOME2_LA_PUNT="yes"
diff --git a/gnome-extra/yelp/yelp-3.22.0.ebuild b/gnome-extra/yelp/yelp-3.22.0.ebuild
index fb7d08a3bd1..45c7247c60c 100644
--- a/gnome-extra/yelp/yelp-3.22.0.ebuild
+++ b/gnome-extra/yelp/yelp-3.22.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
GNOME2_LA_PUNT="yes"
diff --git a/gnome-extra/zeitgeist-datasources/zeitgeist-datasources-0.8.1.ebuild b/gnome-extra/zeitgeist-datasources/zeitgeist-datasources-0.8.1.ebuild
index 6a0b1c96802..af21e23d001 100644
--- a/gnome-extra/zeitgeist-datasources/zeitgeist-datasources-0.8.1.ebuild
+++ b/gnome-extra/zeitgeist-datasources/zeitgeist-datasources-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
diff --git a/gnome-extra/zeitgeist-explorer/zeitgeist-explorer-0.2-r1.ebuild b/gnome-extra/zeitgeist-explorer/zeitgeist-explorer-0.2-r1.ebuild
index af3ad4b3a39..bd1ec759fa8 100644
--- a/gnome-extra/zeitgeist-explorer/zeitgeist-explorer-0.2-r1.ebuild
+++ b/gnome-extra/zeitgeist-explorer/zeitgeist-explorer-0.2-r1.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/gnome-extra/zeitgeist/zeitgeist-0.9.16.ebuild b/gnome-extra/zeitgeist/zeitgeist-0.9.16.ebuild
index 02b46f80e88..27029f7daef 100644
--- a/gnome-extra/zeitgeist/zeitgeist-0.9.16.ebuild
+++ b/gnome-extra/zeitgeist/zeitgeist-0.9.16.ebuild
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
EAPI=5
diff --git a/gnome-extra/zenity/zenity-3.20.0.ebuild b/gnome-extra/zenity/zenity-3.20.0.ebuild
index 06cd9b2727e..5dabd0282e2 100644
--- a/gnome-extra/zenity/zenity-3.20.0.ebuild
+++ b/gnome-extra/zenity/zenity-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
inherit gnome2
diff --git a/gnome-extra/zenity/zenity-3.22.0.ebuild b/gnome-extra/zenity/zenity-3.22.0.ebuild
index 1525f459a50..43e2f2019e2 100644
--- a/gnome-extra/zenity/zenity-3.22.0.ebuild
+++ b/gnome-extra/zenity/zenity-3.22.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 gnome2