gentoo resync : 04.12.2017

4 files changed, 34 insertions, 3 deletions

diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 28f4f4222915..c81a0537db34 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index 71e3ca57a104..78b3dbce3799 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -1,8 +1,9 @@
 AUX elogind-226.4-docs.patch 355 BLAKE2B 6e2ffcfe0e4b8d8822cb41133302757cc02c09298dd53cb4eb277b3e3200764f6beb90d4a702870e00d0ff5338cb5a0a7d228a563a6f9c51fb340e4c63650a59 SHA512 dc942f190ea2064e194808db7c6ede618d536778f1b574658ddb9c0aa4a106f6129cc18000eaa63aeca1b16ad28fe5f5dbee441bd93436ae62eb4740236f94ae
+AUX elogind-233.7-xlocale.h.patch 746 BLAKE2B 82dd29dbbc9269879bd9d641b3735d781f7c61980c6749aa611083a26cf8344d8a3e7cf01557b41f696cd7f079c4f31822efb26efb64e131cd364a9e76ce28a5 SHA512 90fa911c0ea7bc49893473e3068206a4c83e35982eb15316bf8f07644e98d3248767ee2d8723e0a7f37177b047ee21d1fdc1593f87dab9e8e8bdebe04c9bb47f
 AUX elogind.conf.in 218 BLAKE2B 7ee0a72c4a628a233fdbb2d3104487859aaa7e5c4f2624e5a4eafb37ed90fb8f64349b1a8acc92e69ec618496bb7f6263b7a5d0fe15a1afe1c03f5955743f079 SHA512 2c62ab28d7db9cd52489069f80363159000385a25dd7f2afe5a03598a0b7a1f61af7c18df71f6286e72f5966e55b62a4029e30cb786dd813bb201b9e20adccd7
 AUX elogind.init 490 BLAKE2B 71c102f89a71a2963da50b153d8696a9480d81caa48e8422e7f39614e9bfb0b09037bc4dea202c3735e170140752429dd54747b99941d861453b4714dcb98819 SHA512 60fe1cb55ec0f605f06fb3744a0300accebfc14c4ecd24b7db2e8b0cb1537e816a4a4ccbc4b2eeac45e2f3ca8942dd10d24bdcd814cccbc2ceed198b2657238a
-DIST elogind-233.7.tar.gz 957308 SHA256 8854f29a53d1305dc1c264635b1e970cfcbcc32507af8ef35de4a9b447f79e0b SHA512 c4ca84d45c289131f2b9d698d0e010fb368da39e80a9a972822148509644727a5e420ec2c68dc896bd250e81bdb125b4d760b0a65a4444365c81af2da9555a78 WHIRLPOOL 597f43c47ff630ec408f99c3d7e88622fc179f542772d800af09691734882bede81ab2d54ea51de21de08be568500477e2688579f9d244ddc11bd282a6678fce
+DIST elogind-233.7.tar.gz 957308 BLAKE2B 65361c349771bdb3e28b417e5f5c180505209f215edce316e8131bdc78cb7a1b56c0285df8aa3fd6998c6ea2c349d9892a4f791b59f9ae245819492783099d61 SHA512 c4ca84d45c289131f2b9d698d0e010fb368da39e80a9a972822148509644727a5e420ec2c68dc896bd250e81bdb125b4d760b0a65a4444365c81af2da9555a78
 DIST elogind-234.4.tar.gz 973370 BLAKE2B 4fe00d2e22e3f94dfb6385fe61825be72ad2200f1368807ea816a971104cf384e3508ecf2877fa08394c6d0259874b2ceb7c4014f9e861dcd3b19c01bcd04602 SHA512 2df4fa318074d4f5e5dbba353cf817068a2703ffed40cdeae4cba2dea4ee143d1c5fc076b19419f1c4299392088c2c14b430d8aa1ded03b62117311802305d5e
