diff --git a/app-admin/listadmin/listadmin-2.40.ebuild b/app-admin/listadmin/listadmin-2.40.ebuild
index 56266eb61..112e7e65e 100644
--- a/app-admin/listadmin/listadmin-2.40.ebuild
+++ b/app-admin/listadmin/listadmin-2.40.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: Exp $
 
 EAPI="5"
 
diff --git a/app-laptop/nvidiabl/nvidiabl-0.83.ebuild b/app-laptop/nvidiabl/nvidiabl-0.83.ebuild
index c110f6adb..d2220ecf7 100644
--- a/app-laptop/nvidiabl/nvidiabl-0.83.ebuild
+++ b/app-laptop/nvidiabl/nvidiabl-0.83.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/nvidiabl/nvidiabl-0.83.ebuild,v 1.5 2014/12/27 19:29:18 ago Exp $
 
 EAPI=5
 inherit linux-mod
diff --git a/app-laptop/tp_smapi/tp_smapi-0.41.ebuild b/app-laptop/tp_smapi/tp_smapi-0.41.ebuild
index 937cd59ee..3a101bf8c 100644
--- a/app-laptop/tp_smapi/tp_smapi-0.41.ebuild
+++ b/app-laptop/tp_smapi/tp_smapi-0.41.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/tp_smapi/tp_smapi-0.41.ebuild,v 1.1 2011/12/20 02:56:49 ottxor Exp $
 
 EAPI=4
 
diff --git a/dev-java/gcj-jdk/gcj-jdk-4.7.3.ebuild b/dev-java/gcj-jdk/gcj-jdk-4.7.3.ebuild
index d9a0efeae..59b2d1a54 100644
--- a/dev-java/gcj-jdk/gcj-jdk-4.7.3.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-4.7.3.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/gcj-jdk/gcj-jdk-4.7.2.ebuild,v 1.1 2013/01/23 10:30:56 sera Exp $
 
 EAPI="5"
 
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.38.0-r1.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.38.0-r1.ebuild
index 5823899e6..716f6857a 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.38.0-r1.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.38.0-r1.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.36.0.ebuild,v 1.5 2013/07/27 17:12:33 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.40.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.40.0.ebuild
index 84a6ee52d..0a0657b30 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.40.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.40.0.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/gobject-introspection/gobject-introspection-1.36.0.ebuild,v 1.5 2013/07/27 17:12:33 eva Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
diff --git a/dev-libs/guiloader-c++/guiloader-c++-2.21.0.ebuild b/dev-libs/guiloader-c++/guiloader-c++-2.21.0.ebuild
index cb71fbea6..277d805f4 100644
--- a/dev-libs/guiloader-c++/guiloader-c++-2.21.0.ebuild
+++ b/dev-libs/guiloader-c++/guiloader-c++-2.21.0.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/guiloader-c++/guiloader-c++-2.21.0.ebuild,v 1.3 2011/07/26 21:16:02 maekke Exp $
 
 EAPI="3"
 
diff --git a/dev-libs/libnl/libnl-1.1.ebuild b/dev-libs/libnl/libnl-1.1.ebuild
index 8db8c944e..362608950 100644
--- a/dev-libs/libnl/libnl-1.1.ebuild
+++ b/dev-libs/libnl/libnl-1.1.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/libnl-1.0_pre6-r1.ebuild,v 1.1 2007/12/01 19:47:49 rbu Exp $
 
 inherit eutils multilib linux-info versionator
 
diff --git a/dev-util/molecule/molecule-0.9.24.7.ebuild b/dev-util/molecule/molecule-0.9.24.7.ebuild
index 8e5468b7c..8a2d984da 100644
--- a/dev-util/molecule/molecule-0.9.24.7.ebuild
+++ b/dev-util/molecule/molecule-0.9.24.7.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/molecule/molecule-0.9.24.6.ebuild,v 1.1 2012/09/11 14:05:57 lxnay Exp $
 
 EAPI="3"
 PYTHON_DEPEND="*"
