[gentoo-commits] repo/gentoo:master commit in: sys-fs/eudev/, sys-fs/eudev/files/

[Anthony G. Basile]

commit:     6e8f5be59e1c7aa86f91a96945f16bb15f6a58fa
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 19 23:16:34 2017 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Oct 19 23:19:17 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e8f5be5

sys-fs/eudev: fix build for =sys-libs/glibc-2.25-r7, bug #634062

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 sys-fs/eudev/eudev-3.1.5.ebuild                    |   2 +
 sys-fs/eudev/eudev-3.2.4.ebuild                    |   2 +
 .../files/eudev-include-sysmacros-header.patch     | 121 +++++++++++++++++++++
 3 files changed, 125 insertions(+)

diff --git a/sys-fs/eudev/eudev-3.1.5.ebuild b/sys-fs/eudev/eudev-3.1.5.ebuild
index 792ebe01221..10b380fda54 100644
--- a/sys-fs/eudev/eudev-3.1.5.ebuild
+++ b/sys-fs/eudev/eudev-3.1.5.ebuild
@@ -89,6 +89,8 @@ src_prepare() {
 	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
 	|| die "failed to change group dialout to uucp"
 
+	epatch "${FILESDIR}"/${PN}-include-sysmacros-header.patch
+
 	epatch_user
 	eautoreconf
 }

diff --git a/sys-fs/eudev/eudev-3.2.4.ebuild b/sys-fs/eudev/eudev-3.2.4.ebuild
index a864deb766c..5e4cf893273 100644
--- a/sys-fs/eudev/eudev-3.2.4.ebuild
+++ b/sys-fs/eudev/eudev-3.2.4.ebuild
@@ -89,6 +89,8 @@ src_prepare() {
 	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
 	|| die "failed to change group dialout to uucp"
 
+	eapply "${FILESDIR}"/${PN}-include-sysmacros-header.patch
+
 	eapply_user
 	eautoreconf
 }

