python-updater.diff

python-updater.diff (text/plain), 9.62 KB, created by Martin Mokrejš on 2017-04-11 11:51:12 UTC

--- /scratch/var/tmp/portage/app-admin/python-updater-0.14/work/python-updater-0.14/python-updater.in	2015-12-10 20:25:15.000000000 +0100
+++ /scratch/var/tmp/portage/app-admin/python-updater-0.14/image/usr/sbin/python-updater	2017-04-11 13:46:12.999556618 +0200
@@ -29,7 +29,7 @@
 OLD_PYTHON_VERSIONS=""
 OLD_PYTHON2_VERSIONS=""
 OLD_PYTHON3_VERSIONS=""
-NEW_PYTHON_VERSION="$("@GENTOO_PORTAGE_EPREFIX@"/usr/bin/python -c 'from sys import version_info; print(".".join([str(x) for x in version_info[:2]]))')"
+NEW_PYTHON_VERSION="$(""/usr/bin/python -c 'from sys import version_info; print(".".join([str(x) for x in version_info[:2]]))')"
 NEW_PYTHON2_VERSION=""
 NEW_PYTHON3_VERSION=""
 
@@ -62,17 +62,17 @@
 CHECK_STATIC_LINKING="1"
 
 # Load the Gentoo-style info macros
-if [[ -e "@GENTOO_PORTAGE_EPREFIX@"/lib/gentoo/functions.sh ]]; then
-    . "@GENTOO_PORTAGE_EPREFIX@"/lib/gentoo/functions.sh
-elif [[ -e "@GENTOO_PORTAGE_EPREFIX@"/etc/init.d/functions.sh ]]; then
-    . "@GENTOO_PORTAGE_EPREFIX@"/etc/init.d/functions.sh
+if [[ -e ""/lib/gentoo/functions.sh ]]; then
+    . ""/lib/gentoo/functions.sh
+elif [[ -e ""/etc/init.d/functions.sh ]]; then
+    . ""/etc/init.d/functions.sh
 else
     echo "Unable to find functions.sh"
     exit 1
 fi
 
 # Portage variables.
-PKG_DBDIR="@GENTOO_PORTAGE_EPREFIX@/var/db/pkg"
+PKG_DBDIR="/var/db/pkg"
 
 shopt -s expand_aliases
 