diff --git a/games-engines/exult/exult-1.2.ebuild b/games-engines/exult/exult-1.2.ebuild
index 644af202f..c08b32bde 100644
--- a/games-engines/exult/exult-1.2.ebuild
+++ b/games-engines/exult/exult-1.2.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/exult-1.2.ebuild,v 1.23 2011/09/15 02:44:46 ssuominen Exp $
 
 EAPI=2
 inherit eutils autotools multilib games
diff --git a/games-engines/exult/exult-1.4.9_rc1.ebuild b/games-engines/exult/exult-1.4.9_rc1.ebuild
index 2067e91cf..6c7608424 100644
--- a/games-engines/exult/exult-1.4.9_rc1.ebuild
+++ b/games-engines/exult/exult-1.4.9_rc1.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-engines/exult/exult-1.4.9_rc1.ebuild,v 1.2 2011/10/19 16:51:53 mr_bones_ Exp $
 
 EAPI=2
 inherit multilib eutils games
diff --git a/media-gfx/gfxboot/gfxboot-4.0.14-r4.ebuild b/media-gfx/gfxboot/gfxboot-4.0.14-r4.ebuild
index b1afdb80b..0d7102de6 100644
--- a/media-gfx/gfxboot/gfxboot-4.0.14-r4.ebuild
+++ b/media-gfx/gfxboot/gfxboot-4.0.14-r4.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header:
 
 EAPI='1'
 inherit rpm toolchain-funcs
diff --git a/media-gfx/gfxboot/gfxboot-4.1.19-r10.ebuild b/media-gfx/gfxboot/gfxboot-4.1.19-r10.ebuild
index fbf775280..94477328d 100644
--- a/media-gfx/gfxboot/gfxboot-4.1.19-r10.ebuild
+++ b/media-gfx/gfxboot/gfxboot-4.1.19-r10.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header:
 
 EAPI='1'
 inherit rpm toolchain-funcs
diff --git a/media-gfx/gfxboot/gfxboot-4.2.2.ebuild b/media-gfx/gfxboot/gfxboot-4.2.2.ebuild
index b4dfce098..7ba8f19ea 100644
--- a/media-gfx/gfxboot/gfxboot-4.2.2.ebuild
+++ b/media-gfx/gfxboot/gfxboot-4.2.2.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header:
 
 EAPI=2
 
diff --git a/media-gfx/iscan-plugin-gt-f730/iscan-plugin-gt-f730-0.1.1.ebuild b/media-gfx/iscan-plugin-gt-f730/iscan-plugin-gt-f730-0.1.1.ebuild
index 46669d99a..284fa9f66 100644
--- a/media-gfx/iscan-plugin-gt-f730/iscan-plugin-gt-f730-0.1.1.ebuild
+++ b/media-gfx/iscan-plugin-gt-f730/iscan-plugin-gt-f730-0.1.1.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/iscan-plugin-gt-f730/iscan-plugin-gt-f730-0.1.1.ebuild,v 1.4 2011/04/21 14:29:09 flameeyes Exp $
 
 EAPI="2"
 
diff --git a/media-gfx/splashutils/splashutils-1.5.4.4-r4.ebuild b/media-gfx/splashutils/splashutils-1.5.4.4-r4.ebuild
index 27e999298..5bf99cb74 100644
--- a/media-gfx/splashutils/splashutils-1.5.4.4-r4.ebuild
+++ b/media-gfx/splashutils/splashutils-1.5.4.4-r4.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/splashutils/splashutils-1.5.4.4-r4.ebuild,v 1.1 2013/10/14 13:50:25 pinkbyte Exp $
 
 EAPI=5
 inherit autotools eutils multilib toolchain-funcs
diff --git a/media-libs/libsdl/libsdl-1.2.15-r8.ebuild b/media-libs/libsdl/libsdl-1.2.15-r8.ebuild
index ec2afa9dd..dbe63ef6e 100644
--- a/media-libs/libsdl/libsdl-1.2.15-r8.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.15-r8.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.15-r8.ebuild,v 1.5 2014/10/15 09:05:24 pacho Exp $
 
 EAPI=5
 inherit autotools flag-o-matic multilib toolchain-funcs eutils multilib-minimal
