gentoo resync : 29.10.2017

7 files changed, 4 insertions, 371 deletions

diff --git a/sys-auth/consolekit/Manifest b/sys-auth/consolekit/Manifest
index 1e680336b989..15f8a764fb90 100644
--- a/sys-auth/consolekit/Manifest
+++ b/sys-auth/consolekit/Manifest
@@ -9,19 +9,14 @@ AUX consolekit-shutdown-reboot-without-policies.patch 924 SHA256 cd9a2aa582644ad
 AUX consolekit-udev-acl-install_to_usr.patch 750 SHA256 823316f6898eaab0744e42fa11b1631f64187aebca35baa5aeab09279820bedd SHA512 d2d6fcedea5e72f5a1b387f411ac62a59fd3c9e90a318bd85c35d210b89b18f01511f6b05352c1a4a9508622f0b9242c1b9c15d5ae4f8adf2819b6c3a0ff5ac9 WHIRLPOOL a9b8f48c5dddabfa28c2a65ac99c10dd7cba41d8bdcdc1fac4a0932391a81d9ed87f34115d7a43611d2cd126d10a5378edb8e734c888d529eca4b0d20dd15ac1
 AUX pam-foreground-compat.ck 389 SHA256 0b5b22641e2b138f4e9dfff9790df9fedaf2f760cc3d878ee1e94c2fd52edea9 SHA512 3cabd23ff7dc5de0a86284c3a3d3ff923228969cc954a1036290d4f7f6d58646ea6ea1445f472476b6f319df4dcd22f71e5e0f5cc8c845cd7e0b148af689ce5a WHIRLPOOL a8e36292dc094e107492e65efd147b35e217c652c8bcc52c768942b15660ff7d251e55ee038ce326905f5dc8f17857b62725768d60c3d5c93927550c8ff47db2
 DIST ConsoleKit-0.4.6.tar.xz 366572 SHA256 b41d17e06f80059589fbeefe96ad07bcc564c49e65516da1caf975146475565c SHA512 54955e3e83778a9216846104da8762fd50a37190e209127dd5d211e2227da617e14f6f5c1359905396d299656e526d14e1187b28eaff7d0ae1d7563dc8d9b46d WHIRLPOOL ebf36b109b4c646d0b874f6b8e2ae9e2d190022ee9b6feff6cbb6b9203c80401c538cc3ca674fa7bde4f07e658d5460864e9784c1e0249d49b4784725a4e05c7
-DIST ConsoleKit2-1.0.1.tar.bz2 1192681 SHA256 741c53321a0792b165f386c73c668af25615accab6d15983290103348a3ff00c SHA512 028e7347ff7293ebf3d08541d801e987cbc82fb31d98b67aa23e6dc28d00a422db9591c716c568320b6dde3fa01eb0b77b43c06d230f4bedd1085e078848a202 WHIRLPOOL c555281cd177ed243b1beb3d07d2988d029d8d89cac5242d12dcc37270d2d7adb1d503eaeba2f466964b589c4d10b8f2f014fef7067b535a7be9a360612d0485
 DIST ConsoleKit2-1.1.0.tar.bz2 630178 SHA256 a40d92358aca9f627a224dca674090e310423b00ed63fc06482997611661b69b SHA512 14ded07d4140e7a31132de21e84c2878475676b8c98f72b42340708972ed384abb9ba9380d74719718fc220c001387c788cf709cd15f8b19d598467dfe8a57df WHIRLPOOL 8f08d81576b5121b2da6cd94b3b5675ea55dce17997b035d0ba451c011b101f9e315e983b20610ee022ee286b50a7b13e2508584b9c08dba0c6cda20b8801a63
