From: Mike Gilbert Date: Mon, 30 May 2016 13:57:22 +0000 (-0400) Subject: sys-apps/systemd: unblock laptop-mode-tools X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f314f484289baa78fadeb0866c5da6f0b224d732;p=gentoo.git sys-apps/systemd: unblock laptop-mode-tools Bug: https://bugs.gentoo.org/584470 Package-Manager: portage-2.3.0_rc1_p14 --- diff --git a/sys-apps/systemd/systemd-230-r1.ebuild b/sys-apps/systemd/systemd-230-r1.ebuild index 380e43b82fcb..673e9d6942d8 100644 --- a/sys-apps/systemd/systemd-230-r1.ebuild +++ b/sys-apps/systemd/systemd-230-r1.ebuild @@ -64,14 +64,12 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.27.1:0=[${MULTILIB_USEDEP}] !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" # baselayout-2.2 has /run -# laptop-mode-tools: https://github.com/systemd/systemd/issues/2684 RDEPEND="${COMMON_DEPEND} >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-systemd ) !sys-auth/nss-myhostname !sys-fs/eudev - !sys-fs/udev - !app-laptop/laptop-mode-tools" + !sys-fs/udev" # sys-apps/dbus: the daemon only (+ build-time lib dep for tests) PDEPEND=">=sys-apps/dbus-1.8.8:0[systemd] diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index d11ade93d1a4..4373f8b0c39d 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -63,14 +63,12 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.27.1:0=[${MULTILIB_USEDEP}] !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" # baselayout-2.2 has /run -# laptop-mode-tools: https://github.com/systemd/systemd/issues/2684 RDEPEND="${COMMON_DEPEND} >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-systemd ) !sys-auth/nss-myhostname !sys-fs/eudev - !sys-fs/udev - !app-laptop/laptop-mode-tools" + !sys-fs/udev" # sys-apps/dbus: the daemon only (+ build-time lib dep for tests) PDEPEND=">=sys-apps/dbus-1.8.8:0[systemd]