diff --git a/media-libs/svgalib/svgalib-1.9.25-r1.ebuild b/media-libs/svgalib/svgalib-1.9.25-r1.ebuild
index 2b17b86a1..4aa1294e4 100644
--- a/media-libs/svgalib/svgalib-1.9.25-r1.ebuild
+++ b/media-libs/svgalib/svgalib-1.9.25-r1.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/svgalib/svgalib-1.9.25-r1.ebuild,v 1.2 2010/03/04 09:41:47 fauli Exp $
 
 EAPI=1
 
diff --git a/media-libs/wxsvg/wxsvg-1.5.4.ebuild b/media-libs/wxsvg/wxsvg-1.5.4.ebuild
index 5d9f0c7c9..6dc57122a 100644
--- a/media-libs/wxsvg/wxsvg-1.5.4.ebuild
+++ b/media-libs/wxsvg/wxsvg-1.5.4.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/wxsvg/wxsvg-1.4.2.ebuild,v 1.2 2014/07/29 16:38:43 ssuominen Exp $
 
 EAPI=5
 WX_GTK_VER=2.8
diff --git a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild
index 8db798df6..1d28b65ea 100644
--- a/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild
+++ b/media-sound/jack-audio-connection-kit/jack-audio-connection-kit-0.121.3-r1.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: %
 
 EAPI=5
 
diff --git a/media-sound/nuvolaplayer/nuvolaplayer-9999.ebuild b/media-sound/nuvolaplayer/nuvolaplayer-9999.ebuild
index beb1d95db..3c0e9c25c 100644
--- a/media-sound/nuvolaplayer/nuvolaplayer-9999.ebuild
+++ b/media-sound/nuvolaplayer/nuvolaplayer-9999.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header:
 
 EAPI=5
 
diff --git a/media-video/jubler/jubler-4.6.1-r3.ebuild b/media-video/jubler/jubler-4.6.1-r3.ebuild
index 1a25e52de..8b661ea8b 100644
--- a/media-video/jubler/jubler-4.6.1-r3.ebuild
+++ b/media-video/jubler/jubler-4.6.1-r3.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/jubler/jubler-4.6.1-r3.ebuild,v 1.5 2011/10/18 09:43:04 scarabeus Exp $
 
 EAPI="2"
 WANT_ANT_TASKS="ant-nodeps ant-contrib"
diff --git a/media-video/libav/libav-11.3-r1.ebuild b/media-video/libav/libav-11.3-r1.ebuild
index 65874e456..3cdbe8001 100644
--- a/media-video/libav/libav-11.3-r1.ebuild
+++ b/media-video/libav/libav-11.3-r1.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-11.3.ebuild,v 1.7 2015/05/15 09:09:28 pacho Exp $
 
 EAPI=5
 
diff --git a/media-video/noad/noad-0.7.2-r2.ebuild b/media-video/noad/noad-0.7.2-r2.ebuild
index 5e60e2c46..ae159e22f 100644
--- a/media-video/noad/noad-0.7.2-r2.ebuild
+++ b/media-video/noad/noad-0.7.2-r2.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/noad/noad-0.7.2-r2.ebuild,v 1.2 2011/04/06 17:33:09 idl0r Exp $
 
 EAPI="3"
 
diff --git a/media-video/ushare/ushare-1.1a-r6.ebuild b/media-video/ushare/ushare-1.1a-r6.ebuild
index 09d6abc6e..f19e82471 100644
--- a/media-video/ushare/ushare-1.1a-r6.ebuild
+++ b/media-video/ushare/ushare-1.1a-r6.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ushare/ushare-1.1a-r5.ebuild,v 1.1 2012/11/08 19:06:53 hwoarang Exp $
 
 EAPI=4
 inherit eutils multilib user