-DIST ConsoleKit2-1.1.1.tar.bz2 1372801 SHA256 795b2cfb766bdffb9187ef7f8beb8d8298e4c38df4a69377115297a0dee3b0d0 SHA512 168af9760e10914dff5e693d2c3b2e2a35b1662fc2769e2954eec0238f7f313ff154add650fa6f0f59e73e4e0aec2fe63ff62446a3c73c2d4437408e69aa97b6 WHIRLPOOL cef8ac778923671f9bffe87ecd8045b30630578e2599d0ccf37ad8d8070b7c0ca6936e9837abc5fc1f7af5f119edfeae68d9a14199485936677a5faba09b0958
 DIST ConsoleKit2-1.1.2.tar.bz2 1125567 SHA256 f4b26b45edf7416ed76052b8f85ea05b7b560c744edee8042575667528bc1f24 SHA512 fadca85e05c176b06ead40fba5c068d497bf69bcc322287363d0c27cdd6627b758295db1ef534b908c0e6240486430d8cb36660b4d71216a60d19a52d6d0db39 WHIRLPOOL b9655418498cb2b63a30d6d1a56f6afe0adf8f6ae3a6aa97fc55da8288fae588deea04ab868f0ef524e185696ad87a35aca6de8eb4e6cb32bc4ba729040e0cbb
 DIST ConsoleKit2-1.2.0.tar.bz2 1125402 SHA256 d6ea13b306557a76519388de39bf7f1a1ea9010af147fad4fb3131ce634bd8b3 SHA512 c0f6e629b7229c2ffaafe8da899970b48c8372402447af18560fffd8804d9ab91a4ad2eb82c8f648a14807f8ccc5fb1ab4366de14faa8a2d5fb3767a6a4253f7 WHIRLPOOL 46c463fbfafd188dcaecc61f3ce83599a746e18b4c3ea129a205fec24927cc80958decf95913de679ddded0120e15fb631dcdeb08fd09a0029350b70b8b8ecd9
 DIST consolekit_0.4.6-4.debian.tar.gz 12192 SHA256 6d4dd5e13a76454b4bab27ab6b407718cd77616afd2b1af7cb8d947c1323b802 SHA512 f7fc5965b1f495d16a8ca167940431bc2569e9bde9e4a356b9c9ed00c2825db61da7b6db3d434d977fff72b3aaef30c455a365b9eba282a887a523753613b58f WHIRLPOOL 961a918c21259e24c68c7a5bf93964825b891ea207c088fecab61f81434012dc8925fca83b74518cfc9cf42f2c4a87eba7518c0829f663716ca0e11e38c856c9
 EBUILD consolekit-0.4.6.ebuild 3396 SHA256 69aee2e526d17e7be61d82199e0b9ae1d6d52431ec0c97bcb06b842966d3d69c SHA512 2a0acd029eb9db8d3035d0fbdc52e5c0cf6a84779dfd41d7175970b8c4ff8600292302740d375eacf8fa0939714d82c3c602f285abf811fa36e29c3e41eb7e3a WHIRLPOOL 1789b31faffc8d565650562fa2e1f0ab7e07b49c689a45bf1b5d54447f890161dc97d08da6662644b1affc0b6eb4fe61d915c766465644d8001226d7093efb13
-EBUILD consolekit-1.0.1.ebuild 3104 SHA256 8f4b8990ba7d781aa6d881fae13e943a3e072b55f19ac3d4bed004f751dd92a0 SHA512 4bf6bd62eba5e480d710235cef658516afb119b53157eee51ef6ec20f28ca91fdddb290c34201e598a46aeb82d4f9fcb42da224c8bed0446a818b857a121a31c WHIRLPOOL 07dc530b15bf56776811f3810fc0fd99953619f41d80539573e42c554d6c08a7772cf5b80fbbd20fbea43a608a6625d9c8646e5ae95705c492e4e98304ede4ee
 EBUILD consolekit-1.1.0-r1.ebuild 3238 SHA256 bb02ece53c8df44c4e9231c69858668ee1c62bcbd0cfe9ef8d67921ac1d806f7 SHA512 d124ec42562ab4bb87e34344dd165a70f5fb0116f016d901dd6f2cfa3123540f72ec1466c0c40406f9b1a7629c4a2854c8905ba24984851cf4acfdcd1a3226b8 WHIRLPOOL 85796ca9fc312ee227ab6b47eb71d861354030f7621feab62d723335df034b02da369acc1b40cfe8661981120733d68abf5e3d195a861576583062c8228b8212
