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>

diff --git a/sys-apps/portage/portage-2.3.69.ebuild b/sys-apps/portage/portage-2.3.69.ebuild
index 40994d2450994a92d819f0417d8c49e7585840a4..2ccc4a89c02e50f7caf7a6652e8b80d9da85dce5 100644 (file)
--- 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 780cf80fb585bd25e6e17d95f23d5c954ec4ab87..01603e07361823ab2bfb1c44037561febc835ede 100644 (file)
--- 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 bd25531263bd2b591988f6512fec2c554598605b..1e0dc18322bebf6396b4a90715f888d2593144de 100644 (file)
--- 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 bd25531263bd2b591988f6512fec2c554598605b..1e0dc18322bebf6396b4a90715f888d2593144de 100644 (file)
--- 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 e510a7a02ab48a1a388c03bc272dad800fcdd5d5..1ee606fe3c2224f526c4b62879b6d613d7fa8e9d 100644 (file)
--- 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.