diff --git a/media-video/vdr2jpeg/vdr2jpeg-0.1.9.ebuild b/media-video/vdr2jpeg/vdr2jpeg-0.1.9.ebuild
index 23844e475..179ff6a3c 100644
--- a/media-video/vdr2jpeg/vdr2jpeg-0.1.9.ebuild
+++ b/media-video/vdr2jpeg/vdr2jpeg-0.1.9.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vdr2jpeg/vdr2jpeg-0.1.9.ebuild,v 1.3 2011/10/30 19:41:35 hd_brummy Exp $
 
 EAPI=4
 
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.11.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.11.ebuild
index 16fde6a1f..31cfd6054 100644
--- a/net-fs/openafs-kernel/openafs-kernel-1.6.11.ebuild
+++ b/net-fs/openafs-kernel/openafs-kernel-1.6.11.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/openafs-kernel-1.6.11.ebuild,v 1.4 2015/03/24 08:57:41 ago Exp $
 
 EAPI="5"
 
diff --git a/net-fs/openafs-kernel/openafs-kernel-1.6.5-r2.ebuild b/net-fs/openafs-kernel/openafs-kernel-1.6.5-r2.ebuild
index bc0742ce4..c7ac4de4c 100644
--- a/net-fs/openafs-kernel/openafs-kernel-1.6.5-r2.ebuild
+++ b/net-fs/openafs-kernel/openafs-kernel-1.6.5-r2.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/openafs-kernel/openafs-kernel-1.6.5-r2.ebuild,v 1.1 2013/09/05 20:10:46 axs Exp $
 
 EAPI="5"
 
diff --git a/net-libs/opal/opal-3.10.10-r1.ebuild b/net-libs/opal/opal-3.10.10-r1.ebuild
index a01eac9a4..583b43f78 100644
--- a/net-libs/opal/opal-3.10.10-r1.ebuild
+++ b/net-libs/opal/opal-3.10.10-r1.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/opal/opal-3.10.10.ebuild,v 1.8 2013/06/25 16:11:52 chithanh Exp $
 
 EAPI=5
 
diff --git a/net-libs/openh323/openh323-1.18.0-r1.ebuild b/net-libs/openh323/openh323-1.18.0-r1.ebuild
index 740765909..73afb8c50 100644
--- a/net-libs/openh323/openh323-1.18.0-r1.ebuild
+++ b/net-libs/openh323/openh323-1.18.0-r1.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/openh323/openh323-1.18.0.ebuild,v 1.7 2006/10/24 03:33:36 dang Exp $
 
 inherit eutils flag-o-matic multilib
 
diff --git a/net-mail/gnarwl/gnarwl-3.6.ebuild b/net-mail/gnarwl/gnarwl-3.6.ebuild
index 4b80020d2..1a546ca92 100644
--- a/net-mail/gnarwl/gnarwl-3.6.ebuild
+++ b/net-mail/gnarwl/gnarwl-3.6.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header:  $
 
 inherit eutils
 
diff --git a/net-p2p/mktorrent-borg/mktorrent-borg-0.9.9.ebuild b/net-p2p/mktorrent-borg/mktorrent-borg-0.9.9.ebuild
index 7991eb04f..1a54f371b 100644
--- a/net-p2p/mktorrent-borg/mktorrent-borg-0.9.9.ebuild
+++ b/net-p2p/mktorrent-borg/mktorrent-borg-0.9.9.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/mktorrent-borg/mktorrent-borg-0.9.9.ebuild,v 1.1 2008/05/05 15:09:43 armin76 Exp $
 
 inherit eutils toolchain-funcs
 
diff --git a/net-print/xpp/xpp-1.5.ebuild b/net-print/xpp/xpp-1.5.ebuild
index e39b42f40..267dca47f 100644
--- a/net-print/xpp/xpp-1.5.ebuild
+++ b/net-print/xpp/xpp-1.5.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/xpp/xpp-1.5.ebuild,v 1.11 2011/03/21 18:33:49 ssuominen Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs
diff --git a/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.9.4.4119.20100201.ebuild b/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.9.4.4119.20100201.ebuild
index 78c9a8d11..9c17137e1 100644
--- a/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.9.4.4119.20100201.ebuild
+++ b/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.9.4.4119.20100201.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng-tools/madwifi-ng-tools-0.9.4.4100.20090929.ebuild,v 1.1 2009/10/10 10:31:43 pva Exp $
 
 EAPI="2"
 