-EBUILD consolekit-1.1.0.ebuild 3099 SHA256 57f61a91d8df4e82e8725f71326b05246d55025fade6de68ec63ee054e73a8ef SHA512 dd4750b57e2cc646cf5ca7ea541a94a35f4be52aa89efa6e805df80532573b044e3a4236aa4b95b40455f991e3dc6c18f2fc71f9711c193108ad4179be014984 WHIRLPOOL b566a0056a4bdf8fda5225e6d3cc63582301eac726a062c816c45b845765554ccba9d522f23d62548ff0449bd75749214bff8161ac72f19693b5afc2fe0e6ef3
-EBUILD consolekit-1.1.1.ebuild 3545 SHA256 1deee9c0995c6440c8e6cc612c29d27ba08dfcc915f5dd0126dbe018cd7dcf51 SHA512 a77a489d2ed4696e4ac883607ea421490c1713fbc8865a36edb90f8a07c171c80522cdff194ff342c72be88328ed9085b40fabf1679203bce5d175efddde432d WHIRLPOOL e7f537d3af33a0c68ee0657f7747afa96fe0d912fe91775956e902d6e83847504ad028aa303a7f628682286e2dac4996599b70a3b46cc645340e2dcbfec24ebd
 EBUILD consolekit-1.1.2.ebuild 3507 SHA256 50cb27aa721430efaae6a0fc128432c36dc5049709b1bb7085925d50b505b16a SHA512 e42f804f32026ca15fa13a38535e4808c1552864d952924a4f1922af8a6cc638b4bdd79f52479fd8d81afca9b8b0ab0a4c6e3f503646595573a52668198741df WHIRLPOOL 14004e62be9ad1752c74d644c423dd629859e5992ee4d23de374acb13068fbf6d20e9d0f60b78b0cbb04c2265f7d1801d45a2a70c667a439e4f1b57cdfb1e88c
-EBUILD consolekit-1.2.0.ebuild 3544 SHA256 e77561272e9d7441d1a1285d7699b569b1e36a3cf295a97edaea77b273d8d960 SHA512 03019491f7e0972f11e0af0f8430bd78537145b52f6ab23e8461fe620fc27d62cebce6781d1f11d0c85246945c71dbe21c86a4c78772eb8057cbbde454f42cda WHIRLPOOL dd83e65f62970ddd72606a00cdd618fdd18ad74e7b6c0a4d8fb7750294a792873fc2667653ed6044c2d1996174679326440c1efbd5423f3b488040a15c285938
+EBUILD consolekit-1.2.0.ebuild 3540 SHA256 9891f20b0cf9b049afe5958c09f2d6f9805fe462de8cd7961a1a4e3cf206a399 SHA512 2a7a85d060eab711291f75cdcb73b69c45aaa49a936913492f9af541bfd506a71f64e7b4c6d4ab307de57e365076e42e81f1f0eb71ec02a7ac288f5cee572640 WHIRLPOOL dc4f6598e0e92d84dcd3d679f7a0efa3ee32a8a0e82a49f619025baa333c8d558c61ff55e1ffd0fe01c085bcfbcff582af51d2e3b303ad1bb35b6b0ee149fa52
 EBUILD consolekit-9999.ebuild 3311 SHA256 2197dd7144686db2715b99f7b718f5089629c8dbe7757d355eea3fc5446e7a77 SHA512 d28c3a5da5ece93cf7e9f22746ffcbd53beee19b9106258c210b4ff937713cff650771cdfd4d2919d4122517f2e534d5e7861d3a8392d4fc4e691e92a25e4b69 WHIRLPOOL 605e200b25ccc2a93b16339d861e9c860708c216f64d1dfd98218ae952d6be4d1e9c768cffe438d3838f42cf4fa2429976493a2fba9d37b5680d1c0b475efe3f
 MISC ChangeLog 11611 SHA256 f404a21305473e08a34ed4cf11635b310df9225f7371b32a614df4d6b78e3ead SHA512 d5ec5fa0ac8691acd134e4bbce34b3ffa762a5a78f6b9354c9388a892277984a986585fea415691437beec2f1bc4f004420cbab5a94c0f4111a3766dcb56bc38 WHIRLPOOL 6d205c944d8926186ce6e1c1824474d79ea8251b25a9dfd3ea8825259c10cd2e8f08fe062dfbe44f95ad0176c175fbb092a0549f5499f75f52821e64c518da6b
 MISC ChangeLog-2015 27717 SHA256 bb12cd6e6784f6f87a420e8cf1dea2e5000c0f87f9ca652702492eb14f116b34 SHA512 e01c42a85818919e57aeb58c7713f3fae740094a743f83f41b6b70cc9b3b537add09b0b7ab3f935bdd033f65efc084113db3f510c69c9009f31f308ce26795b5 WHIRLPOOL 802c7719cb7361cc6c3b9e8640371a389ed3cc250cd3868cf26d078e0022065408c5b3ac69de5f6a71a63ac3e4fee1a39e626eb55df5b3e2412d35bc11335ef5
