gentoo Easter resync : 12.04.2020

5 files changed, 64 insertions, 27 deletions

diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index 3e933a8d34f1..cabac9e5095f 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -1,10 +1,11 @@
 AUX elogind-241.4-broken-test.patch 436 BLAKE2B 204591800f415b00535bcd520435ea91ca59077438a1f07d1ecaf1cd68556cf1915460cacb2e3a062702dd84c8ca9729e7c4dfdd385a0435329784c8a33b4a66 SHA512 55435fa4cf902299f4957361393e7d1c5394970193fd814019d4dd5f9abddce3a7ea1da507eee4712f2f98284a989af8b22b6e1ff8a71e8faeb82417d1891c97
-AUX elogind-241.4-nodocs.patch 962 BLAKE2B 2fe0ac3297857869478cd8aa9cfe17b0d6877a7e03804676a53fb43156f4c0e453fb315b247721169293d04a89ebc0eddaea23cb4a4a56a90046a14d452f6c95 SHA512 170b1776d6eb8541b91639f9a321cf1fba47ae33b56928a1535a36f913bb0bf7e6f6aee2644db3daa2274c1eb9572028523ce6b66a3731634311182b4049e621
 AUX elogind-243.4-nodocs.patch 994 BLAKE2B 14e704d541e44b18f4e95b655c4ab5751f537d638e87c90a08ab5615d68c34c1cd75d8cb3fd8032924965fed1f913df3c1bf214db5d610a4df2bdd98bf89f7e1 SHA512 f3567219f31af39cc43ec2ee6856f0363f2fc98391ea807d7a7887e819b622652d6ca4be02d5d447bb446b323e48f0a5c8d58256aa7c2024eb7af9e4e3033d28
+AUX elogind-243.4-selinux-missing-headers.patch 1040 BLAKE2B c8ba321ea788ed68892b10bb34ea8e293f0536208acda8c5fb6436e3877eed616958178ee908491ea29ce8315cfe0771d35a8a2c4633ead9bf581800a7fcd866 SHA512 b8b7b02f4f94326ed12222bab24327b31859da9037a4bfc24a5868cb2f8c2342d267312cff9e66e5cbf3c9a10231c17b7b57d1513d019cb004308577779aa229
+AUX elogind-243.7-nodocs.patch 999 BLAKE2B f4fc95f14ce0412e88bb8b2a001975fae3b42bdf82c1f23b28e4b2cc635d92722c6317ac919bedd1dfbcc47faf4a177d6662b3b04569ce993e1b8fd5ce8bde15 SHA512 87c6072f95b9fe752324ae8dce576a70f795c31115f4b7478cd66c0ab22e50d0035620b5a278f042bc95635423056b1a7984ed81b32e9011dee84b9a5dec7566
 AUX elogind.conf.in 218 BLAKE2B 7ee0a72c4a628a233fdbb2d3104487859aaa7e5c4f2624e5a4eafb37ed90fb8f64349b1a8acc92e69ec618496bb7f6263b7a5d0fe15a1afe1c03f5955743f079 SHA512 2c62ab28d7db9cd52489069f80363159000385a25dd7f2afe5a03598a0b7a1f61af7c18df71f6286e72f5966e55b62a4029e30cb786dd813bb201b9e20adccd7
 AUX elogind.init 490 BLAKE2B 71c102f89a71a2963da50b153d8696a9480d81caa48e8422e7f39614e9bfb0b09037bc4dea202c3735e170140752429dd54747b99941d861453b4714dcb98819 SHA512 60fe1cb55ec0f605f06fb3744a0300accebfc14c4ecd24b7db2e8b0cb1537e816a4a4ccbc4b2eeac45e2f3ca8942dd10d24bdcd814cccbc2ceed198b2657238a
-DIST elogind-241.4.tar.gz 1400769 BLAKE2B f1ddf87a6a4e3d06c184ae004d99acbfc1a753d0e5c6d18ff4c10a51b350cee0c14f833aba6f2a2a0f4891ad323868b9a94a3acb8b9eec2e30405b9fa4a09425 SHA512 e1685ac81028eab4a4cf63c7b962ae85f07bc0e39b2562934f863bfdf39417445c432fab5454e7c64b337ab62d95fb69abbe1139464a059a86fb485ed0534ad8
 DIST elogind-243.4.tar.gz 1335747 BLAKE2B 37c4eb1c476f97948aed44901fbd61ee1b1b8215d3167b368be00c542c64cdcb8b1e8e2725515820df4542d800079810e95f59469e3c6f5229932e55de4a3c1f SHA512 9751a3d0ed65dd73d9363097ee1752d437d5636db2a4137395596e0c81e04d4715f314568d1d7c6f367f1ecbda011086cb165bd4dc207302626b16e693cd0a02