diff --git a/net-wireless/madwifi-ng/madwifi-ng-0.9.4.4165.20110816.ebuild b/net-wireless/madwifi-ng/madwifi-ng-0.9.4.4165.20110816.ebuild
index 055ab1549..d7a092379 100644
--- a/net-wireless/madwifi-ng/madwifi-ng-0.9.4.4165.20110816.ebuild
+++ b/net-wireless/madwifi-ng/madwifi-ng-0.9.4.4165.20110816.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/madwifi-ng/madwifi-ng-0.9.4.4165.20110816.ebuild,v 1.2 2011/10/15 23:23:34 maekke Exp $
 
 EAPI="2"
 
diff --git a/sci-libs/gmsh/gmsh-2.4.2.ebuild b/sci-libs/gmsh/gmsh-2.4.2.ebuild
index 7ce39bc82..70c6ecdd7 100644
--- a/sci-libs/gmsh/gmsh-2.4.2.ebuild
+++ b/sci-libs/gmsh/gmsh-2.4.2.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header:  $
 
 EAPI="2"
 
diff --git a/sci-mathematics/axiom/axiom-201009.ebuild b/sci-mathematics/axiom/axiom-201009.ebuild
index 13d98675c..7469a54f3 100644
--- a/sci-mathematics/axiom/axiom-201009.ebuild
+++ b/sci-mathematics/axiom/axiom-201009.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/axiom/axiom-200805.ebuild,v 1.6 2008/08/30 13:17:33 markusle Exp $
 
 inherit eutils multilib flag-o-matic
 
diff --git a/sys-apps/ddcxinfo-knoppix/ddcxinfo-knoppix-0.6.ebuild b/sys-apps/ddcxinfo-knoppix/ddcxinfo-knoppix-0.6.ebuild
index 80882a321..dd070c3a7 100644
--- a/sys-apps/ddcxinfo-knoppix/ddcxinfo-knoppix-0.6.ebuild
+++ b/sys-apps/ddcxinfo-knoppix/ddcxinfo-knoppix-0.6.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/ddcxinfo-knoppix/ddcxinfo-knoppix-0.6.ebuild,v 1.8 2008/11/23 18:18:37 jer Exp $
 
 inherit eutils
 
diff --git a/sys-apps/hbaapi/hbaapi-2.2.ebuild b/sys-apps/hbaapi/hbaapi-2.2.ebuild
index e5041e1cc..a3d4d54d5 100644
--- a/sys-apps/hbaapi/hbaapi-2.2.ebuild
+++ b/sys-apps/hbaapi/hbaapi-2.2.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hbaapi/hbaapi-2.2.ebuild,v 1.3 2009/02/09 00:35:36 vapier Exp $
 
 inherit base eutils autotools
 
diff --git a/sys-apps/kmod/kmod-13-r1.ebuild b/sys-apps/kmod/kmod-13-r1.ebuild
index 9e29820e6..3d2e4b817 100644
--- a/sys-apps/kmod/kmod-13-r1.ebuild
+++ b/sys-apps/kmod/kmod-13-r1.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/kmod/kmod-13.ebuild,v 1.2 2013/04/10 03:12:15 williamh Exp $
 
 EAPI=5
 
diff --git a/sys-fs/evms/evms-2.5.5-r10.ebuild b/sys-fs/evms/evms-2.5.5-r10.ebuild
index 59859c8c4..d7ac942dd 100644
--- a/sys-fs/evms/evms-2.5.5-r10.ebuild
+++ b/sys-fs/evms/evms-2.5.5-r10.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/evms/evms-2.5.5-r10.ebuild,v 1.11 2009/03/12 17:16:03 dev-zero Exp $
 
 inherit eutils flag-o-matic multilib toolchain-funcs autotools linux-info
 
diff --git a/sys-kernel/genkernel-next/genkernel-next-63.ebuild b/sys-kernel/genkernel-next/genkernel-next-63.ebuild
index 97708893c..66210e56c 100644
--- a/sys-kernel/genkernel-next/genkernel-next-63.ebuild
+++ b/sys-kernel/genkernel-next/genkernel-next-63.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel-next/genkernel-next-60.ebuild,v 1.1 2015/01/20 08:25:58 lxnay Exp $
 
 EAPI=5
 