diff --git a/sys-auth/consolekit/consolekit-1.0.1.ebuild b/sys-auth/consolekit/consolekit-1.0.1.ebuild
deleted file mode 100644
index 9f12159869a1..000000000000
--- a/sys-auth/consolekit/consolekit-1.0.1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils linux-info pam
-
-MY_PN=ConsoleKit2
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Framework for defining and tracking users, login sessions and seats"
-HOMEPAGE="https://github.com/ConsoleKit2/ConsoleKit2 https://www.freedesktop.org/wiki/Software/ConsoleKit"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="acl cgroups debug doc kernel_linux pam pm-utils policykit selinux test"
-
-COMMON_DEPEND=">=dev-libs/glib-2.40:2=[dbus]
-	>=sys-devel/gettext-0.19
-	sys-apps/dbus
-	sys-libs/zlib:=
-	x11-libs/libX11:=
-	acl? (
-		sys-apps/acl:=
-		>=virtual/udev-200
-		)
-	cgroups? (
-		app-admin/cgmanager
-		>=sys-libs/libnih-1.0.2[dbus]
-		)
-	pam? ( virtual/pam )
-	policykit? ( >=sys-auth/polkit-0.110 )"
-# pm-utils: bug 557432
-RDEPEND="${COMMON_DEPEND}
-	kernel_linux? ( sys-apps/coreutils[acl?] )
-	pm-utils? ( sys-power/pm-utils )
-	selinux? ( sec-policy/selinux-consolekit )"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )
-	test? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-		)"
-
-S=${WORKDIR}/${MY_P}
-
-QA_MULTILIB_PATHS="usr/lib/ConsoleKit/.*"
-
-pkg_setup() {
-	if use kernel_linux; then
-		# This is from https://bugs.gentoo.org/376939
-		use acl && CONFIG_CHECK="~TMPFS_POSIX_ACL"
-		# This is required to get login-session-id string with pam_ck_connector.so
-		use pam && CONFIG_CHECK+=" ~AUDITSYSCALL"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	sed -i -e '/SystemdService/d' data/org.freedesktop.ConsoleKit.service.in || die
-
-	epatch_user
-}
-
-src_configure() {
-	econf \
-		XMLTO_FLAGS='--skip-validation' \
-		--libexecdir="${EPREFIX}"/usr/lib/ConsoleKit \
-		--localstatedir="${EPREFIX}"/var \
-		$(use_enable pam pam-module) \
-		$(use_enable doc docbook-docs) \
-		$(use_enable test docbook-docs) \
-		$(use_enable debug) \
-		$(use_enable policykit polkit) \
-		$(use_enable acl udev-acl) \
-		$(use_enable cgroups) \
-		$(use_enable test tests) \
-		--with-dbus-services="${EPREFIX}"/usr/share/dbus-1/services \
-		--with-pam-module-dir="$(getpam_mod_dir)" \
-		--with-xinitrc-dir=/etc/X11/xinit/xinitrc.d \
-		--without-systemdsystemunitdir
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		htmldocdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	dosym /usr/lib/ConsoleKit /usr/lib/${PN}
-
-	dodoc AUTHORS HACKING NEWS README TODO
-
-	newinitd "${FILESDIR}"/${PN}-1.0.0.initd consolekit
-
-	keepdir /usr/lib/ConsoleKit/run-seat.d
-	keepdir /usr/lib/ConsoleKit/run-session.d
-	keepdir /etc/ConsoleKit/run-session.d
-	keepdir /var/log/ConsoleKit
-
-	exeinto /etc/X11/xinit/xinitrc.d
-	newexe "${FILESDIR}"/90-consolekit-3 90-consolekit
-
-	if use kernel_linux; then
-		# bug 571524
-		exeinto /usr/lib/ConsoleKit/run-session.d
-		doexe "${FILESDIR}"/pam-foreground-compat.ck
-	fi
-
-	prune_libtool_files --all # --all for pam_ck_connector.la
-
-	rm -rf "${ED}"/var/run || die # let the init script create the directory
-}
diff --git a/sys-auth/consolekit/consolekit-1.1.0.ebuild b/sys-auth/consolekit/consolekit-1.1.0.ebuild
deleted file mode 100644
index f33886b94e61..000000000000
--- a/sys-auth/consolekit/consolekit-1.1.0.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils linux-info pam
-
-MY_PN=ConsoleKit2
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Framework for defining and tracking users, login sessions and seats"
-HOMEPAGE="https://github.com/ConsoleKit2/ConsoleKit2 https://www.freedesktop.org/wiki/Software/ConsoleKit"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="acl cgroups debug doc kernel_linux pam pm-utils policykit selinux test"
-
-COMMON_DEPEND=">=dev-libs/glib-2.40:2=[dbus]
-	>=sys-devel/gettext-0.19
-	sys-apps/dbus
-	sys-libs/zlib:=
-	x11-libs/libX11:=
-	acl? (
-		sys-apps/acl:=
-		>=virtual/udev-200
-		)
-	cgroups? (
-		app-admin/cgmanager
-		>=sys-libs/libnih-1.0.2[dbus]
-		)
-	pam? ( virtual/pam )
-	policykit? ( >=sys-auth/polkit-0.110 )"
-# pm-utils: bug 557432
-RDEPEND="${COMMON_DEPEND}
-	kernel_linux? ( sys-apps/coreutils[acl?] )
-	pm-utils? ( sys-power/pm-utils )
-	selinux? ( sec-policy/selinux-consolekit )"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )
-	test? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-		)"
-
-S=${WORKDIR}/${MY_P}
-
-QA_MULTILIB_PATHS="usr/lib/ConsoleKit/.*"
-
-pkg_setup() {
-	if use kernel_linux; then
-		# This is from https://bugs.gentoo.org/376939
-		use acl && CONFIG_CHECK="~TMPFS_POSIX_ACL"
-		# This is required to get login-session-id string with pam_ck_connector.so
-		use pam && CONFIG_CHECK+=" ~AUDITSYSCALL"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	sed -i -e '/SystemdService/d' data/org.freedesktop.ConsoleKit.service.in || die
-
-	default
-}
-
-src_configure() {
-	econf \
-		XMLTO_FLAGS='--skip-validation' \
-		--libexecdir="${EPREFIX}"/usr/lib/ConsoleKit \
-		--localstatedir="${EPREFIX}"/var \
-		$(use_enable pam pam-module) \
-		$(use_enable doc docbook-docs) \
-		$(use_enable test docbook-docs) \
-		$(use_enable debug) \
-		$(use_enable policykit polkit) \
-		$(use_enable acl udev-acl) \
-		$(use_enable cgroups) \
-		$(use_enable test tests) \
-		--with-dbus-services="${EPREFIX}"/usr/share/dbus-1/services \
-		--with-pam-module-dir="$(getpam_mod_dir)" \
-		--with-xinitrc-dir=/etc/X11/xinit/xinitrc.d \
-		--without-systemdsystemunitdir
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		htmldocdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	dosym /usr/lib/ConsoleKit /usr/lib/${PN}
-
-	dodoc AUTHORS HACKING NEWS README TODO
-
-	newinitd "${FILESDIR}"/${PN}-1.0.0.initd consolekit
-
-	keepdir /usr/lib/ConsoleKit/run-seat.d
-	keepdir /usr/lib/ConsoleKit/run-session.d
-	keepdir /etc/ConsoleKit/run-session.d
-	keepdir /var/log/ConsoleKit
-
-	exeinto /etc/X11/xinit/xinitrc.d
-	newexe "${FILESDIR}"/90-consolekit-3 90-consolekit
-
-	if use kernel_linux; then
-		# bug 571524
-		exeinto /usr/lib/ConsoleKit/run-session.d
-		doexe "${FILESDIR}"/pam-foreground-compat.ck
-	fi
-
-	prune_libtool_files --all # --all for pam_ck_connector.la
-
-	rm -rf "${ED}"/var/run || die # let the init script create the directory
-}
diff --git a/sys-auth/consolekit/consolekit-1.1.1.ebuild b/sys-auth/consolekit/consolekit-1.1.1.ebuild
deleted file mode 100644
index bac2ded4fb84..000000000000
--- a/sys-auth/consolekit/consolekit-1.1.1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools libtool linux-info pam
-
-MY_PN=ConsoleKit2
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Framework for defining and tracking users, login sessions and seats"
-HOMEPAGE="https://github.com/ConsoleKit2/ConsoleKit2 https://www.freedesktop.org/wiki/Software/ConsoleKit"
-SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="acl cgroups debug doc evdev kernel_linux pam pm-utils policykit selinux test udev"
-
-COMMON_DEPEND=">=dev-libs/glib-2.40:2=[dbus]
-	>=sys-devel/gettext-0.19
-	sys-apps/dbus
-	sys-libs/zlib:=
-	x11-libs/libX11:=
-	acl? (
-		sys-apps/acl:=
-		>=virtual/udev-200
-		)
-	cgroups? (
-		app-admin/cgmanager
-		>=sys-libs/libnih-1.0.2[dbus]
-		)
-	evdev? ( dev-libs/libevdev:= )
-	udev? (
-		virtual/libudev
-		x11-libs/libdrm:=
-	)
-	pam? ( virtual/pam )
-	policykit? ( >=sys-auth/polkit-0.110 )
-	selinux? ( sys-libs/libselinux )"
-# pm-utils: bug 557432
-RDEPEND="${COMMON_DEPEND}
-	kernel_linux? ( sys-apps/coreutils[acl?] )
-	pm-utils? ( sys-power/pm-utils )
-	selinux? ( sec-policy/selinux-consolekit )"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libxslt
-	virtual/pkgconfig
-	doc? ( app-text/xmlto )
-	test? (
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-		)"
-
-S=${WORKDIR}/${MY_P}
-
-QA_MULTILIB_PATHS="usr/lib/ConsoleKit/.*"
-
-PATCHES=( "${FILESDIR}/consolekit-1.1.1-0001-Fix-enable-libudev-configure-flag.patch" )
-
-pkg_setup() {
-	if use kernel_linux; then
-		# This is from https://bugs.gentoo.org/376939
-		use acl && CONFIG_CHECK="~TMPFS_POSIX_ACL"
-		# This is required to get login-session-id string with pam_ck_connector.so
-		use pam && CONFIG_CHECK+=" ~AUDITSYSCALL"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	sed -i -e '/SystemdService/d' data/org.freedesktop.ConsoleKit.service.in || die
-
-	default
-	# patch needs autoreconf, so dont need libtoolize
-	eautoreconf
-	#elibtoolize # bug 593314
-}
-
-src_configure() {
-	econf \
-		XMLTO_FLAGS='--skip-validation' \
-		--libexecdir="${EPREFIX}"/usr/lib/ConsoleKit \
-		--localstatedir="${EPREFIX}"/var \
-		$(use_enable pam pam-module) \
-		$(use_enable doc docbook-docs) \
-		$(use_enable test docbook-docs) \
-		$(use_enable debug) \
-		$(use_enable policykit polkit) \
-		$(use_enable evdev libevdev) \
-		$(use_enable acl udev-acl) \
-		$(use_enable cgroups) \
-		$(use_enable selinux) \
-		$(use_enable udev libudev) \
-		$(use_enable test tests) \
-		--with-dbus-services="${EPREFIX}"/usr/share/dbus-1/services \
-		--with-pam-module-dir="$(getpam_mod_dir)" \
-		--with-xinitrc-dir="${EPREFIX}"/etc/X11/xinit/xinitrc.d \
-		--without-systemdsystemunitdir
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		htmldocdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		install
-
-	dosym /usr/lib/ConsoleKit /usr/lib/${PN}
-
-	dodoc AUTHORS HACKING NEWS README TODO
-
-	newinitd "${FILESDIR}"/${PN}-1.0.0.initd consolekit
-
-	keepdir /usr/lib/ConsoleKit/run-seat.d
-	keepdir /usr/lib/ConsoleKit/run-session.d
-	keepdir /etc/ConsoleKit/run-session.d
-	keepdir /var/log/ConsoleKit
-
-	exeinto /etc/X11/xinit/xinitrc.d
-	newexe "${FILESDIR}"/90-consolekit-3 90-consolekit
-
-	if use kernel_linux; then
-		# bug 571524
-		exeinto /usr/lib/ConsoleKit/run-session.d
-		doexe "${FILESDIR}"/pam-foreground-compat.ck
-	fi
-
-	prune_libtool_files --all # --all for pam_ck_connector.la
-
-	rm -rf "${ED}"/var/run || die # let the init script create the directory
-}
diff --git a/sys-auth/consolekit/consolekit-1.2.0.ebuild b/sys-auth/consolekit/consolekit-1.2.0.ebuild
index ad224d1d9a6a..7fa6fd9fb261 100644
--- a/sys-auth/consolekit/consolekit-1.2.0.ebuild
+++ b/sys-auth/consolekit/consolekit-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${MY_PN}/${MY_PN}/releases/download/${PV}/${MY_P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="acl cgroups debug doc evdev kernel_linux pam pm-utils policykit selinux test udev"
 
 COMMON_DEPEND=">=dev-libs/glib-2.40:2=[dbus]
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index cbd8c3948abc..3dfebf6b81bc 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -1,6 +1,6 @@
 AUX polkit-0.113-elogind.patch 6149 SHA256 a90d18c58aa8f1a034cf84a209e6648b1d19bbf7b1d72fc5e0e0f24a5a0f6a7e SHA512 9a3e928d77c023c3f895f7fec7893f0355729808c4ee3bcd5419a7e408b613faefcff6d43f87cdab94b3fa15b7eaddc9ce40cf9b7b0954624360489c4d2c3b52 WHIRLPOOL 4bc03f43344955ab5c0ef540e51eb257ab6cf936e8bb93f98d288877bd1de6d100b429d79017a85f6b57c9c87bea0339b0deaf310e24f59d577e358fa0b05456
 DIST polkit-0.113.tar.gz 1448865 SHA256 e1c095093c654951f78f8618d427faf91cf62abdefed98de40ff65eca6413c81 SHA512 ab177c89a20eeb2978ddbe28afb205d3619f9c5defe833eb68a85e71a0f2c905367f1295cbbfb85da5eafdd661bce474d5d84aca9195cd425a18c9b4170eb5f9 WHIRLPOOL 106db7e6085a4ce49da44929138671eff2fd6007c80533518abe2d91ede9242b1e3cd0a1801190eeac5d4d5c1e978a30a18e47a6b604497b38853fa60c935a81
-EBUILD polkit-0.113-r4.ebuild 3459 SHA256 d9d7175a51dc984fed94a56a3bf8d9454c09e0d3ff6a8e5672d36d76f582376e SHA512 523a1e8114ff118b9fc7765d7dea921e29ea076652136cb830dd0ea0276413f68e41806a2d70adb5dd3fd4145d013576b26ba1451ee2a9c0e00436089e75bd6a WHIRLPOOL 5d206a2febd679432fcac23ee04dd50a9921fd439753740b190dd89de9befc12f019fe420d16ba156469cf3208b95ca50b712eb2802e23f29faecee998c42ea2
+EBUILD polkit-0.113-r4.ebuild 3456 SHA256 315748e919169f1fef68ba29e5abcc289e70adb42dd41ec2d79e0a484b405960 SHA512 a4ee6493441c8c02a586e1115a051a2f1e1163f1097ac8b20526d3decbd24cbe91d20ad7d7bab55ab6642cf3af13e8f51b25424aab348edbee1442ceb9899b64 WHIRLPOOL 949c10def320d7e90cd9650c35b6a79517258599621b7b64342d655954bb2e6d232e1edcc258c8d7b3184700999438b92298472cda25488f4dcd4359f076b5bc
 EBUILD polkit-0.113.ebuild 2716 SHA256 ad69a9173248ffed504fb2b5936b8c6b3f14f20fe64d1c6e794c7f17ec76a948 SHA512 06cee807ee6cae565146fd1f8d4676cad78c8bdecae80ddc9f9a4c7d928c6dad31bef1361c3c2a9dece8490a37989e5ae8e9fb2e3df4936919a7235521633cff WHIRLPOOL da833ab00f0bb7c71879befd6d05ef4fd488dabedcac4f0b2abdc447fc83f24830412e99cdd1f8283602bbc83cd26dd9ec60b091f9d5d85580962501b47dbbca
 MISC ChangeLog 6131 SHA256 94b5afe5b42ad89d098b0b4f3a2a30186fd92a4677323a7d6f956167e1013266 SHA512 6fefd5506d593b9605377f91bceea62b15bce96d37bb9b7b1b5d94c68eb5f6420adaacfa8e561d05a750d77e0930ef0cf99577604edd7f3c420a80cb51f6397b WHIRLPOOL fe7d55ce7e8c7e10ff08bb71cfa032e766f5af95d6a63f9bcafe8420ffd9d5840ba95d41f500995a8dd476eb3493ded9b274f4de4f99c0c1a231d0bc23f3794e
 MISC ChangeLog-2015 27408 SHA256 b7a63f718f2dbfcc3d17c9146eea2cd830df2d329d1c4406fd7a4b4dabfff236 SHA512 6d6e2b71ef194f07f61c4da2587b22c0b55ee60cf5f8c6e0042bd75d59ca7cf9222b7a4d5018cf8fb789719d6ba3eae3a4a5d6e620e324cd6789bc2ff2fe5cf4 WHIRLPOOL 4a01bbc08ee0ecb7a3502be6c857caa750d111437e4b91cce0ca36b708f7cda0ab293b32fc96fa7d5c35fd46adda75dff44c58d96ccf7103c66705e21bd655bf
diff --git a/sys-auth/polkit/polkit-0.113-r4.ebuild b/sys-auth/polkit/polkit-0.113-r4.ebuild
index ec8a409d3431..b2be07dae961 100644
--- a/sys-auth/polkit/polkit-0.113-r4.ebuild
+++ b/sys-auth/polkit/polkit-0.113-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="elogind examples gtk +introspection jit kde nls pam selinux systemd test"
 
 REQUIRED_USE="?? ( elogind systemd )"