@@ -153,7 +153,7 @@
 # has_version(cpv)
 has_version() {
 	if [[ "${PMS_COMMAND[${PMS_INDEX}]}" == "emerge" ]]; then
-		"@GENTOO_PORTAGE_EPREFIX@"/usr/bin/portageq has_version "@GENTOO_PORTAGE_EPREFIX@"/ "${1}"
+		""/usr/bin/portageq has_version ""/ "${1}"
 	elif [[ "${PMS_COMMAND[${PMS_INDEX}]}" == "pmerge" ]]; then
 		pquery --vdb "${1}"
 	else
@@ -164,7 +164,7 @@
 # get_ebuild_path(CATEGORY, PN, SLOT)
 get_ebuild_path() {
 	# These manual calls to Portage API are 2 times faster than 'portageq get_repo_path / "$(portageq metadata / ebuild "$(portageq best_visible / "${1}")" repository)"'.
-	"@GENTOO_PORTAGE_EPREFIX@"/usr/bin/python -c "
+	""/usr/bin/python -c "
 import sys
 
 if '' in sys.path:
@@ -172,7 +172,7 @@
 
 import portage
 
-dbapi = portage.db['@GENTOO_PORTAGE_EPREFIX@/']['porttree'].dbapi
+dbapi = portage.db['/']['porttree'].dbapi
 pkg_list = dbapi.match('${1}/${2}${3:+:}${3}')
 if pkg_list:
 	best_visible = portage.best(pkg_list)
@@ -248,7 +248,7 @@
 
 	local variable
 	for variable in "$@"; do
-		if eval "[[ \${${variable}} == \$(env -u ${variable} "@GENTOO_PORTAGE_EPREFIX@"/usr/bin/portageq envvar ${variable}) ]]"; then
+		if eval "[[ \${${variable}} == \$(env -u ${variable} ""/usr/bin/portageq envvar ${variable}) ]]"; then
 			unset ${variable}
 		fi
 	done
@@ -260,14 +260,14 @@
 get_USE_PYTHON() {
 	if [[ "${PMS_COMMAND[${PMS_INDEX}]}" =~ ^(emerge|pmerge)$ ]]; then
 		if [[ -z "${global_USE_PYTHON}" ]]; then
-			global_USE_PYTHON="$("@GENTOO_PORTAGE_EPREFIX@"/usr/bin/portageq envvar USE_PYTHON)"
+			global_USE_PYTHON="$(""/usr/bin/portageq envvar USE_PYTHON)"
 		fi
 		USE_PYTHON="${global_USE_PYTHON}"
-		if [[ -f "@GENTOO_PORTAGE_EPREFIX@/etc/portage/env/${1}/${2}" ]]; then
-			USE_PYTHON="$(. "@GENTOO_PORTAGE_EPREFIX@/etc/portage/env/${1}/${2}"; echo "${USE_PYTHON}")"
+		if [[ -f "/etc/portage/env/${1}/${2}" ]]; then
+			USE_PYTHON="$(. "/etc/portage/env/${1}/${2}"; echo "${USE_PYTHON}")"
 		fi
-		if [[ -f "@GENTOO_PORTAGE_EPREFIX@/etc/portage/env/${1}/${2}:${3}" ]]; then
-			USE_PYTHON="$(. "@GENTOO_PORTAGE_EPREFIX@/etc/portage/env/${1}/${2}:${3}"; echo "${USE_PYTHON}")"
+		if [[ -f "/etc/portage/env/${1}/${2}:${3}" ]]; then
+			USE_PYTHON="$(. "/etc/portage/env/${1}/${2}:${3}"; echo "${USE_PYTHON}")"
 		fi
 	else
 		USE_PYTHON="$(cave print-id-environment-variable "${1}/${2}${3:+:}${3}::/?" --best --format %v --variable-name USE_PYTHON)"
@@ -505,17 +505,17 @@
 done
 
 if [[ "${PMS_COMMAND[${PMS_INDEX}]}" == "emerge" ]]; then
-	sed="$("@GENTOO_PORTAGE_EPREFIX@"/usr/bin/python -c "import os; print(os.path.dirname(os.path.realpath('$(type -p emerge)')))")/ebuild-helpers/bsd/sed"
+	sed="$(""/usr/bin/python -c "import os; print(os.path.dirname(os.path.realpath('$(type -p emerge)')))")/ebuild-helpers/bsd/sed"
 	if [[ -x "${sed}" ]]; then
 		alias sed="${sed}"
 	fi
 fi
 
 if has_version "=dev-lang/python-2*"; then
-	NEW_PYTHON2_VERSION="$("@GENTOO_PORTAGE_EPREFIX@"/usr/bin/python2 -c 'from sys import version_info; print(".".join([str(x) for x in version_info[:2]]))')" || die "Error calling python2"
+	NEW_PYTHON2_VERSION="$(""/usr/bin/python2 -c 'from sys import version_info; print(".".join([str(x) for x in version_info[:2]]))')" || die "Error calling python2"
 fi
 if has_version "=dev-lang/python-3*"; then
-	NEW_PYTHON3_VERSION="$("@GENTOO_PORTAGE_EPREFIX@"/usr/bin/python3 -c 'from sys import version_info; print(".".join([str(x) for x in version_info[:2]]))')" || die "Error calling python3"
+	NEW_PYTHON3_VERSION="$(""/usr/bin/python3 -c 'from sys import version_info; print(".".join([str(x) for x in version_info[:2]]))')" || die "Error calling python3"
 fi
 if [[ -z "${NEW_PYTHON2_VERSION}" && -z "${NEW_PYTHON3_VERSION}" ]]; then
 	die "Python 2 and Python 3 not installed"
@@ -525,10 +525,10 @@
 for python_version in ${PYTHON_VERSIONS}; do
 	if [[ "${python_version}" != "${NEW_PYTHON_VERSION}" ]]; then
 		OLD_PYTHON_VERSIONS+="${OLD_PYTHON_VERSIONS:+ }${python_version}"
-		soname="$(readlink -n "@GENTOO_PORTAGE_EPREFIX@"/usr/lib/libpython${python_version}.so)"
+		soname="$(readlink -n ""/usr/lib/libpython${python_version}.so)"
 		if [[ -z "${soname}" ]]; then
 			# Use relatively safe, default value.
-            if [[ -f "@GENTOO_PORTAGE_EPREFIX@"/usr/lib/libpython${python_version}.dylib ]] ; then
+            if [[ -f ""/usr/lib/libpython${python_version}.dylib ]] ; then
                 # there is no versioned dylib on Darwin
                 soname="libpython${python_version}.dylib"
             else
@@ -546,10 +546,10 @@
 for python_version in ${PYTHON2_VERSIONS}; do
 	if [[ "${python_version}" != "${NEW_PYTHON2_VERSION}" ]]; then
 		OLD_PYTHON2_VERSIONS+="${OLD_PYTHON2_VERSIONS:+ }${python_version}"
-		soname="$(readlink -n "@GENTOO_PORTAGE_EPREFIX@"/usr/lib/libpython${python_version}.so)"
+		soname="$(readlink -n ""/usr/lib/libpython${python_version}.so)"
 		if [[ -z "${soname}" ]]; then
 			# Use relatively safe, default value.
-            if [[ -f "@GENTOO_PORTAGE_EPREFIX@"/usr/lib/libpython${python_version}.dylib ]] ; then
+            if [[ -f ""/usr/lib/libpython${python_version}.dylib ]] ; then
                 # there is no versioned dylib on Darwin
                 soname="libpython${python_version}.dylib"
             else
@@ -567,10 +567,10 @@
 for python_version in ${PYTHON3_VERSIONS}; do
 	if [[ "${python_version}" != "${NEW_PYTHON3_VERSION}" ]]; then
 		OLD_PYTHON3_VERSIONS+="${OLD_PYTHON3_VERSIONS:+ }${python_version}"
-		soname="$(readlink -n "@GENTOO_PORTAGE_EPREFIX@"/usr/lib/libpython${python_version}.so)"
+		soname="$(readlink -n ""/usr/lib/libpython${python_version}.so)"
 		if [[ -z "${soname}" ]]; then
 			# Use relatively safe, default value.
-            if [[ -f "@GENTOO_PORTAGE_EPREFIX@"/usr/lib/libpython${python_version}.dylib ]] ; then
+            if [[ -f ""/usr/lib/libpython${python_version}.dylib ]] ; then
                 # there is no versioned dylib on Darwin
                 soname="libpython${python_version}.dylib"
             else
@@ -586,7 +586,7 @@
 
 declare -A PYTHON_GLOBALLY_SUPPORTED_ABIS
 if [[ "${PMS_COMMAND[${PMS_INDEX}]}" == "emerge" ]]; then
-	eval "$("@GENTOO_PORTAGE_EPREFIX@"/usr/bin/python -c \
+	eval "$(""/usr/bin/python -c \
 "import re
 import sys
 
@@ -605,7 +605,7 @@
 for variable in variables:
 	exec('%(variable)s_regex = re.compile(r\'^%(variable)s=\((.*)\)\')' % {'variable': variable})
 
-dbapi = portage.db['@GENTOO_PORTAGE_EPREFIX@/']['porttree'].dbapi
+dbapi = portage.db['/']['porttree'].dbapi
 python_eclass_locations = {}
 
 if hasattr(dbapi.repositories.mainRepo(), 'eclass_db'):
@@ -865,7 +865,7 @@
 	fi
 
 	if [[ "${CHECK_STATIC_LINKING}" -ne 0 ]]; then
-		binaries="$(scanelf -qs +Py_Initialize < <(grep -E "^obj" "${contents_file}" | cut -d" " -f2 | grep -Ev "^@GENTOO_PORTAGE_EPREFIX@/usr/lib(32|64)?/debug/") | sed "s/.* //")"
+		binaries="$(scanelf -qs +Py_Initialize < <(grep -E "^obj" "${contents_file}" | cut -d" " -f2 | grep -Ev "^/usr/lib(32|64)?/debug/") | sed "s/.* //")"
 		if [[ -n "${binaries}" ]]; then
 			PKGS_TO_REMERGE+=" ${CATPKGVER}"
 			eindent
@@ -924,7 +924,7 @@
 	fi
 
 	if [[ "${CHECK_SHARED_LINKING}" -ne 0 ]]; then
-		binaries="$(scanelf -qF "%F %n" < <(grep -E "^obj" "${contents_file}" | cut -d" " -f2 | grep -Ev "^@GENTOO_PORTAGE_EPREFIX@/usr/lib(32|64)?/debug/") | grep -E "( |,)$(get_OLD_PYTHON_SHARED_LIBRARIES_REGEX)(,|$)")"
+		binaries="$(scanelf -qF "%F %n" < <(grep -E "^obj" "${contents_file}" | cut -d" " -f2 | grep -Ev "^/usr/lib(32|64)?/debug/") | grep -E "( |,)$(get_OLD_PYTHON_SHARED_LIBRARIES_REGEX)(,|$)")"
         [[ -z ${binaries} ]] && \
             binaries="$(scanmacho -qF "%F %n" < <(grep -E "^obj" "${contents_file}" | cut -d" " -f2) | grep -E "( |,)$(get_OLD_PYTHON_SHARED_LIBRARIES_REGEX)(,|$)")"
 		if [[ -n "${binaries}" ]]; then
@@ -956,7 +956,7 @@
 if [[ "${PMS_COMMAND[${PMS_INDEX}]}" == "emerge" ]] ; then
 	# Filter out --getbinpkg, --getbinpkgonly, --usepkg and --usepkgonly options in EMERGE_DEFAULT_OPTS environment variable
 	emerge_default_opts=""
-	for option in $("@GENTOO_PORTAGE_EPREFIX@"/usr/bin/portageq envvar EMERGE_DEFAULT_OPTS); do
+	for option in $(""/usr/bin/portageq envvar EMERGE_DEFAULT_OPTS); do
 		if [[ "${option}" == -[[:alnum:]]* ]]; then
 			[[ "${option//[gGkK]/}" != "-" ]] && emerge_default_opts+=" ${option//[gGkK]/}"
 		elif [[ "${option}" != "--getbinpkg" && "${option}" != "--getbinpkgonly" && "${option}" != "--usepkg" && "${option}" != "--usepkgonly" ]]; then