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

diff --cc bin/repoman
Simple merge

diff --cc man/emerge.1
Simple merge

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

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

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

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

diff --cc pym/portage/__init__.py
Simple merge

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

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

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

diff --cc pym/portage/util/__init__.py
Simple merge

diff --cc runtests.sh
index f1cd01c39ed7dd959524e91d816c23571a4cc9ee,dc3343fe9b7ec1d00a8630f30bcc0e2831575f45..31910d65d7b78ba5ab712035e66bb5a90240679e
--- 1/runtests.sh
--- 2/runtests.sh
+++ b/runtests.sh
@@@ -15,11 -15,18 +15,18 @@@ case "${NOCOLOR:-false}" i
                ;;
  esac
  
+ interrupted() {
+       echo "interrupted." >&2
+       exit 1
+ }
+ 
+ trap interrupted SIGINT
+ 
  exit_status="0"
  for version in ${PYTHON_VERSIONS}; do
 -      if [[ -x /usr/bin/python${version} ]]; then
 +      if [[ -x @PORTAGE_PYTHON@${version} ]]; then
                echo -e "${GOOD}Testing with Python ${version}...${NORMAL}"
 -              if ! /usr/bin/python${version} pym/portage/tests/runTests; then
 +              if ! @PORTAGE_PYTHON@${version} pym/portage/tests/runTests; then
                        echo -e "${BAD}Testing with Python ${version} failed${NORMAL}"
                        exit_status="1"
                fi