summaryrefslogtreecommitdiffstats
path: root/pym/portage
diff options
context:
space:
mode:
Diffstat (limited to 'pym/portage')
-rw-r--r--pym/portage/__init__.py1
-rw-r--r--pym/portage/_deprecated.py1
-rw-r--r--pym/portage/_ensure_encodings.py1
-rw-r--r--pym/portage/_global_updates.py1
-rw-r--r--pym/portage/_legacy_globals.py1
-rw-r--r--pym/portage/_selinux.py1
-rw-r--r--pym/portage/cache/__init__.py1
-rw-r--r--pym/portage/cache/anydbm.py1
-rw-r--r--pym/portage/cache/cache_errors.py1
-rw-r--r--pym/portage/cache/ebuild_xattr.py1
-rw-r--r--pym/portage/cache/flat_hash.py1
-rw-r--r--pym/portage/cache/fs_template.py1
-rw-r--r--pym/portage/cache/mappings.py1
-rw-r--r--pym/portage/cache/metadata.py1
-rw-r--r--pym/portage/cache/metadata_overlay.py1
-rw-r--r--pym/portage/cache/sql_template.py1
-rw-r--r--pym/portage/cache/sqlite.py1
-rw-r--r--pym/portage/cache/template.py1
-rw-r--r--pym/portage/cache/util.py1
-rw-r--r--pym/portage/cache/volatile.py1
-rw-r--r--pym/portage/checksum.py1
-rw-r--r--pym/portage/const.py1
-rw-r--r--pym/portage/cvstree.py1
-rw-r--r--pym/portage/data.py1
-rw-r--r--pym/portage/dbapi/__init__.py1
-rw-r--r--pym/portage/dbapi/bintree.py1
-rw-r--r--pym/portage/dbapi/cpv_expand.py1
-rw-r--r--pym/portage/dbapi/dep_expand.py1
-rw-r--r--pym/portage/dbapi/porttree.py1
-rw-r--r--pym/portage/dbapi/vartree.py1
-rw-r--r--pym/portage/dbapi/virtual.py1
-rw-r--r--pym/portage/debug.py1
-rw-r--r--pym/portage/dep/__init__.py1
-rw-r--r--pym/portage/dep/dep_check.py1
-rw-r--r--pym/portage/dispatch_conf.py1
-rw-r--r--pym/portage/eclass_cache.py1
-rw-r--r--pym/portage/elog/__init__.py1
-rw-r--r--pym/portage/elog/filtering.py1
-rw-r--r--pym/portage/elog/messages.py1
-rw-r--r--pym/portage/elog/mod_custom.py1
-rw-r--r--pym/portage/elog/mod_echo.py1
-rw-r--r--pym/portage/elog/mod_mail.py1
-rw-r--r--pym/portage/elog/mod_mail_summary.py1
-rw-r--r--pym/portage/elog/mod_save.py1
-rw-r--r--pym/portage/elog/mod_save_summary.py1
-rw-r--r--pym/portage/elog/mod_syslog.py1
-rw-r--r--pym/portage/env/__init__.py1
-rw-r--r--pym/portage/env/config.py1
-rw-r--r--pym/portage/env/loaders.py1
-rw-r--r--pym/portage/env/validators.py1
-rw-r--r--pym/portage/exception.py1
-rw-r--r--pym/portage/getbinpkg.py1
-rw-r--r--pym/portage/glsa.py1
-rw-r--r--pym/portage/localization.py1
-rw-r--r--pym/portage/locks.py1
-rw-r--r--pym/portage/mail.py1
-rw-r--r--pym/portage/manifest.py1
-rw-r--r--pym/portage/news.py1
-rw-r--r--pym/portage/output.py1
-rw-r--r--pym/portage/package/__init__.py1
-rw-r--r--pym/portage/package/ebuild/__init__.py1
-rw-r--r--pym/portage/package/ebuild/config.py1
-rw-r--r--pym/portage/package/ebuild/deprecated_profile_check.py1
-rw-r--r--pym/portage/package/ebuild/digestcheck.py1
-rw-r--r--pym/portage/package/ebuild/digestgen.py1
-rw-r--r--pym/portage/package/ebuild/doebuild.py1
-rw-r--r--pym/portage/package/ebuild/fetch.py1
-rw-r--r--pym/portage/package/ebuild/getmaskingreason.py1
-rw-r--r--pym/portage/package/ebuild/getmaskingstatus.py1
-rw-r--r--pym/portage/package/ebuild/prepare_build_dirs.py1
-rw-r--r--pym/portage/process.py1
-rw-r--r--pym/portage/proxy/__init__.py1
-rw-r--r--pym/portage/proxy/lazyimport.py1
-rw-r--r--pym/portage/proxy/objectproxy.py1
-rw-r--r--pym/portage/sets/__init__.py1
-rw-r--r--pym/portage/sets/base.py1
-rw-r--r--pym/portage/sets/dbapi.py1
-rw-r--r--pym/portage/sets/files.py1
-rw-r--r--pym/portage/sets/libs.py1
-rw-r--r--pym/portage/sets/profiles.py1
-rw-r--r--pym/portage/sets/security.py1
-rw-r--r--pym/portage/sets/shell.py1
-rw-r--r--pym/portage/tests/__init__.py1
-rw-r--r--pym/portage/tests/bin/setup_env.py1
-rw-r--r--pym/portage/tests/bin/test_dobin.py1
-rw-r--r--pym/portage/tests/bin/test_dodir.py1
-rw-r--r--pym/portage/tests/dep/__init__.py1
-rw-r--r--pym/portage/tests/dep/testAtom.py1
-rw-r--r--pym/portage/tests/dep/test_dep_getcpv.py1
-rw-r--r--pym/portage/tests/dep/test_dep_getslot.py1
-rw-r--r--pym/portage/tests/dep/test_dep_getusedeps.py1
-rw-r--r--pym/portage/tests/dep/test_get_operator.py1
-rw-r--r--pym/portage/tests/dep/test_isjustname.py1
-rw-r--r--pym/portage/tests/dep/test_isvalidatom.py1
-rw-r--r--pym/portage/tests/dep/test_match_from_list.py1
-rw-r--r--pym/portage/tests/dep/test_src_uri.py1
-rw-r--r--pym/portage/tests/dep/test_use_reduce.py1
-rw-r--r--pym/portage/tests/ebuild/__init__.py1
-rw-r--r--pym/portage/tests/ebuild/test_array_fromfile_eof.py1
-rw-r--r--pym/portage/tests/ebuild/test_pty_eof.py1
-rw-r--r--pym/portage/tests/ebuild/test_spawn.py1
-rw-r--r--pym/portage/tests/env/__init__.py1
-rw-r--r--pym/portage/tests/env/config/__init__.py1
-rw-r--r--pym/portage/tests/env/config/test_PackageKeywordsFile.py1
-rw-r--r--pym/portage/tests/env/config/test_PackageMaskFile.py1
-rw-r--r--pym/portage/tests/env/config/test_PackageUseFile.py1
-rw-r--r--pym/portage/tests/env/config/test_PortageModulesFile.py1
-rw-r--r--pym/portage/tests/lint/test_compile_modules.py1
-rw-r--r--pym/portage/tests/news/__init__.py1
-rw-r--r--pym/portage/tests/news/test_NewsItem.py1
-rw-r--r--pym/portage/tests/process/__init__.py1
-rw-r--r--pym/portage/tests/process/test_poll.py1
-rw-r--r--[-rwxr-xr-x]pym/portage/tests/runTests1
-rw-r--r--pym/portage/tests/sets/files/testConfigFileSet.py1
-rw-r--r--pym/portage/tests/sets/files/testStaticFileSet.py1
-rw-r--r--pym/portage/tests/sets/shell/testShell.py1
-rw-r--r--pym/portage/tests/util/__init__.py1
-rw-r--r--pym/portage/tests/util/test_grabdict.py1
-rw-r--r--pym/portage/tests/util/test_normalizedPath.py1
-rw-r--r--pym/portage/tests/util/test_stackDictList.py1
-rw-r--r--pym/portage/tests/util/test_stackDicts.py1
-rw-r--r--pym/portage/tests/util/test_stackLists.py1
-rw-r--r--pym/portage/tests/util/test_uniqueArray.py1
-rw-r--r--pym/portage/tests/util/test_varExpand.py1
-rw-r--r--pym/portage/tests/versions/__init__.py1
-rw-r--r--pym/portage/tests/versions/test_vercmp.py1
-rw-r--r--pym/portage/tests/xpak/__init__.py1
-rw-r--r--pym/portage/tests/xpak/test_decodeint.py1
-rw-r--r--pym/portage/update.py1
-rw-r--r--pym/portage/util/ExtractKernelVersion.py1
-rw-r--r--pym/portage/util/__init__.py1
-rw-r--r--pym/portage/util/_pty.py1
-rw-r--r--pym/portage/util/digraph.py1
-rw-r--r--pym/portage/util/env_update.py1
-rw-r--r--pym/portage/util/listdir.py1
-rw-r--r--pym/portage/util/movefile.py1
-rw-r--r--pym/portage/util/mtimedb.py1
-rw-r--r--pym/portage/versions.py1
-rw-r--r--pym/portage/xpak.py1
139 files changed, 0 insertions, 139 deletions
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ä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: