Remove all svn $Id keywords.

author: Zac Medico <zmedico@gentoo.org> 2010-03-24 00:13:00 -0700
committer: Zac Medico <zmedico@gentoo.org> 2010-03-24 00:13:00 -0700
commit: c790b7ce4c8e3b95b1ef0103129388c06c5eaa4b (patch)
tree: 95a8b912dd518ffe4c7894890f2e8bf5c4929a9a /pym
parent: f1b05b7098ba448a0987bc61224d6616dad3ecde (diff)
download: portage-c790b7ce4c8e3b95b1ef0103129388c06c5eaa4b.tar.gz
portage-c790b7ce4c8e3b95b1ef0103129388c06c5eaa4b.tar.bz2
portage-c790b7ce4c8e3b95b1ef0103129388c06c5eaa4b.zip
229 files changed, 0 insertions, 229 deletions
diff --git a/pym/_emerge/AbstractDepPriority.py b/pym/_emerge/AbstractDepPriority.py
index e51999aa0..94a9379a5 100644
--- a/pym/_emerge/AbstractDepPriority.py
+++ b/pym/_emerge/AbstractDepPriority.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import copy
 from _emerge.SlotObject import SlotObject
diff --git a/pym/_emerge/AbstractEbuildProcess.py b/pym/_emerge/AbstractEbuildProcess.py
index 64846ff8c..293251323 100644
--- a/pym/_emerge/AbstractEbuildProcess.py
+++ b/pym/_emerge/AbstractEbuildProcess.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.SpawnProcess import SpawnProcess
 import portage
diff --git a/pym/_emerge/AbstractPollTask.py b/pym/_emerge/AbstractPollTask.py
index 491e803c2..1feee15f6 100644
--- a/pym/_emerge/AbstractPollTask.py
+++ b/pym/_emerge/AbstractPollTask.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.AsynchronousTask import AsynchronousTask
 from _emerge.PollConstants import PollConstants
diff --git a/pym/_emerge/AsynchronousTask.py b/pym/_emerge/AsynchronousTask.py
index dace8b154..1918b839b 100644
--- a/pym/_emerge/AsynchronousTask.py
+++ b/pym/_emerge/AsynchronousTask.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.SlotObject import SlotObject
 class AsynchronousTask(SlotObject):
diff --git a/pym/_emerge/AtomArg.py b/pym/_emerge/AtomArg.py
index ea89da1fa..244ea28e7 100644
--- a/pym/_emerge/AtomArg.py
+++ b/pym/_emerge/AtomArg.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.DependencyArg import DependencyArg
 try:
diff --git a/pym/_emerge/Binpkg.py b/pym/_emerge/Binpkg.py
index 4f2a07344..03f0e84b1 100644
--- a/pym/_emerge/Binpkg.py
+++ b/pym/_emerge/Binpkg.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.EbuildPhase import EbuildPhase
 from _emerge.BinpkgFetcher import BinpkgFetcher
diff --git a/pym/_emerge/BinpkgExtractorAsync.py b/pym/_emerge/BinpkgExtractorAsync.py
index d9416643a..a4941fccf 100644
--- a/pym/_emerge/BinpkgExtractorAsync.py
+++ b/pym/_emerge/BinpkgExtractorAsync.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.SpawnProcess import SpawnProcess
 import portage
diff --git a/pym/_emerge/BinpkgFetcher.py b/pym/_emerge/BinpkgFetcher.py
index bd8b141f3..5677419e7 100644
--- a/pym/_emerge/BinpkgFetcher.py
+++ b/pym/_emerge/BinpkgFetcher.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.SpawnProcess import SpawnProcess
 try:
diff --git a/pym/_emerge/BinpkgPrefetcher.py b/pym/_emerge/BinpkgPrefetcher.py
index 4e637db03..ca5f7ae96 100644
--- a/pym/_emerge/BinpkgPrefetcher.py
+++ b/pym/_emerge/BinpkgPrefetcher.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.BinpkgFetcher import BinpkgFetcher
 from _emerge.CompositeTask import CompositeTask
diff --git a/pym/_emerge/BinpkgVerifier.py b/pym/_emerge/BinpkgVerifier.py
index 568fc18e9..83a02c76c 100644
--- a/pym/_emerge/BinpkgVerifier.py
+++ b/pym/_emerge/BinpkgVerifier.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.AsynchronousTask import AsynchronousTask
 from portage.util import writemsg
diff --git a/pym/_emerge/Blocker.py b/pym/_emerge/Blocker.py
index 1c1a6f3f4..04b6bb1d4 100644
--- a/pym/_emerge/Blocker.py
+++ b/pym/_emerge/Blocker.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.Task import Task
 try:
diff --git a/pym/_emerge/BlockerCache.py b/pym/_emerge/BlockerCache.py
index de3b65e22..9c5ff4245 100644
--- a/pym/_emerge/BlockerCache.py
+++ b/pym/_emerge/BlockerCache.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import sys
 from portage.util import writemsg
diff --git a/pym/_emerge/BlockerDB.py b/pym/_emerge/BlockerDB.py
index f4ff9cc2c..870d80c4f 100644
--- a/pym/_emerge/BlockerDB.py
+++ b/pym/_emerge/BlockerDB.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import sys
 
diff --git a/pym/_emerge/BlockerDepPriority.py b/pym/_emerge/BlockerDepPriority.py
index 626013c18..1004a3717 100644
--- a/pym/_emerge/BlockerDepPriority.py
+++ b/pym/_emerge/BlockerDepPriority.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.DepPriority import DepPriority
 class BlockerDepPriority(DepPriority):
diff --git a/pym/_emerge/CompositeTask.py b/pym/_emerge/CompositeTask.py
index a9de7a1ab..ddbfe6364 100644
--- a/pym/_emerge/CompositeTask.py
+++ b/pym/_emerge/CompositeTask.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.AsynchronousTask import AsynchronousTask
 from portage import os
diff --git a/pym/_emerge/DepPriority.py b/pym/_emerge/DepPriority.py
index 6ea704337..f99b7264f 100644
--- a/pym/_emerge/DepPriority.py
+++ b/pym/_emerge/DepPriority.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.AbstractDepPriority import AbstractDepPriority
 class DepPriority(AbstractDepPriority):
diff --git a/pym/_emerge/DepPriorityNormalRange.py b/pym/_emerge/DepPriorityNormalRange.py
index d9176487b..259a1df65 100644
--- a/pym/_emerge/DepPriorityNormalRange.py
+++ b/pym/_emerge/DepPriorityNormalRange.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.DepPriority import DepPriority
 class DepPriorityNormalRange(object):
diff --git a/pym/_emerge/DepPrioritySatisfiedRange.py b/pym/_emerge/DepPrioritySatisfiedRange.py
index e2417b529..aa32d8f86 100644
--- a/pym/_emerge/DepPrioritySatisfiedRange.py
+++ b/pym/_emerge/DepPrioritySatisfiedRange.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.DepPriority import DepPriority
 class DepPrioritySatisfiedRange(object):
diff --git a/pym/_emerge/Dependency.py b/pym/_emerge/Dependency.py
index 16cb41f70..63b2a1b12 100644
--- a/pym/_emerge/Dependency.py
+++ b/pym/_emerge/Dependency.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.DepPriority import DepPriority
 from _emerge.SlotObject import SlotObject
diff --git a/pym/_emerge/DependencyArg.py b/pym/_emerge/DependencyArg.py
index f3b0d0f7f..3bcaabefe 100644
--- a/pym/_emerge/DependencyArg.py
+++ b/pym/_emerge/DependencyArg.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 class DependencyArg(object):
 	def __init__(self, arg=None, root_config=None):
diff --git a/pym/_emerge/EbuildBinpkg.py b/pym/_emerge/EbuildBinpkg.py
index 73297ed6b..103f2b5f1 100644
--- a/pym/_emerge/EbuildBinpkg.py
+++ b/pym/_emerge/EbuildBinpkg.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.EbuildProcess import EbuildProcess
 from portage import os
diff --git a/pym/_emerge/EbuildBuild.py b/pym/_emerge/EbuildBuild.py
index 672e2ffcf..d42ff6f5f 100644
--- a/pym/_emerge/EbuildBuild.py
+++ b/pym/_emerge/EbuildBuild.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.EbuildExecuter import EbuildExecuter
 from _emerge.EbuildPhase import EbuildPhase
diff --git a/pym/_emerge/EbuildBuildDir.py b/pym/_emerge/EbuildBuildDir.py
index 4ca0c4b1f..dc7e1daa5 100644
--- a/pym/_emerge/EbuildBuildDir.py
+++ b/pym/_emerge/EbuildBuildDir.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.SlotObject import SlotObject
 import portage
diff --git a/pym/_emerge/EbuildExecuter.py b/pym/_emerge/EbuildExecuter.py
index adb7cd6e9..b9c87f082 100644
--- a/pym/_emerge/EbuildExecuter.py
+++ b/pym/_emerge/EbuildExecuter.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.EbuildPhase import EbuildPhase
 from _emerge.TaskSequence import TaskSequence
diff --git a/pym/_emerge/EbuildFetcher.py b/pym/_emerge/EbuildFetcher.py
index 062ef4726..e5d8bf4a8 100644
--- a/pym/_emerge/EbuildFetcher.py
+++ b/pym/_emerge/EbuildFetcher.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.SpawnProcess import SpawnProcess
 from _emerge.EbuildBuildDir import EbuildBuildDir
diff --git a/pym/_emerge/EbuildFetchonly.py b/pym/_emerge/EbuildFetchonly.py
index 147e824f2..8e02c2a77 100644
--- a/pym/_emerge/EbuildFetchonly.py
+++ b/pym/_emerge/EbuildFetchonly.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.SlotObject import SlotObject
 import shutil
diff --git a/pym/_emerge/EbuildMerge.py b/pym/_emerge/EbuildMerge.py
index 1ac03706e..d73a262b3 100644
--- a/pym/_emerge/EbuildMerge.py
+++ b/pym/_emerge/EbuildMerge.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.SlotObject import SlotObject
 import portage
diff --git a/pym/_emerge/EbuildMetadataPhase.py b/pym/_emerge/EbuildMetadataPhase.py
index 2ff0b64db..43d715949 100644
--- a/pym/_emerge/EbuildMetadataPhase.py
+++ b/pym/_emerge/EbuildMetadataPhase.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.SubProcess import SubProcess
 from _emerge.PollConstants import PollConstants
