gentoo resync : 22.10.2018

3 files changed, 53 insertions, 3 deletions

diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index b71411f0417f..28362553938f 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -1,6 +1,7 @@
 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
-EBUILD elogind-238.1.ebuild 3472 BLAKE2B e0be747f257ee41fabb5294e16aef69f4d071aa04b6bf6dad05b67648957b69a41f99d80515d37a038fa11e539d657dac23fab4fe757365974d691b2914354bc SHA512 907afc4f04ad48b7eb9ea278e6ea116639c5d27d71f52b1dbe236f3b4016cff1fa5323686b27d27723589c86479922c0801ea9aa0d0596b2931a82615d912a08
+EBUILD elogind-238.1.ebuild 3507 BLAKE2B 7f90251cecf01c57d24e4a7ef473acdcdc5ef1e39b0d51ca3a1d69d89518682f6ec0e4dbb3659ba21b4bc183a4667123b0e1d58777c122514c4d3306bcd2f370 SHA512 34e14cefed34dca89a15d222d90cebf588986bb866e2a40a24e10208025ad1a2ce6052b3110333f1f13a962be268c1ee6b9931450acf56ba571c8331a62a8e9f
 MISC metadata.xml 379 BLAKE2B fc63654412fa4cb02122205ad53d29ed35153457c5dd5c5ab8fa3c3dbfcc7c00b2704220d4cb9040f8d6f794bbb9bd0f8cb9be80d410efb6cf85eeee8ce46503 SHA512 30be0eb7903ffb83d9e24fbcacc8db09c0f8cd7187df5f75b2c12fb5cfae1110d52f29aba502ea92af53df02451cc40e0f3789382f87a16bd281f06e9cad6c68
diff --git a/sys-auth/elogind/elogind-238.1.ebuild b/sys-auth/elogind/elogind-238.1.ebuild
index cc148ee6f8da..176b4b39bba9 100644
--- a/sys-auth/elogind/elogind-238.1.ebuild
+++ b/sys-auth/elogind/elogind-238.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -41,7 +41,10 @@ PDEPEND="
 
 DOCS=( src/libelogind/sd-bus/GVARIANT-SERIALIZATION )
 
-PATCHES=( "${FILESDIR}/${P}-docs.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-docs.patch"
+	"${FILESDIR}/${P}-meson-0.48.patch"
+)
 
 pkg_setup() {
 	local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD"
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
new file mode 100644
index 000000000000..ea4ce0f8f933
--- /dev/null
+++ b/sys-auth/elogind/files/elogind-238.1-meson-0.48.patch
@@ -0,0 +1,46 @@
+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