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

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 6aaaaf45860e6daf61384d506cb089c4061eccb2..57b0f731d66e7416250ffda463dbc10a8a965566 100644 (file)
--- 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 95c11ec5e56f0a994d705119d1a374c74ea12b56..78c85bbcdd16471ca2fbd9b7782a8af47a8655e0 100644 (file)
--- 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
 }