diff --git a/sys-fs/eudev/files/eudev-include-sysmacros-header.patch b/sys-fs/eudev/files/eudev-include-sysmacros-header.patch
new file mode 100644
index 00000000000..ca622bff547
--- /dev/null
+++ b/sys-fs/eudev/files/eudev-include-sysmacros-header.patch
@@ -0,0 +1,121 @@
+diff -ruPN eudev-3.1.5.old/src/cdrom_id/cdrom_id.c eudev-3.1.5/src/cdrom_id/cdrom_id.c
+--- eudev-3.1.5.old/src/cdrom_id/cdrom_id.c	2015-09-11 14:54:26.000000000 -0400
++++ eudev-3.1.5/src/cdrom_id/cdrom_id.c	2017-10-11 21:45:10.929671748 -0400
+@@ -37,6 +37,7 @@
+ #include <sys/time.h>
+ #include <sys/ioctl.h>
+ #include <linux/cdrom.h>
++#include <sys/sysmacros.h>
+ 
+ #include "libudev.h"
+ #include "libudev-private.h"
+diff -ruPN eudev-3.1.5.old/src/libudev/libudev-device.c eudev-3.1.5/src/libudev/libudev-device.c
+--- eudev-3.1.5.old/src/libudev/libudev-device.c	2015-10-12 18:22:14.000000000 -0400
++++ eudev-3.1.5/src/libudev/libudev-device.c	2017-10-11 21:44:42.774672156 -0400
+@@ -32,6 +32,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <linux/sockios.h>
++#include <sys/sysmacros.h>
+ 
+ #include "libudev.h"
+ #include "libudev-private.h"
+diff -ruPN eudev-3.1.5.old/src/libudev/libudev-device-private.c eudev-3.1.5/src/libudev/libudev-device-private.c
+--- eudev-3.1.5.old/src/libudev/libudev-device-private.c	2015-09-11 14:54:26.000000000 -0400
++++ eudev-3.1.5/src/libudev/libudev-device-private.c	2017-10-11 21:44:39.445672204 -0400
+@@ -25,6 +25,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/stat.h>
++#include <sys/sysmacros.h>
+ 
+ #include "libudev.h"
+ #include "libudev-private.h"
+diff -ruPN eudev-3.1.5.old/src/libudev/libudev-enumerate.c eudev-3.1.5/src/libudev/libudev-enumerate.c
+--- eudev-3.1.5.old/src/libudev/libudev-enumerate.c	2015-09-11 14:54:26.000000000 -0400
++++ eudev-3.1.5/src/libudev/libudev-enumerate.c	2017-10-11 21:44:36.279672250 -0400
+@@ -28,6 +28,7 @@
+ #include <stdbool.h>
+ #include <sys/stat.h>
+ #include <sys/param.h>
++#include <sys/sysmacros.h>
+ 
+ #include "libudev.h"
+ #include "libudev-private.h"
+diff -ruPN eudev-3.1.5.old/src/scsi_id/scsi_serial.c eudev-3.1.5/src/scsi_id/scsi_serial.c
+--- eudev-3.1.5.old/src/scsi_id/scsi_serial.c	2015-09-11 14:54:26.000000000 -0400
++++ eudev-3.1.5/src/scsi_id/scsi_serial.c	2017-10-11 21:45:20.195671614 -0400
+@@ -36,6 +36,7 @@
+ #include <scsi/sg.h>
+ #include <linux/types.h>
+ #include <linux/bsg.h>
++#include <sys/sysmacros.h>
+ 
+ #include "libudev.h"
+ #include "libudev-private.h"
+diff -ruPN eudev-3.1.5.old/src/udev/udevadm-info.c eudev-3.1.5/src/udev/udevadm-info.c
+--- eudev-3.1.5.old/src/udev/udevadm-info.c	2015-09-11 14:54:26.000000000 -0400
++++ eudev-3.1.5/src/udev/udevadm-info.c	2017-10-11 21:44:33.032672297 -0400
+@@ -28,6 +28,7 @@
+ #include <fcntl.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ 
+ #include "udev.h"
+ #include "udev-util.h"
+diff -ruPN eudev-3.1.5.old/src/udev/udevd.c eudev-3.1.5/src/udev/udevd.c
+--- eudev-3.1.5.old/src/udev/udevd.c	2015-10-12 18:22:14.000000000 -0400
++++ eudev-3.1.5/src/udev/udevd.c	2017-10-11 21:44:59.791671910 -0400
+@@ -45,6 +45,7 @@
+ #include <sys/ioctl.h>
+ #include <sys/inotify.h>
+ #include <sys/utsname.h>
++#include <sys/sysmacros.h>
+ 
+ #include "udev.h"
+ #include "udev-util.h"
+diff -ruPN eudev-3.1.5.old/src/udev/udev-event.c eudev-3.1.5/src/udev/udev-event.c
+--- eudev-3.1.5.old/src/udev/udev-event.c	2015-10-12 18:22:14.000000000 -0400
++++ eudev-3.1.5/src/udev/udev-event.c	2017-10-11 21:44:29.652672346 -0400
+@@ -33,6 +33,7 @@
+ #include <sys/socket.h>
+ #include <sys/signalfd.h>
+ #include <linux/sockios.h>
++#include <sys/sysmacros.h>
+ 
+ #include "udev.h"
+ 
+diff -ruPN eudev-3.1.5.old/src/udev/udev-node.c eudev-3.1.5/src/udev/udev-node.c
+--- eudev-3.1.5.old/src/udev/udev-node.c	2015-09-11 14:54:26.000000000 -0400
++++ eudev-3.1.5/src/udev/udev-node.c	2017-10-11 21:44:25.864672401 -0400
+@@ -28,6 +28,7 @@
+ #include <sys/time.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ 
+ #include "udev.h"
+ #include "smack-util.h"
+diff -ruPN eudev-3.1.5.old/src/udev/udev-rules.c eudev-3.1.5/src/udev/udev-rules.c
+--- eudev-3.1.5.old/src/udev/udev-rules.c	2015-10-12 18:22:14.000000000 -0400
++++ eudev-3.1.5/src/udev/udev-rules.c	2017-10-11 21:44:21.611672463 -0400
+@@ -28,6 +28,7 @@
+ #include <dirent.h>
+ #include <fnmatch.h>
+ #include <time.h>
++#include <sys/sysmacros.h>
+ 
+ #include "udev.h"
+ #include "path-util.h"
+diff -ruPN eudev-3.1.5.old/test/test-libudev.c eudev-3.1.5/test/test-libudev.c
+--- eudev-3.1.5.old/test/test-libudev.c	2015-09-11 14:54:26.000000000 -0400
++++ eudev-3.1.5/test/test-libudev.c	2017-10-11 21:45:27.782671504 -0400
+@@ -27,6 +27,7 @@
+ #include <getopt.h>
+ #include <fcntl.h>
+ #include <sys/epoll.h>
++#include <sys/sysmacros.h>
+ 
+ #include "libudev.h"
+ #include "udev-util.h"