gentoo resync : 12.08.2018

16 files changed, 93 insertions, 487 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 34f441a57359..86cfd27ff3fe 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index 1da138a75f84..b71411f0417f 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -1,13 +1,6 @@
-AUX elogind-235.2-docs.patch 652 BLAKE2B c1d5336d18942efb082e39b2278b8af88da5da37c54a9cca0a9fd45f11fc8751da720d80dfad2c2688ebe81cac3101b491a098b516403bd4c46d9c277d39b2e8 SHA512 59179098c638b8b7228ed6013ff133305138b4aff32e8210fddcc8b056e21d2baeb8619debc9c2231f629cd5c99b79040da677f1eddc958119e488a91222f011
-AUX elogind-235.2-drop-logintest.patch 451 BLAKE2B 61c25c176fd85786d899b34831c320e364b91e8f250c323caf1a5badb531cd58281ef5ac43347a4b94f44e7a40232d5cfded4c3ee7a113cbfd440bc24b13fbd9 SHA512 9017ceb04a779dbc5a2dbc5f1fa4c412d8538626696815f9a6ace3acb4c7d3dc1ca7685292b02483a2f80bc6685769efc853dcedd0e71e13bdbd324bb16ceafe
-AUX elogind-235.2-legacy-cgroupmode.patch 2527 BLAKE2B de50970f6c930b2ff35f6ecc4119e06abb23cbc02fcdb649930258b717ab05cb5b4b1ad8de1e89da705c8a1b66093eedba984c0a831fd60cef3d9704e09c6161 SHA512 1c98981db6efc6afb779aef93fd4cd7ba31a1995d74d1edea9b486c4724fe7bc215df95745a3553324750794530466679cbde491bf01ed5bab99a20eda135bb2
 AUX elogind-238.1-docs.patch 793 BLAKE2B eb6683d5bf221459fb0ff0aab6f10f179769bcaf6a914f6b41f8526ee2075924f80cee1cd320aa7697d60bed24d5652e6bc8c02451a0da98c4b29cb8a73641ce SHA512 16503a616b511e4cf049260c34b1390844ce06b22a99e31813b11886d1dc12c90aa46b3dc67343b2a33df85923b5cd6116d7338ee9bd32f2d7a9be9db934ca74
 AUX elogind.conf.in 218 BLAKE2B 7ee0a72c4a628a233fdbb2d3104487859aaa7e5c4f2624e5a4eafb37ed90fb8f64349b1a8acc92e69ec618496bb7f6263b7a5d0fe15a1afe1c03f5955743f079 SHA512 2c62ab28d7db9cd52489069f80363159000385a25dd7f2afe5a03598a0b7a1f61af7c18df71f6286e72f5966e55b62a4029e30cb786dd813bb201b9e20adccd7
 AUX elogind.init 490 BLAKE2B 71c102f89a71a2963da50b153d8696a9480d81caa48e8422e7f39614e9bfb0b09037bc4dea202c3735e170140752429dd54747b99941d861453b4714dcb98819 SHA512 60fe1cb55ec0f605f06fb3744a0300accebfc14c4ecd24b7db2e8b0cb1537e816a4a4ccbc4b2eeac45e2f3ca8942dd10d24bdcd814cccbc2ceed198b2657238a
-DIST elogind-235.2.tar.gz 975652 BLAKE2B c568b5eec89da14f55211cf4405d96b4bb1ea274d1237739a92c4f3585a6181a3e17dc7ed2af5161c649cae2149b3bd25f4212cf5a304383b254e39d7aa0b378 SHA512 6fa9194e8c21fa3d3caf6f9499f772dbfe38b9d40d8a0fe43ee32ad4b2acd672a78798d00694d1e0d6107625f4f3f06b71e0a5466ed4be446d670f9bcd961313
-DIST elogind-235.5.tar.gz 990321 BLAKE2B 03730f449e01ef74a92aa3313f59b93de3941425f95610e2d50dd6a0651682df5f2e245f9eeaeef5c5fd38300102fbccc980a55466ea12100e8904f126a5c44f SHA512 8f12c576f291fb9768e343e8257c74c62686f1a67b10170715b678e0431692cec7b6382102467dd2598a331c20d823d935128d5ff36f5b074dc02802ffec863c
 DIST elogind-238.1.tar.gz 1074179 BLAKE2B 3041e9cfa0d454f653db164db8e59af4db5f3821bbb65cb5482d83f63e410612e121791f7ef3e08c9ac3940c7b6c7931df2b072ba452d2073c3e424e4dfe10c3 SHA512 ba0a74e9b9168b08a54b13ed500e9c713c48bb1648aa6064dbe666a96fa3fbd5b69447c35f686db3a1813476a5585be34b1ae13e3c9017eac8171b73f6311c4c
