diff --git a/app-text/kbibtex/kbibtex-0.6.2.ebuild b/app-text/kbibtex/kbibtex-0.6.2.ebuild
index 7c6d5003ddbaa..bae357c28ba29 100644
--- a/app-text/kbibtex/kbibtex-0.6.2.ebuild
+++ b/app-text/kbibtex/kbibtex-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=6
 
diff --git a/dev-ada/gnat_util/gnat_util-2016.ebuild b/dev-ada/gnat_util/gnat_util-2016.ebuild
index 0fab74a0ea246..51cdbdc1cf9dd 100644
--- a/dev-ada/gnat_util/gnat_util-2016.ebuild
+++ b/dev-ada/gnat_util/gnat_util-2016.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/pytrie/pytrie-0.3.ebuild b/dev-python/pytrie/pytrie-0.3.ebuild
index e52e46268470f..c6fa894e2e3db 100644
--- a/dev-python/pytrie/pytrie-0.3.ebuild
+++ b/dev-python/pytrie/pytrie-0.3.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=6
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
diff --git a/dev-ruby/faraday/faraday-0.11.0.ebuild b/dev-ruby/faraday/faraday-0.11.0.ebuild
index 2f2f214091f78..da479fb5a4526 100644
--- a/dev-ruby/faraday/faraday-0.11.0.ebuild
+++ b/dev-ruby/faraday/faraday-0.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
 
diff --git a/dev-ruby/faraday/faraday-0.12.0.1.ebuild b/dev-ruby/faraday/faraday-0.12.0.1.ebuild
index 2f2f214091f78..da479fb5a4526 100644
--- a/dev-ruby/faraday/faraday-0.12.0.1.ebuild
+++ b/dev-ruby/faraday/faraday-0.12.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
 
diff --git a/net-dns/https_dns_proxy/https_dns_proxy-9999.ebuild b/net-dns/https_dns_proxy/https_dns_proxy-9999.ebuild
index b38110db87b7c..f409ce890da12 100644
--- a/net-dns/https_dns_proxy/https_dns_proxy-9999.ebuild
+++ b/net-dns/https_dns_proxy/https_dns_proxy-9999.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=6
 inherit git-r3 cmake-utils
diff --git a/net-libs/libwebsockets/libwebsockets-2.1.1.ebuild b/net-libs/libwebsockets/libwebsockets-2.1.1.ebuild
index 29e65d4f6d831..f5e7905eff201 100644
--- a/net-libs/libwebsockets/libwebsockets-2.1.1.ebuild
+++ b/net-libs/libwebsockets/libwebsockets-2.1.1.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=6
 
diff --git a/sci-chemistry/ParmEd/ParmEd-2.7.3.ebuild b/sci-chemistry/ParmEd/ParmEd-2.7.3.ebuild
index a183d0d0ae2a4..856b20e9a444e 100644
--- a/sci-chemistry/ParmEd/ParmEd-2.7.3.ebuild
+++ b/sci-chemistry/ParmEd/ParmEd-2.7.3.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI=6
 
diff --git a/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.4.1.ebuild b/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.4.1.ebuild
index fa3e020c6df21..9e32143c678de 100644
--- a/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.4.1.ebuild
+++ b/x11-drivers/xf86-input-mtrack/xf86-input-mtrack-0.4.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