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

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index ee16b8e485466c9ef121bff2eeb344f9f2d16f2d..f6928fccd39034b86e17d617eb2f4edbba15c08a 100755 (executable)
--- 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 73619ae85a88aab1cefbfd7bd762ed18faf48083..c6f53bc17badcd79c4ee38f8687f6a74e4bd3c57 100755 (executable)
--- 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 6dd8ec2f27cb395e29c8774494f20ddfd1bc62e1..a0a0322b48166bbfd366d99b43461593ac631859 100755 (executable)
--- 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 = []