Changeset 3511 for trunk

Timestamp:

Jul 3, 2007, 11:02:52 PM (18 years ago)

Author:

bird

Message:

svn merge ​http://svn.netlabs.org/repos/libc/vendor/prefix-portage/2.2.00.6804 ​http://svn.netlabs.org/repos/libc/vendor/prefix-portage/current .

Location:

trunk/essentials/sys-apps/prefix-portage

Files:

• Makefile.in (modified) (6 diffs)
• RELEASE-NOTES (modified) (1 diff)
• acinclude.m4 (modified) (1 diff)
• autom4te.cache (copied) (copied from vendor/prefix-portage/current/autom4te.cache )
• autom4te.cache/output.0 (copied) (copied from vendor/prefix-portage/current/autom4te.cache/output.0 )
• autom4te.cache/output.1 (copied) (copied from vendor/prefix-portage/current/autom4te.cache/output.1 )
• autom4te.cache/requests (copied) (copied from vendor/prefix-portage/current/autom4te.cache/requests )
• autom4te.cache/traces.0 (copied) (copied from vendor/prefix-portage/current/autom4te.cache/traces.0 )
• autom4te.cache/traces.1 (copied) (copied from vendor/prefix-portage/current/autom4te.cache/traces.1 )
• bin/archive-conf (modified) (1 prop)
• bin/check-implicit-pointer-usage.py (modified) (1 prop)
• bin/chkcontents (modified) (1 prop)
• bin/clean_locks (modified) (1 prop)
• bin/dispatch-conf (modified) (1 prop)
• bin/dobin (modified) (1 prop)
• bin/doconfd (modified) (1 prop)
• bin/dodir (modified) (1 prop)
• bin/dodoc (modified) (1 prop)
• bin/doenvd (modified) (1 prop)
• bin/doexe (modified) (1 prop)
• bin/dohard (modified) (1 prop)
• bin/dohtml (modified) (1 prop)
• bin/doinfo (modified) (1 prop)
• bin/doinitd (modified) (1 prop)
• bin/doins (modified) (1 prop)
• bin/dolib (modified) (1 prop)
• bin/dolib.a (modified) (1 prop) ( previous)
• bin/dolib.so (modified) (1 prop) ( previous)
• bin/doman (modified) (1 prop)
• bin/domo (modified) (1 prop)
• bin/dosbin (modified) (1 prop)
• bin/dosed (modified) (1 prop)
• bin/dosym (modified) (1 prop)
• bin/ebuild (modified) (1 prop)
• bin/ebuild.sh (modified) (6 diffs, 1 prop)
• bin/ecompress (modified) (1 diff, 1 prop)
• bin/ecompressdir (modified) (1 prop)
• bin/emaint (modified) (1 diff, 1 prop)
• bin/emake (modified) (1 prop)
• bin/emerge (modified) (1 diff, 1 prop)
• bin/emerge-webrsync (modified) (1 prop)
• bin/env-update (modified) (1 prop)
• bin/env-update.sh (modified) (1 prop)
• bin/eprefixify (modified) (1 prop)
• bin/etc-update (modified) (1 prop)
• bin/find-requires (modified) (1 prop)
• bin/fix-db.py (modified) (2 diffs, 1 prop)
• bin/fixdbentries (modified) (1 prop)
• bin/fixpackages (modified) (1 prop)
• bin/fowners (modified) (1 prop)
• bin/fperms (modified) (1 prop)
• bin/isolated-functions.sh (modified) (3 diffs, 1 prop)
• bin/md5check.py (modified) (3 diffs, 1 prop)
• bin/md5check.sh (modified) (1 prop)
• bin/misc-functions.sh (modified) (1 diff)
• bin/newbin (modified) (1 prop)
• bin/newconfd (modified) (1 prop)
• bin/newdoc (modified) (1 prop)
• bin/newenvd (modified) (1 prop)
• bin/newexe (modified) (1 prop)
• bin/newinitd (modified) (1 prop)
• bin/newins (modified) (1 prop)
• bin/newlib.a (modified) (1 prop) ( previous)
• bin/newlib.so (modified) (1 prop) ( previous)
• bin/newman (modified) (1 prop)
• bin/newsbin (modified) (1 prop)
• bin/pemerge.py (modified) (1 prop)
• bin/pkgname (modified) (1 prop)
• bin/portage_gpg_update.sh (modified) (1 prop)
• bin/portageq (modified) (4 diffs, 1 prop)
• bin/prepall (modified) (1 prop)
• bin/prepalldocs (modified) (1 prop)
• bin/prepallinfo (modified) (1 prop)
• bin/prepallman (modified) (1 prop)
• bin/prepallstrip (modified) (1 prop)
• bin/prepinfo (modified) (1 prop)
• bin/preplib (modified) (1 prop)
• bin/prepman (modified) (1 prop)
• bin/prepstrip (modified) (1 prop)
• bin/quickpkg (modified) (8 diffs, 1 prop)
• bin/regenworld (modified) (1 diff, 1 prop)
• bin/repoman (modified) (9 diffs, 1 prop)
• bin/sed (modified) (1 prop)
• bin/xpak (modified) (1 prop)
• cnf/etc-update.conf (modified) (1 diff)
• cnf/logrotate.d (copied) (copied from vendor/prefix-portage/current/cnf/logrotate.d )
• cnf/logrotate.d/elog-save-summary (copied) (copied from vendor/prefix-portage/current/cnf/logrotate.d/elog-save-summary )
• cnf/make.conf (modified) (5 diffs)
• cnf/make.globals (modified) (3 diffs)
• commit (modified) (1 diff)
• config.guess (modified) (1 prop)
• config.sub (modified) (1 prop)
• configure (modified) (22 diffs, 1 prop)
• configure.in (modified) (8 diffs)
• depcomp (modified) (1 prop)
• install-sh (modified) (1 prop)
• kNIX-bootstrap-os2.x86-subst-install.vars (modified) (1 diff)
• ltmain.sh (modified) (6 diffs)
• man/Makefile.in (modified) (3 diffs)
• man/color.map.5 (copied) (copied from vendor/prefix-portage/current/man/color.map.5 )
• man/ebuild.1 (modified) (2 diffs)
• man/ebuild.5 (modified) (5 diffs)
• man/emerge.1 (modified) (4 diffs)
• man/make.conf.5 (modified) (10 diffs)
• man/portage.5 (modified) (4 diffs)
• missing (modified) (1 prop)
• pym/emerge/__init__.py (modified) (72 diffs)
• pym/emerge/help.py (modified) (3 diffs)
• pym/portage/__init__.py (modified) (23 diffs)
• pym/portage/cache/anydbm.py (modified) (1 diff)
• pym/portage/cache/flat_hash.py (modified) (1 diff)
• pym/portage/cache/flat_list.py (modified) (1 diff)
• pym/portage/cache/metadata_overlay.py (modified) (1 diff)
• pym/portage/cache/sql_template.py (modified) (1 diff)
• pym/portage/cache/sqlite.py (modified) (1 diff)
• pym/portage/cache/template.py (modified) (3 diffs)
• pym/portage/cache/util.py (modified) (3 diffs)
• pym/portage/cache/volatile.py (modified) (1 diff)
• pym/portage/checksum.py (modified) (7 diffs)
• pym/portage/const_autotool.py (modified) (2 diffs)
• pym/portage/cvstree.py (modified) (7 diffs)
• pym/portage/data.py (modified) (4 diffs)
• pym/portage/dbapi/bintree.py (modified) (11 diffs)
• pym/portage/dbapi/porttree.py (modified) (9 diffs)
• pym/portage/dbapi/vartree.py (modified) (46 diffs)
• pym/portage/dbapi/virtual.py (modified) (2 diffs)
• pym/portage/eclass_cache.py (modified) (1 diff)
• pym/portage/elog/__init__.py (modified) (5 diffs)
• pym/portage/elog/filtering.py (modified) (2 diffs)
• pym/portage/elog/messages.py (modified) (1 diff)
• pym/portage/elog/mod_custom.py (modified) (2 diffs)
• pym/portage/elog/mod_echo.py (modified) (2 diffs)
• pym/portage/elog/mod_mail_summary.py (modified) (3 diffs)
• pym/portage/env/config.py (modified) (1 diff)
• pym/portage/exception.py (modified) (1 diff)
• pym/portage/getbinpkg.py (modified) (8 diffs)
• pym/portage/gpg.py (modified) (1 diff)
• pym/portage/locks.py (modified) (2 diffs)
• pym/portage/manifest.py (modified) (3 diffs)
• pym/portage/news.py (modified) (3 diffs)
• pym/portage/output.py (modified) (7 diffs)
• pym/portage/tests/__init__.py (modified) (2 diffs)
• pym/portage/tests/bin/setup_env.py (modified) (2 diffs)
• pym/portage/tests/ebuild (copied) (copied from vendor/prefix-portage/current/pym/portage/tests/ebuild )
• pym/portage/tests/ebuild/__init__.py (copied) (copied from vendor/prefix-portage/current/pym/portage/tests/ebuild/__init__.py )
• pym/portage/tests/ebuild/test_spawn.py (copied) (copied from vendor/prefix-portage/current/pym/portage/tests/ebuild/test_spawn.py )
• pym/portage/tests/env/config/test_PackageMaskFile.py (modified) (1 diff)
• pym/portage/tests/env/config/test_PortageModulesFile.py (modified) (1 diff)
• pym/portage/tests/runTests (modified) (1 prop)
• pym/portage/tests/util/test_varExpand.py (modified) (2 diffs)
• pym/portage/update.py (modified) (1 diff)
• pym/portage/util.py (modified) (3 diffs)
• pym/portage/xpak.py (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)
• src/Makefile.in (modified) (4 diffs)
• src/bsd-flags/setup.py (modified) (1 prop)
• src/python-missingos (deleted)
• svnlogmsg.awk (modified) (1 prop)

trunk/essentials/sys-apps/prefix-portage/Makefile.in

@@ -38 +38 @@
         $(srcdir)/subst-install.vars.in.in \
         $(top_srcdir)/bin/Makefile.in $(top_srcdir)/cnf/Makefile.in \
-        $(top_srcdir)/configure $(top_srcdir)/pym/Makefile.in \
-        $(top_srcdir)/src/python-missingos/Makefile.in AUTHORS COPYING \
-        ChangeLog INSTALL NEWS config.guess config.sub depcomp \
+        $(top_srcdir)/configure $(top_srcdir)/pym/Makefile.in AUTHORS \
+        COPYING ChangeLog INSTALL NEWS config.guess config.sub depcomp \
         install-sh ltmain.sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -50 +49 @@
  configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
-CONFIG_CLEAN_FILES = subst-install subst-install.vars.in \
-        src/python-missingos/Makefile bin/Makefile pym/Makefile \
-        cnf/Makefile
+CONFIG_CLEAN_FILES = subst-install subst-install.vars.in bin/Makefile \
+        pym/Makefile cnf/Makefile
 SOURCES =
 DIST_SOURCES =
@@ -79 +77 @@
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 ARCH = @ARCH@
@@ -182 +179 @@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+rootgid = @rootgid@
 rootuid = @rootuid@
 rootuser = @rootuser@
@@ -195 +193 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-wheelgid = @wheelgid@
 SUBDIRS = src man bin pym cnf
 AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip
@@ -242 +239 @@
         cd $(top_builddir) && $(SHELL) ./config.status $@
 subst-install.vars.in: $(top_builddir)/config.status $(srcdir)/subst-install.vars.in.in
-        cd $(top_builddir) && $(SHELL) ./config.status $@
-src/python-missingos/Makefile: $(top_builddir)/config.status $(top_srcdir)/src/python-missingos/Makefile.in
         cd $(top_builddir) && $(SHELL) ./config.status $@
 bin/Makefile: $(top_builddir)/config.status $(top_srcdir)/bin/Makefile.in

trunk/essentials/sys-apps/prefix-portage/RELEASE-NOTES

@@ -18 +18 @@
   For packages that don't specify any other KEYWORDS you can use the new ** token
   as documented in portage(5) to disable KEYWORDS filtering completely.
+
+portage-2.1.3
+==================================
+
+* The unmerge process will remove any file that is not claimed by another
+  package in the same slot and is not protected by CONFIG_PROTECT, even if the
+  modification time or checksum differs from the file that was originally
+  installed.  The old behavior is still available by adding -unmerge-orphans
+  to FEATURES.
 
 portage-2.1.2

trunk/essentials/sys-apps/prefix-portage/acinclude.m4

@@ -43 +43 @@
   AC_PATH_PROG([XCU_ID], [id], no, $1)
 
-  dnl is is there at all?
-  if test "$PYTHON" = "no" ; then
-    AC_MSG_ERROR([no python found in your path])
-  fi
-
   dnl does it support all the bells and whistles we need?
   AC_MSG_CHECKING([whether $XCU_ID is good enough])

trunk/essentials/sys-apps/prefix-portage/bin/ebuild.sh

@@ -80 +80 @@
 [ ! -z "$PREROOTPATH" ] && export PATH="${PREROOTPATH%%:}${PATH_SEP}$PATH"
 
-source "@PORTAGE_BASE@"/bin/isolated-functions.sh &>/dev/null
+source "${PORTAGE_BIN_PATH}/isolated-functions.sh"  &>/dev/null
 
 OCC="$CC"
@@ -204 +204 @@
         # return shell-true/shell-false if exists.
         # Takes single depend-type atoms.
-        if "@PORTAGE_BASE@"/bin/portageq 'has_version' "${ROOT}" "$1"; then
-                return 0
-        else
-                return 1
-        fi
+        "${PORTAGE_BIN_PATH}"/portageq has_version "${ROOT}" "$1"
+        local retval=$?
+        case "${retval}" in
+                0)
+                        return 0
+                        ;;
+                1)
+                        return 1
+                        ;;
+                *)
+                        die "unexpected portageq exit code: ${retval}"
+                        ;;
+        esac
 }
 
@@ -215 +223 @@
                 die "portageq calls are not allowed in the global scope"
         fi
-        "@PORTAGE_BASE@"/bin/portageq "$@"
+        "${PORTAGE_BIN_PATH}/portageq" "$@"
 }
 
@@ -230 +238 @@
         # returns the best/most-current match.
         # Takes single depend-type atoms.
-        "@PORTAGE_BASE@"/bin/portageq 'best_version' "${ROOT}" "$1"
+        "${PORTAGE_BIN_PATH}/portageq" 'best_version' "${ROOT}" "$1"
 }
 
@@ -521 +529 @@
                 if ! ${CONFCACHE} ${CONFCACHE_ARG} ${TMP_CONFCACHE_DIR} "${ECONF_SOURCE}/configure" \
                         --prefix="${EPREFIX}"/usr \
-                        --host="${CHOST}" \
+                        --host=${CHOST} \
                         --mandir="${EPREFIX}"/usr/share/man \
                         --infodir="${EPREFIX}"/usr/share/info \
@@ -1672 +1680 @@
         # Save current environment and touch a success file. (echo for success)
         umask 002
-        set | @EGREP@ -v "^SANDBOX_" > "${T}/environment" 2>/dev/null
-        export | @EGREP@ -v "^declare -x SANDBOX_" | \
-                @SED@ 's:^declare -rx:declare -x:' >> "${T}/environment" 2>/dev/null
+        set | egrep -v "^SANDBOX_" > "${T}/environment" 2>/dev/null
+        export | egrep -v "^declare -x SANDBOX_" | \
+                sed 's:^declare -rx:declare -x:' >> "${T}/environment" 2>/dev/null
         chown ${PORTAGE_USER:-portage}:${PORTAGE_GROUP:-portage} "${T}/environment" &>/dev/null
         chmod g+w "${T}/environment" &>/dev/null

trunk/essentials/sys-apps/prefix-portage/bin/ecompress

@@ -25 +25 @@
                 [[ -n $2 ]] && vecho "${0##*/}: --suffix takes no additional arguments" 1>&2
 
