diff --git a/app-misc/neofetch/neofetch-3.0.1.ebuild b/app-misc/neofetch/neofetch-3.0.1.ebuild
index 9a4c4fa719e69..ed8aa03c69f96 100644
--- a/app-misc/neofetch/neofetch-3.0.1.ebuild
+++ b/app-misc/neofetch/neofetch-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
 
diff --git a/dev-python/iso3166/iso3166-0.8.ebuild b/dev-python/iso3166/iso3166-0.8.ebuild
index e6a0cf76be28b..59573ef2f09a7 100644
--- a/dev-python/iso3166/iso3166-0.8.ebuild
+++ b/dev-python/iso3166/iso3166-0.8.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=6
 
diff --git a/dev-python/iso_639/iso_639-0.4.5.ebuild b/dev-python/iso_639/iso_639-0.4.5.ebuild
index 958d32034e50b..4205e19323fd8 100644
--- a/dev-python/iso_639/iso_639-0.4.5.ebuild
+++ b/dev-python/iso_639/iso_639-0.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=6
 
diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-0.2.0.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-0.2.0.ebuild
index 0e20e21761585..566008f0bf5fa 100644
--- a/dev-util/lxqt-build-tools/lxqt-build-tools-0.2.0.ebuild
+++ b/dev-util/lxqt-build-tools/lxqt-build-tools-0.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 cmake-utils
diff --git a/games-puzzle/sgt-puzzles/sgt-puzzles-20170228.ebuild b/games-puzzle/sgt-puzzles/sgt-puzzles-20170228.ebuild
index a1c46cf6d3b34..d67926d44584a 100644
--- a/games-puzzle/sgt-puzzles/sgt-puzzles-20170228.ebuild
+++ b/games-puzzle/sgt-puzzles/sgt-puzzles-20170228.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=6
 
diff --git a/net-misc/youtube-viewer/youtube-viewer-3.2.5.ebuild b/net-misc/youtube-viewer/youtube-viewer-3.2.5.ebuild
index 915e3d5c8ea80..54e6f570d52b3 100644
--- a/net-misc/youtube-viewer/youtube-viewer-3.2.5.ebuild
+++ b/net-misc/youtube-viewer/youtube-viewer-3.2.5.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=6
 
diff --git a/www-apps/drupal/drupal-8.2.7.ebuild b/www-apps/drupal/drupal-8.2.7.ebuild
index 432c63082378e..d0f9fcc2d95e8 100644
--- a/www-apps/drupal/drupal-8.2.7.ebuild
+++ b/www-apps/drupal/drupal-8.2.7.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=5
 
diff --git a/x11-libs/libXpresent/libXpresent-1.0.0.ebuild b/x11-libs/libXpresent/libXpresent-1.0.0.ebuild
index f324f79c57815..ba558f7609342 100644
--- a/x11-libs/libXpresent/libXpresent-1.0.0.ebuild
+++ b/x11-libs/libXpresent/libXpresent-1.0.0.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
 EAPI=5