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: Mon, 30 May 2016 13:57:34
Message-Id: 1464616642.f314f484289baa78fadeb0866c5da6f0b224d732.floppym@gentoo
1 commit: f314f484289baa78fadeb0866c5da6f0b224d732
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Mon May 30 13:57:22 2016 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Mon May 30 13:57:22 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f314f484
7
8 sys-apps/systemd: unblock laptop-mode-tools
9
10 Bug: https://bugs.gentoo.org/584470
11
12 Package-Manager: portage-2.3.0_rc1_p14
13
14 sys-apps/systemd/systemd-230-r1.ebuild | 4 +---
15 sys-apps/systemd/systemd-9999.ebuild | 4 +---
16 2 files changed, 2 insertions(+), 6 deletions(-)
17
18 diff --git a/sys-apps/systemd/systemd-230-r1.ebuild b/sys-apps/systemd/systemd-230-r1.ebuild
19 index 380e43b..673e9d6 100644
20 --- a/sys-apps/systemd/systemd-230-r1.ebuild
21 +++ b/sys-apps/systemd/systemd-230-r1.ebuild
22 @@ -64,14 +64,12 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.27.1:0=[${MULTILIB_USEDEP}]
23 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
24
25 # baselayout-2.2 has /run
26 -# laptop-mode-tools: https://github.com/systemd/systemd/issues/2684
27 RDEPEND="${COMMON_DEPEND}
28 >=sys-apps/baselayout-2.2
29 selinux? ( sec-policy/selinux-systemd )
30 !sys-auth/nss-myhostname
31 !sys-fs/eudev
32 - !sys-fs/udev
33 - !app-laptop/laptop-mode-tools"
34 + !sys-fs/udev"
35
36 # sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
37 PDEPEND=">=sys-apps/dbus-1.8.8:0[systemd]
38
39 diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
40 index d11ade9..4373f8b 100644
41 --- a/sys-apps/systemd/systemd-9999.ebuild
42 +++ b/sys-apps/systemd/systemd-9999.ebuild
43 @@ -63,14 +63,12 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.27.1:0=[${MULTILIB_USEDEP}]
44 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
45
46 # baselayout-2.2 has /run
47 -# laptop-mode-tools: https://github.com/systemd/systemd/issues/2684
48 RDEPEND="${COMMON_DEPEND}
49 >=sys-apps/baselayout-2.2
50 selinux? ( sec-policy/selinux-systemd )
51 !sys-auth/nss-myhostname
52 !sys-fs/eudev
53 - !sys-fs/udev
54 - !app-laptop/laptop-mode-tools"
55 + !sys-fs/udev"
56
57 # sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
58 PDEPEND=">=sys-apps/dbus-1.8.8:0[systemd]