From 2431cece6ac4411d278531d2e3380dc60f5071e6 Mon Sep 17 00:00:00 2001
From: Fabian Groffen <grobian@gentoo.org>
Date: Tue, 23 Mar 2010 07:23:38 +0000
Subject: [PATCH]    Merged from trunk -r15835:15840
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

   | 15839   | Bug #309149 - Unify look of eend used in bash & python code, |
   | zmedico | additionally fixing few inconsistences in bash code. Thanks  |
   |         | to Michał Górny <gentoo@mgorny.alt.pl> for this patch.     |

   | 15840   | Show masking reasons for --binpkg-respect-use. Thanks to     |
   | zmedico | Sebastian Luther (few) for this patch.                       |

svn path=/main/branches/prefix/; revision=15841
---
 bin/isolated-functions.sh | 11 ++++-------
 pym/_emerge/depgraph.py   |  2 ++
 pym/portage/output.py     |  7 ++-----
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index b268269fe..d951c74b7 100755
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -328,10 +328,10 @@ _eend() {
 	fi
 
 	if [[ ${RC_ENDCOL} == "yes" ]] ; then
-		echo -e "${ENDCOL}  ${msg}"
+		echo -e "${ENDCOL} ${msg}"
 	else
 		[[ ${LAST_E_CMD} == ebegin ]] || LAST_E_LEN=0
-		printf "%$(( COLS - LAST_E_LEN - 6 ))s%b\n" '' "${msg}"
+		printf "%$(( COLS - LAST_E_LEN - 7 ))s%b\n" '' "${msg}"
 	fi
 
 	return ${retval}
@@ -399,7 +399,7 @@ get_KV() {
 }
 
 unset_colors() {
-	COLS="25 80"
+	COLS=80
 	ENDCOL=
 
 	GOOD=
@@ -414,13 +414,10 @@ set_colors() {
 	COLS=${COLUMNS:-0}      # bash's internal COLUMNS variable
 	(( COLS == 0 )) && COLS=$(set -- $(stty size 2>/dev/null) ; echo $2)
 	(( COLS > 0 )) || (( COLS = 80 ))
-	COLS=$((${COLS} - 8))	# width of [ ok ] == 7
-	# Adjust COLS so that eend works properly on a standard BSD console.
-	[[ $TERM = cons25 || $TERM = dumb ]] && ((COLS--))
 
 	# Now, ${ENDCOL} will move us to the end of the
 	# column;  irregardless of character width
-	ENDCOL=$'\e[A\e['${COLS}'C'
+	ENDCOL=$'\e[A\e['$(( COLS - 8 ))'C'
 	if [ -n "${PORTAGE_COLORMAP}" ] ; then
 		eval ${PORTAGE_COLORMAP}
 	else
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index 366aa3cb8..743d38bc7 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -2180,6 +2180,8 @@ class depgraph(object):
 						missing_use.append(pkg)
 						if not mreasons:
 							continue
+					if pkg.built and not mreasons:
+						mreasons = ["use flag configuration mismatch"]
 				masked_packages.append(
 					(root_config, pkgsettings, cpv, metadata, mreasons))
 
diff --git a/pym/portage/output.py b/pym/portage/output.py
index 407238c16..1b1edbb16 100644
--- a/pym/portage/output.py
+++ b/pym/portage/output.py
@@ -487,9 +487,6 @@ class EOutput(object):
 		lines, columns = get_term_size()
 		if columns <= 0:
 			columns = 80
-		# Adjust columns so that eend works properly on a standard BSD console.
-		if os.environ.get("TERM") in ("cons25", "dumb"):
-			columns = columns - 1
 		self.term_columns = columns
 		sys.stdout.flush()
 		sys.stderr.flush()
@@ -518,7 +515,7 @@ class EOutput(object):
 		if not self.quiet:
 			out = sys.stdout
 			self._write(out,
-				"%*s%s\n" % ((self.term_columns - self.__last_e_len - 6),
+				"%*s%s\n" % ((self.term_columns - self.__last_e_len - 7),
 				"", status_brackets))
 
 	def ebegin(self, msg):
@@ -532,7 +529,7 @@ class EOutput(object):
 		msg += " ..."
 		if not self.quiet:
 			self.einfon(msg)
-		self.__last_e_len = len(msg) + 4
+		self.__last_e_len = len(msg) + 3
 		self.__last_e_cmd = "ebegin"
 
 	def eend(self, errno, *msg):
-- 
2.26.2