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 /pym/_emerge
parentDon't use $Id or $Rev for version strings since that doesn't work with git. (diff)
downloadportage-multirepo-c790b7ce4c8e3b95b1ef0103129388c06c5eaa4b.tar.gz
portage-multirepo-c790b7ce4c8e3b95b1ef0103129388c06c5eaa4b.tar.bz2
portage-multirepo-c790b7ce4c8e3b95b1ef0103129388c06c5eaa4b.zip
Remove all svn $Id keywords.
Diffstat (limited to 'pym/_emerge')
-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
84 files changed, 0 insertions, 84 deletions
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