gentoo resync : 18.11.2019

8 files changed, 177 insertions, 10 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 2e65ab6a94af..07fea10d5a54 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index 55c1e1985211..0ac7e5f6533e 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -1,6 +1,9 @@
 AUX elogind-241.1-docs.patch 855 BLAKE2B 08fc89a264ab0408c13caa059649a004b775ec2e75ca0561d658106c9947ee0f6b9594ede8a40eb0fb7d0d0454123411f7c408e4701b88d20e0c4042a84b6916 SHA512 9260d94e77512ab8dede225d01c56194b01a0140be66489991ec17f6e1d09f7ab9f9b2efa0205fe3c6c3dedcd2145d6b9eb6126aef047a02e228cd4270972124
+AUX elogind-241.4-nodocs.patch 962 BLAKE2B 2fe0ac3297857869478cd8aa9cfe17b0d6877a7e03804676a53fb43156f4c0e453fb315b247721169293d04a89ebc0eddaea23cb4a4a56a90046a14d452f6c95 SHA512 170b1776d6eb8541b91639f9a321cf1fba47ae33b56928a1535a36f913bb0bf7e6f6aee2644db3daa2274c1eb9572028523ce6b66a3731634311182b4049e621
 AUX elogind.conf.in 218 BLAKE2B 7ee0a72c4a628a233fdbb2d3104487859aaa7e5c4f2624e5a4eafb37ed90fb8f64349b1a8acc92e69ec618496bb7f6263b7a5d0fe15a1afe1c03f5955743f079 SHA512 2c62ab28d7db9cd52489069f80363159000385a25dd7f2afe5a03598a0b7a1f61af7c18df71f6286e72f5966e55b62a4029e30cb786dd813bb201b9e20adccd7
 AUX elogind.init 490 BLAKE2B 71c102f89a71a2963da50b153d8696a9480d81caa48e8422e7f39614e9bfb0b09037bc4dea202c3735e170140752429dd54747b99941d861453b4714dcb98819 SHA512 60fe1cb55ec0f605f06fb3744a0300accebfc14c4ecd24b7db2e8b0cb1537e816a4a4ccbc4b2eeac45e2f3ca8942dd10d24bdcd814cccbc2ceed198b2657238a
 DIST elogind-241.3.tar.gz 1401391 BLAKE2B 90bc10af1b6d66bc6b6e15314cbc7005f270ebd04767a88d93605d81b199758c7f5423ea85f9810f8dfcde82c6c2b8094e2237cf2ca70a9dfc45a4a8e20b0439 SHA512 b33c0ed85c4a97216f8d56441207510be180258d4f4e5ff9dea07d59d53b84b03c27f5397f09214ce9fc880f38865e20d7c05b41255d4b762c33099b7ebb53eb
+DIST elogind-241.4.tar.gz 1400769 BLAKE2B f1ddf87a6a4e3d06c184ae004d99acbfc1a753d0e5c6d18ff4c10a51b350cee0c14f833aba6f2a2a0f4891ad323868b9a94a3acb8b9eec2e30405b9fa4a09425 SHA512 e1685ac81028eab4a4cf63c7b962ae85f07bc0e39b2562934f863bfdf39417445c432fab5454e7c64b337ab62d95fb69abbe1139464a059a86fb485ed0534ad8
 EBUILD elogind-241.3.ebuild 3524 BLAKE2B d8ee0e5a28ee1aa0494aa35bfb729f00541145c7571a69d31c02c51cfa928d3e8c016c633230fbd8c4d3347f7859bec0f61fb8f40d2208964c71e17f29043e61 SHA512 a80fc860d3c71d971f7381d766ec898dc51bcbd5ad0d9287ec1a7f3fc80ab54f0eea82df317b931a7680d0478f02a5f91623218be4458e4553fd545bd68e6326
