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

pym/portage/package/ebuild/doebuild.py

 # Copyright 2010-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 __all__ = ['doebuild', 'doebuild_environment', 'spawn', 'spawnebuild']
 
 import codecs
+import fileinput
 import gzip
 from itertools import chain
 import logging
 import os as _os
 import re
 import shutil
 import signal
 import stat
 import sys
 import tempfile
@@ skipping 1360 matching lines @@
                 os.system("mtree -c -p %s -k flags > %s" % \
                         (_shell_quote(mysettings["D"]),
                         _shell_quote(os.path.join(mysettings["T"], "bsdflags.mtree"))))
                 os.system("chflags -R noschg,nouchg,nosappnd,nouappnd %s" % \
                         (_shell_quote(mysettings["D"]),))
                 os.system("chflags -R nosunlnk,nouunlnk %s 2>/dev/null" % \
                         (_shell_quote(mysettings["D"]),))
 
         destdir = mysettings["D"]
         unicode_errors = []
+        fix_files = []
 
         while True:
 
                 unicode_error = False
                 size = 0
                 counted_inodes = set()
                 fixlafiles_announced = False
                 fixlafiles = "fixlafiles" in mysettings.features
 
                 for parent, dirs, files in os.walk(destdir):
@@ skipping 68 matching lines @@
                                                         writemsg("Fixing .la files\n", fd=out)
                                                 writemsg("   %s\n" % fpath[len(destdir):], fd=out)
                                                 # write_atomic succeeds even in some cases in which
                                                 # a normal write might fail due to file permission
                                                 # settings on some operating systems such as HP-UX
                                                 write_atomic(_unicode_encode(fpath,
                                                         encoding=_encodings['merge'], errors='strict'),
                                                         new_contents, mode='wb')
 
                                 mystat = os.lstat(fpath)
-                                if stat.S_ISREG(mystat.st_mode) and \
-                                        mystat.st_ino not in counted_inodes:
-                                        counted_inodes.add(mystat.st_ino)
-                                        size += mystat.st_size
+                                if stat.S_ISREG(mystat.st_mode):
+                                        if fname.endswith(".pc") or fname.endswith(".la"):
+                                                fix_files.append(fpath)
+                                        if mystat.st_ino not in counted_inodes:
+                                                counted_inodes.add(mystat.st_ino)
+                                                size += mystat.st_size
                                 if mystat.st_uid != portage_uid and \
                                         mystat.st_gid != portage_gid:
                                         continue
                                 myuid = -1
                                 mygid = -1
                                 if mystat.st_uid == portage_uid:
                                         myuid = inst_uid
                                 if mystat.st_gid == portage_gid:
                                         mygid = inst_gid
                                 apply_secpass_permissions(
@@ skipping 47 matching lines @@
                         try:
                                 os.unlink(filename)
                         except OSError:
                                 pass
                         continue
                 codecs.open(_unicode_encode(os.path.join(build_info_dir,
                         k), encoding=_encodings['fs'], errors='strict'),
                         mode='w', encoding=_encodings['repo.content'],
                         errors='strict').write(v + '\n')
 
+        re_root = mysettings["ROOT"].strip("/")
+        if fix_files and re_root:
+                # Replace references to our sysroot with references to "/" in binpkg.
+                # Sysroot will be re-appended when the package is installed.
+                pat = re.compile(r"([' =](-[IL])?/)%s/" % re.escape(re_root))
+                for line in fileinput.input(fix_files, inplace=1):
+                        sys.stdout.write(pat.sub(r"\1", line))
+
         if bsd_chflags:
                 # Restore all of the flags saved above.
                 os.system("mtree -e -p %s -U -k flags < %s > /dev/null" % \
                         (_shell_quote(mysettings["D"]),
                         _shell_quote(os.path.join(mysettings["T"], "bsdflags.mtree"))))
 
 def _merge_unicode_error(errors):
         lines = []
 
         msg = _("This package installs one or more file names containing "
@@ skipping 11 matching lines @@
                 msg = _("For best results, UTF-8 encoding is recommended. See "
                         "the Gentoo Linux Localization Guide for instructions "
                         "about how to configure your locale for UTF-8 encoding:")
                 lines.extend(wrap(msg, 72))
                 lines.append("")
                 lines.append("\t" + \
                         "http://www.gentoo.org/doc/en/guide-localization.xml")
                 lines.append("")
 
         return lines