[gentoo-commits] proj/tinderbox-cluster:master commit in: pym/tbc/repoman/modules/manifest/, pym/tbc/repoman/modules/fix/, ...

[Magnus Granberg]

commit:     71487c91f475dd47afff595b183bebf32ded0281
Author:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  4 19:34:45 2015 +0000
Commit:     Magnus Granberg <zorry <AT> gentoo <DOT> org>
CommitDate: Sun Oct  4 19:34:45 2015 +0000
URL:        https://gitweb.gentoo.org/proj/tinderbox-cluster.git/commit/?id=71487c91

use repoman from portage 2.2.22

 patches/portage.patch                              |   40 +-
 pym/tbc/repoman/__init__.py                        |    0
 pym/tbc/repoman/_portage.py                        |   25 -
 pym/tbc/repoman/_subprocess.py                     |   82 -
 pym/tbc/repoman/_xml.py                            |  101 --
 pym/tbc/repoman/argparser.py                       |  221 ---
 pym/tbc/repoman/check_missingslot.py               |   29 -
 pym/tbc/repoman/checks/__init__.py                 |    0
 pym/tbc/repoman/checks/directories/__init__.py     |    0
 pym/tbc/repoman/checks/directories/files.py        |   80 -
 pym/tbc/repoman/checks/ebuilds/__init__.py         |    0
 pym/tbc/repoman/checks/ebuilds/checks.py           |  990 ------------
 .../repoman/checks/ebuilds/eclasses/__init__.py    |    0
 pym/tbc/repoman/checks/ebuilds/eclasses/live.py    |   39 -
 pym/tbc/repoman/checks/ebuilds/eclasses/ruby.py    |   32 -
 pym/tbc/repoman/checks/ebuilds/errors.py           |   48 -
 pym/tbc/repoman/checks/ebuilds/fetches.py          |  138 --
 pym/tbc/repoman/checks/ebuilds/isebuild.py         |   70 -
 pym/tbc/repoman/checks/ebuilds/keywords.py         |  121 --
 pym/tbc/repoman/checks/ebuilds/manifests.py        |  101 --
 pym/tbc/repoman/checks/ebuilds/misc.py             |   54 -
 pym/tbc/repoman/checks/ebuilds/pkgmetadata.py      |  174 --
 .../repoman/checks/ebuilds/thirdpartymirrors.py    |   38 -
 pym/tbc/repoman/checks/ebuilds/use_flags.py        |   89 --
 .../repoman/checks/ebuilds/variables/__init__.py   |    0
 .../checks/ebuilds/variables/description.py        |   32 -
 pym/tbc/repoman/checks/ebuilds/variables/eapi.py   |   44 -
 .../repoman/checks/ebuilds/variables/license.py    |   47 -
 .../repoman/checks/ebuilds/variables/restrict.py   |   41 -
 pym/tbc/repoman/checks/herds/__init__.py           |    0
 pym/tbc/repoman/checks/herds/herdbase.py           |  135 --
 pym/tbc/repoman/checks/herds/metadata.py           |   25 -
 pym/tbc/repoman/copyrights.py                      |  119 --
 pym/tbc/repoman/ebuild.py                          |   28 -
 pym/tbc/repoman/errors.py                          |   19 -
 pym/tbc/repoman/main.py                            | 1655 --------------------
 pym/tbc/repoman/metadata.py                        |  150 --
 pym/tbc/repoman/modules/__init__.py                |    0
 pym/tbc/repoman/modules/commit/__init__.py         |    0
 pym/tbc/repoman/modules/commit/repochecks.py       |   32 -
 pym/tbc/repoman/modules/fix/__init__.py            |    0
 pym/tbc/repoman/modules/full/__init__.py           |    0
 pym/tbc/repoman/modules/manifest/__init__.py       |    0
 pym/tbc/repoman/modules/scan/__init__.py           |    0
 pym/tbc/repoman/profile.py                         |   84 -
 pym/tbc/repoman/qa_data.py                         |  430 -----
 pym/tbc/repoman/qa_tracker.py                      |   45 -
 pym/tbc/repoman/repos.py                           |  303 ----
 pym/tbc/repoman/scan.py                            |  170 --
 pym/tbc/repoman/utilities.py                       |  595 -------
 pym/tbc/repoman/vcs/__init__.py                    |    0
 pym/tbc/repoman/vcs/vcs.py                         |  274 ----
 pym/tbc/repoman/vcs/vcsstatus.py                   |  113 --
 53 files changed, 39 insertions(+), 6774 deletions(-)

diff --git a/patches/portage.patch b/patches/portage.patch
index fadbd32..fa8e6ca 100644
--- a/patches/portage.patch
+++ b/patches/portage.patch
@@ -1,4 +1,4 @@
-2015-07-18  Magnus Granberg  <zorry@g.o>
[phone]  Magnus Granberg  <zorry@g.o>
 
 	* tbc/pym/actions.py
 	Use the patched Scheduler and add build_dict so it can be ust.
@@ -12,6 +12,8 @@
 	We copy Scheduler.py from portage and patch it.
 	Fix so we can use add_buildlog_main()
 	We use add_buildlog_main() for loging.
+	* tbc/pym/repoman/main.py
+	We add config_root pkdir and remove action
 
 --- a/pym/tbc/actions.py	2013-03-22 17:57:23.000000000 +0100
 +++ b/pym/tbc/actions.py	2013-03-22 19:00:43.265582143 +0100
@@ -285,3 +287,39 @@
  		self._jobs -= 1
  		self._status_display.running = self._jobs
  		self._schedule()
+--- a/pym/repoman/main.py	2015-09-22 02:20:41.000000000 +0200
++++ b/pym/repoman/main.py	2015-10-04 20:21:57.586494104 +0200
+@@ -45,8 +45,9 @@ bad = create_color_func("BAD")
+ os.umask(0o22)
+ 
+ 
+-def repoman_main(argv):
+-	config_root = os.environ.get("PORTAGE_CONFIGROOT")
++def repoman_main:(argv, config_root=None, pkgdir=None):
++	if config_root is None:
++		config_root = os.environ.get("PORTAGE_CONFIGROOT")
+ 	repoman_settings = portage.config(config_root=config_root, local_config=False)
+ 
+ 	if repoman_settings.get("NOCOLOR", "").lower() in ("yes", "true") or \
+@@ -71,6 +72,9 @@ def repoman_main(argv):
+ 	# commit (like if Manifest generation fails).
+ 	can_force = True
+ 
++	if not pkgdir is None:
++            os.chdir(pkgdir)
++
+ 	portdir, portdir_overlay, mydir = utilities.FindPortdir(repoman_settings)
+ 	if portdir is None:
+ 		sys.exit(1)
+@@ -159,10 +163,4 @@ def repoman_main(argv):
+ 	qa_output = qa_output.getvalue()
+ 	qa_output = qa_output.splitlines(True)
+ 
+-	# output the results
+-	actions = Actions(repo_settings, options, scanner, vcs_settings)
+-	if actions.inform(can_force, result):
+-		# perform any other actions
+-		actions.perform(qa_output)
+-
+-	sys.exit(0)
++	return qatracker, qawarnings

diff --git a/pym/tbc/repoman/__init__.py b/pym/tbc/repoman/__init__.py
deleted file mode 100644
index e69de29..0000000

diff --git a/pym/tbc/repoman/_portage.py b/pym/tbc/repoman/_portage.py
deleted file mode 100644
index 0f611f7..0000000
--- a/pym/tbc/repoman/_portage.py
+++ /dev/null
@@ -1,25 +0,0 @@
-
-'''repoman/_portage.py
-Central location for the portage import.
-There were problems when portage was imported by submodules
-due to the portage instance was somehow different that the
-initial portage import in main.py.  The later portage imports
-did not contain the repo it was working on.  That repo was my cvs tree
-and not listed in those subsequent portage imports.
-
-All modules should import portage from this one
-
-from repoman._portage import portage
-
-Then continue to import the remaining portage modules needed
-'''
-
-import sys
-
-from os import path as osp
-pym_path = osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))))
-sys.path.insert(0, pym_path)
-
-import portage
-portage._internal_caller = True
-portage._disable_legacy_globals()

