commit: 037714cdbc29c1ee8527b431d8b8f7fa865f998f Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Tue Mar 24 21:30:14 2020 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Tue Mar 24 21:32:32 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=037714cd
sys-apps/portage: Migrate to python_get_sitedir Package-Manager: Portage-2.3.95, Repoman-2.3.21 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> sys-apps/portage/portage-2.3.69.ebuild | 6 +++--- sys-apps/portage/portage-2.3.89-r1.ebuild | 6 +++--- sys-apps/portage/portage-2.3.94.ebuild | 6 +++--- sys-apps/portage/portage-2.3.95.ebuild | 6 +++--- sys-apps/portage/portage-9999.ebuild | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sys-apps/portage/portage-2.3.69.ebuild b/sys-apps/portage/portage-2.3.69.ebuild index 40994d24509..2ccc4a89c02 100644 --- a/sys-apps/portage/portage-2.3.69.ebuild +++ b/sys-apps/portage/portage-2.3.69.ebuild @@ -228,14 +228,14 @@ python_install_all() { pkg_preinst() { python_setup - python_export PYTHON_SITEDIR - [[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory" + local sitedir=$(python_get_sitedir) + [[ -d ${D%/}${sitedir} ]] || die "${D%/}${sitedir}: No such directory" env -u DISTDIR \ -u PORTAGE_OVERRIDE_EPREFIX \ -u PORTAGE_REPOSITORIES \ -u PORTDIR \ -u PORTDIR_OVERLAY \ - PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \ + PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ "${PYTHON}" -m portage._compat_upgrade.default_locations || die # elog dir must exist to avoid logrotate error for bug #415911. diff --git a/sys-apps/portage/portage-2.3.89-r1.ebuild b/sys-apps/portage/portage-2.3.89-r1.ebuild index 780cf80fb58..01603e07361 100644 --- a/sys-apps/portage/portage-2.3.89-r1.ebuild +++ b/sys-apps/portage/portage-2.3.89-r1.ebuild @@ -239,14 +239,14 @@ python_install_all() { pkg_preinst() { python_setup - python_export PYTHON_SITEDIR - [[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory" + local sitedir=$(python_get_sitedir) + [[ -d ${D%/}${sitedir} ]] || die "${D%/}${sitedir}: No such directory" env -u DISTDIR \ -u PORTAGE_OVERRIDE_EPREFIX \ -u PORTAGE_REPOSITORIES \ -u PORTDIR \ -u PORTDIR_OVERLAY \ - PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \ + PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ "${PYTHON}" -m portage._compat_upgrade.default_locations || die # elog dir must exist to avoid logrotate error for bug #415911. diff --git a/sys-apps/portage/portage-2.3.94.ebuild b/sys-apps/portage/portage-2.3.94.ebuild index bd25531263b..1e0dc18322b 100644 --- a/sys-apps/portage/portage-2.3.94.ebuild +++ b/sys-apps/portage/portage-2.3.94.ebuild @@ -236,14 +236,14 @@ python_install_all() { pkg_preinst() { python_setup - python_export PYTHON_SITEDIR - [[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory" + local sitedir=$(python_get_sitedir) + [[ -d ${D%/}${sitedir} ]] || die "${D%/}${sitedir}: No such directory" env -u DISTDIR \ -u PORTAGE_OVERRIDE_EPREFIX \ -u PORTAGE_REPOSITORIES \ -u PORTDIR \ -u PORTDIR_OVERLAY \ - PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \ + PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ "${PYTHON}" -m portage._compat_upgrade.default_locations || die # elog dir must exist to avoid logrotate error for bug #415911. diff --git a/sys-apps/portage/portage-2.3.95.ebuild b/sys-apps/portage/portage-2.3.95.ebuild index bd25531263b..1e0dc18322b 100644 --- a/sys-apps/portage/portage-2.3.95.ebuild +++ b/sys-apps/portage/portage-2.3.95.ebuild @@ -236,14 +236,14 @@ python_install_all() { pkg_preinst() { python_setup - python_export PYTHON_SITEDIR - [[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory" + local sitedir=$(python_get_sitedir) + [[ -d ${D%/}${sitedir} ]] || die "${D%/}${sitedir}: No such directory" env -u DISTDIR \ -u PORTAGE_OVERRIDE_EPREFIX \ -u PORTAGE_REPOSITORIES \ -u PORTDIR \ -u PORTDIR_OVERLAY \ - PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \ + PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ "${PYTHON}" -m portage._compat_upgrade.default_locations || die # elog dir must exist to avoid logrotate error for bug #415911. diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index e510a7a02ab..1ee606fe3c2 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.ebuild @@ -231,14 +231,14 @@ python_install_all() { pkg_preinst() { python_setup - python_export PYTHON_SITEDIR - [[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory" + local sitedir=$(python_get_sitedir) + [[ -d ${D%/}${sitedir} ]] || die "${D%/}${sitedir}: No such directory" env -u DISTDIR \ -u PORTAGE_OVERRIDE_EPREFIX \ -u PORTAGE_REPOSITORIES \ -u PORTDIR \ -u PORTDIR_OVERLAY \ - PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \ + PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ "${PYTHON}" -m portage._compat_upgrade.default_locations || die # elog dir must exist to avoid logrotate error for bug #415911.