-EBUILD elogind-241.4.ebuild 3731 BLAKE2B 7dd322951f0571e74d6c9a7273ec09da8813026ed2f68b3958f6f3db2bd9dfe6e81e88fd39f5b36a4965b869abba3f4026c95272418de8c7759d2eee18ebd9ae SHA512 65d96a44119cf69a25cbcbb8677661fbeff6d0de70726b2553eff2fb6f6e49fe3853e25ac2301c5e8483e306e0542d50b9ee87dee71e40115730b2677884ed55
-EBUILD elogind-243.4.ebuild 3689 BLAKE2B 50793bf8b1bedfa10b530eae2990bbaafaaf44c6edc8f57c696f39645ca3e741daf1ee4460a5cf46fae8b41d36f1174f583faebe80aa4af9ca8110a005767ffd SHA512 dbd82489e3bb8c30fb1a01c583ceb6016fa1d02123876e88cc0b21b145424cd3fb34c9580e5faa49cebc32bf66ebfc8b7a3527dcde562886cfe38cc406f36ba8
+DIST elogind-243.7.tar.gz 1338186 BLAKE2B f3efc2af50f56c2cda18d721c18f4d88ca608fb35b2c7e2ebb35c3f3f743124dcf17efcc9db47810a13093397b1c1bc82cb42e017b3db493af5d2bb70bcf0eff SHA512 fd17c5016d083d63805f9ed0326ee32597870f6c48c9c246712cb09a77db775036b0fd0f4258b6557e189a1eceb4b50f4ae2e9e7881f4d9759b87a0b49ce3472
+EBUILD elogind-243.4.ebuild 3745 BLAKE2B 0778c9ca7458d93981579a8965d5b446019defa82128b17fbb6217f3cf090a27ee5355d1124f0a1f7b8fa43d409a5ec01f93e49d0de95212d7fc79b328a2b162 SHA512 bdf33b24df3a9969cf406c6765eb9c549889f37f59df61b3dd8d215d1cdf54430ef6738365a317189a377e0f4c03e37a2c392634dac3b1ea8c52b60959d506d0
+EBUILD elogind-243.7.ebuild 3701 BLAKE2B 34ee731c663899c2fdcb058eec0e6f0b2a175431079fa36497ae9ce11ffc9cbc9b8ff3871150c64573a756854826806d62db0bee1bbee61c7fe69cd303b2d45b SHA512 6bc5f7ebe86878e250408573596defee83237a50d7dde7bacac04f0b2e5820383ff6daf3d9d17bc846cae5173a893b921f31b73f1f3b3595d447db882c6340ac
 MISC metadata.xml 379 BLAKE2B fc63654412fa4cb02122205ad53d29ed35153457c5dd5c5ab8fa3c3dbfcc7c00b2704220d4cb9040f8d6f794bbb9bd0f8cb9be80d410efb6cf85eeee8ce46503 SHA512 30be0eb7903ffb83d9e24fbcacc8db09c0f8cd7187df5f75b2c12fb5cfae1110d52f29aba502ea92af53df02451cc40e0f3789382f87a16bd281f06e9cad6c68
diff --git a/sys-auth/elogind/elogind-243.4.ebuild b/sys-auth/elogind/elogind-243.4.ebuild
index ec495cedb70c..9b5b3ebd4f36 100644
--- a/sys-auth/elogind/elogind-243.4.ebuild
+++ b/sys-auth/elogind/elogind-243.4.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 fi
 
 inherit linux-info meson pam udev xdg-utils
@@ -50,6 +50,7 @@ DOCS=( README.md src/libelogind/sd-bus/GVARIANT-SERIALIZATION )
 PATCHES=(
 	"${FILESDIR}/${P}-nodocs.patch"
 	"${FILESDIR}/${PN}-241.4-broken-test.patch" # bug 699116
+	"${FILESDIR}/${P}-selinux-missing-headers.patch" # bug 711432
 )
 
 pkg_setup() {
diff --git a/sys-auth/elogind/elogind-241.4.ebuild b/sys-auth/elogind/elogind-243.7.ebuild
index e79fbca640c5..9a2819e1b700 100644
--- a/sys-auth/elogind/elogind-241.4.ebuild
+++ b/sys-auth/elogind/elogind-243.7.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 inherit linux-info meson pam udev xdg-utils
@@ -21,24 +21,23 @@ 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}
+BDEPEND="
 	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}