diff --git a/pym/_emerge/EbuildPhase.py b/pym/_emerge/EbuildPhase.py
index 81b0e1f8d..51ee93da6 100644
--- a/pym/_emerge/EbuildPhase.py
+++ b/pym/_emerge/EbuildPhase.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.MiscFunctionsProcess import MiscFunctionsProcess
 from _emerge.EbuildProcess import EbuildProcess
diff --git a/pym/_emerge/EbuildProcess.py b/pym/_emerge/EbuildProcess.py
index 7cd164ee1..255f7c553 100644
--- a/pym/_emerge/EbuildProcess.py
+++ b/pym/_emerge/EbuildProcess.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.AbstractEbuildProcess import AbstractEbuildProcess
 from portage import os
diff --git a/pym/_emerge/FakeVartree.py b/pym/_emerge/FakeVartree.py
index c408a2161..596006f03 100644
--- a/pym/_emerge/FakeVartree.py
+++ b/pym/_emerge/FakeVartree.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import sys
 
diff --git a/pym/_emerge/JobStatusDisplay.py b/pym/_emerge/JobStatusDisplay.py
index 83603ed87..200e196b5 100644
--- a/pym/_emerge/JobStatusDisplay.py
+++ b/pym/_emerge/JobStatusDisplay.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import formatter
 import sys
diff --git a/pym/_emerge/MergeListItem.py b/pym/_emerge/MergeListItem.py
index 0205e6595..e7856ccfc 100644
--- a/pym/_emerge/MergeListItem.py
+++ b/pym/_emerge/MergeListItem.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage import os
 from portage.output import colorize
diff --git a/pym/_emerge/MetadataRegen.py b/pym/_emerge/MetadataRegen.py
index 6ff61f571..f819570d9 100644
--- a/pym/_emerge/MetadataRegen.py
+++ b/pym/_emerge/MetadataRegen.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import portage
 from portage import os
diff --git a/pym/_emerge/MiscFunctionsProcess.py b/pym/_emerge/MiscFunctionsProcess.py
index 75c68cf1e..c0d40a197 100644
--- a/pym/_emerge/MiscFunctionsProcess.py
+++ b/pym/_emerge/MiscFunctionsProcess.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.AbstractEbuildProcess import AbstractEbuildProcess
 import portage
diff --git a/pym/_emerge/Package.py b/pym/_emerge/Package.py
index 97be8ccf2..f94544127 100644
--- a/pym/_emerge/Package.py
+++ b/pym/_emerge/Package.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import re
 import sys
diff --git a/pym/_emerge/PackageArg.py b/pym/_emerge/PackageArg.py
index f64430e14..c4121e31f 100644
--- a/pym/_emerge/PackageArg.py
+++ b/pym/_emerge/PackageArg.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.DependencyArg import DependencyArg
 import portage
diff --git a/pym/_emerge/PackageCounters.py b/pym/_emerge/PackageCounters.py
index e99972e6f..dc0c6ffda 100644
--- a/pym/_emerge/PackageCounters.py
+++ b/pym/_emerge/PackageCounters.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage.output import colorize, create_color_func
 bad = create_color_func("BAD")
diff --git a/pym/_emerge/PackageMerge.py b/pym/_emerge/PackageMerge.py
index 67553ddf8..4aecf8adb 100644
--- a/pym/_emerge/PackageMerge.py
+++ b/pym/_emerge/PackageMerge.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.AsynchronousTask import AsynchronousTask
 from portage.output import colorize
diff --git a/pym/_emerge/PackageUninstall.py b/pym/_emerge/PackageUninstall.py
index 59bb50e56..58a1717a2 100644
--- a/pym/_emerge/PackageUninstall.py
+++ b/pym/_emerge/PackageUninstall.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import codecs
 import logging
diff --git a/pym/_emerge/PackageVirtualDbapi.py b/pym/_emerge/PackageVirtualDbapi.py
index 026b6cc72..45a183e60 100644
--- a/pym/_emerge/PackageVirtualDbapi.py
+++ b/pym/_emerge/PackageVirtualDbapi.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import sys
 from portage.dbapi import dbapi
diff --git a/pym/_emerge/PipeReader.py b/pym/_emerge/PipeReader.py
index 369918de3..be958bcb2 100644
--- a/pym/_emerge/PipeReader.py
+++ b/pym/_emerge/PipeReader.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage import os
 from _emerge.AbstractPollTask import AbstractPollTask
diff --git a/pym/_emerge/PollConstants.py b/pym/_emerge/PollConstants.py
index 0ec8abbe9..d0270a996 100644
--- a/pym/_emerge/PollConstants.py
+++ b/pym/_emerge/PollConstants.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import select
 class PollConstants(object):
diff --git a/pym/_emerge/PollScheduler.py b/pym/_emerge/PollScheduler.py
index e04b58ae7..4914b286a 100644
--- a/pym/_emerge/PollScheduler.py
+++ b/pym/_emerge/PollScheduler.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import logging
 import select
diff --git a/pym/_emerge/PollSelectAdapter.py b/pym/_emerge/PollSelectAdapter.py
index b136e7eb0..c11dab828 100644
--- a/pym/_emerge/PollSelectAdapter.py
+++ b/pym/_emerge/PollSelectAdapter.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.PollConstants import PollConstants
 import select
diff --git a/pym/_emerge/ProgressHandler.py b/pym/_emerge/ProgressHandler.py
index 08ba2c01d..f5afe6d87 100644
--- a/pym/_emerge/ProgressHandler.py
+++ b/pym/_emerge/ProgressHandler.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import time
 class ProgressHandler(object):
diff --git a/pym/_emerge/QueueScheduler.py b/pym/_emerge/QueueScheduler.py
index 27893e39b..8e1837c03 100644
--- a/pym/_emerge/QueueScheduler.py
+++ b/pym/_emerge/QueueScheduler.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.PollScheduler import PollScheduler
 
diff --git a/pym/_emerge/RepoDisplay.py b/pym/_emerge/RepoDisplay.py
index 67bf62672..f5efd65c8 100644
--- a/pym/_emerge/RepoDisplay.py
+++ b/pym/_emerge/RepoDisplay.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage.output import teal
 from portage import os
diff --git a/pym/_emerge/RootConfig.py b/pym/_emerge/RootConfig.py
index 70e933482..4ef8d6783 100644
--- a/pym/_emerge/RootConfig.py
+++ b/pym/_emerge/RootConfig.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.PackageVirtualDbapi import PackageVirtualDbapi
 
diff --git a/pym/_emerge/Scheduler.py b/pym/_emerge/Scheduler.py
index 404a4483b..4d9b3a563 100644
--- a/pym/_emerge/Scheduler.py
+++ b/pym/_emerge/Scheduler.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from __future__ import print_function
 
diff --git a/pym/_emerge/SequentialTaskQueue.py b/pym/_emerge/SequentialTaskQueue.py
index 4909290c0..c1c98c411 100644
--- a/pym/_emerge/SequentialTaskQueue.py
+++ b/pym/_emerge/SequentialTaskQueue.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import sys
 from _emerge.SlotObject import SlotObject
diff --git a/pym/_emerge/SetArg.py b/pym/_emerge/SetArg.py
index 987965dba..e43ad5812 100644
--- a/pym/_emerge/SetArg.py
+++ b/pym/_emerge/SetArg.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.DependencyArg import DependencyArg
 from portage.sets import SETPREFIX
diff --git a/pym/_emerge/SlotObject.py b/pym/_emerge/SlotObject.py
index 1205327d6..fdc6f35ad 100644
--- a/pym/_emerge/SlotObject.py
+++ b/pym/_emerge/SlotObject.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 class SlotObject(object):
 	__slots__ = ("__weakref__",)
diff --git a/pym/_emerge/SpawnProcess.py b/pym/_emerge/SpawnProcess.py
index 67fb17e29..a4a6d87ee 100644
--- a/pym/_emerge/SpawnProcess.py
+++ b/pym/_emerge/SpawnProcess.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.SubProcess import SubProcess
 from _emerge.PollConstants import PollConstants
diff --git a/pym/_emerge/SubProcess.py b/pym/_emerge/SubProcess.py
index 5889f556f..b1b5201eb 100644
--- a/pym/_emerge/SubProcess.py
+++ b/pym/_emerge/SubProcess.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage import os
 from _emerge.AbstractPollTask import AbstractPollTask
diff --git a/pym/_emerge/Task.py b/pym/_emerge/Task.py
index 0cd545500..31788b576 100644
--- a/pym/_emerge/Task.py
+++ b/pym/_emerge/Task.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.SlotObject import SlotObject
 class Task(SlotObject):
diff --git a/pym/_emerge/TaskScheduler.py b/pym/_emerge/TaskScheduler.py
index 9b945b942..f093e2848 100644
--- a/pym/_emerge/TaskScheduler.py
+++ b/pym/_emerge/TaskScheduler.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.QueueScheduler import QueueScheduler
 from _emerge.SequentialTaskQueue import SequentialTaskQueue
diff --git a/pym/_emerge/TaskSequence.py b/pym/_emerge/TaskSequence.py
index 44eaa332c..7a1bd5a47 100644
--- a/pym/_emerge/TaskSequence.py
+++ b/pym/_emerge/TaskSequence.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage import os
 from _emerge.CompositeTask import CompositeTask
diff --git a/pym/_emerge/UninstallFailure.py b/pym/_emerge/UninstallFailure.py
index ceb5a58e2..e4f28347a 100644
--- a/pym/_emerge/UninstallFailure.py
+++ b/pym/_emerge/UninstallFailure.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import portage
 
diff --git a/pym/_emerge/UnmergeDepPriority.py b/pym/_emerge/UnmergeDepPriority.py
index a642e07fe..c1c19c900 100644
--- a/pym/_emerge/UnmergeDepPriority.py
+++ b/pym/_emerge/UnmergeDepPriority.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.AbstractDepPriority import AbstractDepPriority
 class UnmergeDepPriority(AbstractDepPriority):
diff --git a/pym/_emerge/UseFlagDisplay.py b/pym/_emerge/UseFlagDisplay.py
index 66f860f96..db2d6ca16 100644
--- a/pym/_emerge/UseFlagDisplay.py
+++ b/pym/_emerge/UseFlagDisplay.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage.output import red
 from portage.util import cmp_sort_key
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 95cbda1ed..f98c56457 100644
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -1,3 +1,2 @@
 # Copyright 2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/pym/_emerge/_find_deep_system_runtime_deps.py b/pym/_emerge/_find_deep_system_runtime_deps.py
index 4acf239df..ca09d83ac 100644
--- a/pym/_emerge/_find_deep_system_runtime_deps.py
+++ b/pym/_emerge/_find_deep_system_runtime_deps.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from _emerge.DepPriority import DepPriority
 from _emerge.Package import Package
