Update Portage to support fixing *.la and *.pc files.

pym/portage/dbapi/vartree.py

 # Copyright 1998-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 __all__ = [
         "vardbapi", "vartree", "dblink"] + \
         ["write_contents", "tar_contents"]
 
 import portage
 portage.proxy.lazyimport.lazyimport(globals(),
         'portage.checksum:_perform_md5_merge@perform_md5',
@@ skipping 40 matching lines @@
 from portage import _selinux_merge
 from portage import _unicode_decode
 from portage import _unicode_encode
 
 from _emerge.AsynchronousLock import AsynchronousLock
 from _emerge.EbuildBuildDir import EbuildBuildDir
 from _emerge.PollScheduler import PollScheduler
 from _emerge.MiscFunctionsProcess import MiscFunctionsProcess
 
 import codecs
+import fileinput
 import gc
 import re, shutil, stat, errno, subprocess
 import logging
 import os as _os
 import stat
 import sys
 import tempfile
 import time
 import warnings
 
@@ skipping 1623 matching lines @@
                 if log_path is not None and os.path.exists(log_path):
                         # Restore this since it gets lost somewhere above and it
                         # needs to be set for _display_merge() to be able to log.
                         # Note that the log isn't necessarily supposed to exist
                         # since if PORT_LOGDIR is unset then it's a temp file
                         # so it gets cleaned above.
                         self.settings["PORTAGE_LOG_FILE"] = log_path
                 else:
                         self.settings.pop("PORTAGE_LOG_FILE", None)
 
-                env_update(target_root=self.settings['ROOT'],
-                        prev_mtimes=ldpath_mtimes,
-                        contents=contents, env=self.settings.environ(),
-                        writemsg_level=self._display_merge)
+                if 'no-env-update' not in self.settings.features:
+                        env_update(target_root=self.settings['ROOT'],
+                                prev_mtimes=ldpath_mtimes,
+                                contents=contents, env=self.settings.environ(),
+                                writemsg_level=self._display_merge)
                 return os.EX_OK
 
         def _display_merge(self, msg, level=0, noiselevel=0):
                 if not self._verbose and noiselevel >= 0 and level < logging.WARN:
                         return
                 if self._scheduler is not None:
                         self._scheduler.dblinkDisplayMerge(self, msg,
                                 level=level, noiselevel=noiselevel)
                         return
                 writemsg_level(msg, level=level, noiselevel=noiselevel)
@@ skipping 1652 matching lines @@
                                         self, mydbapi, myebuild, "postinst")
                 finally:
                         self.settings.pop("PORTAGE_UPDATE_ENV", None)
 
                 if a != os.EX_OK:
                         # It's stupid to bail out here, so keep going regardless of
                         # phase return code.
                         showMessage(_("!!! FAILED postinst: ")+str(a)+"\n",
                                 level=logging.ERROR, noiselevel=-1)
 
-                downgrade = False
-                for v in otherversions:
-                        if pkgcmp(catpkgsplit(self.pkg)[1:], catpkgsplit(v)[1:]) < 0:
-                                downgrade = True
+                if 'no-env-update' not in self.settings.features:
+                        downgrade = False
+                        for v in otherversions:
+                                if pkgcmp(catpkgsplit(self.pkg)[1:], catpkgsplit(v)[1:]) < 0:
+                                        downgrade = True
 
-                #update environment settings, library paths. DO NOT change symlinks.
-                env_update(makelinks=(not downgrade),
-                        target_root=self.settings['ROOT'], prev_mtimes=prev_mtimes,
-                        contents=contents, env=self.settings.environ(),
-                        writemsg_level=self._display_merge)
+                        #update environment settings, library paths. DO NOT change symlinks.
+                        env_update(makelinks=(not downgrade),
+                                target_root=self.settings['ROOT'], prev_mtimes=prev_mtimes,
+                                contents=contents, env=self.settings.environ(),
+                                writemsg_level=self._display_merge)
+
+                # Fix *.{la,pc} files to point to libs in target_root, if they
+                # don't do so already.
+                re_root = self.settings["ROOT"].strip("/")
+                if re_root:
+                        fix_files = []
+                        for path in contents:
+                                if path.endswith(".la") or path.endswith(".pc"):
+                                        if os.path.exists(path): fix_files.append(path)
+                        if fix_files:
+                                pat = re.compile(r"([' =](?:-[IL])?/)(usr|lib|opt)")
+                                for line in fileinput.input(fix_files, inplace=1):
+                                        sys.stdout.write(pat.sub(r"\1%s/\2" % re_root, line))
 
                 # For gcc upgrades, preserved libs have to be removed after the
                 # the library path has been updated.
                 self._linkmap_rebuild()
                 cpv_lib_map = self._find_unused_preserved_libs()
                 if cpv_lib_map:
                         self._remove_preserved_libs(cpv_lib_map)
                         for cpv, removed in cpv_lib_map.items():
                                 if not self.vartree.dbapi.cpv_exists(cpv):
                                         continue
@@ skipping 743 matching lines @@
                                         encoding=object.__getattribute__(os, '_encoding'),
                                         errors='strict'), 'rb')
                                 try:
                                         tar.addfile(tarinfo, f)
                                 finally:
                                         f.close()
                 else:
                         tar.addfile(tarinfo)
                 if onProgress:
                         onProgress(maxval, curval)