Skip to content

Commit

Permalink
sys-apps/portage: Migrate to python_get_sitedir
Browse files Browse the repository at this point in the history
Package-Manager: Portage-2.3.95, Repoman-2.3.21
Signed-off-by: Zac Medico <[email protected]>
  • Loading branch information
zmedico committed Mar 24, 2020
1 parent 0959da6 commit 037714c
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions sys-apps/portage/portage-2.3.69.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions sys-apps/portage/portage-2.3.89-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions sys-apps/portage/portage-2.3.94.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions sys-apps/portage/portage-2.3.95.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions sys-apps/portage/portage-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit 037714c

Please sign in to comment.