+DEPEND="
+	sys-apps/util-linux
+	sys-libs/libcap
+	virtual/libudev:=
+	acl? ( sys-apps/acl )
+	pam? ( sys-libs/pam )
+	selinux? ( sys-libs/libselinux )
+"
+RDEPEND="${DEPEND}
 	!sys-apps/systemd
 "
 PDEPEND="
@@ -46,11 +45,11 @@ PDEPEND="
 	policykit? ( sys-auth/polkit )
 "
 
-DOCS=( NEWS README.md src/libelogind/sd-bus/GVARIANT-SERIALIZATION )
+DOCS=( README.md src/libelogind/sd-bus/GVARIANT-SERIALIZATION )
 
 PATCHES=(
 	"${FILESDIR}/${P}-nodocs.patch"
-	"${FILESDIR}/${P}-broken-test.patch" # bug 699116
+	"${FILESDIR}/${PN}-241.4-broken-test.patch" # bug 699116
 )
 
 pkg_setup() {
@@ -65,7 +64,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local rccgroupmode="$(grep rc_cgroup_mode \"${EPREFIX}/etc/rc.conf\" | cut -d '"' -f 2)"
+	local rccgroupmode="$(grep rc_cgroup_mode ${EPREFIX}/etc/rc.conf | cut -d '"' -f 2)"
 	local cgroupmode="legacy"
 
 	if [[ "xhybrid" = "x${rccgroupmode}" ]] ; then
diff --git a/sys-auth/elogind/files/elogind-243.4-selinux-missing-headers.patch b/sys-auth/elogind/files/elogind-243.4-selinux-missing-headers.patch
new file mode 100644
index 000000000000..7cc46fd05ebd
--- /dev/null
+++ b/sys-auth/elogind/files/elogind-243.4-selinux-missing-headers.patch
@@ -0,0 +1,36 @@
+From 1cd3fe4083eb8784fa2a125e4af0edb80e6928b5 Mon Sep 17 00:00:00 2001
+From: Sven Eden <sven.eden@prydeworx.com>
+Date: Thu, 12 Mar 2020 20:31:00 +0100
+Subject: [PATCH] basic/selinux-util.c : Uncomment missing includes (#157)
+
+Compiling on Debian unstable failed using gcc 9.2.1 and libc6 2.29.
+Uncommenting the two commented includes in basic/selinux-util.c
+fixes the compilation issues.
+
+Bug: #157
+Closes: #157
+Signed-off-by: Sven Eden <sven.eden@prydeworx.com>
+---
+ src/basic/selinux-util.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/basic/selinux-util.c b/src/basic/selinux-util.c
+index 40a85feec..3be9f2c0d 100644
+--- a/src/basic/selinux-util.c
++++ b/src/basic/selinux-util.c
+@@ -1,13 +1,13 @@
+ /* SPDX-License-Identifier: LGPL-2.1+ */
+ 
+ #include <errno.h>
+-//#include <fcntl.h>
++#include <fcntl.h>
+ #include <malloc.h>
+ #include <stddef.h>
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <sys/time.h>
+-//#include <sys/types.h>
++#include <sys/types.h>
+ #include <sys/un.h>
+ #include <syslog.h>
+ 
diff --git a/sys-auth/elogind/files/elogind-241.4-nodocs.patch b/sys-auth/elogind/files/elogind-243.7-nodocs.patch
index 299087483ced..0ec0aa37308a 100644
--- a/sys-auth/elogind/files/elogind-241.4-nodocs.patch
+++ b/sys-auth/elogind/files/elogind-243.7-nodocs.patch
@@ -1,24 +1,24 @@
 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 @@
+--- a/meson.build	2020-03-12 20:33:40.000000000 +0100
++++ b/meson.build	2020-03-12 22:46:08.020716935 +0100
+@@ -3352,15 +3352,11 @@
  # 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
+ #if 0 /// elogind has upgraded to markdown, and the NEWS file is useless
+ #              'NEWS',
  #              'README',
- #else
+ #else // 0
 -             'README.md',
  #endif // 0
 -             'docs/CODING_STYLE.md',
  #if 0 /// irrelevant for elogind
  #              'docs/DISTRO_PORTING.md',
  #              'docs/ENVIRONMENT.md',
-@@ -3359,8 +3354,6 @@
+@@ -3369,8 +3365,6 @@
  #              'docs/TRANSLATORS.md',
  #              'docs/UIDS-GIDS.md',
  #endif // 0