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 /profiles/prefix
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 'profiles/prefix')
-rw-r--r--profiles/prefix/aix/5.2.0.0/ppc/make.defaults1
-rw-r--r--profiles/prefix/aix/5.3.0.0/ppc/make.defaults1
-rw-r--r--profiles/prefix/aix/6.1.0.0/ppc/make.defaults1
-rw-r--r--profiles/prefix/aix/7.1.0.0/ppc/make.defaults1
-rw-r--r--profiles/prefix/aix/make.defaults1
-rw-r--r--profiles/prefix/aix/package.mask1
-rw-r--r--profiles/prefix/aix/package.use.force1
-rw-r--r--profiles/prefix/aix/package.use.mask1
-rw-r--r--profiles/prefix/aix/packages1
-rw-r--r--profiles/prefix/aix/profile.bashrc1
-rw-r--r--profiles/prefix/aix/use.force1
-rw-r--r--profiles/prefix/aix/use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.10/make.defaults1
-rw-r--r--profiles/prefix/darwin/macos/10.10/package.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.10/package.unmask1
-rw-r--r--profiles/prefix/darwin/macos/10.10/package.use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.10/profile.bashrc1
-rw-r--r--profiles/prefix/darwin/macos/10.10/x64/make.defaults1
-rw-r--r--profiles/prefix/darwin/macos/10.10/x64/package.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.10/x64/package.use.force1
-rw-r--r--profiles/prefix/darwin/macos/10.10/x64/package.use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.10/x64/use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.10/x86/make.defaults1
-rw-r--r--profiles/prefix/darwin/macos/10.10/x86/package.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.10/x86/package.use.force1
-rw-r--r--profiles/prefix/darwin/macos/10.10/x86/package.use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.10/x86/use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.11/make.defaults1
-rw-r--r--profiles/prefix/darwin/macos/10.11/package.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.11/package.unmask1
-rw-r--r--profiles/prefix/darwin/macos/10.11/package.use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.11/profile.bashrc1
-rw-r--r--profiles/prefix/darwin/macos/10.11/x64/make.defaults1
-rw-r--r--profiles/prefix/darwin/macos/10.11/x64/package.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.11/x64/package.use.force1
-rw-r--r--profiles/prefix/darwin/macos/10.11/x64/package.use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.11/x64/use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.11/x86/make.defaults1
-rw-r--r--profiles/prefix/darwin/macos/10.11/x86/package.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.11/x86/package.use.force1
-rw-r--r--profiles/prefix/darwin/macos/10.11/x86/package.use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.11/x86/use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.12/make.defaults1
-rw-r--r--profiles/prefix/darwin/macos/10.12/package.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.12/package.unmask1
-rw-r--r--profiles/prefix/darwin/macos/10.12/package.use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.12/profile.bashrc1
-rw-r--r--profiles/prefix/darwin/macos/10.12/x64/make.defaults1
-rw-r--r--profiles/prefix/darwin/macos/10.12/x64/package.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.12/x64/package.use.force1
-rw-r--r--profiles/prefix/darwin/macos/10.12/x64/package.use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.12/x64/use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.12/x86/make.defaults1
-rw-r--r--profiles/prefix/darwin/macos/10.12/x86/package.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.12/x86/package.use.force1
-rw-r--r--profiles/prefix/darwin/macos/10.12/x86/package.use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.12/x86/use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.4/make.defaults1
-rw-r--r--profiles/prefix/darwin/macos/10.4/package.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.4/package.use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.4/ppc/make.defaults1
-rw-r--r--profiles/prefix/darwin/macos/10.4/ppc/package.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.4/ppc/package.use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.4/ppc/use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.4/profile.bashrc1
-rw-r--r--profiles/prefix/darwin/macos/10.4/x86/make.defaults1
-rw-r--r--profiles/prefix/darwin/macos/10.4/x86/package.unmask1
-rw-r--r--profiles/prefix/darwin/macos/10.4/x86/package.use.force1
-rw-r--r--profiles/prefix/darwin/macos/10.4/x86/package.use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.4/x86/use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.5/make.defaults1
-rw-r--r--profiles/prefix/darwin/macos/10.5/package.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.5/package.use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.5/ppc/make.defaults1
-rw-r--r--profiles/prefix/darwin/macos/10.5/ppc/package.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.5/ppc/package.unmask1
-rw-r--r--profiles/prefix/darwin/macos/10.5/ppc/package.use.force1
-rw-r--r--profiles/prefix/darwin/macos/10.5/ppc/package.use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.5/ppc/use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.5/profile.bashrc1
-rw-r--r--profiles/prefix/darwin/macos/10.5/x64/make.defaults1
-rw-r--r--profiles/prefix/darwin/macos/10.5/x64/package.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.5/x64/package.unmask1
-rw-r--r--profiles/prefix/darwin/macos/10.5/x64/package.use.force1
-rw-r--r--profiles/prefix/darwin/macos/10.5/x64/package.use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.5/x64/use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.5/x86/make.defaults1
-rw-r--r--profiles/prefix/darwin/macos/10.5/x86/package.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.5/x86/package.unmask1
-rw-r--r--profiles/prefix/darwin/macos/10.5/x86/package.use.force1
-rw-r--r--profiles/prefix/darwin/macos/10.5/x86/package.use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.5/x86/use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.6/make.defaults1
-rw-r--r--profiles/prefix/darwin/macos/10.6/package.use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.6/profile.bashrc1
-rw-r--r--profiles/prefix/darwin/macos/10.6/x64/make.defaults1
-rw-r--r--profiles/prefix/darwin/macos/10.6/x64/package.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.6/x64/package.use.force1
-rw-r--r--profiles/prefix/darwin/macos/10.6/x64/package.use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.6/x64/use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.6/x86/make.defaults1
-rw-r--r--profiles/prefix/darwin/macos/10.6/x86/package.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.6/x86/package.use.force1
-rw-r--r--profiles/prefix/darwin/macos/10.6/x86/package.use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.6/x86/use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.7/make.defaults1
-rw-r--r--profiles/prefix/darwin/macos/10.7/package.use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.7/profile.bashrc1
-rw-r--r--profiles/prefix/darwin/macos/10.7/x64/make.defaults1
-rw-r--r--profiles/prefix/darwin/macos/10.7/x64/package.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.7/x64/package.use.force1
-rw-r--r--profiles/prefix/darwin/macos/10.7/x64/package.use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.7/x64/use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.7/x86/make.defaults1
-rw-r--r--profiles/prefix/darwin/macos/10.7/x86/package.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.7/x86/package.use.force1
-rw-r--r--profiles/prefix/darwin/macos/10.7/x86/package.use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.7/x86/use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.8/make.defaults1
-rw-r--r--profiles/prefix/darwin/macos/10.8/package.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.8/package.unmask1
-rw-r--r--profiles/prefix/darwin/macos/10.8/package.use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.8/profile.bashrc1
-rw-r--r--profiles/prefix/darwin/macos/10.8/x64/make.defaults1
-rw-r--r--profiles/prefix/darwin/macos/10.8/x64/package.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.8/x64/package.use.force1
-rw-r--r--profiles/prefix/darwin/macos/10.8/x64/package.use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.8/x64/use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.8/x86/make.defaults1
-rw-r--r--profiles/prefix/darwin/macos/10.8/x86/package.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.8/x86/package.use.force1
-rw-r--r--profiles/prefix/darwin/macos/10.8/x86/package.use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.8/x86/use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.9/make.defaults1
-rw-r--r--profiles/prefix/darwin/macos/10.9/package.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.9/package.unmask1
-rw-r--r--profiles/prefix/darwin/macos/10.9/package.use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.9/profile.bashrc1
-rw-r--r--profiles/prefix/darwin/macos/10.9/x64/make.defaults1
-rw-r--r--profiles/prefix/darwin/macos/10.9/x64/package.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.9/x64/package.use.force1
-rw-r--r--profiles/prefix/darwin/macos/10.9/x64/package.use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.9/x64/use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.9/x86/make.defaults1
-rw-r--r--profiles/prefix/darwin/macos/10.9/x86/package.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.9/x86/package.use.force1
-rw-r--r--profiles/prefix/darwin/macos/10.9/x86/package.use.mask1
-rw-r--r--profiles/prefix/darwin/macos/10.9/x86/use.mask1
-rw-r--r--profiles/prefix/darwin/macos/arch/ppc/make.defaults1
-rw-r--r--profiles/prefix/darwin/macos/arch/ppc/package.mask1
-rw-r--r--profiles/prefix/darwin/macos/arch/ppc/package.use.force1
-rw-r--r--profiles/prefix/darwin/macos/arch/ppc/package.use.mask1
-rw-r--r--profiles/prefix/darwin/macos/arch/ppc/use.force1
-rw-r--r--profiles/prefix/darwin/macos/arch/ppc/use.mask1
-rw-r--r--profiles/prefix/darwin/macos/arch/x64/make.defaults1
-rw-r--r--profiles/prefix/darwin/macos/arch/x64/package.mask1
-rw-r--r--profiles/prefix/darwin/macos/arch/x64/package.use.force1
-rw-r--r--profiles/prefix/darwin/macos/arch/x64/package.use.mask1
-rw-r--r--profiles/prefix/darwin/macos/arch/x64/use.force1
-rw-r--r--profiles/prefix/darwin/macos/arch/x64/use.mask1
-rw-r--r--profiles/prefix/darwin/macos/arch/x86/make.defaults1
-rw-r--r--profiles/prefix/darwin/macos/arch/x86/package.mask1
-rw-r--r--profiles/prefix/darwin/macos/arch/x86/package.use.force1
-rw-r--r--profiles/prefix/darwin/macos/arch/x86/package.use.mask1
-rw-r--r--profiles/prefix/darwin/macos/arch/x86/use.force1
-rw-r--r--profiles/prefix/darwin/macos/arch/x86/use.mask1
-rw-r--r--profiles/prefix/darwin/macos/make.defaults1
-rw-r--r--profiles/prefix/darwin/macos/package.mask1
-rw-r--r--profiles/prefix/darwin/macos/package.use.force1
-rw-r--r--profiles/prefix/darwin/macos/package.use.mask1
-rw-r--r--profiles/prefix/darwin/macos/packages1
-rw-r--r--profiles/prefix/darwin/make.defaults1
-rw-r--r--profiles/prefix/darwin/package.mask1
-rw-r--r--profiles/prefix/darwin/package.use.mask1
-rw-r--r--profiles/prefix/darwin/packages1
-rw-r--r--profiles/prefix/darwin/use.force1
-rw-r--r--profiles/prefix/darwin/use.mask1
-rw-r--r--profiles/prefix/linux-standalone/amd64/make.defaults1
-rw-r--r--profiles/prefix/linux-standalone/arm/armv7a/make.defaults1
-rw-r--r--profiles/prefix/linux-standalone/arm64/make.defaults1
-rw-r--r--profiles/prefix/linux-standalone/make.defaults1
-rw-r--r--profiles/prefix/linux-standalone/ppc64/make.defaults1
-rw-r--r--profiles/prefix/linux-standalone/x86/make.defaults1
-rw-r--r--profiles/prefix/linux/amd64/make.defaults1
-rw-r--r--profiles/prefix/linux/arm/make.defaults1
-rw-r--r--profiles/prefix/linux/make.defaults1
-rw-r--r--profiles/prefix/linux/package.mask1
-rw-r--r--profiles/prefix/linux/packages1
-rw-r--r--profiles/prefix/linux/ppc64/make.defaults1
-rw-r--r--profiles/prefix/linux/ppc64/packages1
-rw-r--r--profiles/prefix/linux/use.mask1
-rw-r--r--profiles/prefix/linux/x86/make.defaults1
-rw-r--r--profiles/prefix/linux/x86/profile.bashrc1
-rw-r--r--profiles/prefix/make.defaults1
-rw-r--r--profiles/prefix/mint/m68k/make.defaults1
-rw-r--r--profiles/prefix/mint/m68k/use.mask1
-rw-r--r--profiles/prefix/mint/make.defaults1
-rw-r--r--profiles/prefix/mint/package.use.force1
-rw-r--r--profiles/prefix/mint/package.use.mask1
-rw-r--r--profiles/prefix/mint/packages1
-rw-r--r--profiles/prefix/mint/use.mask1
-rw-r--r--profiles/prefix/package.mask1
-rw-r--r--profiles/prefix/package.use.mask1
-rw-r--r--profiles/prefix/packages1
-rw-r--r--profiles/prefix/sunos/make.defaults1
-rw-r--r--profiles/prefix/sunos/packages1
-rw-r--r--profiles/prefix/sunos/solaris/5.10/package.mask1
-rw-r--r--profiles/prefix/sunos/solaris/5.10/sparc/make.defaults1
-rw-r--r--profiles/prefix/sunos/solaris/5.10/sparc/package.mask1
-rw-r--r--profiles/prefix/sunos/solaris/5.10/sparc/package.use.mask1
-rw-r--r--profiles/prefix/sunos/solaris/5.10/sparc64/make.defaults1
-rw-r--r--profiles/prefix/sunos/solaris/5.10/sparc64/package.mask1
-rw-r--r--profiles/prefix/sunos/solaris/5.10/sparc64/package.use.mask1
-rw-r--r--profiles/prefix/sunos/solaris/5.10/x64/make.defaults1
-rw-r--r--profiles/prefix/sunos/solaris/5.10/x64/package.mask1
-rw-r--r--profiles/prefix/sunos/solaris/5.10/x64/package.use.mask1
-rw-r--r--profiles/prefix/sunos/solaris/5.10/x86/make.defaults1
-rw-r--r--profiles/prefix/sunos/solaris/5.11/package.use.mask1
-rw-r--r--profiles/prefix/sunos/solaris/5.11/packages1
-rw-r--r--profiles/prefix/sunos/solaris/5.11/sparc/make.defaults1
-rw-r--r--profiles/prefix/sunos/solaris/5.11/sparc/package.mask1
-rw-r--r--profiles/prefix/sunos/solaris/5.11/sparc/package.use.mask1
-rw-r--r--profiles/prefix/sunos/solaris/5.11/sparc64/make.defaults1
-rw-r--r--profiles/prefix/sunos/solaris/5.11/sparc64/package.mask1
-rw-r--r--profiles/prefix/sunos/solaris/5.11/sparc64/package.use.mask1
-rw-r--r--profiles/prefix/sunos/solaris/5.11/x64/make.defaults1
-rw-r--r--profiles/prefix/sunos/solaris/5.11/x64/package.use.mask1
-rw-r--r--profiles/prefix/sunos/solaris/5.11/x86/make.defaults1
-rw-r--r--profiles/prefix/sunos/solaris/5.11/x86/package.use.mask1
-rw-r--r--profiles/prefix/sunos/solaris/5.9/package.mask1
-rw-r--r--profiles/prefix/sunos/solaris/5.9/package.use.mask1
-rw-r--r--profiles/prefix/sunos/solaris/5.9/sparc/make.defaults1
-rw-r--r--profiles/prefix/sunos/solaris/5.9/sparc/package.mask1
-rw-r--r--profiles/prefix/sunos/solaris/arch/sparc/package.mask1
-rw-r--r--profiles/prefix/sunos/solaris/arch/sparc/package.use.mask1
-rw-r--r--profiles/prefix/sunos/solaris/arch/sparc64/package.mask1
-rw-r--r--profiles/prefix/sunos/solaris/arch/sparc64/package.use.mask1
-rw-r--r--profiles/prefix/sunos/solaris/arch/x64/make.defaults1
-rw-r--r--profiles/prefix/sunos/solaris/arch/x64/package.mask1
-rw-r--r--profiles/prefix/sunos/solaris/arch/x64/package.use.mask1
-rw-r--r--profiles/prefix/sunos/solaris/arch/x64/use.force1
-rw-r--r--profiles/prefix/sunos/solaris/arch/x64/use.mask1
-rw-r--r--profiles/prefix/sunos/solaris/arch/x86/make.defaults1
-rw-r--r--profiles/prefix/sunos/solaris/arch/x86/package.mask1
-rw-r--r--profiles/prefix/sunos/solaris/arch/x86/package.use.mask1
-rw-r--r--profiles/prefix/sunos/solaris/arch/x86/use.force1
-rw-r--r--profiles/prefix/sunos/solaris/arch/x86/use.mask1
-rw-r--r--profiles/prefix/sunos/solaris/make.defaults1
-rw-r--r--profiles/prefix/sunos/solaris/package.mask1
-rw-r--r--profiles/prefix/sunos/solaris/package.use.force1
-rw-r--r--profiles/prefix/sunos/solaris/package.use.mask1
-rw-r--r--profiles/prefix/sunos/solaris/profile.bashrc1
-rw-r--r--profiles/prefix/sunos/use.force1
-rw-r--r--profiles/prefix/sunos/use.mask1
-rw-r--r--profiles/prefix/use.force1
-rw-r--r--profiles/prefix/use.mask1
-rw-r--r--profiles/prefix/use.stable.mask1
-rw-r--r--profiles/prefix/windows/cygwin/make.defaults1
-rw-r--r--profiles/prefix/windows/cygwin/package.mask1
-rw-r--r--profiles/prefix/windows/cygwin/package.use1
-rw-r--r--profiles/prefix/windows/cygwin/packages1
-rw-r--r--profiles/prefix/windows/cygwin/use.force1
-rw-r--r--profiles/prefix/windows/cygwin/use.mask1
-rw-r--r--profiles/prefix/windows/cygwin/x64/make.defaults1
-rw-r--r--profiles/prefix/windows/cygwin/x86/make.defaults1
-rw-r--r--profiles/prefix/windows/package.mask1
-rw-r--r--profiles/prefix/windows/use.force1
-rw-r--r--profiles/prefix/windows/use.mask1
-rw-r--r--profiles/prefix/windows/winnt/3.5/x86/make.defaults1
-rw-r--r--profiles/prefix/windows/winnt/5.2/x86/make.defaults1
-rw-r--r--profiles/prefix/windows/winnt/6.0/x86/make.defaults1
-rw-r--r--profiles/prefix/windows/winnt/6.1/x86/make.defaults1
-rw-r--r--profiles/prefix/windows/winnt/make.defaults1
-rw-r--r--profiles/prefix/windows/winnt/package.mask2
-rw-r--r--profiles/prefix/windows/winnt/packages1
-rw-r--r--profiles/prefix/windows/winnt/profile.bashrc1
-rw-r--r--profiles/prefix/windows/winnt/use.force1
-rw-r--r--profiles/prefix/windows/winnt/use.mask1
278 files changed, 0 insertions, 279 deletions
diff --git a/profiles/prefix/aix/5.2.0.0/ppc/make.defaults b/profiles/prefix/aix/5.2.0.0/ppc/make.defaults
index b758ef89cc44..4957fcf7471f 100644
--- a/profiles/prefix/aix/5.2.0.0/ppc/make.defaults
+++ b/profiles/prefix/aix/5.2.0.0/ppc/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
ARCH="ppc-aix"
CHOST="powerpc-ibm-aix5.2.0.0"
diff --git a/profiles/prefix/aix/5.3.0.0/ppc/make.defaults b/profiles/prefix/aix/5.3.0.0/ppc/make.defaults
index 72e3270aec65..c1c7ee8d60bf 100644
--- a/profiles/prefix/aix/5.3.0.0/ppc/make.defaults
+++ b/profiles/prefix/aix/5.3.0.0/ppc/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
ARCH="ppc-aix"
CHOST="powerpc-ibm-aix5.3.0.0"
diff --git a/profiles/prefix/aix/6.1.0.0/ppc/make.defaults b/profiles/prefix/aix/6.1.0.0/ppc/make.defaults
index 71cd10bb04de..84bf77f3fbea 100644
--- a/profiles/prefix/aix/6.1.0.0/ppc/make.defaults
+++ b/profiles/prefix/aix/6.1.0.0/ppc/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
ARCH="ppc-aix"
CHOST="powerpc-ibm-aix6.1.0.0"
diff --git a/profiles/prefix/aix/7.1.0.0/ppc/make.defaults b/profiles/prefix/aix/7.1.0.0/ppc/make.defaults
index 8bd0a2f8867b..0a100e97e6ea 100644
--- a/profiles/prefix/aix/7.1.0.0/ppc/make.defaults
+++ b/profiles/prefix/aix/7.1.0.0/ppc/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
ARCH="ppc-aix"
CHOST="powerpc-ibm-aix7.1.0.0"
diff --git a/profiles/prefix/aix/make.defaults b/profiles/prefix/aix/make.defaults
index 24e3c2806a54..4a1d10f6f86a 100644
--- a/profiles/prefix/aix/make.defaults
+++ b/profiles/prefix/aix/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# System-wide defaults for all AIX profiles
# This file should rarely need to be changed
diff --git a/profiles/prefix/aix/package.mask b/profiles/prefix/aix/package.mask
index cea5e1e074fc..36edc01fdd5e 100644
--- a/profiles/prefix/aix/package.mask
+++ b/profiles/prefix/aix/package.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Michael Haubenwallner <haubi@gentoo.org> (17 Feb 2015)
# Breaks (openssh, ...) because of PR target/65058
diff --git a/profiles/prefix/aix/package.use.force b/profiles/prefix/aix/package.use.force
index c554a21916eb..a30f00532c5e 100644
--- a/profiles/prefix/aix/package.use.force
+++ b/profiles/prefix/aix/package.use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Michael Haubenwallner <haubi@gentoo.org> (2009-03-18)
# Plugins need to be built and installed using libtool (#261186)
diff --git a/profiles/prefix/aix/package.use.mask b/profiles/prefix/aix/package.use.mask
index f7b6aa91e7f9..f169c6736d3d 100644
--- a/profiles/prefix/aix/package.use.mask
+++ b/profiles/prefix/aix/package.use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Michael Haubenwallner <haubi@gentoo.org> (16 Feb 2012)
# JIT implementation in pcre does not know about AIX.
diff --git a/profiles/prefix/aix/packages b/profiles/prefix/aix/packages
index 1a7bec4d4e2e..d0c7983dff6c 100644
--- a/profiles/prefix/aix/packages
+++ b/profiles/prefix/aix/packages
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# AIX uses the native (non-source available) linker
*sys-devel/native-cctools
diff --git a/profiles/prefix/aix/profile.bashrc b/profiles/prefix/aix/profile.bashrc
index 50e5fae4a067..b0f8b6bfeb0e 100644
--- a/profiles/prefix/aix/profile.bashrc
+++ b/profiles/prefix/aix/profile.bashrc
@@ -1,6 +1,5 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# never use /bin/sh as CONFIG_SHELL on AIX: it is ways too slow,
# as well as broken in some corner cases.
diff --git a/profiles/prefix/aix/use.force b/profiles/prefix/aix/use.force
index 3b4e50e077ba..f69f9dce1b4d 100644
--- a/profiles/prefix/aix/use.force
+++ b/profiles/prefix/aix/use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Re-add AIX OS
kernel_AIX
diff --git a/profiles/prefix/aix/use.mask b/profiles/prefix/aix/use.mask
index 1aaf9f8ec2f2..28f2cc6ab75a 100644
--- a/profiles/prefix/aix/use.mask
+++ b/profiles/prefix/aix/use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Re-add AIX libc
-elibc_AIX
diff --git a/profiles/prefix/darwin/macos/10.10/make.defaults b/profiles/prefix/darwin/macos/10.10/make.defaults
index 99d9bbc5d9d1..ae958cc22081 100644
--- a/profiles/prefix/darwin/macos/10.10/make.defaults
+++ b/profiles/prefix/darwin/macos/10.10/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
MACOSX_DEPLOYMENT_TARGET="10.10"
diff --git a/profiles/prefix/darwin/macos/10.10/package.mask b/profiles/prefix/darwin/macos/10.10/package.mask
index 5ba8566f0526..c8a0f51c1211 100644
--- a/profiles/prefix/darwin/macos/10.10/package.mask
+++ b/profiles/prefix/darwin/macos/10.10/package.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Fabian Groffen <grobian@gentoo.org> (30 Sep 2012)
# Requires XQuartz, since Apple dropped much of X-support in 10.8
diff --git a/profiles/prefix/darwin/macos/10.10/package.unmask b/profiles/prefix/darwin/macos/10.10/package.unmask
index f43f77c72fa7..f72a8fab624d 100644
--- a/profiles/prefix/darwin/macos/10.10/package.unmask
+++ b/profiles/prefix/darwin/macos/10.10/package.unmask
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# James Le Cuirot <chewi@gentoo.org> (29 Jul 2015)
# Recent releases are supported in 10.10.
diff --git a/profiles/prefix/darwin/macos/10.10/package.use.mask b/profiles/prefix/darwin/macos/10.10/package.use.mask
index c93cfa79bb42..0e3b22de53b7 100644
--- a/profiles/prefix/darwin/macos/10.10/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.10/package.use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Fabian Groffen <grobian@gentoo.org> (10 Apr 2011)
# as long as util-linux installs uuid.h which breaks the system headers
diff --git a/profiles/prefix/darwin/macos/10.10/profile.bashrc b/profiles/prefix/darwin/macos/10.10/profile.bashrc
index 2eeb05377d68..e80837769875 100644
--- a/profiles/prefix/darwin/macos/10.10/profile.bashrc
+++ b/profiles/prefix/darwin/macos/10.10/profile.bashrc
@@ -1,5 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
export MACOSX_DEPLOYMENT_TARGET=10.10
diff --git a/profiles/prefix/darwin/macos/10.10/x64/make.defaults b/profiles/prefix/darwin/macos/10.10/x64/make.defaults
index 71591b912814..47aeed03be0f 100644
--- a/profiles/prefix/darwin/macos/10.10/x64/make.defaults
+++ b/profiles/prefix/darwin/macos/10.10/x64/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
CHOST="x86_64-apple-darwin14"
CHOST_amd64="${CHOST}"
diff --git a/profiles/prefix/darwin/macos/10.10/x64/package.mask b/profiles/prefix/darwin/macos/10.10/x64/package.mask
index bc4612c59d12..90062e0f6d10 100644
--- a/profiles/prefix/darwin/macos/10.10/x64/package.mask
+++ b/profiles/prefix/darwin/macos/10.10/x64/package.mask
@@ -1,3 +1,2 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.10/x64/package.use.force b/profiles/prefix/darwin/macos/10.10/x64/package.use.force
index d51c8d716a6e..37fe719d893e 100644
--- a/profiles/prefix/darwin/macos/10.10/x64/package.use.force
+++ b/profiles/prefix/darwin/macos/10.10/x64/package.use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
# compiles with -aqua, doesn't work, though
diff --git a/profiles/prefix/darwin/macos/10.10/x64/package.use.mask b/profiles/prefix/darwin/macos/10.10/x64/package.use.mask
index f0e8c9537cba..cbce096ae6b6 100644
--- a/profiles/prefix/darwin/macos/10.10/x64/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.10/x64/package.use.mask
@@ -1,5 +1,4 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.10/x64/use.mask b/profiles/prefix/darwin/macos/10.10/x64/use.mask
index a90a146582dc..67292fbd1c2e 100644
--- a/profiles/prefix/darwin/macos/10.10/x64/use.mask
+++ b/profiles/prefix/darwin/macos/10.10/x64/use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# This file masks out USE flags that are simply NOT allowed in the default
# x86 profile. This works, for example, if another architecture's
diff --git a/profiles/prefix/darwin/macos/10.10/x86/make.defaults b/profiles/prefix/darwin/macos/10.10/x86/make.defaults
index 99b9e28ea497..25bb4496025c 100644
--- a/profiles/prefix/darwin/macos/10.10/x86/make.defaults
+++ b/profiles/prefix/darwin/macos/10.10/x86/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
CHOST="i686-apple-darwin14"
CHOST_x86="${CHOST}"
diff --git a/profiles/prefix/darwin/macos/10.10/x86/package.mask b/profiles/prefix/darwin/macos/10.10/x86/package.mask
index 9822b76e194a..21e0df1269c9 100644
--- a/profiles/prefix/darwin/macos/10.10/x86/package.mask
+++ b/profiles/prefix/darwin/macos/10.10/x86/package.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# The Carbon interface has been removed entirely in Lion, only tk-8.6
# will come with Cocoa support. If you must have tk, you'll have to
diff --git a/profiles/prefix/darwin/macos/10.10/x86/package.use.force b/profiles/prefix/darwin/macos/10.10/x86/package.use.force
index d51c8d716a6e..37fe719d893e 100644
--- a/profiles/prefix/darwin/macos/10.10/x86/package.use.force
+++ b/profiles/prefix/darwin/macos/10.10/x86/package.use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
# compiles with -aqua, doesn't work, though
diff --git a/profiles/prefix/darwin/macos/10.10/x86/package.use.mask b/profiles/prefix/darwin/macos/10.10/x86/package.use.mask
index f0e8c9537cba..cbce096ae6b6 100644
--- a/profiles/prefix/darwin/macos/10.10/x86/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.10/x86/package.use.mask
@@ -1,5 +1,4 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.10/x86/use.mask b/profiles/prefix/darwin/macos/10.10/x86/use.mask
index a90a146582dc..67292fbd1c2e 100644
--- a/profiles/prefix/darwin/macos/10.10/x86/use.mask
+++ b/profiles/prefix/darwin/macos/10.10/x86/use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# This file masks out USE flags that are simply NOT allowed in the default
# x86 profile. This works, for example, if another architecture's
diff --git a/profiles/prefix/darwin/macos/10.11/make.defaults b/profiles/prefix/darwin/macos/10.11/make.defaults
index 033c3077b280..b0c23df10794 100644
--- a/profiles/prefix/darwin/macos/10.11/make.defaults
+++ b/profiles/prefix/darwin/macos/10.11/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
MACOSX_DEPLOYMENT_TARGET="10.11"
diff --git a/profiles/prefix/darwin/macos/10.11/package.mask b/profiles/prefix/darwin/macos/10.11/package.mask
index 95dbe8b454fc..25d98fcad184 100644
--- a/profiles/prefix/darwin/macos/10.11/package.mask
+++ b/profiles/prefix/darwin/macos/10.11/package.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Fabian Groffen <grobian@gentoo.org> (30 Sep 2012)
# Requires XQuartz, since Apple dropped much of X-support in 10.8
diff --git a/profiles/prefix/darwin/macos/10.11/package.unmask b/profiles/prefix/darwin/macos/10.11/package.unmask
index b20523d4160c..ffa904e1603a 100644
--- a/profiles/prefix/darwin/macos/10.11/package.unmask
+++ b/profiles/prefix/darwin/macos/10.11/package.unmask
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# James Le Cuirot <chewi@gentoo.org> (29 Jul 2015)
# Recent releases are supported in >10.10.
diff --git a/profiles/prefix/darwin/macos/10.11/package.use.mask b/profiles/prefix/darwin/macos/10.11/package.use.mask
index 24f749c3e127..a2e4210b6c4b 100644
--- a/profiles/prefix/darwin/macos/10.11/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.11/package.use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Fabian Groffen <grobian@gentoo.org> (10 Apr 2011)
# as long as util-linux installs uuid.h which breaks the system headers
diff --git a/profiles/prefix/darwin/macos/10.11/profile.bashrc b/profiles/prefix/darwin/macos/10.11/profile.bashrc
index 012e1228bf8f..45e4fccece0c 100644
--- a/profiles/prefix/darwin/macos/10.11/profile.bashrc
+++ b/profiles/prefix/darwin/macos/10.11/profile.bashrc
@@ -1,5 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
export MACOSX_DEPLOYMENT_TARGET=10.11
diff --git a/profiles/prefix/darwin/macos/10.11/x64/make.defaults b/profiles/prefix/darwin/macos/10.11/x64/make.defaults
index 8ca84707faae..d48346f6f6b3 100644
--- a/profiles/prefix/darwin/macos/10.11/x64/make.defaults
+++ b/profiles/prefix/darwin/macos/10.11/x64/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
CHOST="x86_64-apple-darwin15"
CHOST_amd64="${CHOST}"
diff --git a/profiles/prefix/darwin/macos/10.11/x64/package.mask b/profiles/prefix/darwin/macos/10.11/x64/package.mask
index 445a68b5ea0f..a99368d0861f 100644
--- a/profiles/prefix/darwin/macos/10.11/x64/package.mask
+++ b/profiles/prefix/darwin/macos/10.11/x64/package.mask
@@ -1,3 +1,2 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.11/x64/package.use.force b/profiles/prefix/darwin/macos/10.11/x64/package.use.force
index 05bc3b7690c8..3890d8713529 100644
--- a/profiles/prefix/darwin/macos/10.11/x64/package.use.force
+++ b/profiles/prefix/darwin/macos/10.11/x64/package.use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
# compiles with -aqua, doesn't work, though
diff --git a/profiles/prefix/darwin/macos/10.11/x64/package.use.mask b/profiles/prefix/darwin/macos/10.11/x64/package.use.mask
index 4bccb5fc89da..76d41d1fd860 100644
--- a/profiles/prefix/darwin/macos/10.11/x64/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.11/x64/package.use.mask
@@ -1,5 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.11/x64/use.mask b/profiles/prefix/darwin/macos/10.11/x64/use.mask
index a90a146582dc..67292fbd1c2e 100644
--- a/profiles/prefix/darwin/macos/10.11/x64/use.mask
+++ b/profiles/prefix/darwin/macos/10.11/x64/use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# This file masks out USE flags that are simply NOT allowed in the default
# x86 profile. This works, for example, if another architecture's
diff --git a/profiles/prefix/darwin/macos/10.11/x86/make.defaults b/profiles/prefix/darwin/macos/10.11/x86/make.defaults
index bdcf0372a7c8..f77f7777f6cf 100644
--- a/profiles/prefix/darwin/macos/10.11/x86/make.defaults
+++ b/profiles/prefix/darwin/macos/10.11/x86/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
CHOST="i686-apple-darwin15"
CHOST_x86="${CHOST}"
diff --git a/profiles/prefix/darwin/macos/10.11/x86/package.mask b/profiles/prefix/darwin/macos/10.11/x86/package.mask
index d1b293c01fd8..0873d990d5a0 100644
--- a/profiles/prefix/darwin/macos/10.11/x86/package.mask
+++ b/profiles/prefix/darwin/macos/10.11/x86/package.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# The Carbon interface has been removed entirely in Lion, only tk-8.6
# will come with Cocoa support. If you must have tk, you'll have to
diff --git a/profiles/prefix/darwin/macos/10.11/x86/package.use.force b/profiles/prefix/darwin/macos/10.11/x86/package.use.force
index 05bc3b7690c8..3890d8713529 100644
--- a/profiles/prefix/darwin/macos/10.11/x86/package.use.force
+++ b/profiles/prefix/darwin/macos/10.11/x86/package.use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
# compiles with -aqua, doesn't work, though
diff --git a/profiles/prefix/darwin/macos/10.11/x86/package.use.mask b/profiles/prefix/darwin/macos/10.11/x86/package.use.mask
index 4bccb5fc89da..76d41d1fd860 100644
--- a/profiles/prefix/darwin/macos/10.11/x86/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.11/x86/package.use.mask
@@ -1,5 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.11/x86/use.mask b/profiles/prefix/darwin/macos/10.11/x86/use.mask
index a90a146582dc..67292fbd1c2e 100644
--- a/profiles/prefix/darwin/macos/10.11/x86/use.mask
+++ b/profiles/prefix/darwin/macos/10.11/x86/use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# This file masks out USE flags that are simply NOT allowed in the default
# x86 profile. This works, for example, if another architecture's
diff --git a/profiles/prefix/darwin/macos/10.12/make.defaults b/profiles/prefix/darwin/macos/10.12/make.defaults
index adaafb785311..65768d98975f 100644
--- a/profiles/prefix/darwin/macos/10.12/make.defaults
+++ b/profiles/prefix/darwin/macos/10.12/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
MACOSX_DEPLOYMENT_TARGET="10.12"
diff --git a/profiles/prefix/darwin/macos/10.12/package.mask b/profiles/prefix/darwin/macos/10.12/package.mask
index 755c6e539d6f..3a93b13de32a 100644
--- a/profiles/prefix/darwin/macos/10.12/package.mask
+++ b/profiles/prefix/darwin/macos/10.12/package.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Fabian Groffen <grobian@gentoo.org> (30 Sep 2012)
# Requires XQuartz, since Apple dropped much of X-support in 10.8
diff --git a/profiles/prefix/darwin/macos/10.12/package.unmask b/profiles/prefix/darwin/macos/10.12/package.unmask
index 52ec79fafb48..9b6d7fac0541 100644
--- a/profiles/prefix/darwin/macos/10.12/package.unmask
+++ b/profiles/prefix/darwin/macos/10.12/package.unmask
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# James Le Cuirot <chewi@gentoo.org> (29 Jul 2015)
# Recent releases are supported in >10.10.
diff --git a/profiles/prefix/darwin/macos/10.12/package.use.mask b/profiles/prefix/darwin/macos/10.12/package.use.mask
index 0d0903b014e8..45a85366bdbc 100644
--- a/profiles/prefix/darwin/macos/10.12/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.12/package.use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Fabian Groffen <grobian@gentoo.org> (10 Apr 2011)
# as long as util-linux installs uuid.h which breaks the system headers
diff --git a/profiles/prefix/darwin/macos/10.12/profile.bashrc b/profiles/prefix/darwin/macos/10.12/profile.bashrc
index aa7550eb8072..606735442cef 100644
--- a/profiles/prefix/darwin/macos/10.12/profile.bashrc
+++ b/profiles/prefix/darwin/macos/10.12/profile.bashrc
@@ -1,5 +1,4 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
export MACOSX_DEPLOYMENT_TARGET=10.12
diff --git a/profiles/prefix/darwin/macos/10.12/x64/make.defaults b/profiles/prefix/darwin/macos/10.12/x64/make.defaults
index 8abc6aeaa48f..46f92cb62b20 100644
--- a/profiles/prefix/darwin/macos/10.12/x64/make.defaults
+++ b/profiles/prefix/darwin/macos/10.12/x64/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
CHOST="x86_64-apple-darwin16"
CHOST_amd64="${CHOST}"
diff --git a/profiles/prefix/darwin/macos/10.12/x64/package.mask b/profiles/prefix/darwin/macos/10.12/x64/package.mask
index 4d1375a4ae0c..5b64a27123b6 100644
--- a/profiles/prefix/darwin/macos/10.12/x64/package.mask
+++ b/profiles/prefix/darwin/macos/10.12/x64/package.mask
@@ -1,3 +1,2 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.12/x64/package.use.force b/profiles/prefix/darwin/macos/10.12/x64/package.use.force
index 7bbf614d7995..bbe3384ec5bb 100644
--- a/profiles/prefix/darwin/macos/10.12/x64/package.use.force
+++ b/profiles/prefix/darwin/macos/10.12/x64/package.use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
# compiles with -aqua, doesn't work, though
diff --git a/profiles/prefix/darwin/macos/10.12/x64/package.use.mask b/profiles/prefix/darwin/macos/10.12/x64/package.use.mask
index 8b9a0bec4972..2b71fbdac61e 100644
--- a/profiles/prefix/darwin/macos/10.12/x64/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.12/x64/package.use.mask
@@ -1,5 +1,4 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.12/x64/use.mask b/profiles/prefix/darwin/macos/10.12/x64/use.mask
index a90a146582dc..67292fbd1c2e 100644
--- a/profiles/prefix/darwin/macos/10.12/x64/use.mask
+++ b/profiles/prefix/darwin/macos/10.12/x64/use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# This file masks out USE flags that are simply NOT allowed in the default
# x86 profile. This works, for example, if another architecture's
diff --git a/profiles/prefix/darwin/macos/10.12/x86/make.defaults b/profiles/prefix/darwin/macos/10.12/x86/make.defaults
index 0ea641e1e301..bdc6f366701e 100644
--- a/profiles/prefix/darwin/macos/10.12/x86/make.defaults
+++ b/profiles/prefix/darwin/macos/10.12/x86/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
CHOST="i686-apple-darwin16"
CHOST_x86="${CHOST}"
diff --git a/profiles/prefix/darwin/macos/10.12/x86/package.mask b/profiles/prefix/darwin/macos/10.12/x86/package.mask
index 4e1289f41fc7..dfef4895f302 100644
--- a/profiles/prefix/darwin/macos/10.12/x86/package.mask
+++ b/profiles/prefix/darwin/macos/10.12/x86/package.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# The Carbon interface has been removed entirely in Lion, only tk-8.6
# will come with Cocoa support. If you must have tk, you'll have to
diff --git a/profiles/prefix/darwin/macos/10.12/x86/package.use.force b/profiles/prefix/darwin/macos/10.12/x86/package.use.force
index 7bbf614d7995..bbe3384ec5bb 100644
--- a/profiles/prefix/darwin/macos/10.12/x86/package.use.force
+++ b/profiles/prefix/darwin/macos/10.12/x86/package.use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
# compiles with -aqua, doesn't work, though
diff --git a/profiles/prefix/darwin/macos/10.12/x86/package.use.mask b/profiles/prefix/darwin/macos/10.12/x86/package.use.mask
index 8b9a0bec4972..2b71fbdac61e 100644
--- a/profiles/prefix/darwin/macos/10.12/x86/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.12/x86/package.use.mask
@@ -1,5 +1,4 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.12/x86/use.mask b/profiles/prefix/darwin/macos/10.12/x86/use.mask
index a90a146582dc..67292fbd1c2e 100644
--- a/profiles/prefix/darwin/macos/10.12/x86/use.mask
+++ b/profiles/prefix/darwin/macos/10.12/x86/use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# This file masks out USE flags that are simply NOT allowed in the default
# x86 profile. This works, for example, if another architecture's
diff --git a/profiles/prefix/darwin/macos/10.4/make.defaults b/profiles/prefix/darwin/macos/10.4/make.defaults
index b5eeaa3c0f72..f8958c17eaf1 100644
--- a/profiles/prefix/darwin/macos/10.4/make.defaults
+++ b/profiles/prefix/darwin/macos/10.4/make.defaults
@@ -1,5 +1,4 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
MACOSX_DEPLOYMENT_TARGET="10.4"
diff --git a/profiles/prefix/darwin/macos/10.4/package.mask b/profiles/prefix/darwin/macos/10.4/package.mask
index 2ac75a8f0914..92066a995673 100644
--- a/profiles/prefix/darwin/macos/10.4/package.mask
+++ b/profiles/prefix/darwin/macos/10.4/package.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Fabian Groffen <grobian@gentoo.org> (03 May 2012)
# Needs 10.6 or up
diff --git a/profiles/prefix/darwin/macos/10.4/package.use.mask b/profiles/prefix/darwin/macos/10.4/package.use.mask
index 3bd5e70e047d..abb881877509 100644
--- a/profiles/prefix/darwin/macos/10.4/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.4/package.use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Fabian Groffen <grobian@gentoo.org> (28 Apr 2008)
diff --git a/profiles/prefix/darwin/macos/10.4/ppc/make.defaults b/profiles/prefix/darwin/macos/10.4/ppc/make.defaults
index de5ac9be6a34..a7ca397782c9 100644
--- a/profiles/prefix/darwin/macos/10.4/ppc/make.defaults
+++ b/profiles/prefix/darwin/macos/10.4/ppc/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
CHOST="powerpc-apple-darwin8"
CHOST_ppc="${CHOST}"
diff --git a/profiles/prefix/darwin/macos/10.4/ppc/package.mask b/profiles/prefix/darwin/macos/10.4/ppc/package.mask
index 4413ca2d3df3..2a5c2e63e2f4 100644
--- a/profiles/prefix/darwin/macos/10.4/ppc/package.mask
+++ b/profiles/prefix/darwin/macos/10.4/ppc/package.mask
@@ -1,4 +1,3 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.4/ppc/package.use.mask b/profiles/prefix/darwin/macos/10.4/ppc/package.use.mask
index e2d57612705d..f7ac4607b395 100644
--- a/profiles/prefix/darwin/macos/10.4/ppc/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.4/ppc/package.use.mask
@@ -1,4 +1,3 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.4/ppc/use.mask b/profiles/prefix/darwin/macos/10.4/ppc/use.mask
index c028f783a627..cb5937b71a2e 100644
--- a/profiles/prefix/darwin/macos/10.4/ppc/use.mask
+++ b/profiles/prefix/darwin/macos/10.4/ppc/use.mask
@@ -1,5 +1,4 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
-altivec
diff --git a/profiles/prefix/darwin/macos/10.4/profile.bashrc b/profiles/prefix/darwin/macos/10.4/profile.bashrc
index b59a3d4befb6..f227ae79ef20 100644
--- a/profiles/prefix/darwin/macos/10.4/profile.bashrc
+++ b/profiles/prefix/darwin/macos/10.4/profile.bashrc
@@ -1,5 +1,4 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
export MACOSX_DEPLOYMENT_TARGET=10.4
diff --git a/profiles/prefix/darwin/macos/10.4/x86/make.defaults b/profiles/prefix/darwin/macos/10.4/x86/make.defaults
index 8196d985f184..aa58c46bfa62 100644
--- a/profiles/prefix/darwin/macos/10.4/x86/make.defaults
+++ b/profiles/prefix/darwin/macos/10.4/x86/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
CHOST="i686-apple-darwin8"
CHOST_x86="${CHOST}"
diff --git a/profiles/prefix/darwin/macos/10.4/x86/package.unmask b/profiles/prefix/darwin/macos/10.4/x86/package.unmask
index 86f9d13834e6..320a6bbb1a0c 100644
--- a/profiles/prefix/darwin/macos/10.4/x86/package.unmask
+++ b/profiles/prefix/darwin/macos/10.4/x86/package.unmask
@@ -1,3 +1,2 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.4/x86/package.use.force b/profiles/prefix/darwin/macos/10.4/x86/package.use.force
index 224ed0fc48b8..eb7f4d25673f 100644
--- a/profiles/prefix/darwin/macos/10.4/x86/package.use.force
+++ b/profiles/prefix/darwin/macos/10.4/x86/package.use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
# compiles with -aqua, doesn't work, though
diff --git a/profiles/prefix/darwin/macos/10.4/x86/package.use.mask b/profiles/prefix/darwin/macos/10.4/x86/package.use.mask
index 6bc858049e42..1a1871bef0cb 100644
--- a/profiles/prefix/darwin/macos/10.4/x86/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.4/x86/package.use.mask
@@ -1,5 +1,4 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.4/x86/use.mask b/profiles/prefix/darwin/macos/10.4/x86/use.mask
index a90a146582dc..67292fbd1c2e 100644
--- a/profiles/prefix/darwin/macos/10.4/x86/use.mask
+++ b/profiles/prefix/darwin/macos/10.4/x86/use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# This file masks out USE flags that are simply NOT allowed in the default
# x86 profile. This works, for example, if another architecture's
diff --git a/profiles/prefix/darwin/macos/10.5/make.defaults b/profiles/prefix/darwin/macos/10.5/make.defaults
index cd03963ead59..b4eacf03871f 100644
--- a/profiles/prefix/darwin/macos/10.5/make.defaults
+++ b/profiles/prefix/darwin/macos/10.5/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
MACOSX_DEPLOYMENT_TARGET="10.5"
diff --git a/profiles/prefix/darwin/macos/10.5/package.mask b/profiles/prefix/darwin/macos/10.5/package.mask
index bc63c5e7e3ec..daf51e691ebf 100644
--- a/profiles/prefix/darwin/macos/10.5/package.mask
+++ b/profiles/prefix/darwin/macos/10.5/package.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Fabian Groffen <grobian@gentoo.org> (03 May 2012)
# Needs 10.6 or up
diff --git a/profiles/prefix/darwin/macos/10.5/package.use.mask b/profiles/prefix/darwin/macos/10.5/package.use.mask
index 3bd5e70e047d..abb881877509 100644
--- a/profiles/prefix/darwin/macos/10.5/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.5/package.use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Fabian Groffen <grobian@gentoo.org> (28 Apr 2008)
diff --git a/profiles/prefix/darwin/macos/10.5/ppc/make.defaults b/profiles/prefix/darwin/macos/10.5/ppc/make.defaults
index 1ec662c7bfcc..8b8ab7718059 100644
--- a/profiles/prefix/darwin/macos/10.5/ppc/make.defaults
+++ b/profiles/prefix/darwin/macos/10.5/ppc/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
CHOST="powerpc-apple-darwin9"
CHOST_ppc="${CHOST}"
diff --git a/profiles/prefix/darwin/macos/10.5/ppc/package.mask b/profiles/prefix/darwin/macos/10.5/ppc/package.mask
index 13ff9386c8d8..13d119cb0a6d 100644
--- a/profiles/prefix/darwin/macos/10.5/ppc/package.mask
+++ b/profiles/prefix/darwin/macos/10.5/ppc/package.mask
@@ -1,3 +1,2 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.5/ppc/package.unmask b/profiles/prefix/darwin/macos/10.5/ppc/package.unmask
index 86f9d13834e6..320a6bbb1a0c 100644
--- a/profiles/prefix/darwin/macos/10.5/ppc/package.unmask
+++ b/profiles/prefix/darwin/macos/10.5/ppc/package.unmask
@@ -1,3 +1,2 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.5/ppc/package.use.force b/profiles/prefix/darwin/macos/10.5/ppc/package.use.force
index 224ed0fc48b8..eb7f4d25673f 100644
--- a/profiles/prefix/darwin/macos/10.5/ppc/package.use.force
+++ b/profiles/prefix/darwin/macos/10.5/ppc/package.use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
# compiles with -aqua, doesn't work, though
diff --git a/profiles/prefix/darwin/macos/10.5/ppc/package.use.mask b/profiles/prefix/darwin/macos/10.5/ppc/package.use.mask
index 54d3278ae96d..5e018747494e 100644
--- a/profiles/prefix/darwin/macos/10.5/ppc/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.5/ppc/package.use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# flag returns compile errors
diff --git a/profiles/prefix/darwin/macos/10.5/ppc/use.mask b/profiles/prefix/darwin/macos/10.5/ppc/use.mask
index c028f783a627..cb5937b71a2e 100644
--- a/profiles/prefix/darwin/macos/10.5/ppc/use.mask
+++ b/profiles/prefix/darwin/macos/10.5/ppc/use.mask
@@ -1,5 +1,4 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
-altivec
diff --git a/profiles/prefix/darwin/macos/10.5/profile.bashrc b/profiles/prefix/darwin/macos/10.5/profile.bashrc
index 2d0fed7c9ca7..b623585a96cc 100644
--- a/profiles/prefix/darwin/macos/10.5/profile.bashrc
+++ b/profiles/prefix/darwin/macos/10.5/profile.bashrc
@@ -1,5 +1,4 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
export MACOSX_DEPLOYMENT_TARGET=10.5
diff --git a/profiles/prefix/darwin/macos/10.5/x64/make.defaults b/profiles/prefix/darwin/macos/10.5/x64/make.defaults
index 0f49e2605bc6..dec1335075b7 100644
--- a/profiles/prefix/darwin/macos/10.5/x64/make.defaults
+++ b/profiles/prefix/darwin/macos/10.5/x64/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
CHOST="x86_64-apple-darwin9"
CHOST_amd64="${CHOST}"
diff --git a/profiles/prefix/darwin/macos/10.5/x64/package.mask b/profiles/prefix/darwin/macos/10.5/x64/package.mask
index 86f9d13834e6..320a6bbb1a0c 100644
--- a/profiles/prefix/darwin/macos/10.5/x64/package.mask
+++ b/profiles/prefix/darwin/macos/10.5/x64/package.mask
@@ -1,3 +1,2 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.5/x64/package.unmask b/profiles/prefix/darwin/macos/10.5/x64/package.unmask
index 1f23cce6ba6e..ca74cff56ac6 100644
--- a/profiles/prefix/darwin/macos/10.5/x64/package.unmask
+++ b/profiles/prefix/darwin/macos/10.5/x64/package.unmask
@@ -1,4 +1,3 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.5/x64/package.use.force b/profiles/prefix/darwin/macos/10.5/x64/package.use.force
index 224ed0fc48b8..eb7f4d25673f 100644
--- a/profiles/prefix/darwin/macos/10.5/x64/package.use.force
+++ b/profiles/prefix/darwin/macos/10.5/x64/package.use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
# compiles with -aqua, doesn't work, though
diff --git a/profiles/prefix/darwin/macos/10.5/x64/package.use.mask b/profiles/prefix/darwin/macos/10.5/x64/package.use.mask
index 6bc858049e42..1a1871bef0cb 100644
--- a/profiles/prefix/darwin/macos/10.5/x64/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.5/x64/package.use.mask
@@ -1,5 +1,4 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.5/x64/use.mask b/profiles/prefix/darwin/macos/10.5/x64/use.mask
index a90a146582dc..67292fbd1c2e 100644
--- a/profiles/prefix/darwin/macos/10.5/x64/use.mask
+++ b/profiles/prefix/darwin/macos/10.5/x64/use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# This file masks out USE flags that are simply NOT allowed in the default
# x86 profile. This works, for example, if another architecture's
diff --git a/profiles/prefix/darwin/macos/10.5/x86/make.defaults b/profiles/prefix/darwin/macos/10.5/x86/make.defaults
index 60efebaece16..ce7d752b743c 100644
--- a/profiles/prefix/darwin/macos/10.5/x86/make.defaults
+++ b/profiles/prefix/darwin/macos/10.5/x86/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
CHOST="i686-apple-darwin9"
CHOST_x86="${CHOST}"
diff --git a/profiles/prefix/darwin/macos/10.5/x86/package.mask b/profiles/prefix/darwin/macos/10.5/x86/package.mask
index 13ff9386c8d8..13d119cb0a6d 100644
--- a/profiles/prefix/darwin/macos/10.5/x86/package.mask
+++ b/profiles/prefix/darwin/macos/10.5/x86/package.mask
@@ -1,3 +1,2 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.5/x86/package.unmask b/profiles/prefix/darwin/macos/10.5/x86/package.unmask
index 1f23cce6ba6e..ca74cff56ac6 100644
--- a/profiles/prefix/darwin/macos/10.5/x86/package.unmask
+++ b/profiles/prefix/darwin/macos/10.5/x86/package.unmask
@@ -1,4 +1,3 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.5/x86/package.use.force b/profiles/prefix/darwin/macos/10.5/x86/package.use.force
index 224ed0fc48b8..eb7f4d25673f 100644
--- a/profiles/prefix/darwin/macos/10.5/x86/package.use.force
+++ b/profiles/prefix/darwin/macos/10.5/x86/package.use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
# compiles with -aqua, doesn't work, though
diff --git a/profiles/prefix/darwin/macos/10.5/x86/package.use.mask b/profiles/prefix/darwin/macos/10.5/x86/package.use.mask
index 6bc858049e42..1a1871bef0cb 100644
--- a/profiles/prefix/darwin/macos/10.5/x86/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.5/x86/package.use.mask
@@ -1,5 +1,4 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.5/x86/use.mask b/profiles/prefix/darwin/macos/10.5/x86/use.mask
index a90a146582dc..67292fbd1c2e 100644
--- a/profiles/prefix/darwin/macos/10.5/x86/use.mask
+++ b/profiles/prefix/darwin/macos/10.5/x86/use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# This file masks out USE flags that are simply NOT allowed in the default
# x86 profile. This works, for example, if another architecture's
diff --git a/profiles/prefix/darwin/macos/10.6/make.defaults b/profiles/prefix/darwin/macos/10.6/make.defaults
index 06b6fd8c124e..7251a95b1ada 100644
--- a/profiles/prefix/darwin/macos/10.6/make.defaults
+++ b/profiles/prefix/darwin/macos/10.6/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
MACOSX_DEPLOYMENT_TARGET="10.6"
diff --git a/profiles/prefix/darwin/macos/10.6/package.use.mask b/profiles/prefix/darwin/macos/10.6/package.use.mask
index 5003fa689703..cba856984633 100644
--- a/profiles/prefix/darwin/macos/10.6/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.6/package.use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Elias Pipping <pipping@gentoo.org> (25 Nov 2007)
diff --git a/profiles/prefix/darwin/macos/10.6/profile.bashrc b/profiles/prefix/darwin/macos/10.6/profile.bashrc
index 69291f841356..21253613c396 100644
--- a/profiles/prefix/darwin/macos/10.6/profile.bashrc
+++ b/profiles/prefix/darwin/macos/10.6/profile.bashrc
@@ -1,5 +1,4 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
export MACOSX_DEPLOYMENT_TARGET=10.6
diff --git a/profiles/prefix/darwin/macos/10.6/x64/make.defaults b/profiles/prefix/darwin/macos/10.6/x64/make.defaults
index 56a2ce92a58a..af0134eefb65 100644
--- a/profiles/prefix/darwin/macos/10.6/x64/make.defaults
+++ b/profiles/prefix/darwin/macos/10.6/x64/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
CHOST="x86_64-apple-darwin10"
CHOST_amd64="${CHOST}"
diff --git a/profiles/prefix/darwin/macos/10.6/x64/package.mask b/profiles/prefix/darwin/macos/10.6/x64/package.mask
index 4645c5d42c61..0cc0ba14627f 100644
--- a/profiles/prefix/darwin/macos/10.6/x64/package.mask
+++ b/profiles/prefix/darwin/macos/10.6/x64/package.mask
@@ -1,3 +1,2 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.6/x64/package.use.force b/profiles/prefix/darwin/macos/10.6/x64/package.use.force
index 224ed0fc48b8..eb7f4d25673f 100644
--- a/profiles/prefix/darwin/macos/10.6/x64/package.use.force
+++ b/profiles/prefix/darwin/macos/10.6/x64/package.use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
# compiles with -aqua, doesn't work, though
diff --git a/profiles/prefix/darwin/macos/10.6/x64/package.use.mask b/profiles/prefix/darwin/macos/10.6/x64/package.use.mask
index 6bc858049e42..1a1871bef0cb 100644
--- a/profiles/prefix/darwin/macos/10.6/x64/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.6/x64/package.use.mask
@@ -1,5 +1,4 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.6/x64/use.mask b/profiles/prefix/darwin/macos/10.6/x64/use.mask
index be1324205cb7..53d2772e64f1 100644
--- a/profiles/prefix/darwin/macos/10.6/x64/use.mask
+++ b/profiles/prefix/darwin/macos/10.6/x64/use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# This file masks out USE flags that are simply NOT allowed in the default
# x86 profile. This works, for example, if another architecture's
diff --git a/profiles/prefix/darwin/macos/10.6/x86/make.defaults b/profiles/prefix/darwin/macos/10.6/x86/make.defaults
index e9eb0bce4913..89da7dfebd35 100644
--- a/profiles/prefix/darwin/macos/10.6/x86/make.defaults
+++ b/profiles/prefix/darwin/macos/10.6/x86/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
CHOST="i686-apple-darwin10"
CHOST_x86="${CHOST}"
diff --git a/profiles/prefix/darwin/macos/10.6/x86/package.mask b/profiles/prefix/darwin/macos/10.6/x86/package.mask
index 4413ca2d3df3..2a5c2e63e2f4 100644
--- a/profiles/prefix/darwin/macos/10.6/x86/package.mask
+++ b/profiles/prefix/darwin/macos/10.6/x86/package.mask
@@ -1,4 +1,3 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.6/x86/package.use.force b/profiles/prefix/darwin/macos/10.6/x86/package.use.force
index 224ed0fc48b8..eb7f4d25673f 100644
--- a/profiles/prefix/darwin/macos/10.6/x86/package.use.force
+++ b/profiles/prefix/darwin/macos/10.6/x86/package.use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
# compiles with -aqua, doesn't work, though
diff --git a/profiles/prefix/darwin/macos/10.6/x86/package.use.mask b/profiles/prefix/darwin/macos/10.6/x86/package.use.mask
index 6bc858049e42..1a1871bef0cb 100644
--- a/profiles/prefix/darwin/macos/10.6/x86/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.6/x86/package.use.mask
@@ -1,5 +1,4 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.6/x86/use.mask b/profiles/prefix/darwin/macos/10.6/x86/use.mask
index a90a146582dc..67292fbd1c2e 100644
--- a/profiles/prefix/darwin/macos/10.6/x86/use.mask
+++ b/profiles/prefix/darwin/macos/10.6/x86/use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# This file masks out USE flags that are simply NOT allowed in the default
# x86 profile. This works, for example, if another architecture's
diff --git a/profiles/prefix/darwin/macos/10.7/make.defaults b/profiles/prefix/darwin/macos/10.7/make.defaults
index d49d1ad99682..09b93d3de3f2 100644
--- a/profiles/prefix/darwin/macos/10.7/make.defaults
+++ b/profiles/prefix/darwin/macos/10.7/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
MACOSX_DEPLOYMENT_TARGET="10.7"
diff --git a/profiles/prefix/darwin/macos/10.7/package.use.mask b/profiles/prefix/darwin/macos/10.7/package.use.mask
index c91450cfd0a4..61d76c7770fe 100644
--- a/profiles/prefix/darwin/macos/10.7/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.7/package.use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Fabian Groffen <grobian@gentoo.org> (10 Apr 2011)
# as long as util-linux installs uuid.h which breaks the system headers
diff --git a/profiles/prefix/darwin/macos/10.7/profile.bashrc b/profiles/prefix/darwin/macos/10.7/profile.bashrc
index 032824b59336..e335b82de74e 100644
--- a/profiles/prefix/darwin/macos/10.7/profile.bashrc
+++ b/profiles/prefix/darwin/macos/10.7/profile.bashrc
@@ -1,5 +1,4 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
export MACOSX_DEPLOYMENT_TARGET=10.7
diff --git a/profiles/prefix/darwin/macos/10.7/x64/make.defaults b/profiles/prefix/darwin/macos/10.7/x64/make.defaults
index ef1a45d2b4d7..e6c8b3450d4b 100644
--- a/profiles/prefix/darwin/macos/10.7/x64/make.defaults
+++ b/profiles/prefix/darwin/macos/10.7/x64/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
CHOST="x86_64-apple-darwin11"
CHOST_amd64="${CHOST}"
diff --git a/profiles/prefix/darwin/macos/10.7/x64/package.mask b/profiles/prefix/darwin/macos/10.7/x64/package.mask
index 9973a0f32ab4..c217bea65701 100644
--- a/profiles/prefix/darwin/macos/10.7/x64/package.mask
+++ b/profiles/prefix/darwin/macos/10.7/x64/package.mask
@@ -1,3 +1,2 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.7/x64/package.use.force b/profiles/prefix/darwin/macos/10.7/x64/package.use.force
index 22105b2beb01..3024cdfd84c2 100644
--- a/profiles/prefix/darwin/macos/10.7/x64/package.use.force
+++ b/profiles/prefix/darwin/macos/10.7/x64/package.use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
# compiles with -aqua, doesn't work, though
diff --git a/profiles/prefix/darwin/macos/10.7/x64/package.use.mask b/profiles/prefix/darwin/macos/10.7/x64/package.use.mask
index 6bc858049e42..1a1871bef0cb 100644
--- a/profiles/prefix/darwin/macos/10.7/x64/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.7/x64/package.use.mask
@@ -1,5 +1,4 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.7/x64/use.mask b/profiles/prefix/darwin/macos/10.7/x64/use.mask
index a90a146582dc..67292fbd1c2e 100644
--- a/profiles/prefix/darwin/macos/10.7/x64/use.mask
+++ b/profiles/prefix/darwin/macos/10.7/x64/use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# This file masks out USE flags that are simply NOT allowed in the default
# x86 profile. This works, for example, if another architecture's
diff --git a/profiles/prefix/darwin/macos/10.7/x86/make.defaults b/profiles/prefix/darwin/macos/10.7/x86/make.defaults
index dfffd8e7f895..c1d087fbd5e6 100644
--- a/profiles/prefix/darwin/macos/10.7/x86/make.defaults
+++ b/profiles/prefix/darwin/macos/10.7/x86/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
CHOST="i686-apple-darwin11"
CHOST_x86="${CHOST}"
diff --git a/profiles/prefix/darwin/macos/10.7/x86/package.mask b/profiles/prefix/darwin/macos/10.7/x86/package.mask
index 2c336012be28..6e7cf1fbfb04 100644
--- a/profiles/prefix/darwin/macos/10.7/x86/package.mask
+++ b/profiles/prefix/darwin/macos/10.7/x86/package.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# The Carbon interface has been removed entirely in Lion, only tk-8.6
# will come with Cocoa support. If you must have tk, you'll have to
diff --git a/profiles/prefix/darwin/macos/10.7/x86/package.use.force b/profiles/prefix/darwin/macos/10.7/x86/package.use.force
index 22105b2beb01..3024cdfd84c2 100644
--- a/profiles/prefix/darwin/macos/10.7/x86/package.use.force
+++ b/profiles/prefix/darwin/macos/10.7/x86/package.use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
# compiles with -aqua, doesn't work, though
diff --git a/profiles/prefix/darwin/macos/10.7/x86/package.use.mask b/profiles/prefix/darwin/macos/10.7/x86/package.use.mask
index 6bc858049e42..1a1871bef0cb 100644
--- a/profiles/prefix/darwin/macos/10.7/x86/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.7/x86/package.use.mask
@@ -1,5 +1,4 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.7/x86/use.mask b/profiles/prefix/darwin/macos/10.7/x86/use.mask
index a90a146582dc..67292fbd1c2e 100644
--- a/profiles/prefix/darwin/macos/10.7/x86/use.mask
+++ b/profiles/prefix/darwin/macos/10.7/x86/use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# This file masks out USE flags that are simply NOT allowed in the default
# x86 profile. This works, for example, if another architecture's
diff --git a/profiles/prefix/darwin/macos/10.8/make.defaults b/profiles/prefix/darwin/macos/10.8/make.defaults
index e0bcf6f9e68e..36cc9c2d39e6 100644
--- a/profiles/prefix/darwin/macos/10.8/make.defaults
+++ b/profiles/prefix/darwin/macos/10.8/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
MACOSX_DEPLOYMENT_TARGET="10.8"
diff --git a/profiles/prefix/darwin/macos/10.8/package.mask b/profiles/prefix/darwin/macos/10.8/package.mask
index 52aaa075f8f3..0d1a44f9d1f3 100644
--- a/profiles/prefix/darwin/macos/10.8/package.mask
+++ b/profiles/prefix/darwin/macos/10.8/package.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Fabian Groffen <grobian@gentoo.org> (30 Sep 2012)
# Requires XQuartz, since Apple dropped much of X-support in 10.8
diff --git a/profiles/prefix/darwin/macos/10.8/package.unmask b/profiles/prefix/darwin/macos/10.8/package.unmask
index 2dd27582b8a8..522ceb60c053 100644
--- a/profiles/prefix/darwin/macos/10.8/package.unmask
+++ b/profiles/prefix/darwin/macos/10.8/package.unmask
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# James Le Cuirot <chewi@gentoo.org> (29 Jul 2015)
# Recent releases are supported in 10.8.
diff --git a/profiles/prefix/darwin/macos/10.8/package.use.mask b/profiles/prefix/darwin/macos/10.8/package.use.mask
index 87e5c709ad17..5d32c2572ec9 100644
--- a/profiles/prefix/darwin/macos/10.8/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.8/package.use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Fabian Groffen <grobian@gentoo.org> (10 Apr 2011)
# as long as util-linux installs uuid.h which breaks the system headers
diff --git a/profiles/prefix/darwin/macos/10.8/profile.bashrc b/profiles/prefix/darwin/macos/10.8/profile.bashrc
index f4b7140c83fc..f9c6eec58bbd 100644
--- a/profiles/prefix/darwin/macos/10.8/profile.bashrc
+++ b/profiles/prefix/darwin/macos/10.8/profile.bashrc
@@ -1,5 +1,4 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
export MACOSX_DEPLOYMENT_TARGET=10.8
diff --git a/profiles/prefix/darwin/macos/10.8/x64/make.defaults b/profiles/prefix/darwin/macos/10.8/x64/make.defaults
index 59cce776f17d..1b8e40a7b3b6 100644
--- a/profiles/prefix/darwin/macos/10.8/x64/make.defaults
+++ b/profiles/prefix/darwin/macos/10.8/x64/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
CHOST="x86_64-apple-darwin12"
CHOST_amd64="${CHOST}"
diff --git a/profiles/prefix/darwin/macos/10.8/x64/package.mask b/profiles/prefix/darwin/macos/10.8/x64/package.mask
index fb619961e6db..633c704dafd1 100644
--- a/profiles/prefix/darwin/macos/10.8/x64/package.mask
+++ b/profiles/prefix/darwin/macos/10.8/x64/package.mask
@@ -1,3 +1,2 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.8/x64/package.use.force b/profiles/prefix/darwin/macos/10.8/x64/package.use.force
index e35f07f45593..8e66f5a37ccd 100644
--- a/profiles/prefix/darwin/macos/10.8/x64/package.use.force
+++ b/profiles/prefix/darwin/macos/10.8/x64/package.use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
# compiles with -aqua, doesn't work, though
diff --git a/profiles/prefix/darwin/macos/10.8/x64/package.use.mask b/profiles/prefix/darwin/macos/10.8/x64/package.use.mask
index ae43b989aafb..7e1e64983ebd 100644
--- a/profiles/prefix/darwin/macos/10.8/x64/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.8/x64/package.use.mask
@@ -1,5 +1,4 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.8/x64/use.mask b/profiles/prefix/darwin/macos/10.8/x64/use.mask
index a90a146582dc..67292fbd1c2e 100644
--- a/profiles/prefix/darwin/macos/10.8/x64/use.mask
+++ b/profiles/prefix/darwin/macos/10.8/x64/use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# This file masks out USE flags that are simply NOT allowed in the default
# x86 profile. This works, for example, if another architecture's
diff --git a/profiles/prefix/darwin/macos/10.8/x86/make.defaults b/profiles/prefix/darwin/macos/10.8/x86/make.defaults
index 3f8cf18d97e1..cda566d1f3c1 100644
--- a/profiles/prefix/darwin/macos/10.8/x86/make.defaults
+++ b/profiles/prefix/darwin/macos/10.8/x86/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
CHOST="i686-apple-darwin12"
CHOST_x86="${CHOST}"
diff --git a/profiles/prefix/darwin/macos/10.8/x86/package.mask b/profiles/prefix/darwin/macos/10.8/x86/package.mask
index 2c336012be28..6e7cf1fbfb04 100644
--- a/profiles/prefix/darwin/macos/10.8/x86/package.mask
+++ b/profiles/prefix/darwin/macos/10.8/x86/package.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# The Carbon interface has been removed entirely in Lion, only tk-8.6
# will come with Cocoa support. If you must have tk, you'll have to
diff --git a/profiles/prefix/darwin/macos/10.8/x86/package.use.force b/profiles/prefix/darwin/macos/10.8/x86/package.use.force
index e35f07f45593..8e66f5a37ccd 100644
--- a/profiles/prefix/darwin/macos/10.8/x86/package.use.force
+++ b/profiles/prefix/darwin/macos/10.8/x86/package.use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
# compiles with -aqua, doesn't work, though
diff --git a/profiles/prefix/darwin/macos/10.8/x86/package.use.mask b/profiles/prefix/darwin/macos/10.8/x86/package.use.mask
index ae43b989aafb..7e1e64983ebd 100644
--- a/profiles/prefix/darwin/macos/10.8/x86/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.8/x86/package.use.mask
@@ -1,5 +1,4 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.8/x86/use.mask b/profiles/prefix/darwin/macos/10.8/x86/use.mask
index a90a146582dc..67292fbd1c2e 100644
--- a/profiles/prefix/darwin/macos/10.8/x86/use.mask
+++ b/profiles/prefix/darwin/macos/10.8/x86/use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# This file masks out USE flags that are simply NOT allowed in the default
# x86 profile. This works, for example, if another architecture's
diff --git a/profiles/prefix/darwin/macos/10.9/make.defaults b/profiles/prefix/darwin/macos/10.9/make.defaults
index 5062be9ba30f..346de818f06b 100644
--- a/profiles/prefix/darwin/macos/10.9/make.defaults
+++ b/profiles/prefix/darwin/macos/10.9/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
MACOSX_DEPLOYMENT_TARGET="10.9"
diff --git a/profiles/prefix/darwin/macos/10.9/package.mask b/profiles/prefix/darwin/macos/10.9/package.mask
index db173a52d836..8669e34bc83e 100644
--- a/profiles/prefix/darwin/macos/10.9/package.mask
+++ b/profiles/prefix/darwin/macos/10.9/package.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Fabian Groffen <grobian@gentoo.org> (30 Sep 2012)
# Requires XQuartz, since Apple dropped much of X-support in 10.8
diff --git a/profiles/prefix/darwin/macos/10.9/package.unmask b/profiles/prefix/darwin/macos/10.9/package.unmask
index d2d608764648..728cd4f5190e 100644
--- a/profiles/prefix/darwin/macos/10.9/package.unmask
+++ b/profiles/prefix/darwin/macos/10.9/package.unmask
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# James Le Cuirot <chewi@gentoo.org> (29 Jul 2015)
# Recent releases are supported in 10.9.
diff --git a/profiles/prefix/darwin/macos/10.9/package.use.mask b/profiles/prefix/darwin/macos/10.9/package.use.mask
index 7f154936de40..fc77c22b7f25 100644
--- a/profiles/prefix/darwin/macos/10.9/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.9/package.use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Fabian Groffen <grobian@gentoo.org> (10 Apr 2011)
# as long as util-linux installs uuid.h which breaks the system headers
diff --git a/profiles/prefix/darwin/macos/10.9/profile.bashrc b/profiles/prefix/darwin/macos/10.9/profile.bashrc
index 06bf9111d387..8a0c588ed92d 100644
--- a/profiles/prefix/darwin/macos/10.9/profile.bashrc
+++ b/profiles/prefix/darwin/macos/10.9/profile.bashrc
@@ -1,5 +1,4 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
export MACOSX_DEPLOYMENT_TARGET=10.9
diff --git a/profiles/prefix/darwin/macos/10.9/x64/make.defaults b/profiles/prefix/darwin/macos/10.9/x64/make.defaults
index ad96e6c95501..def0ef7cdecf 100644
--- a/profiles/prefix/darwin/macos/10.9/x64/make.defaults
+++ b/profiles/prefix/darwin/macos/10.9/x64/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
CHOST="x86_64-apple-darwin13"
CHOST_amd64="${CHOST}"
diff --git a/profiles/prefix/darwin/macos/10.9/x64/package.mask b/profiles/prefix/darwin/macos/10.9/x64/package.mask
index 506a542c6493..17532723914b 100644
--- a/profiles/prefix/darwin/macos/10.9/x64/package.mask
+++ b/profiles/prefix/darwin/macos/10.9/x64/package.mask
@@ -1,3 +1,2 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.9/x64/package.use.force b/profiles/prefix/darwin/macos/10.9/x64/package.use.force
index 01103c99ea20..7d3ab2bb8526 100644
--- a/profiles/prefix/darwin/macos/10.9/x64/package.use.force
+++ b/profiles/prefix/darwin/macos/10.9/x64/package.use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
# compiles with -aqua, doesn't work, though
diff --git a/profiles/prefix/darwin/macos/10.9/x64/package.use.mask b/profiles/prefix/darwin/macos/10.9/x64/package.use.mask
index ae8748b01226..a47b5f8b1d1d 100644
--- a/profiles/prefix/darwin/macos/10.9/x64/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.9/x64/package.use.mask
@@ -1,5 +1,4 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.9/x64/use.mask b/profiles/prefix/darwin/macos/10.9/x64/use.mask
index a90a146582dc..67292fbd1c2e 100644
--- a/profiles/prefix/darwin/macos/10.9/x64/use.mask
+++ b/profiles/prefix/darwin/macos/10.9/x64/use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# This file masks out USE flags that are simply NOT allowed in the default
# x86 profile. This works, for example, if another architecture's
diff --git a/profiles/prefix/darwin/macos/10.9/x86/make.defaults b/profiles/prefix/darwin/macos/10.9/x86/make.defaults
index c0c8c538ac3b..e46679e23636 100644
--- a/profiles/prefix/darwin/macos/10.9/x86/make.defaults
+++ b/profiles/prefix/darwin/macos/10.9/x86/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
CHOST="i686-apple-darwin13"
CHOST_x86="${CHOST}"
diff --git a/profiles/prefix/darwin/macos/10.9/x86/package.mask b/profiles/prefix/darwin/macos/10.9/x86/package.mask
index 0a359aa40775..71da32f6e834 100644
--- a/profiles/prefix/darwin/macos/10.9/x86/package.mask
+++ b/profiles/prefix/darwin/macos/10.9/x86/package.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# The Carbon interface has been removed entirely in Lion, only tk-8.6
# will come with Cocoa support. If you must have tk, you'll have to
diff --git a/profiles/prefix/darwin/macos/10.9/x86/package.use.force b/profiles/prefix/darwin/macos/10.9/x86/package.use.force
index 01103c99ea20..7d3ab2bb8526 100644
--- a/profiles/prefix/darwin/macos/10.9/x86/package.use.force
+++ b/profiles/prefix/darwin/macos/10.9/x86/package.use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Elias Pipping <pipping@gentoo.org> (30 Sep 2007)
# compiles with -aqua, doesn't work, though
diff --git a/profiles/prefix/darwin/macos/10.9/x86/package.use.mask b/profiles/prefix/darwin/macos/10.9/x86/package.use.mask
index ae8748b01226..a47b5f8b1d1d 100644
--- a/profiles/prefix/darwin/macos/10.9/x86/package.use.mask
+++ b/profiles/prefix/darwin/macos/10.9/x86/package.use.mask
@@ -1,5 +1,4 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/darwin/macos/10.9/x86/use.mask b/profiles/prefix/darwin/macos/10.9/x86/use.mask
index a90a146582dc..67292fbd1c2e 100644
--- a/profiles/prefix/darwin/macos/10.9/x86/use.mask
+++ b/profiles/prefix/darwin/macos/10.9/x86/use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# This file masks out USE flags that are simply NOT allowed in the default
# x86 profile. This works, for example, if another architecture's
diff --git a/profiles/prefix/darwin/macos/arch/ppc/make.defaults b/profiles/prefix/darwin/macos/arch/ppc/make.defaults
index dec207ac7ee5..da7fa953c1fc 100644
--- a/profiles/prefix/darwin/macos/arch/ppc/make.defaults
+++ b/profiles/prefix/darwin/macos/arch/ppc/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
ARCH="ppc-macos"
ACCEPT_KEYWORDS="~ppc-macos"
diff --git a/profiles/prefix/darwin/macos/arch/ppc/package.mask b/profiles/prefix/darwin/macos/arch/ppc/package.mask
index c59605fea17e..55f215184f4b 100644
--- a/profiles/prefix/darwin/macos/arch/ppc/package.mask
+++ b/profiles/prefix/darwin/macos/arch/ppc/package.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# The 32-bits profile is inherited by the 64-bits one!
# All the Mac OS X profiles inherit from their matching arch profile here.
diff --git a/profiles/prefix/darwin/macos/arch/ppc/package.use.force b/profiles/prefix/darwin/macos/arch/ppc/package.use.force
index 35d9858cd54d..5b234c4e9499 100644
--- a/profiles/prefix/darwin/macos/arch/ppc/package.use.force
+++ b/profiles/prefix/darwin/macos/arch/ppc/package.use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Fabian Groffen <grobian@gentoo.org> (20 Dec 2016)
# Force the host target to avoid dependency hell
diff --git a/profiles/prefix/darwin/macos/arch/ppc/package.use.mask b/profiles/prefix/darwin/macos/arch/ppc/package.use.mask
index 29d709fd2208..8f009750a2ca 100644
--- a/profiles/prefix/darwin/macos/arch/ppc/package.use.mask
+++ b/profiles/prefix/darwin/macos/arch/ppc/package.use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# The 32-bits profile is inherited by the 64-bits one!
# All the Mac OS X profiles inherit from their matching arch profile here.
diff --git a/profiles/prefix/darwin/macos/arch/ppc/use.force b/profiles/prefix/darwin/macos/arch/ppc/use.force
index 63e95a321613..2df1dde89af6 100644
--- a/profiles/prefix/darwin/macos/arch/ppc/use.force
+++ b/profiles/prefix/darwin/macos/arch/ppc/use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Force the flag corresponding to the default ABI
ppc-macos
diff --git a/profiles/prefix/darwin/macos/arch/ppc/use.mask b/profiles/prefix/darwin/macos/arch/ppc/use.mask
index 2c96250473af..837168ea147f 100644
--- a/profiles/prefix/darwin/macos/arch/ppc/use.mask
+++ b/profiles/prefix/darwin/macos/arch/ppc/use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Unmask the flag corresponding to the default ABI
-ppc-macos
diff --git a/profiles/prefix/darwin/macos/arch/x64/make.defaults b/profiles/prefix/darwin/macos/arch/x64/make.defaults
index 31eb7bf38250..f03f6a88c4ff 100644
--- a/profiles/prefix/darwin/macos/arch/x64/make.defaults
+++ b/profiles/prefix/darwin/macos/arch/x64/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
ARCH="x64-macos"
ACCEPT_KEYWORDS="~x64-macos"
diff --git a/profiles/prefix/darwin/macos/arch/x64/package.mask b/profiles/prefix/darwin/macos/arch/x64/package.mask
index 13e1c33d100b..a1de0b1fec70 100644
--- a/profiles/prefix/darwin/macos/arch/x64/package.mask
+++ b/profiles/prefix/darwin/macos/arch/x64/package.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# The 32-bits profile is inherited by the 64-bits one!
# All the Mac OS X profiles inherit from their matching arch profile here.
diff --git a/profiles/prefix/darwin/macos/arch/x64/package.use.force b/profiles/prefix/darwin/macos/arch/x64/package.use.force
index 6339ecd7af59..84034d863e33 100644
--- a/profiles/prefix/darwin/macos/arch/x64/package.use.force
+++ b/profiles/prefix/darwin/macos/arch/x64/package.use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Fabian Groffen <grobian@gentoo.org> (20 Dec 2016)
# Force the host target to avoid dependency hell
diff --git a/profiles/prefix/darwin/macos/arch/x64/package.use.mask b/profiles/prefix/darwin/macos/arch/x64/package.use.mask
index c63cbaafc8ed..42c047050b54 100644
--- a/profiles/prefix/darwin/macos/arch/x64/package.use.mask
+++ b/profiles/prefix/darwin/macos/arch/x64/package.use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# The 32-bits profile is inherited by the 64-bits one!
# All the Mac OS X profiles inherit from their matching arch profile here.
diff --git a/profiles/prefix/darwin/macos/arch/x64/use.force b/profiles/prefix/darwin/macos/arch/x64/use.force
index b6d39471032a..7ffc124249d7 100644
--- a/profiles/prefix/darwin/macos/arch/x64/use.force
+++ b/profiles/prefix/darwin/macos/arch/x64/use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Force the flag corresponding to the default ABI
x64-macos
diff --git a/profiles/prefix/darwin/macos/arch/x64/use.mask b/profiles/prefix/darwin/macos/arch/x64/use.mask
index 9702d753cb16..01a9fae674b6 100644
--- a/profiles/prefix/darwin/macos/arch/x64/use.mask
+++ b/profiles/prefix/darwin/macos/arch/x64/use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Unmask the flag corresponding to the default ABI
-x64-macos
diff --git a/profiles/prefix/darwin/macos/arch/x86/make.defaults b/profiles/prefix/darwin/macos/arch/x86/make.defaults
index 2132de8d3542..8870f4ea4e4d 100644
--- a/profiles/prefix/darwin/macos/arch/x86/make.defaults
+++ b/profiles/prefix/darwin/macos/arch/x86/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
ARCH="x86-macos"
ACCEPT_KEYWORDS="~x86-macos"
diff --git a/profiles/prefix/darwin/macos/arch/x86/package.mask b/profiles/prefix/darwin/macos/arch/x86/package.mask
index aa09aa855118..216c87ab6373 100644
--- a/profiles/prefix/darwin/macos/arch/x86/package.mask
+++ b/profiles/prefix/darwin/macos/arch/x86/package.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# All the Mac OS X profiles inherit from their matching arch profile here.
diff --git a/profiles/prefix/darwin/macos/arch/x86/package.use.force b/profiles/prefix/darwin/macos/arch/x86/package.use.force
index 6339ecd7af59..84034d863e33 100644
--- a/profiles/prefix/darwin/macos/arch/x86/package.use.force
+++ b/profiles/prefix/darwin/macos/arch/x86/package.use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Fabian Groffen <grobian@gentoo.org> (20 Dec 2016)
# Force the host target to avoid dependency hell
diff --git a/profiles/prefix/darwin/macos/arch/x86/package.use.mask b/profiles/prefix/darwin/macos/arch/x86/package.use.mask
index bd9508023b14..0a0aaa598d36 100644
--- a/profiles/prefix/darwin/macos/arch/x86/package.use.mask
+++ b/profiles/prefix/darwin/macos/arch/x86/package.use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# All the Mac OS X profiles inherit from their matching arch profile here.
diff --git a/profiles/prefix/darwin/macos/arch/x86/use.force b/profiles/prefix/darwin/macos/arch/x86/use.force
index 8f00cb9e61bf..e5de807ddf57 100644
--- a/profiles/prefix/darwin/macos/arch/x86/use.force
+++ b/profiles/prefix/darwin/macos/arch/x86/use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Force the flag corresponding to the default ABI
x86-macos
diff --git a/profiles/prefix/darwin/macos/arch/x86/use.mask b/profiles/prefix/darwin/macos/arch/x86/use.mask
index 3ab486656a91..64aad1244f84 100644
--- a/profiles/prefix/darwin/macos/arch/x86/use.mask
+++ b/profiles/prefix/darwin/macos/arch/x86/use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Unmask the flag corresponding to the default ABI
-x86-macos
diff --git a/profiles/prefix/darwin/macos/make.defaults b/profiles/prefix/darwin/macos/make.defaults
index 8722483811f3..3c693127c433 100644
--- a/profiles/prefix/darwin/macos/make.defaults
+++ b/profiles/prefix/darwin/macos/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# on OSX one should have objc available
USE="objc objc++"
diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask
index 7c098302fc78..2adeb6a71837 100644
--- a/profiles/prefix/darwin/macos/package.mask
+++ b/profiles/prefix/darwin/macos/package.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# James Le Cuirot <chewi@gentoo.org> (29 Jul 2015)
# Recent Oracle releases only support recent Mac OS releases. We can't
diff --git a/profiles/prefix/darwin/macos/package.use.force b/profiles/prefix/darwin/macos/package.use.force
index c38e0d654ca0..24696d95b0f3 100644
--- a/profiles/prefix/darwin/macos/package.use.force
+++ b/profiles/prefix/darwin/macos/package.use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Fabian Groffen <grobian@gentoo.org> (31 May 2015)
# for clang ebuild to work, llvm must build the clang frontend
diff --git a/profiles/prefix/darwin/macos/package.use.mask b/profiles/prefix/darwin/macos/package.use.mask
index 530838c9ed27..cd0aa4ef5dba 100644
--- a/profiles/prefix/darwin/macos/package.use.mask
+++ b/profiles/prefix/darwin/macos/package.use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# James Le Cuirot <chewi@gentoo.org> (29 Jul 2015)
# JavaFX is included on Mac OS. I think a browser plugin is too but as
diff --git a/profiles/prefix/darwin/macos/packages b/profiles/prefix/darwin/macos/packages
index 3b7d6312095f..a16706c6fe74 100644
--- a/profiles/prefix/darwin/macos/packages
+++ b/profiles/prefix/darwin/macos/packages
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Mac OS X is built with LLVM/Clang
-*sys-devel/gcc
diff --git a/profiles/prefix/darwin/make.defaults b/profiles/prefix/darwin/make.defaults
index 375d47e7c2d3..57e1bb0fd545 100644
--- a/profiles/prefix/darwin/make.defaults
+++ b/profiles/prefix/darwin/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# System-wide defaults for all Darwin profiles
# This file should rarely need to be changed
diff --git a/profiles/prefix/darwin/package.mask b/profiles/prefix/darwin/package.mask
index 78077b3a9f38..06769c2d8395 100644
--- a/profiles/prefix/darwin/package.mask
+++ b/profiles/prefix/darwin/package.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Fabian Groffen <grobian@gentoo.org> (22 Feb 2017)
diff --git a/profiles/prefix/darwin/package.use.mask b/profiles/prefix/darwin/package.use.mask
index f25612b984b2..690a8d0e985a 100644
--- a/profiles/prefix/darwin/package.use.mask
+++ b/profiles/prefix/darwin/package.use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Fabian Groffen <grobian@gentoo.org> (06 Apr 2016)
diff --git a/profiles/prefix/darwin/packages b/profiles/prefix/darwin/packages
index e8faa818f9a4..29f325fcf2ee 100644
--- a/profiles/prefix/darwin/packages
+++ b/profiles/prefix/darwin/packages
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
*sys-apps/darwin-miscutils
*sys-devel/binutils-apple
diff --git a/profiles/prefix/darwin/use.force b/profiles/prefix/darwin/use.force
index b0f488eb923e..c318091c77bc 100644
--- a/profiles/prefix/darwin/use.force
+++ b/profiles/prefix/darwin/use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Re-add Darwin OS
kernel_Darwin
diff --git a/profiles/prefix/darwin/use.mask b/profiles/prefix/darwin/use.mask
index 6774305f8db5..8ba77145d248 100644
--- a/profiles/prefix/darwin/use.mask
+++ b/profiles/prefix/darwin/use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
#Add USE flags that don't work on Darwin/OpenDarwin/OS X here
diff --git a/profiles/prefix/linux-standalone/amd64/make.defaults b/profiles/prefix/linux-standalone/amd64/make.defaults
index fda0023e97dd..d0228073bb37 100644
--- a/profiles/prefix/linux-standalone/amd64/make.defaults
+++ b/profiles/prefix/linux-standalone/amd64/make.defaults
@@ -1,5 +1,4 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
ACCEPT_KEYWORDS="~${ARCH} ~${ARCH}-linux"
diff --git a/profiles/prefix/linux-standalone/arm/armv7a/make.defaults b/profiles/prefix/linux-standalone/arm/armv7a/make.defaults
index 1e50879a7eea..1e89fa034dc8 100644
--- a/profiles/prefix/linux-standalone/arm/armv7a/make.defaults
+++ b/profiles/prefix/linux-standalone/arm/armv7a/make.defaults
@@ -1,5 +1,4 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
ACCEPT_KEYWORDS="~${ARCH}"
diff --git a/profiles/prefix/linux-standalone/arm64/make.defaults b/profiles/prefix/linux-standalone/arm64/make.defaults
index 1e50879a7eea..1e89fa034dc8 100644
--- a/profiles/prefix/linux-standalone/arm64/make.defaults
+++ b/profiles/prefix/linux-standalone/arm64/make.defaults
@@ -1,5 +1,4 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
ACCEPT_KEYWORDS="~${ARCH}"
diff --git a/profiles/prefix/linux-standalone/make.defaults b/profiles/prefix/linux-standalone/make.defaults
index dd9cc123d9e2..20c32e1479f0 100644
--- a/profiles/prefix/linux-standalone/make.defaults
+++ b/profiles/prefix/linux-standalone/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# 'Sane' defaults
ELIBC="glibc"
diff --git a/profiles/prefix/linux-standalone/ppc64/make.defaults b/profiles/prefix/linux-standalone/ppc64/make.defaults
index 04e73caaa1d7..decd8d8b1eaf 100644
--- a/profiles/prefix/linux-standalone/ppc64/make.defaults
+++ b/profiles/prefix/linux-standalone/ppc64/make.defaults
@@ -1,5 +1,4 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
ACCEPT_KEYWORDS="~${ARCH}"
diff --git a/profiles/prefix/linux-standalone/x86/make.defaults b/profiles/prefix/linux-standalone/x86/make.defaults
index fda0023e97dd..d0228073bb37 100644
--- a/profiles/prefix/linux-standalone/x86/make.defaults
+++ b/profiles/prefix/linux-standalone/x86/make.defaults
@@ -1,5 +1,4 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
ACCEPT_KEYWORDS="~${ARCH} ~${ARCH}-linux"
diff --git a/profiles/prefix/linux/amd64/make.defaults b/profiles/prefix/linux/amd64/make.defaults
index 3905377560cd..3d476b628afd 100644
--- a/profiles/prefix/linux/amd64/make.defaults
+++ b/profiles/prefix/linux/amd64/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
#Note: this is Gentoo Prefix specific! (13 Jul 2008, darkside)
diff --git a/profiles/prefix/linux/arm/make.defaults b/profiles/prefix/linux/arm/make.defaults
index c59f26d4e7ce..33360a56b8f2 100644
--- a/profiles/prefix/linux/arm/make.defaults
+++ b/profiles/prefix/linux/arm/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
ARCH="arm"
# This is a pretty specific profile to the armv7 arch, we can change that later
diff --git a/profiles/prefix/linux/make.defaults b/profiles/prefix/linux/make.defaults
index 973e6f0c0757..ab544dd53ce0 100644
--- a/profiles/prefix/linux/make.defaults
+++ b/profiles/prefix/linux/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# 'Sane' defaults
ELIBC="glibc"
diff --git a/profiles/prefix/linux/package.mask b/profiles/prefix/linux/package.mask
index 506a542c6493..17532723914b 100644
--- a/profiles/prefix/linux/package.mask
+++ b/profiles/prefix/linux/package.mask
@@ -1,3 +1,2 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/linux/packages b/profiles/prefix/linux/packages
index 8434cbbb52f1..ffd4b62cff8e 100644
--- a/profiles/prefix/linux/packages
+++ b/profiles/prefix/linux/packages
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Here we remove packages that default/linux/packages pulls in and have no
# business being in Gentoo Prefix
diff --git a/profiles/prefix/linux/ppc64/make.defaults b/profiles/prefix/linux/ppc64/make.defaults
index 7d0674dc58cf..6be345d8d6b6 100644
--- a/profiles/prefix/linux/ppc64/make.defaults
+++ b/profiles/prefix/linux/ppc64/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
ARCH="ppc64"
CHOST="powerpc64-pc-linux-gnu"
diff --git a/profiles/prefix/linux/ppc64/packages b/profiles/prefix/linux/ppc64/packages
index 947902a7d720..491ae59c3c83 100644
--- a/profiles/prefix/linux/ppc64/packages
+++ b/profiles/prefix/linux/ppc64/packages
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Those are part of the base powerpc profile's @system set, but having them as
# part of @system makes no sense for Gentoo Prefix.
diff --git a/profiles/prefix/linux/use.mask b/profiles/prefix/linux/use.mask
index 669adbe5a338..03831a79a58d 100644
--- a/profiles/prefix/linux/use.mask
+++ b/profiles/prefix/linux/use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Michael Haubenwallner <haubi@gentoo.org> (19 Apr 2016)
# Unmask the linux-glibc combo, or we get bug#574822.
diff --git a/profiles/prefix/linux/x86/make.defaults b/profiles/prefix/linux/x86/make.defaults
index e7f0d8de7712..d64251b3f6bf 100644
--- a/profiles/prefix/linux/x86/make.defaults
+++ b/profiles/prefix/linux/x86/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
ARCH="x86"
CHOST="i686-pc-linux-gnu"
diff --git a/profiles/prefix/linux/x86/profile.bashrc b/profiles/prefix/linux/x86/profile.bashrc
index c8d0269c0409..5e3242d8ff41 100644
--- a/profiles/prefix/linux/x86/profile.bashrc
+++ b/profiles/prefix/linux/x86/profile.bashrc
@@ -1,5 +1,4 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Id$
# When x86-linux runs on an amd64 host having /lib32,
# we need to have binutils to search there too (#360197).
diff --git a/profiles/prefix/make.defaults b/profiles/prefix/make.defaults
index 32d8a4c30547..80957ae11ba6 100644
--- a/profiles/prefix/make.defaults
+++ b/profiles/prefix/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Some USE-flags that only die-hards don't want:
# readline: to have some sane command line editing, e.g. in python
diff --git a/profiles/prefix/mint/m68k/make.defaults b/profiles/prefix/mint/m68k/make.defaults
index fa793b05378c..326a928552ce 100644
--- a/profiles/prefix/mint/m68k/make.defaults
+++ b/profiles/prefix/mint/m68k/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
ARCH="m68k-mint"
CHOST="m68k-atari-mint"
diff --git a/profiles/prefix/mint/m68k/use.mask b/profiles/prefix/mint/m68k/use.mask
index 599a7fd3a440..ef162720aed2 100644
--- a/profiles/prefix/mint/m68k/use.mask
+++ b/profiles/prefix/mint/m68k/use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# dlopen() doesn't work in MiNT
dso
diff --git a/profiles/prefix/mint/make.defaults b/profiles/prefix/mint/make.defaults
index 603ec35e717f..89ce23bd9145 100644
--- a/profiles/prefix/mint/make.defaults
+++ b/profiles/prefix/mint/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# System-wide defaults for all MiNT profiles
# This file should rarely need to be changed
diff --git a/profiles/prefix/mint/package.use.force b/profiles/prefix/mint/package.use.force
index d175aa7e0fda..b4313ba599ca 100644
--- a/profiles/prefix/mint/package.use.force
+++ b/profiles/prefix/mint/package.use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Michael Haubenwallner <haubi@gentoo.org> (18 Apr 2016)
# adjust MiNT specifics via USE flags
diff --git a/profiles/prefix/mint/package.use.mask b/profiles/prefix/mint/package.use.mask
index f06f28ced27e..d0abe37cb88f 100644
--- a/profiles/prefix/mint/package.use.mask
+++ b/profiles/prefix/mint/package.use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Alan Hourihane <alanh@fairlite.co.uk> (11 Mar 2014)
# plays havoc with GNU pth bug #503764
diff --git a/profiles/prefix/mint/packages b/profiles/prefix/mint/packages
index 679d62201c38..1654df5ca8b0 100644
--- a/profiles/prefix/mint/packages
+++ b/profiles/prefix/mint/packages
@@ -1,5 +1,4 @@
# Copyright 1999-2009 Gentoo Foundation.
# Distributed under the terms of the GNU General Public License v2
-# $Id$
*sys-devel/binutils
diff --git a/profiles/prefix/mint/use.mask b/profiles/prefix/mint/use.mask
index 522d9d27a7fa..672a528372d9 100644
--- a/profiles/prefix/mint/use.mask
+++ b/profiles/prefix/mint/use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Re-add MiNT libc
-elibc_mintlib
diff --git a/profiles/prefix/package.mask b/profiles/prefix/package.mask
index e65a9c357c86..126c3bcdde49 100644
--- a/profiles/prefix/package.mask
+++ b/profiles/prefix/package.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
#
# When you add an entry to the top of this file, add your name, the date, and
# an explanation of why something is getting masked. This file is for
diff --git a/profiles/prefix/package.use.mask b/profiles/prefix/package.use.mask
index c0a52798fe3d..8e1561c8f9ce 100644
--- a/profiles/prefix/package.use.mask
+++ b/profiles/prefix/package.use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Fabian Groffen <grobian@gentoo.org> (27 Jun 2016)
# sys-libs/libseccomp is a linux interface, not sure if it will work
diff --git a/profiles/prefix/packages b/profiles/prefix/packages
index ea972ca9374e..5bf242d44567 100644
--- a/profiles/prefix/packages
+++ b/profiles/prefix/packages
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# we don't want binutils everywhere, only in linux and solaris
-*sys-devel/binutils
diff --git a/profiles/prefix/sunos/make.defaults b/profiles/prefix/sunos/make.defaults
index 78c742b5b6cf..3d5076651913 100644
--- a/profiles/prefix/sunos/make.defaults
+++ b/profiles/prefix/sunos/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# System-wide defaults for all SunOS profiles
# This file should rarely need to be changed
diff --git a/profiles/prefix/sunos/packages b/profiles/prefix/sunos/packages
index 8f7809e1bcc7..869d80c4ff0f 100644
--- a/profiles/prefix/sunos/packages
+++ b/profiles/prefix/sunos/packages
@@ -1,5 +1,4 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
*sys-devel/binutils
diff --git a/profiles/prefix/sunos/solaris/5.10/package.mask b/profiles/prefix/sunos/solaris/5.10/package.mask
index 815fec895a62..3e3cc3434f46 100644
--- a/profiles/prefix/sunos/solaris/5.10/package.mask
+++ b/profiles/prefix/sunos/solaris/5.10/package.mask
@@ -1,4 +1,3 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc/make.defaults b/profiles/prefix/sunos/solaris/5.10/sparc/make.defaults
index 5337c8e32d59..9557d14f8d44 100644
--- a/profiles/prefix/sunos/solaris/5.10/sparc/make.defaults
+++ b/profiles/prefix/sunos/solaris/5.10/sparc/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
ARCH="sparc-solaris"
CHOST="sparc-sun-solaris2.10"
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc/package.mask b/profiles/prefix/sunos/solaris/5.10/sparc/package.mask
index 6bc858049e42..1a1871bef0cb 100644
--- a/profiles/prefix/sunos/solaris/5.10/sparc/package.mask
+++ b/profiles/prefix/sunos/solaris/5.10/sparc/package.mask
@@ -1,5 +1,4 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc/package.use.mask b/profiles/prefix/sunos/solaris/5.10/sparc/package.use.mask
index e2d57612705d..f7ac4607b395 100644
--- a/profiles/prefix/sunos/solaris/5.10/sparc/package.use.mask
+++ b/profiles/prefix/sunos/solaris/5.10/sparc/package.use.mask
@@ -1,4 +1,3 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc64/make.defaults b/profiles/prefix/sunos/solaris/5.10/sparc64/make.defaults
index 1e54d5f7ed8d..cf284c55f436 100644
--- a/profiles/prefix/sunos/solaris/5.10/sparc64/make.defaults
+++ b/profiles/prefix/sunos/solaris/5.10/sparc64/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
ARCH="sparc64-solaris"
CHOST="sparcv9-sun-solaris2.10"
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc64/package.mask b/profiles/prefix/sunos/solaris/5.10/sparc64/package.mask
index 6bc858049e42..1a1871bef0cb 100644
--- a/profiles/prefix/sunos/solaris/5.10/sparc64/package.mask
+++ b/profiles/prefix/sunos/solaris/5.10/sparc64/package.mask
@@ -1,5 +1,4 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/sunos/solaris/5.10/sparc64/package.use.mask b/profiles/prefix/sunos/solaris/5.10/sparc64/package.use.mask
index e2d57612705d..f7ac4607b395 100644
--- a/profiles/prefix/sunos/solaris/5.10/sparc64/package.use.mask
+++ b/profiles/prefix/sunos/solaris/5.10/sparc64/package.use.mask
@@ -1,4 +1,3 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/sunos/solaris/5.10/x64/make.defaults b/profiles/prefix/sunos/solaris/5.10/x64/make.defaults
index 8fd6dd3bf1ce..78dfad702e41 100644
--- a/profiles/prefix/sunos/solaris/5.10/x64/make.defaults
+++ b/profiles/prefix/sunos/solaris/5.10/x64/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
ARCH="x64-solaris"
CHOST="x86_64-pc-solaris2.10"
diff --git a/profiles/prefix/sunos/solaris/5.10/x64/package.mask b/profiles/prefix/sunos/solaris/5.10/x64/package.mask
index 4645c5d42c61..0cc0ba14627f 100644
--- a/profiles/prefix/sunos/solaris/5.10/x64/package.mask
+++ b/profiles/prefix/sunos/solaris/5.10/x64/package.mask
@@ -1,3 +1,2 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/sunos/solaris/5.10/x64/package.use.mask b/profiles/prefix/sunos/solaris/5.10/x64/package.use.mask
index c1124fd8280e..bddf5edb63e4 100644
--- a/profiles/prefix/sunos/solaris/5.10/x64/package.use.mask
+++ b/profiles/prefix/sunos/solaris/5.10/x64/package.use.mask
@@ -1,5 +1,4 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/sunos/solaris/5.10/x86/make.defaults b/profiles/prefix/sunos/solaris/5.10/x86/make.defaults
index f311d2bc1f27..43ada07c78a7 100644
--- a/profiles/prefix/sunos/solaris/5.10/x86/make.defaults
+++ b/profiles/prefix/sunos/solaris/5.10/x86/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
ARCH="x86-solaris"
CHOST="i386-pc-solaris2.10"
diff --git a/profiles/prefix/sunos/solaris/5.11/package.use.mask b/profiles/prefix/sunos/solaris/5.11/package.use.mask
index 3e59ebe16f97..475bf85e8d67 100644
--- a/profiles/prefix/sunos/solaris/5.11/package.use.mask
+++ b/profiles/prefix/sunos/solaris/5.11/package.use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Fabian Groffen <grobian@gentoo.org> (30 Mar 2011)
diff --git a/profiles/prefix/sunos/solaris/5.11/packages b/profiles/prefix/sunos/solaris/5.11/packages
index f83f5d36431a..6745479f9f8e 100644
--- a/profiles/prefix/sunos/solaris/5.11/packages
+++ b/profiles/prefix/sunos/solaris/5.11/packages
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Host provided libuuid.so links against libpool.so, which in turn links
# against libxml2.so. In the latter it looks for SUNW@ symbols which
diff --git a/profiles/prefix/sunos/solaris/5.11/sparc/make.defaults b/profiles/prefix/sunos/solaris/5.11/sparc/make.defaults
index ac4127669fc3..3812f55e1242 100644
--- a/profiles/prefix/sunos/solaris/5.11/sparc/make.defaults
+++ b/profiles/prefix/sunos/solaris/5.11/sparc/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
ARCH="sparc-solaris"
CHOST="sparc-sun-solaris2.11"
diff --git a/profiles/prefix/sunos/solaris/5.11/sparc/package.mask b/profiles/prefix/sunos/solaris/5.11/sparc/package.mask
index 6bc858049e42..1a1871bef0cb 100644
--- a/profiles/prefix/sunos/solaris/5.11/sparc/package.mask
+++ b/profiles/prefix/sunos/solaris/5.11/sparc/package.mask
@@ -1,5 +1,4 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/sunos/solaris/5.11/sparc/package.use.mask b/profiles/prefix/sunos/solaris/5.11/sparc/package.use.mask
index e2d57612705d..f7ac4607b395 100644
--- a/profiles/prefix/sunos/solaris/5.11/sparc/package.use.mask
+++ b/profiles/prefix/sunos/solaris/5.11/sparc/package.use.mask
@@ -1,4 +1,3 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/sunos/solaris/5.11/sparc64/make.defaults b/profiles/prefix/sunos/solaris/5.11/sparc64/make.defaults
index 61a734e0caa4..8b0a6c090f15 100644
--- a/profiles/prefix/sunos/solaris/5.11/sparc64/make.defaults
+++ b/profiles/prefix/sunos/solaris/5.11/sparc64/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
ARCH="sparc64-solaris"
CHOST="sparcv9-sun-solaris2.11"
diff --git a/profiles/prefix/sunos/solaris/5.11/sparc64/package.mask b/profiles/prefix/sunos/solaris/5.11/sparc64/package.mask
index 6bc858049e42..1a1871bef0cb 100644
--- a/profiles/prefix/sunos/solaris/5.11/sparc64/package.mask
+++ b/profiles/prefix/sunos/solaris/5.11/sparc64/package.mask
@@ -1,5 +1,4 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/sunos/solaris/5.11/sparc64/package.use.mask b/profiles/prefix/sunos/solaris/5.11/sparc64/package.use.mask
index e2d57612705d..f7ac4607b395 100644
--- a/profiles/prefix/sunos/solaris/5.11/sparc64/package.use.mask
+++ b/profiles/prefix/sunos/solaris/5.11/sparc64/package.use.mask
@@ -1,4 +1,3 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/sunos/solaris/5.11/x64/make.defaults b/profiles/prefix/sunos/solaris/5.11/x64/make.defaults
index 15abaa39b4b8..01ec27d83eae 100644
--- a/profiles/prefix/sunos/solaris/5.11/x64/make.defaults
+++ b/profiles/prefix/sunos/solaris/5.11/x64/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
ARCH="x64-solaris"
CHOST="x86_64-pc-solaris2.11"
diff --git a/profiles/prefix/sunos/solaris/5.11/x64/package.use.mask b/profiles/prefix/sunos/solaris/5.11/x64/package.use.mask
index c1124fd8280e..bddf5edb63e4 100644
--- a/profiles/prefix/sunos/solaris/5.11/x64/package.use.mask
+++ b/profiles/prefix/sunos/solaris/5.11/x64/package.use.mask
@@ -1,5 +1,4 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/sunos/solaris/5.11/x86/make.defaults b/profiles/prefix/sunos/solaris/5.11/x86/make.defaults
index ee88cdf489b8..e9071fa2391d 100644
--- a/profiles/prefix/sunos/solaris/5.11/x86/make.defaults
+++ b/profiles/prefix/sunos/solaris/5.11/x86/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
ARCH="x86-solaris"
CHOST="i386-pc-solaris2.11"
diff --git a/profiles/prefix/sunos/solaris/5.11/x86/package.use.mask b/profiles/prefix/sunos/solaris/5.11/x86/package.use.mask
index e2d57612705d..f7ac4607b395 100644
--- a/profiles/prefix/sunos/solaris/5.11/x86/package.use.mask
+++ b/profiles/prefix/sunos/solaris/5.11/x86/package.use.mask
@@ -1,4 +1,3 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/sunos/solaris/5.9/package.mask b/profiles/prefix/sunos/solaris/5.9/package.mask
index e7c2db43a698..ef497cea65e1 100644
--- a/profiles/prefix/sunos/solaris/5.9/package.mask
+++ b/profiles/prefix/sunos/solaris/5.9/package.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Jeremy Olexa <darkside@gentoo.org> (26 Aug 2008)
diff --git a/profiles/prefix/sunos/solaris/5.9/package.use.mask b/profiles/prefix/sunos/solaris/5.9/package.use.mask
index 86de9f39e844..149d54951df3 100644
--- a/profiles/prefix/sunos/solaris/5.9/package.use.mask
+++ b/profiles/prefix/sunos/solaris/5.9/package.use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Fabian Groffen <grobian@gentoo.org> (16 Nov 2011)
# jit not supported on sparc
diff --git a/profiles/prefix/sunos/solaris/5.9/sparc/make.defaults b/profiles/prefix/sunos/solaris/5.9/sparc/make.defaults
index 45a62771ecb5..670f50b71e18 100644
--- a/profiles/prefix/sunos/solaris/5.9/sparc/make.defaults
+++ b/profiles/prefix/sunos/solaris/5.9/sparc/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
ARCH="sparc-solaris"
CHOST="sparc-sun-solaris2.9"
diff --git a/profiles/prefix/sunos/solaris/5.9/sparc/package.mask b/profiles/prefix/sunos/solaris/5.9/sparc/package.mask
index 6bc858049e42..1a1871bef0cb 100644
--- a/profiles/prefix/sunos/solaris/5.9/sparc/package.mask
+++ b/profiles/prefix/sunos/solaris/5.9/sparc/package.mask
@@ -1,5 +1,4 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/profiles/prefix/sunos/solaris/arch/sparc/package.mask b/profiles/prefix/sunos/solaris/arch/sparc/package.mask
index a506c54162ab..677bc3ba12eb 100644
--- a/profiles/prefix/sunos/solaris/arch/sparc/package.mask
+++ b/profiles/prefix/sunos/solaris/arch/sparc/package.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# All the Solaris profiles inherit from their matching arch profile here.
diff --git a/profiles/prefix/sunos/solaris/arch/sparc/package.use.mask b/profiles/prefix/sunos/solaris/arch/sparc/package.use.mask
index 0b14f3ae43f6..64d9694254be 100644
--- a/profiles/prefix/sunos/solaris/arch/sparc/package.use.mask
+++ b/profiles/prefix/sunos/solaris/arch/sparc/package.use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# All the Solaris profiles inherit from their matching arch profile here.
diff --git a/profiles/prefix/sunos/solaris/arch/sparc64/package.mask b/profiles/prefix/sunos/solaris/arch/sparc64/package.mask
index a506c54162ab..677bc3ba12eb 100644
--- a/profiles/prefix/sunos/solaris/arch/sparc64/package.mask
+++ b/profiles/prefix/sunos/solaris/arch/sparc64/package.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# All the Solaris profiles inherit from their matching arch profile here.
diff --git a/profiles/prefix/sunos/solaris/arch/sparc64/package.use.mask b/profiles/prefix/sunos/solaris/arch/sparc64/package.use.mask
index b3b8eff90777..3772a96cb28d 100644
--- a/profiles/prefix/sunos/solaris/arch/sparc64/package.use.mask
+++ b/profiles/prefix/sunos/solaris/arch/sparc64/package.use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# All the Solaris profiles inherit from their matching arch profile here.
diff --git a/profiles/prefix/sunos/solaris/arch/x64/make.defaults b/profiles/prefix/sunos/solaris/arch/x64/make.defaults
index aff95e51d922..498848f27c8b 100644
--- a/profiles/prefix/sunos/solaris/arch/x64/make.defaults
+++ b/profiles/prefix/sunos/solaris/arch/x64/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# multilib build stuff, single ABI (no multilib)
MULTILIB_ABIS="amd64"
diff --git a/profiles/prefix/sunos/solaris/arch/x64/package.mask b/profiles/prefix/sunos/solaris/arch/x64/package.mask
index b8f10835cd7b..2e6559ed0a84 100644
--- a/profiles/prefix/sunos/solaris/arch/x64/package.mask
+++ b/profiles/prefix/sunos/solaris/arch/x64/package.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# All the Solaris profiles inherit from their matching arch profile here.
diff --git a/profiles/prefix/sunos/solaris/arch/x64/package.use.mask b/profiles/prefix/sunos/solaris/arch/x64/package.use.mask
index b8f10835cd7b..2e6559ed0a84 100644
--- a/profiles/prefix/sunos/solaris/arch/x64/package.use.mask
+++ b/profiles/prefix/sunos/solaris/arch/x64/package.use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# All the Solaris profiles inherit from their matching arch profile here.
diff --git a/profiles/prefix/sunos/solaris/arch/x64/use.force b/profiles/prefix/sunos/solaris/arch/x64/use.force
index 155d4f924982..49c67c88a3c5 100644
--- a/profiles/prefix/sunos/solaris/arch/x64/use.force
+++ b/profiles/prefix/sunos/solaris/arch/x64/use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Force the flag corresponding to the default ABI
x64-solaris
diff --git a/profiles/prefix/sunos/solaris/arch/x64/use.mask b/profiles/prefix/sunos/solaris/arch/x64/use.mask
index fe804032c0f2..67ec5433a5bf 100644
--- a/profiles/prefix/sunos/solaris/arch/x64/use.mask
+++ b/profiles/prefix/sunos/solaris/arch/x64/use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Unmask the flag corresponding to the default ABI
-x64-solaris
diff --git a/profiles/prefix/sunos/solaris/arch/x86/make.defaults b/profiles/prefix/sunos/solaris/arch/x86/make.defaults
index 4e6b922ab1b8..c1bc34823d71 100644
--- a/profiles/prefix/sunos/solaris/arch/x86/make.defaults
+++ b/profiles/prefix/sunos/solaris/arch/x86/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# multilib build stuff, single ABI (no multilib)
MULTILIB_ABIS="x86"
diff --git a/profiles/prefix/sunos/solaris/arch/x86/package.mask b/profiles/prefix/sunos/solaris/arch/x86/package.mask
index b8f10835cd7b..2e6559ed0a84 100644
--- a/profiles/prefix/sunos/solaris/arch/x86/package.mask
+++ b/profiles/prefix/sunos/solaris/arch/x86/package.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# All the Solaris profiles inherit from their matching arch profile here.
diff --git a/profiles/prefix/sunos/solaris/arch/x86/package.use.mask b/profiles/prefix/sunos/solaris/arch/x86/package.use.mask
index b8f10835cd7b..2e6559ed0a84 100644
--- a/profiles/prefix/sunos/solaris/arch/x86/package.use.mask
+++ b/profiles/prefix/sunos/solaris/arch/x86/package.use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# All the Solaris profiles inherit from their matching arch profile here.
diff --git a/profiles/prefix/sunos/solaris/arch/x86/use.force b/profiles/prefix/sunos/solaris/arch/x86/use.force
index a9f3cc610623..969a2583d914 100644
--- a/profiles/prefix/sunos/solaris/arch/x86/use.force
+++ b/profiles/prefix/sunos/solaris/arch/x86/use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Force the flag corresponding to the default ABI
x86-solaris
diff --git a/profiles/prefix/sunos/solaris/arch/x86/use.mask b/profiles/prefix/sunos/solaris/arch/x86/use.mask
index e680de7bfb6b..3e3c06d9db15 100644
--- a/profiles/prefix/sunos/solaris/arch/x86/use.mask
+++ b/profiles/prefix/sunos/solaris/arch/x86/use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Unmask the flag corresponding to the default ABI
-x86-solaris
diff --git a/profiles/prefix/sunos/solaris/make.defaults b/profiles/prefix/sunos/solaris/make.defaults
index 01db3b4e40a2..f1fcb723dd25 100644
--- a/profiles/prefix/sunos/solaris/make.defaults
+++ b/profiles/prefix/sunos/solaris/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Solaris comes with ipv6 support since Solaris 7, full ipv6 integration
# since Solaris 8. Let's enjoy that we have it.
diff --git a/profiles/prefix/sunos/solaris/package.mask b/profiles/prefix/sunos/solaris/package.mask
index 75ce08de3d92..b295d9aaf575 100644
--- a/profiles/prefix/sunos/solaris/package.mask
+++ b/profiles/prefix/sunos/solaris/package.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Fabian Groffen <grobian@gentoo.org> (22 Feb 2017)
diff --git a/profiles/prefix/sunos/solaris/package.use.force b/profiles/prefix/sunos/solaris/package.use.force
index fbe5f16446a6..ae3b08d0d6aa 100644
--- a/profiles/prefix/sunos/solaris/package.use.force
+++ b/profiles/prefix/sunos/solaris/package.use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Fabian Groffen <grobian@gentoo.org> (08 Dec 2011)
# Force libssp, Solaris' libc doesn't have stack protection symbols,
diff --git a/profiles/prefix/sunos/solaris/package.use.mask b/profiles/prefix/sunos/solaris/package.use.mask
index 593f52faef51..711d0c37502e 100644
--- a/profiles/prefix/sunos/solaris/package.use.mask
+++ b/profiles/prefix/sunos/solaris/package.use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Fabian Groffen <grobian@gentoo.org> (06 Apr 2016)
diff --git a/profiles/prefix/sunos/solaris/profile.bashrc b/profiles/prefix/sunos/solaris/profile.bashrc
index 206ebca70e9d..b6e65dcde052 100644
--- a/profiles/prefix/sunos/solaris/profile.bashrc
+++ b/profiles/prefix/sunos/solaris/profile.bashrc
@@ -1,5 +1,4 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Id$
# Automatically determine whether or not gen_usr_ldscript should be
# doing something or not. This is necessary due to previous screwups,
diff --git a/profiles/prefix/sunos/use.force b/profiles/prefix/sunos/use.force
index c1972e931c00..822c25ac5f7a 100644
--- a/profiles/prefix/sunos/use.force
+++ b/profiles/prefix/sunos/use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Re-add Solaris OS
kernel_SunOS
diff --git a/profiles/prefix/sunos/use.mask b/profiles/prefix/sunos/use.mask
index 43f493edf856..9d6ae2553211 100644
--- a/profiles/prefix/sunos/use.mask
+++ b/profiles/prefix/sunos/use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Re-add SunOS libc
-elibc_SunOS
diff --git a/profiles/prefix/use.force b/profiles/prefix/use.force
index a10281ddd426..b772df154580 100644
--- a/profiles/prefix/use.force
+++ b/profiles/prefix/use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# unforce the GNU/Linux ELIBC, KERNEL, and USERLAND
# flags that come from the base profile
diff --git a/profiles/prefix/use.mask b/profiles/prefix/use.mask
index 89664a8e314e..58031ae9505f 100644
--- a/profiles/prefix/use.mask
+++ b/profiles/prefix/use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Mask all glibc/linux combination, unmasked in the appropriate profiles
elibc_glibc
diff --git a/profiles/prefix/use.stable.mask b/profiles/prefix/use.stable.mask
index 2d6679d795e6..6a2768f662a2 100644
--- a/profiles/prefix/use.stable.mask
+++ b/profiles/prefix/use.stable.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Re-enable python-3.5, we are fully ~arch, so avoid problems with
# Portage like bug #572502
diff --git a/profiles/prefix/windows/cygwin/make.defaults b/profiles/prefix/windows/cygwin/make.defaults
index 84d8fc3c7518..d7ba076a8812 100644
--- a/profiles/prefix/windows/cygwin/make.defaults
+++ b/profiles/prefix/windows/cygwin/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# System-wide defaults for all Cygwin profiles
# This file should rarely need to be changed
diff --git a/profiles/prefix/windows/cygwin/package.mask b/profiles/prefix/windows/cygwin/package.mask
index 1a709f66690c..b44aec6face1 100644
--- a/profiles/prefix/windows/cygwin/package.mask
+++ b/profiles/prefix/windows/cygwin/package.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Michael Haubenwallner <haubi@gentoo.org> (20 May 2016)
# Does not work with Cygwin.
diff --git a/profiles/prefix/windows/cygwin/package.use b/profiles/prefix/windows/cygwin/package.use
index d701f36dfe00..1681aa34eee5 100644
--- a/profiles/prefix/windows/cygwin/package.use
+++ b/profiles/prefix/windows/cygwin/package.use
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Michael Haubenwallner <haubi@gentoo.org> (18 Apr 2016)
# Cygwin coreutils provide kill as gkill
diff --git a/profiles/prefix/windows/cygwin/packages b/profiles/prefix/windows/cygwin/packages
index 8f7809e1bcc7..869d80c4ff0f 100644
--- a/profiles/prefix/windows/cygwin/packages
+++ b/profiles/prefix/windows/cygwin/packages
@@ -1,5 +1,4 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
*sys-devel/binutils
diff --git a/profiles/prefix/windows/cygwin/use.force b/profiles/prefix/windows/cygwin/use.force
index b1832a5eb6b2..e5b3845e4e0f 100644
--- a/profiles/prefix/windows/cygwin/use.force
+++ b/profiles/prefix/windows/cygwin/use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Re-add Cygwin's libc
elibc_Cygwin
diff --git a/profiles/prefix/windows/cygwin/use.mask b/profiles/prefix/windows/cygwin/use.mask
index 0fcf5e644a71..a953069a8059 100644
--- a/profiles/prefix/windows/cygwin/use.mask
+++ b/profiles/prefix/windows/cygwin/use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Re-add Cygwin's libc
-elibc_Cygwin
diff --git a/profiles/prefix/windows/cygwin/x64/make.defaults b/profiles/prefix/windows/cygwin/x64/make.defaults
index a018bd9f764e..118f797c4e3f 100644
--- a/profiles/prefix/windows/cygwin/x64/make.defaults
+++ b/profiles/prefix/windows/cygwin/x64/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
ARCH="x64-cygwin"
CHOST="x86_64-pc-cygwin"
diff --git a/profiles/prefix/windows/cygwin/x86/make.defaults b/profiles/prefix/windows/cygwin/x86/make.defaults
index 59a035b7402a..1b849ae1b953 100644
--- a/profiles/prefix/windows/cygwin/x86/make.defaults
+++ b/profiles/prefix/windows/cygwin/x86/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
ARCH="x86-cygwin"
CHOST="i686-pc-cygwin"
diff --git a/profiles/prefix/windows/package.mask b/profiles/prefix/windows/package.mask
index fb9cc6696fe2..d83ee31002e4 100644
--- a/profiles/prefix/windows/package.mask
+++ b/profiles/prefix/windows/package.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Michael Haubenwallner <haubi@gentoo.org> (19 May 2016)
# No point for util-linux on Windows
diff --git a/profiles/prefix/windows/use.force b/profiles/prefix/windows/use.force
index c6bc648273d7..6dfa2704237a 100644
--- a/profiles/prefix/windows/use.force
+++ b/profiles/prefix/windows/use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Re-add Windows kernel
kernel_Winnt
diff --git a/profiles/prefix/windows/use.mask b/profiles/prefix/windows/use.mask
index 78e4807fe677..3c4d7d24fc95 100644
--- a/profiles/prefix/windows/use.mask
+++ b/profiles/prefix/windows/use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Re-add Windows kernel
-kernel_Winnt
diff --git a/profiles/prefix/windows/winnt/3.5/x86/make.defaults b/profiles/prefix/windows/winnt/3.5/x86/make.defaults
index fa0e46ca55df..21cc6becd407 100644
--- a/profiles/prefix/windows/winnt/3.5/x86/make.defaults
+++ b/profiles/prefix/windows/winnt/3.5/x86/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
ARCH="x86-winnt"
CHOST="i586-pc-winnt3.5"
diff --git a/profiles/prefix/windows/winnt/5.2/x86/make.defaults b/profiles/prefix/windows/winnt/5.2/x86/make.defaults
index 92163f9c98a1..6196da2d7a5c 100644
--- a/profiles/prefix/windows/winnt/5.2/x86/make.defaults
+++ b/profiles/prefix/windows/winnt/5.2/x86/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
ARCH="x86-winnt"
CHOST="i586-pc-winnt5.2"
diff --git a/profiles/prefix/windows/winnt/6.0/x86/make.defaults b/profiles/prefix/windows/winnt/6.0/x86/make.defaults
index 6dae2c2f4440..c28e21320203 100644
--- a/profiles/prefix/windows/winnt/6.0/x86/make.defaults
+++ b/profiles/prefix/windows/winnt/6.0/x86/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
ARCH="x86-winnt"
CHOST="i586-pc-winnt6.0"
diff --git a/profiles/prefix/windows/winnt/6.1/x86/make.defaults b/profiles/prefix/windows/winnt/6.1/x86/make.defaults
index 9bd5ffc0c08d..9dcc06845d96 100644
--- a/profiles/prefix/windows/winnt/6.1/x86/make.defaults
+++ b/profiles/prefix/windows/winnt/6.1/x86/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
ARCH="x86-winnt"
CHOST="i586-pc-winnt6.1"
diff --git a/profiles/prefix/windows/winnt/make.defaults b/profiles/prefix/windows/winnt/make.defaults
index 53510f55b0d5..bd1924d2c0ef 100644
--- a/profiles/prefix/windows/winnt/make.defaults
+++ b/profiles/prefix/windows/winnt/make.defaults
@@ -1,6 +1,5 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# System-wide defaults for all Windows profiles
# This file should rarely need to be changed
diff --git a/profiles/prefix/windows/winnt/package.mask b/profiles/prefix/windows/winnt/package.mask
index 85faba2830c9..0af713753d95 100644
--- a/profiles/prefix/windows/winnt/package.mask
+++ b/profiles/prefix/windows/winnt/package.mask
@@ -1,8 +1,6 @@
# Distributed under the terms of the GNU General Public License v2
-# $Id$
-# $Id$
# Markus Duft <mduft@gentoo.org> (30 Sep 2009)
# the patch does not currently apply, and needs some work.
diff --git a/profiles/prefix/windows/winnt/packages b/profiles/prefix/windows/winnt/packages
index 35bfd0bdc103..7ffc61e1574f 100644
--- a/profiles/prefix/windows/winnt/packages
+++ b/profiles/prefix/windows/winnt/packages
@@ -1,6 +1,5 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# those are packages not available/required on winnt, since
# winnt can be a child EPREFIX only, which tears it's DEPENDS
diff --git a/profiles/prefix/windows/winnt/profile.bashrc b/profiles/prefix/windows/winnt/profile.bashrc
index 5b818e40290a..f1c5c365338b 100644
--- a/profiles/prefix/windows/winnt/profile.bashrc
+++ b/profiles/prefix/windows/winnt/profile.bashrc
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# On windows, binary files (executables, shared libraries) in use
# cannot be replaced during merge.
diff --git a/profiles/prefix/windows/winnt/use.force b/profiles/prefix/windows/winnt/use.force
index 98c050e7bdb3..4dbfdde651d7 100644
--- a/profiles/prefix/windows/winnt/use.force
+++ b/profiles/prefix/windows/winnt/use.force
@@ -1,6 +1,5 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Re-add Winnt libc
elibc_Winnt
diff --git a/profiles/prefix/windows/winnt/use.mask b/profiles/prefix/windows/winnt/use.mask
index 6d02b429fd9e..eb0c49f36f14 100644
--- a/profiles/prefix/windows/winnt/use.mask
+++ b/profiles/prefix/windows/winnt/use.mask
@@ -1,6 +1,5 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Re-add Winnt libc
-elibc_Winnt