gentoo resync : 18.11.2018

4 files changed, 7 insertions, 60 deletions

diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index 8a324e6af675..342d56e2c9c3 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -1,9 +1,8 @@
 AUX elogind-238.1-docs.patch 793 BLAKE2B eb6683d5bf221459fb0ff0aab6f10f179769bcaf6a914f6b41f8526ee2075924f80cee1cd320aa7697d60bed24d5652e6bc8c02451a0da98c4b29cb8a73641ce SHA512 16503a616b511e4cf049260c34b1390844ce06b22a99e31813b11886d1dc12c90aa46b3dc67343b2a33df85923b5cd6116d7338ee9bd32f2d7a9be9db934ca74
-AUX elogind-238.1-meson-0.48.patch 1749 BLAKE2B 4c1174484c75fb33702d47110b95a97ee231756369b39775c1d03a3d4d56b3c48e3b8b9ab71e14c1e5ed667b62b12c999b2edc168b546de45e07fbcc1be7c088 SHA512 d1a97303a4498dc9adf671c2cc150fa1a1391dffa5830f6f9ef4ddf4f0f9f00e4ca700a7f2d500d5de29eed4327b11acdbee92bfd261dc26c3f1243cd179f9b4
 AUX elogind.conf.in 218 BLAKE2B 7ee0a72c4a628a233fdbb2d3104487859aaa7e5c4f2624e5a4eafb37ed90fb8f64349b1a8acc92e69ec618496bb7f6263b7a5d0fe15a1afe1c03f5955743f079 SHA512 2c62ab28d7db9cd52489069f80363159000385a25dd7f2afe5a03598a0b7a1f61af7c18df71f6286e72f5966e55b62a4029e30cb786dd813bb201b9e20adccd7
 AUX elogind.init 490 BLAKE2B 71c102f89a71a2963da50b153d8696a9480d81caa48e8422e7f39614e9bfb0b09037bc4dea202c3735e170140752429dd54747b99941d861453b4714dcb98819 SHA512 60fe1cb55ec0f605f06fb3744a0300accebfc14c4ecd24b7db2e8b0cb1537e816a4a4ccbc4b2eeac45e2f3ca8942dd10d24bdcd814cccbc2ceed198b2657238a
-DIST elogind-238.1.tar.gz 1074179 BLAKE2B 3041e9cfa0d454f653db164db8e59af4db5f3821bbb65cb5482d83f63e410612e121791f7ef3e08c9ac3940c7b6c7931df2b072ba452d2073c3e424e4dfe10c3 SHA512 ba0a74e9b9168b08a54b13ed500e9c713c48bb1648aa6064dbe666a96fa3fbd5b69447c35f686db3a1813476a5585be34b1ae13e3c9017eac8171b73f6311c4c
 DIST elogind-238.2.tar.gz 1075847 BLAKE2B 17e4d8ffabb65a210f34076223e502c9019a7fa639f6cc12b1c8a0e186d8a6e97f115cd68487c86470915a8208dead6830577d2da3ffd85ed2e12c3a699ef2c5 SHA512 c66dd514d7c708a1d1c52ac9f25f34af839c4d4ff452302b40eb95c040c1d3d8d238b4e35c33d81af71f6aac22c8793951d91d005e6595e02124edb976baf640
-EBUILD elogind-238.1.ebuild 3507 BLAKE2B 7f90251cecf01c57d24e4a7ef473acdcdc5ef1e39b0d51ca3a1d69d89518682f6ec0e4dbb3659ba21b4bc183a4667123b0e1d58777c122514c4d3306bcd2f370 SHA512 34e14cefed34dca89a15d222d90cebf588986bb866e2a40a24e10208025ad1a2ce6052b3110333f1f13a962be268c1ee6b9931450acf56ba571c8331a62a8e9f
-EBUILD elogind-238.2.ebuild 3472 BLAKE2B d13dc04b85a88a4431e48fd3b7a31fabd10639e3a803d77cb2aa8d52a0300bc1f56474131a8a5ed49d9e7d09409fae18f75c410dbb2d9ff5ece3e04c3b292fa3 SHA512 ef2873bc8d9bd60f130036de42b553d0111a76c4d7b6db5aed021b04551eb9f73a2efbbef1290dabe4e122468c1782a3316b9b79ff01b8b4626926c11d89a461
+DIST elogind-239.1.tar.gz 1123754 BLAKE2B e75a48c28ff17e946e3ac4b7d3d19f1798fd1812da6c1d1f2ac8917865331563ea3bce73bbe4d7591bd7caddaf11e4272b3c1a82b6128e99e8dfe2528a2e8e38 SHA512 282a5d9a809ce55a03f650dd235529c24254a20495c61e33f802390787486d9b303da8983fd7e28beaf3cdd2fed9497bd897c202d38ef0182d4b4c632d4d2f62
+EBUILD elogind-238.2.ebuild 3470 BLAKE2B 85e9183f674fc4d40f4c617b7387a07eb10ebfc191cc79d407b168d0d454867558b4950a9fe085291ae09328b4fb0dd76c482b504f24e18318326dd88c1c109f SHA512 264f2fd1f695a183f20e300a781cb740617812a0d907c06a4d1c8b6276504450379e7cc0ed8762d1caf615c0cbdd0ef10ae900e9b4900cbafe7abba15d1b234d
+EBUILD elogind-239.1.ebuild 3428 BLAKE2B 445b22ec9c8c3a2cc4a6b4b0ce60f44f86b3ba2b984e314fe5cd55e00151310a217318d4f7b1ff41f9c06be7527c0c323b18c6b86edf09ca3d10322f9542c009 SHA512 fef3919552f9bea4e3b87f8c2cac9495424f35c07e64d822f46938bf0df492dc6448053424c59764e32d4598a744926a761bb3cb288ed39654958c390a9fbf3f
 MISC metadata.xml 379 BLAKE2B fc63654412fa4cb02122205ad53d29ed35153457c5dd5c5ab8fa3c3dbfcc7c00b2704220d4cb9040f8d6f794bbb9bd0f8cb9be80d410efb6cf85eeee8ce46503 SHA512 30be0eb7903ffb83d9e24fbcacc8db09c0f8cd7187df5f75b2c12fb5cfae1110d52f29aba502ea92af53df02451cc40e0f3789382f87a16bd281f06e9cad6c68
