From fe2e501b771e1e20b8a227ad94e019310c0338cc Mon Sep 17 00:00:00 2001 From: Jonathan Boulle Date: Wed, 11 Jun 2014 13:36:38 -0700 Subject: [PATCH] chore(systemd): remove gentoo-systemd-integration from systemd build --- .../profiles/features/systemd/package.accept_keywords | 2 -- .../coreos-overlay/sys-apps/systemd/systemd-213.ebuild | 3 +-- .../coreos-overlay/sys-apps/systemd/systemd-9999.ebuild | 3 +-- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.accept_keywords index a41890095f..2a3ae1f4e4 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.accept_keywords @@ -1,5 +1,3 @@ -sys-apps/gentoo-systemd-integration ~amd64 ~x86 - # Various dependencies that also need to be up-to-date sys-apps/hwids ~amd64 ~x86 sys-apps/kmod ~amd64 ~x86 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-213.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-213.ebuild index f1d748b8e7..10cffa7a99 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-213.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-213.ebuild @@ -77,8 +77,7 @@ RDEPEND="${COMMON_DEPEND} PDEPEND=">=sys-apps/dbus-1.6.8-r1:0 >=sys-apps/hwids-20130717-r1[udev] openrc? ( >=sys-fs/udev-init-scripts-25 ) - policykit? ( sys-auth/polkit ) - !vanilla? ( sys-apps/gentoo-systemd-integration )" + policykit? ( sys-auth/polkit )" DEPEND="${COMMON_DEPEND} app-arch/xz-utils:0 diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild index eb79fca4a0..29d22cd67c 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild @@ -77,8 +77,7 @@ RDEPEND="${COMMON_DEPEND} PDEPEND=">=sys-apps/dbus-1.6.8-r1:0 >=sys-apps/hwids-20130717-r1[udev] openrc? ( >=sys-fs/udev-init-scripts-25 ) - policykit? ( sys-auth/polkit ) - !vanilla? ( sys-apps/gentoo-systemd-integration )" + policykit? ( sys-auth/polkit )" DEPEND="${COMMON_DEPEND} app-arch/xz-utils:0