diff --git a/pym/_emerge/_flush_elog_mod_echo.py b/pym/_emerge/_flush_elog_mod_echo.py
index 302138a7e..4b24aad59 100644
--- a/pym/_emerge/_flush_elog_mod_echo.py
+++ b/pym/_emerge/_flush_elog_mod_echo.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 def _flush_elog_mod_echo():
 	"""
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index bf26881bf..954123a76 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from __future__ import print_function
 
diff --git a/pym/_emerge/changelog.py b/pym/_emerge/changelog.py
index 2391a92ab..d4d9076a5 100644
--- a/pym/_emerge/changelog.py
+++ b/pym/_emerge/changelog.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import codecs
 import re
diff --git a/pym/_emerge/clear_caches.py b/pym/_emerge/clear_caches.py
index a6b004f5d..30371f03f 100644
--- a/pym/_emerge/clear_caches.py
+++ b/pym/_emerge/clear_caches.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import gc
 import portage
diff --git a/pym/_emerge/countdown.py b/pym/_emerge/countdown.py
index efb648c76..5abdc8a96 100644
--- a/pym/_emerge/countdown.py
+++ b/pym/_emerge/countdown.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from __future__ import print_function
 
diff --git a/pym/_emerge/create_depgraph_params.py b/pym/_emerge/create_depgraph_params.py
index f8351831e..bed9c25ea 100644
--- a/pym/_emerge/create_depgraph_params.py
+++ b/pym/_emerge/create_depgraph_params.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import logging
 from portage.util import writemsg_level
diff --git a/pym/_emerge/create_world_atom.py b/pym/_emerge/create_world_atom.py
index 2bc1ec542..146cc4ccb 100644
--- a/pym/_emerge/create_world_atom.py
+++ b/pym/_emerge/create_world_atom.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import portage
 
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 99fce457b..1f326e87c 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from __future__ import print_function
 
diff --git a/pym/_emerge/emergelog.py b/pym/_emerge/emergelog.py
index b25ec29b7..400653051 100644
--- a/pym/_emerge/emergelog.py
+++ b/pym/_emerge/emergelog.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from __future__ import print_function
 
diff --git a/pym/_emerge/format_size.py b/pym/_emerge/format_size.py
index b0d39db33..4357b7654 100644
--- a/pym/_emerge/format_size.py
+++ b/pym/_emerge/format_size.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import sys
 
diff --git a/pym/_emerge/getloadavg.py b/pym/_emerge/getloadavg.py
index 5ff0890cd..e9babf13e 100644
--- a/pym/_emerge/getloadavg.py
+++ b/pym/_emerge/getloadavg.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage import os
 
diff --git a/pym/_emerge/help.py b/pym/_emerge/help.py
index 0a3cf3e6e..a62bc08a6 100644
--- a/pym/_emerge/help.py
+++ b/pym/_emerge/help.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from __future__ import print_function
 
diff --git a/pym/_emerge/is_valid_package_atom.py b/pym/_emerge/is_valid_package_atom.py
index 6295667a5..b6183d48a 100644
--- a/pym/_emerge/is_valid_package_atom.py
+++ b/pym/_emerge/is_valid_package_atom.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import re
 import portage
diff --git a/pym/_emerge/main.py b/pym/_emerge/main.py
index e725da87c..27948e51b 100644
--- a/pym/_emerge/main.py
+++ b/pym/_emerge/main.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from __future__ import print_function
 
diff --git a/pym/_emerge/search.py b/pym/_emerge/search.py
index f36a249e0..9b5ec13dc 100644
--- a/pym/_emerge/search.py
+++ b/pym/_emerge/search.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from __future__ import print_function
 
diff --git a/pym/_emerge/show_invalid_depstring_notice.py b/pym/_emerge/show_invalid_depstring_notice.py
index 4d374fcd0..8be186c1e 100644
--- a/pym/_emerge/show_invalid_depstring_notice.py
+++ b/pym/_emerge/show_invalid_depstring_notice.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import logging
 import textwrap
diff --git a/pym/_emerge/stdout_spinner.py b/pym/_emerge/stdout_spinner.py
index f299b5915..5ad31f001 100644
--- a/pym/_emerge/stdout_spinner.py
+++ b/pym/_emerge/stdout_spinner.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import platform
 import sys
diff --git a/pym/_emerge/sync/__init__.py b/pym/_emerge/sync/__init__.py
index c802d70cc..21a391aee 100644
--- a/pym/_emerge/sync/__init__.py
+++ b/pym/_emerge/sync/__init__.py
@@ -1,3 +1,2 @@
 # Copyright 2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/pym/_emerge/sync/old_tree_timestamp.py b/pym/_emerge/sync/old_tree_timestamp.py
index 00d671c29..df55a2b25 100644
--- a/pym/_emerge/sync/old_tree_timestamp.py
+++ b/pym/_emerge/sync/old_tree_timestamp.py
@@ -1,6 +1,5 @@
 # Copyright 2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import locale
 import logging
diff --git a/pym/_emerge/unmerge.py b/pym/_emerge/unmerge.py
index 6e62aae05..bfd5576d2 100644
--- a/pym/_emerge/unmerge.py
+++ b/pym/_emerge/unmerge.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from __future__ import print_function
 
diff --git a/pym/_emerge/userquery.py b/pym/_emerge/userquery.py
index f177c9e87..e7ed400b1 100644
--- a/pym/_emerge/userquery.py
+++ b/pym/_emerge/userquery.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from __future__ import print_function
 
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py
index 6f5268ae9..44402edd4 100644
--- a/pym/portage/__init__.py
+++ b/pym/portage/__init__.py
@@ -1,7 +1,6 @@
 # portage.py -- core Portage functionality
 # Copyright 1998-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 VERSION="HEAD"
 
diff --git a/pym/portage/_deprecated.py b/pym/portage/_deprecated.py
index f151cd6d0..a7da5f965 100644
--- a/pym/portage/_deprecated.py
+++ b/pym/portage/_deprecated.py
@@ -1,6 +1,5 @@
 # Copyright 2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from __future__ import print_function
 
diff --git a/pym/portage/_ensure_encodings.py b/pym/portage/_ensure_encodings.py
index 7daf52e3b..5e62843f1 100644
--- a/pym/portage/_ensure_encodings.py
+++ b/pym/portage/_ensure_encodings.py
@@ -1,6 +1,5 @@
 # Copyright 2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import codecs
 
diff --git a/pym/portage/_global_updates.py b/pym/portage/_global_updates.py
index cdb73187b..0e855c34e 100644
--- a/pym/portage/_global_updates.py
+++ b/pym/portage/_global_updates.py
@@ -1,6 +1,5 @@
 # Copyright 2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from __future__ import print_function
 
diff --git a/pym/portage/_legacy_globals.py b/pym/portage/_legacy_globals.py
index 9958ff41b..bdeba351d 100644
--- a/pym/portage/_legacy_globals.py
+++ b/pym/portage/_legacy_globals.py
@@ -1,6 +1,5 @@
 # Copyright 2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import portage
 from portage import os
diff --git a/pym/portage/_selinux.py b/pym/portage/_selinux.py
index 594e47ad5..e14324e55 100644
--- a/pym/portage/_selinux.py
+++ b/pym/portage/_selinux.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 # Don't use the unicode-wrapped os and shutil modules here since
 # the whole _selinux module itself will be wrapped.
diff --git a/pym/portage/cache/__init__.py b/pym/portage/cache/__init__.py
index cb1b59d69..e7fe599f0 100644
--- a/pym/portage/cache/__init__.py
+++ b/pym/portage/cache/__init__.py
@@ -1,5 +1,4 @@
 # Copyright: 2005 Gentoo Foundation
 # Author(s): Brian Harring (ferringb@gentoo.org)
 # License: GPL2
-# $Id$
 
diff --git a/pym/portage/cache/anydbm.py b/pym/portage/cache/anydbm.py
index 33cedebbb..dcfff3fb8 100644
--- a/pym/portage/cache/anydbm.py
+++ b/pym/portage/cache/anydbm.py
@@ -1,7 +1,6 @@
 # Copyright: 2005 Gentoo Foundation
 # Author(s): Brian Harring (ferringb@gentoo.org)
 # License: GPL2
-# $Id$
 
 try:
 	anydbm_module = __import__("anydbm")
diff --git a/pym/portage/cache/cache_errors.py b/pym/portage/cache/cache_errors.py
index e1e8eead0..3c1f2397e 100644
--- a/pym/portage/cache/cache_errors.py
+++ b/pym/portage/cache/cache_errors.py
@@ -1,7 +1,6 @@
 # Copyright: 2005 Gentoo Foundation
 # Author(s): Brian Harring (ferringb@gentoo.org)
 # License: GPL2
-# $Id$
 
 class CacheError(Exception):	pass
 
diff --git a/pym/portage/cache/ebuild_xattr.py b/pym/portage/cache/ebuild_xattr.py
index 7ea4aaaca..6582a003d 100644
--- a/pym/portage/cache/ebuild_xattr.py
+++ b/pym/portage/cache/ebuild_xattr.py
@@ -1,7 +1,6 @@
 # Copyright: 2009 Gentoo Foundation
 # Author(s): Petteri R&#228;ty (betelgeuse@gentoo.org)
 # License: GPL2
-# $Id$
 
 __all__ = ['database']
 
diff --git a/pym/portage/cache/flat_hash.py b/pym/portage/cache/flat_hash.py
index b014f170d..6be0fe4b2 100644
--- a/pym/portage/cache/flat_hash.py
+++ b/pym/portage/cache/flat_hash.py
@@ -1,7 +1,6 @@
 # Copyright: 2005 Gentoo Foundation
 # Author(s): Brian Harring (ferringb@gentoo.org)
 # License: GPL2
-# $Id$
 
 import codecs
 from portage.cache import fs_template
diff --git a/pym/portage/cache/fs_template.py b/pym/portage/cache/fs_template.py
index 7cd8af4d7..a82e8623a 100644
--- a/pym/portage/cache/fs_template.py
+++ b/pym/portage/cache/fs_template.py
@@ -1,7 +1,6 @@
 # Copyright: 2005 Gentoo Foundation
 # Author(s): Brian Harring (ferringb@gentoo.org)
 # License: GPL2
-# $Id$
 
 import sys
 from portage.cache import template
diff --git a/pym/portage/cache/mappings.py b/pym/portage/cache/mappings.py
index f15f362b0..67f6dfcc6 100644
--- a/pym/portage/cache/mappings.py
+++ b/pym/portage/cache/mappings.py
@@ -1,7 +1,6 @@
 # Copyright: 2005-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # Author(s): Brian Harring (ferringb@gentoo.org)
-# $Id$
 
 __all__ = ["Mapping", "MutableMapping", "UserDict", "ProtectedDict",
 	"LazyLoad", "slot_dict_class"]
diff --git a/pym/portage/cache/metadata.py b/pym/portage/cache/metadata.py
index 650658afc..9da52ce14 100644
--- a/pym/portage/cache/metadata.py
+++ b/pym/portage/cache/metadata.py
@@ -1,7 +1,6 @@
 # Copyright: 2005 Gentoo Foundation
 # Author(s): Brian Harring (ferringb@gentoo.org)
 # License: GPL2
-# $Id$
 
 import errno
 import re
diff --git a/pym/portage/cache/metadata_overlay.py b/pym/portage/cache/metadata_overlay.py
index 7b4f70a9c..a4053372b 100644
--- a/pym/portage/cache/metadata_overlay.py
+++ b/pym/portage/cache/metadata_overlay.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import time
 from portage.cache import template
diff --git a/pym/portage/cache/sql_template.py b/pym/portage/cache/sql_template.py
index ff9d273ed..d3c6a0b30 100644
--- a/pym/portage/cache/sql_template.py
+++ b/pym/portage/cache/sql_template.py
@@ -1,7 +1,6 @@
 # Copyright: 2005 Gentoo Foundation
 # Author(s): Brian Harring (ferringb@gentoo.org)
 # License: GPL2
-# $Id$
 
 import sys
 from portage.cache import template, cache_errors
diff --git a/pym/portage/cache/sqlite.py b/pym/portage/cache/sqlite.py
index b8136bb4f..cd118f515 100644
--- a/pym/portage/cache/sqlite.py
+++ b/pym/portage/cache/sqlite.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import sys
 from portage.cache import fs_template
diff --git a/pym/portage/cache/template.py b/pym/portage/cache/template.py
index 3b003b1f6..f84d8f4b9 100644
--- a/pym/portage/cache/template.py
+++ b/pym/portage/cache/template.py
@@ -1,7 +1,6 @@
 # Copyright: 2005 Gentoo Foundation
 # Author(s): Brian Harring (ferringb@gentoo.org)
 # License: GPL2
-# $Id$
 
 from portage.cache import cache_errors
 from portage.cache.cache_errors import InvalidRestriction
diff --git a/pym/portage/cache/util.py b/pym/portage/cache/util.py
index 55bcb015c..b82468973 100644
--- a/pym/portage/cache/util.py
+++ b/pym/portage/cache/util.py
@@ -1,7 +1,6 @@
 # Copyright: 2005 Gentoo Foundation
 # Author(s): Brian Harring (ferringb@gentoo.org)
 # License: GPL2
-# $Id$
 
 from __future__ import print_function
 
diff --git a/pym/portage/cache/volatile.py b/pym/portage/cache/volatile.py
index 108393185..e671904ee 100644
--- a/pym/portage/cache/volatile.py
+++ b/pym/portage/cache/volatile.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import copy
 from portage.cache import template
diff --git a/pym/portage/checksum.py b/pym/portage/checksum.py
index badde3daf..e460e7ac7 100644
--- a/pym/portage/checksum.py
+++ b/pym/portage/checksum.py
@@ -1,7 +1,6 @@
 # checksum.py -- core Portage functionality
 # Copyright 1998-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import portage
 from portage.const import PRIVATE_PATH,PRELINK_BINARY,HASHING_BLOCKSIZE
diff --git a/pym/portage/const.py b/pym/portage/const.py
index b017bcf75..1450fe2e8 100644
--- a/pym/portage/const.py
+++ b/pym/portage/const.py
@@ -1,7 +1,6 @@
 # portage: Constants
 # Copyright 1998-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import os
 
diff --git a/pym/portage/cvstree.py b/pym/portage/cvstree.py
index ca9d56d2f..f36e9230c 100644
--- a/pym/portage/cvstree.py
+++ b/pym/portage/cvstree.py
@@ -1,7 +1,6 @@
 # cvstree.py -- cvs tree utilities
 # Copyright 1998-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from __future__ import print_function
 
diff --git a/pym/portage/data.py b/pym/portage/data.py
index 6322a6ab9..6d19b6455 100644
--- a/pym/portage/data.py
+++ b/pym/portage/data.py
@@ -1,7 +1,6 @@
 # data.py -- Calculated/Discovered Data Values
 # Copyright 1998-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import os, sys, pwd, grp, platform
 from portage.const import PORTAGE_GROUPNAME, PORTAGE_USERNAME
diff --git a/pym/portage/dbapi/__init__.py b/pym/portage/dbapi/__init__.py
index e3e53a432..c86616a95 100644
--- a/pym/portage/dbapi/__init__.py
+++ b/pym/portage/dbapi/__init__.py
@@ -1,6 +1,5 @@
 # Copyright 1998-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 __all__ = ["dbapi"]
 
diff --git a/pym/portage/dbapi/bintree.py b/pym/portage/dbapi/bintree.py
index 0821b7e55..610813f76 100644
--- a/pym/portage/dbapi/bintree.py
+++ b/pym/portage/dbapi/bintree.py
@@ -1,6 +1,5 @@
 # Copyright 1998-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 __all__ = ["bindbapi", "binarytree"]
 
diff --git a/pym/portage/dbapi/cpv_expand.py b/pym/portage/dbapi/cpv_expand.py
index 587f2372c..c42e427d3 100644
--- a/pym/portage/dbapi/cpv_expand.py
+++ b/pym/portage/dbapi/cpv_expand.py
@@ -1,6 +1,5 @@
 # Copyright 2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 __all__ = ["cpv_expand"]
 
diff --git a/pym/portage/dbapi/dep_expand.py b/pym/portage/dbapi/dep_expand.py
index 53a666ee0..ab1605413 100644
--- a/pym/portage/dbapi/dep_expand.py
+++ b/pym/portage/dbapi/dep_expand.py
@@ -1,6 +1,5 @@
 # Copyright 2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 __all__ = ["dep_expand"]
 
diff --git a/pym/portage/dbapi/porttree.py b/pym/portage/dbapi/porttree.py
index 124783ca2..140a3bd80 100644
--- a/pym/portage/dbapi/porttree.py
+++ b/pym/portage/dbapi/porttree.py
@@ -1,6 +1,5 @@
 # Copyright 1998-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 __all__ = [
 	"close_portdbapi_caches", "FetchlistDict", "portagetree", "portdbapi"
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 4eee0cf05..38622df45 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1,6 +1,5 @@
 # Copyright 1998-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 __all__ = ["PreservedLibsRegistry", "LinkageMap",
 	"vardbapi", "vartree", "dblink"] + \
diff --git a/pym/portage/dbapi/virtual.py b/pym/portage/dbapi/virtual.py
index 6c567a072..c16e82231 100644
--- a/pym/portage/dbapi/virtual.py
+++ b/pym/portage/dbapi/virtual.py
@@ -1,6 +1,5 @@
 # Copyright 1998-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 
 from portage.dbapi import dbapi
diff --git a/pym/portage/debug.py b/pym/portage/debug.py
index 18e8482e4..e18d02cf7 100644
--- a/pym/portage/debug.py
+++ b/pym/portage/debug.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import os, sys, threading
 
diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py
index 282fe749d..abe5a0666 100644
--- a/pym/portage/dep/__init__.py
+++ b/pym/portage/dep/__init__.py
@@ -1,7 +1,6 @@
 # deps.py -- Portage dependency resolution functions
 # Copyright 2003-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 __all__ = [
 	'Atom', 'best_match_to_list', 'cpvequal',
diff --git a/pym/portage/dep/dep_check.py b/pym/portage/dep/dep_check.py
index 1bc1e40dc..73bcfabc0 100644
--- a/pym/portage/dep/dep_check.py
+++ b/pym/portage/dep/dep_check.py
@@ -1,6 +1,5 @@
 # Copyright 2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 __all__ = ['dep_check', 'dep_eval', 'dep_wordreduce', 'dep_zapdeps']
 
diff --git a/pym/portage/dispatch_conf.py b/pym/portage/dispatch_conf.py
index 377eb45c3..956f52373 100644
--- a/pym/portage/dispatch_conf.py
+++ b/pym/portage/dispatch_conf.py
@@ -1,7 +1,6 @@
 # archive_conf.py -- functionality common to archive-conf and dispatch-conf
 # Copyright 2003-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 
 # Library by Wayne Davison <gentoo@blorf.net>, derived from code
diff --git a/pym/portage/eclass_cache.py b/pym/portage/eclass_cache.py
index 39e29d540..226e00272 100644
--- a/pym/portage/eclass_cache.py
+++ b/pym/portage/eclass_cache.py
@@ -1,7 +1,6 @@
 # Copyright: 2005 Gentoo Foundation
 # Author(s): Nicholas Carpaski (carpaski@gentoo.org), Brian Harring (ferringb@gentoo.org)
 # License: GPL2
-# $Id$
 
 __all__ = ["cache"]
 
diff --git a/pym/portage/elog/__init__.py b/pym/portage/elog/__init__.py
index 15e8c9bce..f1f2aea0c 100644
--- a/pym/portage/elog/__init__.py
+++ b/pym/portage/elog/__init__.py
@@ -1,7 +1,6 @@
 # elog/__init__.py - elog core functions
 # Copyright 2006-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import portage
 portage.proxy.lazyimport.lazyimport(globals(),
diff --git a/pym/portage/elog/filtering.py b/pym/portage/elog/filtering.py
index d834edd3a..2e154242b 100644
--- a/pym/portage/elog/filtering.py
+++ b/pym/portage/elog/filtering.py
@@ -1,7 +1,6 @@
 # elog/messages.py - elog core functions
 # Copyright 2006-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage.const import EBUILD_PHASES
 
diff --git a/pym/portage/elog/messages.py b/pym/portage/elog/messages.py
index b2a2dc4cf..6b4561fe7 100644
--- a/pym/portage/elog/messages.py
+++ b/pym/portage/elog/messages.py
@@ -1,7 +1,6 @@
 # elog/messages.py - elog core functions
 # Copyright 2006-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import portage
 portage.proxy.lazyimport.lazyimport(globals(),
diff --git a/pym/portage/elog/mod_custom.py b/pym/portage/elog/mod_custom.py
index 0bcd42a95..e1a5223d6 100644
--- a/pym/portage/elog/mod_custom.py
+++ b/pym/portage/elog/mod_custom.py
@@ -1,7 +1,6 @@
 # elog/mod_custom.py - elog dispatch module
 # Copyright 2006-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import portage.elog.mod_save, portage.process, portage.exception
 
diff --git a/pym/portage/elog/mod_echo.py b/pym/portage/elog/mod_echo.py
index 1df2fca3b..1943caaf3 100644
--- a/pym/portage/elog/mod_echo.py
+++ b/pym/portage/elog/mod_echo.py
@@ -1,7 +1,6 @@
 # elog/mod_echo.py - elog dispatch module
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from __future__ import print_function
 
diff --git a/pym/portage/elog/mod_mail.py b/pym/portage/elog/mod_mail.py
index 96e45ba21..086c683a6 100644
--- a/pym/portage/elog/mod_mail.py
+++ b/pym/portage/elog/mod_mail.py
@@ -1,7 +1,6 @@
 # elog/mod_mail.py - elog dispatch module
 # Copyright 2006-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import portage.mail, socket
 from portage.exception import PortageException
diff --git a/pym/portage/elog/mod_mail_summary.py b/pym/portage/elog/mod_mail_summary.py
index 3ea0e6fe9..97c9efa1e 100644
--- a/pym/portage/elog/mod_mail_summary.py
+++ b/pym/portage/elog/mod_mail_summary.py
@@ -1,7 +1,6 @@
 # elog/mod_mail_summary.py - elog dispatch module
 # Copyright 2006-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import portage
 from portage.exception import PortageException
diff --git a/pym/portage/elog/mod_save.py b/pym/portage/elog/mod_save.py
index b1c38061d..ac21fb8c5 100644
--- a/pym/portage/elog/mod_save.py
+++ b/pym/portage/elog/mod_save.py
@@ -1,7 +1,6 @@
 # elog/mod_save.py - elog dispatch module
 # Copyright 2006-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import codecs
 import time
diff --git a/pym/portage/elog/mod_save_summary.py b/pym/portage/elog/mod_save_summary.py
index 605b96190..ea8233fda 100644
--- a/pym/portage/elog/mod_save_summary.py
+++ b/pym/portage/elog/mod_save_summary.py
@@ -1,7 +1,6 @@
 # elog/mod_save_summary.py - elog dispatch module
 # Copyright 2006-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import codecs
 import time
diff --git a/pym/portage/elog/mod_syslog.py b/pym/portage/elog/mod_syslog.py
index d7e955f81..d385255b2 100644
--- a/pym/portage/elog/mod_syslog.py
+++ b/pym/portage/elog/mod_syslog.py
@@ -1,7 +1,6 @@
 # elog/mod_syslog.py - elog dispatch module
 # Copyright 2006-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import sys
 import syslog
diff --git a/pym/portage/env/__init__.py b/pym/portage/env/__init__.py
index 63f6f9ef2..17b66d17c 100644
--- a/pym/portage/env/__init__.py
+++ b/pym/portage/env/__init__.py
@@ -1,4 +1,3 @@
 # Copyright: 2007 Gentoo Foundation
 # License: GPL2
-# $Id$
 
diff --git a/pym/portage/env/config.py b/pym/portage/env/config.py
index b6efdbecf..865d8353a 100644
--- a/pym/portage/env/config.py
+++ b/pym/portage/env/config.py
@@ -1,7 +1,6 @@
 # config.py -- Portage Config
 # Copyright 2007-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 __all__ = ["ConfigLoaderKlass", "GenericFile", "PackageKeywordsFile",
 	"PackageUseFile", "PackageMaskFile", "PortageModulesFile"]
diff --git a/pym/portage/env/loaders.py b/pym/portage/env/loaders.py
index 0dc4d75be..81dd5b172 100644
--- a/pym/portage/env/loaders.py
+++ b/pym/portage/env/loaders.py
@@ -1,7 +1,6 @@
 # config.py -- Portage Config
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import codecs
 import errno
diff --git a/pym/portage/env/validators.py b/pym/portage/env/validators.py
index fb29b8d29..4d11d69fe 100644
--- a/pym/portage/env/validators.py
+++ b/pym/portage/env/validators.py
@@ -1,6 +1,5 @@
 # validators.py Portage File Loader Code
 # Copyright 2007 Gentoo Foundation
-# $Id$
 
 from portage.dep import isvalidatom
 
diff --git a/pym/portage/exception.py b/pym/portage/exception.py
index 900dab7df..39901ed07 100644
--- a/pym/portage/exception.py
+++ b/pym/portage/exception.py
@@ -1,6 +1,5 @@
 # Copyright 1998-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import sys
 from portage import _unicode_encode
diff --git a/pym/portage/getbinpkg.py b/pym/portage/getbinpkg.py
index 26b2bb1fc..e15853f1e 100644
--- a/pym/portage/getbinpkg.py
+++ b/pym/portage/getbinpkg.py
@@ -1,7 +1,6 @@
 # getbinpkg.py -- Portage binary-package helper functions
 # Copyright 2003-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage.output import colorize
 from portage.cache.mappings import slot_dict_class
diff --git a/pym/portage/glsa.py b/pym/portage/glsa.py
index 38b07ad32..9b599528f 100644
--- a/pym/portage/glsa.py
+++ b/pym/portage/glsa.py
@@ -1,6 +1,5 @@
 # Copyright 2003-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import codecs
 import sys
diff --git a/pym/portage/localization.py b/pym/portage/localization.py
index 25a15e81f..d16c4b131 100644
--- a/pym/portage/localization.py
+++ b/pym/portage/localization.py
@@ -1,7 +1,6 @@
 # localization.py -- Code to manage/help portage localization.
 # Copyright 2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 
 # We define this to make the transition easier for us.
diff --git a/pym/portage/locks.py b/pym/portage/locks.py
index f024fe542..3685d8041 100644
--- a/pym/portage/locks.py
+++ b/pym/portage/locks.py
@@ -1,7 +1,6 @@
 # portage: Lock management code
 # Copyright 2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 __all__ = ["lockdir", "unlockdir", "lockfile", "unlockfile", \
 	"hardlock_name", "hardlink_is_mine", "hardlink_lockfile", \
diff --git a/pym/portage/mail.py b/pym/portage/mail.py
index 722127c28..362b00510 100644
--- a/pym/portage/mail.py
+++ b/pym/portage/mail.py
@@ -1,7 +1,6 @@
 # portage.py -- core Portage functionality
 # Copyright 1998-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 # Since python ebuilds remove the 'email' module when USE=build
 # is enabled, use a local import so that
diff --git a/pym/portage/manifest.py b/pym/portage/manifest.py
index 470f732d6..a2a65aaf8 100644
--- a/pym/portage/manifest.py
+++ b/pym/portage/manifest.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import codecs
 import errno
diff --git a/pym/portage/news.py b/pym/portage/news.py
index a1ce42246..c0e6ef329 100644
--- a/pym/portage/news.py
+++ b/pym/portage/news.py
@@ -1,7 +1,6 @@
 # portage: news management code
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 __all__ = ["NewsManager", "NewsItem", "DisplayRestriction",
 	"DisplayProfileRestriction", "DisplayKeywordRestriction",
diff --git a/pym/portage/output.py b/pym/portage/output.py
index 4d8eb94fa..0dc218ed1 100644
--- a/pym/portage/output.py
+++ b/pym/portage/output.py
@@ -1,6 +1,5 @@
 # Copyright 1998-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 __docformat__ = "epytext"
 
diff --git a/pym/portage/package/__init__.py b/pym/portage/package/__init__.py
index c802d70cc..21a391aee 100644
--- a/pym/portage/package/__init__.py
+++ b/pym/portage/package/__init__.py
@@ -1,3 +1,2 @@
 # Copyright 2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/pym/portage/package/ebuild/__init__.py b/pym/portage/package/ebuild/__init__.py
index c802d70cc..21a391aee 100644
--- a/pym/portage/package/ebuild/__init__.py
+++ b/pym/portage/package/ebuild/__init__.py
@@ -1,3 +1,2 @@
 # Copyright 2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/pym/portage/package/ebuild/config.py b/pym/portage/package/ebuild/config.py
index 908b6b66a..7be1af1e7 100644
--- a/pym/portage/package/ebuild/config.py
+++ b/pym/portage/package/ebuild/config.py
@@ -1,6 +1,5 @@
 # Copyright 2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 __all__ = [
 	'autouse', 'best_from_dict', 'check_config_instance', 'config',
diff --git a/pym/portage/package/ebuild/deprecated_profile_check.py b/pym/portage/package/ebuild/deprecated_profile_check.py
index b3f99f5fe..7da5fe848 100644
--- a/pym/portage/package/ebuild/deprecated_profile_check.py
+++ b/pym/portage/package/ebuild/deprecated_profile_check.py
@@ -1,6 +1,5 @@
 # Copyright 2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 __all__ = ['deprecated_profile_check']
 
diff --git a/pym/portage/package/ebuild/digestcheck.py b/pym/portage/package/ebuild/digestcheck.py
index 65d249489..906bb4a57 100644
--- a/pym/portage/package/ebuild/digestcheck.py
+++ b/pym/portage/package/ebuild/digestcheck.py
@@ -1,6 +1,5 @@
 # Copyright 2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 __all__ = ['digestcheck']
 
diff --git a/pym/portage/package/ebuild/digestgen.py b/pym/portage/package/ebuild/digestgen.py
index 2dd0caef4..e923279f6 100644
--- a/pym/portage/package/ebuild/digestgen.py
+++ b/pym/portage/package/ebuild/digestgen.py
@@ -1,6 +1,5 @@
 # Copyright 2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 __all__ = ['digestgen']
 
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index 4ca74e591..e5716f0a5 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -1,6 +1,5 @@
 # Copyright 2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 __all__ = ['doebuild', 'doebuild_environment', 'spawn', 'spawnebuild']
 
diff --git a/pym/portage/package/ebuild/fetch.py b/pym/portage/package/ebuild/fetch.py
index 04bb4f325..50c591f9d 100644
--- a/pym/portage/package/ebuild/fetch.py
+++ b/pym/portage/package/ebuild/fetch.py
@@ -1,6 +1,5 @@
 # Copyright 2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from __future__ import print_function
 
diff --git a/pym/portage/package/ebuild/getmaskingreason.py b/pym/portage/package/ebuild/getmaskingreason.py
index d0c816439..a8a9626f2 100644
--- a/pym/portage/package/ebuild/getmaskingreason.py
+++ b/pym/portage/package/ebuild/getmaskingreason.py
@@ -1,6 +1,5 @@
 # Copyright 2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 __all__ = ['getmaskingreason']
 
diff --git a/pym/portage/package/ebuild/getmaskingstatus.py b/pym/portage/package/ebuild/getmaskingstatus.py
index a51332028..7211a02dd 100644
--- a/pym/portage/package/ebuild/getmaskingstatus.py
+++ b/pym/portage/package/ebuild/getmaskingstatus.py
@@ -1,6 +1,5 @@
 # Copyright 2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 __all__ = ['getmaskingstatus']
 
diff --git a/pym/portage/package/ebuild/prepare_build_dirs.py b/pym/portage/package/ebuild/prepare_build_dirs.py
index 83031d689..2bf2e9ee0 100644
--- a/pym/portage/package/ebuild/prepare_build_dirs.py
+++ b/pym/portage/package/ebuild/prepare_build_dirs.py
@@ -1,6 +1,5 @@
 # Copyright 2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 __all__ = ['prepare_build_dirs']
 
diff --git a/pym/portage/process.py b/pym/portage/process.py
index 703e7cc9f..9f6ec0e56 100644
--- a/pym/portage/process.py
+++ b/pym/portage/process.py
@@ -1,7 +1,6 @@
 # portage.py -- core Portage functionality
 # Copyright 1998-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 
 import atexit
diff --git a/pym/portage/proxy/__init__.py b/pym/portage/proxy/__init__.py
index 95cbda1ed..f98c56457 100644
--- a/pym/portage/proxy/__init__.py
+++ b/pym/portage/proxy/__init__.py
@@ -1,3 +1,2 @@
 # Copyright 2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/pym/portage/proxy/lazyimport.py b/pym/portage/proxy/lazyimport.py
index 84b2c730b..56591c037 100644
--- a/pym/portage/proxy/lazyimport.py
+++ b/pym/portage/proxy/lazyimport.py
@@ -1,6 +1,5 @@
 # Copyright 2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 __all__ = ['lazyimport']
 
diff --git a/pym/portage/proxy/objectproxy.py b/pym/portage/proxy/objectproxy.py
index 3e5191671..9bcd6b43a 100644
--- a/pym/portage/proxy/objectproxy.py
+++ b/pym/portage/proxy/objectproxy.py
@@ -1,6 +1,5 @@
 # Copyright 2008-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import sys
 
diff --git a/pym/portage/sets/__init__.py b/pym/portage/sets/__init__.py
index 65ade2e54..fb87ce104 100644
--- a/pym/portage/sets/__init__.py
+++ b/pym/portage/sets/__init__.py
@@ -1,6 +1,5 @@
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from __future__ import print_function
 
diff --git a/pym/portage/sets/base.py b/pym/portage/sets/base.py
index 8b791c5e1..56f9df4ed 100644
--- a/pym/portage/sets/base.py
+++ b/pym/portage/sets/base.py
@@ -1,6 +1,5 @@
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import sys
 from portage.dep import Atom, best_match_to_list, match_from_list
diff --git a/pym/portage/sets/dbapi.py b/pym/portage/sets/dbapi.py
index 3ece6f642..5bd7e1688 100644
--- a/pym/portage/sets/dbapi.py
+++ b/pym/portage/sets/dbapi.py
@@ -1,6 +1,5 @@
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import time
 
diff --git a/pym/portage/sets/files.py b/pym/portage/sets/files.py
index 02cf8d7f1..2380fc546 100644
--- a/pym/portage/sets/files.py
+++ b/pym/portage/sets/files.py
@@ -1,6 +1,5 @@
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import errno
 import re
diff --git a/pym/portage/sets/libs.py b/pym/portage/sets/libs.py
index b8aa3c41c..624e70bf6 100644
--- a/pym/portage/sets/libs.py
+++ b/pym/portage/sets/libs.py
@@ -1,6 +1,5 @@
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from __future__ import print_function
 
diff --git a/pym/portage/sets/profiles.py b/pym/portage/sets/profiles.py
index da3a25e86..3e2ab9055 100644
--- a/pym/portage/sets/profiles.py
+++ b/pym/portage/sets/profiles.py
@@ -1,6 +1,5 @@
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import logging
 
diff --git a/pym/portage/sets/security.py b/pym/portage/sets/security.py
index 115c0f3bd..61dfed819 100644
--- a/pym/portage/sets/security.py
+++ b/pym/portage/sets/security.py
@@ -1,6 +1,5 @@
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import portage.glsa as glsa
 from portage.sets.base import PackageSet
diff --git a/pym/portage/sets/shell.py b/pym/portage/sets/shell.py
index 658353ef2..2edd82d7e 100644
--- a/pym/portage/sets/shell.py
+++ b/pym/portage/sets/shell.py
@@ -1,6 +1,5 @@
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import subprocess
 
diff --git a/pym/portage/tests/__init__.py b/pym/portage/tests/__init__.py
index fec1e238e..704847198 100644
--- a/pym/portage/tests/__init__.py
+++ b/pym/portage/tests/__init__.py
@@ -1,7 +1,6 @@
 # tests/__init__.py -- Portage Unit Test functionality
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import sys
 import time
diff --git a/pym/portage/tests/bin/setup_env.py b/pym/portage/tests/bin/setup_env.py
index fdc5cd21c..a73e2ddc8 100644
--- a/pym/portage/tests/bin/setup_env.py
+++ b/pym/portage/tests/bin/setup_env.py
@@ -1,7 +1,6 @@
 # setup_env.py -- Make sure bin subdir has sane env for testing
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import tempfile
 
diff --git a/pym/portage/tests/bin/test_dobin.py b/pym/portage/tests/bin/test_dobin.py
index 7b22f14a6..b9e9bbb1a 100644
--- a/pym/portage/tests/bin/test_dobin.py
+++ b/pym/portage/tests/bin/test_dobin.py
@@ -1,7 +1,6 @@
 # test_dobin.py -- Portage Unit Testing Functionality
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage.tests.bin.setup_env import BinTestCase, dobin, xexists_in_D
 
diff --git a/pym/portage/tests/bin/test_dodir.py b/pym/portage/tests/bin/test_dodir.py
index 04e52077f..c6a71ed86 100644
--- a/pym/portage/tests/bin/test_dodir.py
+++ b/pym/portage/tests/bin/test_dodir.py
@@ -1,7 +1,6 @@
 # test_dodir.py -- Portage Unit Testing Functionality
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage.tests.bin.setup_env import BinTestCase, dodir, exists_in_D
 
diff --git a/pym/portage/tests/dep/__init__.py b/pym/portage/tests/dep/__init__.py
index a3226c133..9c3f52476 100644
--- a/pym/portage/tests/dep/__init__.py
+++ b/pym/portage/tests/dep/__init__.py
@@ -1,4 +1,3 @@
 # tests/portage.dep/__init__.py -- Portage Unit Test functionality
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/pym/portage/tests/dep/testAtom.py b/pym/portage/tests/dep/testAtom.py
index c527bb7d2..8d69e425f 100644
--- a/pym/portage/tests/dep/testAtom.py
+++ b/pym/portage/tests/dep/testAtom.py
@@ -1,7 +1,6 @@
 # test_isvalidatom.py -- Portage Unit Testing Functionality
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage.tests import TestCase
 from portage.dep import Atom
diff --git a/pym/portage/tests/dep/test_dep_getcpv.py b/pym/portage/tests/dep/test_dep_getcpv.py
index 893de0c6e..8a0a8aa2f 100644
--- a/pym/portage/tests/dep/test_dep_getcpv.py
+++ b/pym/portage/tests/dep/test_dep_getcpv.py
@@ -1,7 +1,6 @@
 # test_dep_getcpv.py -- Portage Unit Testing Functionality
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage.tests import TestCase
 from portage.dep import dep_getcpv
diff --git a/pym/portage/tests/dep/test_dep_getslot.py b/pym/portage/tests/dep/test_dep_getslot.py
index 925a03ffc..206cecc8c 100644
--- a/pym/portage/tests/dep/test_dep_getslot.py
+++ b/pym/portage/tests/dep/test_dep_getslot.py
@@ -1,7 +1,6 @@
 # test_dep_getslot.py -- Portage Unit Testing Functionality
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage.tests import TestCase
 from portage.dep import dep_getslot
diff --git a/pym/portage/tests/dep/test_dep_getusedeps.py b/pym/portage/tests/dep/test_dep_getusedeps.py
index 82649e243..05977b157 100644
--- a/pym/portage/tests/dep/test_dep_getusedeps.py
+++ b/pym/portage/tests/dep/test_dep_getusedeps.py
@@ -1,7 +1,6 @@
 # test_dep_getusedeps.py -- Portage Unit Testing Functionality
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage.tests import TestCase
 from portage.dep import dep_getusedeps
diff --git a/pym/portage/tests/dep/test_get_operator.py b/pym/portage/tests/dep/test_get_operator.py
index fec6223a5..4f9848f5d 100644
--- a/pym/portage/tests/dep/test_get_operator.py
+++ b/pym/portage/tests/dep/test_get_operator.py
@@ -1,7 +1,6 @@
 # test_get_operator.py -- Portage Unit Testing Functionality
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage.tests import TestCase
 from portage.dep import get_operator
diff --git a/pym/portage/tests/dep/test_isjustname.py b/pym/portage/tests/dep/test_isjustname.py
index e6b0e8531..c16fb5493 100644
--- a/pym/portage/tests/dep/test_isjustname.py
+++ b/pym/portage/tests/dep/test_isjustname.py
@@ -1,7 +1,6 @@
 # test_isjustname.py -- Portage Unit Testing Functionality
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage.tests import TestCase
 from portage.dep import isjustname
diff --git a/pym/portage/tests/dep/test_isvalidatom.py b/pym/portage/tests/dep/test_isvalidatom.py
index da91a8cfa..54a930385 100644
--- a/pym/portage/tests/dep/test_isvalidatom.py
+++ b/pym/portage/tests/dep/test_isvalidatom.py
@@ -1,7 +1,6 @@
 # test_isvalidatom.py -- Portage Unit Testing Functionality
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage.tests import TestCase
 from portage.dep import isvalidatom
diff --git a/pym/portage/tests/dep/test_match_from_list.py b/pym/portage/tests/dep/test_match_from_list.py
index 8d5b1a812..d6df1f29f 100644
--- a/pym/portage/tests/dep/test_match_from_list.py
+++ b/pym/portage/tests/dep/test_match_from_list.py
@@ -1,7 +1,6 @@
 # test_match_from_list.py -- Portage Unit Testing Functionality
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage.tests import TestCase
 from portage.dep import match_from_list
diff --git a/pym/portage/tests/dep/test_src_uri.py b/pym/portage/tests/dep/test_src_uri.py
index 9955ca096..45ba09bc2 100644
--- a/pym/portage/tests/dep/test_src_uri.py
+++ b/pym/portage/tests/dep/test_src_uri.py
@@ -1,6 +1,5 @@
 # Copyright 2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage.tests import TestCase
 from portage.dep import paren_reduce
diff --git a/pym/portage/tests/dep/test_use_reduce.py b/pym/portage/tests/dep/test_use_reduce.py
index 07b9ddbb9..ac3a13c0f 100644
--- a/pym/portage/tests/dep/test_use_reduce.py
+++ b/pym/portage/tests/dep/test_use_reduce.py
@@ -1,6 +1,5 @@
 # Copyright 2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage.tests import TestCase
 from portage.exception import InvalidDependString
diff --git a/pym/portage/tests/ebuild/__init__.py b/pym/portage/tests/ebuild/__init__.py
index d67b0cd85..e2d487ecb 100644
--- a/pym/portage/tests/ebuild/__init__.py
+++ b/pym/portage/tests/ebuild/__init__.py
@@ -1,3 +1,2 @@
 # Copyright 1998-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/pym/portage/tests/ebuild/test_array_fromfile_eof.py b/pym/portage/tests/ebuild/test_array_fromfile_eof.py
index efb292f8a..3f2a6c7c5 100644
--- a/pym/portage/tests/ebuild/test_array_fromfile_eof.py
+++ b/pym/portage/tests/ebuild/test_array_fromfile_eof.py
@@ -1,6 +1,5 @@
 # Copyright 2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import array
 import tempfile
diff --git a/pym/portage/tests/ebuild/test_pty_eof.py b/pym/portage/tests/ebuild/test_pty_eof.py
index 6280eb263..a910f98b5 100644
--- a/pym/portage/tests/ebuild/test_pty_eof.py
+++ b/pym/portage/tests/ebuild/test_pty_eof.py
@@ -1,6 +1,5 @@
 # Copyright 2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import portage
 from portage.tests import TestCase
diff --git a/pym/portage/tests/ebuild/test_spawn.py b/pym/portage/tests/ebuild/test_spawn.py
index 8dfbddd78..f37a0c5a3 100644
--- a/pym/portage/tests/ebuild/test_spawn.py
+++ b/pym/portage/tests/ebuild/test_spawn.py
@@ -1,6 +1,5 @@
 # Copyright 1998-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import codecs
 import errno
diff --git a/pym/portage/tests/env/__init__.py b/pym/portage/tests/env/__init__.py
index 50e38af99..cbeabe5c6 100644
--- a/pym/portage/tests/env/__init__.py
+++ b/pym/portage/tests/env/__init__.py
@@ -1,5 +1,4 @@
 # tests/portage/env/__init__.py -- Portage Unit Test functionality
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
diff --git a/pym/portage/tests/env/config/__init__.py b/pym/portage/tests/env/config/__init__.py
index 7fc0d0e96..ef5cc43b6 100644
--- a/pym/portage/tests/env/config/__init__.py
+++ b/pym/portage/tests/env/config/__init__.py
@@ -1,5 +1,4 @@
 # tests/portage/env/config/__init__.py -- Portage Unit Test functionality
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
diff --git a/pym/portage/tests/env/config/test_PackageKeywordsFile.py b/pym/portage/tests/env/config/test_PackageKeywordsFile.py
index d01633125..f1e9e98f0 100644
--- a/pym/portage/tests/env/config/test_PackageKeywordsFile.py
+++ b/pym/portage/tests/env/config/test_PackageKeywordsFile.py
@@ -1,7 +1,6 @@
 # test_PackageKeywordsFile.py -- Portage Unit Testing Functionality
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage import os
 from portage.tests import TestCase
diff --git a/pym/portage/tests/env/config/test_PackageMaskFile.py b/pym/portage/tests/env/config/test_PackageMaskFile.py
index 90cdf5387..0c5b30f53 100644
--- a/pym/portage/tests/env/config/test_PackageMaskFile.py
+++ b/pym/portage/tests/env/config/test_PackageMaskFile.py
@@ -1,7 +1,6 @@
 # test_PackageMaskFile.py -- Portage Unit Testing Functionality
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage import os
 from portage.env.config import PackageMaskFile
diff --git a/pym/portage/tests/env/config/test_PackageUseFile.py b/pym/portage/tests/env/config/test_PackageUseFile.py
index 4157d6097..7a3806792 100644
--- a/pym/portage/tests/env/config/test_PackageUseFile.py
+++ b/pym/portage/tests/env/config/test_PackageUseFile.py
@@ -1,7 +1,6 @@
 # test_PackageUseFile.py -- Portage Unit Testing Functionality
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage import os
 from portage.tests import TestCase
diff --git a/pym/portage/tests/env/config/test_PortageModulesFile.py b/pym/portage/tests/env/config/test_PortageModulesFile.py
index 8a37b73bd..2cd1a8ab1 100644
--- a/pym/portage/tests/env/config/test_PortageModulesFile.py
+++ b/pym/portage/tests/env/config/test_PortageModulesFile.py
@@ -1,6 +1,5 @@
 # Copyright 2006-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage import os
 from portage.tests import TestCase
diff --git a/pym/portage/tests/lint/test_compile_modules.py b/pym/portage/tests/lint/test_compile_modules.py
index da039f4dd..ec6edfa9b 100644
--- a/pym/portage/tests/lint/test_compile_modules.py
+++ b/pym/portage/tests/lint/test_compile_modules.py
@@ -1,6 +1,5 @@
 # Copyright 2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage.const import PORTAGE_PYM_PATH
 from portage.tests import TestCase
diff --git a/pym/portage/tests/news/__init__.py b/pym/portage/tests/news/__init__.py
index aeaa49195..28a753f9c 100644
--- a/pym/portage/tests/news/__init__.py
+++ b/pym/portage/tests/news/__init__.py
@@ -1,4 +1,3 @@
 # tests/portage.news/__init__.py -- Portage Unit Test functionality
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/pym/portage/tests/news/test_NewsItem.py b/pym/portage/tests/news/test_NewsItem.py
index 721ab2690..a4e76f3f7 100644
--- a/pym/portage/tests/news/test_NewsItem.py
+++ b/pym/portage/tests/news/test_NewsItem.py
@@ -1,7 +1,6 @@
 # test_NewsItem.py -- Portage Unit Testing Functionality
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage import os
 from portage.tests import TestCase
diff --git a/pym/portage/tests/process/__init__.py b/pym/portage/tests/process/__init__.py
index 21d15a4bf..d19e353cc 100644
--- a/pym/portage/tests/process/__init__.py
+++ b/pym/portage/tests/process/__init__.py
@@ -1,3 +1,2 @@
 # Copyright 1998-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/pym/portage/tests/process/test_poll.py b/pym/portage/tests/process/test_poll.py
index 22aa6aa8b..19cc05710 100644
--- a/pym/portage/tests/process/test_poll.py
+++ b/pym/portage/tests/process/test_poll.py
@@ -1,6 +1,5 @@
 # Copyright 1998-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import sys
 from portage import os
diff --git a/pym/portage/tests/runTests b/pym/portage/tests/runTests
index 7cdf5762a..3afe8e20f 100755..100644
--- a/pym/portage/tests/runTests
+++ b/pym/portage/tests/runTests
@@ -2,7 +2,6 @@
 # runTests.py -- Portage Unit Test Functionality
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import os, sys
 import os.path as osp
diff --git a/pym/portage/tests/sets/files/testConfigFileSet.py b/pym/portage/tests/sets/files/testConfigFileSet.py
index 95ea4f44a..c11228e9c 100644
--- a/pym/portage/tests/sets/files/testConfigFileSet.py
+++ b/pym/portage/tests/sets/files/testConfigFileSet.py
@@ -1,7 +1,6 @@
 # testConfigFileSet.py -- Portage Unit Testing Functionality
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import tempfile
 
diff --git a/pym/portage/tests/sets/files/testStaticFileSet.py b/pym/portage/tests/sets/files/testStaticFileSet.py
index 138c99e5e..174190dbb 100644
--- a/pym/portage/tests/sets/files/testStaticFileSet.py
+++ b/pym/portage/tests/sets/files/testStaticFileSet.py
@@ -1,7 +1,6 @@
 # testStaticFileSet.py -- Portage Unit Testing Functionality
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import tempfile
 
diff --git a/pym/portage/tests/sets/shell/testShell.py b/pym/portage/tests/sets/shell/testShell.py
index 43d69599a..dd8825412 100644
--- a/pym/portage/tests/sets/shell/testShell.py
+++ b/pym/portage/tests/sets/shell/testShell.py
@@ -1,7 +1,6 @@
 # testCommandOututSet.py -- Portage Unit Testing Functionality
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage.process import find_binary
 from portage.tests import TestCase, test_cps
diff --git a/pym/portage/tests/util/__init__.py b/pym/portage/tests/util/__init__.py
index 9a66903d1..69ce1898d 100644
--- a/pym/portage/tests/util/__init__.py
+++ b/pym/portage/tests/util/__init__.py
@@ -1,5 +1,4 @@
 # tests/portage.util/__init__.py -- Portage Unit Test functionality
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
diff --git a/pym/portage/tests/util/test_grabdict.py b/pym/portage/tests/util/test_grabdict.py
index 2a0642243..3bf719054 100644
--- a/pym/portage/tests/util/test_grabdict.py
+++ b/pym/portage/tests/util/test_grabdict.py
@@ -1,7 +1,6 @@
 # test_grabDict.py -- Portage Unit Testing Functionality
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage.tests import TestCase
 from portage.util import grabdict
diff --git a/pym/portage/tests/util/test_normalizedPath.py b/pym/portage/tests/util/test_normalizedPath.py
index b6851651a..f993886ac 100644
--- a/pym/portage/tests/util/test_normalizedPath.py
+++ b/pym/portage/tests/util/test_normalizedPath.py
@@ -1,7 +1,6 @@
 # test_normalizePath.py -- Portage Unit Testing Functionality
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage.tests import TestCase
 
diff --git a/pym/portage/tests/util/test_stackDictList.py b/pym/portage/tests/util/test_stackDictList.py
index ada56fa0f..678001c38 100644
--- a/pym/portage/tests/util/test_stackDictList.py
+++ b/pym/portage/tests/util/test_stackDictList.py
@@ -1,7 +1,6 @@
 # test_stackDictList.py -- Portage Unit Testing Functionality
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage.tests import TestCase
 
diff --git a/pym/portage/tests/util/test_stackDicts.py b/pym/portage/tests/util/test_stackDicts.py
index 0c109a9cf..0d2cadd0c 100644
--- a/pym/portage/tests/util/test_stackDicts.py
+++ b/pym/portage/tests/util/test_stackDicts.py
@@ -1,7 +1,6 @@
 # test_stackDicts.py -- Portage Unit Testing Functionality
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage.tests import TestCase
 from portage.util import stack_dicts
diff --git a/pym/portage/tests/util/test_stackLists.py b/pym/portage/tests/util/test_stackLists.py
index c26bbb06a..8d01ea5ac 100644
--- a/pym/portage/tests/util/test_stackLists.py
+++ b/pym/portage/tests/util/test_stackLists.py
@@ -1,7 +1,6 @@
 # test_stackLists.py -- Portage Unit Testing Functionality
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage.tests import TestCase
 from portage.util import stack_lists
diff --git a/pym/portage/tests/util/test_uniqueArray.py b/pym/portage/tests/util/test_uniqueArray.py
index e9485b126..34daaf23c 100644
--- a/pym/portage/tests/util/test_uniqueArray.py
+++ b/pym/portage/tests/util/test_uniqueArray.py
@@ -1,7 +1,6 @@
 # test_uniqueArray.py -- Portage Unit Testing Functionality
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage import os
 from portage.tests import TestCase
diff --git a/pym/portage/tests/util/test_varExpand.py b/pym/portage/tests/util/test_varExpand.py
index e4f85ef43..1c2500dbd 100644
--- a/pym/portage/tests/util/test_varExpand.py
+++ b/pym/portage/tests/util/test_varExpand.py
@@ -1,7 +1,6 @@
 # test_varExpand.py -- Portage Unit Testing Functionality
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage.tests import TestCase
 from portage.util import varexpand
diff --git a/pym/portage/tests/versions/__init__.py b/pym/portage/tests/versions/__init__.py
index 5e5b216fb..2b14180bc 100644
--- a/pym/portage/tests/versions/__init__.py
+++ b/pym/portage/tests/versions/__init__.py
@@ -1,4 +1,3 @@
 # tests/portage.versions/__init__.py -- Portage Unit Test functionality
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/pym/portage/tests/versions/test_vercmp.py b/pym/portage/tests/versions/test_vercmp.py
index eb2ba3eb0..23e7dd575 100644
--- a/pym/portage/tests/versions/test_vercmp.py
+++ b/pym/portage/tests/versions/test_vercmp.py
@@ -1,7 +1,6 @@
 # test_vercmp.py -- Portage Unit Testing Functionality
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 from portage.tests import TestCase
 from portage.versions import vercmp
diff --git a/pym/portage/tests/xpak/__init__.py b/pym/portage/tests/xpak/__init__.py
index a3226c133..9c3f52476 100644
--- a/pym/portage/tests/xpak/__init__.py
+++ b/pym/portage/tests/xpak/__init__.py
@@ -1,4 +1,3 @@
 # tests/portage.dep/__init__.py -- Portage Unit Test functionality
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
diff --git a/pym/portage/tests/xpak/test_decodeint.py b/pym/portage/tests/xpak/test_decodeint.py
index b949b031d..2da573598 100644
--- a/pym/portage/tests/xpak/test_decodeint.py
+++ b/pym/portage/tests/xpak/test_decodeint.py
@@ -1,7 +1,6 @@
 # xpak/test_decodeint.py
 # Copright Gentoo Foundation 2006
 # Portage Unit Testing Functionality
-# $Id$
 
 from portage.tests import TestCase
 from portage.xpak import decodeint, encodeint
diff --git a/pym/portage/update.py b/pym/portage/update.py
index c55741473..7d48e1d17 100644
--- a/pym/portage/update.py
+++ b/pym/portage/update.py
@@ -1,6 +1,5 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import codecs
 import errno
diff --git a/pym/portage/util/ExtractKernelVersion.py b/pym/portage/util/ExtractKernelVersion.py
index 9e6433b28..1cdb8bf13 100644
--- a/pym/portage/util/ExtractKernelVersion.py
+++ b/pym/portage/util/ExtractKernelVersion.py
@@ -1,6 +1,5 @@
 # Copyright 2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 __all__ = ['ExtractKernelVersion']
 
diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py
index e72961269..541204334 100644
--- a/pym/portage/util/__init__.py
+++ b/pym/portage/util/__init__.py
@@ -1,6 +1,5 @@
 # Copyright 2004-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 __all__ = ['apply_permissions', 'apply_recursive_permissions',
 	'apply_secpass_permissions', 'apply_stat_permissions', 'atomic_ofstream',
diff --git a/pym/portage/util/_pty.py b/pym/portage/util/_pty.py
index c48584f58..7fba0e2ba 100644
--- a/pym/portage/util/_pty.py
+++ b/pym/portage/util/_pty.py
@@ -1,6 +1,5 @@
 # Copyright 2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 import array
 import fcntl
diff --git a/pym/portage/util/digraph.py b/pym/portage/util/digraph.py
index dbb86a3c4..4502ed582 100644
--- a/pym/portage/util/digraph.py
+++ b/pym/portage/util/digraph.py
@@ -1,6 +1,5 @@
 # Copyright 2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 __all__ = ['digraph']
 
diff --git a/pym/portage/util/env_update.py b/pym/portage/util/env_update.py
index 6f8e91a83..26fcf9ff7 100644
--- a/pym/portage/util/env_update.py
+++ b/pym/portage/util/env_update.py
@@ -1,6 +1,5 @@
 # Copyright 2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 __all__ = ['env_update']
 
diff --git a/pym/portage/util/listdir.py b/pym/portage/util/listdir.py
index 82705acc9..ab7ffddf5 100644
--- a/pym/portage/util/listdir.py
+++ b/pym/portage/util/listdir.py
@@ -1,6 +1,5 @@
 # Copyright 2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 __all__ = ['cacheddir', 'listdir']
 
diff --git a/pym/portage/util/movefile.py b/pym/portage/util/movefile.py
index 23110ab05..298d15186 100644
--- a/pym/portage/util/movefile.py
+++ b/pym/portage/util/movefile.py
@@ -1,6 +1,5 @@
 # Copyright 2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 __all__ = ['movefile']
 
diff --git a/pym/portage/util/mtimedb.py b/pym/portage/util/mtimedb.py
index cbeb1bb8c..660e9d69f 100644
--- a/pym/portage/util/mtimedb.py
+++ b/pym/portage/util/mtimedb.py
@@ -1,6 +1,5 @@
 # Copyright 2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 __all__ = ['MtimeDB']
 
diff --git a/pym/portage/versions.py b/pym/portage/versions.py
index c8159741b..a4765ef1c 100644
--- a/pym/portage/versions.py
+++ b/pym/portage/versions.py
@@ -1,7 +1,6 @@
 # versions.py -- core Portage functionality
 # Copyright 1998-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 __all__ = [
 	'best', 'catpkgsplit', 'catsplit',
diff --git a/pym/portage/xpak.py b/pym/portage/xpak.py
index 7d595bdab..c72ce257a 100644
--- a/pym/portage/xpak.py
+++ b/pym/portage/xpak.py
@@ -1,6 +1,5 @@
 # Copyright 2001-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 
 # The format for a tbz2/xpak:
diff --git a/pym/portage_compat_namespace.py b/pym/portage_compat_namespace.py
index 736b67833..2dc772838 100644
--- a/pym/portage_compat_namespace.py
+++ b/pym/portage_compat_namespace.py
@@ -1,7 +1,6 @@
 # portage_compat_namespace.py -- provide compability layer with new namespace
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 """ 
 This module checks the name under which it is imported and attempts to load
