gentoo resync : 21.10.2017

3 files changed, 73 insertions, 4 deletions

diff --git a/sys-apps/systemd-readahead/Manifest b/sys-apps/systemd-readahead/Manifest
index c52e279ff60d..bad80511a70d 100644
--- a/sys-apps/systemd-readahead/Manifest
+++ b/sys-apps/systemd-readahead/Manifest
@@ -1,5 +1,6 @@
+AUX systemd-readahead-216-sysmacros.patch 1814 SHA256 7f61b1a487d834cd0896fc700a283f00b617ab239d978ea3972592c91ddb5309 SHA512 e48c013913b4db636f070d045eb65dff193d0b5cd25a0d1c98ed62b4071bc6925dce7c835341122fd6e0dc3136d11a8fa4ed35332a8b44ffb6f13195db9d6763 WHIRLPOOL c403dd522c735c88421584317ba97a553232d070460654f00a3d75e43c05ef5025c2a02dfb39e4d45554dbfa81b0127540b85f9246ae3c0a79ee6720290289b4
 DIST systemd-216.tar.xz 3612960 SHA256 945d3db7d840d6ffe98aa68394428e13317161ae79905397faab6671619728f3 SHA512 f4eee6664368168eafd61939f1355ac21c7eeecce6247de98ef36f40bb6a942d12c006ced4ee15f3d8f11699c194990222d5a5115b45f2aa81f2a1abafebbdd2 WHIRLPOOL 505e09b55209a4f9d8cec077970571b2e1298e8db02946a6c79df139dece9d1a08e46c86ef6c8053274abfd46c9a5ea09157f5bc9dc1f7461322c596e84ef494
-EBUILD systemd-readahead-216.ebuild 4183 SHA256 336529b89b3992e9138afe5f543dace0c863ea986be053e60e11f73d82e41ada SHA512 c54289a199d7d448afdaa83cc2f341bff37544398bb062fe7f36a1a0a0b4054c89532f0d427d2cce9df6979706c401a0560dfd89e4158f404534a622a815dd11 WHIRLPOOL 0d5ac928ec69f58d1d664466d44505f4643b25159515fa8c52731ceeeeb5dd44d93e33c8f5f50f5808868ed299590b3020410aba4c0bd605d3c529f237a2a6dd
+EBUILD systemd-readahead-216.ebuild 4306 SHA256 d9dfe7c48df7235410c97b5f9c289b5968de68cd1f35ce9b99c135e562c1ed3a SHA512 b7ce0255c5620821294ae1781fe5ea38993edd6b32fa55a0dda33be87170d7611064a684a6ae1824e18fa50f7c60a10eff19dfbeb4ddad73cc1888c1dfe3a167 WHIRLPOOL e147e8c810ad2d3b7a159f55ebaedef25f90ca8e42488bf6c416e0b4330c075dd31e8160789ae5656b047d9870e83e23d097b024a5b42c40d845082c6c8ef769
 MISC ChangeLog 3033 SHA256 e075c48a70faeea7e7aff920f696b02bf0df2ebc8533a334e6f963cf1924e6a3 SHA512 fbd75e7204eb31124f207a54492559b2e602e762ae43d44934a5e5d0afc93a83175b83c2f267f1944fc8ee44ac6e2243f9c78863ef26bf95d9c8cab22aa8b1e2 WHIRLPOOL 649f8f5c5f166924bdbfc33c648fa2c10355f420692fdce6abbd43b5537a731a8577f9add759cd58bb910e5978d82790a84637b9331ec7c62af53b8df4a75e6b
 MISC ChangeLog-2015 469 SHA256 c0b861226a2fd82476ff5473a54e775a16fee4783b3a31013622b0daaa96ebfe SHA512 6603b1bc3332d7fce063049ca1d0ccac9be4589e23d69a51005282bbaa75b3bdde2db1fa5b74e691046872e101d6a530a17fa045c9e485e5af7d21cce76ca4e7 WHIRLPOOL f0293c3e877295f7cf11482ffacdec0e50f7fce5bd1593a3b3c457b28edc6e44e6e1114b7b382d778c52d7da150270db019ff3bddfdccf08147a703854b9ba32
 MISC metadata.xml 243 SHA256 c2902f16dc6be36b40d0e76de3275bf3ccdea37d5f0522492f5f5a624b2e9285 SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a WHIRLPOOL 2279bba195f44213fecf0414bb604a75ae7487b85697f97d4325054f67fdfce2809e751a39b6dc677e5e42a9cdb136409b846597841f2e759485e38e2c5a921a