diff --git a/pym/tbc/repoman/_subprocess.py b/pym/tbc/repoman/_subprocess.py
deleted file mode 100644
index e303e5e..0000000
--- a/pym/tbc/repoman/_subprocess.py
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
-import codecs
-import subprocess
-import sys
-
-# import our initialized portage instance
-from tbc.repoman._portage import portage
-
-from portage import os
-from portage.process import find_binary
-from portage import _encodings, _unicode_encode
-
-
-def repoman_getstatusoutput(cmd):
-	"""
-	Implements an interface similar to getstatusoutput(), but with
-	customized unicode handling (see bug #310789) and without the shell.
-	"""
-	args = portage.util.shlex_split(cmd)
-
-	if sys.hexversion < 0x3020000 and sys.hexversion >= 0x3000000 and \
-		not os.path.isabs(args[0]):
-		# Python 3.1 _execvp throws TypeError for non-absolute executable
-		# path passed as bytes (see http://bugs.python.org/issue8513).
-		fullname = find_binary(args[0])
-		if fullname is None:
-			raise portage.exception.CommandNotFound(args[0])
-		args[0] = fullname
-
-	encoding = _encodings['fs']
-	args = [
-		_unicode_encode(x, encoding=encoding, errors='strict') for x in args]
-	proc = subprocess.Popen(
-		args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-	output = portage._unicode_decode(
-		proc.communicate()[0], encoding=encoding, errors='strict')
-	if output and output[-1] == "\n":
-		# getstatusoutput strips one newline
-		output = output[:-1]
-	return (proc.wait(), output)
-
-
-class repoman_popen(portage.proxy.objectproxy.ObjectProxy):
-	"""
-	Implements an interface similar to os.popen(), but with customized
-	unicode handling (see bug #310789) and without the shell.
-	"""
-
-	__slots__ = ('_proc', '_stdout')
-
-	def __init__(self, cmd):
-		args = portage.util.shlex_split(cmd)
-
-		if sys.hexversion < 0x3020000 and sys.hexversion >= 0x3000000 and \
-			not os.path.isabs(args[0]):
-			# Python 3.1 _execvp throws TypeError for non-absolute executable
-			# path passed as bytes (see http://bugs.python.org/issue8513).
-			fullname = find_binary(args[0])
-			if fullname is None:
-				raise portage.exception.CommandNotFound(args[0])
-			args[0] = fullname
-
-		encoding = _encodings['fs']
-		args = [
-			_unicode_encode(x, encoding=encoding, errors='strict')
-			for x in args]
-		proc = subprocess.Popen(args, stdout=subprocess.PIPE)
-		object.__setattr__(
-			self, '_proc', proc)
-		object.__setattr__(
-			self, '_stdout', codecs.getreader(encoding)(proc.stdout, 'strict'))
-
-	def _get_target(self):
-		return object.__getattribute__(self, '_stdout')
-
-	__enter__ = _get_target
-
-	def __exit__(self, exc_type, exc_value, traceback):
-		proc = object.__getattribute__(self, '_proc')
-		proc.wait()
-		proc.stdout.close()

diff --git a/pym/tbc/repoman/_xml.py b/pym/tbc/repoman/_xml.py
deleted file mode 100644
index 7bf6698..0000000
--- a/pym/tbc/repoman/_xml.py
+++ /dev/null
@@ -1,101 +0,0 @@
-
-import sys
-import xml
-
-# import our initialized portage instance
-from repoman._portage import portage
-
-from portage import os
-from portage.output import red
-from portage.process import find_binary
-
-from repoman.metadata import fetch_metadata_dtd
-from repoman._subprocess import repoman_getstatusoutput
-
-
-class _XMLParser(xml.etree.ElementTree.XMLParser):
-
-	def __init__(self, data, **kwargs):
-		xml.etree.ElementTree.XMLParser.__init__(self, **kwargs)
-		self._portage_data = data
-		if hasattr(self, 'parser'):
-			self._base_XmlDeclHandler = self.parser.XmlDeclHandler
-			self.parser.XmlDeclHandler = self._portage_XmlDeclHandler
-			self._base_StartDoctypeDeclHandler = \
-				self.parser.StartDoctypeDeclHandler
-			self.parser.StartDoctypeDeclHandler = \
-				self._portage_StartDoctypeDeclHandler
-
-	def _portage_XmlDeclHandler(self, version, encoding, standalone):
-		if self._base_XmlDeclHandler is not None:
-			self._base_XmlDeclHandler(version, encoding, standalone)
-		self._portage_data["XML_DECLARATION"] = (version, encoding, standalone)
-
-	def _portage_StartDoctypeDeclHandler(
-		self, doctypeName, systemId, publicId, has_internal_subset):
-		if self._base_StartDoctypeDeclHandler is not None:
-			self._base_StartDoctypeDeclHandler(
-				doctypeName, systemId, publicId, has_internal_subset)
-		self._portage_data["DOCTYPE"] = (doctypeName, systemId, publicId)
-
-
-class _MetadataTreeBuilder(xml.etree.ElementTree.TreeBuilder):
-	"""
-	Implements doctype() as required to avoid deprecation warnings with
-	>=python-2.7.
-	"""
-	def doctype(self, name, pubid, system):
-		pass
-
-
-class XmlLint(object):
-
-	def __init__(self, options, repoman_settings):
-		self.metadata_dtd = os.path.join(repoman_settings["DISTDIR"], 'metadata.dtd')
-		self.options = options
-		self.repoman_settings = repoman_settings
-		self._is_capable = False
-		self.binary = None
-		self._check_capable()
-
-	def _check_capable(self):
-		if self.options.mode == "manifest":
-			return
-		self.binary = find_binary('xmllint')
-		if not self.binary:
-			print(red("!!! xmllint not found. Can't check metadata.xml.\n"))
-		else:
-			if not fetch_metadata_dtd(self.metadata_dtd, self.repoman_settings):
-				sys.exit(1)
-			# this can be problematic if xmllint changes their output
-			self._is_capable = True
-
-	@property
-	def capable(self):
-		return self._is_capable
-
-	def check(self, checkdir, repolevel):
-		'''Runs checks on the package metadata.xml file
-
-		@param checkdir: string, path
-		@param repolevel: integer
-		@return boolean, False == bad metadata
-		'''
-		if not self.capable:
-			if self.options.xml_parse or repolevel == 3:
-				print("%s sorry, xmllint is needed.  failing\n" % red("!!!"))
-				sys.exit(1)
-			return True
-		# xmlint can produce garbage output even on success, so only dump
-		# the ouput when it fails.
-		st, out = repoman_getstatusoutput(
-			self.binary + " --nonet --noout --dtdvalid %s %s" % (
-				portage._shell_quote(self.metadata_dtd),
-				portage._shell_quote(
-					os.path.join(checkdir, "metadata.xml"))))
-		if st != os.EX_OK:
-			print(red("!!!") + " metadata.xml is invalid:")
-			for z in out.splitlines():
-				print(red("!!! ") + z)
-			return False
-		return True

diff --git a/pym/tbc/repoman/argparser.py b/pym/tbc/repoman/argparser.py
deleted file mode 100644
index 1c9bd45..0000000
--- a/pym/tbc/repoman/argparser.py
+++ /dev/null
@@ -1,221 +0,0 @@
-# repoman: Argument parser
-# Copyright 2007-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-"""This module contains functions used in Repoman to parse CLI arguments."""
-
-import logging
-import sys
-
-# import our initialized portage instance
-from repoman._portage import portage
-
-from portage import util
-from portage.util._argparse import ArgumentParser
-
-
-def parse_args(argv, qahelp, repoman_default_opts):
-	"""Use a customized optionParser to parse command line arguments for repoman
-	Args:
-		argv - a sequence of command line arguments
-		qahelp - a dict of qa warning to help message
-	Returns:
-		(opts, args), just like a call to parser.parse_args()
-	"""
-
-	argv = portage._decode_argv(argv)
-
-	modes = {
-		'commit': 'Run a scan then commit changes',
-		'ci': 'Run a scan then commit changes',
-		'fix': 'Fix simple QA issues (stray digests, missing digests)',
-		'full': 'Scan directory tree and print all issues (not a summary)',
-		'help': 'Show this screen',
-		'manifest': 'Generate a Manifest (fetches files if necessary)',
-		'manifest-check': 'Check Manifests for missing or incorrect digests',
-		'scan': 'Scan directory tree for QA issues'
-	}
-
-	output_choices = {
-		'default': 'The normal output format',
-		'column': 'Columnar output suitable for use with grep'
-	}
-
-	mode_keys = list(modes)
-	mode_keys.sort()
-
-	output_keys = sorted(output_choices)
-
-	parser = ArgumentParser(
-		usage="repoman [options] [mode]",
-		description="Modes: %s" % " | ".join(mode_keys),
-		epilog="For more help consult the man page.")
-
-	parser.add_argument(
-		'-a', '--ask', dest='ask', action='store_true',
-		default=False,
-		help='Request a confirmation before commiting')
-
-	parser.add_argument(
-		'-m', '--commitmsg', dest='commitmsg',
-		help='specify a commit message on the command line')
-
-	parser.add_argument(
-		'-M', '--commitmsgfile', dest='commitmsgfile',
-		help='specify a path to a file that contains a commit message')
-
-	parser.add_argument(
-		'--digest', choices=('y', 'n'), metavar='<y|n>',
-		help='Automatically update Manifest digests for modified files')
-
-	parser.add_argument(
-		'-p', '--pretend', dest='pretend', default=False,
-		action='store_true',
-		help='don\'t commit or fix anything; just show what would be done')
-
-	parser.add_argument(
-		'-q', '--quiet', dest="quiet", action="count",
-		default=0,
-		help='do not print unnecessary messages')
-
-	parser.add_argument(
-		'--echangelog', choices=('y', 'n', 'force'), metavar="<y|n|force>",
-		help=(
-			'for commit mode, call echangelog if ChangeLog is unmodified (or '
-			'regardless of modification if \'force\' is specified)'))
-
-	parser.add_argument(
-		'--experimental-inherit', choices=('y', 'n'), metavar="<y|n>",
-		default='n',
-		help=(
-			'Enable experimental inherit.missing checks which may misbehave'
-			' when the internal eclass database becomes outdated'))
-
-	parser.add_argument(
-		'-f', '--force', dest='force', action='store_true',
-		default=False,
-		help='Commit with QA violations')
-
-	parser.add_argument(
-		'-S', '--straight-to-stable', dest='straight_to_stable',
-		default=False, action='store_true',
-		help='Allow committing straight to stable')
-
-	parser.add_argument(
-		'--vcs', dest='vcs',
-		help='Force using specific VCS instead of autodetection')
-
-	parser.add_argument(
-		'-v', '--verbose', dest="verbosity", action='count',
-		help='be very verbose in output', default=0)
-
-	parser.add_argument(
-		'-V', '--version', dest='version', action='store_true',
-		help='show version info')
-
-	parser.add_argument(
-		'-x', '--xmlparse', dest='xml_parse', action='store_true',
-		default=False,
-		help='forces the metadata.xml parse check to be carried out')
-
-	parser.add_argument(
-		'--if-modified', choices=('y', 'n'), default='n',
-		metavar="<y|n>",
-		help='only check packages that have uncommitted modifications')
-
-	parser.add_argument(
-		'-i', '--ignore-arches', dest='ignore_arches', action='store_true',
-		default=False,
-		help='ignore arch-specific failures (where arch != host)')
-
-	parser.add_argument(
-		"--ignore-default-opts",
-		action="store_true",
-		help="do not use the REPOMAN_DEFAULT_OPTS environment variable")
-
-	parser.add_argument(
-		'-I', '--ignore-masked', dest='ignore_masked', action='store_true',
-		default=False,
-		help='ignore masked packages (not allowed with commit mode)')
-
-	parser.add_argument(
-		'--include-arches',
-		dest='include_arches', metavar='ARCHES', action='append',
-		help=(
-			'A space separated list of arches used to '
-			'filter the selection of profiles for dependency checks'))
-
-	parser.add_argument(
-		'-d', '--include-dev', dest='include_dev', action='store_true',
-		default=False,
-		help='include dev profiles in dependency checks')
-
-	parser.add_argument(
-		'-e', '--include-exp-profiles', choices=('y', 'n'), metavar='<y|n>',
-		default=False,
-		help='include exp profiles in dependency checks')
-
-	parser.add_argument(
-		'--unmatched-removal', dest='unmatched_removal', action='store_true',
-		default=False,
-		help=(
-			'enable strict checking of package.mask and package.unmask files'
-			' for unmatched removal atoms'))
-
-	parser.add_argument(
-		'--without-mask', dest='without_mask', action='store_true',
-		default=False,
-		help=(
-			'behave as if no package.mask entries exist'
-			' (not allowed with commit mode)'))
-
-	parser.add_argument(
-		'--output-style', dest='output_style', choices=output_keys,
-		help='select output type', default='default')
-
-	parser.add_argument(
-		'--mode', dest='mode', choices=mode_keys,
-		help='specify which mode repoman will run in (default=full)')
-
-	opts, args = parser.parse_known_args(argv[1:])
-
-	if not opts.ignore_default_opts:
-		default_opts = util.shlex_split(repoman_default_opts)
-		if default_opts:
-			opts, args = parser.parse_known_args(default_opts + sys.argv[1:])
-
-	if opts.mode == 'help':
-		parser.print_help(short=False)
-
-	for arg in args:
-		if arg in modes:
-			if not opts.mode:
-				opts.mode = arg
-				break
-		else:
-			parser.error("invalid mode: %s" % arg)
-
-	if not opts.mode:
-		opts.mode = 'full'
-
-	if opts.mode == 'ci':
-		opts.mode = 'commit'  # backwards compat shortcut
-
-	# Use verbosity and quiet options to appropriately fiddle with the loglevel
-	for val in range(opts.verbosity):
-		logger = logging.getLogger()
-		logger.setLevel(logger.getEffectiveLevel() - 10)
-
-	for val in range(opts.quiet):
-		logger = logging.getLogger()
-		logger.setLevel(logger.getEffectiveLevel() + 10)
-
-	if opts.mode == 'commit' and not (opts.force or opts.pretend):
-		if opts.ignore_masked:
-			opts.ignore_masked = False
-			logging.warn('Commit mode automatically disables --ignore-masked')
-		if opts.without_mask:
-			opts.without_mask = False
-			logging.warn('Commit mode automatically disables --without-mask')
-
-	return (opts, args)

diff --git a/pym/tbc/repoman/check_missingslot.py b/pym/tbc/repoman/check_missingslot.py
deleted file mode 100644
index 3f79435..0000000
--- a/pym/tbc/repoman/check_missingslot.py
+++ /dev/null
@@ -1,29 +0,0 @@
-# repoman: missing slot check
-# Copyright 2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-"""This module contains the check used to find missing slot values
-in dependencies."""
-
-from portage.eapi import eapi_has_slot_operator
-
-def check_missingslot(atom, mytype, eapi, portdb, qatracker, relative_path, my_aux):
-	# If no slot or slot operator is specified in RDEP...
-	if (not atom.blocker and not atom.slot and not atom.slot_operator
-			and mytype == 'RDEPEND' and eapi_has_slot_operator(eapi)):
-		# Check whether it doesn't match more than one.
-		atom_matches = portdb.xmatch("match-all", atom)
-		dep_slots = frozenset(
-				portdb.aux_get(cpv, ['SLOT'])[0].split('/')[0]
-					for cpv in atom_matches)
-
-		if len(dep_slots) > 1:
-			# See if it is a DEPEND as well. It's a very simple & dumb
-			# check but should suffice for catching it.
-			depend = my_aux['DEPEND'].split()
-			if atom not in depend:
-				return
-
-			qatracker.add_error("dependency.missingslot", relative_path +
-				": %s: '%s' matches more than one slot, please specify an explicit slot and/or use the := or :* slot operator" %
-				(mytype, atom))

diff --git a/pym/tbc/repoman/checks/__init__.py b/pym/tbc/repoman/checks/__init__.py
deleted file mode 100644
index e69de29..0000000

diff --git a/pym/tbc/repoman/checks/directories/__init__.py b/pym/tbc/repoman/checks/directories/__init__.py
deleted file mode 100644
index e69de29..0000000

diff --git a/pym/tbc/repoman/checks/directories/files.py b/pym/tbc/repoman/checks/directories/files.py
deleted file mode 100644
index 10cb7aa..0000000
--- a/pym/tbc/repoman/checks/directories/files.py
+++ /dev/null
@@ -1,80 +0,0 @@
-
-'''repoman/checks/diretories/files.py
-
-'''
-
-import io
-
-from portage import _encodings, _unicode_encode
-from portage import os
-
-from tbc.repoman.vcs.vcs import vcs_new_changed
-
-
-class FileChecks(object):
-
-	def __init__(
-		self, qatracker, repoman_settings, repo_settings, portdb, vcs_settings):
-		'''
-		@param qatracker: QATracker instance
-		@param repoman_settings: settings instance
-		@param repo_settings: repository settings instance
-		@param portdb: portdb instance
-		'''
-		self.portdb = portdb
-		self.qatracker = qatracker
-		self.repo_settings = repo_settings
-		self.repoman_settings = repoman_settings
-		self.vcs_settings = vcs_settings
-
-	def check(self, checkdir, checkdirlist, checkdir_relative, changed, new):
-		'''Checks the ebuild sources and files for errors
-
-		@param xpkg: the pacakge being checked
-		@param checkdir: string, directory path
-		@param checkdir_relative: repolevel determined path
-		'''
-		for y_file in checkdirlist:
-			index = self.repo_settings.repo_config.find_invalid_path_char(y_file)
-			if index != -1:
-				y_relative = os.path.join(checkdir_relative, y_file)
-				invcs = self.vcs_settings.vcs is not None
-				inchangeset = vcs_new_changed(y_relative, changed, new)
-				if invcs and not inchangeset:
-					# If the file isn't in the VCS new or changed set, then
-					# assume that it's an irrelevant temporary file (Manifest
-					# entries are not generated for file names containing
-					# prohibited characters). See bug #406877.
-					index = -1
-			if index != -1:
-				self.qatracker.add_error(
-					"file.name",
-					"%s/%s: char '%s'" % (checkdir, y_file, y_file[index]))
-
-			if not (
-				y_file in ("ChangeLog", "metadata.xml")
-				or y_file.endswith(".ebuild")):
-				continue
-			f = None
-			try:
-				line = 1
-				f = io.open(
-					_unicode_encode(
-						os.path.join(checkdir, y_file),
-						encoding=_encodings['fs'], errors='strict'),
-					mode='r', encoding=_encodings['repo.content'])
-				for l in f:
-					line += 1
-			except UnicodeDecodeError as ue:
-				s = ue.object[:ue.start]
-				l2 = s.count("\n")
-				line += l2
-				if l2 != 0:
-					s = s[s.rfind("\n") + 1:]
-				self.qatracker.add_error(
-					"file.UTF8", "%s/%s: line %i, just after: '%s'" % (
-						checkdir, y_file, line, s))
-			finally:
-				if f is not None:
-					f.close()
-		return

diff --git a/pym/tbc/repoman/checks/ebuilds/__init__.py b/pym/tbc/repoman/checks/ebuilds/__init__.py
deleted file mode 100644
index e69de29..0000000

diff --git a/pym/tbc/repoman/checks/ebuilds/checks.py b/pym/tbc/repoman/checks/ebuilds/checks.py
deleted file mode 100644
index 3028a4a..0000000
--- a/pym/tbc/repoman/checks/ebuilds/checks.py
+++ /dev/null
@@ -1,990 +0,0 @@
-# repoman: Checks
-# Copyright 2007-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-"""This module contains functions used in Repoman to ascertain the quality
-and correctness of an ebuild."""
-
-from __future__ import unicode_literals
-
-import codecs
-from itertools import chain
-import re
-import time
-
-# import our initialized portage instance
-from tbc.repoman._portage import portage
-
-from portage.eapi import (
-	eapi_supports_prefix, eapi_has_implicit_rdepend,
-	eapi_has_src_prepare_and_src_configure, eapi_has_dosed_dohard,
-	eapi_exports_AA, eapi_has_pkg_pretend)
-
-import tbc.repoman.checks.ebuilds.errors as errors
-
-
-class LineCheck(object):
-	"""Run a check on a line of an ebuild."""
-	"""A regular expression to determine whether to ignore the line"""
-	ignore_line = False
-	"""True if lines containing nothing more than comments with optional
-	leading whitespace should be ignored"""
-	ignore_comment = True
-
-	def new(self, pkg):
-		pass
-
-	def check_eapi(self, eapi):
-		"""Returns if check should be run in the given EAPI (default: True)"""
-		return True
-
-	def check(self, num, line):
-		"""Run the check on line and return error if there is one"""
-		if self.re.match(line):
-			return self.error
-
-	def end(self):
-		pass
-
-
-class PhaseCheck(LineCheck):
-	""" basic class for function detection """
-
-	func_end_re = re.compile(r'^\}$')
-	phases_re = re.compile('(%s)' % '|'.join((
-		'pkg_pretend', 'pkg_setup', 'src_unpack', 'src_prepare',
-		'src_configure', 'src_compile', 'src_test', 'src_install',
-		'pkg_preinst', 'pkg_postinst', 'pkg_prerm', 'pkg_postrm',
-		'pkg_config')))
-	in_phase = ''
-
-	def check(self, num, line):
-		m = self.phases_re.match(line)
-		if m is not None:
-			self.in_phase = m.group(1)
-		if self.in_phase != '' and self.func_end_re.match(line) is not None:
-			self.in_phase = ''
-
-		return self.phase_check(num, line)
-
-	def phase_check(self, num, line):
-		""" override this function for your checks """
-		pass
-
-
-class EbuildHeader(LineCheck):
-	"""Ensure ebuilds have proper headers
-		Copyright header errors
-		CVS header errors
-		License header errors
-
-	Args:
-		modification_year - Year the ebuild was last modified
-	"""
-
-	repoman_check_name = 'ebuild.badheader'
-
-	gentoo_copyright = r'^# Copyright ((1999|2\d\d\d)-)?%s Gentoo Foundation$'
-	gentoo_license = (
-		'# Distributed under the terms'
-		' of the GNU General Public License v2')
-	cvs_header = re.compile(r'^# \$Header: .*\$$')
-	ignore_comment = False
-
-	def new(self, pkg):
-		if pkg.mtime is None:
-			self.modification_year = r'2\d\d\d'
-		else:
-			self.modification_year = str(time.gmtime(pkg.mtime)[0])
-		self.gentoo_copyright_re = re.compile(
-			self.gentoo_copyright % self.modification_year)
-
-	def check(self, num, line):
-		if num > 2:
-			return
-		elif num == 0:
-			if not self.gentoo_copyright_re.match(line):
-				return errors.COPYRIGHT_ERROR
-		elif num == 1 and line.rstrip('\n') != self.gentoo_license:
-			return errors.LICENSE_ERROR
-		elif num == 2:
-			if not self.cvs_header.match(line):
-				return errors.CVS_HEADER_ERROR
-
-
-class EbuildWhitespace(LineCheck):
-	"""Ensure ebuilds have proper whitespacing"""
-
-	repoman_check_name = 'ebuild.minorsyn'
-
-	ignore_line = re.compile(r'(^$)|(^(\t)*#)')
-	ignore_comment = False
-	leading_spaces = re.compile(r'^[\S\t]')
-	trailing_whitespace = re.compile(r'.*([\S]$)')
-
-	def check(self, num, line):
-		if self.leading_spaces.match(line) is None:
-			return errors.LEADING_SPACES_ERROR
-		if self.trailing_whitespace.match(line) is None:
-			return errors.TRAILING_WHITESPACE_ERROR
-
-
-class EbuildBlankLine(LineCheck):
-	repoman_check_name = 'ebuild.minorsyn'
-	ignore_comment = False
-	blank_line = re.compile(r'^$')
-
-	def new(self, pkg):
-		self.line_is_blank = False
-
-	def check(self, num, line):
-		if self.line_is_blank and self.blank_line.match(line):
-			return 'Useless blank line on line: %d'
-		if self.blank_line.match(line):
-			self.line_is_blank = True
-		else:
-			self.line_is_blank = False
-
-	def end(self):
-		if self.line_is_blank:
-			yield 'Useless blank line on last line'
-
-
-class EbuildQuote(LineCheck):
-	"""Ensure ebuilds have valid quoting around things like D,FILESDIR, etc..."""
-
-	repoman_check_name = 'ebuild.minorsyn'
-	_message_commands = [
-		"die", "echo", "eerror", "einfo", "elog", "eqawarn", "ewarn"]
-	_message_re = re.compile(
-		r'\s(' + "|".join(_message_commands) + r')\s+"[^"]*"\s*$')
-	_ignored_commands = ["local", "export"] + _message_commands
-	ignore_line = re.compile(
-		r'(^$)|(^\s*#.*)|(^\s*\w+=.*)' +
-		r'|(^\s*(' + "|".join(_ignored_commands) + r')\s+)')
-	ignore_comment = False
-	var_names = ["D", "DISTDIR", "FILESDIR", "S", "T", "ROOT", "WORKDIR"]
-
-	# EAPI=3/Prefix vars
-	var_names += ["ED", "EPREFIX", "EROOT"]
-
-	# variables for games.eclass
-	var_names += [
-		"Ddir", "GAMES_PREFIX_OPT", "GAMES_DATADIR",
-		"GAMES_DATADIR_BASE", "GAMES_SYSCONFDIR", "GAMES_STATEDIR",
-		"GAMES_LOGDIR", "GAMES_BINDIR"]
-
-	# variables for multibuild.eclass
-	var_names += ["BUILD_DIR"]
-
-	var_names = "(%s)" % "|".join(var_names)
-	var_reference = re.compile(
-		r'\$(\{%s\}|%s\W)' % (var_names, var_names))
-	missing_quotes = re.compile(
-		r'(\s|^)[^"\'\s]*\$\{?%s\}?[^"\'\s]*(\s|$)' % var_names)
-	cond_begin = re.compile(r'(^|\s+)\[\[($|\\$|\s+)')
-	cond_end = re.compile(r'(^|\s+)\]\]($|\\$|\s+)')
-
-	def check(self, num, line):
-		if self.var_reference.search(line) is None:
-			return
-		# There can be multiple matches / violations on a single line. We
-		# have to make sure none of the matches are violators. Once we've
-		# found one violator, any remaining matches on the same line can
-		# be ignored.
-		pos = 0
-		while pos <= len(line) - 1:
-			missing_quotes = self.missing_quotes.search(line, pos)
-			if not missing_quotes:
-				break
-			# If the last character of the previous match is a whitespace
-			# character, that character may be needed for the next
-			# missing_quotes match, so search overlaps by 1 character.
-			group = missing_quotes.group()
-			pos = missing_quotes.end() - 1
-
-			# Filter out some false positives that can
-			# get through the missing_quotes regex.
-			if self.var_reference.search(group) is None:
-				continue
-
-			# Filter matches that appear to be an
-			# argument to a message command.
-			# For example: false || ewarn "foo $WORKDIR/bar baz"
-			message_match = self._message_re.search(line)
-			if message_match is not None and \
-				message_match.start() < pos and \
-				message_match.end() > pos:
-				break
-
-			# This is an attempt to avoid false positives without getting
-			# too complex, while possibly allowing some (hopefully
-			# unlikely) violations to slip through. We just assume
-			# everything is correct if the there is a ' [[ ' or a ' ]] '
-			# anywhere in the whole line (possibly continued over one
-			# line).
-			if self.cond_begin.search(line) is not None:
-				continue
-			if self.cond_end.search(line) is not None:
-				continue
-
-			# Any remaining matches on the same line can be ignored.
-			return errors.MISSING_QUOTES_ERROR
-
-
-class EbuildAssignment(LineCheck):
-	"""Ensure ebuilds don't assign to readonly variables."""
-
-	repoman_check_name = 'variable.readonly'
-	read_only_vars = 'A|CATEGORY|P|P[VNRF]|PVR|D|WORKDIR|FILESDIR|FEATURES|USE'
-	readonly_assignment = re.compile(r'^\s*(export\s+)?(%s)=' % read_only_vars)
-
-	def check(self, num, line):
-		match = self.readonly_assignment.match(line)
-		e = None
-		if match is not None:
-			e = errors.READONLY_ASSIGNMENT_ERROR
-		return e
-
-
-class Eapi3EbuildAssignment(EbuildAssignment):
-	"""Ensure ebuilds don't assign to readonly EAPI 3-introduced variables."""
-
-	readonly_assignment = re.compile(r'\s*(export\s+)?(ED|EPREFIX|EROOT)=')
-
-	def check_eapi(self, eapi):
-		return eapi_supports_prefix(eapi)
-
-
-class EbuildNestedDie(LineCheck):
-	"""Check ebuild for nested die statements (die statements in subshells)"""
-
-	repoman_check_name = 'ebuild.nesteddie'
-	nesteddie_re = re.compile(r'^[^#]*\s\(\s[^)]*\bdie\b')
-
-	def check(self, num, line):
-		if self.nesteddie_re.match(line):
-			return errors.NESTED_DIE_ERROR
-
-
-class EbuildUselessDodoc(LineCheck):
-	"""Check ebuild for useless files in dodoc arguments."""
-	repoman_check_name = 'ebuild.minorsyn'
-	uselessdodoc_re = re.compile(
-		r'^\s*dodoc(\s+|\s+.*\s+)(ABOUT-NLS|COPYING|LICENCE|LICENSE)($|\s)')
-
-	def check(self, num, line):
-		match = self.uselessdodoc_re.match(line)
-		if match:
-			return "Useless dodoc '%s'" % (match.group(2), ) + " on line: %d"
-
-
-class EbuildUselessCdS(LineCheck):
-	"""Check for redundant cd ${S} statements"""
-	repoman_check_name = 'ebuild.minorsyn'
-	_src_phases = r'^\s*src_(prepare|configure|compile|install|test)\s*\(\)'
-	method_re = re.compile(_src_phases)
-	cds_re = re.compile(r'^\s*cd\s+("\$(\{S\}|S)"|\$(\{S\}|S))\s')
-
-	def __init__(self):
-		self.check_next_line = False
-
-	def check(self, num, line):
-		if self.check_next_line:
-			self.check_next_line = False
-			if self.cds_re.match(line):
-				return errors.REDUNDANT_CD_S_ERROR
-		elif self.method_re.match(line):
-			self.check_next_line = True
-
-
-class EapiDefinition(LineCheck):
-	"""
-	Check that EAPI assignment conforms to PMS section 7.3.1
-	(first non-comment, non-blank line).
-	"""
-	repoman_check_name = 'EAPI.definition'
-	ignore_comment = True
-	_eapi_re = portage._pms_eapi_re
-
-	def new(self, pkg):
-		self._cached_eapi = pkg.eapi
-		self._parsed_eapi = None
-		self._eapi_line_num = None
-
-	def check(self, num, line):
-		if self._eapi_line_num is None and line.strip():
-			self._eapi_line_num = num + 1
-			m = self._eapi_re.match(line)
-			if m is not None:
-				self._parsed_eapi = m.group(2)
-
-	def end(self):
-		if self._parsed_eapi is None:
-			if self._cached_eapi != "0":
-				yield "valid EAPI assignment must occur on or before line: %s" % \
-					self._eapi_line_num
-		elif self._parsed_eapi != self._cached_eapi:
-			yield (
-				"bash returned EAPI '%s' which does not match "
-				"assignment on line: %s" %
-				(self._cached_eapi, self._eapi_line_num))
-
-
-class EbuildPatches(LineCheck):
-	"""Ensure ebuilds use bash arrays for PATCHES to ensure white space safety"""
-	repoman_check_name = 'ebuild.patches'
-	re = re.compile(r'^\s*PATCHES=[^\(]')
-	error = errors.PATCHES_ERROR
-
-
-class EbuildQuotedA(LineCheck):
-	"""Ensure ebuilds have no quoting around ${A}"""
-
-	repoman_check_name = 'ebuild.minorsyn'
-	a_quoted = re.compile(r'.*\"\$(\{A\}|A)\"')
-
-	def check(self, num, line):
-		match = self.a_quoted.match(line)
-		if match:
-			return "Quoted \"${A}\" on line: %d"
-
-
-class NoOffsetWithHelpers(LineCheck):
-	""" Check that the image location, the alternate root offset, and the
-	offset prefix (D, ROOT, ED, EROOT and EPREFIX) are not used with
-	helpers """
-
-	repoman_check_name = 'variable.usedwithhelpers'
-	# Ignore matches in quoted strings like this:
-	# elog "installed into ${ROOT}usr/share/php5/apc/."
-	_install_funcs = (
-		'docinto|do(compress|dir|hard)'
-		'|exeinto|fowners|fperms|insinto|into')
-	_quoted_vars = 'D|ROOT|ED|EROOT|EPREFIX'
-	re = re.compile(
-		r'^[^#"\']*\b(%s)\s+"?\$\{?(%s)\b.*' %
-		(_install_funcs, _quoted_vars))
-	error = errors.NO_OFFSET_WITH_HELPERS
-
-
-class ImplicitRuntimeDeps(LineCheck):
-	"""
-	Detect the case where DEPEND is set and RDEPEND is unset in the ebuild,
-	since this triggers implicit RDEPEND=$DEPEND assignment (prior to EAPI 4).
-	"""
-
-	repoman_check_name = 'RDEPEND.implicit'
-	_assignment_re = re.compile(r'^\s*(R?DEPEND)\+?=')
-
-	def new(self, pkg):
-		self._rdepend = False
-		self._depend = False
-
-	def check_eapi(self, eapi):
-		# Beginning with EAPI 4, there is no
-		# implicit RDEPEND=$DEPEND assignment
-		# to be concerned with.
-		return eapi_has_implicit_rdepend(eapi)
-
-	def check(self, num, line):
-		if not self._rdepend:
-			m = self._assignment_re.match(line)
-			if m is None:
-				pass
-			elif m.group(1) == "RDEPEND":
-				self._rdepend = True
-			elif m.group(1) == "DEPEND":
-				self._depend = True
-
-	def end(self):
-		if self._depend and not self._rdepend:
-			yield 'RDEPEND is not explicitly assigned'
-
-
-class InheritDeprecated(LineCheck):
-	"""Check if ebuild directly or indirectly inherits a deprecated eclass."""
-
-	repoman_check_name = 'inherit.deprecated'
-
-	# deprecated eclass : new eclass (False if no new eclass)
-	deprecated_classes = {
-		"bash-completion": "bash-completion-r1",
-		"boost-utils": False,
-		"distutils": "distutils-r1",
-		"gems": "ruby-fakegem",
-		"mono": "mono-env",
-		"python": "python-r1 / python-single-r1 / python-any-r1",
-		"ruby": "ruby-ng",
-		"x-modular": "xorg-2",
-	}
-
-	_inherit_re = re.compile(r'^\s*inherit\s(.*)$')
-
-	def new(self, pkg):
-		self._errors = []
-
-	def check(self, num, line):
-		direct_inherits = None
-		m = self._inherit_re.match(line)
-		if m is not None:
-			direct_inherits = m.group(1)
-			if direct_inherits:
-				direct_inherits = direct_inherits.split()
-
-		if not direct_inherits:
-			return
-
-		for eclass in direct_inherits:
-			replacement = self.deprecated_classes.get(eclass)
-			if replacement is None:
-				pass
-			elif replacement is False:
-				self._errors.append(
-					"please migrate from "
-					"'%s' (no replacement) on line: %d" % (eclass, num + 1))
-			else:
-				self._errors.append(
-					"please migrate from "
-					"'%s' to '%s' on line: %d" % (eclass, replacement, num + 1))
-
-	def end(self):
-		for error in self._errors:
-			yield error
-		del self._errors
-
-
-
-class InheritEclass(LineCheck):
-	"""
-	Base class for checking for missing inherits, as well as excess inherits.
-
-	Args:
-		eclass: Set to the name of your eclass.
-		funcs: A tuple of functions that this eclass provides.
-		comprehensive: Is the list of functions complete?
-		exempt_eclasses: If these eclasses are inherited, disable the missing
-			inherit check.
-	"""
-
-	def __init__(
-		self, eclass, funcs=None, comprehensive=False,
-		exempt_eclasses=None, ignore_missing=False, **kwargs):
-		self._eclass = eclass
-		self._comprehensive = comprehensive
-		self._exempt_eclasses = exempt_eclasses
-		self._ignore_missing = ignore_missing
-		inherit_re = eclass
-		self._inherit_re = re.compile(
-			r'^(\s*|.*[|&]\s*)\binherit\s(.*\s)?%s(\s|$)' % inherit_re)
-		# Match when the function is preceded only by leading whitespace, a
-		# shell operator such as (, {, |, ||, or &&, or optional variable
-		# setting(s). This prevents false positives in things like elog
-		# messages, as reported in bug #413285.
-		self._func_re = re.compile(
-			r'(^|[|&{(])\s*(\w+=.*)?\b(' + '|'.join(funcs) + r')\b')
-
-	def new(self, pkg):
-		self.repoman_check_name = 'inherit.missing'
-		# We can't use pkg.inherited because that tells us all the eclasses that
-		# have been inherited and not just the ones we inherit directly.
-		self._inherit = False
-		self._func_call = False
-		if self._exempt_eclasses is not None:
-			inherited = pkg.inherited
-			self._disabled = any(x in inherited for x in self._exempt_eclasses)
-		else:
-			self._disabled = False
-		self._eapi = pkg.eapi
-
-	def check(self, num, line):
-		if not self._inherit:
-			self._inherit = self._inherit_re.match(line)
-		if not self._inherit:
-			if self._disabled or self._ignore_missing:
-				return
-			s = self._func_re.search(line)
-			if s is not None:
-				func_name = s.group(3)
-				eapi_func = _eclass_eapi_functions.get(func_name)
-				if eapi_func is None or not eapi_func(self._eapi):
-					self._func_call = True
-					return (
-						'%s.eclass is not inherited, '
-						'but "%s" found at line: %s' %
-						(self._eclass, func_name, '%d'))
-		elif not self._func_call:
-			self._func_call = self._func_re.search(line)
-
-	def end(self):
-		if not self._disabled and self._comprehensive and self._inherit \
-			and not self._func_call:
-			self.repoman_check_name = 'inherit.unused'
-			yield 'no function called from %s.eclass; please drop' % self._eclass
-
-_usex_supported_eapis = ("0", "1", "2", "3", "4", "4-python", "4-slot-abi")
-_eclass_eapi_functions = {
-	"usex": lambda eapi: eapi not in _usex_supported_eapis
-}
-
-# eclasses that export ${ECLASS}_src_(compile|configure|install)
-_eclass_export_functions = (
-	'ant-tasks', 'apache-2', 'apache-module', 'aspell-dict',
-	'autotools-utils', 'base', 'bsdmk', 'cannadic',
-	'clutter', 'cmake-utils', 'db', 'distutils', 'elisp',
-	'embassy', 'emboss', 'emul-linux-x86', 'enlightenment',
-	'font-ebdftopcf', 'font', 'fox', 'freebsd', 'freedict',
-	'games', 'games-ggz', 'games-mods', 'gdesklets',
-	'gems', 'gkrellm-plugin', 'gnatbuild', 'gnat', 'gnome2',
-	'gnome-python-common', 'gnustep-base', 'go-mono', 'gpe',
-	'gst-plugins-bad', 'gst-plugins-base', 'gst-plugins-good',
-	'gst-plugins-ugly', 'gtk-sharp-module', 'haskell-cabal',
-	'horde', 'java-ant-2', 'java-pkg-2', 'java-pkg-simple',
-	'java-virtuals-2', 'kde4-base', 'kde4-meta', 'kernel-2',
-	'latex-package', 'linux-mod', 'mozlinguas', 'myspell',
-	'myspell-r2', 'mysql', 'mysql-v2', 'mythtv-plugins',
-	'oasis', 'obs-service', 'office-ext', 'perl-app',
-	'perl-module', 'php-ext-base-r1', 'php-ext-pecl-r2',
-	'php-ext-source-r2', 'php-lib-r1', 'php-pear-lib-r1',
-	'php-pear-r1', 'python-distutils-ng', 'python',
-	'qt4-build', 'qt4-r2', 'rox-0install', 'rox', 'ruby',
-	'ruby-ng', 'scsh', 'selinux-policy-2', 'sgml-catalog',
-	'stardict', 'sword-module', 'tetex-3', 'tetex',
-	'texlive-module', 'toolchain-binutils', 'toolchain',
-	'twisted', 'vdr-plugin-2', 'vdr-plugin', 'vim',
-	'vim-plugin', 'vim-spell', 'virtuoso', 'vmware',
-	'vmware-mod', 'waf-utils', 'webapp', 'xemacs-elisp',
-	'xemacs-packages', 'xfconf', 'x-modular', 'xorg-2',
-	'zproduct'
-)
-
-_eclass_info = {
-	'autotools': {
-		'funcs': (
-			'eaclocal', 'eautoconf', 'eautoheader',
-			'eautomake', 'eautoreconf', '_elibtoolize',
-			'eautopoint'
-		),
-		'comprehensive': True,
-
-		# Exempt eclasses:
-		# git - An EGIT_BOOTSTRAP variable may be used to call one of
-		#       the autotools functions.
-		# subversion - An ESVN_BOOTSTRAP variable may be used to call one of
-		#       the autotools functions.
-		'exempt_eclasses': ('git', 'git-2', 'subversion', 'autotools-utils')
-	},
-
-	'eutils': {
-		'funcs': (
-			'estack_push', 'estack_pop', 'eshopts_push', 'eshopts_pop',
-			'eumask_push', 'eumask_pop', 'epatch', 'epatch_user',
-			'emktemp', 'edos2unix', 'in_iuse', 'use_if_iuse', 'usex'
-		),
-		'comprehensive': False,
-
-		# These are "eclasses are the whole ebuild" type thing.
-		'exempt_eclasses': _eclass_export_functions,
-	},
-
-	'flag-o-matic': {
-		'funcs': (
-			'filter-(ld)?flags', 'strip-flags', 'strip-unsupported-flags',
-			'append-((ld|c(pp|xx)?))?flags', 'append-libs',
-		),
-		'comprehensive': False
-	},
-
-	'libtool': {
-		'funcs': (
-			'elibtoolize',
-		),
-		'comprehensive': True,
-		'exempt_eclasses': ('autotools',)
-	},
-
-	'multilib': {
-		'funcs': (
-			'get_libdir',
-		),
-
-		# These are "eclasses are the whole ebuild" type thing.
-		'exempt_eclasses': _eclass_export_functions + (
-			'autotools', 'libtool', 'multilib-minimal'),
-
-		'comprehensive': False
-	},
-
-	'multiprocessing': {
-		'funcs': (
-			'makeopts_jobs',
-		),
-		'comprehensive': False
-	},
-
-	'prefix': {
-		'funcs': (
-			'eprefixify',
-		),
-		'comprehensive': True
-	},
-
-	'toolchain-funcs': {
-		'funcs': (
-			'gen_usr_ldscript',
-		),
-		'comprehensive': False
-	},
-
-	'user': {
-		'funcs': (
-			'enewuser', 'enewgroup',
-			'egetent', 'egethome', 'egetshell', 'esethome'
-		),
-		'comprehensive': True
-	}
-}
-
-
-class EMakeParallelDisabled(PhaseCheck):
-	"""Check for emake -j1 calls which disable parallelization."""
-	repoman_check_name = 'upstream.workaround'
-	re = re.compile(r'^\s*emake\s+.*-j\s*1\b')
-	error = errors.EMAKE_PARALLEL_DISABLED
-
-	def phase_check(self, num, line):
-		if self.in_phase == 'src_compile' or self.in_phase == 'src_install':
-			if self.re.match(line):
-				return self.error
-
-
-class EMakeParallelDisabledViaMAKEOPTS(LineCheck):
-	"""Check for MAKEOPTS=-j1 that disables parallelization."""
-	repoman_check_name = 'upstream.workaround'
-	re = re.compile(r'^\s*MAKEOPTS=(\'|")?.*-j\s*1\b')
-	error = errors.EMAKE_PARALLEL_DISABLED_VIA_MAKEOPTS
-
-
-class NoAsNeeded(LineCheck):
-	"""Check for calls to the no-as-needed function."""
-	repoman_check_name = 'upstream.workaround'
-	re = re.compile(r'.*\$\(no-as-needed\)')
-	error = errors.NO_AS_NEEDED
-
-
-class PreserveOldLib(LineCheck):
-	"""Check for calls to the deprecated preserve_old_lib function."""
-	repoman_check_name = 'ebuild.minorsyn'
-	re = re.compile(r'.*preserve_old_lib')
-	error = errors.PRESERVE_OLD_LIB
-
-
-class SandboxAddpredict(LineCheck):
-	"""Check for calls to the addpredict function."""
-	repoman_check_name = 'upstream.workaround'
-	re = re.compile(r'(^|\s)addpredict\b')
-	error = errors.SANDBOX_ADDPREDICT
-
-
-class DeprecatedBindnowFlags(LineCheck):
-	"""Check for calls to the deprecated bindnow-flags function."""
-	repoman_check_name = 'ebuild.minorsyn'
-	re = re.compile(r'.*\$\(bindnow-flags\)')
-	error = errors.DEPRECATED_BINDNOW_FLAGS
-
-
-class WantAutoDefaultValue(LineCheck):
-	"""Check setting WANT_AUTO* to latest (default value)."""
-	repoman_check_name = 'ebuild.minorsyn'
-	_re = re.compile(r'^WANT_AUTO(CONF|MAKE)=(\'|")?latest')
-
-	def check(self, num, line):
-		m = self._re.match(line)
-		if m is not None:
-			return 'WANT_AUTO' + m.group(1) + \
-				' redundantly set to default value "latest" on line: %d'
-
-
-class SrcCompileEconf(PhaseCheck):
-	repoman_check_name = 'ebuild.minorsyn'
-	configure_re = re.compile(r'\s(econf|./configure)')
-
-	def check_eapi(self, eapi):
-		return eapi_has_src_prepare_and_src_configure(eapi)
-
-	def phase_check(self, num, line):
-		if self.in_phase == 'src_compile':
-			m = self.configure_re.match(line)
-			if m is not None:
-				return ("'%s'" % m.group(1)) + \
-					" call should be moved to src_configure from line: %d"
-
-
-class SrcUnpackPatches(PhaseCheck):
-	repoman_check_name = 'ebuild.minorsyn'
-	src_prepare_tools_re = re.compile(r'\s(e?patch|sed)\s')
-
-	def check_eapi(self, eapi):
-		return eapi_has_src_prepare_and_src_configure(eapi)
-
-	def phase_check(self, num, line):
-		if self.in_phase == 'src_unpack':
-			m = self.src_prepare_tools_re.search(line)
-			if m is not None:
-				return ("'%s'" % m.group(1)) + \
-					" call should be moved to src_prepare from line: %d"
-
-
-class BuiltWithUse(LineCheck):
-	repoman_check_name = 'ebuild.minorsyn'
-	re = re.compile(r'(^|.*\b)built_with_use\b')
-	error = errors.BUILT_WITH_USE
-
-
-class DeprecatedUseq(LineCheck):
-	"""Checks for use of the deprecated useq function"""
-	repoman_check_name = 'ebuild.minorsyn'
-	re = re.compile(r'(^|.*\b)useq\b')
-	error = errors.USEQ_ERROR
-
-
-class DeprecatedHasq(LineCheck):
-	"""Checks for use of the deprecated hasq function"""
-	repoman_check_name = 'ebuild.minorsyn'
-	re = re.compile(r'(^|.*\b)hasq\b')
-	error = errors.HASQ_ERROR
-
-
-# EAPI <2 checks
-class UndefinedSrcPrepareSrcConfigurePhases(LineCheck):
-	repoman_check_name = 'EAPI.incompatible'
-	src_configprepare_re = re.compile(r'\s*(src_configure|src_prepare)\s*\(\)')
-
-	def check_eapi(self, eapi):
-		return not eapi_has_src_prepare_and_src_configure(eapi)
-
-	def check(self, num, line):
-		m = self.src_configprepare_re.match(line)
-		if m is not None:
-			return ("'%s'" % m.group(1)) + \
-				" phase is not defined in EAPI < 2 on line: %d"
-
-
-# EAPI-3 checks
-class Eapi3DeprecatedFuncs(LineCheck):
-	repoman_check_name = 'EAPI.deprecated'
-	deprecated_commands_re = re.compile(r'^\s*(check_license)\b')
-
-	def check_eapi(self, eapi):
-		return eapi not in ('0', '1', '2')
-
-	def check(self, num, line):
-		m = self.deprecated_commands_re.match(line)
-		if m is not None:
-			return ("'%s'" % m.group(1)) + \
-				" has been deprecated in EAPI=3 on line: %d"
-
-
-# EAPI <4 checks
-class UndefinedPkgPretendPhase(LineCheck):
-	repoman_check_name = 'EAPI.incompatible'
-	pkg_pretend_re = re.compile(r'\s*(pkg_pretend)\s*\(\)')
-
-	def check_eapi(self, eapi):
-		return not eapi_has_pkg_pretend(eapi)
-
-	def check(self, num, line):
-		m = self.pkg_pretend_re.match(line)
-		if m is not None:
-			return ("'%s'" % m.group(1)) + \
-				" phase is not defined in EAPI < 4 on line: %d"
-
-
-# EAPI-4 checks
-class Eapi4IncompatibleFuncs(LineCheck):
-	repoman_check_name = 'EAPI.incompatible'
-	banned_commands_re = re.compile(r'^\s*(dosed|dohard)')
-
-	def check_eapi(self, eapi):
-		return not eapi_has_dosed_dohard(eapi)
-
-	def check(self, num, line):
-		m = self.banned_commands_re.match(line)
-		if m is not None:
-			return ("'%s'" % m.group(1)) + \
-				" has been banned in EAPI=4 on line: %d"
-
-
-class Eapi4GoneVars(LineCheck):
-	repoman_check_name = 'EAPI.incompatible'
-	undefined_vars_re = re.compile(
-		r'.*\$(\{(AA|KV|EMERGE_FROM)\}|(AA|KV|EMERGE_FROM))')
-
-	def check_eapi(self, eapi):
-		# AA, KV, and EMERGE_FROM should not be referenced in EAPI 4 or later.
-		return not eapi_exports_AA(eapi)
-
-	def check(self, num, line):
-		m = self.undefined_vars_re.match(line)
-		if m is not None:
-			return ("variable '$%s'" % m.group(1)) + \
-				" is gone in EAPI=4 on line: %d"
-
-
-class PortageInternal(LineCheck):
-	repoman_check_name = 'portage.internal'
-	ignore_comment = True
-	# Match when the command is preceded only by leading whitespace or a shell
-	# operator such as (, {, |, ||, or &&. This prevents false positives in
-	# things like elog messages, as reported in bug #413285.
-
-	internal_portage_func_or_var = (
-		'ecompress|ecompressdir|env-update|prepall|prepalldocs|preplib')
-	re = re.compile(
-		r'^(\s*|.*[|&{(]+\s*)\b(%s)\b' % internal_portage_func_or_var)
-
-	def check(self, num, line):
-		"""Run the check on line and return error if there is one"""
-		m = self.re.match(line)
-		if m is not None:
-			return ("'%s'" % m.group(2)) + " called on line: %d"
-
-
-class PortageInternalVariableAssignment(LineCheck):
-	repoman_check_name = 'portage.internal'
-	internal_assignment = re.compile(
-		r'\s*(export\s+)?(EXTRA_ECONF|EXTRA_EMAKE)\+?=')
-
-	def check(self, num, line):
-		match = self.internal_assignment.match(line)
-		e = None
-		if match is not None:
-			e = 'Assignment to variable %s' % match.group(2)
-			e += ' on line: %d'
-		return e
-
-_base_check_classes = (InheritEclass, LineCheck, PhaseCheck)
-_constant_checks = None
-
-
-def checks_init(experimental_inherit=False):
-
-	global _constant_checks, _eclass_info
-
-	if not experimental_inherit:
-		# Emulate the old eprefixify.defined and inherit.autotools checks.
-		_eclass_info = {
-			'autotools': {
-				'funcs': (
-					'eaclocal', 'eautoconf', 'eautoheader',
-					'eautomake', 'eautoreconf', '_elibtoolize',
-					'eautopoint'
-				),
-				'comprehensive': True,
-				'ignore_missing': True,
-				'exempt_eclasses': ('git', 'git-2', 'subversion', 'autotools-utils')
-			},
-
-			'prefix': {
-				'funcs': (
-					'eprefixify',
-				),
-				'comprehensive': False
-			}
-		}
-
-	_constant_checks = tuple(
-		chain((
-			v() for k, v in globals().items()
-			if (
-				isinstance(v, type)
-				and issubclass(v, LineCheck)
-				and v not in _base_check_classes)), (
-			InheritEclass(k, **portage._native_kwargs(kwargs))
-			for k, kwargs in _eclass_info.items())))
-
-
-_here_doc_re = re.compile(r'.*\s<<[-]?(\w+)$')
-_ignore_comment_re = re.compile(r'^\s*#')
-
-
-def run_checks(contents, pkg):
-	unicode_escape_codec = codecs.lookup('unicode_escape')
-	unicode_escape = lambda x: unicode_escape_codec.decode(x)[0]
-	if _constant_checks is None:
-		checks_init()
-	checks = _constant_checks
-	here_doc_delim = None
-	multiline = None
-
-	for lc in checks:
-		lc.new(pkg)
-
-	multinum = 0
-	for num, line in enumerate(contents):
-
-		# Check if we're inside a here-document.
-		if here_doc_delim is not None:
-			if here_doc_delim.match(line):
-				here_doc_delim = None
-		if here_doc_delim is None:
-			here_doc = _here_doc_re.match(line)
-			if here_doc is not None:
-				here_doc_delim = re.compile(r'^\s*%s$' % here_doc.group(1))
-		if here_doc_delim is not None:
-			continue
-
-		# Unroll multiline escaped strings so that we can check things:
-		# 	inherit foo bar \
-		# 		moo \
-		# 		cow
-		# This will merge these lines like so:
-		# 	inherit foo bar moo cow
-		try:
-			# A normal line will end in the two bytes: <\> <\n>.  So decoding
-			# that will result in python thinking the <\n> is being escaped
-			# and eat the single <\> which makes it hard for us to detect.
-			# Instead, strip the newline (which we know all lines have), and
-			# append a <0>.  Then when python escapes it, if the line ended
-			# in a <\>, we'll end up with a <\0> marker to key off of.  This
-			# shouldn't be a problem with any valid ebuild ...
-			line_escaped = unicode_escape(line.rstrip('\n') + '0')
-		except SystemExit:
-			raise
-		except:
-			# Who knows what kind of crazy crap an ebuild will have
-			# in it -- don't allow it to kill us.
-			line_escaped = line
-		if multiline:
-			# Chop off the \ and \n bytes from the previous line.
-			multiline = multiline[:-2] + line
-			if not line_escaped.endswith('\0'):
-				line = multiline
-				num = multinum
-				multiline = None
-			else:
-				continue
-		else:
-			if line_escaped.endswith('\0'):
-				multinum = num
-				multiline = line
-				continue
-
-		if not line.endswith("#nowarn\n"):
-			# Finally we have a full line to parse.
-			is_comment = _ignore_comment_re.match(line) is not None
-			for lc in checks:
-				if is_comment and lc.ignore_comment:
-					continue
-				if lc.check_eapi(pkg.eapi):
-					ignore = lc.ignore_line
-					if not ignore or not ignore.match(line):
-						e = lc.check(num, line)
-						if e:
-							yield lc.repoman_check_name, e % (num + 1)
-
-	for lc in checks:
-		i = lc.end()
-		if i is not None:
-			for e in i:
-				yield lc.repoman_check_name, e

diff --git a/pym/tbc/repoman/checks/ebuilds/eclasses/__init__.py b/pym/tbc/repoman/checks/ebuilds/eclasses/__init__.py
deleted file mode 100644
index e69de29..0000000

diff --git a/pym/tbc/repoman/checks/ebuilds/eclasses/live.py b/pym/tbc/repoman/checks/ebuilds/eclasses/live.py
deleted file mode 100644
index 754c557..0000000
--- a/pym/tbc/repoman/checks/ebuilds/eclasses/live.py
+++ /dev/null
@@ -1,39 +0,0 @@
-
-'''live.py
-Performs Live eclass checks
-'''
-
-from tbc.repoman.repos import has_global_mask
-
-
-class LiveEclassChecks(object):
-	'''Performs checks for the usage of Live eclasses in ebuilds'''
-
-	def __init__(self, qatracker):
-		'''
-		@param qatracker: QATracker instance
-		'''
-		self.qatracker = qatracker
-
-	def check(self, pkg, package, ebuild, y_ebuild, keywords, global_pmaskdict):
-		'''Ebuilds that inherit a "Live" eclass (darcs, subversion, git, cvs,
-		etc..) should not be allowed to be marked stable
-
-		@param pkg: Package in which we check (object).
-		@param package: Package in which we check (string).
-		@param ebuild: Ebuild which we check (object).
-		@param y_ebuild: Ebuild which we check (string).
-		@param keywords: The keywords of the ebuild.
-		@param global_pmaskdict: A global dictionary of all the masks.
-		'''
-		is_stable = lambda kw: not kw.startswith("~") and not kw.startswith("-")
-		bad_stable_keywords = list(filter(is_stable, keywords))
-
-		if bad_stable_keywords:
-			self.qatracker.add_error(
-				"LIVEVCS.stable", "%s/%s.ebuild with stable keywords:%s " % (
-					package, y_ebuild, bad_stable_keywords))
-
-		good_keywords_exist = len(bad_stable_keywords) < len(keywords)
-		if good_keywords_exist and not has_global_mask(pkg, global_pmaskdict):
-			self.qatracker.add_error("LIVEVCS.unmasked", ebuild.relative_path)

diff --git a/pym/tbc/repoman/checks/ebuilds/eclasses/ruby.py b/pym/tbc/repoman/checks/ebuilds/eclasses/ruby.py
deleted file mode 100644
index e8d36ea..0000000
--- a/pym/tbc/repoman/checks/ebuilds/eclasses/ruby.py
+++ /dev/null
@@ -1,32 +0,0 @@
-
-'''live.py
-Performs Ruby eclass checks
-'''
-
-from repoman.qa_data import ruby_deprecated
-
-
-class RubyEclassChecks(object):
-	'''Performs checks for the usage of Ruby eclasses in ebuilds'''
-
-	def __init__(self, qatracker):
-		'''
-		@param qatracker: QATracker instance
-		'''
-		self.qatracker = qatracker
-		self.old_ruby_eclasses = ["ruby-ng", "ruby-fakegem", "ruby"]
-
-	def check(self, pkg, ebuild):
-		is_inherited = lambda eclass: eclass in pkg.inherited
-		is_old_ruby_eclass_inherited = filter(
-			is_inherited, self.old_ruby_eclasses)
-
-		if is_old_ruby_eclass_inherited:
-			ruby_intersection = pkg.iuse.all.intersection(ruby_deprecated)
-
-			if ruby_intersection:
-				for myruby in ruby_intersection:
-					self.qatracker.add_error(
-						"IUSE.rubydeprecated",
-						(ebuild.relative_path + ": Deprecated ruby target: %s")
-						% myruby)

diff --git a/pym/tbc/repoman/checks/ebuilds/errors.py b/pym/tbc/repoman/checks/ebuilds/errors.py
deleted file mode 100644
index 20ebc29..0000000
--- a/pym/tbc/repoman/checks/ebuilds/errors.py
+++ /dev/null
@@ -1,48 +0,0 @@
-# repoman: Error Messages
-# Copyright 2007-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-from __future__ import unicode_literals
-
-COPYRIGHT_ERROR = (
-	'Invalid Gentoo Copyright on line: %d')
-LICENSE_ERROR = (
-	'Invalid Gentoo/GPL License on line: %d')
-CVS_HEADER_ERROR = (
-	'Malformed CVS Header on line: %d')
-LEADING_SPACES_ERROR = (
-	'Ebuild contains leading spaces on line: %d')
-TRAILING_WHITESPACE_ERROR = (
-	'Trailing whitespace error on line: %d')
-READONLY_ASSIGNMENT_ERROR = (
-	'Ebuild contains assignment to read-only variable on line: %d')
-MISSING_QUOTES_ERROR = (
-	'Unquoted Variable on line: %d')
-NESTED_DIE_ERROR = (
-	'Ebuild calls die in a subshell on line: %d')
-PATCHES_ERROR = (
-	'PATCHES is not a bash array on line: %d')
-REDUNDANT_CD_S_ERROR = (
-	'Ebuild has redundant cd ${S} statement on line: %d')
-EMAKE_PARALLEL_DISABLED = (
-	'Upstream parallel compilation bug (ebuild calls emake -j1 on line: %d)')
-EMAKE_PARALLEL_DISABLED_VIA_MAKEOPTS = (
-	'Upstream parallel compilation bug (MAKEOPTS=-j1 on line: %d)')
-DEPRECATED_BINDNOW_FLAGS = (
-	'Deprecated bindnow-flags call on line: %d')
-EAPI_DEFINED_AFTER_INHERIT = (
-	'EAPI defined after inherit on line: %d')
-NO_AS_NEEDED = (
-	'Upstream asneeded linking bug (no-as-needed on line: %d)')
-PRESERVE_OLD_LIB = (
-	'Ebuild calls deprecated preserve_old_lib on line: %d')
-BUILT_WITH_USE = (
-	'built_with_use on line: %d')
-NO_OFFSET_WITH_HELPERS = (
-	"Helper function is used with D, ROOT, ED, EROOT or EPREFIX on line :%d")
-SANDBOX_ADDPREDICT = (
-	'Ebuild calls addpredict on line: %d')
-USEQ_ERROR = (
-	'Ebuild calls deprecated useq function on line: %d')
-HASQ_ERROR = (
-	'Ebuild calls deprecated hasq function on line: %d')

diff --git a/pym/tbc/repoman/checks/ebuilds/fetches.py b/pym/tbc/repoman/checks/ebuilds/fetches.py
deleted file mode 100644
index 95d88e8..0000000
--- a/pym/tbc/repoman/checks/ebuilds/fetches.py
+++ /dev/null
@@ -1,138 +0,0 @@
-
-'''fetches.py
-Performs the src_uri fetchlist and files checks
-'''
-
-from stat import S_ISDIR
-
-# import our initialized portage instance
-from tbc.repoman._portage import portage
-
-from portage import os
-
-from tbc.repoman.vcs.vcs import vcs_new_changed
-
-
-class FetchChecks(object):
-	'''Performs checks on the files needed for the ebuild'''
-
-	def __init__(
-		self, qatracker, repoman_settings, repo_settings, portdb, vcs_settings):
-		'''
-		@param qatracker: QATracker instance
-		@param repoman_settings: settings instance
-		@param repo_settings: repository settings instance
-		@param portdb: portdb instance
-		'''
-		self.portdb = portdb
-		self.qatracker = qatracker
-		self.repo_settings = repo_settings
-		self.repoman_settings = repoman_settings
-		self.vcs_settings = vcs_settings
-		self._digests = None
-
-	def check(self, xpkg, checkdir, checkdir_relative, mychanged, mynew):
-		'''Checks the ebuild sources and files for errors
-
-		@param xpkg: the pacakge being checked
-		@param checkdir: string, directory path
-		@param checkdir_relative: repolevel determined path
-		'''
-		self.checkdir = checkdir
-		fetchlist_dict = portage.FetchlistDict(
-			checkdir, self.repoman_settings, self.portdb)
-		myfiles_all = []
-		self.src_uri_error = False
-		for mykey in fetchlist_dict:
-			try:
-				myfiles_all.extend(fetchlist_dict[mykey])
-			except portage.exception.InvalidDependString as e:
-				self.src_uri_error = True
-				try:
-					self.portdb.aux_get(mykey, ["SRC_URI"])
-				except KeyError:
-					# This will be reported as an "ebuild.syntax" error.
-					pass
-				else:
-					self.qatracker.add_error(
-						"SRC_URI.syntax", "%s.ebuild SRC_URI: %s" % (mykey, e))
-		del fetchlist_dict
-		if not self.src_uri_error:
-			# This test can produce false positives if SRC_URI could not
-			# be parsed for one or more ebuilds. There's no point in
-			# producing a false error here since the root cause will
-			# produce a valid error elsewhere, such as "SRC_URI.syntax"
-			# or "ebuild.sytax".
-			myfiles_all = set(myfiles_all)
-			for entry in self.digests:
-				if entry not in myfiles_all:
-					self.qatracker.add_error("digest.unused", checkdir + "::" + entry)
-			for entry in myfiles_all:
-				if entry not in self.digests:
-					self.qatracker.add_error("digest.missing", checkdir + "::" + entry)
-		del myfiles_all
-
-		if os.path.exists(checkdir + "/files"):
-			filesdirlist = os.listdir(checkdir + "/files")
-
-			# Recurse through files directory, use filesdirlist as a stack;
-			# appending directories as needed,
-			# so people can't hide > 20k files in a subdirectory.
-			while filesdirlist:
-				y = filesdirlist.pop(0)
-				relative_path = os.path.join(xpkg, "files", y)
-				full_path = os.path.join(self.repo_settings.repodir, relative_path)
-				try:
-					mystat = os.stat(full_path)
-				except OSError as oe:
-					if oe.errno == 2:
-						# don't worry about it.  it likely was removed via fix above.
-						continue
-					else:
-						raise oe
-				if S_ISDIR(mystat.st_mode):
-					# !!! VCS "portability" alert!  Need some function isVcsDir() or alike !!!
-					if y == "CVS" or y == ".svn":
-						continue
-					for z in os.listdir(checkdir + "/files/" + y):
-						if z == "CVS" or z == ".svn":
-							continue
-						filesdirlist.append(y + "/" + z)
-				# Current policy is no files over 20 KiB, these are the checks.
-				# File size between 20 KiB and 60 KiB causes a warning,
-				# while file size over 60 KiB causes an error.
-				elif mystat.st_size > 61440:
-					self.qatracker.add_error(
-						"file.size.fatal", "(%d KiB) %s/files/%s" % (
-							mystat.st_size // 1024, xpkg, y))
-				elif mystat.st_size > 20480:
-					self.qatracker.add_error(
-						"file.size", "(%d KiB) %s/files/%s" % (
-							mystat.st_size // 1024, xpkg, y))
-
-				index = self.repo_settings.repo_config.find_invalid_path_char(y)
-				if index != -1:
-					y_relative = os.path.join(checkdir_relative, "files", y)
-					if self.vcs_settings.vcs is not None \
-						and not vcs_new_changed(y_relative, mychanged, mynew):
-						# If the file isn't in the VCS new or changed set, then
-						# assume that it's an irrelevant temporary file (Manifest
-						# entries are not generated for file names containing
-						# prohibited characters). See bug #406877.
-						index = -1
-				if index != -1:
-					self.qatracker.add_error(
-						"file.name",
-						"%s/files/%s: char '%s'" % (checkdir, y, y[index]))
-
-	@property
-	def digests(self):
-		'''Property function, returns the saved digests or
-		loads them for the test'''
-		if not self._digests:
-			mf = self.repoman_settings.repositories.get_repo_for_location(
-				os.path.dirname(os.path.dirname(self.checkdir)))
-			mf = mf.load_manifest(self.checkdir, self.repoman_settings["DISTDIR"])
-			self._digests = mf.getTypeDigests("DIST")
-			del mf
-		return self._digests

diff --git a/pym/tbc/repoman/checks/ebuilds/isebuild.py b/pym/tbc/repoman/checks/ebuilds/isebuild.py
deleted file mode 100644
index 42c69bd..0000000
--- a/pym/tbc/repoman/checks/ebuilds/isebuild.py
+++ /dev/null
@@ -1,70 +0,0 @@
-
-import stat
-
-from _emerge.Package import Package
-from _emerge.RootConfig import RootConfig
-
-# import our initialized portage instance
-from tbc.repoman._portage import portage
-
-from portage import os
-
-from tbc.repoman.qa_data import no_exec, allvars
-
-
-class IsEbuild(object):
-
-	def __init__(self, repoman_settings, repo_settings, portdb, qatracker):
-		''''''
-		self.portdb = portdb
-		self.qatracker = qatracker
-		self.root_config = RootConfig(
-			repoman_settings, repo_settings.trees[repo_settings.root], None)
-
-	def check(self, checkdirlist, checkdir, xpkg):
-		self.continue_ = False
-		ebuildlist = []
-		pkgs = {}
-		allvalid = True
-		for y in checkdirlist:
-			file_is_ebuild = y.endswith(".ebuild")
-			file_should_be_non_executable = y in no_exec or file_is_ebuild
-
-			if file_should_be_non_executable:
-				file_is_executable = stat.S_IMODE(
-					os.stat(os.path.join(checkdir, y)).st_mode) & 0o111
-
-				if file_is_executable:
-					self.qatracker.add_error("file.executable", os.path.join(checkdir, y))
-			if file_is_ebuild:
-				pf = y[:-7]
-				ebuildlist.append(pf)
-				catdir = xpkg.split("/")[0]
-				cpv = "%s/%s" % (catdir, pf)
-				try:
-					myaux = dict(zip(allvars, self.portdb.aux_get(cpv, allvars)))
-				except KeyError:
-					allvalid = False
-					self.qatracker.add_error("ebuild.syntax", os.path.join(xpkg, y))
-					continue
-				except IOError:
-					allvalid = False
-					self.qatracker.add_error("ebuild.output", os.path.join(xpkg, y))
-					continue
-				if not portage.eapi_is_supported(myaux["EAPI"]):
-					allvalid = False
-					self.qatracker.add_error("EAPI.unsupported", os.path.join(xpkg, y))
-					continue
-				pkgs[pf] = Package(
-					cpv=cpv, metadata=myaux, root_config=self.root_config,
-					type_name="ebuild")
-
-		if len(pkgs) != len(ebuildlist):
-			# If we can't access all the metadata then it's totally unsafe to
-			# commit since there's no way to generate a correct Manifest.
-			# Do not try to do any more QA checks on this package since missing
-			# metadata leads to false positives for several checks, and false
-			# positives confuse users.
-			self.continue_ = True
-
-		return pkgs, allvalid

diff --git a/pym/tbc/repoman/checks/ebuilds/keywords.py b/pym/tbc/repoman/checks/ebuilds/keywords.py
deleted file mode 100644
index 235c751..0000000
--- a/pym/tbc/repoman/checks/ebuilds/keywords.py
+++ /dev/null
@@ -1,121 +0,0 @@
-
-'''keywords.py
-Perform KEYWORDS related checks
-'''
-
-
-class KeywordChecks(object):
-	'''Perform checks on the KEYWORDS of an ebuild'''
-
-	def __init__(self, qatracker, options):
-		'''
-		@param qatracker: QATracker instance
-		'''
-		self.qatracker = qatracker
-		self.options = options
-		self.slot_keywords = {}
-
-	def prepare(self):
-		'''Prepare the checks for the next package.'''
-		self.slot_keywords = {}
-
-	def check(
-		self, pkg, package, ebuild, y_ebuild, keywords, ebuild_archs, changed,
-		live_ebuild, kwlist, profiles):
-		'''Perform the check.
-
-		@param pkg: Package in which we check (object).
-		@param package: Package in which we check (string).
-		@param ebuild: Ebuild which we check (object).
-		@param y_ebuild: Ebuild which we check (string).
-		@param keywords: All the keywords (including -...) of the ebuild.
-		@param ebuild_archs: Just the architectures (no prefixes) of the ebuild.
-		@param changed: Changes instance
-		@param slot_keywords: A dictionary of keywords per slot.
-		@param live_ebuild: A boolean that determines if this is a live ebuild.
-		@param kwlist: A list of all global keywords.
-		@param profiles: A list of all profiles.
-		'''
-		if not self.options.straight_to_stable:
-			self._checkAddedWithStableKeywords(
-				package, ebuild, y_ebuild, keywords, changed)
-
-		self._checkForDroppedKeywords(
-			pkg, ebuild, ebuild_archs, live_ebuild)
-
-		self._checkForInvalidKeywords(
-			pkg, package, y_ebuild, kwlist, profiles)
-
-		self._checkForMaskLikeKeywords(
-			package, y_ebuild, keywords, kwlist)
-
-		self.slot_keywords[pkg.slot].update(ebuild_archs)
-
-	def _isKeywordStable(self, keyword):
-		return not keyword.startswith("~") and not keyword.startswith("-")
-
-	def _checkAddedWithStableKeywords(
-		self, package, ebuild, y_ebuild, keywords, changed):
-		catdir, pkgdir = package.split("/")
-
-		stable_keywords = list(filter(self._isKeywordStable, keywords))
-		if stable_keywords:
-			if ebuild.ebuild_path in changed.new_ebuilds and catdir != "virtual":
-				stable_keywords.sort()
-				self.qatracker.add_error(
-					"KEYWORDS.stable",
-					"%s/%s.ebuild added with stable keywords: %s" %
-					(package, y_ebuild, " ".join(stable_keywords)))
-
-	def _checkForDroppedKeywords(
-		self, pkg, ebuild, ebuild_archs, live_ebuild):
-		previous_keywords = self.slot_keywords.get(pkg.slot)
-		if previous_keywords is None:
-			self.slot_keywords[pkg.slot] = set()
-		elif ebuild_archs and "*" not in ebuild_archs and not live_ebuild:
-			dropped_keywords = previous_keywords.difference(ebuild_archs)
-			if dropped_keywords:
-				self.qatracker.add_error(
-					"KEYWORDS.dropped", "%s: %s" % (
-						ebuild.relative_path,
-						" ".join(sorted(dropped_keywords))))
-
-	def _checkForInvalidKeywords(
-		self, pkg, package, y_ebuild, kwlist, profiles):
-		myuse = pkg._metadata["KEYWORDS"].split()
-
-		for mykey in myuse:
-			if mykey not in ("-*", "*", "~*"):
-				myskey = mykey
-
-				if not self._isKeywordStable(myskey[:1]):
-					myskey = myskey[1:]
-
-				if myskey not in kwlist:
-					self.qatracker.add_error(
-						"KEYWORDS.invalid",
-						"%s/%s.ebuild: %s" % (
-							package, y_ebuild, mykey))
-				elif myskey not in profiles:
-					self.qatracker.add_error(
-						"KEYWORDS.invalid",
-						"%s/%s.ebuild: %s (profile invalid)" % (
-							package, y_ebuild, mykey))
-
-	def _checkForMaskLikeKeywords(
-		self, package, y_ebuild, keywords, kwlist):
-
-		# KEYWORDS="-*" is a stupid replacement for package.mask
-		# and screws general KEYWORDS semantics
-		if "-*" in keywords:
-			haskeyword = False
-
-			for kw in keywords:
-				if kw[0] == "~":
-					kw = kw[1:]
-				if kw in kwlist:
-					haskeyword = True
-
-			if not haskeyword:
-				self.qatracker.add_error(
-					"KEYWORDS.stupid", package + "/" + y_ebuild + ".ebuild")

diff --git a/pym/tbc/repoman/checks/ebuilds/manifests.py b/pym/tbc/repoman/checks/ebuilds/manifests.py
deleted file mode 100644
index 70030c2..0000000
--- a/pym/tbc/repoman/checks/ebuilds/manifests.py
+++ /dev/null
@@ -1,101 +0,0 @@
-
-import logging
-import sys
-
-# import our initialized portage instance
-from tbc.repoman._portage import portage
-
-from portage import os
-from portage.package.ebuild.digestgen import digestgen
-from portage.util import writemsg_level
-
-
-class Manifests(object):
-
-	def __init__(self, options, qatracker=None, repoman_settings=None):
-		self.options = options
-		self.qatracker = qatracker
-		self.repoman_settings = repoman_settings
-		self.generated_manifest = False
-
-	def run(self, checkdir, portdb):
-		self.generated_manifest = False
-		self.digest_only = self.options.mode != 'manifest-check' \
-			and self.options.digest == 'y'
-		if self.options.pretend:
-			return False
-		if self.options.mode in ("manifest", 'commit', 'fix') or self.digest_only:
-			failed = False
-			self.auto_assumed = set()
-			fetchlist_dict = portage.FetchlistDict(
-				checkdir, self.repoman_settings, portdb)
-			if self.options.mode == 'manifest' and self.options.force:
-				portage._doebuild_manifest_exempt_depend += 1
-				self.create_manifest(checkdir, fetchlist_dict)
-			self.repoman_settings["O"] = checkdir
-			try:
-				self.generated_manifest = digestgen(
-					mysettings=self.repoman_settings, myportdb=portdb)
-			except portage.exception.PermissionDenied as e:
-				self.generated_manifest = False
-				writemsg_level(
-					"!!! Permission denied: '%s'\n" % (e,),
-					level=logging.ERROR, noiselevel=-1)
-
-			if not self.generated_manifest:
-				writemsg_level(
-					"Unable to generate manifest.",
-					level=logging.ERROR, noiselevel=-1)
-				failed = True
-
-			if self.options.mode == "manifest":
-				if not failed and self.options.force and self.auto_assumed and \
-					'assume-digests' in self.repoman_settings.features:
-					# Show which digests were assumed despite the --force option
-					# being given. This output will already have been shown by
-					# digestgen() if assume-digests is not enabled, so only show
-					# it here if assume-digests is enabled.
-					pkgs = list(fetchlist_dict)
-					pkgs.sort()
-					portage.writemsg_stdout(
-						"  digest.assumed %s" %
-						portage.output.colorize(
-							"WARN", str(len(self.auto_assumed)).rjust(18)) + "\n")
-					for cpv in pkgs:
-						fetchmap = fetchlist_dict[cpv]
-						pf = portage.catsplit(cpv)[1]
-						for distfile in sorted(fetchmap):
-							if distfile in self.auto_assumed:
-								portage.writemsg_stdout(
-									"   %s::%s\n" % (pf, distfile))
-				# continue, skip remaining main loop code
-				return True
-			elif failed:
-				sys.exit(1)
-		return False
-
-	def create_manifest(self, checkdir, fetchlist_dict):
-		try:
-			distdir = self.repoman_settings['DISTDIR']
-			mf = self.repoman_settings.repositories.get_repo_for_location(
-				os.path.dirname(os.path.dirname(checkdir)))
-			mf = mf.load_manifest(
-				checkdir, distdir, fetchlist_dict=fetchlist_dict)
-			mf.create(
-				requiredDistfiles=None, assumeDistHashesAlways=True)
-			for distfiles in fetchlist_dict.values():
-				for distfile in distfiles:
-					if os.path.isfile(os.path.join(distdir, distfile)):
-						mf.fhashdict['DIST'].pop(distfile, None)
-					else:
-						self.auto_assumed.add(distfile)
-			mf.write()
-		finally:
-			portage._doebuild_manifest_exempt_depend -= 1
-
-	def digest_check(self, xpkg, checkdir):
-		self.repoman_settings['O'] = checkdir
-		self.repoman_settings['PORTAGE_QUIET'] = '1'
-		if not portage.digestcheck([], self.repoman_settings, strict=1):
-			self.qatracker.add_error("manifest.bad", os.path.join(xpkg, 'Manifest'))
-		self.repoman_settings.pop('PORTAGE_QUIET', None)

diff --git a/pym/tbc/repoman/checks/ebuilds/misc.py b/pym/tbc/repoman/checks/ebuilds/misc.py
deleted file mode 100644
index 6c9a6ed..0000000
--- a/pym/tbc/repoman/checks/ebuilds/misc.py
+++ /dev/null
@@ -1,54 +0,0 @@
-
-'''repoman/checks/ebuilds/misc.py
-Miscelaneous ebuild check functions'''
-
-import re
-
-# import our initialized portage instance
-from tbc.repoman._portage import portage
-
-
-pv_toolong_re = re.compile(r'[0-9]{19,}')
-
-
-def bad_split_check(xpkg, y_ebuild, pkgdir, qatracker):
-	'''Checks for bad category/package splits.
-
-	@param xpkg: the pacakge being checked
-	@param y_ebuild: string of the ebuild name being tested
-	@param pkgdir: string: path
-	@param qatracker: QATracker instance
-	'''
-	myesplit = portage.pkgsplit(y_ebuild)
-
-	is_bad_split = myesplit is None or myesplit[0] != xpkg.split("/")[-1]
-
-	if is_bad_split:
-		is_pv_toolong = pv_toolong_re.search(myesplit[1])
-		is_pv_toolong2 = pv_toolong_re.search(myesplit[2])
-
-		if is_pv_toolong or is_pv_toolong2:
-			qatracker.add_error(
-				"ebuild.invalidname", xpkg + "/" + y_ebuild + ".ebuild")
-			return True
-	elif myesplit[0] != pkgdir:
-		print(pkgdir, myesplit[0])
-		qatracker.add_error(
-			"ebuild.namenomatch", xpkg + "/" + y_ebuild + ".ebuild")
-		return True
-	return False
-
-
-def pkg_invalid(pkg, qatracker, ebuild):
-	'''Checks for invalid packages
-
-	@param pkg: _emerge.Package instance
-	@param qatracker: QATracker instance
-	@return boolean:
-	'''
-	if pkg.invalid:
-		for k, msgs in pkg.invalid.items():
-			for msg in msgs:
-				qatracker.add_error(k, "%s: %s" % (ebuild.relative_path, msg))
-		return True
-	return False

diff --git a/pym/tbc/repoman/checks/ebuilds/pkgmetadata.py b/pym/tbc/repoman/checks/ebuilds/pkgmetadata.py
deleted file mode 100644
index 5b0d250..0000000
--- a/pym/tbc/repoman/checks/ebuilds/pkgmetadata.py
+++ /dev/null
@@ -1,174 +0,0 @@
-
-'''Package Metadata Checks operations'''
-
-import sys
-
-from itertools import chain
-
-try:
-	import xml.etree.ElementTree
-	from xml.parsers.expat import ExpatError
-except (SystemExit, KeyboardInterrupt):
-	raise
-except (ImportError, SystemError, RuntimeError, Exception):
-	# broken or missing xml support
-	# http://bugs.python.org/issue14988
-	msg = ["Please enable python's \"xml\" USE flag in order to use repoman."]
-	from portage.output import EOutput
-	out = EOutput()
-	for line in msg:
-		out.eerror(line)
-	sys.exit(1)
-
-# import our initialized portage instance
-from tbc.repoman._portage import portage
-
-from portage.exception import InvalidAtom
-from portage import os
-from portage import _encodings, _unicode_encode
-from portage.dep import Atom
-
-from tbc.repoman.metadata import (
-	metadata_xml_encoding, metadata_doctype_name,
-	metadata_dtd_uri, metadata_xml_declaration, parse_metadata_use)
-from tbc.repoman.checks.herds.herdbase import get_herd_base
-from tbc.repoman.checks.herds.metadata import check_metadata, UnknownHerdsError
-from tbc.repoman._xml import _XMLParser, _MetadataTreeBuilder, XmlLint
-
-
-class PkgMetadata(object):
-	'''Package metadata.xml checks'''
-
-	def __init__(self, options, qatracker, repoman_settings):
-		'''PkgMetadata init function
-
-		@param options: ArgumentParser.parse_known_args(argv[1:]) options
-		@param qatracker: QATracker instance
-		@param repoman_settings: settings instance
-		'''
-		self.options = options
-		self.qatracker = qatracker
-		self.repoman_settings = repoman_settings
-		self.musedict = {}
-		self.xmllint = XmlLint(self.options, self.repoman_settings)
-
-	def check(self, xpkg, checkdir, checkdirlist, repolevel):
-		'''Performs the checks on the metadata.xml for the package
-
-		@param xpkg: the pacakge being checked
-		@param checkdir: string, directory path
-		@param checkdirlist: list of checkdir's
-		@param repolevel: integer
-		'''
-
-		self.musedict = {}
-		# metadata.xml file check
-		if "metadata.xml" not in checkdirlist:
-			self.qatracker.add_error("metadata.missing", xpkg + "/metadata.xml")
-		# metadata.xml parse check
-		else:
-			metadata_bad = False
-			xml_info = {}
-			xml_parser = _XMLParser(xml_info, target=_MetadataTreeBuilder())
-
-			# read metadata.xml into memory
-			try:
-				_metadata_xml = xml.etree.ElementTree.parse(
-					_unicode_encode(
-						os.path.join(checkdir, "metadata.xml"),
-						encoding=_encodings['fs'], errors='strict'),
-					parser=xml_parser)
-			except (ExpatError, SyntaxError, EnvironmentError) as e:
-				metadata_bad = True
-				self.qatracker.add_error("metadata.bad", "%s/metadata.xml: %s" % (xpkg, e))
-				del e
-			else:
-				if not hasattr(xml_parser, 'parser') or \
-					sys.hexversion < 0x2070000 or \
-					(sys.hexversion > 0x3000000 and sys.hexversion < 0x3020000):
-					# doctype is not parsed with python 2.6 or 3.1
-					pass
-				else:
-					if "XML_DECLARATION" not in xml_info:
-						self.qatracker.add_error(
-							"metadata.bad", "%s/metadata.xml: "
-							"xml declaration is missing on first line, "
-							"should be '%s'" % (xpkg, metadata_xml_declaration))
-					else:
-						xml_version, xml_encoding, xml_standalone = \
-							xml_info["XML_DECLARATION"]
-						if xml_encoding is None or \
-							xml_encoding.upper() != metadata_xml_encoding:
-							if xml_encoding is None:
-								encoding_problem = "but it is undefined"
-							else:
-								encoding_problem = "not '%s'" % xml_encoding
-							self.qatracker.add_error(
-								"metadata.bad", "%s/metadata.xml: "
-								"xml declaration encoding should be '%s', %s" %
-								(xpkg, metadata_xml_encoding, encoding_problem))
-
-					if "DOCTYPE" not in xml_info:
-						metadata_bad = True
-						self.qatracker.add_error(
-							"metadata.bad",
-							"%s/metadata.xml: %s" % (xpkg, "DOCTYPE is missing"))
-					else:
-						doctype_name, doctype_system, doctype_pubid = \
-							xml_info["DOCTYPE"]
-						if doctype_system != metadata_dtd_uri:
-							if doctype_system is None:
-								system_problem = "but it is undefined"
-							else:
-								system_problem = "not '%s'" % doctype_system
-							self.qatracker.add_error(
-								"metadata.bad", "%s/metadata.xml: "
-								"DOCTYPE: SYSTEM should refer to '%s', %s" %
-								(xpkg, metadata_dtd_uri, system_problem))
-
-						if doctype_name != metadata_doctype_name:
-							self.qatracker.add_error(
-								"metadata.bad", "%s/metadata.xml: "
-								"DOCTYPE: name should be '%s', not '%s'" %
-								(xpkg, metadata_doctype_name, doctype_name))
-
-				# load USE flags from metadata.xml
-				try:
-					self.musedict = parse_metadata_use(_metadata_xml)
-				except portage.exception.ParseError as e:
-					metadata_bad = True
-					self.qatracker.add_error(
-						"metadata.bad", "%s/metadata.xml: %s" % (xpkg, e))
-				else:
-					for atom in chain(*self.musedict.values()):
-						if atom is None:
-							continue
-						try:
-							atom = Atom(atom)
-						except InvalidAtom as e:
-							self.qatracker.add_error(
-								"metadata.bad",
-								"%s/metadata.xml: Invalid atom: %s" % (xpkg, e))
-						else:
-							if atom.cp != xpkg:
-								self.qatracker.add_error(
-									"metadata.bad",
-									"%s/metadata.xml: Atom contains "
-									"unexpected cat/pn: %s" % (xpkg, atom))
-
-				# Run other metadata.xml checkers
-				try:
-					check_metadata(_metadata_xml, get_herd_base(
-						self.repoman_settings))
-				except (UnknownHerdsError, ) as e:
-					metadata_bad = True
-					self.qatracker.add_error(
-						"metadata.bad", "%s/metadata.xml: %s" % (xpkg, e))
-					del e
-
-			# Only carry out if in package directory or check forced
-			if not metadata_bad:
-				if not self.xmllint.check(checkdir, repolevel):
-					self.qatracker.add_error("metadata.bad", xpkg + "/metadata.xml")
-			del metadata_bad
-		return

diff --git a/pym/tbc/repoman/checks/ebuilds/thirdpartymirrors.py b/pym/tbc/repoman/checks/ebuilds/thirdpartymirrors.py
deleted file mode 100644
index 39d0410..0000000
--- a/pym/tbc/repoman/checks/ebuilds/thirdpartymirrors.py
+++ /dev/null
@@ -1,38 +0,0 @@
-
-# import our initialized portage instance
-from tbc.repoman._portage import portage
-
-
-class ThirdPartyMirrors(object):
-
-	def __init__(self, repoman_settings, qatracker):
-		# TODO: Build a regex instead here, for the SRC_URI.mirror check.
-		self.thirdpartymirrors = {}
-		profile_thirdpartymirrors = repoman_settings.thirdpartymirrors().items()
-		for mirror_alias, mirrors in profile_thirdpartymirrors:
-			for mirror in mirrors:
-				if not mirror.endswith("/"):
-					mirror += "/"
-				self.thirdpartymirrors[mirror] = mirror_alias
-
-		self.qatracker = qatracker
-
-	def check(self, myaux, relative_path):
-		# Check that URIs don't reference a server from thirdpartymirrors.
-		for uri in portage.dep.use_reduce(
-			myaux["SRC_URI"], matchall=True, is_src_uri=True,
-			eapi=myaux["EAPI"], flat=True):
-			contains_mirror = False
-			for mirror, mirror_alias in self.thirdpartymirrors.items():
-				if uri.startswith(mirror):
-					contains_mirror = True
-					break
-			if not contains_mirror:
-				continue
-
-			new_uri = "mirror://%s/%s" % (mirror_alias, uri[len(mirror):])
-			self.qatracker.add_error(
-				"SRC_URI.mirror",
-				"%s: '%s' found in thirdpartymirrors, use '%s'" % (
-					relative_path, mirror, new_uri))
-		return

diff --git a/pym/tbc/repoman/checks/ebuilds/use_flags.py b/pym/tbc/repoman/checks/ebuilds/use_flags.py
deleted file mode 100644
index 4fd72d8..0000000
--- a/pym/tbc/repoman/checks/ebuilds/use_flags.py
+++ /dev/null
@@ -1,89 +0,0 @@
-
-'''use_flags.py
-Performs USE flag related checks
-'''
-
-# import our centrally initialized portage instance
-from tbc.repoman._portage import portage
-
-from portage import eapi
-from portage.eapi import eapi_has_iuse_defaults, eapi_has_required_use
-
-
-class USEFlagChecks(object):
-	'''Performs checks on USE flags listed in the ebuilds and metadata.xml'''
-
-	def __init__(self, qatracker, globalUseFlags):
-		'''
-		@param qatracker: QATracker instance
-		@param globalUseFlags: Global USE flags
-		'''
-		self.qatracker = qatracker
-		self.globalUseFlags = globalUseFlags
-		self.useFlags = []
-		self.defaultUseFlags = []
-		self.usedUseFlags = set()
-
-	def check(self, pkg, package, ebuild, y_ebuild, localUseFlags):
-		'''Perform the check.
-
-		@param pkg: Package in which we check (object).
-		@param package: Package in which we check (string).
-		@param ebuild: Ebuild which we check (object).
-		@param y_ebuild: Ebuild which we check (string).
-		@param localUseFlags: Local USE flags of the package
-		'''
-		# reset state variables for the run
-		self.useFlags = []
-		self.defaultUseFlags = []
-		self.usedUseFlags = set()
-		self._checkGlobal(pkg)
-		self._checkMetadata(package, ebuild, y_ebuild, localUseFlags)
-		self._checkRequiredUSE(pkg, ebuild)
-
-	def getUsedUseFlags(self):
-		'''Get the USE flags that this check has seen'''
-		return self.usedUseFlags
-
-	def _checkGlobal(self, pkg):
-		for myflag in pkg._metadata["IUSE"].split():
-			flag_name = myflag.lstrip("+-")
-			self.usedUseFlags.add(flag_name)
-			if myflag != flag_name:
-				self.defaultUseFlags.append(myflag)
-			if flag_name not in self.globalUseFlags:
-				self.useFlags.append(flag_name)
-
-	def _checkMetadata(self, package, ebuild, y_ebuild, localUseFlags):
-		for mypos in range(len(self.useFlags) - 1, -1, -1):
-			if self.useFlags[mypos] and (self.useFlags[mypos] in localUseFlags):
-				del self.useFlags[mypos]
-
-		if self.defaultUseFlags and not eapi_has_iuse_defaults(eapi):
-			for myflag in self.defaultUseFlags:
-				self.qatracker.add_error(
-					'EAPI.incompatible', "%s: IUSE defaults"
-					" not supported with EAPI='%s': '%s'" % (
-						ebuild.relative_path, eapi, myflag))
-
-		for mypos in range(len(self.useFlags)):
-			self.qatracker.add_error(
-				"IUSE.invalid",
-				"%s/%s.ebuild: %s" % (package, y_ebuild, self.useFlags[mypos]))
-
-	def _checkRequiredUSE(self, pkg, ebuild):
-		required_use = pkg._metadata["REQUIRED_USE"]
-		if required_use:
-			if not eapi_has_required_use(eapi):
-				self.qatracker.add_error(
-					'EAPI.incompatible', "%s: REQUIRED_USE"
-					" not supported with EAPI='%s'"
-					% (ebuild.relative_path, eapi,))
-			try:
-				portage.dep.check_required_use(
-					required_use, (), pkg.iuse.is_valid_flag, eapi=eapi)
-			except portage.exception.InvalidDependString as e:
-				self.qatracker.add_error(
-					"REQUIRED_USE.syntax",
-					"%s: REQUIRED_USE: %s" % (ebuild.relative_path, e))
-				del e

diff --git a/pym/tbc/repoman/checks/ebuilds/variables/__init__.py b/pym/tbc/repoman/checks/ebuilds/variables/__init__.py
deleted file mode 100644
index e69de29..0000000

diff --git a/pym/tbc/repoman/checks/ebuilds/variables/description.py b/pym/tbc/repoman/checks/ebuilds/variables/description.py
deleted file mode 100644
index a2b1057..0000000
--- a/pym/tbc/repoman/checks/ebuilds/variables/description.py
+++ /dev/null
@@ -1,32 +0,0 @@
-
-'''description.py
-Perform checks on the DESCRIPTION variable.
-'''
-
-from repoman.qa_data import max_desc_len
-
-
-class DescriptionChecks(object):
-	'''Perform checks on the DESCRIPTION variable.'''
-
-	def __init__(self, qatracker):
-		'''
-		@param qatracker: QATracker instance
-		'''
-		self.qatracker = qatracker
-
-	def check(self, pkg, ebuild):
-		'''
-		@param pkg: Package in which we check (object).
-		@param ebuild: Ebuild which we check (object).
-		'''
-		self._checkTooLong(pkg, ebuild)
-
-	def _checkTooLong(self, pkg, ebuild):
-		# 14 is the length of DESCRIPTION=""
-		if len(pkg._metadata['DESCRIPTION']) > max_desc_len:
-			self.qatracker.add_error(
-				'DESCRIPTION.toolong',
-				"%s: DESCRIPTION is %d characters (max %d)" %
-				(ebuild.relative_path, len(
-					pkg._metadata['DESCRIPTION']), max_desc_len))

diff --git a/pym/tbc/repoman/checks/ebuilds/variables/eapi.py b/pym/tbc/repoman/checks/ebuilds/variables/eapi.py
deleted file mode 100644
index 2f8b1cb..0000000
--- a/pym/tbc/repoman/checks/ebuilds/variables/eapi.py
+++ /dev/null
@@ -1,44 +0,0 @@
-
-'''eapi.py
-Perform checks on the EAPI variable.
-'''
-
-
-class EAPIChecks(object):
-	'''Perform checks on the EAPI variable.'''
-
-	def __init__(self, qatracker, repo_settings):
-		'''
-		@param qatracker: QATracker instance
-		@param repo_settings: Repository settings
-		'''
-		self.qatracker = qatracker
-		self.repo_settings = repo_settings
-
-	def check(self, pkg, ebuild):
-		'''
-		@param pkg: Package in which we check (object).
-		@param ebuild: Ebuild which we check (object).
-		'''
-		eapi = pkg._metadata["EAPI"]
-
-		if not self._checkBanned(ebuild, eapi):
-			self._checkDeprecated(ebuild, eapi)
-
-	def _checkBanned(self, ebuild, eapi):
-		if self.repo_settings.repo_config.eapi_is_banned(eapi):
-			self.qatracker.add_error(
-				"repo.eapi.banned", "%s: %s" % (ebuild.relative_path, eapi))
-
-			return True
-
-		return False
-
-	def _checkDeprecated(self, ebuild, eapi):
-		if self.repo_settings.repo_config.eapi_is_deprecated(eapi):
-			self.qatracker.add_error(
-				"repo.eapi.deprecated", "%s: %s" % (ebuild.relative_path, eapi))
-
-			return True
-
-		return False

diff --git a/pym/tbc/repoman/checks/ebuilds/variables/license.py b/pym/tbc/repoman/checks/ebuilds/variables/license.py
deleted file mode 100644
index fbb0bfc..0000000
--- a/pym/tbc/repoman/checks/ebuilds/variables/license.py
+++ /dev/null
@@ -1,47 +0,0 @@
-
-'''description.py
-Perform checks on the LICENSE variable.
-'''
-
-# import our initialized portage instance
-from tbc.repoman._portage import portage
-
-
-class LicenseChecks(object):
-	'''Perform checks on the LICENSE variable.'''
-
-	def __init__(self, qatracker, liclist, liclist_deprecated):
-		'''
-		@param qatracker: QATracker instance
-		@param liclist: List of licenses.
-		@param liclist: List of deprecated licenses.
-		'''
-		self.qatracker = qatracker
-		self.liclist = liclist
-		self.liclist_deprecated = liclist_deprecated
-
-	def check(
-		self, pkg, package, ebuild, y_ebuild):
-		'''
-		@param pkg: Package in which we check (object).
-		@param package: Package in which we check (string).
-		@param ebuild: Ebuild which we check (object).
-		@param y_ebuild: Ebuild which we check (string).
-		'''
-
-		# Parse the LICENSE variable, remove USE conditions and flatten it.
-		licenses = portage.dep.use_reduce(
-			pkg._metadata["LICENSE"], matchall=1, flat=True)
-
-		# Check each entry to ensure that it exists in ${PORTDIR}/licenses/.
-		for lic in licenses:
-			# Need to check for "||" manually as no portage
-			# function will remove it without removing values.
-			if lic not in self.liclist and lic != "||":
-				self.qatracker.add_error(
-					"LICENSE.invalid",
-					package + "/" + y_ebuild + ".ebuild: %s" % lic)
-			elif lic in self.liclist_deprecated:
-				self.qatracker.add_error(
-					"LICENSE.deprecated",
-					"%s: %s" % (ebuild.relative_path, lic))

diff --git a/pym/tbc/repoman/checks/ebuilds/variables/restrict.py b/pym/tbc/repoman/checks/ebuilds/variables/restrict.py
deleted file mode 100644
index 215b792..0000000
--- a/pym/tbc/repoman/checks/ebuilds/variables/restrict.py
+++ /dev/null
@@ -1,41 +0,0 @@
-
-'''restrict.py
-Perform checks on the RESTRICT variable.
-'''
-
-# import our initialized portage instance
-from repoman._portage import portage
-
-from repoman.qa_data import valid_restrict
-
-
-class RestrictChecks(object):
-	'''Perform checks on the RESTRICT variable.'''
-
-	def __init__(self, qatracker):
-		'''
-		@param qatracker: QATracker instance
-		'''
-		self.qatracker = qatracker
-
-	def check(self, pkg, package, ebuild, y_ebuild):
-		myrestrict = None
-
-		try:
-			myrestrict = portage.dep.use_reduce(
-				pkg._metadata["RESTRICT"], matchall=1, flat=True)
-		except portage.exception.InvalidDependString as e:
-			self. qatracker.add_error(
-				"RESTRICT.syntax",
-				"%s: RESTRICT: %s" % (ebuild.relative_path, e))
-			del e
-
-		if myrestrict:
-			myrestrict = set(myrestrict)
-			mybadrestrict = myrestrict.difference(valid_restrict)
-
-			if mybadrestrict:
-				for mybad in mybadrestrict:
-					self.qatracker.add_error(
-						"RESTRICT.invalid",
-						package + "/" + y_ebuild + ".ebuild: %s" % mybad)

diff --git a/pym/tbc/repoman/checks/herds/__init__.py b/pym/tbc/repoman/checks/herds/__init__.py
deleted file mode 100644
index e69de29..0000000

diff --git a/pym/tbc/repoman/checks/herds/herdbase.py b/pym/tbc/repoman/checks/herds/herdbase.py
deleted file mode 100644
index 5140acd..0000000
--- a/pym/tbc/repoman/checks/herds/herdbase.py
+++ /dev/null
@@ -1,135 +0,0 @@
-# -*- coding: utf-8 -*-
-# repoman: Herd database analysis
-# Copyright 2010-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2 or later
-
-from __future__ import unicode_literals
-
-import errno
-import xml.etree.ElementTree
-try:
-	from xml.parsers.expat import ExpatError
-except (SystemExit, KeyboardInterrupt):
-	raise
-except (ImportError, SystemError, RuntimeError, Exception):
-	# broken or missing xml support
-	# http://bugs.python.org/issue14988
-	# This means that python is built without xml support.
-	# We tolerate global scope import failures for optional
-	# modules, so that ImportModulesTestCase can succeed (or
-	# possibly alert us about unexpected import failures).
-	pass
-
-from portage import _encodings, _unicode_encode
-from portage.exception import FileNotFound, ParseError, PermissionDenied
-from portage import os
-
-from tbc.repoman.errors import err
-
-__all__ = [
-	"make_herd_base", "get_herd_base"
-]
-
-
-def _make_email(nick_name):
-	if not nick_name.endswith('@gentoo.org'):
-		nick_name = nick_name + '@gentoo.org'
-	return nick_name
-
-
-class HerdBase(object):
-	def __init__(self, herd_to_emails, all_emails):
-		self.herd_to_emails = herd_to_emails
-		self.all_emails = all_emails
-
-	def known_herd(self, herd_name):
-		return herd_name in self.herd_to_emails
-
-	def known_maintainer(self, nick_name):
-		return _make_email(nick_name) in self.all_emails
-
-	def maintainer_in_herd(self, nick_name, herd_name):
-		return _make_email(nick_name) in self.herd_to_emails[herd_name]
-
-
-class _HerdsTreeBuilder(xml.etree.ElementTree.TreeBuilder):
-	"""
-	Implements doctype() as required to avoid deprecation warnings with
-	>=python-2.7.
-	"""
-	def doctype(self, name, pubid, system):
-		pass
-
-
-def make_herd_base(filename):
-	herd_to_emails = dict()
-	all_emails = set()
-
-	try:
-		xml_tree = xml.etree.ElementTree.parse(
-			_unicode_encode(
-				filename, encoding=_encodings['fs'], errors='strict'),
-			parser=xml.etree.ElementTree.XMLParser(
-				target=_HerdsTreeBuilder()))
-	except ExpatError as e:
-		raise ParseError("metadata.xml: %s" % (e,))
-	except EnvironmentError as e:
-		func_call = "open('%s')" % filename
-		if e.errno == errno.EACCES:
-			raise PermissionDenied(func_call)
-		elif e.errno == errno.ENOENT:
-			raise FileNotFound(filename)
-		raise
-
-	herds = xml_tree.findall('herd')
-	for h in herds:
-		_herd_name = h.find('name')
-		if _herd_name is None:
-			continue
-		herd_name = _herd_name.text.strip()
-		del _herd_name
-
-		maintainers = h.findall('maintainer')
-		herd_emails = set()
-		for m in maintainers:
-			_m_email = m.find('email')
-			if _m_email is None:
-				continue
-			m_email = _m_email.text.strip()
-
-			herd_emails.add(m_email)
-			all_emails.add(m_email)
-
-		herd_to_emails[herd_name] = herd_emails
-
-	return HerdBase(herd_to_emails, all_emails)
-
-
-def get_herd_base(repoman_settings):
-	try:
-		herd_base = make_herd_base(
-			os.path.join(repoman_settings["PORTDIR"], "metadata/herds.xml"))
-	except (EnvironmentError, ParseError, PermissionDenied) as e:
-		err(str(e))
-	except FileNotFound:
-		# TODO: Download as we do for metadata.dtd, but add a way to
-		# disable for non-gentoo repoman users who may not have herds.
-		herd_base = None
-	return herd_base
-
-
-if __name__ == '__main__':
-	h = make_herd_base('/usr/portage/metadata/herds.xml')
-
-	assert(h.known_herd('sound'))
-	assert(not h.known_herd('media-sound'))
-
-	assert(h.known_maintainer('sping'))
-	assert(h.known_maintainer('sping@g.o'))
-	assert(not h.known_maintainer('portage'))
-
-	assert(h.maintainer_in_herd('zmedico@g.o', 'tools-portage'))
-	assert(not h.maintainer_in_herd('pva@g.o', 'tools-portage'))
-
-	import pprint
-	pprint.pprint(h.herd_to_emails)

diff --git a/pym/tbc/repoman/checks/herds/metadata.py b/pym/tbc/repoman/checks/herds/metadata.py
deleted file mode 100644
index 3c67fcf..0000000
--- a/pym/tbc/repoman/checks/herds/metadata.py
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-class UnknownHerdsError(ValueError):
-	def __init__(self, herd_names):
-		_plural = len(herd_names) != 1
-		super(UnknownHerdsError, self).__init__(
-			'Unknown %s %s' % (
-				_plural and 'herds' or 'herd',
-				','.join('"%s"' % e for e in herd_names)))
-
-
-def check_metadata_herds(xml_tree, herd_base):
-	herd_nodes = xml_tree.findall('herd')
-	unknown_herds = [
-		name for name in (
-			e.text.strip() for e in herd_nodes if e.text is not None)
-		if not herd_base.known_herd(name)]
-
-	if unknown_herds:
-		raise UnknownHerdsError(unknown_herds)
-
-
-def check_metadata(xml_tree, herd_base):
-	if herd_base is not None:
-		check_metadata_herds(xml_tree, herd_base)

diff --git a/pym/tbc/repoman/copyrights.py b/pym/tbc/repoman/copyrights.py
deleted file mode 100644
index 056cfda..0000000
--- a/pym/tbc/repoman/copyrights.py
+++ /dev/null
@@ -1,119 +0,0 @@
-
-
-import difflib
-import io
-import re
-from tempfile import mkstemp
-
-from portage import _encodings
-from portage import _unicode_decode
-from portage import _unicode_encode
-from portage import os
-from portage import shutil
-from portage import util
-
-
-_copyright_re1 = re.compile(br'^(# Copyright \d\d\d\d)-\d\d\d\d ')
-_copyright_re2 = re.compile(br'^(# Copyright )(\d\d\d\d) ')
-
-
-class _copyright_repl(object):
-	__slots__ = ('year',)
-
-	def __init__(self, year):
-		self.year = year
-
-	def __call__(self, matchobj):
-		if matchobj.group(2) == self.year:
-			return matchobj.group(0)
-		else:
-			return matchobj.group(1) + matchobj.group(2) + \
-				b'-' + self.year + b' '
-
-
-def update_copyright_year(year, line):
-	"""
-	These two regexes are taken from echangelog
-	update_copyright(), except that we don't hardcode
-	1999 here (in order to be more generic).
-	"""
-	is_bytes = isinstance(line, bytes)
-	if is_bytes:
-		if not line.startswith(b'# Copyright '):
-			return line
-	else:
-		if not line.startswith('# Copyright '):
-			return line
-
-	year = _unicode_encode(year)
-	line = _unicode_encode(line)
-
-	line = _copyright_re1.sub(br'\1-' + year + b' ', line)
-	line = _copyright_re2.sub(_copyright_repl(year), line)
-	if not is_bytes:
-		line = _unicode_decode(line)
-	return line
-
-
-def update_copyright(fn_path, year, pretend=False):
-	"""
-	Check file for a Copyright statement, and update its year.  The
-	patterns used for replacing copyrights are taken from echangelog.
-	Only the first lines of each file that start with a hash ('#') are
-	considered, until a line is found that doesn't start with a hash.
-	Files are read and written in binary mode, so that this function
-	will work correctly with files encoded in any character set, as
-	long as the copyright statements consist of plain ASCII.
-	"""
-
-	try:
-		fn_hdl = io.open(_unicode_encode(
-			fn_path, encoding=_encodings['fs'], errors='strict'),
-			mode='rb')
-	except EnvironmentError:
-		return
-
-	orig_header = []
-	new_header = []
-
-	for line in fn_hdl:
-		line_strip = line.strip()
-		orig_header.append(line)
-		if not line_strip or line_strip[:1] != b'#':
-			new_header.append(line)
-			break
-
-		line = update_copyright_year(year, line)
-		new_header.append(line)
-
-	difflines = 0
-	for diffline in difflib.unified_diff(
-		[_unicode_decode(diffline) for diffline in orig_header],
-		[_unicode_decode(diffline) for diffline in new_header],
-		fromfile=fn_path, tofile=fn_path, n=0):
-		util.writemsg_stdout(diffline, noiselevel=-1)
-		difflines += 1
-	util.writemsg_stdout("\n", noiselevel=-1)
-
-	# unified diff has three lines to start with
-	if difflines > 3 and not pretend:
-		# write new file with changed header
-		f, fnnew_path = mkstemp()
-		f = io.open(f, mode='wb')
-		for line in new_header:
-			f.write(line)
-		for line in fn_hdl:
-			f.write(line)
-		f.close()
-		try:
-			fn_stat = os.stat(fn_path)
-		except OSError:
-			fn_stat = None
-
-		shutil.move(fnnew_path, fn_path)
-
-		if fn_stat is None:
-			util.apply_permissions(fn_path, mode=0o644)
-		else:
-			util.apply_stat_permissions(fn_path, fn_stat)
-	fn_hdl.close()

diff --git a/pym/tbc/repoman/ebuild.py b/pym/tbc/repoman/ebuild.py
deleted file mode 100644
index 1dddfb9..0000000
--- a/pym/tbc/repoman/ebuild.py
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-from portage import os
-
-
-class Ebuild(object):
-	'''Class to run primary checks on ebuilds'''
-
-	def __init__(
-		self, repo_settings, repolevel, pkgdir, catdir, vcs_settings, x, y):
-		self.vcs_settings = vcs_settings
-		self.relative_path = os.path.join(x, y + ".ebuild")
-		self.full_path = os.path.join(repo_settings.repodir, self.relative_path)
-		self.ebuild_path = y + ".ebuild"
-		if repolevel < 3:
-			self.ebuild_path = os.path.join(pkgdir, self.ebuild_path)
-		if repolevel < 2:
-			self.ebuild_path = os.path.join(catdir, self.ebuild_path)
-		self.ebuild_path = os.path.join(".", self.ebuild_path)
-
-	def untracked(self, check_ebuild_notadded, y, eadded):
-		do_check = self.vcs_settings.vcs in ("cvs", "svn", "bzr")
-		really_notadded = check_ebuild_notadded and y not in eadded
-
-		if do_check and really_notadded:
-			# ebuild not added to vcs
-			return True
-		return False

diff --git a/pym/tbc/repoman/errors.py b/pym/tbc/repoman/errors.py
deleted file mode 100644
index 305eece..0000000
--- a/pym/tbc/repoman/errors.py
+++ /dev/null
@@ -1,19 +0,0 @@
-
-import sys
-
-
-def warn(txt):
-	print("repoman: " + txt)
-
-
-def err(txt):
-	warn(txt)
-	sys.exit(1)
-
-
-def caterror(catdir, repodir):
-	err(
-		"%s is not an official category."
-		"  Skipping QA checks in this directory.\n"
-		"Please ensure that you add %s to %s/profiles/categories\n"
-		"if it is a new category." % (catdir, catdir, repodir))

diff --git a/pym/tbc/repoman/main.py b/pym/tbc/repoman/main.py
deleted file mode 100644
index 10d508b..0000000
--- a/pym/tbc/repoman/main.py
+++ /dev/null
@@ -1,1655 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-from __future__ import print_function, unicode_literals
-
-import copy
-import errno
-import io
-import logging
-import re
-import signal
-import subprocess
-import sys
-import tempfile
-import platform
-from itertools import chain
-from pprint import pformat
-
-from os import path as osp
-if osp.isfile(osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), ".portage_not_installed")):
-	pym_path = osp.join(osp.dirname(osp.dirname(osp.realpath(__file__)))) #, "pym")
-	sys.path.insert(0, pym_path)
-# import our centrally initialized portage instance
-from repoman._portage import portage
-portage._internal_caller = True
-portage._disable_legacy_globals()
-
-
-from portage import os
-from portage import _encodings
-from portage import _unicode_encode
-from _emerge.Package import Package
-from _emerge.UserQuery import UserQuery
-import portage.checksum
-import portage.const
-import portage.repository.config
-from portage import cvstree, normalize_path
-from portage import util
-from portage.dep import Atom
-from portage.exception import MissingParameter
-from portage.process import find_binary, spawn
-from portage.output import (
-	bold, create_color_func, green, nocolor, red)
-from portage.output import ConsoleStyleFile, StyleWriter
-from portage.util import formatter
-from portage.util import writemsg_level
-from portage.package.ebuild.digestgen import digestgen
-
-from repoman.argparser import parse_args
-from repoman.checks.directories.files import FileChecks
-from repoman.checks.ebuilds.checks import run_checks, checks_init
-from repoman.checks.ebuilds.eclasses.live import LiveEclassChecks
-from repoman.checks.ebuilds.eclasses.ruby import RubyEclassChecks
-from repoman.checks.ebuilds.fetches import FetchChecks
-from repoman.checks.ebuilds.keywords import KeywordChecks
-from repoman.checks.ebuilds.isebuild import IsEbuild
-from repoman.checks.ebuilds.thirdpartymirrors import ThirdPartyMirrors
-from repoman.checks.ebuilds.manifests import Manifests
-from repoman.check_missingslot import check_missingslot
-from repoman.checks.ebuilds.misc import bad_split_check, pkg_invalid
-from repoman.checks.ebuilds.pkgmetadata import PkgMetadata
-from repoman.checks.ebuilds.use_flags import USEFlagChecks
-from repoman.checks.ebuilds.variables.description import DescriptionChecks
-from repoman.checks.ebuilds.variables.eapi import EAPIChecks
-from repoman.checks.ebuilds.variables.license import LicenseChecks
-from repoman.checks.ebuilds.variables.restrict import RestrictChecks
-from repoman.ebuild import Ebuild
-from repoman.errors import err
-from repoman.modules.commit import repochecks
-from repoman.profile import check_profiles, dev_keywords, setup_profile
-from repoman.qa_data import (
-	format_qa_output, format_qa_output_column, qahelp,
-	qawarnings, qacats, missingvars,
-	suspect_virtual, suspect_rdepend)
-from repoman.qa_tracker import QATracker
-from repoman.repos import RepoSettings, repo_metadata
-from repoman.scan import Changes, scan
-from repoman._subprocess import repoman_popen, repoman_getstatusoutput
-from repoman import utilities
-from repoman.vcs.vcs import (
-	git_supports_gpg_sign, vcs_files_to_cps, VCSSettings)
-from repoman.vcs.vcsstatus import VCSStatus
-
-
-if sys.hexversion >= 0x3000000:
-	basestring = str
-
-util.initialize_logger()
-
-commitmessage = None
-
-bad = create_color_func("BAD")
-
-live_eclasses = portage.const.LIVE_ECLASSES
-non_ascii_re = re.compile(r'[^\x00-\x7f]')
-
-# A sane umask is needed for files that portage creates.
-os.umask(0o22)
-
-def sort_key(item):
-	return item[2].sub_path
-
-# Setup the GPG commands
-def gpgsign(filename):
-	gpgcmd = repoman_settings.get("PORTAGE_GPG_SIGNING_COMMAND")
-	if gpgcmd in [None, '']:
-		raise MissingParameter("PORTAGE_GPG_SIGNING_COMMAND is unset!"
-			" Is make.globals missing?")
-	if "${PORTAGE_GPG_KEY}" in gpgcmd and \
-		"PORTAGE_GPG_KEY" not in repoman_settings:
-		raise MissingParameter("PORTAGE_GPG_KEY is unset!")
-	if "${PORTAGE_GPG_DIR}" in gpgcmd:
-		if "PORTAGE_GPG_DIR" not in repoman_settings:
-			repoman_settings["PORTAGE_GPG_DIR"] = \
-				os.path.expanduser("~/.gnupg")
-			logging.info(
-				"Automatically setting PORTAGE_GPG_DIR to '%s'" %
-				repoman_settings["PORTAGE_GPG_DIR"])
-		else:
-			repoman_settings["PORTAGE_GPG_DIR"] = \
-				os.path.expanduser(repoman_settings["PORTAGE_GPG_DIR"])
-		if not os.access(repoman_settings["PORTAGE_GPG_DIR"], os.X_OK):
-			raise portage.exception.InvalidLocation(
-				"Unable to access directory: PORTAGE_GPG_DIR='%s'" %
-				repoman_settings["PORTAGE_GPG_DIR"])
-	gpgvars = {"FILE": filename}
-	for k in ("PORTAGE_GPG_DIR", "PORTAGE_GPG_KEY"):
-		v = repoman_settings.get(k)
-		if v is not None:
-			gpgvars[k] = v
-	gpgcmd = portage.util.varexpand(gpgcmd, mydict=gpgvars)
-	if options.pretend:
-		print("(" + gpgcmd + ")")
-	else:
-		# Encode unicode manually for bug #310789.
-		gpgcmd = portage.util.shlex_split(gpgcmd)
-
-		if sys.hexversion < 0x3020000 and sys.hexversion >= 0x3000000 and \
-			not os.path.isabs(gpgcmd[0]):
-			# Python 3.1 _execvp throws TypeError for non-absolute executable
-			# path passed as bytes (see http://bugs.python.org/issue8513).
-			fullname = find_binary(gpgcmd[0])
-			if fullname is None:
-				raise portage.exception.CommandNotFound(gpgcmd[0])
-			gpgcmd[0] = fullname
-
-		gpgcmd = [
-			_unicode_encode(arg, encoding=_encodings['fs'], errors='strict')
-			for arg in gpgcmd]
-		rValue = subprocess.call(gpgcmd)
-		if rValue == os.EX_OK:
-			os.rename(filename + ".asc", filename)
-		else:
-			raise portage.exception.PortageException(
-				"!!! gpg exited with '" + str(rValue) + "' status")
-
-def need_signature(filename):
-	try:
-		with open(
-			_unicode_encode(
-				filename, encoding=_encodings['fs'], errors='strict'),
-			'rb') as f:
-			return b"BEGIN PGP SIGNED MESSAGE" not in f.readline()
-	except IOError as e:
-		if e.errno in (errno.ENOENT, errno.ESTALE):
-			return False
-		raise
-
-def repoman_scan(repoman_settings, repo_settings, vcs_settings, portdb, options, myreporoot, mydir, check_changelog, config_root):
-	# Repoman sets it's own ACCEPT_KEYWORDS and we don't want it to
-	# behave incrementally.
-	repoman_incrementals = tuple(
-		x for x in portage.const.INCREMENTALS if x != 'ACCEPT_KEYWORDS')
-
-	categories = repoman_settings.categories
-	reposplit = myreporoot.split(os.path.sep)
-	repolevel = len(reposplit)
-
-	# It's confusing if these warnings are displayed without the user
-	# being told which profile they come from, so disable them.
-	env = os.environ.copy()
-	env['FEATURES'] = env.get('FEATURES', '') + ' -unknown-features-warn'
-
-	##################
-
-	if options.mode == 'commit':
-		repochecks.commit_check(repolevel, reposplit)
-		repochecks.conflict_check(vcs_settings, options)
-
-	###################
-
-	# Make startdir relative to the canonical repodir, so that we can pass
-	# it to digestgen and it won't have to be canonicalized again.
-	if repolevel == 1:
-		startdir = repo_settings.repodir
-	else:
-		startdir = normalize_path(mydir)
-		startdir = os.path.join(
-			repo_settings.repodir, *startdir.split(os.sep)[-2 - repolevel + 3:])
-	###################
-
-	# get lists of valid keywords, licenses, and use
-	new_data = repo_metadata(repo_settings.portdb, repoman_settings)
-	kwlist, liclist, uselist, profile_list, \
-		global_pmaskdict, liclist_deprecated = new_data
-
-	repoman_settings['PORTAGE_ARCHLIST'] = ' '.join(sorted(kwlist))
-	repoman_settings.backup_changes('PORTAGE_ARCHLIST')
-
-	####################
-
-	profiles = setup_profile(profile_list)
-
-	####################
-
-	check_profiles(profiles, repoman_settings.archlist())
-
-	####################
-
-	scanlist = scan(repolevel, reposplit, startdir, categories, repo_settings)
-
-	####################
-
-	qatracker = QATracker()
-
-	if options.mode == "manifest":
-		pass
-	elif options.pretend:
-		print(green("\nRepoMan does a once-over of the neighborhood..."))
-	else:
-		print(green("\nRepoMan scours the neighborhood..."))
-
-	#####################
-
-	changed = Changes(options)
-	changed.scan(vcs_settings)
-
-	######################
-
-	have_pmasked = False
-	have_dev_keywords = False
-	dofail = 0
-
-	# NOTE: match-all caches are not shared due to potential
-	# differences between profiles in _get_implicit_iuse.
-	arch_caches = {}
-	arch_xmatch_caches = {}
-	shared_xmatch_caches = {"cp-list": {}}
-
-	include_arches = None
-	if options.include_arches:
-		include_arches = set()
-		include_arches.update(*[x.split() for x in options.include_arches])
-
-	# Disable the "ebuild.notadded" check when not in commit mode and
-	# running `svn status` in every package dir will be too expensive.
-
-	check_ebuild_notadded = not \
-		(vcs_settings.vcs == "svn" and repolevel < 3 and options.mode != "commit")
-
-	effective_scanlist = scanlist
-	if options.if_modified == "y":
-		effective_scanlist = sorted(vcs_files_to_cps(
-			chain(changed.changed, changed.new, changed.removed),
-			repolevel, reposplit, categories))
-
-	######################
-	# initialize our checks classes here before the big xpkg loop
-	manifester = Manifests(options, qatracker, repoman_settings)
-	is_ebuild = IsEbuild(repoman_settings, repo_settings, portdb, qatracker)
-	filescheck = FileChecks(
-		qatracker, repoman_settings, repo_settings, portdb, vcs_settings)
-	status_check = VCSStatus(vcs_settings, qatracker)
-	fetchcheck = FetchChecks(
-		qatracker, repoman_settings, repo_settings, portdb, vcs_settings)
-	pkgmeta = PkgMetadata(options, qatracker, repoman_settings)
-	thirdparty = ThirdPartyMirrors(repoman_settings, qatracker)
-	use_flag_checks = USEFlagChecks(qatracker, uselist)
-	keywordcheck = KeywordChecks(qatracker, options)
-	liveeclasscheck = LiveEclassChecks(qatracker)
-	rubyeclasscheck = RubyEclassChecks(qatracker)
-	eapicheck = EAPIChecks(qatracker, repo_settings)
-	descriptioncheck = DescriptionChecks(qatracker)
-	licensecheck = LicenseChecks(qatracker, liclist, liclist_deprecated)
-	restrictcheck = RestrictChecks(qatracker)
-	######################
-
-	for xpkg in effective_scanlist:
-		# ebuilds and digests added to cvs respectively.
-		logging.info("checking package %s" % xpkg)
-		# save memory by discarding xmatch caches from previous package(s)
-		arch_xmatch_caches.clear()
-		eadded = []
-		catdir, pkgdir = xpkg.split("/")
-		checkdir = repo_settings.repodir + "/" + xpkg
-		checkdir_relative = ""
-		if repolevel < 3:
-			checkdir_relative = os.path.join(pkgdir, checkdir_relative)
-		if repolevel < 2:
-			checkdir_relative = os.path.join(catdir, checkdir_relative)
-		checkdir_relative = os.path.join(".", checkdir_relative)
-
-	#####################
-		if manifester.run(checkdir, portdb):
-			continue
-		if not manifester.generated_manifest:
-			manifester.digest_check(xpkg, checkdir)
-	######################
-
-		if options.mode == 'manifest-check':
-			continue
-
-		checkdirlist = os.listdir(checkdir)
-
-	######################
-		pkgs, allvalid = is_ebuild.check(checkdirlist, checkdir, xpkg)
-		if is_ebuild.continue_:
-			# If we can't access all the metadata then it's totally unsafe to
-			# commit since there's no way to generate a correct Manifest.
-			# Do not try to do any more QA checks on this package since missing
-			# metadata leads to false positives for several checks, and false
-			# positives confuse users.
-			can_force = False
-			continue
-	######################
-
-		keywordcheck.prepare()
-
-		# Sort ebuilds in ascending order for the KEYWORDS.dropped check.
-		ebuildlist = sorted(pkgs.values())
-		ebuildlist = [pkg.pf for pkg in ebuildlist]
-	#######################
-		filescheck.check(
-			checkdir, checkdirlist, checkdir_relative, changed.changed, changed.new)
-	#######################
-		status_check.check(check_ebuild_notadded, checkdir, checkdir_relative, xpkg)
-		eadded.extend(status_check.eadded)
-
-	#################
-		fetchcheck.check(
-			xpkg, checkdir, checkdir_relative, changed.changed, changed.new)
-	#################
-
-		if check_changelog and "ChangeLog" not in checkdirlist:
-			qatracker.add_error("changelog.missing", xpkg + "/ChangeLog")
-	#################
-		pkgmeta.check(xpkg, checkdir, checkdirlist, repolevel)
-		muselist = frozenset(pkgmeta.musedict)
-	#################
-
-		changelog_path = os.path.join(checkdir_relative, "ChangeLog")
-		changelog_modified = changelog_path in changed.changelogs
-
-		# detect unused local USE-descriptions
-		used_useflags = set()
-
-		for y_ebuild in ebuildlist:
-			##################
-			ebuild = Ebuild(
-				repo_settings, repolevel, pkgdir, catdir, vcs_settings,
-				xpkg, y_ebuild)
-			##################
-
-			if check_changelog and not changelog_modified \
-				and ebuild.ebuild_path in changed.new_ebuilds:
-				qatracker.add_error('changelog.ebuildadded', ebuild.relative_path)
-
-			if ebuild.untracked(check_ebuild_notadded, y_ebuild, eadded):
-				# ebuild not added to vcs
-				qatracker.add_error(
-					"ebuild.notadded", xpkg + "/" + y_ebuild + ".ebuild")
-
-	##################
-			if bad_split_check(xpkg, y_ebuild, pkgdir, qatracker):
-				continue
-	###################
-			pkg = pkgs[y_ebuild]
-			if pkg_invalid(pkg, qatracker, ebuild):
-				allvalid = False
-				continue
-
-			myaux = pkg._metadata
-			eapi = myaux["EAPI"]
-			inherited = pkg.inherited
-			live_ebuild = live_eclasses.intersection(inherited)
-
-			#######################
-			eapicheck.check(pkg, ebuild)
-			#######################
-
-			for k, v in myaux.items():
-				if not isinstance(v, basestring):
-					continue
-				m = non_ascii_re.search(v)
-				if m is not None:
-					qatracker.add_error(
-						"variable.invalidchar",
-						"%s: %s variable contains non-ASCII "
-						"character at position %s" %
-						(ebuild.relative_path, k, m.start() + 1))
-
-			if not fetchcheck.src_uri_error:
-				#######################
-				thirdparty.check(myaux, ebuild.relative_path)
-				#######################
-			if myaux.get("PROVIDE"):
-				qatracker.add_error("virtual.oldstyle", ebuild.relative_path)
-
-			for pos, missing_var in enumerate(missingvars):
-				if not myaux.get(missing_var):
-					if catdir == "virtual" and \
-						missing_var in ("HOMEPAGE", "LICENSE"):
-						continue
-					if live_ebuild and missing_var == "KEYWORDS":
-						continue
-					myqakey = missingvars[pos] + ".missing"
-					qatracker.add_error(myqakey, xpkg + "/" + y_ebuild + ".ebuild")
-
-			if catdir == "virtual":
-				for var in ("HOMEPAGE", "LICENSE"):
-					if myaux.get(var):
-						myqakey = var + ".virtual"
-						qatracker.add_error(myqakey, ebuild.relative_path)
-
-			#######################
-			descriptioncheck.check(pkg, ebuild)
-			#######################
-
-			keywords = myaux["KEYWORDS"].split()
-
-			ebuild_archs = set(
-				kw.lstrip("~") for kw in keywords if not kw.startswith("-"))
-
-			#######################
-			keywordcheck.check(
-				pkg, xpkg, ebuild, y_ebuild, keywords, ebuild_archs, changed,
-				live_ebuild, kwlist, profiles)
-			#######################
-
-			if live_ebuild and repo_settings.repo_config.name == "gentoo":
-				#######################
-				liveeclasscheck.check(
-					pkg, xpkg, ebuild, y_ebuild, keywords, global_pmaskdict)
-				#######################
-
-			if options.ignore_arches:
-				arches = [[
-					repoman_settings["ARCH"], repoman_settings["ARCH"],
-					repoman_settings["ACCEPT_KEYWORDS"].split()]]
-			else:
-				arches = set()
-				for keyword in keywords:
-					if keyword[0] == "-":
-						continue
-					elif keyword[0] == "~":
-						arch = keyword[1:]
-						if arch == "*":
-							for expanded_arch in profiles:
-								if expanded_arch == "**":
-									continue
-								arches.add(
-									(keyword, expanded_arch, (
-										expanded_arch, "~" + expanded_arch)))
-						else:
-							arches.add((keyword, arch, (arch, keyword)))
-					else:
-						if keyword == "*":
-							for expanded_arch in profiles:
-								if expanded_arch == "**":
-									continue
-								arches.add(
-									(keyword, expanded_arch, (expanded_arch,)))
-						else:
-							arches.add((keyword, keyword, (keyword,)))
-				if not arches:
-					# Use an empty profile for checking dependencies of
-					# packages that have empty KEYWORDS.
-					arches.add(('**', '**', ('**',)))
-
-			unknown_pkgs = set()
-			baddepsyntax = False
-			badlicsyntax = False
-			badprovsyntax = False
-			catpkg = catdir + "/" + y_ebuild
-
-			inherited_java_eclass = "java-pkg-2" in inherited or \
-				"java-pkg-opt-2" in inherited
-			inherited_wxwidgets_eclass = "wxwidgets" in inherited
-			operator_tokens = set(["||", "(", ")"])
-			type_list, badsyntax = [], []
-			for mytype in Package._dep_keys + ("LICENSE", "PROPERTIES", "PROVIDE"):
-				mydepstr = myaux[mytype]
-
-				buildtime = mytype in Package._buildtime_keys
-				runtime = mytype in Package._runtime_keys
-				token_class = None
-				if mytype.endswith("DEPEND"):
-					token_class = portage.dep.Atom
-
-				try:
-					atoms = portage.dep.use_reduce(
-						mydepstr, matchall=1, flat=True,
-						is_valid_flag=pkg.iuse.is_valid_flag, token_class=token_class)
-				except portage.exception.InvalidDependString as e:
-					atoms = None
-					badsyntax.append(str(e))
-
-				if atoms and mytype.endswith("DEPEND"):
-					if runtime and \
-						"test?" in mydepstr.split():
-						qatracker.add_error(
-							mytype + '.suspect',
-							"%s: 'test?' USE conditional in %s" %
-							(ebuild.relative_path, mytype))
-
-					for atom in atoms:
-						if atom == "||":
-							continue
-
-						is_blocker = atom.blocker
-
-						# Skip dependency.unknown for blockers, so that we
-						# don't encourage people to remove necessary blockers,
-						# as discussed in bug 382407. We use atom.without_use
-						# due to bug 525376.
-						if not is_blocker and \
-							not portdb.xmatch("match-all", atom.without_use) and \
-							not atom.cp.startswith("virtual/"):
-							unknown_pkgs.add((mytype, atom.unevaluated_atom))
-
-						if catdir != "virtual":
-							if not is_blocker and \
-								atom.cp in suspect_virtual:
-								qatracker.add_error(
-									'virtual.suspect', ebuild.relative_path +
-									": %s: consider using '%s' instead of '%s'" %
-									(mytype, suspect_virtual[atom.cp], atom))
-							if not is_blocker and \
-								atom.cp.startswith("perl-core/"):
-								qatracker.add_error('dependency.perlcore',
-									ebuild.relative_path +
-									": %s: please use '%s' instead of '%s'" %
-									(mytype,
-									atom.replace("perl-core/","virtual/perl-"),
-									atom))
-
-						if buildtime and \
-							not is_blocker and \
-							not inherited_java_eclass and \
-							atom.cp == "virtual/jdk":
-							qatracker.add_error(
-								'java.eclassesnotused', ebuild.relative_path)
-						elif buildtime and \
-							not is_blocker and \
-							not inherited_wxwidgets_eclass and \
-							atom.cp == "x11-libs/wxGTK":
-							qatracker.add_error(
-								'wxwidgets.eclassnotused',
-								"%s: %ss on x11-libs/wxGTK without inheriting"
-								" wxwidgets.eclass" % (ebuild.relative_path, mytype))
-						elif runtime:
-							if not is_blocker and \
-								atom.cp in suspect_rdepend:
-								qatracker.add_error(
-									mytype + '.suspect',
-									ebuild.relative_path + ": '%s'" % atom)
-
-						if atom.operator == "~" and \
-							portage.versions.catpkgsplit(atom.cpv)[3] != "r0":
-							qacat = 'dependency.badtilde'
-							qatracker.add_error(
-								qacat, "%s: %s uses the ~ operator"
-								" with a non-zero revision: '%s'" %
-								(ebuild.relative_path, mytype, atom))
-
-						check_missingslot(atom, mytype, eapi, portdb, qatracker,
-							ebuild.relative_path, myaux)
-
-				type_list.extend([mytype] * (len(badsyntax) - len(type_list)))
-
-			for m, b in zip(type_list, badsyntax):
-				if m.endswith("DEPEND"):
-					qacat = "dependency.syntax"
-				else:
-					qacat = m + ".syntax"
-				qatracker.add_error(
-					qacat, "%s: %s: %s" % (ebuild.relative_path, m, b))
-
-			badlicsyntax = len([z for z in type_list if z == "LICENSE"])
-			badprovsyntax = len([z for z in type_list if z == "PROVIDE"])
-			baddepsyntax = len(type_list) != badlicsyntax + badprovsyntax
-			badlicsyntax = badlicsyntax > 0
-			badprovsyntax = badprovsyntax > 0
-
-			#################
-			use_flag_checks.check(pkg, xpkg, ebuild, y_ebuild, muselist)
-
-			ebuild_used_useflags = use_flag_checks.getUsedUseFlags()
-			used_useflags = used_useflags.union(ebuild_used_useflags)
-			#################
-			rubyeclasscheck.check(pkg, ebuild)
-			#################
-
-			# license checks
-			if not badlicsyntax:
-				#################
-				licensecheck.check(pkg, xpkg, ebuild, y_ebuild)
-				#################
-
-			#################
-			restrictcheck.check(pkg, xpkg, ebuild, y_ebuild)
-			#################
-
-			# Syntax Checks
-
-			if not vcs_settings.vcs_preserves_mtime:
-				if ebuild.ebuild_path not in changed.new_ebuilds and \
-					ebuild.ebuild_path not in changed.ebuilds:
-					pkg.mtime = None
-			try:
-				# All ebuilds should have utf_8 encoding.
-				f = io.open(
-					_unicode_encode(
-						ebuild.full_path, encoding=_encodings['fs'], errors='strict'),
-					mode='r', encoding=_encodings['repo.content'])
-				try:
-					for check_name, e in run_checks(f, pkg):
-						qatracker.add_error(
-							check_name, ebuild.relative_path + ': %s' % e)
-				finally:
-					f.close()
-			except UnicodeDecodeError:
-				# A file.UTF8 failure will have already been recorded above.
-				pass
-
-			if options.force:
-				# The dep_check() calls are the most expensive QA test. If --force
-				# is enabled, there's no point in wasting time on these since the
-				# user is intent on forcing the commit anyway.
-				continue
-
-			relevant_profiles = []
-			for keyword, arch, groups in arches:
-				if arch not in profiles:
-					# A missing profile will create an error further down
-					# during the KEYWORDS verification.
-					continue
-
-				if include_arches is not None:
-					if arch not in include_arches:
-						continue
-
-				relevant_profiles.extend(
-					(keyword, groups, prof) for prof in profiles[arch])
-
-			relevant_profiles.sort(key=sort_key)
-
-			for keyword, groups, prof in relevant_profiles:
-
-				is_stable_profile = prof.status == "stable"
-				is_dev_profile = prof.status == "dev" and \
-					options.include_dev
-				is_exp_profile = prof.status == "exp" and \
-					options.include_exp_profiles == 'y'
-				if not (is_stable_profile or is_dev_profile or is_exp_profile):
-					continue
-
-				dep_settings = arch_caches.get(prof.sub_path)
-				if dep_settings is None:
-					dep_settings = portage.config(
-						config_profile_path=prof.abs_path,
-						config_incrementals=repoman_incrementals,
-						config_root=config_root,
-						local_config=False,
-						_unmatched_removal=options.unmatched_removal,
-						env=env, repositories=repoman_settings.repositories)
-					dep_settings.categories = repoman_settings.categories
-					if options.without_mask:
-						dep_settings._mask_manager_obj = \
-							copy.deepcopy(dep_settings._mask_manager)
-						dep_settings._mask_manager._pmaskdict.clear()
-					arch_caches[prof.sub_path] = dep_settings
-
-				xmatch_cache_key = (prof.sub_path, tuple(groups))
-				xcache = arch_xmatch_caches.get(xmatch_cache_key)
-				if xcache is None:
-					portdb.melt()
-					portdb.freeze()
-					xcache = portdb.xcache
-					xcache.update(shared_xmatch_caches)
-					arch_xmatch_caches[xmatch_cache_key] = xcache
-
-				repo_settings.trees[repo_settings.root]["porttree"].settings = dep_settings
-				portdb.settings = dep_settings
-				portdb.xcache = xcache
-
-				dep_settings["ACCEPT_KEYWORDS"] = " ".join(groups)
-				# just in case, prevent config.reset() from nuking these.
-				dep_settings.backup_changes("ACCEPT_KEYWORDS")
-
-				# This attribute is used in dbapi._match_use() to apply
-				# use.stable.{mask,force} settings based on the stable
-				# status of the parent package. This is required in order
-				# for USE deps of unstable packages to be resolved correctly,
-				# since otherwise use.stable.{mask,force} settings of
-				# dependencies may conflict (see bug #456342).
-				dep_settings._parent_stable = dep_settings._isStable(pkg)
-
-				# Handle package.use*.{force,mask) calculation, for use
-				# in dep_check.
-				dep_settings.useforce = dep_settings._use_manager.getUseForce(
-					pkg, stable=dep_settings._parent_stable)
-				dep_settings.usemask = dep_settings._use_manager.getUseMask(
-					pkg, stable=dep_settings._parent_stable)
-
-				if not baddepsyntax:
-					ismasked = not ebuild_archs or \
-						pkg.cpv not in portdb.xmatch("match-visible",
-						Atom("%s::%s" % (pkg.cp, repo_settings.repo_config.name)))
-					if ismasked:
-						if not have_pmasked:
-							have_pmasked = bool(dep_settings._getMaskAtom(
-								pkg.cpv, pkg._metadata))
-						if options.ignore_masked:
-							continue
-						# we are testing deps for a masked package; give it some lee-way
-						suffix = "masked"
-						matchmode = "minimum-all"
-					else:
-						suffix = ""
-						matchmode = "minimum-visible"
-
-					if not have_dev_keywords:
-						dev_keyword = dev_keywords(profiles)
-						have_dev_keywords = \
-							bool(dev_keyword.intersection(keywords))
-
-					if prof.status == "dev":
-						suffix = suffix + "indev"
-
-					for mytype in Package._dep_keys:
-
-						mykey = "dependency.bad" + suffix
-						myvalue = myaux[mytype]
-						if not myvalue:
-							continue
-
-						success, atoms = portage.dep_check(
-							myvalue, portdb, dep_settings,
-							use="all", mode=matchmode, trees=repo_settings.trees)
-
-						if success:
-							if atoms:
-
-								# Don't bother with dependency.unknown for
-								# cases in which *DEPEND.bad is triggered.
-								for atom in atoms:
-									# dep_check returns all blockers and they
-									# aren't counted for *DEPEND.bad, so we
-									# ignore them here.
-									if not atom.blocker:
-										unknown_pkgs.discard(
-											(mytype, atom.unevaluated_atom))
-
-								if not prof.sub_path:
-									# old-style virtuals currently aren't
-									# resolvable with empty profile, since
-									# 'virtuals' mappings are unavailable
-									# (it would be expensive to search
-									# for PROVIDE in all ebuilds)
-									atoms = [
-										atom for atom in atoms if not (
-											atom.cp.startswith('virtual/')
-											and not portdb.cp_list(atom.cp))]
-
-								# we have some unsolvable deps
-								# remove ! deps, which always show up as unsatisfiable
-								atoms = [
-									str(atom.unevaluated_atom)
-									for atom in atoms if not atom.blocker]
-
-								# if we emptied out our list, continue:
-								if not atoms:
-									continue
-								qatracker.add_error(mykey,
-									"%s: %s: %s(%s)\n%s"
-									% (ebuild.relative_path, mytype, keyword, prof,
-										pformat(atoms, indent=6)))
-						else:
-							qatracker.add_error(mykey,
-								"%s: %s: %s(%s)\n%s"
-								% (ebuild.relative_path, mytype, keyword, prof,
-									pformat(atoms, indent=6)))
-
-			if not baddepsyntax and unknown_pkgs:
-				type_map = {}
-				for mytype, atom in unknown_pkgs:
-					type_map.setdefault(mytype, set()).add(atom)
-				for mytype, atoms in type_map.items():
-					qatracker.add_error(
-						"dependency.unknown", "%s: %s: %s"
-						% (ebuild.relative_path, mytype, ", ".join(sorted(atoms))))
-
-		# check if there are unused local USE-descriptions in metadata.xml
-		# (unless there are any invalids, to avoid noise)
-		if allvalid:
-			for myflag in muselist.difference(used_useflags):
-				qatracker.add_error(
-					"metadata.warning",
-					"%s/metadata.xml: unused local USE-description: '%s'"
-					% (xpkg, myflag))
-
-	if options.if_modified == "y" and len(effective_scanlist) < 1:
-		logging.warning("--if-modified is enabled, but no modified packages were found!")
-
-	suggest_ignore_masked = False
-	suggest_include_dev = False
-
-	if have_pmasked and not (options.without_mask or options.ignore_masked):
-		suggest_ignore_masked = True
-	if have_dev_keywords and not options.include_dev:
-		suggest_include_dev = True
-
-	if suggest_ignore_masked or suggest_include_dev:
-		print()
-		if suggest_ignore_masked:
-			print(bold(
-				"Note: use --without-mask to check "
-				"KEYWORDS on dependencies of masked packages"))
-
-		if suggest_include_dev:
-			print(bold(
-				"Note: use --include-dev (-d) to check "
-				"dependencies for 'dev' profiles"))
-		print()
-	return qatracker
-def repoman_main(argv):
-
-	config_root = os.environ.get("PORTAGE_CONFIGROOT")
-	repoman_settings = portage.config(config_root=config_root, local_config=False)
-
-	if repoman_settings.get("NOCOLOR", "").lower() in ("yes", "true") or \
-		repoman_settings.get('TERM') == 'dumb' or \
-		not sys.stdout.isatty():
-		nocolor()
-
-	options, arguments = parse_args(
-		sys.argv, qahelp, repoman_settings.get("REPOMAN_DEFAULT_OPTS", ""))
-
-	if options.version:
-		print("Portage", portage.VERSION)
-		sys.exit(0)
-
-	if options.experimental_inherit == 'y':
-		# This is experimental, so it's non-fatal.
-		qawarnings.add("inherit.missing")
-		checks_init(experimental_inherit=True)
-
-	# Set this to False when an extraordinary issue (generally
-	# something other than a QA issue) makes it impossible to
-	# commit (like if Manifest generation fails).
-	can_force = True
-
-	portdir, portdir_overlay, mydir = utilities.FindPortdir(repoman_settings)
-	if portdir is None:
-		sys.exit(1)
-
-	myreporoot = os.path.basename(portdir_overlay)
-	myreporoot += mydir[len(portdir_overlay):]
-
-	##################
-
-	vcs_settings = VCSSettings(options, repoman_settings)
-
-	repo_settings = RepoSettings(
-		config_root, portdir, portdir_overlay,
-		repoman_settings, vcs_settings, options, qawarnings)
-
-	repoman_settings = repo_settings.repoman_settings
-
-	portdb = repo_settings.portdb
-
-	##################
-
-	if options.echangelog is None and repo_settings.repo_config.update_changelog:
-		options.echangelog = 'y'
-
-	if vcs_settings.vcs is None:
-		options.echangelog = 'n'
-
-	# The --echangelog option causes automatic ChangeLog generation,
-	# which invalidates changelog.ebuildadded and changelog.missing
-	# checks.
-	# Note: Some don't use ChangeLogs in distributed SCMs.
-	# It will be generated on server side from scm log,
-	# before package moves to the rsync server.
-	# This is needed because they try to avoid merge collisions.
-	# Gentoo's Council decided to always use the ChangeLog file.
-	# TODO: shouldn't this just be switched on the repo, iso the VCS?
-	is_echangelog_enabled = options.echangelog in ('y', 'force')
-	vcs_settings.vcs_is_cvs_or_svn = vcs_settings.vcs in ('cvs', 'svn')
-	check_changelog = not is_echangelog_enabled and vcs_settings.vcs_is_cvs_or_svn
-
-	if 'digest' in repoman_settings.features and options.digest != 'n':
-		options.digest = 'y'
-
-	logging.debug("vcs: %s" % (vcs_settings.vcs,))
-	logging.debug("repo config: %s" % (repo_settings.repo_config,))
-	logging.debug("options: %s" % (options,))
-
-	categories = []
-	for path in repo_settings.repo_config.eclass_db.porttrees:
-		categories.extend(portage.util.grabfile(
-			os.path.join(path, 'profiles', 'categories')))
-	repoman_settings.categories = frozenset(
-		portage.util.stack_lists([categories], incremental=1))
-	categories = repoman_settings.categories
-
-	portdb.settings = repoman_settings
-	# We really only need to cache the metadata that's necessary for visibility
-	# filtering. Anything else can be discarded to reduce memory consumption.
-	portdb._aux_cache_keys.clear()
-	portdb._aux_cache_keys.update(
-		["EAPI", "IUSE", "KEYWORDS", "repository", "SLOT"])
-
-	reposplit = myreporoot.split(os.path.sep)
-	repolevel = len(reposplit)
-
-	# Call scan
-	qatracker = repoman_scan(repoman_settings, repo_settings, vcs_settings, portdb, options, myreporoot, mydir, check_changelog, config_root)
-
-	if options.mode == "manifest":
-		sys.exit(dofail)
-
-	# dofail will be true if we have failed in at least one non-warning category
-	dofail = 0
-	# dowarn will be true if we tripped any warnings
-	dowarn = 0
-	# dofull will be true if we should print a "repoman full" informational message
-	dofull = options.mode != 'full'
-
-	for x in qacats:
-		if x not in qatracker.fails:
-			continue
-		dowarn = 1
-		if x not in qawarnings:
-			dofail = 1
-
-	if dofail or \
-		(dowarn and not (options.quiet or options.mode == "scan")):
-		dofull = 0
-
-	# Save QA output so that it can be conveniently displayed
-	# in $EDITOR while the user creates a commit message.
-	# Otherwise, the user would not be able to see this output
-	# once the editor has taken over the screen.
-	qa_output = io.StringIO()
-	style_file = ConsoleStyleFile(sys.stdout)
-	if options.mode == 'commit' and \
-		(not commitmessage or not commitmessage.strip()):
-		style_file.write_listener = qa_output
-	console_writer = StyleWriter(file=style_file, maxcol=9999)
-	console_writer.style_listener = style_file.new_styles
-
-	f = formatter.AbstractFormatter(console_writer)
-
-	format_outputs = {
-		'column': format_qa_output_column,
-		'default': format_qa_output
-	}
-
-	format_output = format_outputs.get(
-		options.output_style, format_outputs['default'])
-	format_output(f, qatracker.fails, dofull, dofail, options, qawarnings)
-
-	style_file.flush()
-	del console_writer, f, style_file
-	qa_output = qa_output.getvalue()
-	qa_output = qa_output.splitlines(True)
-
-	if options.mode != 'commit':
-		if dofull:
-			print(bold("Note: type \"repoman full\" for a complete listing."))
-		if dowarn and not dofail:
-			utilities.repoman_sez(
-				"\"You're only giving me a partial QA payment?\n"
-				"              I'll take it this time, but I'm not happy.\"")
-		elif not dofail:
-			utilities.repoman_sez(
-				"\"If everyone were like you, I'd be out of business!\"")
-		elif dofail:
-			print(bad("Please fix these important QA issues first."))
-			utilities.repoman_sez(
-				"\"Make your QA payment on time"
-				" and you'll never see the likes of me.\"\n")
-			sys.exit(1)
-	else:
-		if dofail and can_force and options.force and not options.pretend:
-			utilities.repoman_sez(
-				" \"You want to commit even with these QA issues?\n"
-				"              I'll take it this time, but I'm not happy.\"\n")
-		elif dofail:
-			if options.force and not can_force:
-				print(bad(
-					"The --force option has been disabled"
-					" due to extraordinary issues."))
-			print(bad("Please fix these important QA issues first."))
-			utilities.repoman_sez(
-				"\"Make your QA payment on time"
-				" and you'll never see the likes of me.\"\n")
-			sys.exit(1)
-
-		if options.pretend:
-			utilities.repoman_sez(
-				"\"So, you want to play it safe. Good call.\"\n")
-
-		myunadded = []
-		if vcs_settings.vcs == "cvs":
-			try:
-				myvcstree = portage.cvstree.getentries("./", recursive=1)
-				myunadded = portage.cvstree.findunadded(
-					myvcstree, recursive=1, basedir="./")
-			except SystemExit as e:
-				raise  # TODO propagate this
-			except:
-				err("Error retrieving CVS tree; exiting.")
-		if vcs_settings.vcs == "svn":
-			try:
-				with repoman_popen("svn status --no-ignore") as f:
-					svnstatus = f.readlines()
-				myunadded = [
-					"./" + elem.rstrip().split()[1]
-					for elem in svnstatus
-					if elem.startswith("?") or elem.startswith("I")]
-			except SystemExit as e:
-				raise  # TODO propagate this
-			except:
-				err("Error retrieving SVN info; exiting.")
-		if vcs_settings.vcs == "git":
-			# get list of files not under version control or missing
-			myf = repoman_popen("git ls-files --others")
-			myunadded = ["./" + elem[:-1] for elem in myf]
-			myf.close()
-		if vcs_settings.vcs == "bzr":
-			try:
-				with repoman_popen("bzr status -S .") as f:
-					bzrstatus = f.readlines()
-				myunadded = [
-					"./" + elem.rstrip().split()[1].split('/')[-1:][0]
-					for elem in bzrstatus
-					if elem.startswith("?") or elem[0:2] == " D"]
-			except SystemExit as e:
-				raise  # TODO propagate this
-			except:
-				err("Error retrieving bzr info; exiting.")
-		if vcs_settings.vcs == "hg":
-			with repoman_popen("hg status --no-status --unknown .") as f:
-				myunadded = f.readlines()
-			myunadded = ["./" + elem.rstrip() for elem in myunadded]
-
-			# Mercurial doesn't handle manually deleted files as removed from
-			# the repository, so the user need to remove them before commit,
-			# using "hg remove [FILES]"
-			with repoman_popen("hg status --no-status --deleted .") as f:
-				mydeleted = f.readlines()
-			mydeleted = ["./" + elem.rstrip() for elem in mydeleted]
-
-		myautoadd = []
-		if myunadded:
-			for x in range(len(myunadded) - 1, -1, -1):
-				xs = myunadded[x].split("/")
-				if xs[-1] == "files":
-					print("!!! files dir is not added! Please correct this.")
-					sys.exit(-1)
-				elif xs[-1] == "Manifest":
-					# It's a manifest... auto add
-					myautoadd += [myunadded[x]]
-					del myunadded[x]
-
-		if myunadded:
-			print(red(
-				"!!! The following files are in your local tree"
-				" but are not added to the master"))
-			print(red(
-				"!!! tree. Please remove them from the local tree"
-				" or add them to the master tree."))
-			for x in myunadded:
-				print("   ", x)
-			print()
-			print()
-			sys.exit(1)
-
-		if vcs_settings.vcs == "hg" and mydeleted:
-			print(red(
-				"!!! The following files are removed manually"
-				" from your local tree but are not"))
-			print(red(
-				"!!! removed from the repository."
-				" Please remove them, using \"hg remove [FILES]\"."))
-			for x in mydeleted:
-				print("   ", x)
-			print()
-			print()
-			sys.exit(1)
-
-		if vcs_settings.vcs == "cvs":
-			mycvstree = cvstree.getentries("./", recursive=1)
-			mychanged = cvstree.findchanged(mycvstree, recursive=1, basedir="./")
-			mynew = cvstree.findnew(mycvstree, recursive=1, basedir="./")
-			myremoved = portage.cvstree.findremoved(mycvstree, recursive=1, basedir="./")
-			bin_blob_pattern = re.compile("^-kb$")
-			no_expansion = set(portage.cvstree.findoption(
-				mycvstree, bin_blob_pattern, recursive=1, basedir="./"))
-
-		if vcs_settings.vcs == "svn":
-			with repoman_popen("svn status") as f:
-				svnstatus = f.readlines()
-			mychanged = [
-				"./" + elem.split()[-1:][0]
-				for elem in svnstatus
-				if (elem[:1] in "MR" or elem[1:2] in "M")]
-			mynew = [
-				"./" + elem.split()[-1:][0]
-				for elem in svnstatus
-				if elem.startswith("A")]
-			myremoved = [
-				"./" + elem.split()[-1:][0]
-				for elem in svnstatus
-				if elem.startswith("D")]
-
-			# Subversion expands keywords specified in svn:keywords properties.
-			with repoman_popen("svn propget -R svn:keywords") as f:
-				props = f.readlines()
-			expansion = dict(
-				("./" + prop.split(" - ")[0], prop.split(" - ")[1].split())
-				for prop in props if " - " in prop)
-
-		elif vcs_settings.vcs == "git":
-			with repoman_popen(
-				"git diff-index --name-only "
-				"--relative --diff-filter=M HEAD") as f:
-				mychanged = f.readlines()
-			mychanged = ["./" + elem[:-1] for elem in mychanged]
-
-			with repoman_popen(
-				"git diff-index --name-only "
-				"--relative --diff-filter=A HEAD") as f:
-				mynew = f.readlines()
-			mynew = ["./" + elem[:-1] for elem in mynew]
-
-			with repoman_popen(
-				"git diff-index --name-only "
-				"--relative --diff-filter=D HEAD") as f:
-				myremoved = f.readlines()
-			myremoved = ["./" + elem[:-1] for elem in myremoved]
-
-		if vcs_settings.vcs == "bzr":
-			with repoman_popen("bzr status -S .") as f:
-				bzrstatus = f.readlines()
-			mychanged = [
-				"./" + elem.split()[-1:][0].split('/')[-1:][0]
-				for elem in bzrstatus
-				if elem and elem[1:2] == "M"]
-			mynew = [
-				"./" + elem.split()[-1:][0].split('/')[-1:][0]
-				for elem in bzrstatus
-				if elem and (elem[1:2] in "NK" or elem[0:1] == "R")]
-			myremoved = [
-				"./" + elem.split()[-1:][0].split('/')[-1:][0]
-				for elem in bzrstatus
-				if elem.startswith("-")]
-			myremoved = [
-				"./" + elem.split()[-3:-2][0].split('/')[-1:][0]
-				for elem in bzrstatus
-				if elem and (elem[1:2] == "K" or elem[0:1] == "R")]
-			# Bazaar expands nothing.
-
-		if vcs_settings.vcs == "hg":
-			with repoman_popen("hg status --no-status --modified .") as f:
-				mychanged = f.readlines()
-			mychanged = ["./" + elem.rstrip() for elem in mychanged]
-
-			with repoman_popen("hg status --no-status --added .") as f:
-				mynew = f.readlines()
-			mynew = ["./" + elem.rstrip() for elem in mynew]
-
-			with repoman_popen("hg status --no-status --removed .") as f:
-				myremoved = f.readlines()
-			myremoved = ["./" + elem.rstrip() for elem in myremoved]
-
-		if vcs_settings.vcs:
-			a_file_is_changed = mychanged or mynew or myremoved
-			a_file_is_deleted_hg = vcs_settings.vcs == "hg" and mydeleted
-
-			if not (a_file_is_changed or a_file_is_deleted_hg):
-				utilities.repoman_sez(
-					"\"Doing nothing is not always good for QA.\"")
-				print()
-				print("(Didn't find any changed files...)")
-				print()
-				sys.exit(1)
-
-		# Manifests need to be regenerated after all other commits, so don't commit
-		# them now even if they have changed.
-		mymanifests = set()
-		myupdates = set()
-		for f in mychanged + mynew:
-			if "Manifest" == os.path.basename(f):
-				mymanifests.add(f)
-			else:
-				myupdates.add(f)
-		myupdates.difference_update(myremoved)
-		myupdates = list(myupdates)
-		mymanifests = list(mymanifests)
-		myheaders = []
-		mydirty = []
-
-		commitmessage = options.commitmsg
-		if options.commitmsgfile:
-			try:
-				f = io.open(
-					_unicode_encode(
-						options.commitmsgfile,
-						encoding=_encodings['fs'], errors='strict'),
-					mode='r', encoding=_encodings['content'], errors='replace')
-				commitmessage = f.read()
-				f.close()
-				del f
-			except (IOError, OSError) as e:
-				if e.errno == errno.ENOENT:
-					portage.writemsg(
-						"!!! File Not Found:"
-						" --commitmsgfile='%s'\n" % options.commitmsgfile)
-				else:
-					raise
-			# We've read the content so the file is no longer needed.
-			commitmessagefile = None
-		if not commitmessage or not commitmessage.strip():
-			msg_prefix = ""
-			if repolevel > 1:
-				msg_prefix = "/".join(reposplit[1:]) + ": "
-
-			try:
-				editor = os.environ.get("EDITOR")
-				if editor and utilities.editor_is_executable(editor):
-					commitmessage = utilities.get_commit_message_with_editor(
-						editor, message=qa_output, prefix=msg_prefix)
-				else:
-					commitmessage = utilities.get_commit_message_with_stdin()
-			except KeyboardInterrupt:
-				logging.fatal("Interrupted; exiting...")
-				sys.exit(1)
-			if (not commitmessage or not commitmessage.strip()
-					or commitmessage.strip() == msg_prefix):
-				print("* no commit message?  aborting commit.")
-				sys.exit(1)
-		commitmessage = commitmessage.rstrip()
-		changelog_msg = commitmessage
-		portage_version = getattr(portage, "VERSION", None)
-		gpg_key = repoman_settings.get("PORTAGE_GPG_KEY", "")
-		dco_sob = repoman_settings.get("DCO_SIGNED_OFF_BY", "")
-		if portage_version is None:
-			sys.stderr.write("Failed to insert portage version in message!\n")
-			sys.stderr.flush()
-			portage_version = "Unknown"
-
-		report_options = []
-		if options.force:
-			report_options.append("--force")
-		if options.ignore_arches:
-			report_options.append("--ignore-arches")
-		if include_arches is not None:
-			report_options.append(
-				"--include-arches=\"%s\"" %
-				" ".join(sorted(include_arches)))
-
-		if vcs_settings.vcs == "git":
-			# Use new footer only for git (see bug #438364).
-			commit_footer = "\n\nPackage-Manager: portage-%s" % portage_version
-			if report_options:
-				commit_footer += "\nRepoMan-Options: " + " ".join(report_options)
-			if repo_settings.sign_manifests:
-				commit_footer += "\nManifest-Sign-Key: %s" % (gpg_key, )
-			if dco_sob:
-				commit_footer += "\nSigned-off-by: %s" % (dco_sob, )
-		else:
-			unameout = platform.system() + " "
-			if platform.system() in ["Darwin", "SunOS"]:
-				unameout += platform.processor()
-			else:
-				unameout += platform.machine()
-			commit_footer = "\n\n"
-			if dco_sob:
-				commit_footer += "Signed-off-by: %s\n" % (dco_sob, )
-			commit_footer += "(Portage version: %s/%s/%s" % \
-				(portage_version, vcs_settings.vcs, unameout)
-			if report_options:
-				commit_footer += ", RepoMan options: " + " ".join(report_options)
-			if repo_settings.sign_manifests:
-				commit_footer += ", signed Manifest commit with key %s" % \
-					(gpg_key, )
-			else:
-				commit_footer += ", unsigned Manifest commit"
-			commit_footer += ")"
-
-		commitmessage += commit_footer
-
-		broken_changelog_manifests = []
-		if options.echangelog in ('y', 'force'):
-			logging.info("checking for unmodified ChangeLog files")
-			committer_name = utilities.get_committer_name(env=repoman_settings)
-			for x in sorted(vcs_files_to_cps(
-				chain(myupdates, mymanifests, myremoved),
-				repolevel, reposplit, categories)):
-				catdir, pkgdir = x.split("/")
-				checkdir = repo_settings.repodir + "/" + x
-				checkdir_relative = ""
-				if repolevel < 3:
-					checkdir_relative = os.path.join(pkgdir, checkdir_relative)
-				if repolevel < 2:
-					checkdir_relative = os.path.join(catdir, checkdir_relative)
-				checkdir_relative = os.path.join(".", checkdir_relative)
-
-				changelog_path = os.path.join(checkdir_relative, "ChangeLog")
-				changelog_modified = changelog_path in changed.changelogs
-				if changelog_modified and options.echangelog != 'force':
-					continue
-
-				# get changes for this package
-				cdrlen = len(checkdir_relative)
-				check_relative = lambda e: e.startswith(checkdir_relative)
-				split_relative = lambda e: e[cdrlen:]
-				clnew = list(map(split_relative, filter(check_relative, mynew)))
-				clremoved = list(map(split_relative, filter(check_relative, myremoved)))
-				clchanged = list(map(split_relative, filter(check_relative, mychanged)))
-
-				# Skip ChangeLog generation if only the Manifest was modified,
-				# as discussed in bug #398009.
-				nontrivial_cl_files = set()
-				nontrivial_cl_files.update(clnew, clremoved, clchanged)
-				nontrivial_cl_files.difference_update(['Manifest'])
-				if not nontrivial_cl_files and options.echangelog != 'force':
-					continue
-
-				new_changelog = utilities.UpdateChangeLog(
-					checkdir_relative, committer_name, changelog_msg,
-					os.path.join(repo_settings.repodir, 'skel.ChangeLog'),
-					catdir, pkgdir,
-					new=clnew, removed=clremoved, changed=clchanged,
-					pretend=options.pretend)
-				if new_changelog is None:
-					writemsg_level(
-						"!!! Updating the ChangeLog failed\n",
-						level=logging.ERROR, noiselevel=-1)
-					sys.exit(1)
-
-				# if the ChangeLog was just created, add it to vcs
-				if new_changelog:
-					myautoadd.append(changelog_path)
-					# myautoadd is appended to myupdates below
-				else:
-					myupdates.append(changelog_path)
-
-				if options.ask and not options.pretend:
-					# regenerate Manifest for modified ChangeLog (bug #420735)
-					repoman_settings["O"] = checkdir
-					digestgen(mysettings=repoman_settings, myportdb=portdb)
-				else:
-					broken_changelog_manifests.append(x)
-
-		if myautoadd:
-			print(">>> Auto-Adding missing Manifest/ChangeLog file(s)...")
-			add_cmd = [vcs_settings.vcs, "add"]
-			add_cmd += myautoadd
-			if options.pretend:
-				portage.writemsg_stdout(
-					"(%s)\n" % " ".join(add_cmd),
-					noiselevel=-1)
-			else:
-
-				if sys.hexversion < 0x3020000 and sys.hexversion >= 0x3000000 and \
-					not os.path.isabs(add_cmd[0]):
-					# Python 3.1 _execvp throws TypeError for non-absolute executable
-					# path passed as bytes (see http://bugs.python.org/issue8513).
-					fullname = find_binary(add_cmd[0])
-					if fullname is None:
-						raise portage.exception.CommandNotFound(add_cmd[0])
-					add_cmd[0] = fullname
-
-				add_cmd = [_unicode_encode(arg) for arg in add_cmd]
-				retcode = subprocess.call(add_cmd)
-				if retcode != os.EX_OK:
-					logging.error(
-						"Exiting on %s error code: %s\n" % (vcs_settings.vcs, retcode))
-					sys.exit(retcode)
-
-			myupdates += myautoadd
-
-		print("* %s files being committed..." % green(str(len(myupdates))), end=' ')
-
-		if vcs_settings.vcs not in ('cvs', 'svn'):
-			# With git, bzr and hg, there's never any keyword expansion, so
-			# there's no need to regenerate manifests and all files will be
-			# committed in one big commit at the end.
-			print()
-		elif not repo_settings.repo_config.thin_manifest:
-			if vcs_settings.vcs == 'cvs':
-				headerstring = "'\$(Header|Id).*\$'"
-			elif vcs_settings.vcs == "svn":
-				svn_keywords = dict((k.lower(), k) for k in [
-					"Rev",
-					"Revision",
-					"LastChangedRevision",
-					"Date",
-					"LastChangedDate",
-					"Author",
-					"LastChangedBy",
-					"URL",
-					"HeadURL",
-					"Id",
-					"Header",
-				])
-
-			for myfile in myupdates:
-
-				# for CVS, no_expansion contains files that are excluded from expansion
-				if vcs_settings.vcs == "cvs":
-					if myfile in no_expansion:
-						continue
-
-				# for SVN, expansion contains files that are included in expansion
-				elif vcs_settings.vcs == "svn":
-					if myfile not in expansion:
-						continue
-
-					# Subversion keywords are case-insensitive
-					# in svn:keywords properties,
-					# but case-sensitive in contents of files.
-					enabled_keywords = []
-					for k in expansion[myfile]:
-						keyword = svn_keywords.get(k.lower())
-						if keyword is not None:
-							enabled_keywords.append(keyword)
-
-					headerstring = "'\$(%s).*\$'" % "|".join(enabled_keywords)
-
-				myout = repoman_getstatusoutput(
-					"egrep -q %s %s" % (headerstring, portage._shell_quote(myfile)))
-				if myout[0] == 0:
-					myheaders.append(myfile)
-
-			print("%s have headers that will change." % green(str(len(myheaders))))
-			print(
-				"* Files with headers will"
-				" cause the manifests to be changed and committed separately.")
-
-		logging.info("myupdates: %s", myupdates)
-		logging.info("myheaders: %s", myheaders)
-
-		uq = UserQuery(options)
-		if options.ask and uq.query('Commit changes?', True) != 'Yes':
-			print("* aborting commit.")
-			sys.exit(128 + signal.SIGINT)
-
-		# Handle the case where committed files have keywords which
-		# will change and need a priming commit before the Manifest
-		# can be committed.
-		if (myupdates or myremoved) and myheaders:
-			myfiles = myupdates + myremoved
-			fd, commitmessagefile = tempfile.mkstemp(".repoman.msg")
-			mymsg = os.fdopen(fd, "wb")
-			mymsg.write(_unicode_encode(commitmessage))
-			mymsg.close()
-
-			separator = '-' * 78
-
-			print()
-			print(green("Using commit message:"))
-			print(green(separator))
-			print(commitmessage)
-			print(green(separator))
-			print()
-
-			# Having a leading ./ prefix on file paths can trigger a bug in
-			# the cvs server when committing files to multiple directories,
-			# so strip the prefix.
-			myfiles = [f.lstrip("./") for f in myfiles]
-
-			commit_cmd = [vcs_settings.vcs]
-			commit_cmd.extend(vcs_settings.vcs_global_opts)
-			commit_cmd.append("commit")
-			commit_cmd.extend(vcs_settings.vcs_local_opts)
-			commit_cmd.extend(["-F", commitmessagefile])
-			commit_cmd.extend(myfiles)
-
-			try:
-				if options.pretend:
-					print("(%s)" % (" ".join(commit_cmd),))
-				else:
-					retval = spawn(commit_cmd, env=repo_settings.commit_env)
-					if retval != os.EX_OK:
-						writemsg_level(
-							"!!! Exiting on %s (shell) "
-							"error code: %s\n" % (vcs_settings.vcs, retval),
-							level=logging.ERROR, noiselevel=-1)
-						sys.exit(retval)
-			finally:
-				try:
-					os.unlink(commitmessagefile)
-				except OSError:
-					pass
-
-		# When files are removed and re-added, the cvs server will put /Attic/
-		# inside the $Header path. This code detects the problem and corrects it
-		# so that the Manifest will generate correctly. See bug #169500.
-		# Use binary mode in order to avoid potential character encoding issues.
-		cvs_header_re = re.compile(br'^#\s*\$Header.*\$$')
-		attic_str = b'/Attic/'
-		attic_replace = b'/'
-		for x in myheaders:
-			f = open(
-				_unicode_encode(x, encoding=_encodings['fs'], errors='strict'),
-				mode='rb')
-			mylines = f.readlines()
-			f.close()
-			modified = False
-			for i, line in enumerate(mylines):
-				if cvs_header_re.match(line) is not None and \
-					attic_str in line:
-					mylines[i] = line.replace(attic_str, attic_replace)
-					modified = True
-			if modified:
-				portage.util.write_atomic(x, b''.join(mylines), mode='wb')
-
-		if repolevel == 1:
-			utilities.repoman_sez(
-				"\"You're rather crazy... "
-				"doing the entire repository.\"\n")
-
-		if vcs_settings.vcs in ('cvs', 'svn') and (myupdates or myremoved):
-			for x in sorted(vcs_files_to_cps(
-				chain(myupdates, myremoved, mymanifests),
-				repolevel, reposplit, categories)):
-				repoman_settings["O"] = os.path.join(repo_settings.repodir, x)
-				digestgen(mysettings=repoman_settings, myportdb=portdb)
-
-		elif broken_changelog_manifests:
-			for x in broken_changelog_manifests:
-				repoman_settings["O"] = os.path.join(repo_settings.repodir, x)
-				digestgen(mysettings=repoman_settings, myportdb=portdb)
-
-		signed = False
-		if repo_settings.sign_manifests:
-			signed = True
-			try:
-				for x in sorted(vcs_files_to_cps(
-					chain(myupdates, myremoved, mymanifests),
-					repolevel, reposplit, categories)):
-					repoman_settings["O"] = os.path.join(repo_settings.repodir, x)
-					manifest_path = os.path.join(repoman_settings["O"], "Manifest")
-					if not need_signature(manifest_path):
-						continue
-					gpgsign(manifest_path)
-			except portage.exception.PortageException as e:
-				portage.writemsg("!!! %s\n" % str(e))
-				portage.writemsg("!!! Disabled FEATURES='sign'\n")
-				signed = False
-
-		if vcs_settings.vcs == 'git':
-			# It's not safe to use the git commit -a option since there might
-			# be some modified files elsewhere in the working tree that the
-			# user doesn't want to commit. Therefore, call git update-index
-			# in order to ensure that the index is updated with the latest
-			# versions of all new and modified files in the relevant portion
-			# of the working tree.
-			myfiles = mymanifests + myupdates
-			myfiles.sort()
-			update_index_cmd = ["git", "update-index"]
-			update_index_cmd.extend(f.lstrip("./") for f in myfiles)
-			if options.pretend:
-				print("(%s)" % (" ".join(update_index_cmd),))
-			else:
-				retval = spawn(update_index_cmd, env=os.environ)
-				if retval != os.EX_OK:
-					writemsg_level(
-						"!!! Exiting on %s (shell) "
-						"error code: %s\n" % (vcs_settings.vcs, retval),
-						level=logging.ERROR, noiselevel=-1)
-					sys.exit(retval)
-
-		if True:
-			myfiles = mymanifests[:]
-			# If there are no header (SVN/CVS keywords) changes in
-			# the files, this Manifest commit must include the
-			# other (yet uncommitted) files.
-			if not myheaders:
-				myfiles += myupdates
-				myfiles += myremoved
-			myfiles.sort()
-
-			fd, commitmessagefile = tempfile.mkstemp(".repoman.msg")
-			mymsg = os.fdopen(fd, "wb")
-			mymsg.write(_unicode_encode(commitmessage))
-			mymsg.close()
-
-			commit_cmd = []
-			if options.pretend and vcs_settings.vcs is None:
-				# substitute a bogus value for pretend output
-				commit_cmd.append("cvs")
-			else:
-				commit_cmd.append(vcs_settings.vcs)
-			commit_cmd.extend(vcs_settings.vcs_global_opts)
-			commit_cmd.append("commit")
-			commit_cmd.extend(vcs_settings.vcs_local_opts)
-			if vcs_settings.vcs == "hg":
-				commit_cmd.extend(["--logfile", commitmessagefile])
-				commit_cmd.extend(myfiles)
-			else:
-				commit_cmd.extend(["-F", commitmessagefile])
-				commit_cmd.extend(f.lstrip("./") for f in myfiles)
-
-			try:
-				if options.pretend:
-					print("(%s)" % (" ".join(commit_cmd),))
-				else:
-					retval = spawn(commit_cmd, env=repo_settings.commit_env)
-					if retval != os.EX_OK:
-						if repo_settings.repo_config.sign_commit and vcs_settings.vcs == 'git' and \
-							not git_supports_gpg_sign():
-							# Inform user that newer git is needed (bug #403323).
-							logging.error(
-								"Git >=1.7.9 is required for signed commits!")
-
-						writemsg_level(
-							"!!! Exiting on %s (shell) "
-							"error code: %s\n" % (vcs_settings.vcs, retval),
-							level=logging.ERROR, noiselevel=-1)
-						sys.exit(retval)
-			finally:
-				try:
-					os.unlink(commitmessagefile)
-				except OSError:
-					pass
-
-		print()
-		if vcs_settings.vcs:
-			print("Commit complete.")
-		else:
-			print(
-				"repoman was too scared"
-				" by not seeing any familiar version control file"
-				" that he forgot to commit anything")
-		utilities.repoman_sez(
-			"\"If everyone were like you, I'd be out of business!\"\n")
-	sys.exit(0)

diff --git a/pym/tbc/repoman/metadata.py b/pym/tbc/repoman/metadata.py
deleted file mode 100644
index f2b63a7..0000000
--- a/pym/tbc/repoman/metadata.py
+++ /dev/null
@@ -1,150 +0,0 @@
-
-import errno
-import logging
-import sys
-import tempfile
-import time
-
-try:
-	from urllib.parse import urlparse
-except ImportError:
-	from urlparse import urlparse
-
-
-# import our initialized portage instance
-from repoman._portage import portage
-
-from portage import exception
-from portage import os
-from portage.output import green
-
-if sys.hexversion >= 0x3000000:
-	basestring = str
-
-if sys.hexversion >= 0x3000000:
-	basestring = str
-
-metadata_xml_encoding = 'UTF-8'
-metadata_xml_declaration = '<?xml version="1.0" encoding="%s"?>' \
-	% (metadata_xml_encoding,)
-metadata_doctype_name = 'pkgmetadata'
-metadata_dtd_uri = 'http://www.gentoo.org/dtd/metadata.dtd'
-# force refetch if the local copy creation time is older than this
-metadata_dtd_ctime_interval = 60 * 60 * 24 * 7  # 7 days
-
-
-def parse_metadata_use(xml_tree):
-	"""
-	Records are wrapped in XML as per GLEP 56
-	returns a dict with keys constisting of USE flag names and values
-	containing their respective descriptions
-	"""
-	uselist = {}
-
-	usetags = xml_tree.findall("use")
-	if not usetags:
-		return uselist
-
-	# It's possible to have multiple 'use' elements.
-	for usetag in usetags:
-		flags = usetag.findall("flag")
-		if not flags:
-			# DTD allows use elements containing no flag elements.
-			continue
-
-		for flag in flags:
-			pkg_flag = flag.get("name")
-			if pkg_flag is None:
-				raise exception.ParseError("missing 'name' attribute for 'flag' tag")
-			flag_restrict = flag.get("restrict")
-
-			# emulate the Element.itertext() method from python-2.7
-			inner_text = []
-			stack = []
-			stack.append(flag)
-			while stack:
-				obj = stack.pop()
-				if isinstance(obj, basestring):
-					inner_text.append(obj)
-					continue
-				if isinstance(obj.text, basestring):
-					inner_text.append(obj.text)
-				if isinstance(obj.tail, basestring):
-					stack.append(obj.tail)
-				stack.extend(reversed(obj))
-
-			if pkg_flag not in uselist:
-				uselist[pkg_flag] = {}
-
-			# (flag_restrict can be None)
-			uselist[pkg_flag][flag_restrict] = " ".join("".join(inner_text).split())
-
-	return uselist
-
-
-def fetch_metadata_dtd(metadata_dtd, repoman_settings):
-	"""
-	Fetch metadata.dtd if it doesn't exist or the ctime is older than
-	metadata_dtd_ctime_interval.
-	@rtype: bool
-	@return: True if successful, otherwise False
-	"""
-
-	must_fetch = True
-	metadata_dtd_st = None
-	current_time = int(time.time())
-	try:
-		metadata_dtd_st = os.stat(metadata_dtd)
-	except EnvironmentError as e:
-		if e.errno not in (errno.ENOENT, errno.ESTALE):
-			raise
-		del e
-	else:
-		# Trigger fetch if metadata.dtd mtime is old or clock is wrong.
-		if abs(current_time - metadata_dtd_st.st_ctime) \
-			< metadata_dtd_ctime_interval:
-			must_fetch = False
-
-	if must_fetch:
-		print()
-		print(
-			"%s the local copy of metadata.dtd "
-			"needs to be refetched, doing that now" % green("***"))
-		print()
-		parsed_url = urlparse(metadata_dtd_uri)
-		setting = 'FETCHCOMMAND_' + parsed_url.scheme.upper()
-		fcmd = repoman_settings.get(setting)
-		if not fcmd:
-			fcmd = repoman_settings.get('FETCHCOMMAND')
-			if not fcmd:
-				logging.error("FETCHCOMMAND is unset")
-				return False
-
-		destdir = repoman_settings["DISTDIR"]
-		fd, metadata_dtd_tmp = tempfile.mkstemp(
-			prefix='metadata.dtd.', dir=destdir)
-		os.close(fd)
-
-		try:
-			if not portage.getbinpkg.file_get(
-				metadata_dtd_uri, destdir, fcmd=fcmd,
-				filename=os.path.basename(metadata_dtd_tmp)):
-				logging.error(
-					"failed to fetch metadata.dtd from '%s'" % metadata_dtd_uri)
-				return False
-
-			try:
-				portage.util.apply_secpass_permissions(
-					metadata_dtd_tmp,
-					gid=portage.data.portage_gid, mode=0o664, mask=0o2)
-			except portage.exception.PortageException:
-				pass
-
-			os.rename(metadata_dtd_tmp, metadata_dtd)
-		finally:
-			try:
-				os.unlink(metadata_dtd_tmp)
-			except OSError:
-				pass
-
-	return True

diff --git a/pym/tbc/repoman/modules/__init__.py b/pym/tbc/repoman/modules/__init__.py
deleted file mode 100644
index e69de29..0000000

diff --git a/pym/tbc/repoman/modules/commit/__init__.py b/pym/tbc/repoman/modules/commit/__init__.py
deleted file mode 100644
index e69de29..0000000

diff --git a/pym/tbc/repoman/modules/commit/repochecks.py b/pym/tbc/repoman/modules/commit/repochecks.py
deleted file mode 100644
index 2839864..0000000
--- a/pym/tbc/repoman/modules/commit/repochecks.py
+++ /dev/null
@@ -1,32 +0,0 @@
-
-from portage.output import red
-
-from repoman.errors import err
-from repoman.vcs.vcs import detect_vcs_conflicts
-
-
-def commit_check(repolevel, reposplit):
-	# Check if it's in $PORTDIR/$CATEGORY/$PN , otherwise bail if commiting.
-	# Reason for this is if they're trying to commit in just $FILESDIR/*,
-	# the Manifest needs updating.
-	# This check ensures that repoman knows where it is,
-	# and the manifest recommit is at least possible.
-	if repolevel not in [1, 2, 3]:
-		print(red("***") + (
-			" Commit attempts *must* be from within a vcs checkout,"
-			" category, or package directory."))
-		print(red("***") + (
-			" Attempting to commit from a packages files directory"
-			" will be blocked for instance."))
-		print(red("***") + (
-			" This is intended behaviour,"
-			" to ensure the manifest is recommitted for a package."))
-		print(red("***"))
-		err(
-			"Unable to identify level we're commiting from for %s" %
-			'/'.join(reposplit))
-
-
-def conflict_check(vcs_settings, options):
-	if vcs_settings.vcs:
-		detect_vcs_conflicts(options, vcs_settings.vcs)

diff --git a/pym/tbc/repoman/modules/fix/__init__.py b/pym/tbc/repoman/modules/fix/__init__.py
deleted file mode 100644
index e69de29..0000000

diff --git a/pym/tbc/repoman/modules/full/__init__.py b/pym/tbc/repoman/modules/full/__init__.py
deleted file mode 100644
index e69de29..0000000

diff --git a/pym/tbc/repoman/modules/manifest/__init__.py b/pym/tbc/repoman/modules/manifest/__init__.py
deleted file mode 100644
index e69de29..0000000

diff --git a/pym/tbc/repoman/modules/scan/__init__.py b/pym/tbc/repoman/modules/scan/__init__.py
deleted file mode 100644
index e69de29..0000000

diff --git a/pym/tbc/repoman/profile.py b/pym/tbc/repoman/profile.py
deleted file mode 100644
index 11b93c7..0000000
--- a/pym/tbc/repoman/profile.py
+++ /dev/null
@@ -1,84 +0,0 @@
-
-from portage import normalize_path
-from portage import os
-from portage.output import red
-
-
-class ProfileDesc(object):
-	__slots__ = ('abs_path', 'arch', 'status', 'sub_path', 'tree_path',)
-
-	def __init__(self, arch, status, sub_path, tree_path):
-		self.arch = arch
-		self.status = status
-		if sub_path:
-			sub_path = normalize_path(sub_path.lstrip(os.sep))
-		self.sub_path = sub_path
-		self.tree_path = tree_path
-		if tree_path:
-			self.abs_path = os.path.join(tree_path, 'profiles', self.sub_path)
-		else:
-			self.abs_path = tree_path
-
-	def __str__(self):
-		if self.sub_path:
-			return self.sub_path
-		return 'empty profile'
-
-
-valid_profile_types = frozenset(['dev', 'exp', 'stable'])
-
-
-def dev_keywords(profiles):
-	"""
-	Create a set of KEYWORDS values that exist in 'dev'
-	profiles. These are used
-	to trigger a message notifying the user when they might
-	want to add the --include-dev option.
-	"""
-	type_arch_map = {}
-	for arch, arch_profiles in profiles.items():
-		for prof in arch_profiles:
-			arch_set = type_arch_map.get(prof.status)
-			if arch_set is None:
-				arch_set = set()
-				type_arch_map[prof.status] = arch_set
-			arch_set.add(arch)
-
-	dev_keywords = type_arch_map.get('dev', set())
-	dev_keywords.update(['~' + arch for arch in dev_keywords])
-	return frozenset(dev_keywords)
-
-
-def setup_profile(profile_list):
-	# Ensure that profile sub_path attributes are unique. Process in reverse order
-	# so that profiles with duplicate sub_path from overlays will override
-	# profiles with the same sub_path from parent repos.
-	profiles = {}
-	profile_list.reverse()
-	profile_sub_paths = set()
-	for prof in profile_list:
-		if prof.sub_path in profile_sub_paths:
-			continue
-		profile_sub_paths.add(prof.sub_path)
-		profiles.setdefault(prof.arch, []).append(prof)
-
-	# Use an empty profile for checking dependencies of
-	# packages that have empty KEYWORDS.
-	prof = ProfileDesc('**', 'stable', '', '')
-	profiles.setdefault(prof.arch, []).append(prof)
-	return profiles
-
-
-def check_profiles(profiles, archlist):
-	for x in archlist:
-		if x[0] == "~":
-			continue
-		if x not in profiles:
-			print(red(
-				"\"%s\" doesn't have a valid profile listed in profiles.desc." % x))
-			print(red(
-				"You need to either \"cvs update\" your profiles dir"
-				" or follow this"))
-			print(red(
-				"up with the " + x + " team."))
-			print()

diff --git a/pym/tbc/repoman/qa_data.py b/pym/tbc/repoman/qa_data.py
deleted file mode 100644
index b262992..0000000
--- a/pym/tbc/repoman/qa_data.py
+++ /dev/null
@@ -1,430 +0,0 @@
-
-import logging
-
-from _emerge.Package import Package
-
-# import our initialized portage instance
-from repoman._portage import portage
-
-# 14 is the length of DESCRIPTION=""
-max_desc_len = 100
-allowed_filename_chars = "a-zA-Z0-9._-+:"
-
-qahelp = {
-	"CVS/Entries.IO_error": (
-		"Attempting to commit, and an IO error was encountered access the"
-		" Entries file"),
-	"ebuild.invalidname": (
-		"Ebuild files with a non-parseable or syntactically incorrect name"
-		" (or using 2.1 versioning extensions)"),
-	"ebuild.namenomatch": (
-		"Ebuild files that do not have the same name as their parent"
-		" directory"),
-	"changelog.ebuildadded": (
-		"An ebuild was added but the ChangeLog was not modified"),
-	"changelog.missing": (
-		"Missing ChangeLog files"),
-	"ebuild.notadded": (
-		"Ebuilds that exist but have not been added to cvs"),
-	"ebuild.patches": (
-		"PATCHES variable should be a bash array to ensure white space safety"),
-	"changelog.notadded": (
-		"ChangeLogs that exist but have not been added to cvs"),
-	"dependency.bad": (
-		"User-visible ebuilds with unsatisfied dependencies"
-		" (matched against *visible* ebuilds)"),
-	"dependency.badmasked": (
-		"Masked ebuilds with unsatisfied dependencies"
-		" (matched against *all* ebuilds)"),
-	"dependency.badindev": (
-		"User-visible ebuilds with unsatisfied dependencies"
-		" (matched against *visible* ebuilds) in developing arch"),
-	"dependency.badmaskedindev": (
-		"Masked ebuilds with unsatisfied dependencies"
-		" (matched against *all* ebuilds) in developing arch"),
-	"dependency.badtilde": (
-		"Uses the ~ dep operator with a non-zero revision part,"
-		" which is useless (the revision is ignored)"),
-	"dependency.missingslot": (
-		"RDEPEND matches more than one SLOT but does not specify a "
-		"slot and/or use the := or :* slot operator"),
-	"dependency.perlcore": (
-		"This ebuild directly depends on a package in perl-core;"
-		" it should use the corresponding virtual instead."),
-	"dependency.syntax": (
-		"Syntax error in dependency string"
-		" (usually an extra/missing space/parenthesis)"),
-	"dependency.unknown": (
-		"Ebuild has a dependency that refers to an unknown package"
-		" (which may be valid if it is a blocker for a renamed/removed package,"
-		" or is an alternative choice provided by an overlay)"),
-	"file.executable": (
-		"Ebuilds, digests, metadata.xml, Manifest, and ChangeLog do not need"
-		" the executable bit"),
-	"file.size": (
-		"Files in the files directory must be under 20 KiB"),
-	"file.size.fatal": (
-		"Files in the files directory must be under 60 KiB"),
-	"file.name": (
-		"File/dir name must be composed"
-		" of only the following chars: %s " % allowed_filename_chars),
-	"file.UTF8": (
-		"File is not UTF8 compliant"),
-	"inherit.deprecated": (
-		"Ebuild inherits a deprecated eclass"),
-	"inherit.missing": (
-		"Ebuild uses functions from an eclass but does not inherit it"),
-	"inherit.unused": (
-		"Ebuild inherits an eclass but does not use it"),
-	"java.eclassesnotused": (
-		"With virtual/jdk in DEPEND you must inherit a java eclass"),
-	"wxwidgets.eclassnotused": (
-		"Ebuild DEPENDs on x11-libs/wxGTK without inheriting wxwidgets.eclass"),
-	"KEYWORDS.dropped": (
-		"Ebuilds that appear to have dropped KEYWORDS for some arch"),
-	"KEYWORDS.missing": (
-		"Ebuilds that have a missing or empty KEYWORDS variable"),
-	"KEYWORDS.stable": (
-		"Ebuilds that have been added directly with stable KEYWORDS"),
-	"KEYWORDS.stupid": (
-		"Ebuilds that use KEYWORDS=-* instead of package.mask"),
-	"LICENSE.missing": (
-		"Ebuilds that have a missing or empty LICENSE variable"),
-	"LICENSE.virtual": (
-		"Virtuals that have a non-empty LICENSE variable"),
-	"DESCRIPTION.missing": (
-		"Ebuilds that have a missing or empty DESCRIPTION variable"),
-	"DESCRIPTION.toolong": (
-		"DESCRIPTION is over %d characters" % max_desc_len),
-	"EAPI.definition": (
-		"EAPI definition does not conform to PMS section 7.3.1"
-		" (first non-comment, non-blank line)"),
-	"EAPI.deprecated": (
-		"Ebuilds that use features that are deprecated in the current EAPI"),
-	"EAPI.incompatible": (
-		"Ebuilds that use features that are only available with a different"
-		" EAPI"),
-	"EAPI.unsupported": (
-		"Ebuilds that have an unsupported EAPI version"
-		" (you must upgrade portage)"),
-	"SLOT.invalid": (
-		"Ebuilds that have a missing or invalid SLOT variable value"),
-	"HOMEPAGE.missing": (
-		"Ebuilds that have a missing or empty HOMEPAGE variable"),
-	"HOMEPAGE.virtual": (
-		"Virtuals that have a non-empty HOMEPAGE variable"),
-	"PDEPEND.suspect": (
-		"PDEPEND contains a package that usually only belongs in DEPEND."),
-	"LICENSE.syntax": (
-		"Syntax error in LICENSE"
-		" (usually an extra/missing space/parenthesis)"),
-	"PROVIDE.syntax": (
-		"Syntax error in PROVIDE"
-		" (usually an extra/missing space/parenthesis)"),
-	"PROPERTIES.syntax": (
-		"Syntax error in PROPERTIES"
-		" (usually an extra/missing space/parenthesis)"),
-	"RESTRICT.syntax": (
-		"Syntax error in RESTRICT"
-		" (usually an extra/missing space/parenthesis)"),
-	"REQUIRED_USE.syntax": (
-		"Syntax error in REQUIRED_USE"
-		" (usually an extra/missing space/parenthesis)"),
-	"SRC_URI.syntax": (
-		"Syntax error in SRC_URI"
-		" (usually an extra/missing space/parenthesis)"),
-	"SRC_URI.mirror": (
-		"A uri listed in profiles/thirdpartymirrors is found in SRC_URI"),
-	"ebuild.syntax": (
-		"Error generating cache entry for ebuild;"
-		" typically caused by ebuild syntax error"
-		" or digest verification failure"),
-	"ebuild.output": (
-		"A simple sourcing of the ebuild produces output;"
-		" this breaks ebuild policy."),
-	"ebuild.nesteddie": (
-		"Placing 'die' inside ( ) prints an error,"
-		" but doesn't stop the ebuild."),
-	"variable.invalidchar": (
-		"A variable contains an invalid character"
-		" that is not part of the ASCII character set"),
-	"variable.readonly": (
-		"Assigning a readonly variable"),
-	"variable.usedwithhelpers": (
-		"Ebuild uses D, ROOT, ED, EROOT or EPREFIX with helpers"),
-	"LIVEVCS.stable": (
-		"This ebuild is a live checkout from a VCS but has stable keywords."),
-	"LIVEVCS.unmasked": (
-		"This ebuild is a live checkout from a VCS but has keywords"
-		" and is not masked in the global package.mask."),
-	"IUSE.invalid": (
-		"This ebuild has a variable in IUSE"
-		" that is not in the use.desc or its metadata.xml file"),
-	"IUSE.missing": (
-		"This ebuild has a USE conditional"
-		" which references a flag that is not listed in IUSE"),
-	"IUSE.rubydeprecated": (
-		"The ebuild has set a ruby interpreter in USE_RUBY,"
-		" that is not available as a ruby target anymore"),
-	"LICENSE.invalid": (
-		"This ebuild is listing a license"
-		" that doesnt exist in portages license/ dir."),
-	"LICENSE.deprecated": (
-		"This ebuild is listing a deprecated license."),
-	"KEYWORDS.invalid": (
-		"This ebuild contains KEYWORDS"
-		" that are not listed in profiles/arch.list"
-		" or for which no valid profile was found"),
-	"RDEPEND.implicit": (
-		"RDEPEND is unset in the ebuild"
-		" which triggers implicit RDEPEND=$DEPEND assignment"
-		" (prior to EAPI 4)"),
-	"RDEPEND.suspect": (
-		"RDEPEND contains a package that usually only belongs in DEPEND."),
-	"RESTRICT.invalid": (
-		"This ebuild contains invalid RESTRICT values."),
-	"digest.assumed": (
-		"Existing digest must be assumed correct (Package level only)"),
-	"digest.missing": (
-		"Some files listed in SRC_URI aren't referenced in the Manifest"),
-	"digest.unused": (
-		"Some files listed in the Manifest aren't referenced in SRC_URI"),
-	"ebuild.majorsyn": (
-		"This ebuild has a major syntax error"
-		" that may cause the ebuild to fail partially or fully"),
-	"ebuild.minorsyn": (
-		"This ebuild has a minor syntax error"
-		" that contravenes gentoo coding style"),
-	"ebuild.badheader": (
-		"This ebuild has a malformed header"),
-	"manifest.bad": (
-		"Manifest has missing or incorrect digests"),
-	"metadata.missing": (
-		"Missing metadata.xml files"),
-	"metadata.bad": (
-		"Bad metadata.xml files"),
-	"metadata.warning": (
-		"Warnings in metadata.xml files"),
-	"portage.internal": (
-		"The ebuild uses an internal Portage function or variable"),
-	"repo.eapi.banned": (
-		"The ebuild uses an EAPI which is"
-		" banned by the repository's metadata/layout.conf settings"),
-	"repo.eapi.deprecated": (
-		"The ebuild uses an EAPI which is"
-		" deprecated by the repository's metadata/layout.conf settings"),
-	"virtual.oldstyle": (
-		"The ebuild PROVIDEs an old-style virtual (see GLEP 37)"),
-	"virtual.suspect": (
-		"Ebuild contains a package"
-		" that usually should be pulled via virtual/, not directly."),
-	"usage.obsolete": (
-		"The ebuild makes use of an obsolete construct"),
-	"upstream.workaround": (
-		"The ebuild works around an upstream bug,"
-		" an upstream bug should be filed and tracked in bugs.gentoo.org")
-}
-
-qacats = list(qahelp)
-qacats.sort()
-
-qawarnings = set((
-	"changelog.missing",
-	"changelog.notadded",
-	"dependency.unknown",
-	"digest.assumed",
-	"digest.unused",
-	"ebuild.notadded",
-	"ebuild.nesteddie",
-	"dependency.badmasked",
-	"dependency.badindev",
-	"dependency.badmaskedindev",
-	"dependency.badtilde",
-	"dependency.missingslot",
-	"dependency.perlcore",
-	"DESCRIPTION.toolong",
-	"EAPI.deprecated",
-	"HOMEPAGE.virtual",
-	"LICENSE.deprecated",
-	"LICENSE.virtual",
-	"KEYWORDS.dropped",
-	"KEYWORDS.stupid",
-	"KEYWORDS.missing",
-	"PDEPEND.suspect",
-	"RDEPEND.implicit",
-	"RDEPEND.suspect",
-	"virtual.suspect",
-	"RESTRICT.invalid",
-	"ebuild.minorsyn",
-	"ebuild.badheader",
-	"ebuild.patches",
-	"file.size",
-	"inherit.unused",
-	"inherit.deprecated",
-	"java.eclassesnotused",
-	"wxwidgets.eclassnotused",
-	"metadata.warning",
-	"portage.internal",
-	"repo.eapi.deprecated",
-	"usage.obsolete",
-	"upstream.workaround",
-	"LIVEVCS.stable",
-	"LIVEVCS.unmasked",
-	"IUSE.rubydeprecated",
-))
-
-
-missingvars = ["KEYWORDS", "LICENSE", "DESCRIPTION", "HOMEPAGE"]
-allvars = set(x for x in portage.auxdbkeys if not x.startswith("UNUSED_"))
-allvars.update(Package.metadata_keys)
-allvars = sorted(allvars)
-
-for x in missingvars:
-	x += ".missing"
-	if x not in qacats:
-		logging.warning('* missingvars values need to be added to qahelp ("%s")' % x)
-		qacats.append(x)
-		qawarnings.add(x)
-
-valid_restrict = frozenset([
-	"binchecks", "bindist", "fetch", "installsources", "mirror",
-	"preserve-libs", "primaryuri", "splitdebug", "strip", "test", "userpriv"])
-
-
-suspect_rdepend = frozenset([
-	"app-arch/cabextract",
-	"app-arch/rpm2targz",
-	"app-doc/doxygen",
-	"dev-lang/nasm",
-	"dev-lang/swig",
-	"dev-lang/yasm",
-	"dev-perl/extutils-pkgconfig",
-	"dev-util/byacc",
-	"dev-util/cmake",
-	"dev-util/ftjam",
-	"dev-util/gperf",
-	"dev-util/gtk-doc",
-	"dev-util/gtk-doc-am",
-	"dev-util/intltool",
-	"dev-util/jam",
-	"dev-util/pkg-config-lite",
-	"dev-util/pkgconf",
-	"dev-util/pkgconfig",
-	"dev-util/pkgconfig-openbsd",
-	"dev-util/scons",
-	"dev-util/unifdef",
-	"dev-util/yacc",
-	"media-gfx/ebdftopcf",
-	"sys-apps/help2man",
-	"sys-devel/autoconf",
-	"sys-devel/automake",
-	"sys-devel/bin86",
-	"sys-devel/bison",
-	"sys-devel/dev86",
-	"sys-devel/flex",
-	"sys-devel/m4",
-	"sys-devel/pmake",
-	"virtual/linux-sources",
-	"virtual/pkgconfig",
-	"x11-misc/bdftopcf",
-	"x11-misc/imake",
-])
-
-suspect_virtual = {
-	"dev-util/pkg-config-lite": "virtual/pkgconfig",
-	"dev-util/pkgconf": "virtual/pkgconfig",
-	"dev-util/pkgconfig": "virtual/pkgconfig",
-	"dev-util/pkgconfig-openbsd": "virtual/pkgconfig",
-	"dev-libs/libusb": "virtual/libusb",
-	"dev-libs/libusbx": "virtual/libusb",
-	"dev-libs/libusb-compat": "virtual/libusb",
-}
-
-ruby_deprecated = frozenset([
-	"ruby_targets_ree18",
-	"ruby_targets_ruby18",
-])
-
-
-# file.executable
-no_exec = frozenset(["Manifest", "ChangeLog", "metadata.xml"])
-
-
-def format_qa_output(
-	formatter, fails, dofull, dofail, options, qawarnings):
-	"""Helper function that formats output properly
-
-	Args:
-		formatter - a subclass of Formatter
-		fails - a dict of qa status failures
-		dofull - boolean to print full results or a summary
-		dofail - boolean to decide if failure was hard or soft
-
-	Returns:
-		None (modifies formatter)
-	"""
-	full = options.mode == 'full'
-	# we only want key value pairs where value > 0
-	for category in sorted(fails):
-		number = len(fails[category])
-		formatter.add_literal_data("  " + category.ljust(30))
-		if category in qawarnings:
-			formatter.push_style("WARN")
-		else:
-			formatter.push_style("BAD")
-		formatter.add_literal_data("%s" % number)
-		formatter.pop_style()
-		formatter.add_line_break()
-		if not dofull:
-			if not full and dofail and category in qawarnings:
-				# warnings are considered noise when there are failures
-				continue
-			fails_list = fails[category]
-			if not full and len(fails_list) > 12:
-				fails_list = fails_list[:12]
-			for failure in fails_list:
-				formatter.add_literal_data("   " + failure)
-				formatter.add_line_break()
-
-
-def format_qa_output_column(
-	formatter, fails, dofull, dofail, options, qawarnings):
-	"""Helper function that formats output in a machine-parseable column format
-
-	@param formatter: an instance of Formatter
-	@type formatter: Formatter
-	@param path: dict of qa status items
-	@type path: dict
-	@param fails: dict of qa status failures
-	@type fails: dict
-	@param dofull: Whether to print full results or a summary
-	@type dofull: boolean
-	@param dofail: Whether failure was hard or soft
-	@type dofail: boolean
-	@param options: The command-line options provided to repoman
-	@type options: Namespace
-	@param qawarnings: the set of warning types
-	@type qawarnings: set
-	@return: None (modifies formatter)
-	"""
-	full = options.mode == 'full'
-	for category in fails.items():
-		number = len(fails[category])
-		formatter.add_literal_data("NumberOf " + category + " ")
-		if category in qawarnings:
-			formatter.push_style("WARN")
-		else:
-			formatter.push_style("BAD")
-		formatter.add_literal_data("%s" % number)
-		formatter.pop_style()
-		formatter.add_line_break()
-		if not dofull:
-			if not full and dofail and category in qawarnings:
-				# warnings are considered noise when there are failures
-				continue
-			fails_list = fails[category]
-			if not full and len(fails_list) > 12:
-				fails_list = fails_list[:12]
-			for failure in fails_list:
-				formatter.add_literal_data(category + " " + failure)
-				formatter.add_line_break()

diff --git a/pym/tbc/repoman/qa_tracker.py b/pym/tbc/repoman/qa_tracker.py
deleted file mode 100644
index 9bfe0e2..0000000
--- a/pym/tbc/repoman/qa_tracker.py
+++ /dev/null
@@ -1,45 +0,0 @@
-
-import logging
-import sys
-
-from repoman.qa_data import qacats, qawarnings
-
-
-class QATracker(object):
-	'''Track all occurrances of Q/A problems detected'''
-
-	def __init__(self):
-		self.fails = {}
-		self.warns = {}
-
-	def add_error(self, detected_qa, info):
-		'''Add the Q/A error to the database of detected problems
-
-		@param detected_qa: string, member of qa_data.qacats list
-		@param info: string, details of the detected problem
-		'''
-		if detected_qa not in qacats:
-			logging.error(
-				'QATracker: Exiting on error. Unknown detected_qa type passed '
-				'in to add_error(): %s, %s' % (detected_qa, info))
-			sys.exit(1)
-		try:
-			self.fails[detected_qa].append(info)
-		except KeyError:
-			self.fails[detected_qa] = [info]
-
-	def add_warning(self, detected_qa, info):
-		'''Add the Q/A warning to the database of detected problems
-
-		@param detected_qa: string, member of qa_data.qawarnings list
-		@param info: string, details of the detected problem
-		'''
-		if detected_qa not in qawarnings:
-			logging.error(
-				'QATracker: Exiting on error. Unknown detected_qa type passed '
-				'in to add_warning(): %s, %s' % (detected_qa, info))
-			sys.exit(1)
-		try:
-			self.warns[detected_qa].append(info)
-		except KeyError:
-			self.warns[detected_qa] = [info]

diff --git a/pym/tbc/repoman/repos.py b/pym/tbc/repoman/repos.py
deleted file mode 100644
index e6accb1..0000000
--- a/pym/tbc/repoman/repos.py
+++ /dev/null
@@ -1,303 +0,0 @@
-
-
-import io
-import logging
-import re
-import sys
-import textwrap
-
-# import our initialized portage instance
-from tbc.repoman._portage import portage
-
-from portage import os
-from portage import _encodings
-from portage import _unicode_encode
-
-from tbc.repoman.errors import err
-from tbc.repoman.profile import ProfileDesc, valid_profile_types
-
-GPG_KEY_ID_REGEX = r'(0x)?([0-9a-fA-F]{8}){1,5}!?'
-bad = portage.output.create_color_func("BAD")
-
-
-class RepoSettings(object):
-	'''Holds out repo specific settings'''
-
-	def __init__(
-		self, config_root, portdir, portdir_overlay,
-		repoman_settings=None, vcs_settings=None, options=None,
-		qawarnings=None):
-		self.repoman_settings = repoman_settings
-		self.vcs_settings = vcs_settings
-
-		repoman_repos = self.repoman_settings.repositories
-
-		# Ensure that current repository is in the list of enabled repositories.
-		self.repodir = os.path.realpath(portdir_overlay)
-		try:
-			repoman_repos.get_repo_for_location(self.repodir)
-		except KeyError:
-			self._add_repo(config_root, portdir_overlay)
-
-		self.root = self.repoman_settings['EROOT']
-		self.trees = {
-			self.root: {'porttree': portage.portagetree(settings=self.repoman_settings)}
-		}
-		self.portdb = self.trees[self.root]['porttree'].dbapi
-
-		# Constrain dependency resolution to the master(s)
-		# that are specified in layout.conf.
-		self.repo_config = repoman_repos.get_repo_for_location(self.repodir)
-		self.portdb.porttrees = list(self.repo_config.eclass_db.porttrees)
-		self.portdir = self.portdb.porttrees[0]
-		self.commit_env = os.environ.copy()
-		# list() is for iteration on a copy.
-		for repo in list(repoman_repos):
-			# all paths are canonical
-			if repo.location not in self.repo_config.eclass_db.porttrees:
-				del repoman_repos[repo.name]
-
-		if self.repo_config.allow_provide_virtual:
-			qawarnings.add("virtual.oldstyle")
-
-		if self.repo_config.sign_commit:
-			func = getattr(self, '_vcs_gpg_%s' % vcs_settings.vcs)
-			func()
-
-		# In order to disable manifest signatures, repos may set
-		# "sign-manifests = false" in metadata/layout.conf. This
-		# can be used to prevent merge conflicts like those that
-		# thin-manifests is designed to prevent.
-		self.sign_manifests = "sign" in self.repoman_settings.features and \
-			self.repo_config.sign_manifest
-
-		if self.repo_config.sign_manifest and self.repo_config.name == "gentoo" and \
-			options.mode in ("commit",) and not self.sign_manifests:
-			msg = (
-				"The '%s' repository has manifest signatures enabled, "
-				"but FEATURES=sign is currently disabled. In order to avoid this "
-				"warning, enable FEATURES=sign in make.conf. Alternatively, "
-				"repositories can disable manifest signatures by setting "
-				"'sign-manifests = false' in metadata/layout.conf.") % (
-					self.repo_config.name,)
-			for line in textwrap.wrap(msg, 60):
-				logging.warn(line)
-
-		is_commit = options.mode in ("commit",)
-		valid_gpg_key = self.repoman_settings.get("PORTAGE_GPG_KEY") and re.match(
-			r'^%s$' % GPG_KEY_ID_REGEX, self.repoman_settings["PORTAGE_GPG_KEY"])
-
-		if self.sign_manifests and is_commit and not valid_gpg_key:
-			logging.error(
-				"PORTAGE_GPG_KEY value is invalid: %s" %
-				self.repoman_settings["PORTAGE_GPG_KEY"])
-			sys.exit(1)
-
-		manifest_hashes = self.repo_config.manifest_hashes
-		if manifest_hashes is None:
-			manifest_hashes = portage.const.MANIFEST2_HASH_DEFAULTS
-
-		if options.mode in ("commit", "fix", "manifest"):
-			if portage.const.MANIFEST2_REQUIRED_HASH not in manifest_hashes:
-				msg = (
-					"The 'manifest-hashes' setting in the '%s' repository's "
-					"metadata/layout.conf does not contain the '%s' hash which "
-					"is required by this portage version. You will have to "
-					"upgrade portage if you want to generate valid manifests for "
-					"this repository.") % (
-					self.repo_config.name, portage.const.MANIFEST2_REQUIRED_HASH)
-				for line in textwrap.wrap(msg, 70):
-					logging.error(line)
-				sys.exit(1)
-
-			unsupported_hashes = manifest_hashes.difference(
-				portage.const.MANIFEST2_HASH_FUNCTIONS)
-			if unsupported_hashes:
-				msg = (
-					"The 'manifest-hashes' setting in the '%s' repository's "
-					"metadata/layout.conf contains one or more hash types '%s' "
-					"which are not supported by this portage version. You will "
-					"have to upgrade portage if you want to generate valid "
-					"manifests for this repository.") % (
-					self.repo_config.name, " ".join(sorted(unsupported_hashes)))
-				for line in textwrap.wrap(msg, 70):
-					logging.error(line)
-				sys.exit(1)
-
-	def _add_repo(self, config_root, portdir_overlay):
-			self.repo_conf = portage.repository.config
-			self.repo_name = self.repo_conf.RepoConfig._read_valid_repo_name(
-				portdir_overlay)[0]
-			self.layout_conf_data = self.repo_conf.parse_layout_conf(portdir_overlay)[0]
-			if self.layout_conf_data['repo-name']:
-				self.repo_name = self.layout_conf_data['repo-name']
-			tmp_conf_file = io.StringIO(textwrap.dedent("""
-				[%s]
-				location = %s
-				""") % (self.repo_name, portdir_overlay))
-			# Ensure that the repository corresponding to $PWD overrides a
-			# repository of the same name referenced by the existing PORTDIR
-			# or PORTDIR_OVERLAY settings.
-			self.repoman_settings['PORTDIR_OVERLAY'] = "%s %s" % (
-				self.repoman_settings.get('PORTDIR_OVERLAY', ''),
-				portage._shell_quote(portdir_overlay))
-			self.repositories = self.repo_conf.load_repository_config(
-				self.repoman_settings, extra_files=[tmp_conf_file])
-			# We have to call the config constructor again so that attributes
-			# dependent on config.repositories are initialized correctly.
-			self.repoman_settings = portage.config(
-				config_root=config_root, local_config=False,
-				repositories=self.repositories)
-
-	##########
-	# future vcs plugin functions
-	##########
-
-	def _vcs_gpg_bzr(self):
-		pass
-
-	def _vcs_gpg_cvs(self):
-		pass
-
-	def _vcs_gpg_git(self):
-		# NOTE: It's possible to use --gpg-sign=key_id to specify the key in
-		# the commit arguments. If key_id is unspecified, then it must be
-		# configured by `git config user.signingkey key_id`.
-		self.vcs_settings.vcs_local_opts.append("--gpg-sign")
-		if self.repoman_settings.get("PORTAGE_GPG_DIR"):
-			# Pass GNUPGHOME to git for bug #462362.
-			self.commit_env["GNUPGHOME"] = self.repoman_settings["PORTAGE_GPG_DIR"]
-
-		# Pass GPG_TTY to git for bug #477728.
-		try:
-			self.commit_env["GPG_TTY"] = os.ttyname(sys.stdin.fileno())
-		except OSError:
-			pass
-
-	def _vcs_gpg_hg(self):
-		pass
-
-	def _vcs_gpg_svn(self):
-		pass
-
-
-def list_checks(kwlist, liclist, uselist, repoman_settings):
-	liclist_deprecated = set()
-	if "DEPRECATED" in repoman_settings._license_manager._license_groups:
-		liclist_deprecated.update(
-			repoman_settings._license_manager.expandLicenseTokens(["@DEPRECATED"]))
-
-	if not liclist:
-		logging.fatal("Couldn't find licenses?")
-		sys.exit(1)
-
-	if not kwlist:
-		logging.fatal("Couldn't read KEYWORDS from arch.list")
-		sys.exit(1)
-
-	if not uselist:
-		logging.fatal("Couldn't find use.desc?")
-		sys.exit(1)
-	return liclist_deprecated
-
-
-def repo_metadata(portdb, repoman_settings):
-	# get lists of valid keywords, licenses, and use
-	kwlist = set()
-	liclist = set()
-	uselist = set()
-	profile_list = []
-	global_pmasklines = []
-
-	for path in portdb.porttrees:
-		try:
-			liclist.update(os.listdir(os.path.join(path, "licenses")))
-		except OSError:
-			pass
-		kwlist.update(
-			portage.grabfile(os.path.join(path, "profiles", "arch.list")))
-
-		use_desc = portage.grabfile(os.path.join(path, 'profiles', 'use.desc'))
-		for x in use_desc:
-			x = x.split()
-			if x:
-				uselist.add(x[0])
-
-		expand_desc_dir = os.path.join(path, 'profiles', 'desc')
-		try:
-			expand_list = os.listdir(expand_desc_dir)
-		except OSError:
-			pass
-		else:
-			for fn in expand_list:
-				if not fn[-5:] == '.desc':
-					continue
-				use_prefix = fn[:-5].lower() + '_'
-				for x in portage.grabfile(os.path.join(expand_desc_dir, fn)):
-					x = x.split()
-					if x:
-						uselist.add(use_prefix + x[0])
-
-		global_pmasklines.append(
-			portage.util.grabfile_package(
-				os.path.join(path, 'profiles', 'package.mask'),
-				recursive=1, verify_eapi=True))
-
-		desc_path = os.path.join(path, 'profiles', 'profiles.desc')
-		try:
-			desc_file = io.open(
-				_unicode_encode(
-					desc_path, encoding=_encodings['fs'], errors='strict'),
-				mode='r', encoding=_encodings['repo.content'], errors='replace')
-		except EnvironmentError:
-			pass
-		else:
-			for i, x in enumerate(desc_file):
-				if x[0] == "#":
-					continue
-				arch = x.split()
-				if len(arch) == 0:
-					continue
-				if len(arch) != 3:
-					err(
-						"wrong format: \"%s\" in %s line %d" %
-						(bad(x.strip()), desc_path, i + 1, ))
-				elif arch[0] not in kwlist:
-					err(
-						"invalid arch: \"%s\" in %s line %d" %
-						(bad(arch[0]), desc_path, i + 1, ))
-				elif arch[2] not in valid_profile_types:
-					err(
-						"invalid profile type: \"%s\" in %s line %d" %
-						(bad(arch[2]), desc_path, i + 1, ))
-				profile_desc = ProfileDesc(arch[0], arch[2], arch[1], path)
-				if not os.path.isdir(profile_desc.abs_path):
-					logging.error(
-						"Invalid %s profile (%s) for arch %s in %s line %d",
-						arch[2], arch[1], arch[0], desc_path, i + 1)
-					continue
-				if os.path.exists(
-					os.path.join(profile_desc.abs_path, 'deprecated')):
-					continue
-				profile_list.append(profile_desc)
-			desc_file.close()
-
-	global_pmasklines = portage.util.stack_lists(global_pmasklines, incremental=1)
-	global_pmaskdict = {}
-	for x in global_pmasklines:
-		global_pmaskdict.setdefault(x.cp, []).append(x)
-	del global_pmasklines
-
-	return (
-		kwlist, liclist, uselist, profile_list, global_pmaskdict,
-		list_checks(kwlist, liclist, uselist, repoman_settings))
-
-
-def has_global_mask(pkg, global_pmaskdict):
-	mask_atoms = global_pmaskdict.get(pkg.cp)
-	if mask_atoms:
-		pkg_list = [pkg]
-		for x in mask_atoms:
-			if portage.dep.match_from_list(x, pkg_list):
-				return x
-	return None

diff --git a/pym/tbc/repoman/scan.py b/pym/tbc/repoman/scan.py
deleted file mode 100644
index efa234d..0000000
--- a/pym/tbc/repoman/scan.py
+++ /dev/null
@@ -1,170 +0,0 @@
-
-import logging
-import os
-import sys
-from itertools import chain
-
-from portage import cvstree
-
-from tbc.repoman.errors import caterror
-from tbc.repoman._subprocess import repoman_popen
-
-
-def scan(repolevel, reposplit, startdir, categories, repo_settings):
-	scanlist = []
-	if repolevel == 2:
-		# we are inside a category directory
-		catdir = reposplit[-1]
-		if catdir not in categories:
-			caterror(catdir, repo_settings.repodir)
-		mydirlist = os.listdir(startdir)
-		for x in mydirlist:
-			if x == "CVS" or x.startswith("."):
-				continue
-			if os.path.isdir(startdir + "/" + x):
-				scanlist.append(catdir + "/" + x)
-		# repo_subdir = catdir + os.sep
-	elif repolevel == 1:
-		for x in categories:
-			if not os.path.isdir(startdir + "/" + x):
-				continue
-			for y in os.listdir(startdir + "/" + x):
-				if y == "CVS" or y.startswith("."):
-					continue
-				if os.path.isdir(startdir + "/" + x + "/" + y):
-					scanlist.append(x + "/" + y)
-		# repo_subdir = ""
-	elif repolevel == 3:
-		catdir = reposplit[-2]
-		if catdir not in categories:
-			caterror(catdir, repo_settings.repodir)
-		scanlist.append(catdir + "/" + reposplit[-1])
-		# repo_subdir = scanlist[-1] + os.sep
-	else:
-		msg = 'Repoman is unable to determine PORTDIR or PORTDIR_OVERLAY' + \
-			' from the current working directory'
-		logging.critical(msg)
-		sys.exit(1)
-
-	# repo_subdir_len = len(repo_subdir)
-	scanlist.sort()
-
-	logging.debug(
-		"Found the following packages to scan:\n%s" % '\n'.join(scanlist))
-
-	return scanlist
-
-
-class Changes(object):
-	'''Class object to scan and hold the resultant data
-	for all changes to process.
-
-	Basic plan is move the spaghetti code here, refactor the code
-	to split it into separate functions for each cvs type.
-	Later refactoring can then move the individual scan_ functions
-	to their respective VCS plugin module.
-	Leaving this class as the manager class which runs the correct VCS plugin.
-	This will ease future addition of new VCS types.
-	'''
-
-	def __init__(self, options):
-		self.options = options
-		self._reset()
-
-	def _reset(self):
-		self.new_ebuilds = set()
-		self.ebuilds = set()
-		self.changelogs = set()
-		self.changed = []
-		self.new = []
-		self.removed = []
-
-	def scan(self, vcs_settings):
-		self._reset()
-
-		if vcs_settings.vcs:
-			vcscheck = getattr(self, 'scan_%s' % vcs_settings.vcs)
-			vcscheck()
-
-		if vcs_settings.vcs:
-			self.new_ebuilds.update(x for x in self.new if x.endswith(".ebuild"))
-			self.ebuilds.update(x for x in self.changed if x.endswith(".ebuild"))
-			self.changelogs.update(
-				x for x in chain(self.changed, self.new)
-				if os.path.basename(x) == "ChangeLog")
-
-	def scan_cvs(self):
-		tree = cvstree.getentries("./", recursive=1)
-		self.changed = cvstree.findchanged(tree, recursive=1, basedir="./")
-		self.new = cvstree.findnew(tree, recursive=1, basedir="./")
-		if self.options.if_modified == "y":
-			self.removed = cvstree.findremoved(tree, recursive=1, basedir="./")
-		del tree
-
-	def scan_svn(self):
-		with repoman_popen("svn status") as f:
-			svnstatus = f.readlines()
-		self.changed = [
-			"./" + elem.split()[-1:][0]
-			for elem in svnstatus
-			if elem and elem[:1] in "MR"]
-		self.new = [
-			"./" + elem.split()[-1:][0]
-			for elem in svnstatus
-			if elem.startswith("A")]
-		if self.options.if_modified == "y":
-			self.removed = [
-				"./" + elem.split()[-1:][0]
-				for elem in svnstatus
-				if elem.startswith("D")]
-
-	def scan_git(self):
-		with repoman_popen(
-			"git diff-index --name-only "
-			"--relative --diff-filter=M HEAD") as f:
-			changed = f.readlines()
-		self.changed = ["./" + elem[:-1] for elem in changed]
-		del changed
-
-		with repoman_popen(
-			"git diff-index --name-only "
-			"--relative --diff-filter=A HEAD") as f:
-			new = f.readlines()
-		self.new = ["./" + elem[:-1] for elem in new]
-		if self.options.if_modified == "y":
-			with repoman_popen(
-				"git diff-index --name-only "
-				"--relative --diff-filter=D HEAD") as f:
-				removed = f.readlines()
-			self.removed = ["./" + elem[:-1] for elem in removed]
-			del removed
-
-	def scan_bzr(self):
-		with repoman_popen("bzr status -S .") as f:
-			bzrstatus = f.readlines()
-		self.changed = [
-			"./" + elem.split()[-1:][0].split('/')[-1:][0]
-			for elem in bzrstatus
-			if elem and elem[1:2] == "M"]
-		self.new = [
-			"./" + elem.split()[-1:][0].split('/')[-1:][0]
-			for elem in bzrstatus
-			if elem and (elem[1:2] == "NK" or elem[0:1] == "R")]
-		if self.options.if_modified == "y":
-			self.removed = [
-				"./" + elem.split()[-3:-2][0].split('/')[-1:][0]
-				for elem in bzrstatus
-				if elem and (elem[1:2] == "K" or elem[0:1] == "R")]
-
-	def scan_hg(self):
-		with repoman_popen("hg status --no-status --modified .") as f:
-			changed = f.readlines()
-		self.changed = ["./" + elem.rstrip() for elem in changed]
-		with repoman_popen("hg status --no-status --added .") as f:
-			new = f.readlines()
-		self.new = ["./" + elem.rstrip() for elem in new]
-		if self.options.if_modified == "y":
-			with repoman_popen("hg status --no-status --removed .") as f:
-				removed = f.readlines()
-			self.removed = ["./" + elem.rstrip() for elem in removed]
-		del changed, new, removed

diff --git a/pym/tbc/repoman/utilities.py b/pym/tbc/repoman/utilities.py
deleted file mode 100644
index 2a1f4d9..0000000
--- a/pym/tbc/repoman/utilities.py
+++ /dev/null
@@ -1,595 +0,0 @@
-# repoman: Utilities
-# Copyright 2007-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-"""This module contains utility functions to help repoman find ebuilds to
-scan"""
-
-from __future__ import print_function, unicode_literals
-
-__all__ = [
-	"editor_is_executable",
-	"FindPackagesToScan",
-	"FindPortdir",
-	"get_commit_message_with_editor",
-	"get_commit_message_with_stdin",
-	"get_committer_name",
-	"have_ebuild_dir",
-	"have_profile_dir",
-	"UpdateChangeLog"
-]
-
-import errno
-import io
-from itertools import chain
-import logging
-import pwd
-import stat
-import sys
-import time
-import textwrap
-import difflib
-from tempfile import mkstemp
-
-# import our initialized portage instance
-from repoman._portage import portage
-
-from portage import os
-from portage import shutil
-from portage import _encodings
-from portage import _unicode_decode
-from portage import _unicode_encode
-from portage import util
-from portage.localization import _
-from portage.process import find_binary
-from portage.output import green
-
-from repoman.copyrights import update_copyright, update_copyright_year
-
-
-normalize_path = util.normalize_path
-util.initialize_logger()
-
-if sys.hexversion >= 0x3000000:
-	basestring = str
-
-
-def have_profile_dir(path, maxdepth=3, filename="profiles.desc"):
-	"""
-	Try to figure out if 'path' has a profiles/
-	dir in it by checking for the given filename.
-	"""
-	while path != "/" and maxdepth:
-		if os.path.exists(os.path.join(path, "profiles", filename)):
-			return normalize_path(path)
-		path = normalize_path(path + "/..")
-		maxdepth -= 1
-
-
-def have_ebuild_dir(path, maxdepth=3):
-	"""
-	Try to figure out if 'path' or a subdirectory contains one or more
-	ebuild files named appropriately for their parent directory.
-	"""
-	stack = [(normalize_path(path), 1)]
-	while stack:
-		path, depth = stack.pop()
-		basename = os.path.basename(path)
-		try:
-			listdir = os.listdir(path)
-		except OSError:
-			continue
-		for filename in listdir:
-			abs_filename = os.path.join(path, filename)
-			try:
-				st = os.stat(abs_filename)
-			except OSError:
-				continue
-			if stat.S_ISDIR(st.st_mode):
-				if depth < maxdepth:
-					stack.append((abs_filename, depth + 1))
-			elif stat.S_ISREG(st.st_mode):
-				if filename.endswith(".ebuild") and \
-					filename.startswith(basename + "-"):
-					return os.path.dirname(os.path.dirname(path))
-
-
-def FindPackagesToScan(settings, startdir, reposplit):
-	""" Try to find packages that need to be scanned
-
-	Args:
-		settings - portage.config instance, preferably repoman_settings
-		startdir - directory that repoman was run in
-		reposplit - root of the repository
-	Returns:
-		A list of directories to scan
-	"""
-
-	def AddPackagesInDir(path):
-		""" Given a list of dirs, add any packages in it """
-		ret = []
-		pkgdirs = os.listdir(path)
-		for d in pkgdirs:
-			if d == 'CVS' or d.startswith('.'):
-				continue
-			p = os.path.join(path, d)
-
-			if os.path.isdir(p):
-				cat_pkg_dir = os.path.join(*p.split(os.path.sep)[-2:])
-				logging.debug('adding %s to scanlist' % cat_pkg_dir)
-				ret.append(cat_pkg_dir)
-		return ret
-
-	scanlist = []
-	repolevel = len(reposplit)
-	if repolevel == 1:  # root of the tree, startdir = repodir
-		for cat in settings.categories:
-			path = os.path.join(startdir, cat)
-			if not os.path.isdir(path):
-				continue
-			scanlist.extend(AddPackagesInDir(path))
-	elif repolevel == 2:  # category level, startdir = catdir
-		# We only want 1 segment of the directory,
-		# this is why we use catdir instead of startdir.
-		catdir = reposplit[-2]
-		if catdir not in settings.categories:
-			logging.warn(
-				'%s is not a valid category according to profiles/categories, '
-				'skipping checks in %s' % (catdir, catdir))
-		else:
-			scanlist = AddPackagesInDir(catdir)
-	elif repolevel == 3:  # pkgdir level, startdir = pkgdir
-		catdir = reposplit[-2]
-		pkgdir = reposplit[-1]
-		if catdir not in settings.categories:
-			logging.warn(
-				'%s is not a valid category according to profiles/categories, '
-				'skipping checks in %s' % (catdir, catdir))
-		else:
-			path = os.path.join(catdir, pkgdir)
-			logging.debug('adding %s to scanlist' % path)
-			scanlist.append(path)
-	return scanlist
-
-
-def editor_is_executable(editor):
-	"""
-	Given an EDITOR string, validate that it refers to
-	an executable. This uses shlex_split() to split the
-	first component and do a PATH lookup if necessary.
-
-	@param editor: An EDITOR value from the environment.
-	@type: string
-	@rtype: bool
-	@return: True if an executable is found, False otherwise.
-	"""
-	editor_split = util.shlex_split(editor)
-	if not editor_split:
-		return False
-	filename = editor_split[0]
-	if not os.path.isabs(filename):
-		return find_binary(filename) is not None
-	return os.access(filename, os.X_OK) and os.path.isfile(filename)
-
-
-def get_commit_message_with_editor(editor, message=None, prefix=""):
-	"""
-	Execute editor with a temporary file as it's argument
-	and return the file content afterwards.
-
-	@param editor: An EDITOR value from the environment
-	@type: string
-	@param message: An iterable of lines to show in the editor.
-	@type: iterable
-	@param prefix: Suggested prefix for the commit message summary line.
-	@type: string
-	@rtype: string or None
-	@return: A string on success or None if an error occurs.
-	"""
-	fd, filename = mkstemp()
-	try:
-		os.write(
-			fd, _unicode_encode(_(
-				prefix +
-				"\n\n# Please enter the commit message "
-				"for your changes.\n# (Comment lines starting "
-				"with '#' will not be included)\n"),
-				encoding=_encodings['content'], errors='backslashreplace'))
-		if message:
-			os.write(fd, b"#\n")
-			for line in message:
-				os.write(
-					fd, _unicode_encode(
-						"#" + line, encoding=_encodings['content'],
-						errors='backslashreplace'))
-		os.close(fd)
-		retval = os.system(editor + " '%s'" % filename)
-		if not (os.WIFEXITED(retval) and os.WEXITSTATUS(retval) == os.EX_OK):
-			return None
-		try:
-			with io.open(_unicode_encode(
-				filename, encoding=_encodings['fs'], errors='strict'),
-				mode='r', encoding=_encodings['content'], errors='replace') as f:
-				mylines = f.readlines()
-		except OSError as e:
-			if e.errno != errno.ENOENT:
-				raise
-			del e
-			return None
-		return "".join(line for line in mylines if not line.startswith("#"))
-	finally:
-		try:
-			os.unlink(filename)
-		except OSError:
-			pass
-
-
-def get_commit_message_with_stdin():
-	"""
-	Read a commit message from the user and return it.
-
-	@rtype: string or None
-	@return: A string on success or None if an error occurs.
-	"""
-	print(
-		"Please enter a commit message."
-		" Use Ctrl-d to finish or Ctrl-c to abort.")
-	commitmessage = []
-	while True:
-		commitmessage.append(sys.stdin.readline())
-		if not commitmessage[-1]:
-			break
-	commitmessage = "".join(commitmessage)
-	return commitmessage
-
-
-def FindPortdir(settings):
-	""" Try to figure out what repo we are in and whether we are in a regular
-	tree or an overlay.
-
-	Basic logic is:
-
-	1. Determine what directory we are in (supports symlinks).
-	2. Build a list of directories from / to our current location
-	3. Iterate over PORTDIR_OVERLAY, if we find a match,
-	search for a profiles directory in the overlay.  If it has one,
-	make it portdir, otherwise make it portdir_overlay.
-	4. If we didn't find an overlay in PORTDIR_OVERLAY,
-	see if we are in PORTDIR; if so, set portdir_overlay to PORTDIR.
-	If we aren't in PORTDIR, see if PWD has a profiles dir, if so,
-	set portdir_overlay and portdir to PWD, else make them False.
-	5. If we haven't found portdir_overlay yet,
-	it means the user is doing something odd, report an error.
-	6. If we haven't found a portdir yet, set portdir to PORTDIR.
-
-	Args:
-		settings - portage.config instance, preferably repoman_settings
-	Returns:
-		list(portdir, portdir_overlay, location)
-	"""
-
-	portdir = None
-	portdir_overlay = None
-	location = os.getcwd()
-	pwd = _unicode_decode(os.environ.get('PWD', ''), encoding=_encodings['fs'])
-	if pwd and pwd != location and os.path.realpath(pwd) == location:
-		# getcwd() returns the canonical path but that makes it hard for repoman to
-		# orient itself if the user has symlinks in their portage tree structure.
-		# We use os.environ["PWD"], if available, to get the non-canonical path of
-		# the current working directory (from the shell).
-		location = pwd
-
-	location = normalize_path(location)
-
-	path_ids = {}
-	p = location
-	s = None
-	while True:
-		s = os.stat(p)
-		path_ids[(s.st_dev, s.st_ino)] = p
-		if p == "/":
-			break
-		p = os.path.dirname(p)
-	if location[-1] != "/":
-		location += "/"
-
-	for overlay in portage.util.shlex_split(settings["PORTDIR_OVERLAY"]):
-		overlay = os.path.realpath(overlay)
-		try:
-			s = os.stat(overlay)
-		except OSError:
-			continue
-		overlay = path_ids.get((s.st_dev, s.st_ino))
-		if overlay is None:
-			continue
-		if overlay[-1] != "/":
-			overlay += "/"
-		if True:
-			portdir_overlay = overlay
-			subdir = location[len(overlay):]
-			if subdir and subdir[-1] != "/":
-				subdir += "/"
-			if have_profile_dir(location, subdir.count("/")):
-				portdir = portdir_overlay
-			break
-
-	# Couldn't match location with anything from PORTDIR_OVERLAY,
-	# so fall back to have_profile_dir() checks alone. Assume that
-	# an overlay will contain at least a "repo_name" file while a
-	# master repo (portdir) will contain at least a "profiles.desc"
-	# file.
-	if not portdir_overlay:
-		portdir_overlay = have_profile_dir(location, filename="repo_name")
-		if not portdir_overlay:
-			portdir_overlay = have_ebuild_dir(location)
-		if portdir_overlay:
-			subdir = location[len(portdir_overlay):]
-			if subdir and subdir[-1] != os.sep:
-				subdir += os.sep
-			if have_profile_dir(location, subdir.count(os.sep)):
-				portdir = portdir_overlay
-
-	if not portdir_overlay:
-		if (settings["PORTDIR"] + os.path.sep).startswith(location):
-			portdir_overlay = settings["PORTDIR"]
-		else:
-			portdir_overlay = have_profile_dir(location)
-		portdir = portdir_overlay
-
-	if not portdir_overlay:
-		msg = 'Repoman is unable to determine PORTDIR or PORTDIR_OVERLAY' + \
-			' from the current working directory'
-		logging.critical(msg)
-		return (None, None, None)
-
-	if not portdir:
-		portdir = settings["PORTDIR"]
-
-	if not portdir_overlay.endswith('/'):
-		portdir_overlay += '/'
-
-	if not portdir.endswith('/'):
-		portdir += '/'
-
-	return [normalize_path(x) for x in (portdir, portdir_overlay, location)]
-
-
-def get_committer_name(env=None):
-	"""Generate a committer string like echangelog does."""
-	if env is None:
-		env = os.environ
-	if 'GENTOO_COMMITTER_NAME' in env and 'GENTOO_COMMITTER_EMAIL' in env:
-		user = '%s <%s>' % (
-			env['GENTOO_COMMITTER_NAME'],
-			env['GENTOO_COMMITTER_EMAIL'])
-	elif 'GENTOO_AUTHOR_NAME' in env and 'GENTOO_AUTHOR_EMAIL' in env:
-		user = '%s <%s>' % (
-			env['GENTOO_AUTHOR_NAME'],
-			env['GENTOO_AUTHOR_EMAIL'])
-	elif 'ECHANGELOG_USER' in env:
-		user = env['ECHANGELOG_USER']
-	else:
-		pwd_struct = pwd.getpwuid(os.getuid())
-		gecos = pwd_struct.pw_gecos.split(',')[0]  # bug #80011
-		user = '%s <%s@g.o>' % (gecos, pwd_struct.pw_name)
-	return user
-
-
-def UpdateChangeLog(
-	pkgdir, user, msg, skel_path, category, package,
-	new=(), removed=(), changed=(), pretend=False, quiet=False):
-	"""
-	Write an entry to an existing ChangeLog, or create a new one.
-	Updates copyright year on changed files, and updates the header of
-	ChangeLog with the contents of skel.ChangeLog.
-	"""
-
-	if '<root@' in user:
-		if not quiet:
-			logging.critical('Please set ECHANGELOG_USER or run as non-root')
-		return None
-
-	# ChangeLog times are in UTC
-	gmtime = time.gmtime()
-	year = time.strftime('%Y', gmtime)
-	date = time.strftime('%d %b %Y', gmtime)
-
-	# check modified files and the ChangeLog for copyright updates
-	# patches and diffs (identified by .patch and .diff) are excluded
-	for fn in chain(new, changed):
-		if fn.endswith('.diff') or fn.endswith('.patch'):
-			continue
-		update_copyright(os.path.join(pkgdir, fn), year, pretend=pretend)
-
-	cl_path = os.path.join(pkgdir, 'ChangeLog')
-	clold_lines = []
-	clnew_lines = []
-	old_header_lines = []
-	header_lines = []
-
-	clold_file = None
-	try:
-		clold_file = io.open(_unicode_encode(
-			cl_path, encoding=_encodings['fs'], errors='strict'),
-			mode='r', encoding=_encodings['repo.content'], errors='replace')
-	except EnvironmentError:
-		pass
-
-	f, clnew_path = mkstemp()
-
-	# construct correct header first
-	try:
-		if clold_file is not None:
-			# retain header from old ChangeLog
-			first_line = True
-			for line in clold_file:
-				line_strip = line.strip()
-				if line_strip and line[:1] != "#":
-					clold_lines.append(line)
-					break
-				# always make sure cat/pkg is up-to-date in case we are
-				# moving packages around, or copied from another pkg, or ...
-				if first_line:
-					if line.startswith('# ChangeLog for'):
-						line = '# ChangeLog for %s/%s\n' % (category, package)
-					first_line = False
-				old_header_lines.append(line)
-				header_lines.append(update_copyright_year(year, line))
-				if not line_strip:
-					break
-
-		clskel_file = None
-		if not header_lines:
-			# delay opening this until we find we need a header
-			try:
-				clskel_file = io.open(_unicode_encode(
-					skel_path, encoding=_encodings['fs'], errors='strict'),
-					mode='r', encoding=_encodings['repo.content'],
-					errors='replace')
-			except EnvironmentError:
-				pass
-
-		if clskel_file is not None:
-			# read skel.ChangeLog up to first empty line
-			for line in clskel_file:
-				line_strip = line.strip()
-				if not line_strip:
-					break
-				line = line.replace('<CATEGORY>', category)
-				line = line.replace('<PACKAGE_NAME>', package)
-				line = update_copyright_year(year, line)
-				header_lines.append(line)
-			header_lines.append('\n')
-			clskel_file.close()
-
-		# write new ChangeLog entry
-		clnew_lines.extend(header_lines)
-		newebuild = False
-		for fn in new:
-			if not fn.endswith('.ebuild'):
-				continue
-			ebuild = fn.split(os.sep)[-1][0:-7]
-			clnew_lines.append('*%s (%s)\n' % (ebuild, date))
-			newebuild = True
-		if newebuild:
-			clnew_lines.append('\n')
-		trivial_files = ('ChangeLog', 'Manifest')
-		display_new = [
-			'+' + elem
-			for elem in new
-			if elem not in trivial_files]
-		display_removed = [
-			'-' + elem
-			for elem in removed]
-		display_changed = [
-			elem for elem in changed
-			if elem not in trivial_files]
-		if not (display_new or display_removed or display_changed):
-			# If there's nothing else to display, show one of the
-			# trivial files.
-			for fn in trivial_files:
-				if fn in new:
-					display_new = ['+' + fn]
-					break
-				elif fn in changed:
-					display_changed = [fn]
-					break
-
-		display_new.sort()
-		display_removed.sort()
-		display_changed.sort()
-
-		mesg = '%s; %s %s:' % (date, user, ', '.join(chain(
-			display_new, display_removed, display_changed)))
-		for line in textwrap.wrap(
-			mesg, 80, initial_indent='  ', subsequent_indent='  ',
-			break_on_hyphens=False):
-			clnew_lines.append('%s\n' % line)
-		for line in textwrap.wrap(
-			msg, 80, initial_indent='  ', subsequent_indent='  '):
-			clnew_lines.append('%s\n' % line)
-		# Don't append a trailing newline if the file is new.
-		if clold_file is not None:
-			clnew_lines.append('\n')
-
-		f = io.open(
-			f, mode='w', encoding=_encodings['repo.content'],
-			errors='backslashreplace')
-
-		for line in clnew_lines:
-			f.write(line)
-
-		# append stuff from old ChangeLog
-		if clold_file is not None:
-
-			if clold_lines:
-				# clold_lines may contain a saved non-header line
-				# that we want to write first.
-				# Also, append this line to clnew_lines so that the
-				# unified_diff call doesn't show it as removed.
-				for line in clold_lines:
-					f.write(line)
-					clnew_lines.append(line)
-
-			else:
-				# ensure that there is no more than one blank
-				# line after our new entry
-				for line in clold_file:
-					if line.strip():
-						f.write(line)
-						break
-
-			# Now prepend old_header_lines to clold_lines, for use
-			# in the unified_diff call below.
-			clold_lines = old_header_lines + clold_lines
-
-			# Trim any trailing newlines.
-			lines = clold_file.readlines()
-			clold_file.close()
-			while lines and lines[-1] == '\n':
-				del lines[-1]
-			f.writelines(lines)
-		f.close()
-
-		# show diff
-		if not quiet:
-			for line in difflib.unified_diff(
-				clold_lines, clnew_lines,
-				fromfile=cl_path, tofile=cl_path, n=0):
-				util.writemsg_stdout(line, noiselevel=-1)
-			util.writemsg_stdout("\n", noiselevel=-1)
-
-		if pretend:
-			# remove what we've done
-			os.remove(clnew_path)
-		else:
-			# rename to ChangeLog, and set permissions
-			try:
-				clold_stat = os.stat(cl_path)
-			except OSError:
-				clold_stat = None
-
-			shutil.move(clnew_path, cl_path)
-
-			if clold_stat is None:
-				util.apply_permissions(cl_path, mode=0o644)
-			else:
-				util.apply_stat_permissions(cl_path, clold_stat)
-
-		if clold_file is None:
-			return True
-		else:
-			return False
-	except IOError as e:
-		err = 'Repoman is unable to create/write to Changelog.new file: %s' % (e,)
-		logging.critical(err)
-		# try to remove if possible
-		try:
-			os.remove(clnew_path)
-		except OSError:
-			pass
-		return None
-
-
-def repoman_sez(msg):
-	print (green("RepoMan sez:"), msg)

diff --git a/pym/tbc/repoman/vcs/__init__.py b/pym/tbc/repoman/vcs/__init__.py
deleted file mode 100644
index e69de29..0000000

diff --git a/pym/tbc/repoman/vcs/vcs.py b/pym/tbc/repoman/vcs/vcs.py
deleted file mode 100644
index 3f7cbb5..0000000
--- a/pym/tbc/repoman/vcs/vcs.py
+++ /dev/null
@@ -1,274 +0,0 @@
-
-import collections
-import logging
-import re
-import subprocess
-import sys
-from itertools import chain
-
-from portage import os
-from portage.const import BASH_BINARY
-from portage.output import red, green
-from portage import _unicode_encode, _unicode_decode
-
-from tbc.repoman._subprocess import repoman_getstatusoutput
-
-
-_vcs_type = collections.namedtuple('_vcs_type', 'name dir_name')
-
-_FindVCS_data = (
-	_vcs_type(
-		name='git',
-		dir_name='.git'
-	),
-	_vcs_type(
-		name='bzr',
-		dir_name='.bzr'
-	),
-	_vcs_type(
-		name='hg',
-		dir_name='.hg'
-	),
-	_vcs_type(
-		name='svn',
-		dir_name='.svn'
-	)
-)
-
-
-def FindVCS():
-	""" Try to figure out in what VCS' working tree we are. """
-
-	outvcs = []
-
-	def seek(depth=None):
-		""" Seek for VCSes that have a top-level data directory only. """
-		retvcs = []
-		pathprep = ''
-
-		while depth is None or depth > 0:
-			for vcs_type in _FindVCS_data:
-				vcs_dir = os.path.join(pathprep, vcs_type.dir_name)
-				if os.path.isdir(vcs_dir):
-					logging.debug(
-						'FindVCS: found %(name)s dir: %(vcs_dir)s' % {
-							'name': vcs_type.name,
-							'vcs_dir': os.path.abspath(vcs_dir)})
-					retvcs.append(vcs_type.name)
-
-			if retvcs:
-				break
-			pathprep = os.path.join(pathprep, '..')
-			if os.path.realpath(pathprep).strip('/') == '':
-				break
-			if depth is not None:
-				depth = depth - 1
-
-		return retvcs
-
-	# Level zero VCS-es.
-	if os.path.isdir('CVS'):
-		outvcs.append('cvs')
-	if os.path.isdir('.svn'):  # <1.7
-		outvcs.append('svn')
-
-	# If we already found one of 'level zeros', just take a quick look
-	# at the current directory. Otherwise, seek parents till we get
-	# something or reach root.
-	if outvcs:
-		outvcs.extend(seek(1))
-	else:
-		outvcs = seek()
-
-	if len(outvcs) > 1:
-		# eliminate duplicates, like for svn in bug #391199
-		outvcs = list(set(outvcs))
-
-	return outvcs
-
-
-def vcs_files_to_cps(vcs_file_iter, repolevel, reposplit, categories):
-	"""
-	Iterate over the given modified file paths returned from the vcs,
-	and return a frozenset containing category/pn strings for each
-	modified package.
-	"""
-
-	modified_cps = []
-
-	if repolevel == 3:
-		if reposplit[-2] in categories and \
-			next(vcs_file_iter, None) is not None:
-			modified_cps.append("/".join(reposplit[-2:]))
-
-	elif repolevel == 2:
-		category = reposplit[-1]
-		if category in categories:
-			for filename in vcs_file_iter:
-				f_split = filename.split(os.sep)
-				# ['.', pn, ...]
-				if len(f_split) > 2:
-					modified_cps.append(category + "/" + f_split[1])
-
-	else:
-		# repolevel == 1
-		for filename in vcs_file_iter:
-			f_split = filename.split(os.sep)
-			# ['.', category, pn, ...]
-			if len(f_split) > 3 and f_split[1] in categories:
-				modified_cps.append("/".join(f_split[1:3]))
-
-	return frozenset(modified_cps)
-
-
-def vcs_new_changed(relative_path, mychanged, mynew):
-	for x in chain(mychanged, mynew):
-		if x == relative_path:
-			return True
-	return False
-
-
-def git_supports_gpg_sign():
-	status, cmd_output = \
-		repoman_getstatusoutput("git --version")
-	cmd_output = cmd_output.split()
-	if cmd_output:
-		version = re.match(r'^(\d+)\.(\d+)\.(\d+)', cmd_output[-1])
-		if version is not None:
-			version = [int(x) for x in version.groups()]
-			if version[0] > 1 or \
-				(version[0] == 1 and version[1] > 7) or \
-				(version[0] == 1 and version[1] == 7 and version[2] >= 9):
-				return True
-	return False
-
-
-def detect_vcs_conflicts(options, vcs):
-	"""Determine if the checkout has problems like cvs conflicts.
-
-	If you want more vcs support here just keep adding if blocks...
-	This could be better.
-
-	TODO(antarus): Also this should probably not call sys.exit() as
-	repoman is run on >1 packages and one failure should not cause
-	subsequent packages to fail.
-
-	Args:
-		vcs - A string identifying the version control system in use
-	Returns:
-		None (calls sys.exit on fatal problems)
-	"""
-
-	cmd = None
-	if vcs == 'cvs':
-		logging.info(
-			"Performing a %s with a little magic grep to check for updates." %
-			green("cvs -n up"))
-		cmd = (
-			"cvs -n up 2>/dev/null | "
-			"egrep '^[^\?] .*' | "
-			"egrep -v '^. .*/digest-[^/]+|^cvs server: .* -- ignored$'")
-	if vcs == 'svn':
-		logging.info(
-			"Performing a %s with a little magic grep to check for updates." %
-			green("svn status -u"))
-		cmd = (
-			"svn status -u 2>&1 | "
-			"egrep -v '^.  +.*/digest-[^/]+' | "
-			"head -n-1")
-
-	if cmd is not None:
-		# Use Popen instead of getstatusoutput(), in order to avoid
-		# unicode handling problems (see bug #310789).
-		args = [BASH_BINARY, "-c", cmd]
-		args = [_unicode_encode(x) for x in args]
-		proc = subprocess.Popen(
-			args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-		out = _unicode_decode(proc.communicate()[0])
-		proc.wait()
-		mylines = out.splitlines()
-		myupdates = []
-		for line in mylines:
-			if not line:
-				continue
-
-			# [ ] Unmodified (SVN)	[U] Updates		[P] Patches
-			# [M] Modified			[A] Added		[R] Removed / Replaced
-			# [D] Deleted
-			if line[0] not in " UPMARD":
-				# Stray Manifest is fine, we will readd it anyway.
-				if line[0] == '?' and line[1:].lstrip() == 'Manifest':
-					continue
-				logging.error(red(
-					"!!! Please fix the following issues reported "
-					"from cvs: %s" % green("(U,P,M,A,R,D are ok)")))
-				logging.error(red(
-					"!!! Note: This is a pretend/no-modify pass..."))
-				logging.error(out)
-				sys.exit(1)
-			elif vcs == 'cvs' and line[0] in "UP":
-				myupdates.append(line[2:])
-			elif vcs == 'svn' and line[8] == '*':
-				myupdates.append(line[9:].lstrip(" 1234567890"))
-
-		if myupdates:
-			logging.info(green("Fetching trivial updates..."))
-			if options.pretend:
-				logging.info("(" + vcs + " update " + " ".join(myupdates) + ")")
-				retval = os.EX_OK
-			else:
-				retval = os.system(vcs + " update " + " ".join(myupdates))
-			if retval != os.EX_OK:
-				logging.fatal("!!! " + vcs + " exited with an error. Terminating.")
-				sys.exit(retval)
-
-
-class VCSSettings(object):
-	'''Holds various VCS settings'''
-
-	def __init__(self, options=None, repoman_settings=None):
-		if options.vcs:
-			if options.vcs in ('cvs', 'svn', 'git', 'bzr', 'hg'):
-				self.vcs = options.vcs
-			else:
-				self.vcs = None
-		else:
-			vcses = FindVCS()
-			if len(vcses) > 1:
-				print(red(
-					'*** Ambiguous workdir -- more than one VCS found'
-					' at the same depth: %s.' % ', '.join(vcses)))
-				print(red(
-					'*** Please either clean up your workdir'
-					' or specify --vcs option.'))
-				sys.exit(1)
-			elif vcses:
-				self.vcs = vcses[0]
-			else:
-				self.vcs = None
-
-		if options.if_modified == "y" and self.vcs is None:
-			logging.info(
-				"Not in a version controlled repository; "
-				"disabling --if-modified.")
-			options.if_modified = "n"
-
-		# Disable copyright/mtime check if vcs does not preserve mtime (bug #324075).
-		self.vcs_preserves_mtime = self.vcs in ('cvs',)
-
-		self.vcs_local_opts = repoman_settings.get(
-			"REPOMAN_VCS_LOCAL_OPTS", "").split()
-		self.vcs_global_opts = repoman_settings.get(
-			"REPOMAN_VCS_GLOBAL_OPTS")
-		if self.vcs_global_opts is None:
-			if self.vcs in ('cvs', 'svn'):
-				self.vcs_global_opts = "-q"
-			else:
-				self.vcs_global_opts = ""
-		self.vcs_global_opts = self.vcs_global_opts.split()
-
-		if options.mode == 'commit' and not options.pretend and not self.vcs:
-			logging.info(
-				"Not in a version controlled repository; "
-				"enabling pretend mode.")
-			options.pretend = True

diff --git a/pym/tbc/repoman/vcs/vcsstatus.py b/pym/tbc/repoman/vcs/vcsstatus.py
deleted file mode 100644
index 13f2e83..0000000
--- a/pym/tbc/repoman/vcs/vcsstatus.py
+++ /dev/null
@@ -1,113 +0,0 @@
-
-
-# import our initialized portage instance
-from tbc.repoman._portage import portage
-
-from portage import os
-
-from tbc.repoman._subprocess import repoman_popen
-
-
-class VCSStatus(object):
-	'''Determines the status of the vcs repositories
-	to determine if files are not added'''
-
-	def __init__(self, vcs_settings, qatracker):
-		self.vcs_settings = vcs_settings
-		self.vcs = vcs_settings.vcs
-		self.eadded = []
-		self.qatracker = qatracker
-
-	def check(self, check_not_added, checkdir, checkdir_relative, xpkg):
-		if self.vcs and check_not_added:
-			vcscheck = getattr(self, 'check_%s' % self.vcs)
-			vcscheck(checkdir, checkdir_relative, xpkg)
-
-	def post_git_hg(self, myf, xpkg):
-			for l in myf:
-				if l[:-1][-7:] == ".ebuild":
-					self.qatracker.add_error(
-						"ebuild.notadded",
-						os.path.join(xpkg, os.path.basename(l[:-1])))
-			myf.close()
-
-	def check_git(self, checkdir, checkdir_relative, xpkg):
-		myf = repoman_popen(
-			"git ls-files --others %s" %
-			(portage._shell_quote(checkdir_relative),))
-		self.post_git_hg(myf, xpkg)
-
-	def check_hg(self, checkdir, checkdir_relative, xpkg):
-		myf = repoman_popen(
-			"hg status --no-status --unknown %s" %
-			(portage._shell_quote(checkdir_relative),))
-		self.post_git_hg(myf, xpkg)
-
-	def check_cvs(self, checkdir, checkdir_relative, xpkg):
-			try:
-				myf = open(checkdir + "/CVS/Entries", "r")
-				myl = myf.readlines()
-				myf.close()
-			except IOError:
-				self.qatracker.add_error(
-					"CVS/Entries.IO_error", checkdir + "/CVS/Entries")
-				return True
-			for l in myl:
-				if l[0] != "/":
-					continue
-				splitl = l[1:].split("/")
-				if not len(splitl):
-					continue
-				if splitl[0][-7:] == ".ebuild":
-					self.eadded.append(splitl[0][:-7])
-			return True
-
-	def check_svn(self, checkdir, checkdir_relative, xpkg):
-		try:
-			myf = repoman_popen(
-				"svn status --depth=files --verbose " +
-				portage._shell_quote(self.checkdir))
-			myl = myf.readlines()
-			myf.close()
-		except IOError:
-			raise
-		for l in myl:
-			if l[:1] == "?":
-				continue
-			if l[:7] == '      >':
-				# tree conflict, new in subversion 1.6
-				continue
-			l = l.split()[-1]
-			if l[-7:] == ".ebuild":
-				self.eadded.append(os.path.basename(l[:-7]))
-		try:
-			myf = repoman_popen(
-				"svn status " +
-				portage._shell_quote(checkdir))
-			myl = myf.readlines()
-			myf.close()
-		except IOError:
-			raise
-		for l in myl:
-			if l[0] == "A":
-				l = l.rstrip().split(' ')[-1]
-				if l[-7:] == ".ebuild":
-					self.eadded.append(os.path.basename(l[:-7]))
-		return True
-
-	def check_bzr(self, checkdir, checkdir_relative, xpkg):
-		try:
-			myf = repoman_popen(
-				"bzr ls -v --kind=file " +
-				portage._shell_quote(checkdir))
-			myl = myf.readlines()
-			myf.close()
-		except IOError:
-			raise
-		for l in myl:
-			if l[1:2] == "?":
-				continue
-			l = l.split()[-1]
-			if l[-7:] == ".ebuild":
-				self.eadded.append(os.path.basename(l[:-7]))
-		return True