-EBUILD elogind-233.7-r1.ebuild 2941 BLAKE2B bb2b36092014397a2674a678945a06dbfbb88d4630bf9c3e519f66b10ce8dc191d443f91a6d73478a45caf37b1ae318540610967c83da7cb85e5f7fc73e52da2 SHA512 269dbe822cbec66c32e30ba3a1009bb88a089447ad8015c6e568d1e86ff1d820891eda818666aa13aeb6c56edff46b841d0f16091e42be1c4560229fb62efe88
+EBUILD elogind-233.7-r1.ebuild 2978 BLAKE2B d62324cfa19609e903c508c34f1ee423656c8a222a0a0bc7fa3103a7c3c0288ea797be6108e381a08b1dd811db00de047571ce1d502e8bc53bcb643f8b55f063 SHA512 f5125a3d1f72d664ca66e7358ac7454bccc2775da23ce75363c74a90174d3d079476b52fb72caa316b488da64577aec1a0b07ae702d0cacd0714e2c92b4c659a
 EBUILD elogind-234.4-r1.ebuild 2922 BLAKE2B 277308df2fcacb0a31a9b8441fff11bf3a838244bb43ec463471bcdb55b8c7384d21a662ac0127aa2b506808efc94512edadad80824cc14bf911f38399255661 SHA512 6905190b3a9c5dbbb70bf31a48898a9492605e096532167633f7d6528f149f4e908081cf5b52a11e7cfabbe85ea7068fb0d224d0a4129671fc731d8fb4dfd56f
 MISC metadata.xml 379 BLAKE2B fc63654412fa4cb02122205ad53d29ed35153457c5dd5c5ab8fa3c3dbfcc7c00b2704220d4cb9040f8d6f794bbb9bd0f8cb9be80d410efb6cf85eeee8ce46503 SHA512 30be0eb7903ffb83d9e24fbcacc8db09c0f8cd7187df5f75b2c12fb5cfae1110d52f29aba502ea92af53df02451cc40e0f3789382f87a16bd281f06e9cad6c68
diff --git a/sys-auth/elogind/elogind-233.7-r1.ebuild b/sys-auth/elogind/elogind-233.7-r1.ebuild
index 6a9df040c51d..bd3cac33ad8b 100644
--- a/sys-auth/elogind/elogind-233.7-r1.ebuild
+++ b/sys-auth/elogind/elogind-233.7-r1.ebuild
@@ -40,7 +40,10 @@ PDEPEND="
 	policykit? ( sys-auth/polkit )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-226.4-docs.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-226.4-docs.patch"
+	"${FILESDIR}/${P}-xlocale.h.patch"
+)
 
 pkg_setup() {
 	local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SECURITY_SMACK
diff --git a/sys-auth/elogind/files/elogind-233.7-xlocale.h.patch b/sys-auth/elogind/files/elogind-233.7-xlocale.h.patch
new file mode 100644
index 000000000000..c95890aac405
--- /dev/null
+++ b/sys-auth/elogind/files/elogind-233.7-xlocale.h.patch
@@ -0,0 +1,27 @@
+From 96eb328e90fa272a66b2feb0bfb57c73154dbd9c Mon Sep 17 00:00:00 2001
+From: Matija Skala <mskala@gmx.com>
+Date: Wed, 15 Mar 2017 13:21:10 +0100
+Subject: [PATCH] fix includes
+
+linux/sockios.h is needed for the SIOCGSTAMPNS macro
+
+xlocale.h is included indirectly in glibc and doesn't even exist in
+other libcs
+---
+ src/basic/parse-util.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
+index cfdb29aba..c38e14d96 100644
+--- a/src/basic/parse-util.c
++++ b/src/basic/parse-util.c
+@@ -23,9 +23,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#if defined(__GLIBC__)
+-#  include <xlocale.h>
+-#endif // defined(__GLIBC__)
+ 
+ #include "alloc-util.h"
+ //#include "extract-word.h"