commit:     fe9f13cf6189140f1e89481cb87a0f544a50657c
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 18 16:56:24 2017 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Jul 18 16:56:24 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe9f13cf

sys-apps/systemd: use relative symlinks for systemd and systemd-shutdown

Bug: https://bugs.gentoo.org/625462
Package-Manager: Portage-2.3.6_p16, Repoman-2.3.2_p84

 sys-apps/systemd/{systemd-234-r1.ebuild => systemd-234-r2.ebuild} | 4 ++--
 sys-apps/systemd/systemd-9999.ebuild                              | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-apps/systemd/systemd-234-r1.ebuild 
b/sys-apps/systemd/systemd-234-r2.ebuild
similarity index 98%
rename from sys-apps/systemd/systemd-234-r1.ebuild
rename to sys-apps/systemd/systemd-234-r2.ebuild
index 6aaaaf45860..57b0f731d66 100644
--- a/sys-apps/systemd/systemd-234-r1.ebuild
+++ b/sys-apps/systemd/systemd-234-r2.ebuild
@@ -332,8 +332,8 @@ multilib_src_install_all() {
 
        if [[ ! -e "${ED%/}"/usr/lib/systemd/systemd ]]; then
                # Avoid breaking boot/reboot
-               dosym "${EPREFIX}${ROOTPREFIX%/}/lib/systemd/systemd" 
/usr/lib/systemd/systemd
-               dosym "${EPREFIX}${ROOTPREFIX%/}/lib/systemd/systemd-shutdown" 
/usr/lib/systemd/systemd-shutdown
+               dosym "../../..${ROOTPREFIX%/}/lib/systemd/systemd" 
/usr/lib/systemd/systemd
+               dosym "../../..${ROOTPREFIX%/}/lib/systemd/systemd-shutdown" 
/usr/lib/systemd/systemd-shutdown
        fi
 }
 

diff --git a/sys-apps/systemd/systemd-9999.ebuild 
b/sys-apps/systemd/systemd-9999.ebuild
index 95c11ec5e56..78c85bbcdd1 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -331,8 +331,8 @@ multilib_src_install_all() {
 
        if [[ ! -e "${ED%/}"/usr/lib/systemd/systemd ]]; then
                # Avoid breaking boot/reboot
-               dosym "${EPREFIX}${ROOTPREFIX%/}/lib/systemd/systemd" 
/usr/lib/systemd/systemd
-               dosym "${EPREFIX}${ROOTPREFIX%/}/lib/systemd/systemd-shutdown" 
/usr/lib/systemd/systemd-shutdown
+               dosym "../../..${ROOTPREFIX%/}/lib/systemd/systemd" 
/usr/lib/systemd/systemd
+               dosym "../../..${ROOTPREFIX%/}/lib/systemd/systemd-shutdown" 
/usr/lib/systemd/systemd-shutdown
        fi
 }
 

Reply via email to