From: Fabian Groffen <grobian@gentoo.org>
Date: Mon, 17 Oct 2011 18:33:56 +0000 (+0200)
Subject: Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d9f449ca690417b6268ce1e3ef16e5c3f0e01a6f;p=portage.git

Merge remote-tracking branch 'overlays-gentoo-org/master' into prefix
---

d9f449ca690417b6268ce1e3ef16e5c3f0e01a6f
diff --cc bin/repoman
index 1f4175bd8,ad1e68830..56b2b7ae7
--- a/bin/repoman
+++ b/bin/repoman
@@@ -75,10 -73,9 +75,10 @@@ from portage.process import find_binary
  from portage.output import bold, create_color_func, \
  	green, nocolor, red
  from portage.output import ConsoleStyleFile, StyleWriter
- from portage.util import cmp_sort_key, writemsg_level, writemsg_stdout
+ from portage.util import cmp_sort_key, writemsg_level
  from portage.package.ebuild.digestgen import digestgen
  from portage.eapi import eapi_has_iuse_defaults, eapi_has_required_use
 +from portage.const import EPREFIX
  
  if sys.hexversion >= 0x3000000:
  	basestring = str