diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2020-03-24 14:30:14 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2020-03-24 14:32:32 -0700 |
| commit | 037714cdbc29c1ee8527b431d8b8f7fa865f998f (patch) | |
| tree | e5d8bf71257d6074a7dc2785c84427b551f377a4 /sys-apps | |
| parent | app-text/poppler: Drop 0.86.0 (r0) (diff) | |
| download | gentoo-037714cdbc29c1ee8527b431d8b8f7fa865f998f.tar.gz gentoo-037714cdbc29c1ee8527b431d8b8f7fa865f998f.tar.bz2 gentoo-037714cdbc29c1ee8527b431d8b8f7fa865f998f.zip | |
sys-apps/portage: Migrate to python_get_sitedir
Package-Manager: Portage-2.3.95, Repoman-2.3.21
Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/portage/portage-2.3.69.ebuild | 6 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.3.89-r1.ebuild | 6 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.3.94.ebuild | 6 | ||||
| -rw-r--r-- | sys-apps/portage/portage-2.3.95.ebuild | 6 | ||||
| -rw-r--r-- | 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 40994d245099..2ccc4a89c02e 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 780cf80fb585..01603e073618 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 bd25531263bd..1e0dc18322be 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 bd25531263bd..1e0dc18322be 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 e510a7a02ab4..1ee606fe3c22 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. |