+EBUILD elogind-241.4.ebuild 3681 BLAKE2B a9da417fad39971a6204c317572b224d8709ecf2f37f788209c40d1f17e4649ae32d459d5c3d86b589c01b85305a6fdaaf9545ee93ee5e4e994bee470a349c0f SHA512 5a2e6e3c33aaf99e7b478c85fb751e3a9621a8047408cd59f3db8a9b372e5e8086c330094cac8dadab7306925d8519b071a13ffaf11cae2bd5a85372a3cc5e3b
 MISC metadata.xml 379 BLAKE2B fc63654412fa4cb02122205ad53d29ed35153457c5dd5c5ab8fa3c3dbfcc7c00b2704220d4cb9040f8d6f794bbb9bd0f8cb9be80d410efb6cf85eeee8ce46503 SHA512 30be0eb7903ffb83d9e24fbcacc8db09c0f8cd7187df5f75b2c12fb5cfae1110d52f29aba502ea92af53df02451cc40e0f3789382f87a16bd281f06e9cad6c68
diff --git a/sys-auth/elogind/elogind-241.4.ebuild b/sys-auth/elogind/elogind-241.4.ebuild
new file mode 100644
index 000000000000..1ea759237934
--- /dev/null
+++ b/sys-auth/elogind/elogind-241.4.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_BRANCH="v241-stable"
+	EGIT_REPO_URI="https://github.com/elogind/elogind.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+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"
+
+LICENSE="CC0-1.0 LGPL-2.1+ public-domain"
+SLOT="0"
+IUSE="+acl debug doc +pam +policykit selinux"
+
+COMMON_DEPEND="
+	sys-apps/util-linux
+	sys-libs/libcap
+	virtual/libudev:=
+	acl? ( sys-apps/acl )
+	pam? ( sys-libs/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 )
+"
+
+DOCS=( NEWS README.md src/libelogind/sd-bus/GVARIANT-SERIALIZATION )
+
+PATCHES=( "${FILESDIR}/${P}-nodocs.patch" )
+
+pkg_setup() {
+	local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD"
+
+	use kernel_linux && linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	xdg_environment_reset
+}
+
+src_configure() {
+	local rccgroupmode="$(grep rc_cgroup_mode \"${EPREFIX}/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="${EPREFIX}$(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"
+		-Dman=auto
+		-Dsmack=true
+		-Dcgroup-controller=openrc
+		-Ddefault-hierarchy=${cgroupmode}
+		-Ddefault-kill-user-processes=false
+		-Dacl=$(usex acl true false)
+		--buildtype $(usex debug debug release)
+		-Dhtml=$(usex doc auto false)
+		-Dpam=$(usex pam true false)
+		-Dselinux=$(usex selinux true false)
+		-Dutmp=$(usex elibc_musl false true)
+	)
+
+	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
+		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-241.4-nodocs.patch b/sys-auth/elogind/files/elogind-241.4-nodocs.patch
new file mode 100644
index 000000000000..299087483ced
--- /dev/null
+++ b/sys-auth/elogind/files/elogind-241.4-nodocs.patch
@@ -0,0 +1,29 @@
+We don't want the build system to install to docdir for us.
+
+--- a/meson.build	2019-10-26 23:24:34.743783753 +0200
++++ b/meson.build	2019-10-26 23:26:50.847647926 +0200
+@@ -3342,15 +3342,10 @@
+ # install_data('modprobe.d/systemd.conf',
+ #              install_dir : modprobedir)
+ #endif // 0
+-install_data('LICENSE.GPL2',
+-             'LICENSE.LGPL2.1',
+-             'NEWS',
+ #if 0 /// elogind has upgraded to markdown
+ #              'README',
+ #else
+-             'README.md',
+ #endif // 0
+-             'docs/CODING_STYLE.md',
+ #if 0 /// irrelevant for elogind
+ #              'docs/DISTRO_PORTING.md',
+ #              'docs/ENVIRONMENT.md',
+@@ -3359,8 +3354,6 @@
+ #              'docs/TRANSLATORS.md',
+ #              'docs/UIDS-GIDS.md',
+ #endif // 0
+-             'src/libelogind/sd-bus/GVARIANT-SERIALIZATION',
+-             install_dir : docdir)
+ 
+ #if 0 /// UNNEEDED by elogind
+ # meson.add_install_script('sh', '-c', mkdir_p.format(systemdstatedir))
diff --git a/sys-auth/pam_p11/Manifest b/sys-auth/pam_p11/Manifest
index 0be264ca9e99..c247a5bbaa97 100644
--- a/sys-auth/pam_p11/Manifest
+++ b/sys-auth/pam_p11/Manifest
@@ -1,5 +1,5 @@
 DIST pam_p11-0.3.0.tar.gz 422806 BLAKE2B 60ac1cc0b8fff536553b2502f906f7730c1be760b2948389f5a6399979f994b3fcfa04226f1605c64d02bad47f46c9bd28fa076d819814b9121241b034407d4b SHA512 f89cf57f6365c25e54830d18180aad7d14b7eaef82eb0d419bcc3d8b881e1e07993a2c4e635e90b4f2fb779fec24fa0d912388f898d726e387bc0db63d772d49
 DIST pam_p11-0.3.1.tar.gz 422940 BLAKE2B b4c6d60a7ee31d808b9e928339f6e8aba3b56655b9f408ff7cd15ff4a397c89c00d00b0bbe70fc0b7bd6c6a246acd9c313c8f5b21a88e1474355c3407ff694f0 SHA512 caaa6882d4c007dfaba5974dc420bc45aa225f705679d170fdc9576aa49cbd24bba6985f14eb2bca97d4fe37aaf6088641add912dfbb93740b7d634f448addcf
 EBUILD pam_p11-0.3.0.ebuild 658 BLAKE2B 07d4d2bd9bedc19d3a34f5c0ad0dafaca7d9d2407f649f88fa4a6a437684dfae73a25b50e1c3f850131470686bbf644ef2d409ba62f373a5051689c70f3992e7 SHA512 44cc0e84a8113d123ffb6eeb82019f4e7acb0a86190080471c44245107e66ef2ea8bdfccdff037a7f5323e526e97a5143c682d61dfe8d32086fe7df184130b68
-EBUILD pam_p11-0.3.1.ebuild 662 BLAKE2B 8afdf6415b120513397f20b5eb1d2bcbd83cb6a5cab9c6ed947e35479e45b334d4c82abfe1a92ee49c5b0276c066a52d0b484731d02bd2a5fa743188b308173b SHA512 c01ee670b1bf2e1799a0ff590d93084f32b9672575e3210346db0a3529e12ba32b03a04c8b5e21082363676b5ae86cac7b4de2f9de22ff6aef7580ef127a3a37
+EBUILD pam_p11-0.3.1.ebuild 659 BLAKE2B a848e7c5f25023e6964976b9266b88d342f6d75eee483e1a9d65a9503b12f85d870b4cf858ed6b3e0d1fbcba8654ce2646a3d7e4dbb1683b1d81ede0d1c48231 SHA512 9fe12cc0374d2e051e9672771dc914ddad5681f6bc38e27ab81c80726eac436a26b35f22b1c7b1dbbed07545813c33feb1f9bd9b8813e5bb584c8d501ec51e4c
 MISC metadata.xml 382 BLAKE2B 8617a56b292f5844a178afcbaaf56ad5e1c221871fba9012f19e2b94f2a745e2a39e0298d4edc1b30a4aa62bddfa0afef1751966292d2b9e3117832787e0da8d SHA512 1747f4d94dd0a90448d38557beae49c4532f752a33956a54795a58262d42c259d7371a9ebe5a5ac347a7d1178d7932c7f40bce363c476f7a199ff03129fdaf6c
diff --git a/sys-auth/pam_p11/pam_p11-0.3.1.ebuild b/sys-auth/pam_p11/pam_p11-0.3.1.ebuild
index 95a5dbe668c4..9effa4fd9b23 100644
--- a/sys-auth/pam_p11/pam_p11-0.3.1.ebuild
+++ b/sys-auth/pam_p11/pam_p11-0.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/OpenSC/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86"
 
 RDEPEND="sys-libs/pam
 	dev-libs/libp11:=
diff --git a/sys-auth/polkit-qt/Manifest b/sys-auth/polkit-qt/Manifest
index ed9ca836ef39..75b53d972bcf 100644
--- a/sys-auth/polkit-qt/Manifest
+++ b/sys-auth/polkit-qt/Manifest
@@ -1,5 +1,5 @@
 DIST polkit-qt-1-0.112.0_p20160416.tar.xz 64540 BLAKE2B fbc3631585801f42ff92324576a2bd82d61aa5b24317f95e1182c300073a8e746007fa3409127a50d7d3433c5092f56d72e2e579683d08145067d4424c4dfe7e SHA512 90677af780a2bbcb33b6a54702ba96f965eb8561f2636af7aa0146f9b2450f9e89f67e022ffa99742afe50e3d1f570eabfad686e9e08e629a1e662d9f5abf2ea
 DIST polkit-qt-1-0.113.0.tar.xz 64652 BLAKE2B 52d8c5c8009e2595c70db5b6a6349e4524d6d9cbec12c5a535f25d737da1d16e77fadf3572eebbede7a5ed583c818e878119b416d69a076e03bb37d2f7da7b41 SHA512 deea5d75f547eaa0279c664ec9608b65f464db97fd5fdea27437f8ed4ec033de2b9f91d967deacb28bf0a1e54f131f997acb862cc3e1f8dfcb1f6c337e719b38
 EBUILD polkit-qt-0.112.0_p20160416-r2.ebuild 761 BLAKE2B e7b71f31eba9822e7d9c825253ce91d72dc2d61ce6b56dd7b847540ec71991b534909988b37fa4f568323c03c9c7acdd8f2e1a18cfc79fd0ec214c1799abc95a SHA512 750844ce511690cd2791bde75d456aa3d941e7c86540a67182d36cd2ea430988b89065f9a532ffdcbb7d815be773ebc959283e00e8a038014e68ceaf6fbdd57c
-EBUILD polkit-qt-0.113.0.ebuild 748 BLAKE2B 0179670d73be5b0feef6982ef06261c07b3c5010effd50e4eedfcadee5f4f840958ccfd94d2e9916fd45e74dc871023b4ab6d17135f72c79e9383f3b5ee0a94a SHA512 e35ab8e1fc4ce27d38f9a7f03ddddd0f2756465143d7ae28fab2171a3727929b52d3b7707e46df49e826c89657ce69ae6dbb7e30fd76911cab3caf4b7b460ffe
+EBUILD polkit-qt-0.113.0.ebuild 828 BLAKE2B 1f2fb023b677682e38360a0311458b0d47d6e7c6e0caf3630db3270b7e6b10436e8de0d51e3d5895b016798c4850d53d6019432f8717767bff96a0baaa4cd025 SHA512 3604c9e4e37e502cdef49a4b8c7af77e91c415864863dd9fa5e2dac5f349e6424481d5833a2ba589b47d4369036406566c4b9980f592ee83e7bfcca14047c32c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/sys-auth/polkit-qt/polkit-qt-0.113.0.ebuild b/sys-auth/polkit-qt/polkit-qt-0.113.0.ebuild
index 65ed2776fbf3..3d438c81c688 100644
--- a/sys-auth/polkit-qt/polkit-qt-0.113.0.ebuild
+++ b/sys-auth/polkit-qt/polkit-qt-0.113.0.ebuild
@@ -3,17 +3,20 @@
 
 EAPI=7
 
-MY_PN="${PN}-1"
-MY_P="${MY_PN}-${PV}"
-inherit cmake-utils
+KDE_ORG_NAME="polkit-qt-1"
+inherit cmake-utils kde.org
 
 DESCRIPTION="Qt wrapper around polkit-1 client libraries"
 HOMEPAGE="https://api.kde.org/kdesupport-api/polkit-qt-1-apidocs/"
-SRC_URI="mirror://kde/stable/${MY_PN}/${MY_P}.tar.xz"
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${KDE_ORG_NAME}/${KDE_ORG_NAME}-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
+	S="${WORKDIR}/${KDE_ORG_NAME}-${PV}"
+fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="debug"
 
 RDEPEND="
@@ -28,8 +31,6 @@ DEPEND="${RDEPEND}"
 
 DOCS=( AUTHORS README README.porting TODO )
 
-S="${WORKDIR}/${MY_P}"
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_EXAMPLES=OFF