diff --git a/pym/portage_exec.py b/pym/portage_exec.py
index aa8da0aa0..669a92cce 100644
--- a/pym/portage_exec.py
+++ b/pym/portage_exec.py
@@ -1,7 +1,6 @@
 # portage_compat_namespace.py -- provide compability layer with new namespace
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 """ 
 Special edition of portage_compat_namespace.py as for this module we can't translate
diff --git a/pym/repoman/checks.py b/pym/repoman/checks.py
index 79ba892e6..c918eea6d 100644
--- a/pym/repoman/checks.py
+++ b/pym/repoman/checks.py
@@ -1,7 +1,6 @@
 # repoman: Checks
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 """This module contains functions used in Repoman to ascertain the quality
 and correctness of an ebuild."""
diff --git a/pym/repoman/errors.py b/pym/repoman/errors.py
index cd1d7e3d7..c419b79fa 100644
--- a/pym/repoman/errors.py
+++ b/pym/repoman/errors.py
@@ -1,7 +1,6 @@
 # repoman: Error Messages
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 COPYRIGHT_ERROR = 'Invalid Gentoo Copyright on line: %d'
 LICENSE_ERROR = 'Invalid Gentoo/GPL License on line: %d'
diff --git a/pym/repoman/herdbase.py b/pym/repoman/herdbase.py
index 3734a2f0a..924839a61 100644
--- a/pym/repoman/herdbase.py
+++ b/pym/repoman/herdbase.py
@@ -2,7 +2,6 @@
 # repoman: Herd database analysis
 # Copyright 2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: $
 
 import xml.etree.ElementTree as ET
 from xml.parsers.expat import ExpatError
diff --git a/pym/repoman/utilities.py b/pym/repoman/utilities.py
index 1efed7663..cd7f5ea87 100644
--- a/pym/repoman/utilities.py
+++ b/pym/repoman/utilities.py
@@ -1,7 +1,6 @@
 # repoman: Utilities
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 """This module contains utility functions to help repoman find ebuilds to
 scan"""
author	Zac Medico <zmedico@gentoo.org>	2010-03-24 00:13:00 -0700
committer	Zac Medico <zmedico@gentoo.org>	2010-03-24 00:13:00 -0700
commit	c790b7ce4c8e3b95b1ef0103129388c06c5eaa4b (patch)
tree	95a8b912dd518ffe4c7894890f2e8bf5c4929a9a /pym
parent	f1b05b7098ba448a0987bc61224d6616dad3ecde (diff)
download	portage-c790b7ce4c8e3b95b1ef0103129388c06c5eaa4b.tar.gz portage-c790b7ce4c8e3b95b1ef0103129388c06c5eaa4b.tar.bz2 portage-c790b7ce4c8e3b95b1ef0103129388c06c5eaa4b.zip