diff --git a/sys-libs/glibc/glibc-2.17.ebuild b/sys-libs/glibc/glibc-2.17.ebuild
index a03418c3f..0bdfa89a6 100644
--- a/sys-libs/glibc/glibc-2.17.ebuild
+++ b/sys-libs/glibc/glibc-2.17.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.17.ebuild,v 1.34 2014/04/05 16:05:07 vapier Exp $
 
 inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing
 
diff --git a/sys-libs/glibc/glibc-2.19-r1.ebuild b/sys-libs/glibc/glibc-2.19-r1.ebuild
index df31e7209..73eb0afb1 100644
--- a/sys-libs/glibc/glibc-2.19-r1.ebuild
+++ b/sys-libs/glibc/glibc-2.19-r1.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.19-r1.ebuild,v 1.11 2014/10/26 08:05:50 vapier Exp $
 
 inherit eutils versionator toolchain-funcs flag-o-matic gnuconfig multilib systemd unpacker multiprocessing
 
diff --git a/virtual/mysql/mysql-5.1.ebuild b/virtual/mysql/mysql-5.1.ebuild
index 51c144435..27ddc2546 100644
--- a/virtual/mysql/mysql-5.1.ebuild
+++ b/virtual/mysql/mysql-5.1.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/mysql/mysql-5.1.ebuild,v 1.23 2011/04/20 12:26:25 jmbsvicetto Exp $
 
 EAPI="2"
 
diff --git a/www-apache/mod_musicindex/mod_musicindex-1.3.7.ebuild b/www-apache/mod_musicindex/mod_musicindex-1.3.7.ebuild
index 2f8b27ead..4d36961c7 100644
--- a/www-apache/mod_musicindex/mod_musicindex-1.3.7.ebuild
+++ b/www-apache/mod_musicindex/mod_musicindex-1.3.7.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_musicindex/mod_musicindex-1.3.5.ebuild,v 1.1 2011/10/14 17:11:32 beandog Exp $
 
 EAPI="2"
 
diff --git a/x11-misc/bumblebee/bumblebee-3.0.1-r2.ebuild b/x11-misc/bumblebee/bumblebee-3.0.1-r2.ebuild
index 9d853820a..9dadf3f2b 100644
--- a/x11-misc/bumblebee/bumblebee-3.0.1-r2.ebuild
+++ b/x11-misc/bumblebee/bumblebee-3.0.1-r2.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bumblebee/bumblebee-3.0.1-r2.ebuild,v 1.1 2013/01/21 21:19:16 pacho Exp $
 
 EAPI=5
 inherit eutils multilib systemd udev user
diff --git a/x11-misc/bumblebee/bumblebee-3.2.1-r1.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1-r1.ebuild
index 3a602e8b5..34f7d58bf 100644
--- a/x11-misc/bumblebee/bumblebee-3.2.1-r1.ebuild
+++ b/x11-misc/bumblebee/bumblebee-3.2.1-r1.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bumblebee/bumblebee-3.2.1.ebuild,v 1.1 2013/05/26 18:55:23 pacho Exp $
 
 EAPI=5
 inherit eutils multilib readme.gentoo systemd user
diff --git a/x11-misc/bumblebee/bumblebee-3.2.1.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1.ebuild
index bb529edda..c21269204 100644
--- a/x11-misc/bumblebee/bumblebee-3.2.1.ebuild
+++ b/x11-misc/bumblebee/bumblebee-3.2.1.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bumblebee/bumblebee-3.2.1.ebuild,v 1.1 2013/05/26 18:55:23 pacho Exp $
 
 EAPI=5
 inherit eutils multilib readme.gentoo systemd user
diff --git a/x11-plugins/pidgin-libnotify/pidgin-libnotify-0.14-r2.ebuild b/x11-plugins/pidgin-libnotify/pidgin-libnotify-0.14-r2.ebuild
index 3550ab647..8c78c20a7 100644
--- a/x11-plugins/pidgin-libnotify/pidgin-libnotify-0.14-r2.ebuild
+++ b/x11-plugins/pidgin-libnotify/pidgin-libnotify-0.14-r2.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header:
 
 EAPI="2"