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

Conflicts:
	pym/_emerge/actions.py

diff --cc bin/ebuild.sh
Simple merge

diff --cc bin/egencache
Simple merge

diff --cc bin/misc-functions.sh
index e11991f004851a2a8322dae5905f88d6065dd047,622676873dc8133a7d797c5e9381e97d3145b383..1622acc806dc654e724c76068490b329def6e7f7
mode 100644,100755..100644
--- 1/bin/misc-functions.sh
--- 2/bin/misc-functions.sh
+++ b/bin/misc-functions.sh
@@@ -370,9 -332,11 +370,11 @@@ install_qa_check_misc() 
  
        # Sanity check syntax errors in init.d scripts
        for d in /etc/conf.d /etc/init.d ; do
 -              [[ -d ${D}/${d} ]] || continue
 -              for i in "${D}"/${d}/* ; do
 +              [[ -d ${ED}/${d} ]] || continue
 +              for i in "${ED}"/${d}/* ; do
                        [[ -L ${i} ]] && continue
+                       # if empty conf.d/init.d dir exists (baselayout), then i will be "/etc/conf.d/*" and not exist
+                       [[ ! -e ${i} ]] && continue
                        bash -n "${i}" || die "The init.d file has syntax errors: ${i}"
                done
        done

diff --cc bin/repoman
Simple merge

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

diff --cc pym/_emerge/actions.py
index 166492d6859e53671ed60354625586286beb6575,af4380ed1a8b49ad9d0c1f6ca9fbbb282adf9c3e..1ea3e81a56f3efab659665bc149112cdb2058650
--- 1/pym/_emerge/actions.py
--- 2/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@@ -2179,9 -2188,9 +2188,9 @@@ def action_sync(settings, trees, mtimed
                                out.eerror(line)
                        sys.exit(exitcode)
        elif syncuri[:6]=="cvs://":
 -              if not os.path.exists("/usr/bin/cvs"):
 -                      print("!!! /usr/bin/cvs does not exist, so CVS support is disabled.")
 +              if not os.path.exists(EPREFIX + "/usr/bin/cvs"):
 +                      print("!!! " + EPREFIX + "/usr/bin/cvs does not exist, so CVS support is disabled.")
-                       print("!!! Type \"emerge dev-util/cvs\" to enable CVS support.")
+                       print("!!! Type \"emerge dev-vcs/cvs\" to enable CVS support.")
                        sys.exit(1)
                cvsroot=syncuri[6:]
                cvsdir=os.path.dirname(myportdir)

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

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

diff --cc pym/portage/package/ebuild/config.py
Simple merge