diff --git a/sys-auth/elogind/elogind-238.2.ebuild b/sys-auth/elogind/elogind-238.2.ebuild
index 83c977d1eb23..8717f7ddfe87 100644
--- a/sys-auth/elogind/elogind-238.2.ebuild
+++ b/sys-auth/elogind/elogind-238.2.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="
diff --git a/sys-auth/elogind/elogind-238.1.ebuild b/sys-auth/elogind/elogind-239.1.ebuild
index 176b4b39bba9..f9136f937f10 100644
--- a/sys-auth/elogind/elogind-238.1.ebuild
+++ b/sys-auth/elogind/elogind-239.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="
@@ -41,17 +41,12 @@ PDEPEND="
 
 DOCS=( src/libelogind/sd-bus/GVARIANT-SERIALIZATION )
 
-PATCHES=(
-	"${FILESDIR}/${P}-docs.patch"
-	"${FILESDIR}/${P}-meson-0.48.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-238.1-docs.patch" )
 
 pkg_setup() {
 	local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD"
 
-	if use kernel_linux; then
-		linux-info_pkg_setup
-	fi
+	use kernel_linux && linux-info_pkg_setup
 }
 
 src_prepare() {
@@ -85,7 +80,6 @@ src_configure() {
 		-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)
diff --git a/sys-auth/elogind/files/elogind-238.1-meson-0.48.patch b/sys-auth/elogind/files/elogind-238.1-meson-0.48.patch
deleted file mode 100644
index ea4ce0f8f933..000000000000
--- a/sys-auth/elogind/files/elogind-238.1-meson-0.48.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 63c4b947c4fddbefd8d35acf6dffdaf34d6077ee Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
-Date: Sun, 19 Aug 2018 19:11:30 +0200
-Subject: [PATCH] meson: rename -Ddebug to -Ddebug-extra
-
-Meson added -Doptimization and -Ddebug options, which obviously causes
-a conflict with our -Ddebug options. Let's rename it.
-
-Fixes #76.
----
- meson.build       | 2 +-
- meson_options.txt | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 05a257d1f..117af9e5e 100644
---- a/meson.build
-+++ b/meson.build
-@@ -936,7 +936,7 @@ conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
- # substs.set('DEBUGTTY', get_option('debug-tty'))
- #endif // 0
- 
--debug = get_option('debug')
-+debug = get_option('debug-extra')
- enable_debug_hashmap = false
- enable_debug_mmap_cache = false
- #if 1 /// additional elogind debug mode
-diff --git a/meson_options.txt b/meson_options.txt
-index 84100b629..f12b542e5 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -77,12 +77,12 @@ option('kexec-path', type : 'string', description : 'path to kexec')
- #        description : 'path to debug shell binary')
- # option('debug-tty', type : 'string', value : '/dev/tty9',
- #        description : 'specify the tty device for debug shell')
--# option('debug', type : 'string',
-+# option('debug-extra', type : 'string',
- #        description : 'enable extra debugging (hashmap,mmap-cache)')
- # option('memory-accounting-default', type : 'boolean',
- #        description : 'enable MemoryAccounting= by default')
- #else
--option('debug', type : 'string',
-+option('debug-extra', type : 'string',
-        description : 'enable extra debugging (elogind,hashmap,mmap-cache)')
- #endif // 0
- 
\ No newline at end of file