-EBUILD elogind-235.2-r2.ebuild 3274 BLAKE2B 01b8ed8c003382dc7eaf676a2b95493c442c673306405a832f174dabf025c0787daee1b98bfc584480f78b608fe4281a81b3ed554e14156d3c045ddee6c95da8 SHA512 f866e80c5631e3fae2269f5f12350e76a15ccea6186325319bc7c05ddade5cf0055761b6e01e068391fcda7dcff107437dbba31745a91ed04fefdd81f90c3402
-EBUILD elogind-235.5.ebuild 3248 BLAKE2B ea8412e276879ad063cba63f3385d152464120344d041bc900370344d7a4233a3b3496f428cea8b91703e3b02383e0d0bc2cf00c5683188baadbb9a6acf0fc1f SHA512 12fd4d2a03049406ed12d5c436b6386938e15b5a92b03114a4e1f76c7dd2671c5cbb5a613ac0fb5455cf2d472f287b7bb0344135ef4fb66739381d3da779b6ea
-EBUILD elogind-238.1.ebuild 3171 BLAKE2B 2097e4ce51024006d51ee7248c29c1d24d9989f83c17da1c6b503582f82a1af258d4873207830a62914cde67dbd94900c457d47adaf11314693b37b651472942 SHA512 f0c93cecc2561a254516f2a0a7c415989a5ecedb0399374d64838c154ebbb7b00c91aabf931597a1938b3a150ee01ccf07d28f317302ad1a3dd416b1a4bb819f
+EBUILD elogind-238.1.ebuild 3472 BLAKE2B e0be747f257ee41fabb5294e16aef69f4d071aa04b6bf6dad05b67648957b69a41f99d80515d37a038fa11e539d657dac23fab4fe757365974d691b2914354bc SHA512 907afc4f04ad48b7eb9ea278e6ea116639c5d27d71f52b1dbe236f3b4016cff1fa5323686b27d27723589c86479922c0801ea9aa0d0596b2931a82615d912a08
 MISC metadata.xml 379 BLAKE2B fc63654412fa4cb02122205ad53d29ed35153457c5dd5c5ab8fa3c3dbfcc7c00b2704220d4cb9040f8d6f794bbb9bd0f8cb9be80d410efb6cf85eeee8ce46503 SHA512 30be0eb7903ffb83d9e24fbcacc8db09c0f8cd7187df5f75b2c12fb5cfae1110d52f29aba502ea92af53df02451cc40e0f3789382f87a16bd281f06e9cad6c68
