[gentoo-commits] repo/gentoo:master commit in: sys-apps/portage/

[Zac Medico]

commit:     ca46dbd3c4430d0b1c928073451b4d92279439c7
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 19 22:49:14 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Jul 19 22:51:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca46dbd3

sys-apps/portage: upgrade 9999 to EAPI 7

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 sys-apps/portage/portage-9999.ebuild | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys-apps/portage/portage-9999.ebuild 
b/sys-apps/portage/portage-9999.ebuild
index 4c546564cf0..925c6b9f65b 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
 }