From e7373bf602b036b5a31eafade52fe10ae2d9409d Mon Sep 17 00:00:00 2001
From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 5 Jan 2008 22:34:14 +0000
Subject: [PATCH]    Merged from trunk 9143:9147

   | 9144      | per bug 204468, remove old check from repoman (all ebuilds |
   | WarnerBro | in gentoo-x86 are migrated).                               |

   | 9145      | Filter PATH along with FEATURES when loading               |
   | zmedico   | environment.bz2.                                           |

   | 9147      | Make filter_readonly_variables() filter PATH in any case   |
   | zmedico   | since we never want to save of reload it.                  |

svn path=/main/branches/prefix/; revision=9150
---
 bin/ebuild.sh             |  2 +-
 bin/isolated-functions.sh |  2 +-
 bin/repoman               | 26 --------------------------
 3 files changed, 2 insertions(+), 28 deletions(-)

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index ee16b8e48..f6928fccd 100755
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -1429,7 +1429,7 @@ filter_readonly_variables() {
 		SANDBOX_DEBUG_LOG SANDBOX_DISABLED SANDBOX_LIB
 		SANDBOX_LOG SANDBOX_ON"
 	filtered_vars="${readonly_bash_vars} ${READONLY_PORTAGE_VARS}
-		BASH_[_[:alnum:]]*"
+		BASH_[_[:alnum:]]* PATH"
 	if hasq --filter-sandbox $* ; then
 		filtered_vars="${filtered_vars} SANDBOX_[_[:alnum:]]*"
 	else
diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh
index 73619ae85..c6f53bc17 100755
--- a/bin/isolated-functions.sh
+++ b/bin/isolated-functions.sh
@@ -468,7 +468,7 @@ save_ebuild_env() {
 			ECLASSDIR ECLASS_DEPTH ENDCOL FAKEROOTKEY \
 			GOOD HILITE HOME IMAGE \
 			LAST_E_CMD LAST_E_LEN LD_PRELOAD MISC_FUNCTIONS_ARGS MOPREFIX \
-			NORMAL PATH PKGDIR PKGUSE PKG_LOGDIR PKG_TMPDIR \
+			NORMAL PKGDIR PKGUSE PKG_LOGDIR PKG_TMPDIR \
 			PORTAGE_ACTUAL_DISTDIR PORTAGE_ARCHLIST PORTAGE_BASHRC \
 			PORTAGE_BINPKG_TMPFILE PORTAGE_BUILDDIR \
 			PORTAGE_COLORMAP PORTAGE_CONFIGROOT PORTAGE_DEBUG \
diff --git a/bin/repoman b/bin/repoman
index 6dd8ec2f2..a0a0322b4 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -862,27 +862,6 @@ else:
 	#this can be problematic if xmllint changes their output
 	xmllint_capable=True
 
-
-def x11_deprecation_check(depstr):
-	if depstr.find("virtual/x11") == -1:
-		return False
-	depsplit = depstr.split()
-	ok_stack = []
-	ok = False
-	for token in depsplit:
-		if token == "(":
-			ok_stack.append(ok)
-			ok = False
-		elif token == ")":
-			ok = ok_stack.pop()
-		elif token == "||":
-			ok = True
-		else:
-			ok = False
-			if token.find("virtual/x11") != -1 and (not ok_stack or not ok_stack[-1]):
-				return True
-	return False
-
 if options.mode == 'commit':
 	retval = ("","")
 	if isCvs:
@@ -1507,11 +1486,6 @@ for x in scanlist:
 		badlicsyntax = badlicsyntax > 0
 		badprovsyntax = badprovsyntax > 0
 
-		if not baddepsyntax:
-			if x11_deprecation_check(" ".join([myaux["DEPEND"], myaux["RDEPEND"], myaux["PDEPEND"]])):
-				stats["usage.obsolete"] += 1
-				fails["usage.obsolete"].append("%s/%s.ebuild: not migrated to modular X" % (x, y))
-
 		# uselist checks - global
 		myuse = []
 		default_use = []
-- 
2.26.2