Merge remote branch 'overlays-gentoo-org/master' into prefix

diff --cc bin/misc-functions.sh
index 2bd385f78dacd3e0964880c96dd16f28f6a5ad50,7fb61f69e466179f9fcc2d84fa145d19eef9c620..c06b52421197f7d4eee73c3c748e61e281e17484
mode 100644,100755..100644
--- 1/bin/misc-functions.sh
--- 2/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@@ -379,25 -341,15 +379,15 @@@ install_qa_check_misc() 
  
        # this should help to ensure that all (most?) shared libraries are executable
        # and that all libtool scripts / static libraries are not executable
 -      for i in "${D}"opt/*/lib{,32,64} \
 -               "${D}"lib{,32,64}       \
 -               "${D}"usr/lib{,32,64}   \
 -               "${D}"usr/X11R6/lib{,32,64} ; do
 +      for i in "${ED}"opt/*/lib{,32,64} \
 +               "${ED}"lib{,32,64}       \
 +               "${ED}"usr/lib{,32,64}   \
 +               "${ED}"usr/X11R6/lib{,32,64} ; do
                [[ ! -d ${i} ]] && continue
  
 -              for j in "${i}"/*.so.* "${i}"/*.so ; do
 +              for j in "${i}"/*.so.* "${i}"/*.so "${i}"/*.dylib "${i}"/*.dll ; do
                        [[ ! -e ${j} ]] && continue
-                       if [[ -L ${j} ]] ; then
-                               linkdest=$(readlink "${j}")
-                               if [[ ${linkdest} == /* ]] ; then
-                                       vecho -ne '\a\n'
-                                       eqawarn "QA Notice: Found an absolute symlink in a library directory:"
-                                       eqawarn "           ${j#${D}} -> ${linkdest}"
-                                       eqawarn "           It should be a relative symlink if in the same directory"
-                                       eqawarn "           or a linker script if it crosses the /usr boundary."
-                               fi
-                               continue
-                       fi
+                       [[ -L ${j} ]] && continue
                        [[ -x ${j} ]] && continue
                        vecho "making executable: ${j#${D}}"
                        chmod +x "${j}"

diff --cc bin/repoman
Simple merge

diff --cc cnf/make.globals
index 70001b89f773344a5b6e1fea514437bda40d15b9,42e7d3215c41e53fb2b8ff9b6e088522e8b9d1d9..c20d8e7628752c332d4312138a80d7e036116f73
--- 1/cnf/make.globals
--- 2/cnf/make.globals
+++ b/cnf/make.globals
@@@ -28,18 -28,21 +28,21 @@@ ACCEPT_LICENSE="* -@EULA
  ACCEPT_PROPERTIES="*"
  
  # Repository Paths
 -PORTDIR=/usr/portage
 -DISTDIR=/usr/portage/distfiles
 -PKGDIR=/usr/portage/packages
 -RPMDIR=/usr/portage/rpm
 +PORTDIR="@PORTAGE_EPREFIX@/usr/portage"
 +DISTDIR="@PORTAGE_EPREFIX@/usr/portage/distfiles"
 +PKGDIR="@PORTAGE_EPREFIX@/usr/portage/packages"
 +RPMDIR="@PORTAGE_EPREFIX@/usr/portage/rpm"
  
  # Temporary build directory
 -PORTAGE_TMPDIR=/var/tmp
 +PORTAGE_TMPDIR="@PORTAGE_EPREFIX@/var/tmp"
  
  # Fetching command (5 tries, passive ftp for firewall compatibility)
 -FETCHCOMMAND="/usr/bin/wget -t 5 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\""
 -RESUMECOMMAND="/usr/bin/wget -c -t 5 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\""
 +FETCHCOMMAND="@PORTAGE_WGET@ -t 5 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\""
 +RESUMECOMMAND="@PORTAGE_WGET@ -c -t 5 -T 60 --passive-ftp -O \"\${DISTDIR}/\${FILE}\" \"\${URI}\""
  
+ FETCHCOMMAND_RSYNC="rsync -avP \"\${URI}\" \"\${DISTDIR}/\${FILE}\""
+ RESUMECOMMAND_RSYNC="rsync -avP \"\${URI}\" \"\${DISTDIR}/\${FILE}\""
+ 
  # Default user options
  FEATURES="assume-digests distlocks fixpackages news parallel-fetch protect-owned
            sandbox sfperms strict unmerge-logs unmerge-orphans userfetch"

diff --cc pym/_emerge/depgraph.py
Simple merge

diff --cc pym/portage/dbapi/bintree.py
Simple merge