diff --git a/sys-auth/elogind/elogind-235.2-r2.ebuild b/sys-auth/elogind/elogind-235.2-r2.ebuild
deleted file mode 100644
index bae01cc02e4f..000000000000
--- a/sys-auth/elogind/elogind-235.2-r2.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info meson pam udev xdg-utils
-
-DESCRIPTION="The systemd project's logind, extracted to a standalone package"
-HOMEPAGE="https://github.com/elogind/elogind"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC0-1.0 LGPL-2.1+ public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE="+acl debug doc +pam +policykit selinux"
-
-COMMON_DEPEND="
-	sys-apps/util-linux
-	sys-libs/libcap
-	virtual/libudev:=
-	acl? ( sys-apps/acl )
-	pam? ( virtual/pam )
-	selinux? ( sys-libs/libselinux )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-util/gperf
-	dev-util/intltool
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	!sys-apps/systemd
-"
-PDEPEND="
-	sys-apps/dbus
-	policykit? ( sys-auth/polkit )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-docs.patch"
-	"${FILESDIR}/${P}-legacy-cgroupmode.patch"
-	"${FILESDIR}/${P}-drop-logintest.patch" # bug 645156
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD"
-
-	if use kernel_linux; then
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	xdg_environment_reset
-}
-
-src_configure() {
-	local rccgroupmode="$(grep rc_cgroup_mode /etc/rc.conf | cut -d '"' -f 2)"
-	local cgroupmode="legacy"
-
-	if [[ "xhybrid" = "x${rccgroupmode}" ]] ; then
-		cgroupmode="hybrid"
-	elif [[ "xunified" = "x${rccgroupmode}" ]] ; then
-		cgroupmode="unified"
-	fi
-
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		-Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-		-Dpamlibdir=$(getpam_mod_dir)
-		-Dudevrulesdir="$(get_udevdir)"/rules.d
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		-Drootlibdir="${EPREFIX}"/$(get_libdir)
-		-Drootlibexecdir="${EPREFIX}"/$(get_libdir)/elogind
-		-Drootprefix="${EPREFIX}/"
-		-Dbashcompletiondir="${EPREFIX}/usr/share/bash-completion/completions"
-		-Dzsh-completion="${EPREFIX}/usr/share/zsh/site-functions"
-		-Dman=auto
-		-Dsmack=true
-		-Dcgroup-controller=openrc
-		-Ddefault-hierarchy=${cgroupmode}
-		-Ddefault-kill-user-processes=false
-		-Dacl=$(usex acl true false)
-		-Ddebug=$(usex debug elogind false)
-		--buildtype $(usex debug debug release)
-		-Dhtml=$(usex doc auto false)
-		-Dpam=$(usex pam true false)
-		-Dselinux=$(usex selinux true false)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	DOCS+=( src/libelogind/sd-bus/GVARIANT-SERIALIZATION )
-
-	meson_src_install
-
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
-
-	sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.conf.in > ${PN}.conf || die
-	newconfd ${PN}.conf ${PN}
-}
-
-pkg_postinst() {
-	if [[ "$(rc-config list boot | grep elogind)" != "" ]]; then
-		elog "elogind is currently started from boot runlevel."
-	elif [[ "$(rc-config list default | grep elogind)" != "" ]]; then
-		ewarn "elogind is currently started from default runlevel."
-		ewarn "Please remove elogind from the default runlevel and"
-		ewarn "add it to the boot runlevel by:"
-		ewarn "# rc-update del elogind default"
-		ewarn "# rc-update add elogind boot"
-	else
-		ewarn "elogind is currently not started from any runlevel."
-		ewarn "You may add it to the boot runlevel by:"
-		ewarn "# rc-update add elogind boot"
-	fi
-}
diff --git a/sys-auth/elogind/elogind-235.5.ebuild b/sys-auth/elogind/elogind-235.5.ebuild
deleted file mode 100644
index c2dbf0ad0277..000000000000
--- a/sys-auth/elogind/elogind-235.5.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info meson pam udev xdg-utils
-
-DESCRIPTION="The systemd project's logind, extracted to a standalone package"
-HOMEPAGE="https://github.com/elogind/elogind"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC0-1.0 LGPL-2.1+ public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+acl debug doc +pam +policykit selinux"
-
-COMMON_DEPEND="
-	sys-apps/util-linux
-	sys-libs/libcap
-	virtual/libudev:=
-	acl? ( sys-apps/acl )
-	pam? ( virtual/pam )
-	selinux? ( sys-libs/libselinux )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-util/gperf
-	dev-util/intltool
-	sys-devel/libtool
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	!sys-apps/systemd
-"
-PDEPEND="
-	sys-apps/dbus
-	policykit? ( sys-auth/polkit )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-235.2-docs.patch"
-	"${FILESDIR}/${PN}-235.2-drop-logintest.patch" # bug 645156
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD"
-
-	if use kernel_linux; then
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	xdg_environment_reset
-}
-
-src_configure() {
-	local rccgroupmode="$(grep rc_cgroup_mode /etc/rc.conf | cut -d '"' -f 2)"
-	local cgroupmode="legacy"
-
-	if [[ "xhybrid" = "x${rccgroupmode}" ]] ; then
-		cgroupmode="hybrid"
-	elif [[ "xunified" = "x${rccgroupmode}" ]] ; then
-		cgroupmode="unified"
-	fi
-
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-		-Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-		-Dpamlibdir=$(getpam_mod_dir)
-		-Dudevrulesdir="$(get_udevdir)"/rules.d
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		-Drootlibdir="${EPREFIX}"/$(get_libdir)
-		-Drootlibexecdir="${EPREFIX}"/$(get_libdir)/elogind
-		-Drootprefix="${EPREFIX}/"
-		-Dbashcompletiondir="${EPREFIX}/usr/share/bash-completion/completions"
-		-Dzshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions"
-		-Dman=auto
-		-Dsmack=true
-		-Dcgroup-controller=openrc
-		-Ddefault-hierarchy=${cgroupmode}
-		-Ddefault-kill-user-processes=false
-		-Dacl=$(usex acl true false)
-		-Ddebug=$(usex debug elogind false)
-		--buildtype $(usex debug debug release)
-		-Dhtml=$(usex doc auto false)
-		-Dpam=$(usex pam true false)
-		-Dselinux=$(usex selinux true false)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	DOCS+=( src/libelogind/sd-bus/GVARIANT-SERIALIZATION )
-
-	meson_src_install
-
-	newinitd "${FILESDIR}"/${PN}.init ${PN}
-
-	sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.conf.in > ${PN}.conf || die
-	newconfd ${PN}.conf ${PN}
-}
-
-pkg_postinst() {
-	if [[ "$(rc-config list boot | grep elogind)" != "" ]]; then
-		elog "elogind is currently started from boot runlevel."
-	elif [[ "$(rc-config list default | grep elogind)" != "" ]]; then
-		ewarn "elogind is currently started from default runlevel."
-		ewarn "Please remove elogind from the default runlevel and"
-		ewarn "add it to the boot runlevel by:"
-		ewarn "# rc-update del elogind default"
-		ewarn "# rc-update add elogind boot"
-	else
-		ewarn "elogind is currently not started from any runlevel."
-		ewarn "You may add it to the boot runlevel by:"
-		ewarn "# rc-update add elogind boot"
-	fi
-}
diff --git a/sys-auth/elogind/elogind-238.1.ebuild b/sys-auth/elogind/elogind-238.1.ebuild
index c532686d9faa..cc148ee6f8da 100644
--- a/sys-auth/elogind/elogind-238.1.ebuild
+++ b/sys-auth/elogind/elogind-238.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="CC0-1.0 LGPL-2.1+ public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="+acl debug doc +pam +policykit selinux"
 
 COMMON_DEPEND="
