diff options
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/portage/portage-9999.ebuild | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild index 4c546564cf0c..925c6b9f65ba 100644 --- a/sys-apps/portage/portage-9999.ebuild +++ b/sys-apps/portage/portage-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DISTUTILS_USE_SETUPTOOLS=no PYTHON_COMPAT=( pypy3 python3_{6..9} ) @@ -216,24 +216,24 @@ python_install_all() { dodir /usr/sbin for target in ${sbin_relocations}; do einfo "Moving /usr/bin/${target} to /usr/sbin/${target}" - mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!" + mv "${ED}/usr/bin/${target}" "${ED}/usr/sbin/${target}" || die "sbin scripts move failed!" done } pkg_preinst() { python_setup local sitedir=$(python_get_sitedir) - [[ -d ${D%/}${sitedir} ]] || die "${D%/}${sitedir}: No such directory" + [[ -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%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ "${PYTHON}" -m portage._compat_upgrade.default_locations || die env -u BINPKG_COMPRESS \ - PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ + PYTHONPATH="${D}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \ "${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die # elog dir must exist to avoid logrotate error for bug #415911. @@ -241,7 +241,7 @@ pkg_preinst() { # portage:portage to root:root which happens after src_install. keepdir /var/log/portage/elog # This is allowed to fail if the user/group are invalid for prefix users. - if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then - chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog} + if chown portage:portage "${ED}"/var/log/portage{,/elog} 2>/dev/null ; then + chmod g+s,ug+rwx "${ED}"/var/log/portage{,/elog} fi } |