diff --git a/sys-apps/systemd-readahead/files/systemd-readahead-216-sysmacros.patch b/sys-apps/systemd-readahead/files/systemd-readahead-216-sysmacros.patch
new file mode 100644
index 000000000000..61cda995af4b
--- /dev/null
+++ b/sys-apps/systemd-readahead/files/systemd-readahead-216-sysmacros.patch
@@ -0,0 +1,61 @@
+Backported to 216 adapting headers locations
+
+From 27d13af71c3af6b2f9b60556d2c046dbb6e36e23 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Mon, 14 Mar 2016 17:44:49 -0400
+Subject: [PATCH] include sys/sysmacros.h in more places
+
+Since glibc is moving away from implicitly including sys/sysmacros.h
+all the time via sys/types.h, include the header directly in more
+places.  This seems to cover most makedev/major/minor usage.
+---
+ src/shared/macro.h       | 1 +
+ src/shared/util.h        | 1 +
+ src/libudev/libudev.h   | 1 +
+ src/udev/udev.h         | 1 +
+ 5 files changed, 5 insertions(+)
+
+diff --git a/src/shared/macro.h b/src/shared/macro.h
+index c34441d75d..b36a95675a 100644
+--- a/src/shared/macro.h
++++ b/src/shared/macro.h
+@@ -23,6 +23,7 @@
+ #include <inttypes.h>
+ #include <stdbool.h>
+ #include <sys/param.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ 
+ #define _printf_(a,b) __attribute__ ((format (printf, a, b)))
+diff --git a/src/libudev/libudev.h b/src/libudev/libudev.h
+index eb58740d26..3f6d0ed16c 100644
+--- a/src/libudev/libudev.h
++++ b/src/libudev/libudev.h
+@@ -21,6 +21,7 @@
+ #define _LIBUDEV_H_
+ 
+ #include <stdarg.h>
++#include <sys/sysmacros.h>
+ #include <sys/types.h>
+ 
+ #ifdef __cplusplus
+--- a/src/shared/util.h~  2014-08-19 16:47:52.000000000 +0200
++++ b/src/shared/util.h   2017-10-21 17:58:54.294946349 +0200
+@@ -35,6 +35,7 @@
+ #include <limits.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ #include <dirent.h>
+ #include <sys/resource.h>
+ #include <stddef.h>
+--- a/src/udev/udev.h~    2014-07-29 19:51:00.000000000 +0200
++++ b/src/udev/udev.h     2017-10-21 17:59:50.026412561 +0200
+@@ -20,6 +20,7 @@
+ 
+ #include <sys/types.h>
+ #include <sys/param.h>
++#include <sys/sysmacros.h>
+ #include <signal.h>
+ 
+ #include "macro.h"
diff --git a/sys-apps/systemd-readahead/systemd-readahead-216.ebuild b/sys-apps/systemd-readahead/systemd-readahead-216.ebuild
index e29293a0a6cc..e256882d9165 100644
--- a/sys-apps/systemd-readahead/systemd-readahead-216.ebuild
+++ b/sys-apps/systemd-readahead/systemd-readahead-216.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 inherit systemd toolchain-funcs udev
 
 DESCRIPTION="Split of readahead systemd implementation"
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
-S=${WORKDIR}/systemd-${PV}
+S="${WORKDIR}/systemd-${PV}"
 
 RDEPEND=">=sys-apps/systemd-217:="
 DEPEND="${RDEPEND}
@@ -26,7 +26,14 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+PATCHES=(
+	# https://github.com/systemd/systemd/pull/2838 , bug #604614
+	"${FILESDIR}/${P}-sysmacros.patch"
+)
+
 src_prepare() {
+	default
+
 	# systemd-notify no longer supports readahead playing
 	sed -i -e 's:ExecStart=@SYSTEMD_NOTIFY@ --readahead=done:ExecStart=/bin/touch /run/systemd/readahead/done:' \
 		units/systemd-readahead-done.service.in || die