@@ -113,8 +113,17 @@ pkg_postinst() {
 		ewarn "# rc-update del elogind default"
 		ewarn "# rc-update add elogind boot"
 	else
-		ewarn "elogind is currently not started from any runlevel."
-		ewarn "You may add it to the boot runlevel by:"
-		ewarn "# rc-update add elogind boot"
+		elog "elogind is currently not started from any runlevel."
+		elog "You may add it to the boot runlevel by:"
+		elog "# rc-update add elogind boot"
+		elog
+		elog "Alternatively, you can leave elogind out of any"
+		elog "runlevel. It will then be started automatically"
+		if use pam; then
+			elog "when the first service calls it via dbus, or"
+			elog "the first user logs into the system."
+		else
+			elog "when the first service calls it via dbus."
+		fi
 	fi
 }
diff --git a/sys-auth/elogind/files/elogind-235.2-docs.patch b/sys-auth/elogind/files/elogind-235.2-docs.patch
deleted file mode 100644
index 7fbb4594bdc4..000000000000
--- a/sys-auth/elogind/files/elogind-235.2-docs.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/meson.build	2018-01-14 18:59:36.141461154 +0100
-+++ b/meson.build	2018-01-14 19:00:46.208461781 +0100
-@@ -2634,16 +2634,5 @@
- # install_data('modprobe.d/systemd.conf',
- #              install_dir : modprobedir)
- #endif // 0
--install_data('README',
--             'NEWS',
--             'CODING_STYLE',
--#if 0 /// UNNEEDED by elogind
--#              'DISTRO_PORTING',
--#              'ENVIRONMENT.md',
--#endif // 0
--             'LICENSE.GPL2',
--             'LICENSE.LGPL2.1',
--             'src/libelogind/sd-bus/GVARIANT-SERIALIZATION',
--             install_dir : docdir)
- 
- meson.add_install_script('sh', '-c', mkdir_p.format(systemdstatedir))
diff --git a/sys-auth/elogind/files/elogind-235.2-drop-logintest.patch b/sys-auth/elogind/files/elogind-235.2-drop-logintest.patch
deleted file mode 100644
index 45f17f1b843a..000000000000
--- a/sys-auth/elogind/files/elogind-235.2-drop-logintest.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/src/test/meson.build	2018-01-15 20:34:18.000000000 +0100
-+++ b/src/test/meson.build	2018-01-31 15:11:33.342989914 +0100
-@@ -868,10 +868,10 @@
- #          [],
- #          [threads]],
- #endif // 0
--
--        [['src/libelogind/sd-login/test-login.c'],
--         [],
--         []],
-+# Broken in chroot; needs elogind at runtime?
-+#        [['src/libelogind/sd-login/test-login.c'],
-+#         [],
-+#         []],
- ]
- 
- #if 0 /// UNNEEDED in elogind
diff --git a/sys-auth/elogind/files/elogind-235.2-legacy-cgroupmode.patch b/sys-auth/elogind/files/elogind-235.2-legacy-cgroupmode.patch
deleted file mode 100644
index eb86e930f6f8..000000000000
--- a/sys-auth/elogind/files/elogind-235.2-legacy-cgroupmode.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 003ece760231aba0c661e2390dfd11075d72a8da Mon Sep 17 00:00:00 2001
-From: Sven Eden <yamakuzure@gmx.net>
-Date: Thu, 18 Jan 2018 23:01:12 +0100
-Subject: [PATCH] Prep v235.3 : Fix cgroup hierarchy detection code
-
-There is no sub-grouping with elogind, so /sys/fs/cgroup/elogind is
-not needed to be mounted as cgroup fs in legacy mode.
-
-Fixes Bug https://bugs.gentoo.org/644834
----
- src/basic/cgroup-util.c | 17 ++++++++++-------
- 1 file changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
-index 7f86c532c..cb60108ef 100644
---- a/src/basic/cgroup-util.c
-+++ b/src/basic/cgroup-util.c
-@@ -2550,28 +2550,31 @@ static int cg_unified_update(void) {
- 
-         if (F_TYPE_EQUAL(fs.f_type, CGROUP2_SUPER_MAGIC))
-                 unified_cache = CGROUP_UNIFIED_ALL;
-+#if 0 /// The handling of cgroups is a bit different with elogind
-         else if (F_TYPE_EQUAL(fs.f_type, TMPFS_MAGIC)) {
-+#else
-+        else if (F_TYPE_EQUAL(fs.f_type, CGROUP_SUPER_MAGIC)
-+              || F_TYPE_EQUAL(fs.f_type, TMPFS_MAGIC)) {
-+#endif // 0
-                 if (statfs("/sys/fs/cgroup/unified/", &fs) == 0 &&
-                     F_TYPE_EQUAL(fs.f_type, CGROUP2_SUPER_MAGIC)) {
-                         unified_cache = CGROUP_UNIFIED_SYSTEMD;
-                         unified_systemd_v232 = false;
- #if 0 /// elogind uses its own name
-                 } else if (statfs("/sys/fs/cgroup/systemd/", &fs) == 0 &&
--                           F_TYPE_EQUAL(fs.f_type, CGROUP2_SUPER_MAGIC)) {
--                        unified_cache = CGROUP_UNIFIED_SYSTEMD;
--                        unified_systemd_v232 = true;
--                } else {
--                        if (statfs("/sys/fs/cgroup/systemd/", &fs) < 0)
--                                return -errno;
- #else
-                 } else if (statfs("/sys/fs/cgroup/elogind/", &fs) == 0 &&
-+#endif // 0
-                            F_TYPE_EQUAL(fs.f_type, CGROUP2_SUPER_MAGIC)) {
-                         unified_cache = CGROUP_UNIFIED_SYSTEMD;
-                         unified_systemd_v232 = true;
-                 } else {
--#endif // 0
-+#if 0 /// There is no sub-grouping within elogind
-+                        if (statfs("/sys/fs/cgroup/systemd/", &fs) < 0)
-+                                return -errno;
-                         if (!F_TYPE_EQUAL(fs.f_type, CGROUP_SUPER_MAGIC))
-                                 return -ENOMEDIUM;
-+#endif // 0
-                         unified_cache = CGROUP_UNIFIED_NONE;
-                 }
-         } else
diff --git a/sys-auth/google-authenticator-wrappers/Manifest b/sys-auth/google-authenticator-wrappers/Manifest
new file mode 100644
index 000000000000..71d1076ca7dd
--- /dev/null
+++ b/sys-auth/google-authenticator-wrappers/Manifest
@@ -0,0 +1,5 @@
+DIST google-authenticator-wrappers-1.tar.gz 1379 BLAKE2B b8566281ade004a6b8996b18138754bab0f8ad2c4c23f4481b8a4f511a779a661fa7f1d68d22f43d0a077b9cef6dc5979d6ec522736d66e969db25c38a89062c SHA512 28d85206486c7aef9c1aee6e97e99950dd152c2114ae72c96c0af53debb1108e3d021766349d175cc6e402948f0ecd51a289575ebaa86680010ac50316e0146b
+DIST google-authenticator-wrappers-2.tar.gz 1615 BLAKE2B 313283bf2672e36883aa21d1520595afab90120ea106ef79e1dd7f2561d4a13f9ccb767ff3496f54eb2943b4a8fb55edce21e9b7f4ba9acb2845a97afbbbabde SHA512 5edcd57a1494fb6750a45396c9c5746dc952a9c7935c15bbae5e9ffce9175c9e1db92ee136ffe9cf513828425ab3dca0d976d1cc82737375b139f646717519cb
+EBUILD google-authenticator-wrappers-1.ebuild 478 BLAKE2B 50335934f2b7b20cfd10e74f6d7028b18ff67f36735d7a4955a1b834c3a96936c798800c769a4f84cc8d8f18e808fdd4ee67b137d297a714c90e050db95c052f SHA512 db098d6d9015ba3d0691d7bf63c7ab93099f5cd6bf2a4e5b71595c38446f1d468435bca47882207ff721c3914af1c39bbb9efdf54c1599503e18ea7acfe56d38
+EBUILD google-authenticator-wrappers-2.ebuild 478 BLAKE2B 50335934f2b7b20cfd10e74f6d7028b18ff67f36735d7a4955a1b834c3a96936c798800c769a4f84cc8d8f18e808fdd4ee67b137d297a714c90e050db95c052f SHA512 db098d6d9015ba3d0691d7bf63c7ab93099f5cd6bf2a4e5b71595c38446f1d468435bca47882207ff721c3914af1c39bbb9efdf54c1599503e18ea7acfe56d38
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/sys-auth/google-authenticator-wrappers/google-authenticator-wrappers-1.ebuild b/sys-auth/google-authenticator-wrappers/google-authenticator-wrappers-1.ebuild
new file mode 100644
index 000000000000..8b4ab71f9dae
--- /dev/null
+++ b/sys-auth/google-authenticator-wrappers/google-authenticator-wrappers-1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Set of scripts to manage google-auth setup on Gentoo Infra"
+HOMEPAGE="https://github.com/mgorny/google-authenticator-wrappers"
+SRC_URI="https://github.com/mgorny/google-authenticator-wrappers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="sys-auth/google-authenticator"
diff --git a/sys-auth/google-authenticator-wrappers/google-authenticator-wrappers-2.ebuild b/sys-auth/google-authenticator-wrappers/google-authenticator-wrappers-2.ebuild
new file mode 100644
index 000000000000..8b4ab71f9dae
--- /dev/null
+++ b/sys-auth/google-authenticator-wrappers/google-authenticator-wrappers-2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Set of scripts to manage google-auth setup on Gentoo Infra"
+HOMEPAGE="https://github.com/mgorny/google-authenticator-wrappers"
+SRC_URI="https://github.com/mgorny/google-authenticator-wrappers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="sys-auth/google-authenticator"
diff --git a/sys-auth/google-authenticator-wrappers/metadata.xml b/sys-auth/google-authenticator-wrappers/metadata.xml
new file mode 100644
index 000000000000..0319eec4c8be
--- /dev/null
+++ b/sys-auth/google-authenticator-wrappers/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sys-auth/polkit/Manifest b/sys-auth/polkit/Manifest
index 4a74e776baea..bf40abaa63d1 100644
--- a/sys-auth/polkit/Manifest
+++ b/sys-auth/polkit/Manifest
@@ -1,8 +1,7 @@
 AUX polkit-0.113-elogind.patch 6149 BLAKE2B 5e99eab21887f4504e07bd1fe803f8534aad227ec0ec8fcacf207ee5179a3ca6a670c1c3cf1f52e932096f27d39a911ca95c11adf1461833b4d3d4dda410973d SHA512 9a3e928d77c023c3f895f7fec7893f0355729808c4ee3bcd5419a7e408b613faefcff6d43f87cdab94b3fa15b7eaddc9ce40cf9b7b0954624360489c4d2c3b52
+AUX polkit-0.115-elogind.patch 1069 BLAKE2B 6c5a3d7d3e716a994b951181808f64d864e6ca58b3a018a5354022f08c6e7c1d8987366c9777f47cc970916ad9fe39f288a1b1643113fc99745f333e02dab56f SHA512 06432fa56788699762c6978484640554f91728a1cb40679eb47b8514b3c7aa23aac5b9c26586eb4d7043a0af1b319bbe7f869d24844d9151317299b74a8e8f7f
 DIST polkit-0.113.tar.gz 1448865 BLAKE2B 93cb6abf03d0de193e9f64b953bee40faf3bd07cf6f86beb4f84edd740dedc0bcf7a1ffd6b3a1a816e5adad0ee59536dacae3d991add4c4965cc6a98566b7470 SHA512 ab177c89a20eeb2978ddbe28afb205d3619f9c5defe833eb68a85e71a0f2c905367f1295cbbfb85da5eafdd661bce474d5d84aca9195cd425a18c9b4170eb5f9
-DIST polkit-0.114.tar.gz 1557340 BLAKE2B 4ba50f5c44342b9420e7a7e9fc07b94338613816530000f42d6e45b941c7b6bd39260ea23c86b24b22684be3fd0be968976415dd3d11fe5ba9269d8c70d33870 SHA512 49cdf9dd3663714b1c6569ad8740cb413d9c5bd5c11e4bdbba3ce82b744f36638b652547edff9203caab9287834bc68a1d6a4895ec7a188fa1524dc1e9c9b4ea
 DIST polkit-0.115.tar.gz 1550932 BLAKE2B 3185ebed46209f88a9ffccbbcaf1bf180d1ae6d5ec53cf3c66d867ad43910b47a1123a3db190991ebb382a0d28fc5a119ea4bab942db324e9af5663056cf6ee1 SHA512 1153011fa93145b2c184e6b3446d3ca21b38918641aeccd8fac3985ac3e30ec6bc75be6973985fde90f2a24236592f1595be259155061c2d33358dd17c4ee4fc
 EBUILD polkit-0.113-r4.ebuild 3453 BLAKE2B 742c7a63b760831043cd0fc2ba51b2923a61619561fd715ba77be978fa597030bf25c90b87cd3944007e2f1342fca0b485a3fa806cd8f6337d115820d65d4691 SHA512 9b36a31705cf5c1e84a1004dbd6938d44cb2103e1b71e67f6c12d4f828cafb2622e894409e22323b42d1c1fcfa5e1b51b334886458267b363c5f7dd27643bb55
-EBUILD polkit-0.114.ebuild 3396 BLAKE2B 2493cfa26fd4b9fd4c5d24367bb71086be9b0495e5875e948cc66a1928ccee5e4a1676780ca69682eb9d47c6c5cb480c310a6c80b964d0044f54908fe1918f4f SHA512 9330cf67327427a293e3a424238f819aa428a213701b424b68d4616c3f535b6733747574f783b5f5eb134be6ff6107da02394f905cc77b2668dd81852e8f6bbf
-EBUILD polkit-0.115.ebuild 3396 BLAKE2B 2493cfa26fd4b9fd4c5d24367bb71086be9b0495e5875e948cc66a1928ccee5e4a1676780ca69682eb9d47c6c5cb480c310a6c80b964d0044f54908fe1918f4f SHA512 9330cf67327427a293e3a424238f819aa428a213701b424b68d4616c3f535b6733747574f783b5f5eb134be6ff6107da02394f905cc77b2668dd81852e8f6bbf
+EBUILD polkit-0.115-r1.ebuild 3455 BLAKE2B d98e83967e781f6333421a9a5450581ff291fc4929d43c07ee4810edf742d01932440bc952aea74e4f6abc93d3452f3c70bc962ba330adfa15b1754d466dbdb3 SHA512 1c2dbd5beab9d56600342be351062f95aee3cbccb3323857cfd3fa4c530285a9e4a0ea85736c474f0d8f6fd8326358e5deae095a55149891586f9f5a5e5b4997
 MISC metadata.xml 493 BLAKE2B bbf2a4e83d0882480d0f2ba8b18ef439b234bd82538546d04753d63fa828f6b111afb78846c1a03f4aa93f89e6fd0a6a828c7908574a740c9c6880252a84e98d SHA512 9c7b199d1a3b1193beb4d01e52d5e90d81821aa6df6785482da7ee37c0ca777c12095f160bc997c77d0089429c2e338cf75d0a46836416736178cd661ffa80f5
diff --git a/sys-auth/polkit/files/polkit-0.115-elogind.patch b/sys-auth/polkit/files/polkit-0.115-elogind.patch
new file mode 100644
index 000000000000..93d672015db4
--- /dev/null
+++ b/sys-auth/polkit/files/polkit-0.115-elogind.patch
@@ -0,0 +1,28 @@
+From 08bb656496cd3d6213bbe9473f63f2d4a110da6e Mon Sep 17 00:00:00 2001
+From: Rasmus Thomsen <cogitri@exherbo.org>
+Date: Wed, 11 Apr 2018 13:14:14 +0200
+Subject: [PATCH] configure: fix elogind support
+
+HAVE_LIBSYSTEMD is used to determine which source files to use.
+We have to check if either have_libsystemd or have_libelogind is
+true, as both of these need the source files which are used when
+HAVE_LIBSYSTEMD is true.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 36df239..da47ecb 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -221,7 +221,7 @@ AS_IF([test "x$cross_compiling" != "xyes" ], [
+ 
+ AC_SUBST(LIBSYSTEMD_CFLAGS)
+ AC_SUBST(LIBSYSTEMD_LIBS)
+-AM_CONDITIONAL(HAVE_LIBSYSTEMD, [test "$have_libsystemd" = "yes"], [Using libsystemd])
++AM_CONDITIONAL(HAVE_LIBSYSTEMD, [test "$have_libsystemd" = "yes" || test "$have_libelogind" = "yes" ], [Using libsystemd])
+ 
+ dnl ---------------------------------------------------------------------------
+ dnl - systemd unit / service files
+-- 
+2.17.0
diff --git a/sys-auth/polkit/polkit-0.114.ebuild b/sys-auth/polkit/polkit-0.114.ebuild
deleted file mode 100644
index 3e161e209a86..000000000000
--- a/sys-auth/polkit/polkit-0.114.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools pam pax-utils systemd user xdg-utils
-
-DESCRIPTION="Policy framework for controlling privileges for system-wide services"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/polkit"
-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"
-IUSE="elogind examples gtk +introspection jit kde nls pam selinux systemd test"
-
-REQUIRED_USE="?? ( elogind systemd )"
-
-CDEPEND="
-	dev-lang/spidermonkey:52[-debug]
-	dev-libs/glib:2
-	dev-libs/expat
-	elogind? ( sys-auth/elogind )
-	introspection? ( dev-libs/gobject-introspection )
-	pam? (
-		sys-auth/pambase
-		virtual/pam
-	)
-	systemd? ( sys-apps/systemd:0= )
-"
-DEPEND="${CDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xsl-stylesheets
-	dev-libs/gobject-introspection-common
-	dev-libs/libxslt
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-policykit )
-"
-PDEPEND="
-	gtk? ( || (
-		>=gnome-extra/polkit-gnome-0.105
-		>=lxde-base/lxsession-0.5.2
-	) )
-	kde? ( kde-plasma/polkit-kde-agent )
-	!systemd? ( !elogind? ( sys-auth/consolekit[policykit] ) )
-"
-
-DOCS=( docs/TODO HACKING NEWS README )
-
-QA_MULTILIB_PATHS="
-	usr/lib/polkit-1/polkit-agent-helper-1
-	usr/lib/polkit-1/polkitd"
-
-pkg_setup() {
-	local u=polkitd
-	local g=polkitd
-	local h=/var/lib/polkit-1
-
-	enewgroup ${g}
-	enewuser ${u} -1 -1 ${h} ${g}
-	esethome ${u} ${h}
-}
-
-src_prepare() {
-	default
-
-	sed -i -e 's|unix-group:wheel|unix-user:0|' src/polkitbackend/*-default.rules || die #401513
-
-	# Workaround upstream hack around standard gtk-doc behavior, bug #552170
-	sed -i -e 's/@ENABLE_GTK_DOC_TRUE@\(TARGET_DIR\)/\1/' \
-		-e '/install-data-local:/,/uninstall-local:/ s/@ENABLE_GTK_DOC_TRUE@//' \
-		-e 's/@ENABLE_GTK_DOC_FALSE@install-data-local://' \
-		docs/polkit/Makefile.in || die
-
-	# disable broken test - bug #624022
-	sed -i -e "/^SUBDIRS/s/polkitbackend//" test/Makefile.am || die
-
-	# Fix cross-building, bug #590764, elogind patch, bug #598615
-	eautoreconf
-}
-
-src_configure() {
-	xdg_environment_reset
-
-	local myeconfargs=(
-		--localstatedir="${EPREFIX}"/var
-		--disable-static
-		--enable-man-pages
-		--disable-gtk-doc
-		--disable-examples
-		$(use_enable elogind libelogind)
-		$(use_enable introspection)
-		$(use_enable nls)
-		$(usex pam "--with-pam-module-dir=$(getpam_mod_dir)" '')
-		--with-authfw=$(usex pam pam shadow)
-		$(use_enable systemd libsystemd-login)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		$(use_enable test)
-		--with-os-type=gentoo
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	# Required for polkitd on hardened/PaX due to spidermonkey's JIT
-	pax-mark mr src/polkitbackend/.libs/polkitd test/polkitbackend/.libs/polkitbackendjsauthoritytest
-}
-
-src_install() {
-	default
-
-	fowners -R polkitd:root /{etc,usr/share}/polkit-1/rules.d
-
-	diropts -m0700 -o polkitd -g polkitd
-	keepdir /var/lib/polkit-1
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins src/examples/{*.c,*.policy*}
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	chown -R polkitd:root "${EROOT}"/{etc,usr/share}/polkit-1/rules.d
-	chown -R polkitd:polkitd "${EROOT}"/var/lib/polkit-1
-}
diff --git a/sys-auth/polkit/polkit-0.115.ebuild b/sys-auth/polkit/polkit-0.115-r1.ebuild
index 3e161e209a86..f07c7ca222e3 100644
--- a/sys-auth/polkit/polkit-0.115.ebuild
+++ b/sys-auth/polkit/polkit-0.115-r1.ebuild
@@ -52,6 +52,8 @@ PDEPEND="
 
 DOCS=( docs/TODO HACKING NEWS README )
 
+PATCHES=( "${FILESDIR}"/${P}-elogind.patch ) # bug 660880
+
 QA_MULTILIB_PATHS="
 	usr/lib/polkit-1/polkit-agent-helper-1
 	usr/lib/polkit-1/polkitd"