summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2010-03-24 00:13:00 -0700
committerZac Medico <zmedico@gentoo.org>2010-03-24 00:13:00 -0700
commitc790b7ce4c8e3b95b1ef0103129388c06c5eaa4b (patch)
tree95a8b912dd518ffe4c7894890f2e8bf5c4929a9a
parentDon't use $Id or $Rev for version strings since that doesn't work with git. (diff)
downloadportage-idfetch-c790b7ce4c8e3b95b1ef0103129388c06c5eaa4b.tar.gz
portage-idfetch-c790b7ce4c8e3b95b1ef0103129388c06c5eaa4b.tar.bz2
portage-idfetch-c790b7ce4c8e3b95b1ef0103129388c06c5eaa4b.zip
Remove all svn $Id keywords.
-rw-r--r--[-rwxr-xr-x]bin/archive-conf1
-rw-r--r--[-rwxr-xr-x]bin/banned-helper1
-rw-r--r--[-rwxr-xr-x]bin/clean_locks1
-rw-r--r--[-rwxr-xr-x]bin/dispatch-conf1
-rw-r--r--[-rwxr-xr-x]bin/dohtml.py1
-rw-r--r--[-rwxr-xr-x]bin/ebuild1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/4/dodoc1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/die1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/dobin1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/doconfd1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/dodir1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/dodoc1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/doenvd1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/doexe1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/dohard1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/dohtml1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/doinfo1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/doinitd1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/doins1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/dolib1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/dolib.a1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/dolib.so1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/doman1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/domo1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/dosbin1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/dosed1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/dosym1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/ecompress1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/ecompressdir1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/elog1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/emake1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/fowners1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/fperms1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/newbin1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/newconfd1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/newdoc1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/newenvd1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/newexe1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/newinitd1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/newins1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/newlib.a1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/newlib.so1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/newman1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/newsbin1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/portageq1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/prepall1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/prepalldocs1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/prepallinfo1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/prepallman1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/prepallstrip1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/prepinfo1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/preplib1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/prepman1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/prepstrip1
-rw-r--r--[-rwxr-xr-x]bin/ebuild-helpers/sed1
-rw-r--r--[-rwxr-xr-x]bin/ebuild.sh1
-rw-r--r--[-rwxr-xr-x]bin/egencache1
-rw-r--r--[-rwxr-xr-x]bin/emerge1
-rw-r--r--[-rwxr-xr-x]bin/emerge-webrsync1
-rw-r--r--[-rwxr-xr-x]bin/env-update1
-rw-r--r--[-rwxr-xr-x]bin/etc-update1
-rw-r--r--[-rwxr-xr-x]bin/filter-bash-environment.py1
-rw-r--r--[-rwxr-xr-x]bin/fixpackages1
-rw-r--r--[-rwxr-xr-x]bin/glsa-check1
-rw-r--r--[-rwxr-xr-x]bin/isolated-functions.sh1
-rw-r--r--[-rwxr-xr-x]bin/misc-functions.sh1
-rw-r--r--[-rwxr-xr-x]bin/portageq1
-rw-r--r--[-rwxr-xr-x]bin/quickpkg1
-rw-r--r--[-rwxr-xr-x]bin/regenworld1
-rw-r--r--[-rwxr-xr-x]bin/repoman1
-rw-r--r--[-rwxr-xr-x]bin/xpak-helper.py1
-rw-r--r--cnf/logrotate.d/elog-save-summary1
-rw-r--r--cnf/make.conf1
-rw-r--r--cnf/make.globals1
-rw-r--r--pym/_emerge/AbstractDepPriority.py1
-rw-r--r--pym/_emerge/AbstractEbuildProcess.py1
-rw-r--r--pym/_emerge/AbstractPollTask.py1
-rw-r--r--pym/_emerge/AsynchronousTask.py1
-rw-r--r--pym/_emerge/AtomArg.py1
-rw-r--r--pym/_emerge/Binpkg.py1
-rw-r--r--pym/_emerge/BinpkgExtractorAsync.py1
-rw-r--r--pym/_emerge/BinpkgFetcher.py1
-rw-r--r--pym/_emerge/BinpkgPrefetcher.py1
-rw-r--r--pym/_emerge/BinpkgVerifier.py1
-rw-r--r--pym/_emerge/Blocker.py1
-rw-r--r--pym/_emerge/BlockerCache.py1
-rw-r--r--pym/_emerge/BlockerDB.py1
-rw-r--r--pym/_emerge/BlockerDepPriority.py1
-rw-r--r--pym/_emerge/CompositeTask.py1
-rw-r--r--pym/_emerge/DepPriority.py1
-rw-r--r--pym/_emerge/DepPriorityNormalRange.py1
-rw-r--r--pym/_emerge/DepPrioritySatisfiedRange.py1
-rw-r--r--pym/_emerge/Dependency.py1
-rw-r--r--pym/_emerge/DependencyArg.py1
-rw-r--r--pym/_emerge/EbuildBinpkg.py1
-rw-r--r--pym/_emerge/EbuildBuild.py1
-rw-r--r--pym/_emerge/EbuildBuildDir.py1
-rw-r--r--pym/_emerge/EbuildExecuter.py1
-rw-r--r--pym/_emerge/EbuildFetcher.py1
-rw-r--r--pym/_emerge/EbuildFetchonly.py1
-rw-r--r--pym/_emerge/EbuildMerge.py1
-rw-r--r--pym/_emerge/EbuildMetadataPhase.py1
-rw-r--r--pym/_emerge/EbuildPhase.py1
-rw-r--r--pym/_emerge/EbuildProcess.py1
-rw-r--r--pym/_emerge/FakeVartree.py1
-rw-r--r--pym/_emerge/JobStatusDisplay.py1
-rw-r--r--pym/_emerge/MergeListItem.py1
-rw-r--r--pym/_emerge/MetadataRegen.py1
-rw-r--r--pym/_emerge/MiscFunctionsProcess.py1
-rw-r--r--pym/_emerge/Package.py1
-rw-r--r--pym/_emerge/PackageArg.py1
-rw-r--r--pym/_emerge/PackageCounters.py1
-rw-r--r--pym/_emerge/PackageMerge.py1
-rw-r--r--pym/_emerge/PackageUninstall.py1
-rw-r--r--pym/_emerge/PackageVirtualDbapi.py1
-rw-r--r--pym/_emerge/PipeReader.py1
-rw-r--r--pym/_emerge/PollConstants.py1
-rw-r--r--pym/_emerge/PollScheduler.py1
-rw-r--r--pym/_emerge/PollSelectAdapter.py1
-rw-r--r--pym/_emerge/ProgressHandler.py1
-rw-r--r--pym/_emerge/QueueScheduler.py1
-rw-r--r--pym/_emerge/RepoDisplay.py1
-rw-r--r--pym/_emerge/RootConfig.py1
-rw-r--r--pym/_emerge/Scheduler.py1
-rw-r--r--pym/_emerge/SequentialTaskQueue.py1
-rw-r--r--pym/_emerge/SetArg.py1
-rw-r--r--pym/_emerge/SlotObject.py1
-rw-r--r--pym/_emerge/SpawnProcess.py1
-rw-r--r--pym/_emerge/SubProcess.py1
-rw-r--r--pym/_emerge/Task.py1
-rw-r--r--pym/_emerge/TaskScheduler.py1
-rw-r--r--pym/_emerge/TaskSequence.py1
-rw-r--r--pym/_emerge/UninstallFailure.py1
-rw-r--r--pym/_emerge/UnmergeDepPriority.py1
-rw-r--r--pym/_emerge/UseFlagDisplay.py1
-rw-r--r--pym/_emerge/__init__.py1
-rw-r--r--pym/_emerge/_find_deep_system_runtime_deps.py1
-rw-r--r--pym/_emerge/_flush_elog_mod_echo.py1
-rw-r--r--pym/_emerge/actions.py1
-rw-r--r--pym/_emerge/changelog.py1
-rw-r--r--pym/_emerge/clear_caches.py1
-rw-r--r--pym/_emerge/countdown.py1
-rw-r--r--pym/_emerge/create_depgraph_params.py1
-rw-r--r--pym/_emerge/create_world_atom.py1
-rw-r--r--pym/_emerge/depgraph.py1
-rw-r--r--pym/_emerge/emergelog.py1
-rw-r--r--pym/_emerge/format_size.py1
-rw-r--r--pym/_emerge/getloadavg.py1
-rw-r--r--pym/_emerge/help.py1
-rw-r--r--pym/_emerge/is_valid_package_atom.py1
-rw-r--r--pym/_emerge/main.py1
-rw-r--r--pym/_emerge/search.py1
-rw-r--r--pym/_emerge/show_invalid_depstring_notice.py1
-rw-r--r--pym/_emerge/stdout_spinner.py1
-rw-r--r--pym/_emerge/sync/__init__.py1
-rw-r--r--pym/_emerge/sync/old_tree_timestamp.py1
-rw-r--r--pym/_emerge/unmerge.py1
-rw-r--r--pym/_emerge/userquery.py1
-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
-rw-r--r--pym/portage_compat_namespace.py1
-rw-r--r--pym/portage_exec.py1
-rw-r--r--pym/repoman/checks.py1
-rw-r--r--pym/repoman/errors.py1
-rw-r--r--pym/repoman/herdbase.py1
-rw-r--r--pym/repoman/utilities.py1
-rw-r--r--src/bsd-flags/chflags.c1
-rw-r--r--src/bsd-flags/setup.cfg1
-rw-r--r--[-rwxr-xr-x]src/bsd-flags/setup.py1
-rw-r--r--src/python-missingos/ChangeLog1
-rw-r--r--src/python-missingos/README1
-rw-r--r--src/python-missingos/missingos.c1
-rw-r--r--src/python-missingos/setup.cfg1
-rw-r--r--[-rwxr-xr-x]src/python-missingos/setup.py1
-rw-r--r--src/tbz2tool.c1
312 files changed, 0 insertions, 312 deletions
diff --git a/bin/archive-conf b/bin/archive-conf
index d36dc49d..97c055df 100755..100644
--- a/bin/archive-conf
+++ b/bin/archive-conf
@@ -1,7 +1,6 @@
#!/usr/bin/python
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
#
# archive-conf -- save off a config file in the dispatch-conf archive dir
diff --git a/bin/banned-helper b/bin/banned-helper
index aa962a1f..17ea9915 100755..100644
--- a/bin/banned-helper
+++ b/bin/banned-helper
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
die "'${0##*/}' has been banned for EAPI '$EAPI'"
exit 1
diff --git a/bin/clean_locks b/bin/clean_locks
index 95698322..8c4299c9 100755..100644
--- a/bin/clean_locks
+++ b/bin/clean_locks
@@ -1,7 +1,6 @@
#!/usr/bin/python -O
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
from __future__ import print_function
diff --git a/bin/dispatch-conf b/bin/dispatch-conf
index 4ceb1a0f..43fe145a 100755..100644
--- a/bin/dispatch-conf
+++ b/bin/dispatch-conf
@@ -1,7 +1,6 @@
#!/usr/bin/python -O
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
#
# dispatch-conf -- Integrate modified configs, post-emerge
diff --git a/bin/dohtml.py b/bin/dohtml.py
index 421b5e71..00258ec9 100755..100644
--- a/bin/dohtml.py
+++ b/bin/dohtml.py
@@ -1,7 +1,6 @@
#!/usr/bin/python
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
#
# Typical usage:
diff --git a/bin/ebuild b/bin/ebuild
index a4c0bfdb..3eaea943 100755..100644
--- a/bin/ebuild
+++ b/bin/ebuild
@@ -1,7 +1,6 @@
#!/usr/bin/python -O
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
from __future__ import print_function
diff --git a/bin/ebuild-helpers/4/dodoc b/bin/ebuild-helpers/4/dodoc
index 4e7c934a..0539de11 100755..100644
--- a/bin/ebuild-helpers/4/dodoc
+++ b/bin/ebuild-helpers/4/dodoc
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
diff --git a/bin/ebuild-helpers/die b/bin/ebuild-helpers/die
index e871bd9f..7e94bc72 100755..100644
--- a/bin/ebuild-helpers/die
+++ b/bin/ebuild-helpers/die
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# TODO: Eliminate race condition in signal delivery by using pipe or socket
# IPC to guarantee that the ebuild process and all of its children (including
diff --git a/bin/ebuild-helpers/dobin b/bin/ebuild-helpers/dobin
index 87b773f8..821ce07c 100755..100644
--- a/bin/ebuild-helpers/dobin
+++ b/bin/ebuild-helpers/dobin
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
diff --git a/bin/ebuild-helpers/doconfd b/bin/ebuild-helpers/doconfd
index 9952ec0f..718c21ec 100755..100644
--- a/bin/ebuild-helpers/doconfd
+++ b/bin/ebuild-helpers/doconfd
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
if [[ $# -lt 1 ]] ; then
echo "$0: at least one argument needed" 1>&2
diff --git a/bin/ebuild-helpers/dodir b/bin/ebuild-helpers/dodir
index 1902c6f3..50e10f45 100755..100644
--- a/bin/ebuild-helpers/dodir
+++ b/bin/ebuild-helpers/dodir
@@ -1,6 +1,5 @@
#!/bin/bash
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
exec install -d ${DIROPTIONS} "${@/#/${D}/}"
diff --git a/bin/ebuild-helpers/dodoc b/bin/ebuild-helpers/dodoc
index 04275703..796e96c6 100755..100644
--- a/bin/ebuild-helpers/dodoc
+++ b/bin/ebuild-helpers/dodoc
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
if [ $# -lt 1 ] ; then
source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
diff --git a/bin/ebuild-helpers/doenvd b/bin/ebuild-helpers/doenvd
index eb7dcd72..cfc70e2a 100755..100644
--- a/bin/ebuild-helpers/doenvd
+++ b/bin/ebuild-helpers/doenvd
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
if [[ $# -lt 1 ]] ; then
echo "$0: at least one argument needed" 1>&2
diff --git a/bin/ebuild-helpers/doexe b/bin/ebuild-helpers/doexe
index 00f43d0c..fb1c5668 100755..100644
--- a/bin/ebuild-helpers/doexe
+++ b/bin/ebuild-helpers/doexe
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
diff --git a/bin/ebuild-helpers/dohard b/bin/ebuild-helpers/dohard
index dfd7bd34..22704876 100755..100644
--- a/bin/ebuild-helpers/dohard
+++ b/bin/ebuild-helpers/dohard
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
if [[ $# -ne 2 ]] ; then
echo "$0: two arguments needed" 1>&2
diff --git a/bin/ebuild-helpers/dohtml b/bin/ebuild-helpers/dohtml
index 95626eb6..cfcab2af 100755..100644
--- a/bin/ebuild-helpers/dohtml
+++ b/bin/ebuild-helpers/dohtml
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
PORTAGE_BIN_PATH=${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}
PORTAGE_PYM_PATH=${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}
diff --git a/bin/ebuild-helpers/doinfo b/bin/ebuild-helpers/doinfo
index 1c9e7cc0..1aaf7fe4 100755..100644
--- a/bin/ebuild-helpers/doinfo
+++ b/bin/ebuild-helpers/doinfo
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
if [[ -z $1 ]] ; then
vecho "${0##*/}: at least one argument needed"
diff --git a/bin/ebuild-helpers/doinitd b/bin/ebuild-helpers/doinitd
index 0f1af940..56c8396c 100755..100644
--- a/bin/ebuild-helpers/doinitd
+++ b/bin/ebuild-helpers/doinitd
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
if [[ $# -lt 1 ]] ; then
echo "$0: at least one argument needed" 1>&2
diff --git a/bin/ebuild-helpers/doins b/bin/ebuild-helpers/doins
index db19750e..64d2af23 100755..100644
--- a/bin/ebuild-helpers/doins
+++ b/bin/ebuild-helpers/doins
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
diff --git a/bin/ebuild-helpers/dolib b/bin/ebuild-helpers/dolib
index a158ecc0..794fdb64 100755..100644
--- a/bin/ebuild-helpers/dolib
+++ b/bin/ebuild-helpers/dolib
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Setup ABI cruft
LIBDIR_VAR="LIBDIR_${ABI}"
diff --git a/bin/ebuild-helpers/dolib.a b/bin/ebuild-helpers/dolib.a
index 3ef57d2f..d2279dc9 100755..100644
--- a/bin/ebuild-helpers/dolib.a
+++ b/bin/ebuild-helpers/dolib.a
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
exec env LIBOPTIONS="-m0644" \
dolib "$@"
diff --git a/bin/ebuild-helpers/dolib.so b/bin/ebuild-helpers/dolib.so
index e4d477f6..4bdbfabb 100755..100644
--- a/bin/ebuild-helpers/dolib.so
+++ b/bin/ebuild-helpers/dolib.so
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
exec env LIBOPTIONS="-m0755" \
dolib "$@"
diff --git a/bin/ebuild-helpers/doman b/bin/ebuild-helpers/doman
index eb1f3114..85d5e2b4 100755..100644
--- a/bin/ebuild-helpers/doman
+++ b/bin/ebuild-helpers/doman
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
diff --git a/bin/ebuild-helpers/domo b/bin/ebuild-helpers/domo
index 88570c69..5a1e808e 100755..100644
--- a/bin/ebuild-helpers/domo
+++ b/bin/ebuild-helpers/domo
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
mynum=${#}
if [ ${mynum} -lt 1 ] ; then
diff --git a/bin/ebuild-helpers/dosbin b/bin/ebuild-helpers/dosbin
index e850701e..8920d37e 100755..100644
--- a/bin/ebuild-helpers/dosbin
+++ b/bin/ebuild-helpers/dosbin
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
if [[ $# -lt 1 ]] ; then
echo "$0: at least one argument needed" 1>&2
diff --git a/bin/ebuild-helpers/dosed b/bin/ebuild-helpers/dosed
index 0510703f..afc949ba 100755..100644
--- a/bin/ebuild-helpers/dosed
+++ b/bin/ebuild-helpers/dosed
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
if [[ $# -lt 1 ]] ; then
echo "!!! ${0##*/}: at least one argument needed" >&2
diff --git a/bin/ebuild-helpers/dosym b/bin/ebuild-helpers/dosym
index da31246c..52defbe8 100755..100644
--- a/bin/ebuild-helpers/dosym
+++ b/bin/ebuild-helpers/dosym
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
if [[ $# -ne 2 ]] ; then
echo "$0: two arguments needed" 1>&2
diff --git a/bin/ebuild-helpers/ecompress b/bin/ebuild-helpers/ecompress
index ecf362ce..c6817ec3 100755..100644
--- a/bin/ebuild-helpers/ecompress
+++ b/bin/ebuild-helpers/ecompress
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
diff --git a/bin/ebuild-helpers/ecompressdir b/bin/ebuild-helpers/ecompressdir
index 297b4677..5d7fdf04 100755..100644
--- a/bin/ebuild-helpers/ecompressdir
+++ b/bin/ebuild-helpers/ecompressdir
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
diff --git a/bin/ebuild-helpers/elog b/bin/ebuild-helpers/elog
index 31df186d..a2303afa 100755..100644
--- a/bin/ebuild-helpers/elog
+++ b/bin/ebuild-helpers/elog
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
diff --git a/bin/ebuild-helpers/emake b/bin/ebuild-helpers/emake
index 18d8f089..97ea1366 100755..100644
--- a/bin/ebuild-helpers/emake
+++ b/bin/ebuild-helpers/emake
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
#
# emake: Supplies some default parameters to GNU make. At the moment the
# only parameter supplied is -jN, where N is a number of
diff --git a/bin/ebuild-helpers/fowners b/bin/ebuild-helpers/fowners
index 766266a1..1097296d 100755..100644
--- a/bin/ebuild-helpers/fowners
+++ b/bin/ebuild-helpers/fowners
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# we can't prefix all arguments because
# chown takes random options
diff --git a/bin/ebuild-helpers/fperms b/bin/ebuild-helpers/fperms
index 1d5326ec..6c236ab6 100755..100644
--- a/bin/ebuild-helpers/fperms
+++ b/bin/ebuild-helpers/fperms
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# we can't prefix all arguments because
# chmod takes random options
diff --git a/bin/ebuild-helpers/newbin b/bin/ebuild-helpers/newbin
index 905b2802..fb2752a1 100755..100644
--- a/bin/ebuild-helpers/newbin
+++ b/bin/ebuild-helpers/newbin
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
echo "$0: Need two arguments, old file and new file" 1>&2
diff --git a/bin/ebuild-helpers/newconfd b/bin/ebuild-helpers/newconfd
index 6d57a343..94497d18 100755..100644
--- a/bin/ebuild-helpers/newconfd
+++ b/bin/ebuild-helpers/newconfd
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
echo "$0: Need two arguments, old file and new file" 1>&2
diff --git a/bin/ebuild-helpers/newdoc b/bin/ebuild-helpers/newdoc
index 331bf0d0..1bc6a05f 100755..100644
--- a/bin/ebuild-helpers/newdoc
+++ b/bin/ebuild-helpers/newdoc
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
echo "$0: Need two arguments, old file and new file" 1>&2
diff --git a/bin/ebuild-helpers/newenvd b/bin/ebuild-helpers/newenvd
index 2c03e373..06b44050 100755..100644
--- a/bin/ebuild-helpers/newenvd
+++ b/bin/ebuild-helpers/newenvd
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
echo "$0: Need two arguments, old file and new file" 1>&2
diff --git a/bin/ebuild-helpers/newexe b/bin/ebuild-helpers/newexe
index 32d7d929..63dff500 100755..100644
--- a/bin/ebuild-helpers/newexe
+++ b/bin/ebuild-helpers/newexe
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
echo "$0: Need two arguments, old file and new file" 1>&2
diff --git a/bin/ebuild-helpers/newinitd b/bin/ebuild-helpers/newinitd
index 7ab89ae0..e74a6aaf 100755..100644
--- a/bin/ebuild-helpers/newinitd
+++ b/bin/ebuild-helpers/newinitd
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
echo "$0: Need two arguments, old file and new file" 1>&2
diff --git a/bin/ebuild-helpers/newins b/bin/ebuild-helpers/newins
index 4b2bb2b5..1e11b432 100755..100644
--- a/bin/ebuild-helpers/newins
+++ b/bin/ebuild-helpers/newins
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
echo "$0: Need two arguments, old file and new file" 1>&2
diff --git a/bin/ebuild-helpers/newlib.a b/bin/ebuild-helpers/newlib.a
index ddcb1af2..120e8a25 100755..100644
--- a/bin/ebuild-helpers/newlib.a
+++ b/bin/ebuild-helpers/newlib.a
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
echo "$0: Need two arguments, old file and new file" 1>&2
diff --git a/bin/ebuild-helpers/newlib.so b/bin/ebuild-helpers/newlib.so
index eb23d267..2fbe59a1 100755..100644
--- a/bin/ebuild-helpers/newlib.so
+++ b/bin/ebuild-helpers/newlib.so
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
echo "$0: Need two arguments, old file and new file" 1>&2
diff --git a/bin/ebuild-helpers/newman b/bin/ebuild-helpers/newman
index 2d278aed..758112c3 100755..100644
--- a/bin/ebuild-helpers/newman
+++ b/bin/ebuild-helpers/newman
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
echo "$0: Need two arguments, old file and new file" 1>&2
diff --git a/bin/ebuild-helpers/newsbin b/bin/ebuild-helpers/newsbin
index cfe75450..bf1fbc8e 100755..100644
--- a/bin/ebuild-helpers/newsbin
+++ b/bin/ebuild-helpers/newsbin
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
if [[ -z ${T} ]] || [[ -z ${2} ]] ; then
echo "$0: Need two arguments, old file and new file" 1>&2
diff --git a/bin/ebuild-helpers/portageq b/bin/ebuild-helpers/portageq
index f5a60200..d1a1fb52 100755..100644
--- a/bin/ebuild-helpers/portageq
+++ b/bin/ebuild-helpers/portageq
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
PORTAGE_BIN_PATH=${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}
PORTAGE_PYM_PATH=${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}
diff --git a/bin/ebuild-helpers/prepall b/bin/ebuild-helpers/prepall
index da37f571..19db4155 100755..100644
--- a/bin/ebuild-helpers/prepall
+++ b/bin/ebuild-helpers/prepall
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
diff --git a/bin/ebuild-helpers/prepalldocs b/bin/ebuild-helpers/prepalldocs
index c9509d1f..6705f5e7 100755..100644
--- a/bin/ebuild-helpers/prepalldocs
+++ b/bin/ebuild-helpers/prepalldocs
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
diff --git a/bin/ebuild-helpers/prepallinfo b/bin/ebuild-helpers/prepallinfo
index af95bbfc..0d978034 100755..100644
--- a/bin/ebuild-helpers/prepallinfo
+++ b/bin/ebuild-helpers/prepallinfo
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
diff --git a/bin/ebuild-helpers/prepallman b/bin/ebuild-helpers/prepallman
index c9e1bdf4..f41bcb81 100755..100644
--- a/bin/ebuild-helpers/prepallman
+++ b/bin/ebuild-helpers/prepallman
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
diff --git a/bin/ebuild-helpers/prepallstrip b/bin/ebuild-helpers/prepallstrip
index 178ded79..ec12ce66 100755..100644
--- a/bin/ebuild-helpers/prepallstrip
+++ b/bin/ebuild-helpers/prepallstrip
@@ -1,6 +1,5 @@
#!/bin/bash
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
exec prepstrip "${D}"
diff --git a/bin/ebuild-helpers/prepinfo b/bin/ebuild-helpers/prepinfo
index 582f41fe..1d8c7d1f 100755..100644
--- a/bin/ebuild-helpers/prepinfo
+++ b/bin/ebuild-helpers/prepinfo
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
diff --git a/bin/ebuild-helpers/preplib b/bin/ebuild-helpers/preplib
index 71446316..76aabe64 100755..100644
--- a/bin/ebuild-helpers/preplib
+++ b/bin/ebuild-helpers/preplib
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
diff --git a/bin/ebuild-helpers/prepman b/bin/ebuild-helpers/prepman
index af6ad1f8..cfbcdd41 100755..100644
--- a/bin/ebuild-helpers/prepman
+++ b/bin/ebuild-helpers/prepman
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
diff --git a/bin/ebuild-helpers/prepstrip b/bin/ebuild-helpers/prepstrip
index 13cd5a6b..2bd5bb10 100755..100644
--- a/bin/ebuild-helpers/prepstrip
+++ b/bin/ebuild-helpers/prepstrip
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
source "${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"/isolated-functions.sh
diff --git a/bin/ebuild-helpers/sed b/bin/ebuild-helpers/sed
index 6fc54500..b21e8569 100755..100644
--- a/bin/ebuild-helpers/sed
+++ b/bin/ebuild-helpers/sed
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
scriptpath=${BASH_SOURCE[0]}
scriptname=${scriptpath##*/}
diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 9c888c51..86d97e7b 100755..100644
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
PORTAGE_BIN_PATH="${PORTAGE_BIN_PATH:-/usr/lib/portage/bin}"
PORTAGE_PYM_PATH="${PORTAGE_PYM_PATH:-/usr/lib/portage/pym}"
diff --git a/bin/egencache b/bin/egencache
index 13e7ced7..0766d99c 100755..100644
--- a/bin/egencache
+++ b/bin/egencache
@@ -1,7 +1,6 @@
#!/usr/bin/python
# Copyright 2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
from __future__ import print_function
diff --git a/bin/emerge b/bin/emerge
index fe3b422d..5d74bfa0 100755..100644
--- a/bin/emerge
+++ b/bin/emerge
@@ -1,7 +1,6 @@
#!/usr/bin/python
# Copyright 2006-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
from __future__ import print_function
diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index 07139634..9b2fcbb9 100755..100644
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Author: Karl Trygve Kalleberg <karltk@gentoo.org>
# Rewritten from the old, Perl-based emerge-webrsync script
# Author: Alon Bar-Lev <alon.barlev@gmail.com>
diff --git a/bin/env-update b/bin/env-update
index 396dc447..8a69f2bb 100755..100644
--- a/bin/env-update
+++ b/bin/env-update
@@ -1,7 +1,6 @@
#!/usr/bin/python -O
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
from __future__ import print_function
diff --git a/bin/etc-update b/bin/etc-update
index d18afa33..e282a307 100755..100644
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Author Brandon Low <lostlogic@gentoo.org>
#
diff --git a/bin/filter-bash-environment.py b/bin/filter-bash-environment.py
index 8c0fdb9d..53f395ea 100755..100644
--- a/bin/filter-bash-environment.py
+++ b/bin/filter-bash-environment.py
@@ -1,7 +1,6 @@
#!/usr/bin/python
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
import codecs
import os, re, sys
diff --git a/bin/fixpackages b/bin/fixpackages
index 37cdf282..5e1df704 100755..100644
--- a/bin/fixpackages
+++ b/bin/fixpackages
@@ -1,7 +1,6 @@
#!/usr/bin/python
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
from __future__ import print_function
diff --git a/bin/glsa-check b/bin/glsa-check
index 4f1b7422..d8745b06 100755..100644
--- a/bin/glsa-check
+++ b/bin/glsa-check
@@ -1,7 +1,6 @@
#!/usr/bin/python
# Copyright 2008-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
from __future__ import print_function
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 63080130..f797a342 100755..100644
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -1,6 +1,5 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# We need this next line for "die" and "assert". It expands
# It _must_ preceed all the calls to die and assert.
diff --git a/bin/misc-functions.sh b/bin/misc-functions.sh
index 8db09a0e..39d8ca3d 100755..100644
--- a/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@ -1,7 +1,6 @@
#!/bin/bash
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
#
# Miscellaneous shell functions that make use of the ebuild env but don't need
# to be included directly in ebuild.sh.
diff --git a/bin/portageq b/bin/portageq
index 7f146aaf..5a4364fe 100755..100644
--- a/bin/portageq
+++ b/bin/portageq
@@ -1,7 +1,6 @@
#!/usr/bin/python -O
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
from __future__ import print_function
diff --git a/bin/quickpkg b/bin/quickpkg
index 5d75956c..0dfaa55f 100755..100644
--- a/bin/quickpkg
+++ b/bin/quickpkg
@@ -1,7 +1,6 @@
#!/usr/bin/python
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
from __future__ import print_function
diff --git a/bin/regenworld b/bin/regenworld
index f5b30bd4..12692daf 100755..100644
--- a/bin/regenworld
+++ b/bin/regenworld
@@ -1,7 +1,6 @@
#!/usr/bin/python
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# NOTE: this file does not respect ROOT
diff --git a/bin/repoman b/bin/repoman
index 144c1935..ffc4c948 100755..100644
--- a/bin/repoman
+++ b/bin/repoman
@@ -1,7 +1,6 @@
#!/usr/bin/python -O
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Next to do: dep syntax checking in mask files
# Then, check to make sure deps are satisfiable (to avoid "can't find match for" problems)
diff --git a/bin/xpak-helper.py b/bin/xpak-helper.py
index e6e8680e..4766d990 100755..100644
--- a/bin/xpak-helper.py
+++ b/bin/xpak-helper.py
@@ -1,7 +1,6 @@
#!/usr/bin/python
# Copyright 2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
import optparse
import sys
diff --git a/cnf/logrotate.d/elog-save-summary b/cnf/logrotate.d/elog-save-summary
index bdc4972e..db272731 100644
--- a/cnf/logrotate.d/elog-save-summary
+++ b/cnf/logrotate.d/elog-save-summary
@@ -1,6 +1,5 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Rotate the log created by the save_summary elog module.
/var/log/portage/elog/summary.log {
diff --git a/cnf/make.conf b/cnf/make.conf
index 55a175ed..7e48949a 100644
--- a/cnf/make.conf
+++ b/cnf/make.conf
@@ -1,6 +1,5 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Contains local system settings for Portage system
# Please review 'man make.conf' for more information.
diff --git a/cnf/make.globals b/cnf/make.globals
index b1b2cf49..a809ae4d 100644
--- a/cnf/make.globals
+++ b/cnf/make.globals
@@ -1,6 +1,5 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# System-wide defaults for the Portage system
# *****************************
diff --git a/pym/_emerge/AbstractDepPriority.py b/pym/_emerge/AbstractDepPriority.py
index e51999aa..94a9379a 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 64846ff8..29325132 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 491e803c..1feee15f 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 dace8b15..1918b839 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 ea89da1f..244ea28e 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 4f2a0734..03f0e84b 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 d9416643..a4941fcc 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 bd8b141f..5677419e 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 4e637db0..ca5f7ae9 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 568fc18e..83a02c76 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 1c1a6f3f..04b6bb1d 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 de3b65e2..9c5ff424 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 f4ff9cc2..870d80c4 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 626013c1..1004a371 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 a9de7a1a..ddbfe636 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 6ea70433..f99b7264 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 d9176487..259a1df6 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 e2417b52..aa32d8f8 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 16cb41f7..63b2a1b1 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 f3b0d0f7..3bcaabef 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 73297ed6..103f2b5f 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 672e2ffc..d42ff6f5 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 4ca0c4b1..dc7e1daa 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 adb7cd6e..b9c87f08 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 062ef472..e5d8bf4a 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 147e824f..8e02c2a7 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 1ac03706..d73a262b 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 2ff0b64d..43d71594 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 81b0e1f8..51ee93da 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 7cd164ee..255f7c55 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 c408a216..596006f0 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 83603ed8..200e196b 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 0205e659..e7856ccf 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 6ff61f57..f819570d 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 75c68cf1..c0d40a19 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 97be8ccf..f9454412 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 f64430e1..c4121e31 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 e99972e6..dc0c6ffd 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 67553ddf..4aecf8ad 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 59bb50e5..58a1717a 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 026b6cc7..45a183e6 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 369918de..be958bcb 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 0ec8abbe..d0270a99 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 e04b58ae..4914b286 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 b136e7eb..c11dab82 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 08ba2c01..f5afe6d8 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 27893e39..8e1837c0 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 67bf6267..f5efd65c 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 70e93348..4ef8d678 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 404a4483..4d9b3a56 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 4909290c..c1c98c41 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 987965db..e43ad581 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 1205327d..fdc6f35a 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 67fb17e2..a4a6d87e 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 5889f556..b1b5201e 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 0cd54550..31788b57 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 9b945b94..f093e284 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 44eaa332..7a1bd5a4 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 ceb5a58e..e4f28347 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 a642e07f..c1c19c90 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 66f860f9..db2d6ca1 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 95cbda1e..f98c5645 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 4acf239d..ca09d83a 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 302138a7..4b24aad5 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 bf26881b..954123a7 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 2391a92a..d4d9076a 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 a6b004f5..30371f03 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 efb648c7..5abdc8a9 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 f8351831..bed9c25e 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 2bc1ec54..146cc4cc 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 99fce457..1f326e87 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 b25ec29b..40065305 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 b0d39db3..4357b765 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 5ff0890c..e9babf13 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 0a3cf3e6..a62bc08a 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 6295667a..b6183d48 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 e725da87..27948e51 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 f36a249e..9b5ec13d 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 4d374fcd..8be186c1 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 f299b591..5ad31f00 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 c802d70c..21a391ae 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 00d671c2..df55a2b2 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 6e62aae0..bfd5576d 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 f177c9e8..e7ed400b 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 6f5268ae..44402edd 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 f151cd6d..a7da5f96 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 7daf52e3..5e62843f 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 cdb73187..0e855c34 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 9958ff41..bdeba351 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 594e47ad..e14324e5 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 cb1b59d6..e7fe599f 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 33cedebb..dcfff3fb 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 e1e8eead..3c1f2397 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 7ea4aaac..6582a003 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 b014f170..6be0fe4b 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 7cd8af4d..a82e8623 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 f15f362b..67f6dfcc 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 650658af..9da52ce1 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 7b4f70a9..a4053372 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 ff9d273e..d3c6a0b3 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 b8136bb4..cd118f51 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 3b003b1f..f84d8f4b 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 55bcb015..b8246897 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 10839318..e671904e 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 badde3da..e460e7ac 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 b017bcf7..1450fe2e 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 ca9d56d2..f36e9230 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 6322a6ab..6d19b645 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 e3e53a43..c86616a9 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 0821b7e5..610813f7 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 587f2372..c42e427d 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 53a666ee..ab160541 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 124783ca..140a3bd8 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 4eee0cf0..38622df4 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 6c567a07..c16e8223 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 18e8482e..e18d02cf 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 282fe749..abe5a066 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 1bc1e40d..73bcfabc 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 377eb45c..956f5237 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 39e29d54..226e0027 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 15e8c9bc..f1f2aea0 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 d834edd3..2e154242 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 b2a2dc4c..6b4561fe 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 0bcd42a9..e1a5223d 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 1df2fca3..1943caaf 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 96e45ba2..086c683a 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 3ea0e6fe..97c9efa1 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 b1c38061..ac21fb8c 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 605b9619..ea8233fd 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 d7e955f8..d385255b 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 63f6f9ef..17b66d17 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 b6efdbec..865d8353 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 0dc4d75b..81dd5b17 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 fb29b8d2..4d11d69f 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 900dab7d..39901ed0 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 26b2bb1f..e15853f1 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 38b07ad3..9b599528 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 25a15e81..d16c4b13 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 f024fe54..3685d804 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 722127c2..362b0051 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 470f732d..a2a65aaf 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 a1ce4224..c0e6ef32 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 4d8eb94f..0dc218ed 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 c802d70c..21a391ae 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 c802d70c..21a391ae 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 908b6b66..7be1af1e 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 b3f99f5f..7da5fe84 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 65d24948..906bb4a5 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 2dd0caef..e923279f 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 4ca74e59..e5716f0a 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 04bb4f32..50c591f9 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 d0c81643..a8a9626f 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 a5133202..7211a02d 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 83031d68..2bf2e9ee 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 703e7cc9..9f6ec0e5 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 95cbda1e..f98c5645 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 84b2c730..56591c03 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 3e519167..9bcd6b43 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 65ade2e5..fb87ce10 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 8b791c5e..56f9df4e 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 3ece6f64..5bd7e168 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 02cf8d7f..2380fc54 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 b8aa3c41..624e70bf 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 da3a25e8..3e2ab905 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 115c0f3b..61dfed81 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 658353ef..2edd82d7 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 fec1e238..70484719 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 fdc5cd21..a73e2ddc 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 7b22f14a..b9e9bbb1 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 04e52077..c6a71ed8 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 a3226c13..9c3f5247 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 c527bb7d..8d69e425 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 893de0c6..8a0a8aa2 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 925a03ff..206cecc8 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 82649e24..05977b15 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 fec6223a..4f9848f5 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 e6b0e853..c16fb549 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 da91a8cf..54a93038 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 8d5b1a81..d6df1f29 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 9955ca09..45ba09bc 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 07b9ddbb..ac3a13c0 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 d67b0cd8..e2d487ec 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 efb292f8..3f2a6c7c 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 6280eb26..a910f98b 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 8dfbddd7..f37a0c5a 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 50e38af9..cbeabe5c 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 7fc0d0e9..ef5cc43b 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 d0163312..f1e9e98f 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 90cdf538..0c5b30f5 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 4157d609..7a380679 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 8a37b73b..2cd1a8ab 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 da039f4d..ec6edfa9 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 aeaa4919..28a753f9 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 721ab269..a4e76f3f 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 21d15a4b..d19e353c 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 22aa6aa8..19cc0571 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 7cdf5762..3afe8e20 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 95ea4f44..c11228e9 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 138c99e5..174190db 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 43d69599..dd882541 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 9a66903d..69ce1898 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 2a064224..3bf71905 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 b6851651..f993886a 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 ada56fa0..678001c3 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 0c109a9c..0d2cadd0 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 c26bbb06..8d01ea5a 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 e9485b12..34daaf23 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 e4f85ef4..1c2500db 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 5e5b216f..2b14180b 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 eb2ba3eb..23e7dd57 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 a3226c13..9c3f5247 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 b949b031..2da57359 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 c5574147..7d48e1d1 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 9e6433b2..1cdb8bf1 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 e7296126..54120433 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 c48584f5..7fba0e2b 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 dbb86a3c..4502ed58 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 6f8e91a8..26fcf9ff 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 82705acc..ab7ffddf 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 23110ab0..298d1518 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 cbeb1bb8..660e9d69 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 c8159741..a4765ef1 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 7d595bda..c72ce257 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 736b6783..2dc77283 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 aa8da0aa..669a92cc 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 79ba892e..c918eea6 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 cd1d7e3d..c419b79f 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 3734a2f0..924839a6 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 1efed766..cd7f5ea8 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"""
diff --git a/src/bsd-flags/chflags.c b/src/bsd-flags/chflags.c
index fc571d73..5019b3f4 100644
--- a/src/bsd-flags/chflags.c
+++ b/src/bsd-flags/chflags.c
@@ -1,4 +1,3 @@
-/* $Id$ */
#include "Python.h"
diff --git a/src/bsd-flags/setup.cfg b/src/bsd-flags/setup.cfg
index 83f861d0..783d54fa 100644
--- a/src/bsd-flags/setup.cfg
+++ b/src/bsd-flags/setup.cfg
@@ -1,5 +1,4 @@
# bsd-flags
-# $Id$
[bdist_rpm]
release = 1
diff --git a/src/bsd-flags/setup.py b/src/bsd-flags/setup.py
index 26ee8ca0..1499dcb3 100755..100644
--- a/src/bsd-flags/setup.py
+++ b/src/bsd-flags/setup.py
@@ -1,5 +1,4 @@
#! /usr/bin/env python
-# $Id$
from os import chdir, stat
from distutils.core import setup, Extension
diff --git a/src/python-missingos/ChangeLog b/src/python-missingos/ChangeLog
index acec66bd..69c486c5 100644
--- a/src/python-missingos/ChangeLog
+++ b/src/python-missingos/ChangeLog
@@ -1,4 +1,3 @@
-# $Id$
python-missingos ChangeLog
Jonathon D Nelson <jnelson@gentoo.org>
diff --git a/src/python-missingos/README b/src/python-missingos/README
index f776fed4..a1c0373f 100644
--- a/src/python-missingos/README
+++ b/src/python-missingos/README
@@ -1,4 +1,3 @@
-# $Id$
python-missingos
Jonathon D Nelson <jnelson@gentoo.org>
diff --git a/src/python-missingos/missingos.c b/src/python-missingos/missingos.c
index 4e4ad96e..bd852a38 100644
--- a/src/python-missingos/missingos.c
+++ b/src/python-missingos/missingos.c
@@ -1,4 +1,3 @@
-/* $Id$ */
#include "Python.h"
diff --git a/src/python-missingos/setup.cfg b/src/python-missingos/setup.cfg
index d43ea60e..0867cf43 100644
--- a/src/python-missingos/setup.cfg
+++ b/src/python-missingos/setup.cfg
@@ -1,5 +1,4 @@
# python-missingos
-# $Id$
[bdist_rpm]
release = 1
diff --git a/src/python-missingos/setup.py b/src/python-missingos/setup.py
index f2d254be..3cc13458 100755..100644
--- a/src/python-missingos/setup.py
+++ b/src/python-missingos/setup.py
@@ -1,5 +1,4 @@
#!/usr/bin/python
-# $Id$
from os import chdir, stat
from distutils.core import setup, Extension
diff --git a/src/tbz2tool.c b/src/tbz2tool.c
index af762814..08516396 100644
--- a/src/tbz2tool.c
+++ b/src/tbz2tool.c
@@ -1,4 +1,3 @@
-/* $Id$ */
#include <stdio.h>
#include <stdlib.h>