-                set -e
-                tmpdir="${T}"/.ecompress$$.${RANDOM}
-                mkdir "${tmpdir}"
-                cd "${tmpdir}"
-                # we have to fill the file enough so that there is something
-                # to compress as some programs will refuse to do compression
-                # if it cannot actually compress the file
-                echo {0..1000} > compressme
-                ${PORTAGE_COMPRESS} ${PORTAGE_COMPRESS_FLAGS} compressme > /dev/null
-                suffix=$(ls compressme*)
-                suffix=${suffix#compressme}
-                cd /
-                rm -rf "${tmpdir}"
-                echo "${suffix}"
+                if [[ ! -e ${T}/.ecompress.suffix ]] ; then
+                        set -e
+                        tmpdir="${T}"/.ecompress$$.${RANDOM}
+                        mkdir "${tmpdir}"
+                        cd "${tmpdir}"
+                        # we have to fill the file enough so that there is something
+                        # to compress as some programs will refuse to do compression
+                        # if it cannot actually compress the file
+                        echo {0..1000} > compressme
+                        ${PORTAGE_COMPRESS} ${PORTAGE_COMPRESS_FLAGS} compressme > /dev/null
+                        suffix=$(ls compressme*)
+                        suffix=${suffix#compressme}
+                        cd /
+                        rm -rf "${tmpdir}"
+                        echo "${suffix}" > "${T}/.ecompress.suffix"
+                fi
+                cat "${T}/.ecompress.suffix"
                 ;;
         --bin)

trunk/essentials/sys-apps/prefix-portage/bin/emaint

@@ -70 +70 @@
                 errors = []
                 try:
-                        portage.write_atomic(self.world_file, "\n".join(self.okay))
+                        portage.write_atomic(self.world_file,
+                                "\n".join(sorted(self.okay)) + "\n")
                 except portage.exception.PortageException:
                         errors.append(self.world_file + " could not be opened for writing")

trunk/essentials/sys-apps/prefix-portage/bin/emerge

@@ -14 +14 @@
 if __name__ == "__main__":
         import sys
-        sys.exit(emerge_main())
+        from portage.exception import PermissionDenied
+        try:
+                retval = emerge_main()
+        except PermissionDenied, e:
+                sys.stderr.write("Permission denied: '%s'\n" % str(e))
+                sys.exit(e.errno)
+        sys.exit(retval)

trunk/essentials/sys-apps/prefix-portage/bin/fix-db.py

@@ -138 +138 @@
 actions = {}
 writemsg("\n\n")
-for catpkg in bad.keys():
+for catpkg in bad:
         bad[catpkg].sort()
 
@@ -157 +157 @@
 if (len(sys.argv) > 1) and (sys.argv[1] == "--fix"):
         writemsg("These are only directions, at the moment.")
-        for catpkg in actions.keys():
+        for catpkg in actions:
                 action = actions[catpkg]
                 writemsg("We will now '%s' '%s'..." % (action, catpkg))

trunk/essentials/sys-apps/prefix-portage/bin/isolated-functions.sh

@@ -24 +24 @@
         fi
 
-        echo "Call stack:"
+        eerror "Call stack:"
         for (( n = ${#FUNCNAME[@]} - 1, p = ${#BASH_ARGV[@]} ; n > $strip ; n-- )) ; do
                 funcname=${FUNCNAME[${n} - 1]}
@@ -38 +38 @@
                         (( p -= ${BASH_ARGC[${n} - 1]} ))
                 fi
-                echo "  ${sourcefile}, line ${lineno}:   Called ${funcname}${args:+ ${args}}"
+                eerror "  ${sourcefile}, line ${lineno}:   Called ${funcname}${args:+ ${args}}"
         done
 }
@@ -45 +45 @@
         local funcname="$1" lineno="$2" exitcode="$3"
         shift 3
-        echo >&2
-        echo "!!! ERROR: $CATEGORY/$PF failed." >&2
-        dump_trace 2 1>&2
-        echo "  $(basename "${BASH_SOURCE[1]}"), line ${BASH_LINENO[0]}:   Called die" 1>&2
-        echo >&2
-        echo "!!! ${*:-(no error message)}" >&2
-        echo "!!! If you need support, post the topmost build error, and the call stack if relevant." >&2
+        eerror
+        eerror "ERROR: $CATEGORY/$PF failed."
+        dump_trace 2
+        eerror "  ${BASH_SOURCE[1]##*/}, line ${BASH_LINENO[0]}:   Called die"
+        eerror
+        eerror "${*:-(no error message)}"
+        eerror "If you need support, post the topmost build error, and the call stack if relevant."
         [ -n "${PORTAGE_LOG_FILE}" ] && \
-            echo "!!! A complete build log is located at '${PORTAGE_LOG_FILE}'." >&2
-        echo >&2
+            eerror "A complete build log is located at '${PORTAGE_LOG_FILE}'."
         if [ -n "${EBUILD_OVERLAY_ECLASSES}" ] ; then
-                echo "This ebuild used the following eclasses from overlays:" >&2
-                echo >&2
-                for x in ${EBUILD_OVERLAY_ECLASSES} ; do
-                        echo "  ${x}" >&2
-                done
-                echo >&2
+            eerror "This ebuild used the following eclasses from overlays:"
+            local x
+            for x in ${EBUILD_OVERLAY_ECLASSES} ; do
+                 eerror "  ${x}"
+            done
         fi
+        if [ "${EBUILD#${PORTDIR}/}" == "${EBUILD}" ] ; then
+            local overlay=${EBUILD%/*}
+            overlay=${overlay%/*}
+            overlay=${overlay%/*}
+            eerror "This ebuild is from an overlay: '${overlay}/'"
+        fi
+        eerror
 
         if [ "${EBUILD_PHASE/depend}" == "${EBUILD_PHASE}" ]; then

trunk/essentials/sys-apps/prefix-portage/bin/md5check.py

@@ -69 +69 @@
                         continue
                 
-                if mybn not in md5sums.keys():
+                if mybn not in md5sums:
                         portage.util.writemsg("Missing md5sum: %s in %s\n" % (mybn, mycpv))
                 else:
-                        if mybn in md5_list.keys():
+                        if mybn in md5_list:
                                 if (md5_list[mybn]["MD5"]  != md5sums[mybn]["MD5"]) or \
                                    (md5_list[mybn]["size"] != md5sums[mybn]["size"]):
@@ -90 +90 @@
                 
         #portage.writemsg(str(bn_list)+"\n")
-        for x in md5sums.keys():
+        for x in md5sums:
                 if x not in bn_list:
                         portage.writemsg("Extra md5sum: %s in %s\n" % (x, mycpv))
@@ -97 +97 @@
 print col_list
 print
-print str(len(md5_list.keys()))+" unique distfile md5s."
+print str(len(md5_list))+" unique distfile md5s."
 print str(len(bn_list))+" unique distfile names."

trunk/essentials/sys-apps/prefix-portage/bin/misc-functions.sh

@@ -557 +557 @@
         # for $PKGDIR and/or $PKGDIR/All.
         export SANDBOX_ON="0"
+        [ -z "${PORTAGE_BINPKG_TMPFILE}" ] && \
+                PORTAGE_BINPKG_TMPFILE="${PKGDIR}/${CATEGORY}/${PVR}.tbz2"
         mkdir -p "${PORTAGE_BINPKG_TMPFILE%/*}" || die "mkdir failed"
         tar ${tar_options} -cf - . | bzip2 -f > "${PORTAGE_BINPKG_TMPFILE}" || \

trunk/essentials/sys-apps/prefix-portage/bin/portageq

@@ -44 +44 @@
 # and will automaticly add a command by the same name as the function!
 #
-
 
 def has_version(argv):
@@ -285 +284 @@
                 print portage.db[argv[0]]["porttree"].dbapi.getRepositoryPath(argv[1])
 
+def list_preserved_libs(argv):
+        """<root>
+        Print a list of libraries preserved during a package update in the form
+        package: path. Returns 0 if no preserved libraries could be found, 
+        1 otherwise.
+        """
+
+        if len(argv) != 1:
+                print "ERROR: wrong number of arguments"
+                sys.exit(2)
+        mylibs = portage.db[argv[0]]["vartree"].dbapi.plib_registry.getPreservedLibs()
+        rValue = 0
+        for cpv in mylibs:
+                print cpv,
+                for path in mylibs[cpv]:
+                        print path,
+                        rValue = 1
+                print
+        return rValue
+list_preserved_libs.uses_root = True
+
 #-----------------------------------------------------------------------------
 #
@@ -302 +322 @@
         # file, and formatting each functions documentation.
         #
-        for name in globals().keys():
-                # Drop python stuff, modules, and our own support functions.
-                if (name in ("usage", "__doc__", "__name__", "main", "os", "portage", "sys", "__builtins__", "types", "string","exithandler")):
-                        continue
-
+        commands = [x for x in globals() if x not in \
+                                ("usage", "__doc__", "__name__", "main", "os", "portage", \
+                                "sys", "__builtins__", "types", "string","exithandler")]
+        commands.sort()
+
+        for name in commands:
                 # Drop non-functions
                 obj = globals()[name]
@@ -356 +377 @@
                 usage(sys.argv)
                 sys.exit(os.EX_USAGE)
+        except portage.exception.PermissionDenied, e:
+                sys.stderr.write("Permission denied: '%s'\n" % str(e))
+                sys.exit(e.errno)
 
 main()

trunk/essentials/sys-apps/prefix-portage/bin/quickpkg

@@ -7 +7 @@
 
 def quickpkg_main(options, args, eout):
-        from portage import dblink, dep_expand, catsplit, isvalidatom, xpak
-        from portage.util import ensure_dirs
-        from portage.exception import InvalidData
-        from portage.dbapi.vartree import tar_contents
+        from portage import catsplit, dep_expand, flatten, isvalidatom, xpak
+        from portage.dep import use_reduce, paren_reduce
+        from portage.util import ConfigProtect, ensure_dirs
+        from portage.exception import InvalidData, InvalidDependString
+        from portage.dbapi.vartree import dblink, tar_contents
+        from portage.checksum import perform_md5
         import tarfile
         import portage
@@ -23 +25 @@
         successes = []
         missing = []
+        config_files_excluded = 0
+        include_config = options.include_config == "y"
+        include_unmodified_config = options.include_unmodified_config == "y"
         for arg in args:
                 try:
@@ -45 +50 @@
                 pkgs_for_arg = 0
                 for cpv in matches:
+                        excluded_config_files = []
                         bintree.prevent_collision(cpv)
                         cat, pkg = catsplit(cpv)
@@ -55 +61 @@
                                         # unmerged by a concurrent process
                                         continue
+                                iuse, use, restrict = vardb.aux_get(cpv,
+                                        ["IUSE","USE","RESTRICT"])
+                                iuse = [ x.lstrip("+-") for x in iuse.split() ]
+                                use = use.split()
+                                try:
+                                        restrict = flatten(use_reduce(
+                                                paren_reduce(restrict), uselist=use))
+                                except InvalidDependString, e:
+                                        eout.eerror("Invalid RESTRICT metadata " + \
+                                                "for '%s': %s; skipping" % (cpv, str(e)))
+                                        del e
+                                        continue
+                                if "bindist" in iuse and "bindist" not in use:
+                                        eout.ewarn("%s: package was emerged with USE=-bindist!" % cpv)
+                                        eout.ewarn("%s: it may not be legal to redistribute this." % cpv)
+                                elif "bindist" in restrict:
+                                        eout.ewarn("%s: package has RESTRICT=bindist!" % cpv)
+                                        eout.ewarn("%s: it may not be legal to redistribute this." % cpv)
                                 eout.ebegin("Building package for %s" % cpv)
                                 pkgs_for_arg += 1
                                 contents = dblnk.getcontents()
+                                protect = None
+                                if not include_config:
+                                        confprot = ConfigProtect(root,
+                                                portage.settings.get("CONFIG_PROTECT","").split(),
+                                                portage.settings.get("CONFIG_PROTECT_MASK","").split())
+                                        def protect(filename):
+                                                if not confprot.isprotected(filename):
+                                                        return False
+                                                if include_unmodified_config:
+                                                        file_data = contents[filename]
+                                                        if file_data[0] == "obj":
+                                                                orig_md5 = file_data[2].lower()
+                                                                cur_md5 = perform_md5(filename, calc_prelink=1)
+                                                                if orig_md5 == cur_md5:
+                                                                        return False
+                                                excluded_config_files.append(filename)
+                                                return True
                                 xpdata = xpak.xpak(dblnk.dbdir)
                                 binpkg_tmpfile = os.path.join(bintree.pkgdir,
@@ -63 +104 @@
                                 ensure_dirs(os.path.dirname(binpkg_tmpfile))
                                 tar = tarfile.open(binpkg_tmpfile, "w:bz2")
-                                tar_contents(contents, root, tar)
+                                tar_contents(contents, root, tar, protect=protect)
                                 tar.close()
                                 xpak.tbz2(binpkg_tmpfile).recompose_mem(xpdata)
@@ -81 +122 @@
                                 eout.eend(0)
                                 successes.append((cpv, s.st_size))
+                                config_files_excluded += len(excluded_config_files)
+                                for filename in excluded_config_files:
+                                        eout.ewarn("Excluded config: '%s'" % filename)
                 if not pkgs_for_arg:
                         eout.eerror("Could not find anything " + \
@@ -111 +155 @@
                                 size_str = str(size)
                 eout.einfo("%s: %s" % (cpv, size_str))
+        if config_files_excluded:
+                print
+                eout.ewarn("Excluded config files: %d" % config_files_excluded)
+                eout.ewarn("See --help if you would like to include config files.")
         if missing:
                 print
@@ -119 +167 @@
 
 if __name__ == "__main__":
-        usage = "Usage: quickpkg [options] <list of package atoms>"
+        usage = "quickpkg [options] <list of package atoms>"
         from optparse import OptionParser
         parser = OptionParser(usage=usage)
+        parser.add_option("--umask",
+                default="0077",
+                help="umask used during package creation (default is 0077)")
+        parser.add_option("--ignore-default-opts",
+                action="store_true",
+                help="do not use the QUICKPKG_DEFAULT_OPTS environment variable")
+        parser.add_option("--include-config",
+                type="choice",
+                choices=["y","n"],
+                default="n",
+                metavar="<y|n>",
+                help="include all files protected by CONFIG_PROTECT (as a security precaution, default is 'n')")
+        parser.add_option("--include-unmodified-config",
+                type="choice",
+                choices=["y","n"],
+                default="n",
+                metavar="<y|n>",
+                help="include files protected by CONFIG_PROTECT that have not been modified since installation (as a security precaution, default is 'n')")
         options, args = parser.parse_args(sys.argv[1:])
+        if not options.ignore_default_opts:
+                from portage import settings
+                default_opts = settings.get("QUICKPKG_DEFAULT_OPTS","").split()
+                options, args = parser.parse_args(default_opts + sys.argv[1:])
         if not args:
                 parser.error("no packages atoms given")
+        try:
+                umask = int(options.umask, 8)
+        except ValueError:
+                parser.error("invalid umask: %s" % options.umask)
         # We need to ensure a sane umask for the packages that will be created.
-        old_umask = os.umask(022)
+        old_umask = os.umask(umask)
         from portage.output import get_term_size, EOutput
         eout = EOutput()

trunk/essentials/sys-apps/prefix-portage/bin/regenworld

@@ -93 +93 @@
                         worldlist.append(myfavkey)
 
-portage.write_atomic(os.path.join("/", portage.WORLD_FILE), "\n".join(worldlist))
+portage.write_atomic(os.path.join("/", portage.WORLD_FILE),
+        "\n".join(sorted(worldlist)) + "\n")

trunk/essentials/sys-apps/prefix-portage/bin/repoman

@@ -175 +175 @@
         "LICENSE.syntax":"Syntax error in LICENSE (usually an extra/missing space/parenthesis)",
         "PROVIDE.syntax":"Syntax error in PROVIDE (usually an extra/missing space/parenthesis)",
+        "RESTRICT.syntax":"Syntax error in RESTRICT (usually an extra/missing space/parenthesis)",
         "SRC_URI.syntax":"Syntax error in SRC_URI (usually an extra/missing space/parenthesis)",
         "ebuild.syntax":"Error generating cache entry for ebuild; typically caused by ebuild syntax error",
@@ -184 +185 @@
         "LICENSE.invalid":"This ebuild is listing a license that doesnt exist in portages license/ dir.",
         "KEYWORDS.invalid":"This ebuild contains KEYWORDS that are not listed in profiles/arch.list or for which no valid profile was found",
+        "RESTRICT.invalid":"This ebuild contains invalid RESTRICT values.",
         "ebuild.nostable":"There are no ebuilds that are marked as stable for your ARCH",
         "ebuild.allmasked":"All ebuilds are masked for this package (Package level only)",
@@ -218 +220 @@
 "KEYWORDS.stupid",
 "KEYWORDS.missing",
+"RESTRICT.invalid",
 "ebuild.minorsyn",
 "ebuild.badheader",
@@ -241 +244 @@
                 qawarnings.append(x)
 
+valid_restrict = frozenset(["binchecks", "bindist", "fetch", "mirror",
+        "primaryuri", "strip", "test", "userpriv"])
 
 verbose=0
@@ -354 +359 @@
         x=1
         while x < len(sys.argv):
-                if sys.argv[x] in shortmodes.keys():
+                if sys.argv[x] in shortmodes:
                         sys.argv[x]=shortmodes[sys.argv[x]]
-                elif sys.argv[x] in repoman_shortoptions.keys():
+                elif sys.argv[x] in repoman_shortoptions:
                         sys.argv[x] = repoman_shortoptions[sys.argv[x]]
                 if sys.argv[x] in modes:
@@ -1466 +1471 @@
                                         stats["KEYWORDS.invalid"] += 1
                                         fails["KEYWORDS.invalid"].append(x+"/"+y+".ebuild: %s (profile invalid)" % mykey)
+
+                #restrict checks
+                myrestrict = None
+                try:
+                        myrestrict = portage.dep.use_reduce(
+                                portage.dep.paren_reduce(myaux["RESTRICT"]), matchall=1)
+                except portage.exception.InvalidDependString, e:
+                        stats["RESTRICT.syntax"] = stats["RESTRICT.syntax"] + 1
+                        fails["RESTRICT.syntax"].append(mykey+".ebuild RESTRICT: "+str(e))
+                        del e
+                if myrestrict:
+                        myrestrict = set(portage.flatten(myrestrict))
+                        mybadrestrict = myrestrict.difference(valid_restrict)
+                        if mybadrestrict:
+                                stats["RESTRICT.invalid"] += len(mybadrestrict)
+                                for mybad in mybadrestrict:
+                                        fails["RESTRICT.invalid"].append(x+"/"+y+".ebuild: %s" % mybad)
 
                 #syntax checks
@@ -1598 +1620 @@
                 if xs[0]==".":
                         xs=xs[1:]
-                if xs[0] not in mygroups.keys():
+                if xs[0] not in mygroups:
                         mygroups[xs[0]]=[seperator.join(xs[1:])]
                 else:
@@ -1616 +1638 @@
         elif not dofail:
                 print green("RepoMan sez:"),"\"If everyone were like you, I'd be out of business!\""
+        elif dofail:
+                print turquoise("Please fix these important QA issues first.")
+                print green("RepoMan sez:"),"\"Make your QA payment on time and you'll never see the likes of me.\"\n"
+                sys.exit(1)
         if quiet < 1:
                 print
@@ -1816 +1842 @@
         try:
                 unameout=getstatusoutput("uname -srp")[1]
-                commitmessage+="\n(Portage "+str(portage.VERSION)+"-prefix/"
+                commitmessage+="\n(Portage "+str(portage.VERSION)+"/"
                 if isCvs:
                         commitmessage+="CVS"

trunk/essentials/sys-apps/prefix-portage/cnf/etc-update.conf

@@ -23 +23 @@
 
 # For emacs-users
-# diff_command="eval emacs -nw --eval=\(ediff\ \"%file1\"\ \"%file2\"\)"
+# diff_command="eval emacs -nw --eval=\'\(ediff\ \"%file1\"\ \"%file2\"\)\'"
 #using_editor=1
 

trunk/essentials/sys-apps/prefix-portage/cnf/make.conf

@@ -71 +71 @@
 # you try to use portage. *** DO NOT INCLUDE A TRAILING "/" ***
 #
-# EPREFIX is the filesystem location in which ALL packages will be
-#     installed to.
-#EPREFIX=/opt/gentoo
 #
 # PORTAGE_TMPDIR is the location portage will use for compilations and
 #     temporary storage of data. This can get VERY large depending upon
 #     the application being installed.
-#PORTAGE_TMPDIR=${EPREFIX}/var/tmp
+#PORTAGE_TMPDIR=@DOMAIN_PREFIX@/var/tmp
 #
 # PORTDIR is the location of the portage tree. This is the repository
 #     for all profile information as well as all ebuilds. If you change
 #     this, you must update your /etc/make.profile symlink accordingly.
-#PORTDIR=${EPREFIX}/usr/portage
+#     ***Warning***
+#     Data stored inside PORTDIR is in peril of being overwritten or deleted by
+#     the emerge --sync command. The default value of PORTAGE_RSYNC_OPTS
+#     will protect the default locations of DISTDIR and PKGDIR, but users are
+#     warned that any other locations inside PORTDIR are not necessarily safe
+#     for data storage.
+#PORTDIR=@DOMAIN_PREFIX@/usr/portage
 #
 # DISTDIR is where all of the source code tarballs will be placed for
@@ -89 +92 @@
 #     it. The entire repository of tarballs for Gentoo is 9G. This is
 #     considerably more than any user will ever download. 2-3G is
-#     a large DISTDIR.
-#DISTDIR=/usr/portage/distfiles
+#     a large DISTDIR. Note that locations under /usr/portage are not
+#     necessarily safe for data storage. See the PORTDIR documentation
+#     for more information.
+#DISTDIR=@DOMAIN_PREFIX@/usr/portage/distfiles
 #
 # PKGDIR is the location of binary packages that you can have created
 #     with '--buildpkg' or '-b' while emerging a package. This can get
-#     up to several hundred megs, or even a few gigs.
-#PKGDIR=/usr/portage/packages
+#     up to several hundred megs, or even a few gigs. Note that
+#     locations under /usr/portage are not necessarily safe for data
+#     storage. See the PORTDIR documentation for more information.
+#PKGDIR=@DOMAIN_PREFIX@/usr/portage/packages
 #
 # PORT_LOGDIR is the location where portage will store all the logs it
-#     creates from each individual merge. They are stored as NNNN-$PF.log
-#     in the directory specified. This is disabled until you enable it by
-#     providing a directory. Permissions will be modified as needed IF the
-#     directory exists, otherwise logging will be disabled. NNNN is the
-#     increment at the time the log is created. Logs are thus sequential.
-#     The common setting is to use the /var/log/portage path.
+#     creates from each individual merge. They are stored as
+#     ${CATEGORY}:${PF}:YYYYMMDD-HHMMSS.log in the directory specified.
+#     If the direcory does not exist, it will be created automatically and
+#     group permissions will be applied to it.  If the directory already
+#     exists, portage will not modify it's permissions.
 #PORT_LOGDIR=""
 #
@@ -109 +115 @@
 #     concern that they will be deleted by rsync updates. Default is not
 #     defined.
-#PORTDIR_OVERLAY=/usr/local/portage
+#PORTDIR_OVERLAY=@DOMAIN_PREFIX@/usr/local/portage
 
 # Fetching files 
@@ -123 +129 @@
 #
 # Default fetch command (5 tries, passive ftp for firewall compatibility)
-#FETCHCOMMAND="${EPREFIX}/usr/bin/wget -t 5 -T 60 --passive-ftp \${URI} -P \${DISTDIR}"
-#RESUMECOMMAND="${EPREFIX}/usr/bin/wget -c -t 5 -T 60 --passive-ftp \${URI} -P \${DISTDIR}"
+#FETCHCOMMAND="@DOMAIN_PREFIX@/usr/bin/wget -t 5 -T 60 --passive-ftp \${URI} -P \${DISTDIR}"
+#RESUMECOMMAND="@DOMAIN_PREFIX@/usr/bin/wget -c -t 5 -T 60 --passive-ftp \${URI} -P \${DISTDIR}"
 #
 # Using wget, ratelimiting downloads
-#FETCHCOMMAND="${EPREFIX}/usr/bin/wget -t 5 -T 60 --passive-ftp --limit-rate=200k \${URI} -P \${DISTDIR}"
-#RESUMECOMMAND="${EPREFIX}/usr/bin/wget -c -t 5 -T 60 --passive-ftp --limit-rate=200k \${URI} -P \${DISTDIR}"
+#FETCHCOMMAND="@DOMAIN_PREFIX@/usr/bin/wget -t 5 -T 60 --passive-ftp --limit-rate=200k \${URI} -P \${DISTDIR}"
+#RESUMECOMMAND="@DOMAIN_PREFIX@/usr/bin/wget -c -t 5 -T 60 --passive-ftp --limit-rate=200k \${URI} -P \${DISTDIR}"
 #
 # curl groks urls
-#FETCHCOMMAND="${EPREFIX}/usr/bin/curl -f --connect-timeout 15 -# -o \${DISTDIR}/\${FILE} \${URI}"
-#RESUMECOMMAND="${EPREFIX}/usr/bin/curl -f --connect-timeout 15 -# -C - -o \${DISTDIR}/\${FILE} \${URI}"
+#FETCHCOMMAND="@DOMAIN_PREFIX@/usr/bin/curl -f --connect-timeout 15 -# -o \${DISTDIR}/\${FILE} \${URI}"
+#RESUMECOMMAND="@DOMAIN_PREFIX@/usr/bin/curl -f --connect-timeout 15 -# -C - -o \${DISTDIR}/\${FILE} \${URI}"
 #
 # Lukemftp (BSD ftp):
-#FETCHCOMMAND="${EPREFIX}/usr/bin/lukemftp -s -a -o \${DISTDIR}/\${FILE} \${URI}"
-#RESUMECOMMAND="${EPREFIX}/usr/bin/lukemftp -s -a -R -o \${DISTDIR}/\${FILE} \${URI}"
+#FETCHCOMMAND="@DOMAIN_PREFIX@/usr/bin/lukemftp -s -a -o \${DISTDIR}/\${FILE} \${URI}"
+#RESUMECOMMAND="@DOMAIN_PREFIX@/usr/bin/lukemftp -s -a -R -o \${DISTDIR}/\${FILE} \${URI}"
 #
 # Portage uses GENTOO_MIRRORS to specify mirrors to use for source retrieval.
@@ -189 +195 @@
 #
 #SYNC="rsync://rsync.gentoo.org/gentoo-portage"
+#
+# In Gentoo/Alt:Prefix, the only correct SYNC url is the following:
+#
+#SYNC="svn+http://overlays.gentoo.org/svn/proj/alt/trunk/prefix-overlay"
 #
 # PORTAGE_RSYNC_RETRIES sets the number of times portage will attempt to retrieve

trunk/essentials/sys-apps/prefix-portage/cnf/make.globals

@@ -34 +34 @@
 
 # Default user options
-FEATURES="sandbox distlocks metadata-transfer"
+FEATURES="sandbox distlocks metadata-transfer unmerge-orphans"
 
 # Default chunksize for binhost comms
@@ -69 +69 @@
 # Default ownership of installed files.
 PORTAGE_INST_UID="@rootuid@"
-PORTAGE_INST_USER="@rootuser@"
-PORTAGE_INST_GID="@wheelgid@"
+PORTAGE_INST_GID="@rootgid@"
 
 # Default PATH for ebuild env
@@ -84 +83 @@
 PORTAGE_ELOG_MAILURI="@rootuser@"
 PORTAGE_ELOG_MAILSUBJECT="[portage] ebuild log for \${PACKAGE} on \${HOST}"
-PORTAGE_ELOG_MAILFROM="portage"
+PORTAGE_ELOG_MAILFROM="@portageuser@"
 
 #            *****************************

trunk/essentials/sys-apps/prefix-portage/commit

@@ -1 @@
-   Merged from trunk 6765:6802
+   Merged from trunk 7090:7126
 
    +------------------------------------------------------------------------+
-   | 6766    | For bug #181104, make econf give an appropriate error        |
-   | zmedico | message when configure is not executable.                    |
+   | 7091    | For bug #183639, give a more informative message with the    |
+   | zmedico | package.provided warning.                                    |
    |---------+--------------------------------------------------------------|
-   | 6768    | For bug #139383, in xtermTitleReset() use os.system()        |
-   | zmedico | instead of commands.getoutput() since the latter puts too    |
-   |         | much restriction on what $PROMPT_COMMAND may contain.        |
+   | 7093    | Test for existence of the getRepositories method since       |
+   | zmedico | bindbapi doesn't have it atm.                                |
    |---------+--------------------------------------------------------------|
-   | 6770    | For bug #152828, run ${CHOST}-ldconfig when ${CBUILD} !=     |
-   | zmedico | ${CHOST}.                                                    |
+   | 7094    | Add a 0xAAAA00 rgb color code to represent the darkyellow    |
+   | zmedico | color that some terminals have instead of brown.             |
    |---------+--------------------------------------------------------------|
-   | 6772    | Only execute $PROMPT_COMMAND when appropriate.               |
+   | 7096    | print a notice when a repository/overlay does not have a     |
+   | genone  | name                                                         |
+   |---------+--------------------------------------------------------------|
+   | 7097    | ewarn when merging a package and the source                  |
+   | genone  | repository/overlay does not have a name                      |
+   |---------+--------------------------------------------------------------|
+   | 7098    | apply additional phase filters as otherwise some messages    |
+   | genone  | are logged in both unmerge and merge                         |
+   |---------+--------------------------------------------------------------|
+   | 7099    | Remove old wheel group warnings since portage stopped using  |
+   | zmedico | this group long ago.                                         |
+   |---------+--------------------------------------------------------------|
+   | 7100    | Add docs for /etc/portage/color.map and a few misc man page  |
+   | zmedico | fixes. Thanks to Arfrever Frehtes Taifersar Arahesis         |
+   |         | <Arfrever.FTA@GMail.Com> in bug #183758.                     |
+   |---------+--------------------------------------------------------------|
+   | 7102    | Add a QA warning for invalid values of RESTRICT. Thanks to   |
+   | zmedico | peper for the patch.                                         |
+   |---------+--------------------------------------------------------------|
+   | 7104    | For bug #180045, try to merge PDEPEND as soon as possible so |
+   | zmedico | that it behaves more like RDEPEND.                           |
+   |---------+--------------------------------------------------------------|
+   | 7106    | Add medium-soft support to DepPriority.__str__().            |
    | zmedico |                                                              |
    |---------+--------------------------------------------------------------|
-   | 6775    | Skip bogus '$ECLASS inherited illegally' messages when       |
-   | zmedico | installing from a binary package.                            |
+   | 7108    | Update --buildpkgonly logic to account for                   |
+   | zmedico | DepPriority.MEDIUM_SOFT.                                     |
    |---------+--------------------------------------------------------------|
-   | 6778    | For bug #181387, fix an UnboundLocalError for the mymtime    |
-   | zmedico | variable that is triggered by confmem.                       |
+   | 7110    | Revert --buildpkgonly logic back because it was already      |
+   | zmedico | correct.                                                     |
    |---------+--------------------------------------------------------------|
-   | 6780    | For bug #148702, automatically enable flags from IUSE if     |
-   | zmedico | they correspond to unset USE_EXPAND variables such as        |
-   |         | LINGUAS. The variable only has to be set to some value or an |
-   |         | empty string in order to disable these flags.                |
+   | 7112    | For bug #131030, update the warning about potential for      |
+   | zmedico | emerge --sync overwrite or delete files in ${PORTDIR}. Add   |
+   |         | references to the PKGDIR and DISTDIR docs.                   |
    |---------+--------------------------------------------------------------|
-   | 6782    | When an update is discarded due to confmem, record it's      |
-   | zmedico | mtime in the contents (it's md5 is already recorded there    |
-   |         | too).                                                        |
+   | 7114    | s/PORTAGE_EXTRA_RSYNC_OPTS/PORTAGE_RSYNC_OPTS/ for           |
+   | zmedico | correctness.                                                 |
    |---------+--------------------------------------------------------------|
-   | 6784    | For bug #148702, use the * token to trigger wildcard         |
-   | zmedico | expansion of IUSE. This adds flexibility and prevents flags  |
-   |         | from being enabled unexpectedly.                             |
+   | 7116    | If necessary, resample the leaf nodes so that they include   |
+   | zmedico | all nodes whose hard deps are satisfied.                     |
    |---------+--------------------------------------------------------------|
-   | 6786    | Preserve order of flags from IUSE in wildcard expansion.     |
+   | 7118    | Move medium priority out of ignore_priority_range and handle |
+   | zmedico | it separately.                                               |
+   |---------+--------------------------------------------------------------|
+   | 7120    | Flatten restrict for the RESTRICT.invalid check.             |
    | zmedico |                                                              |
    |---------+--------------------------------------------------------------|
-   | 6788    | Make repoman work with both + and - flags in IUSE.           |
+   | 7122    | Clean up the selected_nodes logic in depgraph.altlist().     |
    | zmedico |                                                              |
    |---------+--------------------------------------------------------------|
-   | 6790    | For bug #181551, support slot deps in package.keywords.      |
+   | 7124    | Clone asap_nodes so that iteration is safe for node removal. |
    | zmedico |                                                              |
    |---------+--------------------------------------------------------------|
-   | 6792    | For bug #81097, detect and report suspicious hardlinks to    |
-   | zmedico | suid/sgid files. False positives are prevented by doing      |
-   |         | reference counts for each inode having suid/sgid bits and    |
-   |         | multiple hardlinks. The security check is done prior to each |
-   |         | merge or unmerge phase and it will cause the phase to abort  |
-   |         | if a problem is found (so that the user can investigate      |
-   |         | before any files are removed).                               |
-   |---------+--------------------------------------------------------------|
-   | 6793    | Don't bother to warn about hardlinks to suid/sgid files      |
-   | zmedico | before unlink since it can give false positives and the      |
-   |         | existing suid/sgid security check should spot problems       |
-   |         | before this anyway.                                          |
-   |---------+--------------------------------------------------------------|
-   | 6794    | Fix the suid/sgid check so it only looks at regular files    |
-   | zmedico | since it can generate false positives otherwise.             |
-   |---------+--------------------------------------------------------------|
-   | 6796    | For bug #181355, detect parenthesis mismatch in              |
-   | zmedico | paren_reduce(), raise an InvalidDependString exception, and  |
-   |         | make sure that all callers handle the exception properly.    |
-   |---------+--------------------------------------------------------------|
-   | 6797    | Remove the "missing left parenthesis" test for now since it  |
-   | zmedico | gives false positives.                                       |
-   |---------+--------------------------------------------------------------|
-   | 6799    | For consistency with other xterm titles code, redirect       |
-   | zmedico | $PROMPT_COMMAND output to stderr.                            |
-   |---------+--------------------------------------------------------------|
-   | 6802    | Bump 2.1.3 to 2.2 for some features and add news about       |
-   | zmedico | USE_EXPAND wildcards.                                        |
+   | 7126    | Prefer asap_nodes more aggressively over any other nodes     |
+   | zmedico | whenever possible. If no asap_nodes can be selected for a    |
+   |         | given iteration, they will be ignored for the next           |
+   |         | iteration.                                                   |
    +------------------------------------------------------------------------+

trunk/essentials/sys-apps/prefix-portage/configure

@@ -718 +718 @@
 XARGS
 CPP
-ALLOCA
 portageuser
 portagegroup
-wheelgid
 rootuser
 rootuid
+rootgid
 DOMAIN_PREFIX
 DEFAULT_PATH
@@ -732 +731 @@
 BUILD_TBZ2TOOL_TRUE
 BUILD_TBZ2TOOL_FALSE
-BUILD_MISSINGOS_TRUE
-BUILD_MISSINGOS_FALSE
 LIBOBJS
 LTLIBOBJS'
@@ -1330 +1327 @@
   --enable-tbz2tool       build tbz2tool, tool for creating binpkgs (default
                           yes)
-  --enable-missingos      build compatibility missingos code for python 2.2
-                          (default auto)
   --enable-just-compiled-sources
                           install just the bytecode, not the sources (default
@@ -1339 +1334 @@
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-user=me          use user 'me' for portage to work as (default
+  --with-portage-user=myuser
+                          use user 'myuser' as portage owner (default portage)
+  --with-portage-group=mygroup
+                          use group 'mygroup' as portage users group (default
                           portage)
-  --with-group=mygroup    use group 'mygroup' for portage to work as (default
-                          portage)
-  --with-wheelgid=wheelgid
-                          let portage use 'wheelgid' as wheel group (default
-                          0)
-  --with-rootuser=me      declares 'me' as the portage owner (default root)
+  --with-rootuser=myuser  uses 'myuser' as owner of installed files (default
+                          is portage-user)
   --with-offset-prefix    specify the installation prefix for all packages ,
                           defaults to /
@@ -3813 +3807 @@
 
 
-    if test "$PYTHON" = "no" ; then
-    { { echo "$as_me:$LINENO: error: no python found in your path" >&5
-echo "$as_me: error: no python found in your path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-
     { echo "$as_me:$LINENO: checking whether $XCU_ID is good enough" >&5
 echo $ECHO_N "checking whether $XCU_ID is good enough... $ECHO_C" >&6; }
@@ -4453 +4441 @@
 
 
-
-{ echo "$as_me:$LINENO: checking for main in -lc" >&5
-echo $ECHO_N "checking for main in -lc... $ECHO_C" >&6; }
-if test "${ac_cv_lib_c_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-return main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-         test -z "$ac_c_werror_flag" ||
-         test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_c_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-        ac_cv_lib_c_main=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_main" >&5
-echo "${ECHO_T}$ac_cv_lib_c_main" >&6; }
-if test $ac_cv_lib_c_main = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBC 1
-_ACEOF
-
-  LIBS="-lc $LIBS"
-
-fi
-
-
-{ echo "$as_me:$LINENO: checking for main in -ldl" >&5
-echo $ECHO_N "checking for main in -ldl... $ECHO_C" >&6; }
-if test "${ac_cv_lib_dl_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-return main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-         test -z "$ac_c_werror_flag" ||
-         test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_dl_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-        ac_cv_lib_dl_main=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_main" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_main" >&6; }
-if test $ac_cv_lib_dl_main = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBDL 1
-_ACEOF
-
-  LIBS="-ldl $LIBS"
-
-fi
-
-
-{ echo "$as_me:$LINENO: checking for main in -lgcc" >&5
-echo $ECHO_N "checking for main in -lgcc... $ECHO_C" >&6; }
-if test "${ac_cv_lib_gcc_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgcc  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-return main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-         test -z "$ac_c_werror_flag" ||
-         test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_gcc_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-        ac_cv_lib_gcc_main=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_gcc_main" >&5
-echo "${ECHO_T}$ac_cv_lib_gcc_main" >&6; }
-if test $ac_cv_lib_gcc_main = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBGCC 1
-_ACEOF
-
-  LIBS="-lgcc $LIBS"
-
-fi
-
-
-{ echo "$as_me:$LINENO: checking for main in -lpthread" >&5
-echo $ECHO_N "checking for main in -lpthread... $ECHO_C" >&6; }
-if test "${ac_cv_lib_pthread_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-return main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-         test -z "$ac_c_werror_flag" ||
-         test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_lib_pthread_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-        ac_cv_lib_pthread_main=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_main" >&5
-echo "${ECHO_T}$ac_cv_lib_pthread_main" >&6; }
-if test $ac_cv_lib_pthread_main = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBPTHREAD 1
-_ACEOF
-
-  LIBS="-lpthread $LIBS"
-
-fi
-
-
-
-
-
-
-
-ac_header_dirent=no
-for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
-  as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5
-echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; }
-if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <$ac_hdr>
-
-int
-main ()
-{
-if ((DIR *) 0)
-return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-         test -z "$ac_c_werror_flag" ||
-         test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-        eval "$as_ac_Header=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_Header'}'`
-               { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1
-_ACEOF
-
-ac_header_dirent=$ac_hdr; break
-fi
-
-done
-# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
-if test $ac_header_dirent = dirent.h; then
-  { echo "$as_me:$LINENO: checking for library containing opendir" >&5
-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
-if test "${ac_cv_search_opendir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char opendir ();
-int
-main ()
-{
-return opendir ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' dir; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-         test -z "$ac_c_werror_flag" ||
-         test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_search_opendir=$ac_res
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_opendir+set}" = set; then
-  break
-fi
-done
-if test "${ac_cv_search_opendir+set}" = set; then
-  :
-else
-  ac_cv_search_opendir=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
-ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-else
-  { echo "$as_me:$LINENO: checking for library containing opendir" >&5
-echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; }
-if test "${ac_cv_search_opendir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_func_search_save_LIBS=$LIBS
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char opendir ();
-int
-main ()
-{
-return opendir ();
-  ;
-  return 0;
-}
-_ACEOF
-for ac_lib in '' x; do
-  if test -z "$ac_lib"; then
-    ac_res="none required"
-  else
-    ac_res=-l$ac_lib
-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-  fi
-  rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-         test -z "$ac_c_werror_flag" ||
-         test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_search_opendir=$ac_res
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext
-  if test "${ac_cv_search_opendir+set}" = set; then
-  break
-fi
-done
-if test "${ac_cv_search_opendir+set}" = set; then
-  :
-else
-  ac_cv_search_opendir=no
-fi
-rm conftest.$ac_ext
-LIBS=$ac_func_search_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5
-echo "${ECHO_T}$ac_cv_search_opendir" >&6; }
-ac_res=$ac_cv_search_opendir
-if test "$ac_res" != no; then
-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-
-fi
-
-fi
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -5360 +4846 @@
 fi
 
-{ echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5
-echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; }
-if test "${ac_cv_header_sys_wait_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <sys/wait.h>
-#ifndef WEXITSTATUS
-# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8)
-#endif
-#ifndef WIFEXITED
-# define WIFEXITED(stat_val) (((stat_val) & 255) == 0)
-#endif
-
-int
-main ()
-{
-  int s;
-  wait (&s);
-  s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-         test -z "$ac_c_werror_flag" ||
-         test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_header_sys_wait_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-        ac_cv_header_sys_wait_h=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5
-echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; }
-if test $ac_cv_header_sys_wait_h = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SYS_WAIT_H 1
-_ACEOF
-
-fi
-
 # On IRIX 5.3, sys/types and inttypes.h are conflicting.
 
@@ -5503 +4922 @@
 
 
-
-for ac_header in fcntl.h limits.h strings.h sys/file.h sys/time.h unistd.h getopt.h stdio.h
+for ac_header in string.h errno.h unistd.h stdio.h stdlib.h sys/stat.h sys/types.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
@@ -5649 +5067 @@
 
 
-{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
-echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
-if test "${ac_cv_c_const+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-/* FIXME: Include the comments suggested by Paul. */
-#ifndef __cplusplus
-  /* Ultrix mips cc rejects this.  */
-  typedef int charset[2];
-  const charset cs;
-  /* SunOS 4.1.1 cc rejects this.  */
-  char const *const *pcpcc;
-  char **ppc;
-  /* NEC SVR4.0.2 mips cc rejects this.  */
-  struct point {int x, y;};
-  static struct point const zero = {0,0};
-  /* AIX XL C 1.02.0.0 rejects this.
-     It does not let you subtract one const X* pointer from another in
-     an arm of an if-expression whose if-part is not a constant
-     expression */
-  const char *g = "string";
-  pcpcc = &g + (g ? g-g : 0);
-  /* HPUX 7.0 cc rejects these. */
-  ++pcpcc;
-  ppc = (char**) pcpcc;
-  pcpcc = (char const *const *) ppc;
-  { /* SCO 3.2v4 cc rejects this.  */
-    char *t;
-    char const *s = 0 ? (char *) 0 : (char const *) 0;
-
-    *t++ = 0;
-    if (s) return 0;
-  }
-  { /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-    int x[] = {25, 17};
-    const int *foo = &x[0];
-    ++foo;
-  }
-  { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-    typedef const int *iptr;
-    iptr p = 0;
-    ++p;
-  }
-  { /* AIX XL C 1.02.0.0 rejects this saying
-       "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-    struct s { int j; const int *ap[3]; };
-    struct s *b; b->j = 5;
-  }
-  { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-    const int foo = 10;
-    if (!foo) return 0;
-  }
-  return !cs[0] && !zero.x;
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-         test -z "$ac_c_werror_flag" ||
-         test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_c_const=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-        ac_cv_c_const=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5
-echo "${ECHO_T}$ac_cv_c_const" >&6; }
-if test $ac_cv_c_const = no; then
-
-cat >>confdefs.h <<\_ACEOF
-#define const
-_ACEOF
-
-fi
-
-{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5
-echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; }
-if test "${ac_cv_type_uid_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "uid_t" >/dev/null 2>&1; then
-  ac_cv_type_uid_t=yes
-else
-  ac_cv_type_uid_t=no
-fi
-rm -f conftest*
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
-echo "${ECHO_T}$ac_cv_type_uid_t" >&6; }
-if test $ac_cv_type_uid_t = no; then
-
-cat >>confdefs.h <<\_ACEOF
-#define uid_t int
-_ACEOF
-
-
-cat >>confdefs.h <<\_ACEOF
-#define gid_t int
-_ACEOF
-
-fi
-
-{ echo "$as_me:$LINENO: checking for mode_t" >&5
-echo $ECHO_N "checking for mode_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_mode_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef mode_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-         test -z "$ac_c_werror_flag" ||
-         test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_mode_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-        ac_cv_type_mode_t=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
-echo "${ECHO_T}$ac_cv_type_mode_t" >&6; }
-if test $ac_cv_type_mode_t = yes; then
-  :
-else
-
-cat >>confdefs.h <<_ACEOF
-#define mode_t int
-_ACEOF
-
-fi
-
-{ echo "$as_me:$LINENO: checking for size_t" >&5
-echo $ECHO_N "checking for size_t... $ECHO_C" >&6; }
-if test "${ac_cv_type_size_t+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-typedef size_t ac__type_new_;
-int
-main ()
-{
-if ((ac__type_new_ *) 0)
-  return 0;
-if (sizeof (ac__type_new_))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-         test -z "$ac_c_werror_flag" ||
-         test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_size_t=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-        ac_cv_type_size_t=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5
-echo "${ECHO_T}$ac_cv_type_size_t" >&6; }
-if test $ac_cv_type_size_t = yes; then
-  :
-else
-
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
-
-fi
-
-
-# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
-# for constant arguments.  Useless!
-{ echo "$as_me:$LINENO: checking for working alloca.h" >&5
-echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6; }
-if test "${ac_cv_working_alloca_h+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <alloca.h>
-int
-main ()
-{
-char *p = (char *) alloca (2 * sizeof (int));
-                          if (p) return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-         test -z "$ac_c_werror_flag" ||
-         test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_working_alloca_h=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-        ac_cv_working_alloca_h=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5
-echo "${ECHO_T}$ac_cv_working_alloca_h" >&6; }
-if test $ac_cv_working_alloca_h = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA_H 1
-_ACEOF
-
-fi
-
-{ echo "$as_me:$LINENO: checking for alloca" >&5
-echo $ECHO_N "checking for alloca... $ECHO_C" >&6; }
-if test "${ac_cv_func_alloca_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# ifdef _MSC_VER
-#  include <malloc.h>
-#  define alloca _alloca
-# else
-#  ifdef HAVE_ALLOCA_H
-#   include <alloca.h>
-#  else
-#   ifdef _AIX
- #pragma alloca
-#   else
-#    ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-#    endif
-#   endif
-#  endif
-# endif
-#endif
-
-int
-main ()
-{
-char *p = (char *) alloca (1);
-                                    if (p) return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-         test -z "$ac_c_werror_flag" ||
-         test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  ac_cv_func_alloca_works=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-        ac_cv_func_alloca_works=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5
-echo "${ECHO_T}$ac_cv_func_alloca_works" >&6; }
-
-if test $ac_cv_func_alloca_works = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_ALLOCA 1
-_ACEOF
-
-else
-  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-# that cause trouble.  Some versions do not even contain alloca or
-# contain a buggy version.  If you still want to use their alloca,
-# use ar to extract alloca.o from them instead of compiling alloca.c.
-
-ALLOCA=\${LIBOBJDIR}alloca.$ac_objext
-
-cat >>confdefs.h <<\_ACEOF
-#define C_ALLOCA 1
-_ACEOF
-
-
-{ echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5
-echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6; }
-if test "${ac_cv_os_cray+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#if defined CRAY && ! defined CRAY2
-webecray
-#else
-wenotbecray
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "webecray" >/dev/null 2>&1; then
-  ac_cv_os_cray=yes
-else
-  ac_cv_os_cray=no
-fi
-rm -f conftest*
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5
-echo "${ECHO_T}$ac_cv_os_cray" >&6; }
-if test $ac_cv_os_cray = yes; then
-  for ac_func in _getb67 GETB67 getb67; do
-    as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-         test -z "$ac_c_werror_flag" ||
-         test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-        eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-               { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define CRAY_STACKSEG_END $ac_func
-_ACEOF
-
-    break
-fi
-
-  done
-fi
-
-{ echo "$as_me:$LINENO: checking stack direction for C alloca" >&5
-echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6; }
-if test "${ac_cv_c_stack_direction+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_c_stack_direction=0
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-find_stack_direction ()
-{
-  static char *addr = 0;
-  auto char dummy;
-  if (addr == 0)
-    {
-      addr = &dummy;
-      return find_stack_direction ();
-    }
-  else
-    return (&dummy > addr) ? 1 : -1;
-}
-
-int
-main ()
-{
-  return find_stack_direction () < 0;
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_try") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_c_stack_direction=1
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_c_stack_direction=-1
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5
-echo "${ECHO_T}$ac_cv_c_stack_direction" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define STACK_DIRECTION $ac_cv_c_stack_direction
-_ACEOF
-
-
-fi
-
-{ echo "$as_me:$LINENO: checking return type of signal handlers" >&5
-echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6; }
-if test "${ac_cv_type_signal+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <sys/types.h>
-#include <signal.h>
-
-int
-main ()
-{
-return *(signal (0, 0)) (0) == 1;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-         test -z "$ac_c_werror_flag" ||
-         test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-  ac_cv_type_signal=int
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-        ac_cv_type_signal=void
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5
-echo "${ECHO_T}$ac_cv_type_signal" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define RETSIGTYPE $ac_cv_type_signal
-_ACEOF
-
-
-
-
-
-
-
-
-
-
-for ac_func in getcwd mkdir regcomp rmdir strdup strerror strspn strstr
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-{ echo "$as_me:$LINENO: checking for $ac_func" >&5
-echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_$ac_func || defined __stub___$ac_func
-choke me
-#endif
-
-int
-main ()
-{
-return $ac_func ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-  (eval "$ac_link") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-         test -z "$ac_c_werror_flag" ||
-         test ! -s conftest.err
-       } && test -s conftest$ac_exeext &&
-       $as_test_x conftest$ac_exeext; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-        eval "$as_ac_var=no"
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-ac_res=`eval echo '${'$as_ac_var'}'`
-               { echo "$as_me:$LINENO: result: $ac_res" >&5
-echo "${ECHO_T}$ac_res" >&6; }
-if test `eval echo '${'$as_ac_var'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
 # Check whether --enable-tbz2tool was given.
 if test "${enable_tbz2tool+set}" = set; then
@@ -6452 +5081 @@
 
 
-# Check whether --enable-missingos was given.
-if test "${enable_missingos+set}" = set; then
-  enableval=$enable_missingos; case "${enableval}" in
-  yes)  enable_missingos=true;;
-  no)   enable_missingos=false;;
-  auto) enable_missingos=auto;;
-  *)    { { echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-missingos" >&5
-echo "$as_me: error: bad value ${enableval} for --enable-missingos" >&2;}
-   { (exit 1); exit 1; }; };;
-esac
-else
-  enable_missingos=auto
-fi
-
-
 # Check whether --enable-just-compiled-sources was given.
 if test "${enable_just_compiled_sources+set}" = set; then
@@ -6482 +5096 @@
 
 
-# Check whether --with-user was given.
-if test "${with_user+set}" = set; then
-  withval=$with_user; case "${withval}" in
-  ""|yes) { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-user" >&5
-echo "$as_me: error: bad value ${withval} for --with-user" >&2;}
+# Check whether --with-portage-user was given.
+if test "${with_portage_user+set}" = set; then
+  withval=$with_portage_user; case "${withval}" in
+  ""|yes) { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-portage-user" >&5
+echo "$as_me: error: bad value ${withval} for --with-portage-user" >&2;}
    { (exit 1); exit 1; }; };;
   *) portageuser="${withval}";;
@@ -6496 +5110 @@
 
 
-# Check whether --with-group was given.
-if test "${with_group+set}" = set; then
-  withval=$with_group; case "${withval}" in
-  ""|yes) { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-group" >&5
-echo "$as_me: error: bad value ${withval} for --with-group" >&2;}
+# Check whether --with-portage-group was given.
+if test "${with_portage_group+set}" = set; then
+  withval=$with_portage_group; case "${withval}" in
+  ""|yes) { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-portage-group" >&5
+echo "$as_me: error: bad value ${withval} for --with-portage-group" >&2;}
    { (exit 1); exit 1; }; };;
   *) portagegroup="${withval}";;
@@ -6506 +5120 @@
 else
   portagegroup="portage"
-fi
-
-
-
-# Check whether --with-wheelgid was given.
-if test "${with_wheelgid+set}" = set; then
-  withval=$with_wheelgid; case "${withval}" in
-  ""|yes) { { echo "$as_me:$LINENO: error: bad value ${withval} for --with-wheelgid" >&5
-echo "$as_me: error: bad value ${withval} for --with-wheelgid" >&2;}
-   { (exit 1); exit 1; }; };;
-  *) wheelgid="${withval}";;
-esac
-else
-  wheelgid="0"
 fi
 
@@ -6530 +5130 @@
 echo "$as_me: error: bad value ${withval} for --with-rootuser" >&2;}
    { (exit 1); exit 1; }; };;
-  *) rootuser=${withval}
-     rootuid=`id -u ${withval}`;;
-esac
-else
-  rootuser=root
+  *) rootuser=${withval};;
+esac
+else
+  rootuser=${portageuser}
 fi
 
@@ -6550 +5149 @@
    { (exit 1); exit 1; }; }
 fi
+{ echo "$as_me:$LINENO: checking for group id of ${rootuser}" >&5
+echo $ECHO_N "checking for group id of ${rootuser}... $ECHO_C" >&6; }
+rootgid=`${XCU_ID} -g ${rootuser}`
+if [ `echo ${rootgid} | ${EGREP} '^[[:digit:]]+$'` ]
+then
+        { echo "$as_me:$LINENO: result: ${rootgid}" >&5
+echo "${ECHO_T}${rootgid}" >&6; }
+else
+        { { echo "$as_me:$LINENO: error: error finding the group id of ${rootuser}" >&5
+echo "$as_me: error: error finding the group id of ${rootuser}" >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
 
@@ -6570 +5181 @@
 
 
-
-if test x$enable_missingos = xauto
-then
-  pyver=`python -c 'import sys;print sys.version[0:3]';`
-  case ${pyver} in
-    2.4)  ;;
-    2.3)  ;;
-    2.2)  enable_missingos=true;;
-    *)    { echo "$as_me:$LINENO: WARNING: unable to determine python version, ${pyver}" >&5
-echo "$as_me: WARNING: unable to determine python version, ${pyver}" >&2;};;
-  esac
-fi
 
 { echo "$as_me:$LINENO: checking for ARCH to be used" >&5
@@ -6609 +5208 @@
 ac_config_files="$ac_config_files man/Makefile"
 
-ac_config_files="$ac_config_files src/python-missingos/Makefile"
-
 ac_config_files="$ac_config_files bin/Makefile"
 
@@ -6644 +5241 @@
 fi
 
- if test x$enable_missingos = xtrue; then
-  BUILD_MISSINGOS_TRUE=
-  BUILD_MISSINGOS_FALSE='#'
-else
-  BUILD_MISSINGOS_TRUE='#'
-  BUILD_MISSINGOS_FALSE=
-fi
-
-#AM_CONDITIONAL(BUILD_FILTER_ENV, test x$enable_filter_env = xtrue)
 
 { echo "$as_me:$LINENO: checking for a list of variables known by configure" >&5
@@ -6826 +5414 @@
    { (exit 1); exit 1; }; }
 fi
-if test -z "${BUILD_MISSINGOS_TRUE}" && test -z "${BUILD_MISSINGOS_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"BUILD_MISSINGOS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"BUILD_MISSINGOS\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 
 : ${CONFIG_STATUS=./config.status}
@@ -7291 +5872 @@
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
-    "src/python-missingos/Makefile") CONFIG_FILES="$CONFIG_FILES src/python-missingos/Makefile" ;;
     "bin/Makefile") CONFIG_FILES="$CONFIG_FILES bin/Makefile" ;;
     "pym/Makefile") CONFIG_FILES="$CONFIG_FILES pym/Makefile" ;;
@@ -7499 +6079 @@
 XARGS!$XARGS$ac_delim
 CPP!$CPP$ac_delim
-ALLOCA!$ALLOCA$ac_delim
 portageuser!$portageuser$ac_delim
 portagegroup!$portagegroup$ac_delim
-wheelgid!$wheelgid$ac_delim
 rootuser!$rootuser$ac_delim
 rootuid!$rootuid$ac_delim
+rootgid!$rootgid$ac_delim
 DOMAIN_PREFIX!$DOMAIN_PREFIX$ac_delim
 DEFAULT_PATH!$DEFAULT_PATH$ac_delim
@@ -7513 +6092 @@
 BUILD_TBZ2TOOL_TRUE!$BUILD_TBZ2TOOL_TRUE$ac_delim
 BUILD_TBZ2TOOL_FALSE!$BUILD_TBZ2TOOL_FALSE$ac_delim
-BUILD_MISSINGOS_TRUE!$BUILD_MISSINGOS_TRUE$ac_delim
-BUILD_MISSINGOS_FALSE!$BUILD_MISSINGOS_FALSE$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 23; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 20; then
     break
   elif $ac_last_try; then

trunk/essentials/sys-apps/prefix-portage/configure.in

@@ -47 +47 @@
 GENTOO_PATH_GNUPROG(GREP, [grep])
 
-dnl Checks for libraries.
-dnl Replace `main' with a function in -lc:
-AC_CHECK_LIB(c, main)
-dnl Replace `main' with a function in -ldl:
-AC_CHECK_LIB(dl, main)
-dnl Replace `main' with a function in -lgcc:
-AC_CHECK_LIB(gcc, main)
-dnl Replace `main' with a function in -lpthread:
-AC_CHECK_LIB(pthread, main)
-
 dnl Checks for header files.
-AC_HEADER_DIRENT
 AC_HEADER_STDC
-AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(fcntl.h limits.h strings.h sys/file.h sys/time.h unistd.h getopt.h stdio.h)
-
-dnl Checks for typedefs, structures, and compiler characteristics.
-AC_C_CONST
-AC_TYPE_UID_T
-AC_TYPE_MODE_T
-AC_TYPE_SIZE_T
-
-dnl Checks for library functions.
-AC_FUNC_ALLOCA
-AC_TYPE_SIGNAL
-AC_CHECK_FUNCS(getcwd mkdir regcomp rmdir strdup strerror strspn strstr)
+AC_CHECK_HEADERS([string.h errno.h unistd.h stdio.h stdlib.h sys/stat.h sys/types.h])
 
 AC_ARG_ENABLE(tbz2tool,
@@ -83 +60 @@
 [enable_tbz2tool=true])
 
-AC_ARG_ENABLE(missingos,
-AC_HELP_STRING([--enable-missingos],[build compatibility missingos code for python 2.2 (default auto)]),
-[case "${enableval}" in
-  yes)  enable_missingos=true;;
-  no)   enable_missingos=false;;
-  auto) enable_missingos=auto;;
-  *)    AC_MSG_ERROR(bad value ${enableval} for --enable-missingos);;
-esac],
-[enable_missingos=auto])
-
 AC_ARG_ENABLE(just-compiled-sources,
 AC_HELP_STRING([--enable-just-compiled-sources],[install just the bytecode, not the sources (default no)]),
@@ -102 +69 @@
 [enable_py_sources=true])
 
-AC_ARG_WITH(user,
-AC_HELP_STRING([--with-user=me],[use user 'me' for portage to work as (default portage)]),
+AC_ARG_WITH(portage-user,
+AC_HELP_STRING([--with-portage-user=myuser],[use user 'myuser' as portage owner (default portage)]),
 [case "${withval}" in
-  ""|yes) AC_MSG_ERROR(bad value ${withval} for --with-user);;
+  ""|yes) AC_MSG_ERROR(bad value ${withval} for --with-portage-user);;
   *) portageuser="${withval}";;
 esac],
 [portageuser="portage"])
 
-AC_ARG_WITH(group,
-AC_HELP_STRING([--with-group=mygroup],[use group 'mygroup' for portage to work as (default portage)]),
+AC_ARG_WITH(portage-group,
+AC_HELP_STRING([--with-portage-group=mygroup],[use group 'mygroup' as portage users group (default portage)]),
 [case "${withval}" in
-  ""|yes) AC_MSG_ERROR(bad value ${withval} for --with-group);;
+  ""|yes) AC_MSG_ERROR(bad value ${withval} for --with-portage-group);;
   *) portagegroup="${withval}";;
 esac],
 [portagegroup="portage"])
 
-AC_ARG_WITH(wheelgid,
-AC_HELP_STRING([--with-wheelgid=wheelgid],[let portage use 'wheelgid' as wheel group (default 0)]),
-[case "${withval}" in
-  ""|yes) AC_MSG_ERROR(bad value ${withval} for --with-wheelgid);;
-  *) wheelgid="${withval}";;
-esac],
-[wheelgid="0"])
-
 AC_ARG_WITH(rootuser,
-AC_HELP_STRING([--with-rootuser=me],[declares 'me' as the portage owner (default root)]),
+AC_HELP_STRING([--with-rootuser=myuser],[uses 'myuser' as owner of installed files (default is portage-user)]),
 [case "${withval}" in
   ""|yes) AC_MSG_ERROR(bad value ${withval} for --with-rootuser);;
-  *) rootuser=${withval}
-     rootuid=`id -u ${withval}`;;
+  *) rootuser=${withval};;
 esac],
-[rootuser=root])
+[rootuser=${portageuser}])
 
 AC_MSG_CHECKING([for user id of ${rootuser}])
@@ -143 +101 @@
 else
         AC_MSG_ERROR([error finding the user id of ${rootuser}])
+fi
+AC_MSG_CHECKING([for group id of ${rootuser}])
+rootgid=`${XCU_ID} -g ${rootuser}`
+if [[ `echo ${rootgid} | ${EGREP} '^[[:digit:]]+$'` ]]
+then
+        AC_MSG_RESULT([${rootgid}])
+else
+        AC_MSG_ERROR([error finding the group id of ${rootuser}])
 fi
 
@@ -156 +122 @@
 [DEFAULT_PATH="${DEFAULT_PATH}"])
 
-
-if test x$enable_missingos = xauto
-then
-  pyver=[`python -c 'import sys;print sys.version[0:3]';`]
-  case ${pyver} in
-    2.4)  ;;
-    2.3)  ;;
-    2.2)  enable_missingos=true;;
-    *)    AC_MSG_WARN([unable to determine python version, ${pyver}]);;
-  esac
-fi
 
 AC_MSG_CHECKING([for ARCH to be used])
@@ -187 +142 @@
 AC_CONFIG_FILES([ src/Makefile ])
 AC_CONFIG_FILES([ man/Makefile ])
-AC_CONFIG_FILES([ src/python-missingos/Makefile ])
 AC_CONFIG_FILES([ bin/Makefile ])
 AC_CONFIG_FILES([ pym/Makefile ])
@@ -194 +148 @@
 AC_SUBST(portageuser)
 AC_SUBST(portagegroup)
-AC_SUBST(wheelgid)
 AC_SUBST(rootuser)
 AC_SUBST(rootuid)
+AC_SUBST(rootgid)
 AC_SUBST(DOMAIN_PREFIX)
 AC_SUBST(DEFAULT_PATH)
@@ -203 +157 @@
 AM_CONDITIONAL(INSTALL_PYTHON_SOURCES, test x$enable_py_sources = xtrue)
 AM_CONDITIONAL(BUILD_TBZ2TOOL, test x$enable_tbz2tool = xtrue)
-AM_CONDITIONAL(BUILD_MISSINGOS, test x$enable_missingos = xtrue)
-#AM_CONDITIONAL(BUILD_FILTER_ENV, test x$enable_filter_env = xtrue)
 
 AC_MSG_CHECKING([for a list of variables known by configure])

trunk/essentials/sys-apps/prefix-portage/kNIX-bootstrap-os2.x86-subst-install.vars

@@ -103 +103 @@
 portageuser="portage"
 portagegroup="portage"
-wheelgid="0"
 rootuser="root"
 rootuid="0"
+rootgid="0"
 DOMAIN_PREFIX="/@unixroot"
 DEFAULT_PATH="/@unixroot/usr/bin;/@unixroot/bin;/@unixroot/usr/local/bin;/@unixroot/usr/bin;"

trunk/essentials/sys-apps/prefix-portage/ltmain.sh

@@ -44 +44 @@
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.5.23b
-TIMESTAMP=" (1.1220.2.437 2007/02/17 09:08:45)"
+VERSION=1.5.24
+TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
 
 # Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
@@ -1706 +1706 @@
       -no-install)
         case $host in
-        *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+        *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
           # The PATH hackery in wrapper scripts is required on Windows
-          # in order for the loader to find any dlls it needs.
+          # and Darwin in order for the loader to find any dlls it needs.
           $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
           $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
@@ -3254 +3254 @@
             ;;
           irix|nonstopux)
-            current=`expr $number_major + $number_minor - 1`
+            current=`expr $number_major + $number_minor`
             age="$number_minor"
             revision="$number_minor"
+            lt_irix_increment=no
             ;;
           esac
@@ -3315 +3316 @@
           # Darwin ld doesn't like 0 for these options...
           minor_current=`expr $current + 1`
-          verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+          xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+          verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
           ;;
 
@@ -3329 +3331 @@
 
         irix | nonstopux)
-          major=`expr $current - $age + 1`
-
+          if test "X$lt_irix_increment" = "Xno"; then
+            major=`expr $current - $age`
+          else
+            major=`expr $current - $age + 1`
+          fi
           case $version_type in
             nonstopux) verstring_prefix=nonstopux ;;
@@ -6545 +6550 @@
         eval "if test \"\${save_$lt_var+set}\" = set; then
                 $lt_var=\$save_$lt_var; export $lt_var
-              else
-                $lt_unset $lt_var
               fi"
       done

trunk/essentials/sys-apps/prefix-portage/man/Makefile.in

@@ -51 +51 @@
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 ARCH = @ARCH@
@@ -154 +153 @@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+rootgid = @rootgid@
 rootuid = @rootuid@
 rootuser = @rootuser@
@@ -167 +167 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-wheelgid = @wheelgid@
 man_MANS = dispatch-conf.1  \
                 ebuild.1  \

trunk/essentials/sys-apps/prefix-portage/man/ebuild.1

@@ -1 @@
-.TH "EBUILD" "1" "Dec 2005" "Portage 2.1" "Portage"
+.TH "EBUILD" "1" "Jun 2007" "Portage 2.1.3" "Portage"
 .SH "NAME"
 ebuild \- a low level interface to the Portage system
@@ -179 +179 @@
 .SH "FILES"
 .TP
-\fB/etc/make.conf\fR 
+.B /etc/make.conf 
 Contains variables for the build\-process and overwrites those
 in make.globals.
+.TP
+.B /etc/portage/color.map
+Contains variables customizing colors.
 .SH "SEE ALSO"
 .BR emerge (1),
 .BR ebuild (5),
-.BR make.conf (5)
+.BR make.conf (5),
+.BR color.map (5)
 .TP
 The \fI/usr/sbin/ebuild.sh\fR script. 

trunk/essentials/sys-apps/prefix-portage/man/ebuild.5

@@ -1 @@
-.TH "EBUILD" "5" "Jan 2007" "Portage 2.1.2" "Portage"
+.TH "EBUILD" "5" "Jun 2007" "Portage 2.1.3" "Portage"
 .SH "NAME"
 ebuild \- the internal format, variables, and functions in an ebuild script
@@ -321 +321 @@
 \fBRESTRICT\fR = \fI[strip,mirror,fetch,userpriv]\fR
 This should be a space delimited list of portage features to restrict.
+You may use conditional syntax to vary restrictions as seen above in DEPEND.
 .PD 0
 .RS
@@ -331 +332 @@
 see the \fBQA CONTROL VARIABLES\fR section for more specific exemptions.
 .TP
-.I confcache
-Prevent econf from using confcache.
+.I bindist
+Distribution of binary packages is restricted.
 .TP
 .I fetch
@@ -869 +870 @@
 Nicholas Jones <carpaski@gentoo.org>
 Mike Frysinger <vapier@gentoo.org>
-Arfrever Frehtes Taifersar Arahesis <FFTA@WP.PL>
+Arfrever Frehtes Taifersar Arahesis <Arfrever.FTA@gmail.com>
 .fi
 .SH "FILES"
@@ -877 +878 @@
 The helper apps in \fI@PORTAGE_BASE@/bin\fR.
 .TP
-\fB/etc/make.conf\fR 
+.B /etc/make.conf
 Contains variables for the build\-process and overwrites those in make.defaults.
 .TP
-\fB/etc/make.globals\fR
+.B /etc/make.globals
 Contains the default variables for the build\-process, you should edit
 \fI/etc/make.conf\fR instead.
+.TP
+.B /etc/portage/color.map
+Contains variables customizing colors.
 .SH "SEE ALSO"
 .BR ebuild (1),
-.BR make.conf (5)
+.BR make.conf (5),
+.BR color.map (5)

trunk/essentials/sys-apps/prefix-portage/man/emerge.1

@@ -1 @@
-.TH "EMERGE" "1" "Dec 2006" "Portage 2.1" "Portage"
+.TH "EMERGE" "1" "Jun 2007" "Portage 2.1.3" "Portage"
 .SH "NAME"
 emerge \- Command\-line interface to the Portage system
@@ -356 +356 @@
 output from portage's displays.
 .TP
+.BR "\-\-reinstall changed\-use"
+Tells emerge to include installed packages where USE flags have
+changed since installation.  Unlike \fB\-\-newuse\fR, this option does
+not trigger reinstallation when flags that the user has not
+enabled are added or removed.
+.TP
 .BR "\-\-skipfirst"
 This option is only valid when used with \fB\-\-resume\fR.  It removes the 
@@ -573 +579 @@
 listed below\fR.
 .TP
+.B /etc/portage/color.map
+Contains variables customizing colors.
+.TP
 .B /etc/dispatch\-conf.conf
 Contains settings to handle automatic updates/backups of configuration 
@@ -605 +614 @@
 .BR ebuild (5),
 .BR make.conf (5),
+.BR color.map (5),
 .BR portage (5)
 .LP

trunk/essentials/sys-apps/prefix-portage/man/make.conf.5

@@ -1 @@
-.TH "MAKE.CONF" "5" "Jan 2007" "Portage 2.1.2" "Portage"
+.TH "MAKE.CONF" "5" "Jun 2007" "Portage 2.1.3" "Portage"
 .SH "NAME"
 make.conf \- custom settings for Portage
@@ -97 +97 @@
 .TP
 \fBDISTDIR\fR = \fI[path]\fR
-Defines the location of your local source file repository.
+Defines the location of your local source file repository.  Note
+that locations under /usr/portage are not necessarily safe for data storage.
+See the \fBPORTDIR\fR documentation for more information.
 .br
 Defaults to /usr/portage/distfiles.
@@ -271 +273 @@
 \fBUSE\fR flag.
 .TP
+.B unmerge-orphans
+If a file is not claimed by another package in the same slot and it is not
+protected by \fICONFIG_PROTECT\fR, unmerge it even if the modification time or
+checksum differs from the file that was originally installed.
+.TP
 .B userfetch
 When portage is run as root, drop privileges to portage:portage during the
@@ -286 +293 @@
 This variable contains the command used for fetching package sources from
 the internet.  It must contain the full path to the executable as well as the
-place\-holders \\${DISTDIR} and \\${URI}.
+place\-holders \\${DISTDIR}, \\${FILE} and \\${URI}.  The command should be
+written to place the fetched file at \\${DISTDIR}/\\${FILE}.
+Also see \fBRESUMECOMMAND\fR.
 .TP
 \fBGENTOO_MIRRORS\fR = \fI[URLs]\fR
@@ -319 +328 @@
 .TP
 \fBPKGDIR\fR = \fI[path]\fR
-Defines the location where created .tbz2 binary packages will be stored.
+Defines the location where created .tbz2 binary packages will be stored.  Note
+that locations under /usr/portage are not necessarily safe for data storage.
+See the \fBPORTDIR\fR documentation for more information.
 .br
 Defaults to /usr/portage/packages.
@@ -325 +336 @@
 .B PORT_LOGDIR
 This variable defines the directory in which per\-ebuild logs are kept.
-Logs are created only when this is set and writable.
+Logs are created only when this is set. They are stored as
+${CATEGORY}:${PF}:YYYYMMDD\-HHMMSS.log in the directory specified. If the
+direcory does not exist, it will be created automatically and group permissions
+will be applied to it.  If the directory already exists, portage will not
+modify it's permissions.
 .TP
 \fBPORTAGE_BINHOST\fR = \fI"ftp://login:pass@grp.mirror.site/pub/grp/i686/athlon\-xp/"\fR
@@ -410 +425 @@
 .TP
 \fBPORTDIR\fR = \fI[path]\fR
-Defines the location of your Portage tree.
+Defines the location of the Portage tree. This is the repository for all
+profile information as well as all ebuilds. If you change this, you must update
+your /etc/make.profile symlink accordingly.
 .br
 Defaults to /usr/portage. 
@@ -416 +433 @@
 \fB***Warning***\fR
 .br
-Storing data such as distfiles and binary packages in PORTDIR can
-be potentially dangerous. The default emerge configuration defaults to this 
-behavior (which will work fine), however if you deviate from the default
-configuration by changing PKGDIR or DISTDIR, emerge \-\-sync may inadvertedly
-delete all your distfiles/binary packages. Please make sure to set
-\fBPORTAGE_EXTRA_RSYNC_OPTS\fR properly to insure the safety of files in PORTDIR.
+Data stored inside \fBPORTDIR\fR is in peril of being overwritten or deleted by
+the emerge \-\-sync command. The default value of
+\fBPORTAGE_RSYNC_OPTS\fR will protect the default locations of
+\fBDISTDIR\fR and \fBPKGDIR\fR, but users are warned that any other locations
+inside \fBPORTDIR\fR are not necessarily safe for data storage.
 .TP
 \fBPORTDIR_OVERLAY\fR = \fI"[path] [different\-path] [etc...]"\fR
@@ -445 +461 @@
 This variable contains the command used for resuming package sources that
 have been partially downloaded.  It should be defined using the same format
-as \fBFETCHCOMMAND\fR.
+as \fBFETCHCOMMAND\fR, and must include any additional option(s) that may
+be necessary in order to continue a partially downloaded file located at
+\\${DISTDIR}/\\${FILE}.
 .TP
 \fBROOT\fR = \fI[path]\fR
@@ -517 +535 @@
 .SH "FILES"
 .TP
-\fB/etc/make.conf\fR 
+.B /etc/make.conf
 Contains variables for the build\-process and overwrites those in make.defaults.
 .TP
-\fB/etc/make.globals\fR 
+.B /etc/make.globals
 Contains the default variables for the build\-process, you should edit \fI/etc/make.conf\fR instead.
 .TP
-\fB/usr/portage/profiles/use.desc\fR
+.B /etc/portage/color.map
+Contains variables customizing colors.
+.TP
+.B /usr/portage/profiles/use.desc
 Contains a list of all global USE flags.
 .TP
-\fB/usr/portage/profiles/use.local.desc\fR
+.B /usr/portage/profiles/use.local.desc
 Contains a list of all local USE variables.
 .SH "SEE ALSO"

trunk/essentials/sys-apps/prefix-portage/man/portage.5

@@ -1 @@
-.TH "PORTAGE" "5" "Dec 2005" "Portage 2.1" "Portage"
+.TH "PORTAGE" "5" "Jun 2007" "Portage 2.1.3" "Portage"
 .SH NAME
 portage \- the heart of Gentoo
@@ -42 +42 @@
 .nf
 bashrc
+color.map
 modules
 package.keywords
@@ -366 +367 @@
 any other bash script.
 .TP
+.BR color.map
+Contains variables customizing colors. See \fBcolor.map\fR(5).
+.TP
 .BR modules
 This file can be used to override the metadata cache implementation.  In
@@ -729 +733 @@
 .BR ebuild (1),
 .BR ebuild (5),
-.BR make.conf (5)
+.BR make.conf (5),
+.BR color.map (5)

trunk/essentials/sys-apps/prefix-portage/pym/emerge/__init__.py

@@ -32 +32 @@
 del os.environ["PORTAGE_LEGACY_GLOBALS"]
 from portage import digraph, portdbapi
-from portage.const import NEWS_LIB_PATH, CACHE_PATH
+from portage.const import NEWS_LIB_PATH, CACHE_PATH, PRIVATE_PATH
 
 import emerge.help
@@ -210 +210 @@
                 if short_msg == None:
                         short_msg = mystr
-                if "HOSTNAME" in os.environ.keys():
+                if "HOSTNAME" in os.environ:
                         short_msg = os.environ["HOSTNAME"]+": "+short_msg
                 xtermTitle(short_msg)
@@ -349 +349 @@
         if "--update" in myopts or \
                 "--newuse" in myopts or \
+                "--reinstall" in myopts or \
                 "--noreplace" in myopts or \
                 myaction in ("system", "world"):
@@ -368 +369 @@
 
 # search functionality
-class search:
+class search(object):
 
         #
@@ -447 +448 @@
                                         self.matches["desc"].append([full_package,masked])
                 self.mlen=0
-                for mtype in self.matches.keys():
+                for mtype in self.matches:
                         self.matches[mtype].sort()
                         self.mlen += len(self.matches[mtype])
@@ -456 +457 @@
                 print "[ Applications found : "+white(str(self.mlen))+" ]"
                 print " "
-                for mtype in self.matches.keys():
+                for mtype in self.matches:
                         for match,masked in self.matches[mtype]:
                                 if mtype=="pkg":
@@ -592 +593 @@
                         #this doesn't match the package we're unmerging; keep it.
                         newworldlist.append(x)
-
+        
+        newworldlist.sort()
+        
         portage.util.ensure_dirs(os.path.join(vardb.root, portage.PRIVATE_PATH),
                 gid=portage.portage_gid, mode=02770)
-        portage.util.write_atomic(world_filename, "\n".join(newworldlist))
+        portage.util.write_atomic(world_filename, "\n".join(newworldlist)+"\n")
 
 def genericdict(mylist):
@@ -633 +636 @@
 
                 MEDIUM   The upper boundary for medium dependencies.
+                MEDIUM_SOFT   The upper boundary for medium-soft dependencies.
                 SOFT     The upper boundary for soft dependencies.
                 MIN      The lower boundary for soft dependencies.
         """
-        __slots__ = ("__weakref__", "satisfied", "buildtime", "runtime")
+        __slots__ = ("__weakref__", "satisfied", "buildtime", "runtime", "runtime_post")
         MEDIUM = -1
-        SOFT   = -2
-        MIN    = -4
+        MEDIUM_SOFT = -2
+        SOFT   = -3
+        MIN    = -6
         def __init__(self, **kwargs):
                 for myattr in self.__slots__:
@@ -652 +657 @@
                         if self.runtime:
                                 return -1
+                        if self.runtime_post:
+                                return -2
                 if self.buildtime:
-                        return -2
+                        return -3
                 if self.runtime:
-                        return -3
-                return -4
+                        return -4
+                if self.runtime_post:
+                        return -5
+                return -6
         def __lt__(self, other):
                 return self.__int__() < other
@@ -676 +685 @@
                 if myvalue > self.MEDIUM:
                         return "hard"
+                if myvalue > self.MEDIUM_SOFT:
+                        return "medium"
                 if myvalue > self.SOFT:
-                        return "medium"
+                        return "medium-soft"
                 return "soft"
 
@@ -705 +716 @@
                                 vdb_lock = portage.locks.lockdir(vdb_path)
                         mykeys = ["SLOT", "COUNTER", "PROVIDE", "USE", "IUSE",
-                                "DEPEND", "RDEPEND", "PDEPEND"]
+                                "DEPEND", "RDEPEND", "PDEPEND", "repository"]
                         real_dbapi = real_vartree.dbapi
                         slot_counters = {}
@@ -916 +927 @@
         f.end_paragraph(1)
 
-class depgraph:
+class depgraph(object):
 
         pkg_tree_map = {
@@ -938 +949 @@
                 self._slot_node_map = {}
                 self.mydbapi = {}
-                self._mydbapi_keys = ["SLOT", "DEPEND", "RDEPEND", "PDEPEND"]
+                self._mydbapi_keys = ["SLOT", "DEPEND", "RDEPEND", "PDEPEND",
+                        "USE", "IUSE", "PROVIDE", "repository"]
                 self.useFlags = {}
                 self.trees = {}
@@ -981 +993 @@
                 self.orderedkeys=[]
                 self.outdatedpackages=[]
-                self.args_keys = []
+                self._args_atoms = {}
+                self._args_nodes = set()
+                self._sets = {}
+                self._sets_nodes = {}
                 self.blocker_digraph = digraph()
                 self.blocker_parents = {}
@@ -1044 +1059 @@
                 f.end_paragraph(1)
                 f.writer.flush()
+
+        def _reinstall_for_flags(self, forced_flags,
+                orig_use, orig_iuse, cur_use, cur_iuse):
+                if "--newuse" in self.myopts:
+                        if orig_iuse.symmetric_difference(
+                                cur_iuse).difference(forced_flags):
+                                return True
+                        elif orig_iuse.intersection(orig_use) != \
+                                cur_iuse.intersection(cur_use):
+                                return True
+                elif "changed-use" == self.myopts.get("--reinstall"):
+                        if orig_iuse.intersection(orig_use) != \
+                                cur_iuse.intersection(cur_use):
+                                return True
+                return False
 
         def create(self, mybigkey, myparent=None, addme=1, myuse=None,
@@ -1097 +1127 @@
 
                 mydbapi = self.trees[myroot][self.pkg_tree_map[mytype]].dbapi
+                metadata = dict(izip(self._mydbapi_keys,
+                        mydbapi.aux_get(mykey, self._mydbapi_keys)))
+                if mytype == "ebuild":
+                        pkgsettings.setcpv(mykey, mydb=portdb)
+                        metadata["USE"] = pkgsettings["USE"]
+                        myuse = pkgsettings["USE"].split()
 
                 if not arg and myroot == self.target_root:
-                        cpv_slot = "%s:%s" % (mykey, mydbapi.aux_get(mykey, ["SLOT"])[0])
-                        arg = portage.best_match_to_list(cpv_slot, self.args_keys)
-
-                if myuse is None:
-                        self.pkgsettings[myroot].setcpv(mykey, mydb=portdb)
-                        myuse = self.pkgsettings[myroot]["USE"].split()
+                        try:
+                                arg = self._find_atom_for_pkg(self._args_atoms, mykey, metadata)
+                        except portage.exception.InvalidDependString, e:
+                                if mytype != "installed":
+                                        show_invalid_depstring_notice(tuple(mybigkey+["merge"]),
+                                                metadata["PROVIDE"], str(e))
+                                        return 0
+                                del e
 
                 merging=1
@@ -1118 +1156 @@
                             If the package has new iuse flags or different use flags then if
                             --newuse is specified, we need to merge the package. """
-                        if merging==0 and "--newuse" in self.myopts and \
+                        if merging == 0 and \
+                                ("--newuse" in self.myopts or
+                                "--reinstall" in self.myopts) and \
                                 vardbapi.cpv_exists(mykey):
                                 pkgsettings.setcpv(mykey, mydb=mydbapi)
@@ -1125 +1165 @@
                                 forced_flags.update(pkgsettings.usemask)
                                 old_use = vardbapi.aux_get(mykey, ["USE"])[0].split()
-                                iuses = set(filter_iuse_defaults(
-                                        mydbapi.aux_get(mykey, ["IUSE"])[0].split()))
+                                iuses = set(filter_iuse_defaults(metadata["IUSE"].split()))
                                 old_iuse = set(filter_iuse_defaults(
                                         vardbapi.aux_get(mykey, ["IUSE"])[0].split()))
-                                if iuses.symmetric_difference(
-                                        old_iuse).difference(forced_flags):
+                                if self._reinstall_for_flags(
+                                        forced_flags, old_use, old_iuse, myuse, iuses):
                                         merging = 1
-                                elif old_iuse.intersection(old_use) != \
-                                        iuses.intersection(myuse):
-                                        merging=1
 
                 if addme and merging == 1:
@@ -1143 +1179 @@
 
                 if addme:
-                        metadata = dict(izip(self._mydbapi_keys,
-                                mydbapi.aux_get(mykey, self._mydbapi_keys)))
                         if merging == 0 and vardbapi.cpv_exists(mykey) and \
                                 mytype != "installed":
+                                mytype = "installed"
                                 mybigkey[0] = "installed"
                                 mydbapi = vardbapi
@@ -1152 +1187 @@
                                 metadata = dict(izip(self._mydbapi_keys,
                                         mydbapi.aux_get(mykey, self._mydbapi_keys)))
-                                myuse = mydbapi.aux_get(mykey, ["USE"])[0].split()
+                                myuse = metadata["USE"].split()
                         slot_atom = "%s:%s" % (portage.dep_getkey(mykey), metadata["SLOT"])
                         existing_node = self._slot_node_map[myroot].get(
@@ -1210 +1245 @@
                                         priority=priority)
 
+                if arg:
+                        self._args_nodes.add(jbigkey)
+                        try:
+                                for set_name, pkg_set in self._sets.iteritems():
+                                        atom = self._find_atom_for_pkg(pkg_set, mykey, metadata)
+                                        if atom:
+                                                self._sets_nodes[set_name].add(jbigkey)
+                        except portage.exception.InvalidDependString, e:
+                                if mytype != "installed":
+                                        show_invalid_depstring_notice(jbigkey,
+                                                metadata["PROVIDE"], str(e))
+                                        return 0
+                                del e
+
                 # Do this even when addme is False (--onlydeps) so that the
                 # parent/child relationship is always known in case
@@ -1233 +1282 @@
                 edepend={}
                 depkeys = ["DEPEND","RDEPEND","PDEPEND"]
-                depvalues = mydbapi.aux_get(mykey, depkeys)
-                for i in xrange(len(depkeys)):
-                        edepend[depkeys[i]] = depvalues[i]
+                for k in depkeys:
+                        edepend[k] = metadata[k]
 
                 if mytype == "ebuild":
@@ -1270 +1318 @@
                                 # on a package being present AND must be built after that package.
                                 if not self.select_dep(myroot, edepend["PDEPEND"], myparent=mp,
-                                        myuse=myuse, priority=DepPriority(), rev_deps=True,
+                                        myuse=myuse, priority=DepPriority(runtime_post=True),
                                         parent_arg=arg):
                                         return 0
@@ -1432 +1480 @@
                 """ These are used inside self.create() in order to ensure packages
                 that happen to match arguments are not incorrectly marked as nomerge."""
-                self.args_keys = [x[1] for x in arg_atoms]
+                for myarg, myatom in arg_atoms:
+                        self._args_atoms.setdefault(
+                                portage.dep_getkey(myatom), []).append(myatom)
                 for myarg, myatom in arg_atoms:
                                 try:
@@ -1536 +1586 @@
                         mymerge = mycheck[1]
 
-                if not mymerge and arg and \
-                        portage.best_match_to_list(depstring, self.args_keys):
+                if not mymerge and arg:
                         # A provided package has been specified on the command line.  The
                         # package will not be merged and a warning will be displayed.
-                        self._pprovided_args.append(arg)
+                        cp = portage.dep_getkey(depstring)
+                        if cp in self._args_atoms and depstring in self._args_atoms[cp]:
+                                self._pprovided_args.append((arg, depstring))
 
                 if myparent:
@@ -1600 +1651 @@
                                                 myeb_pkg = portage.best(myeb_pkg_matches)
 
-                                if myeb_pkg and "--newuse" in self.myopts:
+                                if myeb_pkg and \
+                                        ("--newuse" in self.myopts or \
+                                        "--reinstall" in self.myopts):
                                         iuses = set(filter_iuse_defaults(
                                                 bindb.aux_get(myeb_pkg, ["IUSE"])[0].split()))
@@ -1619 +1672 @@
                                                 cur_iuse = set(filter_iuse_defaults(
                                                         portdb.aux_get(myeb, ["IUSE"])[0].split()))
-                                        if iuses.symmetric_difference(
-                                                cur_iuse).difference(forced_flags):
-                                                myeb_pkg = None
-                                        elif iuses.intersection(old_use) != \
-                                                cur_iuse.intersection(now_use):
+                                        if self._reinstall_for_flags(
+                                                forced_flags, old_use, iuses, now_use, cur_iuse):
                                                 myeb_pkg = None
                                 if myeb_pkg:
@@ -2033 +2083 @@
                         return retlist
                 mygraph=self.digraph.copy()
+                for node in mygraph.order[:]:
+                        if node[-1] == "nomerge":
+                                mygraph.remove(node)
                 self._merge_order_bias(mygraph)
                 myblockers = self.blocker_digraph.copy()
@@ -2047 +2100 @@
                                         asap_nodes.append(node)
                                         break
-                ignore_priority_range = [None]
-                ignore_priority_range.extend(
-                        xrange(DepPriority.MIN, DepPriority.MEDIUM + 1))
+                ignore_priority_soft_range = [None]
+                ignore_priority_soft_range.extend(
+                        xrange(DepPriority.MIN, DepPriority.SOFT + 1))
                 tree_mode = "--tree" in self.myopts
+                # Tracks whether or not the current iteration should prefer asap_nodes
+                # if available.  This is set to False when the previous iteration
+                # failed to select any nodes.  It is reset whenever nodes are
+                # successfully selected.
+                prefer_asap = True
                 while not mygraph.empty():
-                        ignore_priority = None
-                        nodes = None
-                        if asap_nodes:
+                        selected_nodes = None
+                        if prefer_asap and asap_nodes:
                                 """ASAP nodes are merged before their soft deps."""
+                                asap_nodes = [node for node in asap_nodes \
+                                        if mygraph.contains(node)]
                                 for node in asap_nodes:
-                                        if not mygraph.contains(node):
-                                                asap_nodes.remove(node)
-                                                continue
                                         if not mygraph.child_nodes(node,
                                                 ignore_priority=DepPriority.SOFT):
-                                                nodes = [node]
+                                                selected_nodes = [node]
                                                 asap_nodes.remove(node)
                                                 break
-                        if not nodes:
-                                for ignore_priority in ignore_priority_range:
+                        if not selected_nodes and \
+                                not (prefer_asap and asap_nodes):
+                                for ignore_priority in ignore_priority_soft_range:
                                         nodes = get_nodes(ignore_priority=ignore_priority)
                                         if nodes:
                                                 break
-                        selected_nodes = None
-                        if nodes:
-                                if ignore_priority <= DepPriority.SOFT:
+                                if nodes:
                                         if ignore_priority is None and not tree_mode:
                                                 # Greedily pop all of these nodes since no relationship
@@ -2091 +2146 @@
                                                         # settle for a root node
                                                         selected_nodes = [nodes[0]]
-                                else:
+                        if not selected_nodes:
+                                nodes = get_nodes(ignore_priority=DepPriority.MEDIUM)
+                                if nodes:
                                         """Recursively gather a group of nodes that RDEPEND on
                                         eachother.  This ensures that they are merged as a group
                                         and get their RDEPENDs satisfied as soon as possible."""
-                                        def gather_deps(mergeable_nodes, selected_nodes, node):
+                                        def gather_deps(ignore_priority,
+                                                mergeable_nodes, selected_nodes, node):
                                                 if node in selected_nodes:
                                                         return True
@@ -2102 +2160 @@
                                                 selected_nodes.add(node)
                                                 for child in mygraph.child_nodes(node,
-                                                        ignore_priority=DepPriority.SOFT):
-                                                        if not gather_deps(
+                                                        ignore_priority=ignore_priority):
+                                                        if not gather_deps(ignore_priority,
                                                                 mergeable_nodes, selected_nodes, child):
                                                                 return False
                                                 return True
                                         mergeable_nodes = set(nodes)
-                                        for node in nodes:
-                                                selected_nodes = set()
-                                                if gather_deps(
-                                                        mergeable_nodes, selected_nodes, node):
+                                        if prefer_asap and asap_nodes:
+                                                nodes = asap_nodes
+                                        for ignore_priority in xrange(DepPriority.SOFT,
+                                                DepPriority.MEDIUM_SOFT + 1):
+                                                for node in nodes:
+                                                        selected_nodes = set()
+                                                        if gather_deps(ignore_priority,
+                                                                mergeable_nodes, selected_nodes, node):
+                                                                break
+                                                        else:
+                                                                selected_nodes = None
+                                                if selected_nodes:
                                                         break
-                                                else:
-                                                        selected_nodes = None
+
+                                        if prefer_asap and asap_nodes and not selected_nodes:
+                                                # We failed to find any asap nodes to merge, so ignore
+                                                # them for the next iteration.
+                                                prefer_asap = False
+                                                continue
+
+                                        if selected_nodes and ignore_priority > DepPriority.SOFT:
+                                                # Try to merge ignored medium deps as soon as possible.
+                                                for node in selected_nodes:
+                                                        children = set(mygraph.child_nodes(node))
+                                                        soft = children.difference(
+                                                                mygraph.child_nodes(node,
+                                                                ignore_priority=DepPriority.SOFT))
+                                                        medium_soft = children.difference(
+                                                                mygraph.child_nodes(node,
+                                                                ignore_priority=DepPriority.MEDIUM_SOFT))
+                                                        medium_soft.difference_update(soft)
+                                                        for child in medium_soft:
+                                                                if child in selected_nodes:
+                                                                        continue
+                                                                if child in asap_nodes:
+                                                                        continue
+                                                                # TODO: Try harder to make these nodes get
+                                                                # merged absolutely as soon as possible.
+                                                                asap_nodes.append(child)
 
                         if not selected_nodes:
@@ -2126 +2216 @@
                                                 circular_blocks = True
                                                 blocker_deps = myblockers.leaf_nodes()
-                                        if blocker_deps:
-                                                selected_nodes = [blocker_deps.pop()]
+                                        while blocker_deps:
+                                                # Some of these nodes might have already been selected
+                                                # by the normal node selection process after the
+                                                # circular_blocks flag has been set.  Therefore, we
+                                                # have to verify that they're still in the graph so
+                                                # that they're not selected more than once.
+                                                node = blocker_deps.pop()
+                                                if mygraph.contains(node):
+                                                        selected_nodes = [node]
+                                                        break
 
                         if not selected_nodes:
@@ -2167 +2265 @@
                                 sys.exit(1)
 
+                        # At this point, we've succeeded in selecting one or more nodes, so
+                        # it's now safe to reset the prefer_asap to it's default state.
+                        prefer_asap = True
+
                         for node in selected_nodes:
                                 retlist.append(list(node))
@@ -2203 +2305 @@
                         return [x for x in mylist \
                                 if x in matches or not portdb.cpv_exists(x)]
+                def create_cp_dict(atom_list):
+                        cp_dict = {}
+                        for atom in atom_list:
+                                cp_dict.setdefault(portage.dep_getkey(atom), []).append(atom)
+                        return cp_dict
                 world_problems = False
                 if mode=="system":
                         mylist = getlist(self.settings, "system")
+                        self._sets["system"] = create_cp_dict(mylist)
+                        self._sets_nodes["system"] = set()
                 else:
                         #world mode
                         worldlist = getlist(self.settings, "world")
+                        self._sets["world"] = create_cp_dict(worldlist)
+                        self._sets_nodes["world"] = set()
                         mylist = getlist(self.settings, "system")
+                        self._sets["system"] = create_cp_dict(mylist)
+                        self._sets_nodes["system"] = set()
                         worlddict=genericdict(worldlist)
 
-                        for x in worlddict.keys():
+                        for x in worlddict:
                                 if not portage.isvalidatom(x):
                                         world_problems = True
-                                elif not self.trees[self.target_root]["vartree"].dbapi.match(x):
+                                        continue
+                                elif not vardb.match(x):
                                         world_problems = True
-                                else:
-                                        mylist.append(x)
+                                        available = False
+                                        if "--usepkgonly" not in self.myopts and \
+                                                portdb.match(x):
+                                                available = True
+                                        elif "--usepkg" in self.myopts:
+                                                mymatches = bindb.match(x)
+                                                if "--usepkgonly" not in self.myopts:
+                                                        mymatches = visible(mymatches)
+                                                if mymatches:
+                                                        available = True
+                                        if not available:
+                                                continue
+                                mylist.append(x)
 
                 newlist = []
@@ -2268 +2393 @@
                                                         newlist.append(myslot_atom)
                 mylist = newlist
-                
+
+                for myatom in mylist:
+                        self._args_atoms.setdefault(
+                                portage.dep_getkey(myatom), []).append(myatom)
+
                 missing_atoms = []
                 for mydep in mylist:
@@ -2293 +2422 @@
 
                 return 1
+
+        def _find_atom_for_pkg(self, pkg_set, cpv, metadata):
+                """Return the best match for a given package from the arguments, or
+                None if there are no matches.  This matches virtual arguments against
+                the PROVIDE metadata.  This can raise an InvalidDependString exception
+                if an error occurs while parsing PROVIDE."""
+                cpv_slot = "%s:%s" % (cpv, metadata["SLOT"])
+                cp = portage.dep_getkey(cpv)
+                atoms = pkg_set.get(cp)
+                if atoms:
+                        best_match = portage.best_match_to_list(cpv_slot, atoms)
+                        if best_match:
+                                return best_match
+                provides = portage.flatten(portage.dep.use_reduce(
+                        portage.dep.paren_reduce(metadata["PROVIDE"]),
+                        uselist=metadata["USE"].split()))
+                for provide in provides:
+                        provided_cp = portage.dep_getkey(provide)
+                        atoms = pkg_set.get(provided_cp)
+                        if atoms:
+                                transformed_atoms = [atom.replace(provided_cp, cp) for atom in atoms]
+                                best_match = portage.best_match_to_list(cpv_slot, transformed_atoms)
+                                if best_match:
+                                        return atoms[transformed_atoms.index(best_match)]
+                return None
 
         def display(self,mylist,verbosity=None):
@@ -2401 +2555 @@
                                         traversed_nodes.add(graph_key)
                                         def add_parents(current_node, ordered):
-                                                parent_nodes = mygraph.parent_nodes(current_node)
+                                                parent_nodes = None
+                                                # Do not traverse to parents if this node is an
+                                                # an argument or a direct member of a set that has
+                                                # been specified as an argument (system or world).
+                                                if current_node not in self._args_nodes:
+                                                        parent_nodes = mygraph.parent_nodes(current_node)
                                                 if parent_nodes:
                                                         child_nodes = set(mygraph.child_nodes(current_node))
@@ -2462 +2621 @@
                 # in size display (verbose mode)
                 myfetchlist=[]
+
                 for mylist_index in xrange(len(mylist)):
                         x, depth, ordered = mylist[mylist_index]
@@ -2497 +2657 @@
                                 mydbapi = self.trees[myroot][self.pkg_tree_map[pkg_type]].dbapi
                                 pkg_status = x[3]
+                                pkg_merge = ordered and pkg_status != "nomerge"
                                 binary_package = True
                                 if "ebuild" == pkg_type:
@@ -2670 +2831 @@
                                         # size verbose
                                         mysize=0
-                                        if x[0] == "ebuild" and ordered and x[-1] != "nomerge":
+                                        if pkg_type == "ebuild" and pkg_merge:
                                                 try:
                                                         myfilesdict = portdb.getfetchsizes(pkg_key,
@@ -2683 +2844 @@
                                                         myfilesdict="[empty/missing/bad digest]"
                                                 else:
-                                                        for myfetchfile in myfilesdict.keys():
+                                                        for myfetchfile in myfilesdict:
                                                                 if myfetchfile not in myfetchlist:
                                                                         mysize+=myfilesdict[myfetchfile]
@@ -2695 +2856 @@
                                         file_name = portdb.findname(pkg_key)
                                         if file_name: # It might not exist in the tree
+                                                newrepo = pkgsettings["PORTDIR"]
+                                                newrepoindex = "0"
+                                                if self.trees[x[1]]["vartree"].dbapi.cpv_exists(pkg):
+                                                        oldrepo = self.trees[x[1]]["vartree"].dbapi.aux_get(pkg, ["repository"])[0]
+                                                else:
+                                                        oldrepo = ""
+                                                if oldrepo != "":
+                                                        oldrepo = portdb.getRepositoryPath(oldrepo)
                                                 dir_name=os.path.abspath(os.path.dirname(file_name)+"/../..")
-                                                if (overlays_real.count(dir_name)>0):
-                                                        verboseadd+=teal("["+str(overlays_real.index(
-                                                                os.path.normpath(dir_name))+1)+"]")+" "
-                                                        display_overlays=True
+                                                if (overlays_real.count(dir_name) > 0):
+                                                        newrepoindex = overlays_real.index(os.path.normpath(dir_name))
+                                                        newrepo = overlays_real[newrepoindex]
+                                                        newrepoindex += 1
+                                                
+                                                # assing lookup indexes
+                                                if oldrepo == "":
+                                                        oldrepoindex = "?"
+                                                elif oldrepo == pkgsettings["PORTDIR"]:
+                                                        oldrepoindex = "0"
+                                                else:
+                                                        oldrepoindex = str(overlays_real.index(os.path.normpath(oldrepo)) + 1)
+                                                if oldrepoindex == newrepoindex \
+                                                                or not self.trees[x[1]]["vartree"].dbapi.cpv_exists(pkg):
+                                                        repoadd = newrepoindex
+                                                else:
+                                                        repoadd = "%s=>%s" % (oldrepoindex, newrepoindex)
+
+                                                verboseadd+=teal("[%s]" % repoadd)+" "
+                                                display_overlays=True
                                         else:
                                                 verboseadd += "[No ebuild?]"
@@ -2730 +2915 @@
                                         myoldbest=blue("["+myoldbest+"]")
 
+                                pkg_cp = xs[0]
+                                pkg_arg    = False
+                                pkg_world  = False
+                                pkg_system = False
+                                pkg_node = tuple(x)
+                                if pkg_node in self._args_nodes:
+                                        pkg_arg = True
+                                        world_nodes = self._sets_nodes.get("world")
+                                        if world_nodes and pkg_node in world_nodes:
+                                                pkg_world = True
+                                        if world_nodes is None:
+                                                # Don't colorize system package when in "world" mode.
+                                                system_nodes = self._sets_nodes.get("system")
+                                                if system_nodes and pkg_node in system_nodes:
+                                                        pkg_system = True
+
+                                def pkgprint(pkg):
+                                        if pkg_merge:
+                                                if pkg_arg:
+                                                        if pkg_world:
+                                                                return colorize("PKG_MERGE_WORLD", pkg)
+                                                        elif pkg_system:
+                                                                return colorize("PKG_MERGE_SYSTEM", pkg)
+                                                        else:
+                                                                return colorize("PKG_MERGE_ARG", pkg)
+                                                else:
+                                                        return colorize("PKG_MERGE", pkg)
+                                        else:
+                                                if pkg_arg:
+                                                        if pkg_world:
+                                                                return colorize("PKG_NOMERGE_WORLD", pkg)
+                                                        elif pkg_system:
+                                                                return colorize("PKG_NOMERGE_SYSTEM", pkg)
+                                                        else:
+                                                                return colorize("PKG_NOMERGE_ARG", pkg)
+                                                else:
+                                                        return colorize("PKG_NOMERGE", pkg)
+
                                 if x[1]!="/":
                                         if myoldbest:
@@ -2735 +2958 @@
                                         if "--columns" in self.myopts:
                                                 if "--quiet" in self.myopts:
-                                                        myprint=addl+" "+indent+darkgreen(xs[0])
+                                                        myprint=addl+" "+indent+pkgprint(pkg_cp)
                                                         myprint=myprint+darkblue(" "+xs[1]+xs[2])+" "
                                                         myprint=myprint+myoldbest
                                                         myprint=myprint+darkgreen("to "+x[1])
                                                 else:
-                                                        myprint="["+x[0]+" "+addl+"] "+indent+darkgreen(xs[0])
+                                                        myprint="["+pkgprint(pkg_type)+" "+addl+"] "+indent+pkgprint(pkg_cp)
                                                         if (newlp-nc_len(myprint)) > 0:
                                                                 myprint=myprint+(" "*(newlp-nc_len(myprint)))
@@ -2749 +2972 @@
                                                         myprint=myprint+darkgreen("to "+x[1])+" "+verboseadd
                                         else:
-                                                if x[-1] == "nomerge" or not ordered:
-                                                        myprint = darkblue("[nomerge      ] ")
+                                                if not pkg_merge:
+                                                        myprint = "[%s      ] " % pkgprint("nomerge")
                                                 else:
                                                         myprint = "[" + pkg_type + " " + addl + "] "
-                                                myprint += indent + darkgreen(pkg_key) + " " + \
+                                                myprint += indent + pkgprint(pkg_key) + " " + \
                                                         myoldbest + darkgreen("to " + myroot) + " " + \
                                                         verboseadd
@@ -2759 +2982 @@
                                         if "--columns" in self.myopts:
                                                 if "--quiet" in self.myopts:
-                                                        myprint=addl+" "+indent+darkgreen(xs[0])
+                                                        myprint=addl+" "+indent+pkgprint(pkg_cp)
                                                         myprint=myprint+" "+green(xs[1]+xs[2])+" "
                                                         myprint=myprint+myoldbest
                                                 else:
-                                                        myprint="["+x[0]+" "+addl+"] "+indent+darkgreen(xs[0])
+                                                        myprint="["+pkgprint(pkg_type)+" "+addl+"] "+indent+pkgprint(pkg_cp)
                                                         if (newlp-nc_len(myprint)) > 0:
                                                                 myprint=myprint+(" "*(newlp-nc_len(myprint)))
@@ -2771 +2994 @@
                                                         myprint=myprint+myoldbest+"  "+verboseadd
                                         else:
-                                                if x[-1] == "nomerge" or not ordered:
-                                                        myprint=darkblue("[nomerge      ] "+indent+x[2]+" "+myoldbest+" ")+verboseadd
+                                                if not pkg_merge:
+                                                        myprint="["+pkgprint("nomerge")+"      ] "+indent+pkgprint(pkg_key)+" "+myoldbest+" "+verboseadd
                                                 else:
-                                                        myprint="["+x[0]+" "+addl+"] "+indent+darkgreen(x[2])+" "+myoldbest+" "+verboseadd
+                                                        myprint="["+pkgprint(pkg_type)+" "+addl+"] "+indent+pkgprint(pkg_key)+" "+myoldbest+" "+verboseadd
                                 p.append(myprint)
 
@@ -2804 +3027 @@
                         print counters
                         if overlays and display_overlays:
-                                print "Portage overlays:"
+                                print "Portage tree and overlays:"
                                 y=0
+                                print " "+teal("[0]"), self.settings["PORTDIR"]
                                 for x in overlays:
                                         y=y+1
                                         print " "+teal("["+str(y)+"]"),x
+                                print " "+teal("[?]"), "indicates that the source repository could not be determined"
 
                 if "--changelog" in self.myopts:
@@ -2817 +3042 @@
 
                 if self._pprovided_args:
+                        arg_refs = {}
+                        for arg_atom in self._pprovided_args:
+                                arg, atom = arg_atom
+                                arg_refs[arg_atom] = []
+                                cp = portage.dep_getkey(atom)
+                                for set_name, pkg_set in self._sets.iteritems():
+                                        if cp in pkg_set and atom in pkg_set[cp]:
+                                                arg_refs[arg_atom].append(set_name)
                         msg = []
                         msg.append(bad("\nWARNING: "))
@@ -2825 +3058 @@
                                 msg.append("A requested package will not be " + \
                                         "merged because it is listed in\n")
-                        msg.append("         package.provided:\n\n")
-                        for arg in self._pprovided_args:
-                                msg.append("             " + arg + "\n")
+                        msg.append("package.provided:\n\n")
+                        problems_sets = set()
+                        for (arg, atom), refs in arg_refs.iteritems():
+                                ref_string = ""
+                                if refs:
+                                        problems_sets.update(refs)
+                                        refs.sort()
+                                        ref_string = ", ".join(["'%s'" % name for name in refs])
+                                        ref_string = " pulled in by " + ref_string
+                                msg.append("  %s%s\n" % (colorize("INFORM", arg), ref_string))
                         msg.append("\n")
+                        if "world" in problems_sets:
+                                msg.append("This problem can be solved in one of the following ways:\n\n")
+                                msg.append("  A) Use emaint to clean offending packages from world (if not installed).\n")
+                                msg.append("  B) Uninstall offending packages (cleans them from world).\n")
+                                msg.append("  C) Remove offending entries from package.provided.\n\n")
+                                msg.append("The best course of action depends on the reason that an offending\n")
+                                msg.append("package.provided entry exists.\n\n")
                         sys.stderr.write("".join(msg))
 
@@ -2961 +3208 @@
 
         def merge(self, mylist, favorites, mtimedb):
+                from portage.elog import elog_process
                 failed_fetches = []
                 fetchonly = "--fetchonly" in self.myopts or \
@@ -3048 +3296 @@
                                 portage.write_atomic(
                                         os.path.join(self.target_root, portage.WORLD_FILE),
-                                        "\n".join(myfavdict.values()))
+                                                "\n".join(sorted(myfavdict.values())) + "\n")
 
                         mtimedb["resume"]["mergelist"]=mymergelist[:]
@@ -3194 +3442 @@
                                                         tree="porttree")
                                                 del pkgsettings["PORTAGE_BINPKG_TMPFILE"]
+                                                if retval != os.EX_OK or \
+                                                        "--buildpkgonly" in self.myopts:
+                                                        elog_process(pkg_key, pkgsettings)
                                                 if retval != os.EX_OK:
                                                         return retval
@@ -3325 +3576 @@
                                                 portage.write_atomic(
                                                 os.path.join(myroot, portage.WORLD_FILE),
-                                                "\n".join(myfavdict.values()))
+                                                "\n".join(sorted(myfavdict.values()))+"\n")
 
                                 if "--pretend" not in self.myopts and \
@@ -3598 +3849 @@
                                                 slotmap[myslot]={}
                                         slotmap[myslot][localtree.dbapi.cpv_counter(mypkg)]=mypkg
-                                for myslot in slotmap.keys():
+                                for myslot in slotmap:
                                         counterkeys=slotmap[myslot].keys()
                                         counterkeys.sort()
@@ -3625 +3876 @@
                 if vdb_lock:
                         portage.locks.unlockdir(vdb_lock)
-        for x in pkgmap.keys():
+        for x in pkgmap:
                 for y in localtree.dep_match(x):
                         if y not in pkgmap[x]["omitted"] and \
@@ -3681 +3932 @@
                 countdown(int(settings["CLEAN_DELAY"]), ">>> Unmerging")
 
-        for x in pkgmap.keys():
+        for x in pkgmap:
                 for y in pkgmap[x]["selected"]:
                         print ">>> Unmerging "+y+"..."
@@ -3786 +4037 @@
 
 
-def display_news_notification(settings):
-        target_root = settings["ROOT"]
+def display_news_notification(trees):
+        for target_root in trees:
+                if len(trees) > 1 and target_root != "/":
+                        break
+        settings = trees[target_root]["vartree"].settings
+        portdb = trees[target_root]["porttree"].dbapi
+        vardb = trees[target_root]["vartree"].dbapi
         NEWS_PATH = os.path.join("metadata", "news")
         UNREAD_PATH = os.path.join(target_root, NEWS_LIB_PATH, "news")
-        porttree = portdbapi(porttree_root=settings["PORTDIR"], mysettings=settings)
         newsReaderDisplay = False
 
-        for repo in porttree.getRepositories():
-                unreadItems = checkUpdatedNewsItems(target_root, NEWS_PATH, UNREAD_PATH, repo)
+        for repo in portdb.getRepositories():
+                unreadItems = checkUpdatedNewsItems(
+                        portdb, vardb, NEWS_PATH, UNREAD_PATH, repo)
                 if unreadItems:
                         if not newsReaderDisplay:
@@ -3808 +4064 @@
                 print
 
-def post_emerge(settings, mtimedb, retval):
+def post_emerge(trees, mtimedb, retval):
         """
         Misc. things to run at the end of a merge session.
@@ -3818 +4074 @@
         Display preserved libs warnings
         Exit Emerge
-        
-        @param settings: Configuration settings (typically portage.settings)
-        @type settings: portage.config()
+
+        @param trees: A dictionary mapping each ROOT to it's package databases
+        @type trees: dict
         @param mtimedb: The mtimeDB to store data needed across merge invocations
         @type mtimedb: MtimeDB class instance
@@ -3829 +4085 @@
         1.  Calls sys.exit(retval)
         """
-        target_root = settings["ROOT"]
+        for target_root in trees:
+                if len(trees) > 1 and target_root != "/":
+                        break
+        vardbapi = trees[target_root]["vartree"].dbapi
+        settings = vardbapi.settings
         info_mtimes = mtimedb["info"]
 
@@ -3847 +4107 @@
 
         from portage.util import normalize_path
+        # Dump the mod_echo output now so that our other notifications are shown
+        # last.
+        from portage.elog import mod_echo
+        mod_echo.finalize()
+
         if "noinfo" not in settings.features:
                 chk_updated_info_files(target_root + EPREFIX.lstrip(os.path.sep), infodirs, info_mtimes, retval)
         chk_updated_cfg_files(target_root + EPREFIX.lstrip(os.path.sep), config_protect)
         
-        display_news_notification(settings)
+        display_news_notification(trees)
         
-        from portage.dbapi.vartree import PreservedLibsRegistry
-        plib_registry = PreservedLibsRegistry(os.path.join(target_root, CACHE_PATH, "preserved_libs_registry"))
-        if plib_registry.hasEntries():
+        if vardbapi.plib_registry.hasEntries():
                 print colorize("WARN", "!!!") + " existing preserved libs:"
-                plibdata = plib_registry.getPreservedLibs()
-                for cpv in plibdata.keys():
+                plibdata = vardbapi.plib_registry.getPreservedLibs()
+                for cpv in plibdata:
                         print colorize("WARN", ">>>") + " package: %s" % cpv
                         for f in plibdata[cpv]:
@@ -3903 +4166 @@
                         print " "+yellow("*")+" Type "+green("emerge --help config")+" to learn how to update config files."
 
-def checkUpdatedNewsItems( root, NEWS_PATH, UNREAD_PATH, repo_id ):
+def checkUpdatedNewsItems(portdb, vardb, NEWS_PATH, UNREAD_PATH, repo_id):
         """
         Examines news items in repodir + '/' + NEWS_PATH and attempts to find unread items
         Returns the number of unread (yet relevent) items.
         
-        @param root:
-        @type root:
+        @param portdb: a portage tree database
+        @type portdb: pordbapi
+        @param vardb: an installed package database
+        @type vardb: vardbapi
         @param NEWS_PATH:
         @type NEWS_PATH:
@@ -3922 +4187 @@
         """
         from portage.news import NewsManager
-        manager = NewsManager( root, NEWS_PATH, UNREAD_PATH )
+        manager = NewsManager(portdb, vardb, NEWS_PATH, UNREAD_PATH)
         return manager.getUnreadItems( repo_id, update=True )
 
@@ -4459 +4724 @@
                 print
         
-        display_news_notification(settings)
+        display_news_notification(trees)
 
 def action_metadata(settings, portdb, myopts):
@@ -5166 +5431 @@
                         mydepgraph.display(
                                 mydepgraph.altlist(reversed=("--tree" in myopts)))
-                if ("--buildpkgonly" in myopts):
-                        if not mydepgraph.digraph.hasallzeros(ignore_priority=DepPriority.MEDIUM):
-                                print "\n!!! --buildpkgonly requires all dependencies to be merged."
-                                print "!!! You have to merge the dependencies before you can build this package.\n"
-                                sys.exit(1)
+                        if "--buildpkgonly" in myopts and \
+                                not mydepgraph.digraph.hasallzeros(ignore_priority=DepPriority.MEDIUM):
+                                        print "\n!!! --buildpkgonly requires all dependencies to be merged."
+                                        print "!!! You have to merge the dependencies before you can build this package.\n"
+                                        sys.exit(1)
         else:
                 if ("--buildpkgonly" in myopts):
@@ -5268 +5533 @@
                         "type":"choice",
                         "choices":("y", "n")
+                },
+                "--reinstall": {
+                        "help":"specify conditions to trigger package reinstallation",
+                        "type":"choice",
+                        "choices":["changed-use"]
                 }
         }
@@ -5488 +5758 @@
 
         tmpcmdline = []
-        if "--ignore-default-opts" not in sys.argv:
+        if "--ignore-default-opts" not in myopts:
                 tmpcmdline.extend(settings["EMERGE_DEFAULT_OPTS"].split())
         tmpcmdline.extend(sys.argv[1:])
@@ -5636 +5906 @@
         if portage.secpass < 2:
                 # We've already allowed "--version" and "--help" above.
-                if "--pretend" not in myopts and \
-                myaction not in ("search","info"):
+                if "--pretend" not in myopts and myaction not in ("search","info"):
                         need_superuser = not \
                                 ("--fetchonly" in myopts or \
                                 "--fetch-all-uri" in myopts or \
-                                myaction in ("metadata", "regen"))
+                                myaction in ("metadata", "regen") or \
+                                (myaction == "sync" and os.access(settings["PORTDIR"], os.W_OK)))
                         if portage.secpass < 1 or \
                                 need_superuser:
@@ -5654 +5924 @@
                                         myopts["--pretend"] = True
                                         del myopts["--ask"]
-                                        print ("%s access would be required... " + \
+                                        print ("%s access is required... " + \
                                                 "adding --pretend to options.\n") % access_desc
                                         if portage.secpass < 1 and not need_superuser:
                                                 portage_group_warning()
                                 else:
-                                        sys.stderr.write(("emerge: %s access would be " + \
+                                        sys.stderr.write(("emerge: %s access is " + \
                                                 "required.\n\n") % access_desc)
                                         if portage.secpass < 1 and not need_superuser:
@@ -5741 +6011 @@
                         mtimedb["ldpath"]):
                         if "--pretend" not in myopts:
-                                post_emerge(settings, mtimedb, 0)
+                                post_emerge(trees, mtimedb, os.EX_OK)
 
         elif "depclean"==myaction:
@@ -5748 +6018 @@
                         myopts, spinner)
                 if "--pretend" not in myopts:
-                        post_emerge(settings, mtimedb, 0)
+                        post_emerge(trees, mtimedb, os.EX_OK)
         # "update", "system", or just process files:
         else:
                 validate_ebuild_environment(trees)
                 if "--pretend" not in myopts:
-                        display_news_notification(settings)
+                        display_news_notification(trees)
                 action_build(settings, trees, mtimedb,
                         myopts, myaction, myfiles, spinner)
                 if "--pretend" not in myopts:
-                        post_emerge(settings, mtimedb, 0)
+                        post_emerge(trees, mtimedb, os.EX_OK)
                 else:
-                        display_news_notification(settings)
+                        display_news_notification(trees)
 
 if __name__ == "__main__":

trunk/essentials/sys-apps/prefix-portage/pym/emerge/help.py

@@ -1 +1 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: help.py 6752 2007-06-08 07:10:30Z grobian $
+# $Id: help.py 7085 2007-06-28 19:06:46Z grobian $
 
 
@@ -17 +17 @@
         print bold("Options:")+" "+green("-")+"["+green("abBcCdDefgGhikKlnNoOpqPsStuvV")+"] ["+green("--oneshot")+"] ["+green("--newuse")+"] ["+green("--noconfmem")+"]"
         print      "                                          [ " + green("--color")+" < " + turquoise("y") + " | "+ turquoise("n")+" >  ] [ "+green("--columns")+" ]"
-        print      "                                                                 ["+green("--nospinner")+"]"
+        print      "                                     [ "+green("--reinstall ")+turquoise("changed-use")+" ] ["+green("--nospinner")+"]"
         print "                                          [ "+green("--deep")+"  ] [" + green("--with-bdeps")+" < " + turquoise("y") + " | "+ turquoise("n")+" > ]"
         print bold("Actions:")+" [ "+green("--clean")+" | "+green("--depclean")+" | "+green("--prune")+" | "+green("--regen")+" | "+green("--search")+" | "+green("--unmerge")+" ]"
@@ -294 +294 @@
                 print "              output from portage's displays."
                 print
+                print "       "+green("--reinstall ") + turquoise("changed-use")
+                print "              Tells emerge to include installed packages where USE flags have"
+                print "              changed since installation.  Unlike --newuse, this option does"
+                print "              not trigger reinstallation when flags that the user has not"
+                print "              enabled are added or removed."
+                print
                 print "       "+green("--skipfirst")
                 print "              This option is only valid in a resume situation. It removes the"

trunk/essentials/sys-apps/prefix-portage/pym/portage/__init__.py

@@ -5 +5 @@
 
 
-VERSION="2.2.00.6804"
+VERSION="2.2.00.7130-prefix"
 
 # ===========================================================================
@@ -187 +187 @@
                 else:
                         raise portage.exception.DirectoryNotFound(mypath)
-        except (IOError,OSError,portage.exception.PortageException):
+        except EnvironmentError, e:
+                if e.errno == portage.exception.PermissionDenied.errno:
+                        raise portage.exception.PermissionDenied(mypath)
+                del e
+                if EmptyOnError:
+                        return [], []
+                return None, None
+        except portage.exception.PortageException:
                 if EmptyOnError:
                         return [], []
@@ -195 +202 @@
                 if dircache.has_key(mypath):
                         cacheStale += 1
-                list = os.listdir(mypath)
+                try:
+                        list = os.listdir(mypath)
+                except EnvironmentError, e:
+                        if e.errno != errno.EACCES:
+                                raise
+                        del e
+                        raise portage.exception.PermissionDenied(mypath)
                 ftype = []
                 for x in list:
@@ -305 +318 @@
 #beautiful directed graph object
 
-class digraph:
+class digraph(object):
         def __init__(self):
                 """Create an empty digraph"""
@@ -807 +820 @@
 
 def check_config_instance(test):
-        if not test or (str(test.__class__) != 'portage.config'):
-                raise TypeError, "Invalid type for config object: %s" % test.__class__
-
-class config:
+        if not isinstance(test, config):
+                raise TypeError("Invalid type for config object: %s (should be %s)" % (test.__class__, config))
+
+class config(object):
         """
         This class encompasses the main portage configuration.  Data is pulled from
@@ -1009 +1022 @@
                                                                         (parentPath, parentsFile))
                                         self.profiles.append(currentPath)
-                                addProfile(os.path.realpath(self.profile_path))
+                                try:
+                                        addProfile(os.path.realpath(self.profile_path))
+                                except portage.exception.ParseError, e:
+                                        writemsg("!!! Unable to parse profile: '%s'\n" % \
+                                                self.profile_path, noiselevel=-1)
+                                        writemsg("!!! ParseError: %s\n" % str(e), noiselevel=-1)
+                                        del e
+                                        self.profiles = []
                         if local_config:
                                 custom_prof = os.path.join(
@@ -1641 +1661 @@
         def load_infodir(self,infodir):
                 self.modifying()
-                if self.configdict.has_key("pkg"):
-                        for x in self.configdict["pkg"].keys():
-                                del self.configdict["pkg"][x]
+                if "pkg" in self.configdict:
+                        self.configdict["pkg"].clear()
                 else:
                         writemsg("No pkg setup for settings instance?\n",
@@ -2102 +2121 @@
                 virts = self.getvirtuals(myroot)
                 if virts:
-                        myvkeys = virts.keys()
-                        for x in myvkeys:
+                        for x in virts:
                                 vkeysplit = x.split("/")
                                 if not self.virts_p.has_key(vkeysplit[1]):
@@ -2191 +2209 @@
 
         def __getitem__(self,mykey):
-                match = ''
-                for x in self.lookuplist:
-                        if x is None:
-                                writemsg("!!! lookuplist is null.\n")
-                        elif x.has_key(mykey):
-                                match = x[mykey]
-                                break
-                return match
+                for d in self.lookuplist:
+                        if mykey in d:
+                                return d[mykey]
+                return '' # for backward compat, don't raise KeyError
+
+        def get(self, k, x=None):
+                for d in self.lookuplist:
+                        if k in d:
+                                return d[k]
+                return x
 
         def has_key(self,mykey):
-                for x in self.lookuplist:
-                        if x.has_key(mykey):
-                                return 1
-                return 0
+                return mykey in self
 
         def __contains__(self, mykey):
                 """Called to implement membership test operators (in and not in)."""
-                return bool(self.has_key(mykey))
+                for d in self.lookuplist:
+                        if mykey in d:
+                                return True
+                return False
 
         def setdefault(self, k, x=None):
-                if k in self:
-                        return self[k]
+                v = self.get(k)
+                if v is not None:
+                        return v
                 else:
                         self[k] = x
                         return x
 
-        def get(self, k, x=None):
-                if k in self:
-                        return self[k]
-                else:
-                        return x
-
         def keys(self):
-                return unique_array(flatten([x.keys() for x in self.lookuplist]))
+                return list(self)
+
+        def __iter__(self):
+                keys = set()
+                for d in self.lookuplist:
+                        keys.update(d)
+                return iter(keys)
+
+        def iterkeys(self):
+                return iter(self)
 
         def __setitem__(self,mykey,myvalue):
@@ -2237 +2261 @@
                 "return our locally-maintained environment"
                 mydict={}
-                for x in self.keys():
+                for x in self:
                         myvalue = self[x]
                         if not isinstance(myvalue, basestring):
@@ -2413 +2437 @@
                         "usersandbox" not in features))
 
-        if free:
+        if free or "SANDBOX_ACTIVE" in os.environ:
                 keywords["opt_name"] += " bash"
                 spawn_func = portage.process.spawn_bash
@@ -2636 +2660 @@
                                 return 0
                         del distlocks_subdir
-        for myfile in filedict.keys():
+        for myfile in filedict:
                 """
                 fetched  status
@@ -2693 +2717 @@
                                                         writemsg("!!! Failed to adjust permissions:" + \
                                                                 " %s\n" % str(e), noiselevel=-1)
-                                        if myfile not in mydigests:
+
+                                        # If the file is empty then it's obviously invalid. Remove
+                                        # the empty file and try to download if possible.
+                                        if mystat.st_size == 0:
+                                                if can_fetch:
+                                                        try:
+                                                                os.unlink(myfile_path)
+                                                        except EnvironmentError:
+                                                                pass
+                                        elif myfile not in mydigests:
                                                 # We don't have a digest, but the file exists.  We must
                                                 # assume that it is fully downloaded.
@@ -2816 +2849 @@
                                                                 writemsg("!!! Failed to adjust permissions:" + \
                                                                         " %s\n" % str(e), noiselevel=-1)
+
+                                        # If the file is empty then it's obviously invalid.  Don't
+                                        # trust the return value from the fetcher.  Remove the
+                                        # empty file and try to download again.
+                                        try:
+                                                if os.stat(myfile_path).st_size == 0:
+                                                        os.unlink(myfile_path)
+                                                        fetched = 0
+                                                        continue
+                                        except EnvironmentError:
+                                                pass
 
                                         if mydigests!=None and mydigests.has_key(myfile):
@@ -2867 +2911 @@
                                                                         eout = portage.output.EOutput()
                                                                         eout.quiet = mysettings.get("PORTAGE_QUIET", None) == "1"
-                                                                        for x_key in mydigests[myfile].keys():
+                                                                        for x_key in mydigests[myfile]:
                                                                                 eout.ebegin("%s %s ;-)" % (myfile, x_key))
                                                                                 eout.eend(0)
@@ -2951 +2995 @@
                         if required_hash_types.difference(myhashes):
                                 missing_hashes.add(myfile)
+                                continue
+                        if myhashes["size"] == 0:
+                                missing_hashes.add(myfile)
                 if missing_hashes:
                         missing_files = []
                         for myfile in missing_hashes:
                                 try:
-                                        os.stat(os.path.join(mysettings["DISTDIR"], myfile))
+                                        st = os.stat(os.path.join(mysettings["DISTDIR"], myfile))
                                 except OSError, e:
                                         if e.errno != errno.ENOENT:
@@ -2961 +3008 @@
                                         del e
                                         missing_files.append(myfile)
+                                else:
+                                        # If the file is empty then it's obviously invalid.
+                                        if st.st_size == 0:
+                                                missing_files.append(myfile)
                         if missing_files:
                                 mytree = os.path.realpath(os.path.dirname(
@@ -3123 +3174 @@
         if alwaysdep or "noauto" not in mysettings.features:
                 # process dependency first
-                if "dep" in actionmap[mydo].keys():
+                if "dep" in actionmap[mydo]:
                         retval=spawnebuild(actionmap[mydo]["dep"],actionmap,mysettings,debug,alwaysdep=alwaysdep,logfile=logfile)
                         if retval:
@@ -3222 +3273 @@
         mysettings["PF"]       = mypv
 
-        mysettings["ECLASSDIR"]   = os.path.join(mysettings["PORTDIR"], "eclass")
-        mysettings["SANDBOX_LOG"] = mycpv.replace(os.path.sep, "_-_")
+        mysettings["PORTDIR"] = os.path.realpath(mysettings["PORTDIR"])
+        mysettings["ECLASSDIR"]   = mysettings["PORTDIR"]+"/eclass"
+        mysettings["SANDBOX_LOG"] = mycpv.replace("/", "_-_")
 
         mysettings["PROFILE_PATHS"] = "\n".join(mysettings.profiles)+"\n"+CUSTOM_PROFILE_PATH
@@ -3932 +3984 @@
                 # merge the deps in so we have again a 'full' actionmap
                 # be glad when this can die.
-                for x in actionmap.keys():
+                for x in actionmap:
                         if len(actionmap_deps.get(x, [])):
                                 actionmap[x]["dep"] = ' '.join(actionmap_deps[x])
 
-                if mydo in actionmap.keys():
+                if mydo in actionmap:
                         retval = spawnebuild(mydo,
                                 actionmap, mysettings, debug, logfile=logfile)
@@ -3969 +4021 @@
                         return 1
 
-                if retval != os.EX_OK and tree == "porttree":
-                        for i in xrange(len(mydbapi.porttrees)-1):
-                                t = mydbapi.porttrees[i+1]
-                                if myebuild.startswith(t):
-                                        # Display the non-cannonical path, in case it's different, to
-                                        # prevent confusion.
-                                        overlays = mysettings["PORTDIR_OVERLAY"].split()
-                                        try:
-                                                writemsg("!!! This ebuild is from an overlay: '%s'\n" % \
-                                                        overlays[i], noiselevel=-1)
-                                        except IndexError:
-                                                pass
-                                        break
                 return retval
 
@@ -4006 +4045 @@
 
 expandcache={}
+
+def _movefile(src, dest, **kwargs):
+        """Calls movefile and raises a PortageException if an error occurs."""
+        if movefile(src, dest, **kwargs) is None:
+                raise portage.exception.PortageException(
+                        "mv '%s' '%s'" % (src, dest))
 
 def movefile(src,dest,newmtime=None,sstat=None,mysettings=None):
@@ -4942 +4987 @@
                 return self.portdb.getfetchlist(pkg_key, mysettings=self.settings,
                         all=True, mytree=self.mytree)[1]
+        def __contains__(self):
+                return pkg_key in self.keys()
         def has_key(self, pkg_key):
                 """Returns true if the given package exists within pkgdir."""
-                return pkg_key in self.keys()
+                return pkg_key in self
         def keys(self):
                 """Returns keys for all packages within pkgdir"""

trunk/essentials/sys-apps/prefix-portage/pym/portage/cache/anydbm.py

@@ -61 +61 @@
                 del self.__db[cpv]
 
-        def iterkeys(self):
+        def __iter__(self):
                 return iter(self.__db)
 

trunk/essentials/sys-apps/prefix-portage/pym/portage/cache/flat_hash.py

@@ -103 +103 @@
 
 
-        def iterkeys(self):
+        def __iter__(self):
                 """generator for walking the dir struct"""
                 dirs = [self.location]

trunk/essentials/sys-apps/prefix-portage/pym/portage/cache/flat_list.py

@@ -87 +87 @@
 
 
-        def iterkeys(self):
+        def __iter__(self):
                 """generator for walking the dir struct"""
                 dirs = [self._base]

trunk/essentials/sys-apps/prefix-portage/pym/portage/cache/metadata_overlay.py

@@ -76 +76 @@
                 return True
 
-        def iterkeys(self):
+        def __iter__(self):
                 s = set()
-                for cpv in self.db_rw.iterkeys():
-                        if self.has_key(cpv): # validates whiteout when necessary
+                for cpv in self.db_rw:
+                        if cpv in self: # validates whiteout when necessary
                                 yield cpv
                         # set includes whiteouts so they won't be yielded later
                         s.add(cpv)
-                for cpv in self.db_ro.iterkeys():
+                for cpv in self.db_ro:
                         if cpv not in s:
                                 yield cpv

trunk/essentials/sys-apps/prefix-portage/pym/portage/cache/sql_template.py

@@ -210 +210 @@
 
 
-        def iterkeys(self):
+        def __iter__(self):
                 if not self.autocommits:
                         try:    self.commit()

trunk/essentials/sys-apps/prefix-portage/pym/portage/cache/sqlite.py

@@ -224 +224 @@
                         raise cache_errors.CacheCorruption(cpv, "key is not unique")
 
-        def iterkeys(self):
+        def __iter__(self):
                 """generator for walking the dir struct"""
                 cursor = self._db_cursor

trunk/essentials/sys-apps/prefix-portage/pym/portage/cache/template.py

@@ -96 +96 @@
 
         def iterkeys(self):
-                raise NotImplementedError
+                return iter(self)
 
         def iteritems(self):
@@ -123 +123 @@
                         raise NotImplementedError
                 return self.has_key(cpv)
+
+        def __iter__(self):
+                """This method should always be overridden.  It is provided only for
+                backward compatibility with modules that override iterkeys instead.  It
+                will automatically raise a NotImplementedError if iterkeys has not been
+                overridden."""
+                if self.iterkeys is database.iterkeys:
+                        # prevent a possible recursive loop
+                        raise NotImplementedError(self)
+                return self.iterkeys()
+
+        def get(self, k, x=None):
+                try:
+                        return self[k]
+                except KeyError:
+                        return x
 
         def get_matches(self, match_dict):
@@ -146 +162 @@
                                 raise InvalidRestriction(key, match, "Key isn't valid")
 
-                for cpv in self.keys():
+                for cpv in self.iterkeys():
                         cont = True
                         vals = self[cpv]

trunk/essentials/sys-apps/prefix-portage/pym/portage/cache/util.py

@@ -19 +19 @@
                 noise=verbose_instance
 
-        dead_nodes = {}
-        dead_nodes = dict.fromkeys(trg_cache.keys())
+        dead_nodes = set(trg_cache)
         count=0
 
@@ -29 +28 @@
 #               print "processing x=",x
                 count+=1
-                if dead_nodes.has_key(x):
-                        del dead_nodes[x]
+                dead_nodes.discard(x)
                 try:    entry = src_cache[x]
                 except KeyError, e:
@@ -100 +98 @@
                         noise.exception(ce)
                         del ce
-        dead_nodes.clear()
         noise.finish()
 

trunk/essentials/sys-apps/prefix-portage/pym/portage/cache/volatile.py

@@ -17 +17 @@
                 super(database, self).__init__(*args, **config)
                 self._data = {}
-                self.iterkeys = self._data.iterkeys
+                self.__iter__ = self._data.__iter__
                 self._delitem = self._data.__delitem__
                 self.__contains__ = self._data.__contains__

trunk/essentials/sys-apps/prefix-portage/pym/portage/checksum.py

@@ -4 +4 @@
 # $Id: portage_checksum.py 3835 2006-07-11 00:59:10Z zmedico $
 
-if not hasattr(__builtins__, "set"):
-        from sets import Set as set
-
 from portage.const import PRIVATE_PATH,PRELINK_BINARY,HASHING_BLOCKSIZE
 import os
 import errno
-import shutil
 import stat
 import portage.exception
 import portage.process
-import portage.util
 import portage.locks
 import commands
-import sha
-
-
-# actual hash functions first
+import md5, sha
 
 #dict of all available hash functions
 hashfunc_map = {}
-
-# We _try_ to load this module. If it fails we do the slightly slower fallback.
+hashorigin_map = {}
+
+def _generate_hash_function(hashtype, hashobject, origin="unknown"):
+        def pyhash(filename):
+                """
+                Run a checksum against a file.
+        
+                @param filename: File to run the checksum against
+                @type filename: String
+                @return: The hash and size of the data
+                """
+                f = open(filename, 'rb')
+                blocksize = HASHING_BLOCKSIZE
+                data = f.read(blocksize)
+                size = 0L
+                sum = hashobject()
+                while data:
+                        sum.update(data)
+                        size = size + len(data)
+                        data = f.read(blocksize)
+                f.close()
+
+                return (sum.hexdigest(), size)
+        hashfunc_map[hashtype] = pyhash
+        hashorigin_map[hashtype] = origin
+        return pyhash
+
+# Define hash functions, try to use the best module available. Later definitions
+# override earlier ones
+
+# Use the internal modules as last fallback
+md5hash = _generate_hash_function("MD5", md5.new, origin="internal")
+sha1hash = _generate_hash_function("SHA1", sha.new, origin="internal")
+
+# Use pycrypto when available, prefer it over the internal fallbacks
+try:
+        from Crypto.Hash import MD5, SHA, SHA256, RIPEMD
+        
+        md5hash = _generate_hash_function("MD5", MD5.new, origin="pycrypto")
+        sha1hash = _generate_hash_function("SHA1", SHA.new, origin="pycrypto")
+        sha256hash = _generate_hash_function("SHA256", SHA256.new, origin="pycrypto")
+        rmd160hash = _generate_hash_function("RMD160", RIPEMD.new, origin="pycrypto")
+except ImportError, e:
+        pass
+
+# Use hashlib from python-2.5 if available and prefer it over pycrypto and internal fallbacks.
+# Need special handling for RMD160 as it may not always be provided by hashlib.
+try:
+        import hashlib
+        
+        md5hash = _generate_hash_function("MD5", hashlib.md5, origin="hashlib")
+        sha1hash = _generate_hash_function("SHA1", hashlib.sha1, origin="hashlib")
+        sha256hash = _generate_hash_function("SHA256", hashlib.sha256, origin="hashlib")
+        try:
+                hashlib.new('ripemd160')
+        except ValueError:
+                pass
+        else:
+                def rmd160():
+                        return hashlib.new('ripemd160')
+                rmd160hash = _generate_hash_function("RMD160", rmd160, origin="hashlib")
+except ImportError, e:
+        pass
+        
+
+# Use python-fchksum if available, prefer it over all other MD5 implementations
 try:
         import fchksum
@@ -31 +87 @@
         def md5hash(filename):
                 return fchksum.fmd5t(filename)
-
-except ImportError:
-        import md5
-        def md5hash(filename):
-                return pyhash(filename, md5)
-hashfunc_map["MD5"] = md5hash
-
-def sha1hash(filename):
-        return pyhash(filename, sha)
-hashfunc_map["SHA1"] = sha1hash
-        
-# Keep pycrypto optional for now, there are no internal fallbacks for these
-try:
-        import Crypto.Hash.SHA256
-        
-        def sha256hash(filename):
-                return pyhash(filename, Crypto.Hash.SHA256)
-        hashfunc_map["SHA256"] = sha256hash
+        hashfunc_map["MD5"] = md5hash
+        hashorigin_map["MD5"] = "python-fchksum"
+
 except ImportError:
         pass
 
-try:
-        import Crypto.Hash.RIPEMD
-        
-        def rmd160hash(filename):
-                return pyhash(filename, Crypto.Hash.RIPEMD)
-        hashfunc_map["RMD160"] = rmd160hash
-except ImportError:
-        pass
-
+# There is only one implementation for size
 def getsize(filename):
         size = os.stat(filename).st_size
@@ -80 +113 @@
 def perform_all(x, calc_prelink=0):
         mydict = {}
-        for k in hashfunc_map.keys():
+        for k in hashfunc_map:
                 mydict[k] = perform_checksum(x, hashfunc_map[k], calc_prelink)[0]
         return mydict
@@ -86 +119 @@
 def get_valid_checksum_keys():
         return hashfunc_map.keys()
+
+def get_hash_origin(hashtype):
+        if hashtype not in hashfunc_map:
+                raise KeyError(hashtype)
+        return hashorigin_map.get(hashtype, "unknown")
 
 def verify_all(filename, mydict, calc_prelink=0, strict=0):
@@ -132 +170 @@
                 return False, ("Insufficient data for checksum verification", got, expected)
 
-        for x in mydict.keys():
+        for x in mydict:
                 if   x == "size":
                         continue
-                elif x in hashfunc_map.keys():
+                elif x in hashfunc_map:
                         myhash = perform_checksum(filename, x, calc_prelink=calc_prelink)[0]
                         if mydict[x] != myhash:
@@ -145 +183 @@
                                         break
         return file_is_ok,reason
-
-def pyhash(filename, hashobject):
-        """
-        Run a checksum against a file.
-
-        @param filename: File to run the checksum against
-        @type filename: String
-        @param hashname: The hash object that will execute the checksum on the file
-        @type hashname: Object
-        @return: The hash and size of the data
-        """
-        f = open(filename, 'rb')
-        blocksize = HASHING_BLOCKSIZE
-        data = f.read(blocksize)
-        size = 0L
-        sum = hashobject.new()
-        while data:
-                sum.update(data)
-                size = size + len(data)
-                data = f.read(blocksize)
-        f.close()
-
-        return (sum.hexdigest(), size)
 
 def perform_checksum(filename, hashname="MD5", calc_prelink=0):
@@ -238 +253 @@
         for x in hashes:
                 if x not in hashfunc_map:
-                        raise portage.exception.DigestException, x+" hash function not available (needs dev-python/pycrypto)"
+                        raise portage.exception.DigestException, x+" hash function not available (needs dev-python/pycrypto or >=dev-lang/python-2.5)"
                 rVal[x] = perform_checksum(filename, x, calc_prelink)[0]
         return rVal

trunk/essentials/sys-apps/prefix-portage/pym/portage/const_autotool.py

@@ -1 @@
-# Copyright: 2005 Gentoo Foundation
-# Author(s): Brian Harring (ferringb@gentoo.org)
-# License: GPL2
-# $Id:$
+# Copyright: 2005-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id: $
 
 # all vars that are to wind up in portage_const must have their name listed in __all__
 
-__all__ = ["EPREFIX", "SYSCONFDIR", "PORTAGE_BASE", "portageuser", "portagegroup", "rootuser", "rootuid", "wheelgid"]
+__all__ = ["EPREFIX", "SYSCONFDIR", "PORTAGE_BASE", "portageuser",
+                "portagegroup", "rootuser", "rootuid"]
 
 from os import path
@@ -16 +16 @@
 portageuser="@portageuser@"
 rootuser="@rootuser@"
-rootuid=int("@rootuid@")
-wheelgid=int("@wheelgid@")
+rootuid=@rootuid@

trunk/essentials/sys-apps/prefix-portage/pym/portage/cvstree.py

@@ -65 +65 @@
                 basedir=basedir+"/"
         mylist=[]
-        for myfile in entries["files"].keys():
+        for myfile in entries["files"]:
                 if "cvs" in entries["files"][myfile]["status"]:
                         if "0" == entries["files"][myfile]["revision"]:
                                 mylist.append(basedir+myfile)
         if recursive:
-                for mydir in entries["dirs"].keys():
+                for mydir in entries["dirs"]:
                         mylist+=findnew(entries["dirs"][mydir],recursive,basedir+mydir)
         return mylist
@@ -82 +82 @@
                 basedir=basedir+"/"
         mylist=[]
-        for myfile in entries["files"].keys():
+        for myfile in entries["files"]:
                 if "cvs" in entries["files"][myfile]["status"]:
                         if "current" not in entries["files"][myfile]["status"]:
@@ -89 +89 @@
                                                 mylist.append(basedir+myfile)
         if recursive:
-                for mydir in entries["dirs"].keys():
+                for mydir in entries["dirs"]:
                         mylist+=findchanged(entries["dirs"][mydir],recursive,basedir+mydir)
         return mylist
@@ -101 +101 @@
                 basedir=basedir+"/"
         mylist=[]
-        for myfile in entries["files"].keys():
+        for myfile in entries["files"]:
                 if "cvs" in entries["files"][myfile]["status"]:
                         if "exists" not in entries["files"][myfile]["status"]:
@@ -107 +107 @@
                                         mylist.append(basedir+myfile)
         if recursive:
-                for mydir in entries["dirs"].keys():
+                for mydir in entries["dirs"]:
                         mylist+=findmissing(entries["dirs"][mydir],recursive,basedir+mydir)
         return mylist
@@ -121 +121 @@
 
         #ignore what cvs ignores.
-        for myfile in entries["files"].keys():
+        for myfile in entries["files"]:
                 if "cvs" not in entries["files"][myfile]["status"]:
                         mylist.append(basedir+myfile)
         if recursive:
-                for mydir in entries["dirs"].keys():
+                for mydir in entries["dirs"]:
                         mylist+=findunadded(entries["dirs"][mydir],recursive,basedir+mydir)
         return mylist
@@ -136 +136 @@
                 basedir=basedir+"/"
         mylist=[]
-        for myfile in entries["files"].keys():
+        for myfile in entries["files"]:
                 if "removed" in entries["files"][myfile]["status"]:
                         mylist.append(basedir+myfile)
         if recursive:
-                for mydir in entries["dirs"].keys():
+                for mydir in entries["dirs"]:
                         mylist+=findremoved(entries["dirs"][mydir],recursive,basedir+mydir)
         return mylist

trunk/essentials/sys-apps/prefix-portage/pym/portage/data.py

@@ -2 +2 @@
 # Copyright 1998-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id:$
+# $Id: $
 
 if not hasattr(__builtins__, "set"):
@@ -8 +8 @@
 
 import os, sys, pwd, grp
-from portage.const import wheelgid, rootuid, portageuser, portagegroup
 from portage.util import writemsg
+from portage.const import rootuid, portageuser, portagegroup
 from portage.output import green,red
 from portage.output import create_color_func
@@ -68 +68 @@
 
 uid=os.getuid()
-wheelgroup=grp.getgrgid(wheelgid)[0]
+wheelgid=0
 
-if uid==0 or uid==int(rootuid):
+if uid==rootuid:
         secpass=2
 try:
-        if (not secpass) and (wheelgid in os.getgroups()):
-                secpass=1
+        wheelgid=grp.getgrnam("wheel")[2]
 except KeyError:
-        writemsg("portage initialization: your system doesn't have a '%s' group.\n" % wheelgroup)
-        writemsg("Please fix this as it is a normal system requirement. '%s' is GID %d\n" % (wheelgroup, wheelgid))
-        writemsg("`emerge baselayout` and a config update with dispatch-conf, etc-update\n")
-        writemsg("or cfg-update should remedy this problem.\n")
         pass
 
@@ -90 +85 @@
 except KeyError:
         portage_uid=0
-        portage_gid=wheelgid
+        portage_gid=0
         writemsg("\n")
-        writemsg(  red("portage: "+portageuser+" user or group missing. Please update baselayout\n"))
-        writemsg(  red("         and merge portage user(250) and group(250) into your passwd\n"))
-        writemsg(  red("         and group files. Non-root compilation is disabled until then.\n"))
-        writemsg(      "         Also note that non-root/wheel users will need to be added to\n")
-        writemsg(      "         the portage group to do portage commands.\n")
-        writemsg("\n")
-        writemsg(      "         For the defaults, line 1 goes into passwd, and 2 into group.\n")
-        writemsg(green("         portage:x:250:250:portage:/var/tmp/portage:/bin/false\n"))
-        writemsg(green("         portage::250:portage\n"))
+        writemsg(  red("portage: "+portageuser+" user or group missing.i\n"))
+        writemsg(  red("         In Prefix Portage this is quite dramatic\n"))
+        writemsg(  red("         since it means you have thrown away yourself.\n"))
+        writemsg(      "         Re-add yourself, or rebootstrap Gentoo Prefix.\n")
         writemsg("\n")
         portage_group_warning()

trunk/essentials/sys-apps/prefix-portage/pym/portage/dbapi/bintree.py

@@ -1 +1 @@
 # Copyright 1998-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: bintree.py 6804 2007-06-11 14:26:02Z grobian $
+# $Id: bintree.py 7033 2007-06-25 12:07:54Z grobian $
 
 from portage.dep import isvalidatom, isjustname, dep_getkey, match_from_list
@@ -11 +11 @@
 from portage.update import update_dbentries
 
-from portage import listdir, dep_expand
+from portage import dep_expand, listdir, _movefile
 
 import portage.xpak, portage.getbinpkg
@@ -207 +207 @@
                                                 raise
                                         del e
-                                os.rename(tbz2path, new_path)
+                                _movefile(tbz2path, new_path, mysettings=self.settings)
                                 self._remove_symlink(mycpv)
                                 if new_path.split(os.path.sep)[-2] == "All":
@@ -300 +300 @@
                                         raise
                                 del e
-                        os.rename(src_path, os.path.join(self.pkgdir, "All", myfile))
+                        dest_path = os.path.join(self.pkgdir, "All", myfile)
+                        _movefile(src_path, dest_path, mysettings=self.settings)
                         self._create_symlink(cpv)
                 self._pkg_paths[cpv] = os.path.join("All", myfile)
@@ -318 +319 @@
                                 raise
                         del e
-                os.rename(os.path.join(self.pkgdir, "All", myfile), dest_path)
+                src_path = os.path.join(self.pkgdir, "All", myfile)
+                _movefile(src_path, dest_path, mysettings=self.settings)
                 self._pkg_paths[cpv] = mypath
 
@@ -430 +432 @@
                                                                 self.dbapi._aux_cache[mycpv] = aux_cache
                                                         continue
+                                        if not os.access(full_path, os.R_OK):
+                                                writemsg("!!! Permission denied to read " + \
+                                                        "binary package: '%s'\n" % full_path,
+                                                        noiselevel=-1)
+                                                self.invalids.append(myfile[:-5])
+                                                continue
                                         mytbz2 = portage.xpak.tbz2(full_path)
                                         # For invalid packages, mycat could be None.
@@ -501 +509 @@
                         # from xpak.
                         if update_pkgindex and os.access(self.pkgdir, os.W_OK):
-                                cpv_all = self._pkg_paths.keys()
-                                stale = set(metadata).difference(cpv_all)
+                                stale = [cpv for cpv in metadata if cpv not in self._pkg_paths]
                                 for cpv in stale:
                                         del metadata[cpv]
@@ -677 +684 @@
                                 wantnewlockfile=1)
                         if filename is not None:
-                                os.rename(filename, self.getname(cpv))
+                                _movefile(filename, self.getname(cpv), mysettings=self.settings)
                         if self._all_directory and \
                                 self.getname(cpv).split(os.path.sep)[-2] == "All":
@@ -823 +830 @@
 
         def isremote(self, pkgname):
-                "Returns true if the package is kept remotely."
-                remote = pkgname in self._remotepkgs and \
-                        not os.path.exists(self.getname(pkgname))
-                return remote
+                """Returns true if the package is kept remotely and it has not been
+                downloaded (or it is only partially downloaded)."""
+                if pkgname not in self._remotepkgs:
+                        return False
+                pkg_path = self.getname(pkgname)
+                if os.path.exists(pkg_path) and \
+                        os.path.basename(pkg_path) not in self.invalids:
+                        return False
+                return True
 
         def get_use(self, pkgname):
@@ -834 +846 @@
 
         def gettbz2(self, pkgname):
-                "fetches the package from a remote site, if necessary."
+                """Fetches the package from a remote site, if necessary.  Attempts to
+                resume if the file appears to be partially downloaded."""
                 print "Fetching '"+str(pkgname)+"'"
-                mysplit  = pkgname.split("/")
-                tbz2name = mysplit[1]+".tbz2"
-                if not self.isremote(pkgname):
+                tbz2_path = self.getname(pkgname)
+                tbz2name = os.path.basename(tbz2_path)
+                resume = False
+                if os.path.exists(tbz2_path):
                         if (tbz2name not in self.invalids):
                                 return
                         else:
+                                resume = True
                                 writemsg("Resuming download of this tbz2, but it is possible that it is corrupt.\n",
                                         noiselevel=-1)
-                tbz2_path = self.getname(pkgname)
+                
                 mydest = os.path.dirname(self.getname(pkgname))
                 try:
@@ -850 +865 @@
                 except (OSError, IOError):
                         pass
-                from urlparse import urljoin
-                base_url = self._remote_base_uri
-                fcmd = self.settings["RESUMECOMMAND"]
+                from urlparse import urlparse
+                # urljoin doesn't work correctly with unrecognized protocols like sftp
                 if self._remote_has_index:
                         rel_url = self._remotepkgs[pkgname].get("PATH")
                         if not rel_url:
                                 rel_url = pkgname+".tbz2"
-                        url = urljoin(base_url, rel_url)
-                        success = portage.getbinpkg.file_get(url, mydest, fcmd=fcmd)
+                        url = self._remote_base_uri.rstrip("/") + "/" + rel_url.lstrip("/")
                 else:
-                        url = urljoin(base_url, tbz2name)
-                        success = portage.getbinpkg.file_get(url, mydest, fcmd=fcmd)
+                        url = self.settings["PORTAGE_BINHOST"].rstrip("/") + "/" + tbz2name
+                protocol = urlparse(url)[0]
+                fcmd_prefix = "FETCHCOMMAND"
+                if resume:
+                        fcmd_prefix = "RESUMECOMMAND"
+                fcmd = self.settings.get(fcmd_prefix + "_" + protocol.upper())
+                if not fcmd:
+                        fcmd = self.settings.get(fcmd_prefix)
+                success = portage.getbinpkg.file_get(url, mydest, fcmd=fcmd)
                 if success and "strict" in self.settings.features:
                         metadata = self._remotepkgs[pkgname]

trunk/essentials/sys-apps/prefix-portage/pym/portage/dbapi/porttree.py

@@ -1 +1 @@
 # Copyright 1998-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: porttree.py 6804 2007-06-11 14:26:02Z grobian $
+# $Id: porttree.py 7128 2007-07-02 17:31:24Z grobian $
 
 from portage.cache.cache_errors import CacheError
@@ -20 +20 @@
 
 from portage import eclass_cache, auxdbkeys, auxdbkeylen, doebuild, flatten, \
-        listdir, dep_expand, eapi_is_supported, key_expand, dep_check, config
+        listdir, dep_expand, eapi_is_supported, key_expand, dep_check
 
 import os, stat, sys
@@ -32 +32 @@
                 portdbapi.portdbapi_instances.append(self)
 
+                from portage import config
                 if mysettings:
                         self.mysettings = mysettings
@@ -91 +92 @@
                                 self.treemap[repo_name] = path
                         except (OSError,IOError):
+                                writemsg("Note: The repository at %s does not have a profiles/repo_name entry.\n" % path \
+                                                + "      This can reduce the functionality of the repository in some cases.\n")
                                 pass
                 
@@ -145 +148 @@
                         # unhandled exception thrown from constructor
                         return
-                for x in self.auxdb.keys():
+                for x in self.auxdb:
                         self.auxdb[x].sync()
                 self.auxdb.clear()
@@ -193 +196 @@
                 TreeMap = {id: path}
                 """
-                return [k for k in self.treemap.keys() if k]
+                return [k for k in self.treemap if k]
 
         def findname2(self, mycpv, mytree=None):
@@ -349 +352 @@
                 for x in mylist:
                         if x == "INHERITED":
-                                returnme.append(' '.join(mydata.get("_eclasses_", {}).keys()))
+                                returnme.append(' '.join(mydata.get("_eclasses_", [])))
                         else:
                                 returnme.append(mydata.get(x,""))
@@ -650 +653 @@
                 pkgdict = self.mysettings.pkeywordsdict
                 aux_keys = ["KEYWORDS", "LICENSE", "EAPI", "SLOT"]
+
+                # Hack: Need to check the env directly here as otherwise stacking 
+                # doesn't work properly as negative values are lost in the config
+                # object (bug #139600)
+                egroups = self.mysettings.configdict["backupenv"].get(
+                        "ACCEPT_KEYWORDS", "").split()
+
                 for mycpv in mylist:
                         try:
@@ -672 +682 @@
                                 for atom in matches:
                                         pgroups.extend(pkgdict[cp][atom])
+                                pgroups.extend(egroups)
                                 if matches:
                                         # normalize pgroups with incrementals logic so it 

trunk/essentials/sys-apps/prefix-portage/pym/portage/dbapi/vartree.py

@@ -1 +1 @@
 # Copyright 1998-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: vartree.py 6804 2007-06-11 14:26:02Z grobian $
+# $Id: vartree.py 7128 2007-07-02 17:31:24Z grobian $
 
 from portage.checksum import perform_md5
@@ -12 +12 @@
 from portage.elog import elog_process
 from portage.exception import InvalidPackageName, InvalidAtom, \
-        UnsupportedAPIException, FileNotFound
+        FileNotFound, PermissionDenied, UnsupportedAPIException
 from portage.locks import lockdir, unlockdir
 from portage.output import bold, red, green
@@ -21 +21 @@
 from portage.versions import pkgsplit, catpkgsplit, catsplit, best, pkgcmp
 
-from portage import listdir, dep_expand, config, flatten, key_expand, \
-        doebuild_environment, doebuild, env_update, dircache, \
-        abssymlink, movefile, bsd_chflags
+from portage import listdir, dep_expand, flatten, key_expand, \
+        doebuild_environment, doebuild, env_update, \
+        abssymlink, movefile, _movefile, bsd_chflags
+
+from portage.elog.messages import ewarn
 
 import os, sys, stat, errno, commands, copy, time
@@ -52 +54 @@
                         if e.errno == errno.ENOENT:
                                 self._data = {}
+                        elif e.errno == PermissionDenied.errno:
+                                raise PermissionDenied(self._filename)
                         else:
                                 raise e
@@ -107 +111 @@
         def hasEntries(self):
                 """ Check if this registry contains any records. """
-                return (len(self._data.keys()) > 0)
+                return len(self._data) > 0
         
         def getPreservedLibs(self):
@@ -115 +119 @@
                 """
                 rValue = {}
-                for cps in self._data.keys():
+                for cps in self._data:
                         rValue[self._data[cps][0]] = self._data[cps][2]
                 return rValue
@@ -155 +159 @@
                                                 obj_dict[lib].append(mysplit[0])
                 mapfile = open(self._filename, "w")
-                for lib in obj_dict.keys():
+                for lib in obj_dict:
                         mapfile.write(lib+" "+",".join(obj_dict[lib])+"\n")
                 mapfile.close()
@@ -184 +188 @@
                 self.vartree = vartree
                 self._aux_cache_keys = set(["SLOT", "COUNTER", "PROVIDE", "USE",
-                        "IUSE", "DEPEND", "RDEPEND", "PDEPEND", "NEEDED"])
+                        "IUSE", "DEPEND", "RDEPEND", "PDEPEND", "NEEDED", "repository"])
                 self._aux_cache = None
                 self._aux_cache_version = "1"
@@ -190 +194 @@
                         CACHE_PATH.lstrip(os.path.sep), "vdb_metadata.pickle")
 
-                self.libmap = LibraryPackageMap(os.path.join(self.root, CACHE_PATH, "library_consumers"), self)
-                self.plib_registry = PreservedLibsRegistry(os.path.join(self.root, CACHE_PATH, "preserved_libs_registry"))
+                self.libmap = LibraryPackageMap(os.path.join(self.root, CACHE_PATH.lstrip(os.sep), "library_consumers"), self)
+                try:
+                        self.plib_registry = PreservedLibsRegistry(
+                                os.path.join(self.root, PRIVATE_PATH, "preserved_libs_registry"))
+                except PermissionDenied:
+                        # apparently this user isn't allowed to access PRIVATE_PATH
+                        self.plib_registry = None
 
         def getpath(self, mykey, filename=None):
@@ -302 +311 @@
                                 #dest already exists; keep this puppy where it is.
                                 continue
-                        os.rename(origpath, newpath)
+                        _movefile(origpath, newpath, mysettings=self.settings)
 
                         # We need to rename the ebuild now.
@@ -311 +320 @@
                                         os.rename(os.path.join(newpath, old_pf + ".ebuild"),
                                                 os.path.join(newpath, new_pf + ".ebuild"))
-                                except OSError, e:
+                                except EnvironmentError, e:
                                         if e.errno != errno.ENOENT:
                                                 raise
@@ -644 +653 @@
                         self.dbapi = copy.deepcopy(clone.dbapi)
                         self.populated = 1
+                        from portage import config
                         self.settings = config(clone=clone.settings)
                 else:
@@ -909 +919 @@
                 """
                 contents_file = os.path.join(self.dbdir, "CONTENTS")
-                if not os.path.exists(contents_file):
-                        return None
                 if self.contentscache is not None:
                         return self.contentscache
                 pkgfiles = {}
-                myc = open(contents_file,"r")
+                try:
+                        myc = open(contents_file,"r")
+                except EnvironmentError, e:
+                        if e.errno != errno.ENOENT:
+                                raise
+                        del e
+                        self.contentscache = pkgfiles
+                        return pkgfiles
                 mylines = myc.readlines()
                 myc.close()
@@ -962 +977 @@
                                         pkgfiles[" ".join(mydat[1:])] = [mydat[0]]
                                 else:
-                                        return None
+                                        writemsg("!!! Unrecognized CONTENTS entry on " + \
+                                                "line %d: '%s'\n" % (pos, line), noiselevel=-1)
                         except (KeyError, IndexError):
-                                print "portage: CONTENTS line", pos, "corrupt!"
+                                writemsg("!!! Unrecognized CONTENTS entry on " + \
+                                        "line %d: '%s'\n" % (pos, line), noiselevel=-1)
                 self.contentscache = pkgfiles
                 return pkgfiles
 
         def unmerge(self, pkgfiles=None, trimworld=1, cleanup=1,
-                ldpath_mtimes=None, new_contents=None):
+                ldpath_mtimes=None, others_in_slot=None):
                 """
                 Calls prerm
@@ -985 +1002 @@
                 @param ldpath_mtimes: mtimes to pass to env_update (see env_update)
                 @type ldpath_mtimes: Dictionary
-                @param new_contents: contents from a new instance that will replace this one
-                @type new_contents: Dictionary
+                @param others_in_slot: all dblink instances in this slot, excluding self
+                @type others_in_slot: list
                 @rtype: Integer
                 @returns:
@@ -997 +1014 @@
                 """
 
-                # When new_contents is supplied, the security check has already been
+                # When others_in_slot is supplied, the security check has already been
                 # done for this slot, so it shouldn't be repeated until the next
                 # replacement or unmerge operation.
-                if new_contents is None:
+                if others_in_slot is None:
                         slot = self.vartree.dbapi.aux_get(self.mycpv, ["SLOT"])[0]
                         slot_matches = self.vartree.dbapi.match(
                                 "%s:%s" % (dep_getkey(self.mycpv), slot))
-                        retval = self._security_check(slot_matches)
+                        others_in_slot = []
+                        for cur_cpv in slot_matches:
+                                if cur_cpv == self.mycpv:
+                                        continue
+                                others_in_slot.append(dblink(self.cat, catsplit(cur_cpv)[1],
+                                        self.vartree.root, self.settings, vartree=self.vartree))
+                        retval = self._security_check([self] + others_in_slot)
                         if retval:
                                 return retval
@@ -1039 +1062 @@
                 builddir_lock = None
                 catdir_lock = None
+                retval = -1
                 try:
                         if myebuildpath:
@@ -1061 +1085 @@
                                         return retval
 
-                        self._unmerge_pkgfiles(pkgfiles, new_contents=new_contents)
+                        self._unmerge_pkgfiles(pkgfiles, others_in_slot)
                         
                         # Remove the registration of preserved libs for this pkg instance
@@ -1071 +1095 @@
                                          mydbapi=self.vartree.dbapi, vartree=self.vartree)
 
-                                # process logs created during pre/postrm
-                                elog_process(self.mycpv, self.settings)
-
                                 # XXX: Decide how to handle failures here.
                                 if retval != os.EX_OK:
                                         writemsg("!!! FAILED postrm: %s\n" % retval, noiselevel=-1)
                                         return retval
-                                doebuild(myebuildpath, "cleanrm", self.myroot, self.settings,
-                                        tree="vartree", mydbapi=self.vartree.dbapi,
-                                        vartree=self.vartree)
-                        
+
                         # regenerate reverse NEEDED map
                         self.vartree.dbapi.libmap.update()
@@ -1087 +1105 @@
                 finally:
                         if builddir_lock:
-                                unlockdir(builddir_lock)
+                                try:
+                                        if myebuildpath:
+                                                # process logs created during pre/postrm
+                                                elog_process(self.mycpv, self.settings)
+                                                if retval == os.EX_OK:
+                                                        doebuild(myebuildpath, "cleanrm", self.myroot,
+                                                                self.settings, tree="vartree",
+                                                                mydbapi=self.vartree.dbapi,
+                                                                vartree=self.vartree)
+                                finally:
+                                        unlockdir(builddir_lock)
                         try:
                                 if myebuildpath and not catdir_lock:
@@ -1106 +1134 @@
                 return os.EX_OK
 
-        def _unmerge_pkgfiles(self, pkgfiles, new_contents=None):
+        def _unmerge_pkgfiles(self, pkgfiles, others_in_slot):
                 """
                 
@@ -1114 +1142 @@
                 @param pkgfiles: typically self.getcontents()
                 @type pkgfiles: Dictionary { filename: [ 'type', '?', 'md5sum' ] }
-                @param new_contents: contents from a new instance that will replace this one
-                @type new_contents: Dictionary
+                @param others_in_slot: all dblink instances in this slot, excluding self
+                @type others_in_slot: list
                 @rtype: None
                 """
-                global dircache
-                dircache={}
 
                 if not pkgfiles:
@@ -1125 +1151 @@
                         pkgfiles = self.getcontents()
 
-                if not new_contents:
-                        counter = self.vartree.dbapi.cpv_counter(self.mycpv)
+                if others_in_slot is None:
+                        others_in_slot = []
                         slot = self.vartree.dbapi.aux_get(self.mycpv, ["SLOT"])[0]
                         slot_matches = self.vartree.dbapi.match(
                                 "%s:%s" % (dep_getkey(self.mycpv), slot))
-                        new_cpv = None
-                        if slot_matches:
-                                max_counter = -1
-                                for cur_cpv in slot_matches:
-                                        cur_counter = self.vartree.dbapi.cpv_counter(cur_cpv)
-                                        if cur_counter == counter and \
-                                                cur_cpv == self.mycpv:
-                                                continue
-                                        if cur_counter > max_counter:
-                                                max_counter = cur_counter
-                                                new_cpv = cur_cpv
-                        if new_cpv:
-                                # The current instance has been replaced by a newer instance.
-                                new_cat, new_pkg = catsplit(new_cpv)
-                                new_contents = dblink(new_cat, new_pkg, self.vartree.root,
-                                        self.settings, vartree=self.vartree).getcontents()
+                        for cur_cpv in slot_matches:
+                                if cur_cpv == self.mycpv:
+                                        continue
+                                others_in_slot.append(dblink(self.cat, catsplit(cur_cpv)[1],
+                                        self.vartree.root, self.settings,
+                                        vartree=self.vartree))
+                dest_root = normalize_path(self.vartree.root).rstrip(os.path.sep) + \
+                        os.path.sep
+                dest_root_len = len(dest_root)
+
+                unmerge_orphans = "unmerge-orphans" in self.settings.features
 
                 if pkgfiles:
@@ -1154 +1175 @@
                         #process symlinks second-to-last, directories last.
                         mydirs = []
-                        modprotect = "/lib/modules/"
+                        modprotect = os.path.join(self.vartree.root, "lib/modules/")
+                        def show_unmerge(zing, desc, file_type, file_name):
+                                        writemsg_stdout("%s %s %s %s\n" % \
+                                                (zing, desc.ljust(8), file_type, file_name))
                         for objkey in mykeys:
                                 obj = normalize_path(objkey)
-                                if new_contents and obj in new_contents:
-                                        # A new instance of this package claims the file, so don't
-                                        # unmerge it.
-                                        writemsg_stdout("--- !owned %s %s\n" % \
-                                                (pkgfiles[objkey][0], obj))
-                                        continue
+                                file_data = pkgfiles[objkey]
+                                file_type = file_data[0]
                                 statobj = None
                                 try:
@@ -1174 +1194 @@
                                         pass
                                 islink = lstatobj is not None and stat.S_ISLNK(lstatobj.st_mode)
-                                if statobj is None:
-                                        if not islink:
-                                                #we skip this if we're dealing with a symlink
-                                                #because os.stat() will operate on the
-                                                #link target rather than the link itself.
-                                                writemsg_stdout("--- !found " + str(pkgfiles[objkey][0]) + " %s\n" % obj)
+                                if lstatobj is None:
+                                                show_unmerge("---", "!found", file_type, obj)
+                                                continue
+                                if obj.startswith(dest_root):
+                                        relative_path = obj[dest_root_len:]
+                                        is_owned = False
+                                        for dblnk in others_in_slot:
+                                                if dblnk.isowner(relative_path, dest_root):
+                                                        is_owned = True
+                                                        break
+                                        if is_owned:
+                                                # A new instance of this package claims the file, so
+                                                # don't unmerge it.
+                                                show_unmerge("---", "replaced", file_type, obj)
                                                 continue
                                 # next line includes a tweak to protect modules from being unmerged,
@@ -1187 +1215 @@
                                 # should be able to be independently specified.
                                 if obj.startswith(modprotect):
-                                        writemsg_stdout("--- cfgpro %s %s\n" % (pkgfiles[objkey][0], obj))
+                                        show_unmerge("---", "cfgpro", file_type, obj)
+                                        continue
+
+                                # Don't unlink symlinks to directories here since that can
+                                # remove /lib and /usr/lib symlinks.
+                                if unmerge_orphans and \
+                                        lstatobj and not stat.S_ISDIR(lstatobj.st_mode) and \
+                                        not (islink and statobj and stat.S_ISDIR(statobj.st_mode)) and \
+                                        not self.isprotected(obj):
+                                        try:
+                                                # Remove permissions to ensure that any hardlinks to
+                                                # suid/sgid files are rendered harmless.
+                                                if statobj and not islink:
+                                                        os.chmod(obj, 0)
+                                                os.unlink(obj)
+                                        except EnvironmentError, e:
+                                                pass
+                                        show_unmerge("<<<", "", file_type, obj)
                                         continue
 
                                 lmtime = str(lstatobj[stat.ST_MTIME])
                                 if (pkgfiles[objkey][0] not in ("dir", "fif", "dev")) and (lmtime != pkgfiles[objkey][1]):
-                                        writemsg_stdout("--- !mtime %s %s\n" % (pkgfiles[objkey][0], obj))
+                                        show_unmerge("---", "!mtime", file_type, obj)
                                         continue
 
                                 if pkgfiles[objkey][0] == "dir":
                                         if statobj is None or not stat.S_ISDIR(statobj.st_mode):
-                                                writemsg_stdout("--- !dir   %s %s\n" % ("dir", obj))
+                                                show_unmerge("---", "!dir", file_type, obj)
                                                 continue
                                         mydirs.append(obj)
                                 elif pkgfiles[objkey][0] == "sym":
                                         if not islink:
-                                                writemsg_stdout("--- !sym   %s %s\n" % ("sym", obj))
+                                                show_unmerge("---", "!sym", file_type, obj)
                                                 continue
+                                        # Go ahead and unlink symlinks to directories here when
+                                        # they're actually recorded as symlinks in the contents.
+                                        # Normally, symlinks such as /lib -> lib64 are not recorded
+                                        # as symlinks in the contents of a package.  If a package
+                                        # installs something into ${D}/lib/, it is recorded in the
+                                        # contents as a directory even if it happens to correspond
+                                        # to a symlink when it's merged to the live filesystem.
                                         try:
                                                 os.unlink(obj)
-                                                writemsg_stdout("<<<        %s %s\n" % ("sym", obj))
+                                                show_unmerge("<<<", "", file_type, obj)
                                         except (OSError, IOError),e:
-                                                writemsg_stdout("!!!        %s %s\n" % ("sym", obj))
+                                                show_unmerge("!!!", "", file_type, obj)
                                 elif pkgfiles[objkey][0] == "obj":
                                         if statobj is None or not stat.S_ISREG(statobj.st_mode):
-                                                writemsg_stdout("--- !obj   %s %s\n" % ("obj", obj))
+                                                show_unmerge("---", "!obj", file_type, obj)
                                                 continue
                                         mymd5 = None
@@ -1218 +1270 @@
                                         except FileNotFound, e:
                                                 # the file has disappeared between now and our stat call
-                                                writemsg_stdout("--- !obj   %s %s\n" % ("obj", obj))
+                                                show_unmerge("---", "!obj", file_type, obj)
                                                 continue
 
@@ -1224 +1276 @@
                                         # string.lower allows for backwards compatibility.
                                         if mymd5 != pkgfiles[objkey][2].lower():
-                                                writemsg_stdout("--- !md5   %s %s\n" % ("obj", obj))
+                                                show_unmerge("---", "!md5", file_type, obj)
                                                 continue
                                         try:
                                                 # Remove permissions to ensure that any hardlinks to
                                                 # suid/sgid files are rendered harmless.
-                                                os.chmod(obj, 0)
+                                                if not islink:
+                                                        os.chmod(obj, 0)
                                                 os.unlink(obj)
                                         except (OSError, IOError), e:
                                                 pass
-                                        writemsg_stdout("<<<        %s %s\n" % ("obj", obj))
+                                        show_unmerge("<<<", "", file_type, obj)
                                 elif pkgfiles[objkey][0] == "fif":
                                         if not stat.S_ISFIFO(lstatobj[stat.ST_MODE]):
-                                                writemsg_stdout("--- !fif   %s %s\n" % ("fif", obj))
+                                                show_unmerge("---", "!fif", file_type, obj)
                                                 continue
-                                        writemsg_stdout("---        %s %s\n" % ("fif", obj))
+                                        show_unmerge("---", "", file_type, obj)
                                 elif pkgfiles[objkey][0] == "dev":
-                                        writemsg_stdout("---        %s %s\n" % ("dev", obj))
+                                        show_unmerge("---", "", file_type, obj)
 
                         mydirs.sort()
@@ -1248 +1301 @@
                                 try:
                                         os.rmdir(obj)
-                                        writemsg_stdout("<<<        %s %s\n" % ("dir", obj))
-                                except (OSError, IOError):
-                                        writemsg_stdout("--- !empty dir %s\n" % obj)
+                                        show_unmerge("<<<", "", "dir", obj)
+                                except EnvironmentError:
+                                        show_unmerge("---", "!empty", "dir", obj)
 
                 #remove self from vartree database so that our own virtual gets zapped if we're the last node
@@ -1271 +1324 @@
                 destfile = normalize_path(
                         os.path.join(destroot, filename.lstrip(os.path.sep)))
-                try:
-                        mylstat = os.lstat(destfile)
-                except (OSError, IOError):
-                        return True
 
                 pkgfiles = self.getcontents()
-                if pkgfiles and filename in pkgfiles:
+                if pkgfiles and destfile in pkgfiles:
                         return True
                 if pkgfiles:
+                        try:
+                                mylstat = os.lstat(destfile)
+                        except EnvironmentError, e:
+                                if e.errno != errno.ENOENT:
+                                        raise
+                                del e
+                                return True
                         if self._contents_inodes is None:
                                 self._contents_inodes = set()
@@ -1299 +1355 @@
                 # get list of libraries from old package instance
                 old_contents = self._installed_instance.getcontents().keys()
-                old_libs = set([os.path.basename(x) for x in old_contents]).intersection(libmap.keys())
+                old_libs = set([os.path.basename(x) for x in old_contents]).intersection(libmap)
 
                 # get list of libraries from new package instance
-                mylibs = set([os.path.basename(x) for x in mycontents]).intersection(libmap.keys())
+                mylibs = set([os.path.basename(x) for x in mycontents]).intersection(libmap)
 
                 # check which libs are present in the old, but not the new package instance
@@ -1360 +1416 @@
                 del preserve_paths
         
-        def _collision_protect(self, srcroot, destroot, otherversions, mycontents, mysymlinks):
+        def _collision_protect(self, srcroot, destroot, mypkglist, mycontents, mysymlinks):
                         collision_ignore = set([normalize_path(myignore) for myignore in \
                                 self.settings.get("COLLISION_IGNORE", "").split()])
@@ -1374 +1430 @@
                         stopmerge = False
                         i=0
-
-                        otherpkg=[]
-                        mypkglist=[]
-
-                        if self.pkg in otherversions:
-                                otherversions.remove(self.pkg)  # we already checked this package
-
-                        myslot = self.settings["SLOT"]
-                        for v in otherversions:
-                                # only allow versions with same slot to overwrite files
-                                if myslot == self.vartree.dbapi.aux_get("/".join((self.cat, v)), ["SLOT"])[0]:
-                                        mypkglist.append(
-                                                dblink(self.cat, v, destroot, self.settings,
-                                                        vartree=self.vartree))
-
                         collisions = []
 
@@ -1405 +1446 @@
                                 if i % 1000 == 0:
                                         print str(i)+" files checked ..."
+                                dest_path = normalize_path(
+                                        os.path.join(destroot, f.lstrip(os.path.sep)))
+                                try:
+                                        dest_lstat = os.lstat(dest_path)
+                                except EnvironmentError, e:
+                                        if e.errno != errno.ENOENT:
+                                                raise
+                                        del e
+                                        continue
                                 if f[0] != "/":
                                         f="/"+f
@@ -1467 +1517 @@
                                 pass
 
-        def _security_check(self, slot_matches):
-                if not slot_matches:
+        def _security_check(self, installed_instances):
+                if not installed_instances:
                         return 0
                 file_paths = set()
-                for cpv in slot_matches:
-                        file_paths.update(dblink(self.cat, catsplit(cpv)[1],
-                                self.vartree.root, self.settings,
-                                vartree=self.vartree).getcontents())
+                for dblnk in installed_instances:
+                        file_paths.update(dblnk.getcontents())
                 inode_map = {}
+                real_paths = set()
                 for path in file_paths:
                         try:
@@ -1484 +1533 @@
                                 del e
                                 continue
-                        if stat.S_ISREG(s.st_mode) and \
-                                s.st_nlink > 1 and \
+                        if not stat.S_ISREG(s.st_mode):
+                                continue
+                        path = os.path.realpath(path)
+                        if path in real_paths:
+                                continue
+                        real_paths.add(path)
+                        if s.st_nlink > 1 and \
                                 s.st_mode & (stat.S_ISUID | stat.S_ISGID):
                                 k = (s.st_dev, s.st_ino)
@@ -1558 +1612 @@
                 slot_matches = self.vartree.dbapi.match(
                         "%s:%s" % (self.mysplit[0], self.settings["SLOT"]))
-                retval = self._security_check(slot_matches)
+                if self.mycpv not in slot_matches and \
+                        self.vartree.dbapi.cpv_exists(self.mycpv):
+                        # handle multislot or unapplied slotmove
+                        slot_matches.append(self.mycpv)
+
+                others_in_slot = []
+                from portage import config
+                for cur_cpv in slot_matches:
+                        # Clone the config in case one of these has to be unmerged since
+                        # we need it to have private ${T} etc... for things like elog.
+                        others_in_slot.append(dblink(self.cat, catsplit(cur_cpv)[1],
+                                self.vartree.root, config(clone=self.settings),
+                                vartree=self.vartree))
+                retval = self._security_check(others_in_slot)
                 if retval:
                         return retval
@@ -1564 +1631 @@
                 if slot_matches:
                         # Used by self.isprotected().
-                        max_cpv = None
+                        max_dblnk = None
                         max_counter = -1
-                        for cur_cpv in slot_matches:
-                                cur_counter = self.vartree.dbapi.cpv_counter(cur_cpv)
+                        for dblnk in others_in_slot:
+                                cur_counter = self.vartree.dbapi.cpv_counter(dblnk.mycpv)
                                 if cur_counter > max_counter:
                                         max_counter = cur_counter
-                                        max_cpv = cur_cpv
-                        slot_matches = [max_cpv]
-                        self._installed_instance = dblink(self.cat,
-                                catsplit(slot_matches[0])[1], destroot, self.settings,
-                                vartree=self.vartree)
+                                        max_dblnk = dblnk
+                        self._installed_instance = max_dblnk
 
                 # get current counter value (counter_tick also takes care of incrementing it)
@@ -1601 +1665 @@
                                 mylinklist = filter(os.path.islink, [os.path.join(srcroot, x) for x in listdir(srcroot, recursive=1, filesonly=0, followSymlinks=False)])
                                 mylinklist = [x[len(srcroot):] for x in mylinklist]
-                        self._collision_protect(srcroot, destroot, otherversions, myfilelist+mylinklist, mylinklist)
-
-                if os.stat(srcroot).st_dev == os.stat(destroot).st_dev:
+                        self._collision_protect(srcroot, destroot, others_in_slot,
+                                myfilelist+mylinklist, mylinklist)
+
+                if True:
                         """ The merge process may move files out of the image directory,
                         which causes invalidation of the .installed flag."""
@@ -1637 +1702 @@
                         self.copyfile(inforoot+"/"+x)
 
+                # do we have a origin repository name for the current package
+                repopath = os.sep.join(self.settings["O"].split(os.sep)[:-2])
+                # bindbapi has no getRepositories() method
+                if mydbapi and hasattr(mydbapi, "getRepositories"):
+                        foundname = False
+                        for reponame in mydbapi.getRepositories():
+                                if mydbapi.getRepositoryPath(reponame) == repopath:
+                                        fd = open(os.path.join(self.dbtmpdir, "repository"), "w")
+                                        fd.write(reponame+"\n")
+                                        fd.close()
+                                        foundname = True
+                                        break
+                        if not foundname:
+                                ewarn("Could not determine name of source repository at %s" % repopath, phase="preinst", key=self.mycpv)
+
                 # write local package counter for recording
                 lcfile = open(os.path.join(self.dbtmpdir, "COUNTER"),"w")
@@ -1698 +1778 @@
                 outfile.flush()
                 outfile.close()
-                self.contentscache = None
-                new_contents = self.getcontents()
-
-                if os.path.exists(self.dbpkgdir):
+
+                for dblnk in others_in_slot:
+                        if dblnk.mycpv != self.mycpv:
+                                continue
                         writemsg_stdout(">>> Safely unmerging already-installed instance...\n")
-                        dblink(self.cat, self.pkg, destroot, self.settings,
-                                vartree=self.vartree).unmerge(trimworld=0,
-                                        ldpath_mtimes=prev_mtimes, new_contents=new_contents)
+                        self.contentscache = None
+                        others_in_slot.append(self)  # self has just been merged
+                        others_in_slot.remove(dblnk) # dblnk will unmerge itself now
+                        dblnk.unmerge(trimworld=0, ldpath_mtimes=prev_mtimes,
+                                others_in_slot=others_in_slot)
                         writemsg_stdout(">>> Original instance of package unmerged safely.\n")
+                        break
 
                 # We hold both directory locks.
                 self.dbdir = self.dbpkgdir
                 self.delete()
-                movefile(self.dbtmpdir, self.dbpkgdir, mysettings=self.settings)
+                _movefile(self.dbtmpdir, self.dbpkgdir, mysettings=self.settings)
                 contents = self.getcontents()
 
@@ -1748 +1831 @@
                         target_root=self.settings["ROOT"], prev_mtimes=prev_mtimes,
                         contents=contents, env=self.settings.environ())
-                #dircache may break autoclean because it remembers the -MERGING-pkg file
-                global dircache
-                if dircache.has_key(self.dbcatdir):
-                        del dircache[self.dbcatdir]
+
                 writemsg_stdout(">>> %s %s\n" % (self.mycpv,"merged."))
-
-                # Process ebuild logfiles
-                elog_process(self.mycpv, self.settings)
-                if "noclean" not in self.settings.features:
-                        doebuild(myebuild, "clean", destroot, self.settings,
-                                tree=self.treetype, mydbapi=mydbapi, vartree=self.vartree)
                 return os.EX_OK
 
@@ -1901 +1975 @@
                                         if bsd_chflags:
                                                 # Save then clear flags on dest.
-                                                dflags = os.lstat(mydest).st_flags
+                                                dflags = mydstat.st_flags
                                                 if dflags != 0:
                                                         bsd_chflags.lchflags(mydest, 0)
@@ -2030 +2104 @@
         def merge(self, mergeroot, inforoot, myroot, myebuild=None, cleanup=0,
                 mydbapi=None, prev_mtimes=None):
+                retval = -1
+                self.lockdb()
                 try:
-                        self.lockdb()
-                        return self.treewalk(mergeroot, myroot, inforoot, myebuild,
+                        retval = self.treewalk(mergeroot, myroot, inforoot, myebuild,
                                 cleanup=cleanup, mydbapi=mydbapi, prev_mtimes=prev_mtimes)
+                        # Process ebuild logfiles
+                        elog_process(self.mycpv, self.settings)
+                        if retval == os.EX_OK and "noclean" not in self.settings.features:
+                                if myebuild is None:
+                                        myebuild = os.path.join(inforoot, self.pkg + ".ebuild")
+                                doebuild(myebuild, "clean", myroot, self.settings,
+                                        tree=self.treetype, mydbapi=mydbapi, vartree=self.vartree)
                 finally:
                         self.unlockdb()
+                return retval
 
         def getstring(self,name):
@@ -2083 +2166 @@
                 return os.path.exists(os.path.join(self.dbdir, "CATEGORY"))
 
-def tar_contents(contents, root, tar, onProgress=None):
-        from portage import normalize_path
+def tar_contents(contents, root, tar, protect=None, onProgress=None):
+        from portage.util import normalize_path
         root = normalize_path(root).rstrip(os.path.sep) + os.path.sep
         id_strings = {}
@@ -2124 +2207 @@
 
                 if stat.S_ISREG(lst.st_mode):
-                        f = file(path)
-                        try:
-                                tar.addfile(tarinfo, f)
-                        finally:
-                                f.close()
+                        if protect and protect(path):
+                                # Create an empty file as a place holder in order to avoid
+                                # potential collision-protect issues.
+                                tarinfo.size = 0
+                                tar.addfile(tarinfo)
+                        else:
+                                f = open(path)
+                                try:
+                                        tar.addfile(tarinfo, f)
+                                finally:
+                                        f.close()
                 else:
                         tar.addfile(tarinfo)

trunk/essentials/sys-apps/prefix-portage/pym/portage/dbapi/virtual.py

@@ -1 +1 @@
 # Copyright 1998-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: virtual.py 6734 2007-06-05 16:37:29Z grobian $
+# $Id: virtual.py 6944 2007-06-22 08:46:32Z grobian $
 
 
@@ -41 +41 @@
         def cp_all(self):
                 returnme=[]
-                for x in self.cpdict.keys():
+                for x in self.cpdict:
                         returnme.extend(self.cpdict[x])
                 return returnme

trunk/essentials/sys-apps/prefix-portage/pym/portage/eclass_cache.py

@@ -8 +8 @@
 from portage.data import portage_gid
 
-class cache:
+class cache(object):
         """
         Maintains the cache information about eclasses used in ebuild.

trunk/essentials/sys-apps/prefix-portage/pym/portage/elog/__init__.py

@@ -2 +2 @@
 # Copyright 2006-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: __init__.py 6593 2007-05-23 16:27:03Z grobian $
+# $Id: __init__.py 7128 2007-07-02 17:31:24Z grobian $
 
 from portage.const import EBUILD_PHASES
@@ -16 +16 @@
 def _merge_logentries(a, b):
         rValue = {}
-        phases = set(a.keys()+b.keys())
+        phases = set(a)
+        phases.update(b)
         for p in phases:
                 rValue[p] = []
@@ -41 +42 @@
 
 _elog_atexit_handlers = []
-def elog_process(cpv, mysettings):
+_preserve_logentries = {}
+def elog_process(cpv, mysettings, phasefilter=None):
         ebuild_logentries = collect_ebuild_messages(os.path.join(mysettings["T"], "logging"))
         all_logentries = collect_messages()
@@ -49 +51 @@
                 all_logentries[cpv] = ebuild_logentries
 
+        for key in _preserve_logentries.keys():
+                if all_logentries.has_key(key):
+                        all_logentries[key] = _merge_logentries(_preserve_logentries[key], all_logentries[key])
+                else:
+                        all_logentries[key] = _preserve_logentries[key]
+                del _preserve_logentries[key]
+
+        if phasefilter != None:
+                for key in all_logentries:
+                        all_logentries[key], _preserve_logentries[key] = phasefilter(all_logentries[key])
+
         my_elog_classes = set(mysettings.get("PORTAGE_ELOG_CLASSES", "").split())
 
-
-        for key in all_logentries.keys():
+        for key in all_logentries:
                 default_logentries = filter_loglevels(all_logentries[key], my_elog_classes)
 
@@ -97 +109 @@
                                 if hasattr(m, "finalize") and not m.finalize in _elog_atexit_handlers:
                                         _elog_atexit_handlers.append(m.finalize)
-                                        atexit_register(m.finalize, mysettings)
+                                        atexit_register(m.finalize)
                         except (ImportError, AttributeError), e:
                                 writemsg("!!! Error while importing logging modules " + \

trunk/essentials/sys-apps/prefix-portage/pym/portage/elog/filtering.py

@@ -4 +4 @@
 # $Id: __init__.py 6458 2007-04-30 02:31:30Z genone $
 
+from portage.const import EBUILD_PHASES
+
 def filter_loglevels(logentries, loglevels):
         # remove unwanted entries from all logentries
         rValue = {}
         loglevels = map(str.upper, loglevels)
-        for phase in logentries.keys():
+        for phase in logentries:
                 for msgtype, msgcontent in logentries[phase]:
                         if msgtype.upper() in loglevels or "*" in loglevels:
@@ -16 +18 @@
         return rValue
         
+def filter_phases(logentries, phases):
+        rValue1 = {}
+        rValue2 = {}
+        phases = map(str.lower, phases)
+        for phase in logentries:
+                if phase in phases:
+                        rValue1[phase] = logentries[phase]
+                else:
+                        rValue2[phase] = logentries[phase]
+        return (rValue1, rValue2)
+
+def filter_mergephases(logentries):
+        myphases = EBUILD_PHASES[:]
+        myphases.remove("prerm")
+        myphases.remove("postrm")
+        return filter_phases(logentries, myphases)
+
+def filter_unmergephases(logentries):
+        return filter_phases(logentries, ["prerm", "postrm", "other"])

trunk/essentials/sys-apps/prefix-portage/pym/portage/elog/messages.py

@@ -85 +85 @@
 
 import sys
-for f in _functions.keys():
+for f in _functions:
         setattr(sys.modules[__name__], f, _make_msgfunction(_functions[f][0], _functions[f][1]))
 del f, _functions

trunk/essentials/sys-apps/prefix-portage/pym/portage/elog/mod_custom.py

@@ -2 +2 @@
 # Copyright 2006-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: mod_custom.py 6593 2007-05-23 16:27:03Z grobian $
+# $Id: mod_custom.py 6944 2007-06-22 08:46:32Z grobian $
 
 import portage.elog_modules.mod_save, portage.process, portage.exception
@@ -9 +9 @@
         elogfilename = portage.elog_modules.mod_save.process(mysettings, key, logentries, fulltext)
         
-        if (not "PORTAGE_ELOG_COMMAND" in mysettings.keys()) \
-                        or len(mysettings["PORTAGE_ELOG_COMMAND"]) == 0:
+        if not mysettings.get("PORTAGE_ELOG_COMMAND"):
                 raise portage.exception.MissingParameter("!!! Custom logging requested but PORTAGE_ELOG_COMMAND is not defined")
         else:

trunk/essentials/sys-apps/prefix-portage/pym/portage/elog/mod_echo.py

@@ -2 +2 @@
 # Copyright 2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: mod_echo.py 6593 2007-05-23 16:27:03Z grobian $
+# $Id: mod_echo.py 7054 2007-06-27 07:57:53Z grobian $
 
 from portage.output import EOutput
 from portage.const import EBUILD_PHASES
 
-_items = {}
+_items = []
 def process(mysettings, key, logentries, fulltext):
-        _items[key] = logentries
+        global _items
+        _items.append((mysettings, key, logentries))
 
-def finalize(mysettings):
+def finalize():
+        global _items
         printer = EOutput()
-        for key in _items.keys():
+        for mysettings, key, logentries in _items:
+                root_msg = ""
+                if mysettings["ROOT"] != "/":
+                        root_msg = " merged to %s" % mysettings["ROOT"]
                 print
-                printer.einfo("Messages for package %s:" % key)
+                printer.einfo("Messages for package %s%s:" % (key, root_msg))
                 print
                 for phase in EBUILD_PHASES:
-                        if not phase in _items[key]:
+                        if phase not in logentries:
                                 continue
-                        for msgtype, msgcontent in _items[key][phase]:
+                        for msgtype, msgcontent in logentries[phase]:
                                 fmap = {"INFO": printer.einfo,
                                                 "WARN": printer.ewarn,
@@ -28 +33 @@
                                 for line in msgcontent:
                                         fmap[msgtype](line.strip("\n"))
+        _items = []
         return

trunk/essentials/sys-apps/prefix-portage/pym/portage/elog/mod_mail_summary.py

@@ -2 +2 @@
 # Copyright 2006-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: mod_mail_summary.py 6593 2007-05-23 16:27:03Z grobian $
+# $Id: mod_mail_summary.py 6993 2007-06-24 15:46:46Z grobian $
 
 import portage.mail, socket, os, time
@@ -9 +9 @@
 _items = {}
 def process(mysettings, key, logentries, fulltext):
+        global _items
         header = ">>> Messages generated for package %s by process %d on %s:\n\n" % \
                 (key, os.getpid(), time.strftime("%Y%m%d-%H%M%S", time.gmtime(time.time())))
-        _items[key] = header + fulltext
+        config_root = mysettings["PORTAGE_CONFIGROOT"]
+        mysettings, items = _items.setdefault(config_root, (mysettings, {}))
+        items[key] = header + fulltext
 
-def finalize(mysettings):
-        if len(_items) == 0:
+def finalize():
+        global _items
+        for mysettings, items in _items.itervalues():
+                _finalize(mysettings, items)
+        _items.clear()
+
+def _finalize(mysettings, items):
+        if len(items) == 0:
                 return
-        elif len(_items) == 1:
+        elif len(items) == 1:
                 count = "one package"
         else:
@@ -32 +41 @@
         mybody = "elog messages for the following packages generated by " + \
                 "process %d on host %s:\n" % (os.getpid(), socket.getfqdn())
-        for key in _items.keys():
+        for key in items:
                  mybody += "- %s\n" % key
 
-        mymessage = portage.mail.create_message(myfrom, myrecipient, mysubject, mybody, attachments=_items.values())
+        mymessage = portage.mail.create_message(myfrom, myrecipient, mysubject,
+                mybody, attachments=items.values())
         portage.mail.send_mail(mysettings, mymessage)
 

trunk/essentials/sys-apps/prefix-portage/pym/portage/env/config.py

@@ -30 +30 @@
 
                 self.data, self.errors = self._loader.load()
+
+        def __iter__(self):
+                return iter(self.data)
 
 class PackageKeywordsFile(UserConfigKlass):

trunk/essentials/sys-apps/prefix-portage/pym/portage/exception.py

@@ -54 +54 @@
 
 class PermissionDenied(PortageException):
+        from errno import EACCES as errno
         """Permission denied"""
 

trunk/essentials/sys-apps/prefix-portage/pym/portage/getbinpkg.py

@@ -80 +80 @@
         optional connection. If connection is already active, it is passed on.
         baseurl is reduced to address and is returned in tuple (conn,address)"""
+
         parts = baseurl.split("://",1)
         if len(parts) != 2:
@@ -85 +86 @@
         protocol,url_parts = parts
         del parts
-        host,address = url_parts.split("/",1)
+
+        url_parts = url_parts.split("/")
+        host = url_parts[0]
+        if len(url_parts) < 2:
+                address = "/"
+        else:
+                address = "/"+"/".join(url_parts[1:])
         del url_parts
-        address = "/"+address
 
         userpass_host = host.split("@",1)
@@ -137 +143 @@
                         conn.set_pasv(passive)
                         conn.set_debuglevel(0)
+                elif protocol == "sftp":
+                        try:
+                                import paramiko
+                        except ImportError:
+                                raise NotImplementedError(
+                                        "paramiko must be installed for sftp support")
+                        t = paramiko.Transport(host)
+                        t.connect(username=username, password=password)
+                        conn = paramiko.SFTPClient.from_transport(t)
                 else:
                         raise NotImplementedError, "%s is not a supported protocol." % protocol
@@ -303 +318 @@
                 else:
                         listing = conn.nlst(address)
+        elif protocol == "sftp":
+                listing = conn.listdir(address)
         else:
                 raise TypeError, "Unknown protocol. '%s'" % protocol
@@ -328 +345 @@
         elif protocol in ["ftp"]:
                 data,rc,msg = make_ftp_request(conn, address, -chunk_size)
+        elif protocol == "sftp":
+                f = conn.open(address)
+                try:
+                        f.seek(-chunk_size, 2)
+                        data = f.read()
+                finally:
+                        f.close()
         else:
                 raise TypeError, "Unknown protocol. '%s'" % protocol
@@ -362 +386 @@
                 return file_get_lib(baseurl,dest,conn)
 
-        fcmd = fcmd.replace("${DISTDIR}",dest)
-        fcmd = fcmd.replace("${URI}", baseurl)
-        fcmd = fcmd.replace("${FILE}", os.path.basename(baseurl))
-        mysplit = fcmd.split()
-        mycmd   = mysplit[0]
-        myargs  = [os.path.basename(mycmd)]+mysplit[1:]
-        mypid=os.fork()
-        if mypid == 0:
-                try:
-                        os.execv(mycmd,myargs)
-                except OSError:
-                        pass
-                sys.stderr.write("!!! Failed to spawn fetcher.\n")
-                sys.stderr.flush()
-                os._exit(1)
-        retval=os.waitpid(mypid,0)[1]
-        if (retval & 0xff) == 0:
-                retval = retval >> 8
-        else:
-                sys.stderr.write("Spawned processes caught a signal.\n")
-                sys.exit(1)
-        if retval != 0:
+        variables = {
+                "DISTDIR": dest,
+                "URI":     baseurl,
+                "FILE":    os.path.basename(baseurl)
+        }
+        import shlex, StringIO
+        from portage.util import varexpand
+        from portage.process import spawn
+        lexer = shlex.shlex(StringIO.StringIO(fcmd), posix=True)
+        lexer.whitespace_split = True
+        myfetch = [varexpand(x, mydict=variables) for x in lexer]
+        retval = spawn(myfetch, env=os.environ.copy())
+        if retval != os.EX_OK:
                 sys.stderr.write("Fetcher exited with a failure condition.\n")
                 return 0
@@ -405 +420 @@
         elif protocol in ["ftp"]:
                 data,rc,msg = make_ftp_request(conn, address, dest=dest)
+        elif protocol == "sftp":
+                rc = 0
+                try:
+                        f = conn.open(address)
+                except SystemExit:
+                        raise
+                except Exception:
+                        rc = 1
+                else:
+                        try:
+                                if dest:
+                                        bufsize = 8192
+                                        while True:
+                                                data = f.read(bufsize)
+                                                if not data:
+                                                        break
+                                                dest.write(data)
+                        finally:
+                                f.close()
         else:
                 raise TypeError, "Unknown protocol. '%s'" % protocol
@@ -517 +551 @@
                 x = os.path.basename(x)
                 binpkg_filenames.add(x)
-                if ((not metadata[baseurl]["data"].has_key(x)) or \
-                    (x not in metadata[baseurl]["data"].keys())):
+                if x not in metadata[baseurl]["data"]:
                         sys.stderr.write(yellow("x"))
                         metadata[baseurl]["modified"] = 1

trunk/essentials/sys-apps/prefix-portage/pym/portage/gpg.py

@@ -31 +31 @@
 
 
-class FileChecker:
+class FileChecker(object):
         def __init__(self,keydir=None,keyring=None,requireSignedRing=False,minimumTrust=EXISTS):
                 self.minimumTrust     = TRUSTED  # Default we require trust. For rings.

trunk/essentials/sys-apps/prefix-portage/pym/portage/locks.py

@@ -286 +286 @@
         results.append("Found %(count)s locks" % {"count":mycount})
         
-        for x in mylist.keys():
+        for x in mylist:
                 if mylist[x].has_key(myhost) or remove_all_locks:
                         mylockname = hardlock_name(path+"/"+x)
@@ -292 +292 @@
                            not os.path.exists(path+"/"+x) or \
                                  remove_all_locks:
-                                for y in mylist[x].keys():
+                                for y in mylist[x]:
                                         for z in mylist[x][y]:
                                                 filename = path+"/"+x+".hardlock-"+y+"-"+z

trunk/essentials/sys-apps/prefix-portage/pym/portage/manifest.py

@@ -80 +80 @@
 class Manifest1Entry(ManifestEntry):
         def __str__(self):
-                myhashkeys = self.hashes.keys()
-                for hashkey in myhashkeys:
+                for hashkey in self.hashes:
                         if hashkey != "size":
                                 break
@@ -346 +345 @@
 
         def checkIntegrity(self):
-                for t in self.fhashdict.keys():
+                for t in self.fhashdict:
                         for f in self.fhashdict[t]:
-                                if not portage.const.MANIFEST2_REQUIRED_HASH in self.fhashdict[t][f].keys():
+                                if portage.const.MANIFEST2_REQUIRED_HASH not in self.fhashdict[t][f]:
                                         raise MissingParameter("Missing %s checksum: %s %s" % (portage.const.MANIFEST2_REQUIRED_HASH, t, f))
 
@@ -489 +488 @@
                                 pass
                         if f in distfilehashes and \
+                                not required_hash_types.difference(distfilehashes[f]) and \
                                 ((assumeDistHashesSometimes and mystat is None) or \
                                 (assumeDistHashesAlways and mystat is None) or \
                                 (assumeDistHashesAlways and mystat is not None and \
                                 len(distfilehashes[f]) == len(self.hashes) and \
-                                distfilehashes[f]["size"] == mystat.st_size)) and \
-                                not required_hash_types.difference(distfilehashes[f]):
+                                distfilehashes[f]["size"] == mystat.st_size)):
                                 self.fhashdict["DIST"][f] = distfilehashes[f]
                         else:

trunk/essentials/sys-apps/prefix-portage/pym/portage/news.py

@@ -5 +5 @@
 
 from portage.const import INCREMENTALS, PROFILE_PATH, NEWS_LIB_PATH
-from portage import config, vartree, vardbapi, portdbapi
 from portage.util import ensure_dirs, apply_permissions
 from portage.data import portage_gid
@@ -27 +26 @@
         TIMESTAMP_FILE = "news-timestamp"
 
-        def __init__(self, root, NEWS_PATH, UNREAD_PATH, LANGUAGE_ID='en'):
+        def __init__(self, portdb, vardb, NEWS_PATH, UNREAD_PATH, LANGUAGE_ID='en'):
                 self.NEWS_PATH = NEWS_PATH
                 self.UNREAD_PATH = UNREAD_PATH
-                self.TIMESTAMP_PATH = os.path.join(root, NEWS_LIB_PATH, NewsManager.TIMESTAMP_FILE)
-                self.target_root = root
+                self.TIMESTAMP_PATH = os.path.join(vardb.root,
+                        NEWS_LIB_PATH, NewsManager.TIMESTAMP_FILE)
+                self.target_root = vardb.root
                 self.LANGUAGE_ID = LANGUAGE_ID
-                self.config = config(config_root = os.environ.get("PORTAGE_CONFIGROOT", "/"),
-                                target_root = root, config_incrementals = INCREMENTALS)
-                self.vdb = vardbapi(settings = self.config, root = root,
-                        vartree = vartree(root = root, settings = self.config))
-                self.portdb = portdbapi(porttree_root = self.config["PORTDIR"], mysettings = self.config)
+                self.config = vardb.settings
+                self.vdb = vardb
+                self.portdb = portdb
+
+                portdir = portdb.porttree_root
+                profiles_base = os.path.join(portdir, "profiles") + os.path.sep
+                from portage.util import normalize_path
+                profile_path = normalize_path(
+                        os.path.realpath(portdb.mysettings.profile_path))
+                if profile_path.startswith(profiles_base):
+                        profile_path = profile_path[len(profiles_base):]
+                self._profile_path = profile_path
 
                 # Ensure that the unread path exists and is writable.
@@ -79 +86 @@
                         except (TypeError, ValueError), e:
                                 continue
-                        if item.isRelevant(profile=os.readlink(PROFILE_PATH), config=config, vardb=self.vdb):
+                        if item.isRelevant(profile=self._profile_path,
+                                config=self.config, vardb=self.vdb):
                                 updates.append(item)
                 del path

trunk/essentials/sys-apps/prefix-portage/pym/portage/output.py

@@ -114 +114 @@
 
 codes["darkteal"]   = codes["turquoise"]
-codes["darkyellow"] = codes["brown"]
+# Some terminals have darkyellow instead of brown.
+codes["0xAAAA00"]   = codes["brown"]
+codes["darkyellow"] = codes["0xAAAA00"]
 codes["fuscia"]     = codes["fuchsia"]
 codes["white"]      = codes["bold"]
@@ -130 +132 @@
 codes["SECURITY_WARN"] = codes["red"]
 codes["MERGE_LIST_PROGRESS"] = codes["yellow"]
+codes["PKG_MERGE"]           = codes["darkgreen"]
+codes["PKG_MERGE_ARG"]       = codes["darkgreen"]
+codes["PKG_MERGE_SYSTEM"]    = codes["green"]
+codes["PKG_MERGE_WORLD"]     = codes["green"]
+codes["PKG_NOMERGE"]         = codes["darkblue"]
+codes["PKG_NOMERGE_ARG"]     = codes["darkblue"]
+codes["PKG_NOMERGE_SYSTEM"]  = codes["blue"]
+codes["PKG_NOMERGE_WORLD"]   = codes["blue"]
 
 def parse_color_map():
@@ -203 +213 @@
                                 if shell:
                                         spawn([shell, "-c", prompt_command], env=os.environ,
-                                                fdpipes={0:sys.stdin.fileno(),1:sys.stderr.fileno(),
+                                                fd_pipes={0:sys.stdin.fileno(),1:sys.stderr.fileno(),
                                                 2:sys.stderr.fileno()})
                                 else:
@@ -257 +267 @@
         `stty size` is parsed.
         """
+        if not sys.stdout.isatty():
+                return -1, -1
         try:
                 import curses
-                curses.setupterm()
-                return curses.tigetnum('lines'), curses.tigetnum('cols')
+                try:
+                        curses.setupterm()
+                        return curses.tigetnum('lines'), curses.tigetnum('cols')
+                except curses.error:
+                        pass
         except ImportError:
                 pass
@@ -282 +297 @@
         spawn(cmd, env=os.environ, fd_pipes={0:fd})
 
-class EOutput:
+class EOutput(object):
         """
         Performs fancy terminal formatting for status and informational messages.
@@ -519 +534 @@
                 maxval = self._maxval
                 position = self._position
-                if cols < 3:
+                percentage_str_width = 4
+                square_brackets_width = 2
+                if cols < percentage_str_width:
                         return ""
-                bar_space = cols - 6
+                bar_space = cols - percentage_str_width - square_brackets_width
                 if maxval == 0:
                         max_bar_width = bar_space-3
@@ -546 +563 @@
                         return image
                 else:
-                        max_bar_width = bar_space-1
                         percentage = int(100 * float(curval) / maxval)
                         if percentage == 100:
-                                percentage = 99
-                        image = ("%d%% " % percentage).rjust(4)
+                                percentage_str_width += 1
+                                bar_space -= 1
+                        max_bar_width = bar_space - 1
+                        image = ("%d%% " % percentage).rjust(percentage_str_width)
                         if cols < min_columns:
                                 return image

trunk/essentials/sys-apps/prefix-portage/pym/portage/tests/__init__.py

@@ -2 +2 @@
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: __init__.py 6312 2007-03-28 19:20:08Z grobian $
+# $Id: __init__.py 6943 2007-06-22 08:42:54Z grobian $
 
 import os, sys, time, unittest
@@ -8 +8 @@
 
 def main():
-        testDirs = ["bin", "util","versions", "dep", "xpak", "env/config"]
+        testDirs = ["bin", "dep", "ebuild",
+                "env/config", "util", "versions", "xpak"]
         suite = unittest.TestSuite()
         basedir = os.path.dirname(__file__)

trunk/essentials/sys-apps/prefix-portage/pym/portage/tests/bin/setup_env.py

@@ -8 +8 @@
 from portage.tests import TestCase
 from portage.process import spawn
+from portage.const import PORTAGE_BIN_PATH
 
 bindir = join(dirname(dirname(abspath(__file__))), "..", "..", "..", "bin")
@@ -16 +17 @@
 os.environ["PF"] = "portage-tests-0.09-r1"
 os.environ["PATH"] = bindir + ":" + os.environ["PATH"]
+os.environ["PORTAGE_BIN_PATH"] = PORTAGE_BIN_PATH
 
 def binTestsCleanup():

trunk/essentials/sys-apps/prefix-portage/pym/portage/tests/env/config/test_PackageMaskFile.py

@@ -19 +19 @@
                         f = PackageMaskFile(self.fname)
                         f.load()
-                        [atom for atom in f.keys() if self.assertTrue(atom in self.atoms)]
+                        for atom in f:
+                                self.assertTrue(atom in self.atoms)
                 finally:
                         self.NukeFile()

trunk/essentials/sys-apps/prefix-portage/pym/portage/tests/env/config/test_PortageModulesFile.py

@@ -19 +19 @@
                 self.BuildFile()
                 f = PortageModulesFile(self.fname)
-                for k in f.keys():
+                for k in f:
                         self.assertEqual( f[k], self.items[k] )
                 self.NukeFile()

trunk/essentials/sys-apps/prefix-portage/pym/portage/tests/util/test_varExpand.py

@@ -2 +2 @@
 # Copyright 2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: test_varExpand.py 6532 2007-05-13 20:52:10Z grobian $
+# $Id: test_varExpand.py 6944 2007-06-22 08:46:32Z grobian $
 
 from portage.tests import TestCase
@@ -12 +12 @@
 
                 varDict = { "a":"5", "b":"7", "c":"-5" }
-                for key in varDict.keys():
+                for key in varDict:
                         result = varexpand( "$%s" % key, varDict )
                         

trunk/essentials/sys-apps/prefix-portage/pym/portage/update.py

@@ -208 +208 @@
                                                 sys.stdout.flush()
 
-        write_atomic(os.path.join(config_root, WORLD_FILE), "\n".join(worldlist))
+        worldlist.sort()
+        write_atomic(os.path.join(config_root, WORLD_FILE), "\n".join(worldlist)+"\n")
 
         protect_obj = ConfigProtect(

trunk/essentials/sys-apps/prefix-portage/pym/portage/util.py

@@ -89 +89 @@
         Returns a new dictlist."""
         new_dl = {}
-        for key in myDict.keys():
+        for key in myDict:
                 new_dl[key] = []
                 new_dl[key] = map(func,myDict[key])
@@ -131 +131 @@
                 if mydict is None:
                         continue
-                for y in mydict.keys():
+                for y in mydict:
                         if not y in final_dict:
                                 final_dict[y] = []
@@ -293 +293 @@
                                 myfile.write(x+"\n")
                 else:
-                        for x in mydict.keys():
+                        for x in mydict:
                                 myfile.write("%s %s\n" % (x, " ".join(mydict[x])))
                 myfile.close()

trunk/essentials/sys-apps/prefix-portage/pym/portage/xpak.py

@@ -225 +225 @@
         os.chdir(origdir)
 
-class tbz2:
+class tbz2(object):
         def __init__(self,myfile):
                 self.file=myfile

trunk/essentials/sys-apps/prefix-portage/src/Makefile.am

@@ -7 +7 @@
 endif
 
-if BUILD_MISSINGOS
-SUBDIRS += python-missingos
-endif
-
 tbz2tool_SOURCES = tbz2tool.c
 

trunk/essentials/sys-apps/prefix-portage/src/Makefile.in

@@ -36 +36 @@
 bin_PROGRAMS = $(am__EXEEXT_1)
 @BUILD_TBZ2TOOL_TRUE@am__append_1 = tbz2tool
-@BUILD_MISSINGOS_TRUE@am__append_2 = python-missingos
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -73 +72 @@
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = python-missingos
+DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
 AMTAR = @AMTAR@
 ARCH = @ARCH@
@@ -179 +177 @@
 program_transform_name = @program_transform_name@
 psdir = @psdir@
+rootgid = @rootgid@
 rootuid = @rootuid@
 rootuser = @rootuser@
@@ -192 +191 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-wheelgid = @wheelgid@
-SUBDIRS = $(am__append_2)
+SUBDIRS = 
 tbz2tool_SOURCES = tbz2tool.c
 MAINTAINERCLEANFILES = Makefile.in