Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/
Date: Tue, 18 Jul 2017 17:01:01
Message-Id: 1500396984.fe9f13cf6189140f1e89481cb87a0f544a50657c.floppym@gentoo
1 commit: fe9f13cf6189140f1e89481cb87a0f544a50657c
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jul 18 16:56:24 2017 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Tue Jul 18 16:56:24 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe9f13cf
7
8 sys-apps/systemd: use relative symlinks for systemd and systemd-shutdown
9
10 Bug: https://bugs.gentoo.org/625462
11 Package-Manager: Portage-2.3.6_p16, Repoman-2.3.2_p84
12
13 sys-apps/systemd/{systemd-234-r1.ebuild => systemd-234-r2.ebuild} | 4 ++--
14 sys-apps/systemd/systemd-9999.ebuild | 4 ++--
15 2 files changed, 4 insertions(+), 4 deletions(-)
16
17 diff --git a/sys-apps/systemd/systemd-234-r1.ebuild b/sys-apps/systemd/systemd-234-r2.ebuild
18 similarity index 98%
19 rename from sys-apps/systemd/systemd-234-r1.ebuild
20 rename to sys-apps/systemd/systemd-234-r2.ebuild
21 index 6aaaaf45860..57b0f731d66 100644
22 --- a/sys-apps/systemd/systemd-234-r1.ebuild
23 +++ b/sys-apps/systemd/systemd-234-r2.ebuild
24 @@ -332,8 +332,8 @@ multilib_src_install_all() {
25
26 if [[ ! -e "${ED%/}"/usr/lib/systemd/systemd ]]; then
27 # Avoid breaking boot/reboot
28 - dosym "${EPREFIX}${ROOTPREFIX%/}/lib/systemd/systemd" /usr/lib/systemd/systemd
29 - dosym "${EPREFIX}${ROOTPREFIX%/}/lib/systemd/systemd-shutdown" /usr/lib/systemd/systemd-shutdown
30 + dosym "../../..${ROOTPREFIX%/}/lib/systemd/systemd" /usr/lib/systemd/systemd
31 + dosym "../../..${ROOTPREFIX%/}/lib/systemd/systemd-shutdown" /usr/lib/systemd/systemd-shutdown
32 fi
33 }
34
35
36 diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
37 index 95c11ec5e56..78c85bbcdd1 100644
38 --- a/sys-apps/systemd/systemd-9999.ebuild
39 +++ b/sys-apps/systemd/systemd-9999.ebuild
40 @@ -331,8 +331,8 @@ multilib_src_install_all() {
41
42 if [[ ! -e "${ED%/}"/usr/lib/systemd/systemd ]]; then
43 # Avoid breaking boot/reboot
44 - dosym "${EPREFIX}${ROOTPREFIX%/}/lib/systemd/systemd" /usr/lib/systemd/systemd
45 - dosym "${EPREFIX}${ROOTPREFIX%/}/lib/systemd/systemd-shutdown" /usr/lib/systemd/systemd-shutdown
46 + dosym "../../..${ROOTPREFIX%/}/lib/systemd/systemd" /usr/lib/systemd/systemd
47 + dosym "../../..${ROOTPREFIX%/}/lib/systemd/systemd-shutdown" /usr/lib/systemd/systemd-shutdown
48 fi
49 }