commit: 39354fee2a5d300e1bbe9809e905c7f3d0430a69
Author: Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 08:07:48 2017 +0000
Commit: Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 08:08:18 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39354fee
sys-fs/eudev: Fix building with newer gperf
Package-Manager: Portage-2.3.3, Repoman-2.3.1
.../{eudev-3.2.1.ebuild => eudev-3.2.1-r1.ebuild} | 6 ++++--
sys-fs/eudev/eudev-3.2.1.ebuild | 4 ++--
sys-fs/eudev/files/eudev-fix-new-gperf.patch | 22 ++++++++++++++++++++++
3 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/sys-fs/eudev/eudev-3.2.1.ebuild
b/sys-fs/eudev/eudev-3.2.1-r1.ebuild
similarity index 97%
copy from sys-fs/eudev/eudev-3.2.1.ebuild
copy to sys-fs/eudev/eudev-3.2.1-r1.ebuild
index 7e2730d6c9..ba610df29c 100644
--- a/sys-fs/eudev/eudev-3.2.1.ebuild
+++ b/sys-fs/eudev/eudev-3.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -35,7 +35,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.20
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
)"
DEPEND="${COMMON_DEPEND}
- dev-util/gperf
+ >=dev-util/gperf-3.1
virtual/os-headers
virtual/pkgconfig
>=sys-devel/make-3.82-r4
@@ -86,6 +86,8 @@ pkg_setup() {
}
src_prepare() {
+ # upstream fix for new gperf versions
+ epatch "${FILESDIR}/${PN}-fix-new-gperf.patch"
# change rules back to group uucp instead of dialout for now
sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
|| die "failed to change group dialout to uucp"
diff --git a/sys-fs/eudev/eudev-3.2.1.ebuild b/sys-fs/eudev/eudev-3.2.1.ebuild
index 7e2730d6c9..bd55e86916 100644
--- a/sys-fs/eudev/eudev-3.2.1.ebuild
+++ b/sys-fs/eudev/eudev-3.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -35,7 +35,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.20
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
)"
DEPEND="${COMMON_DEPEND}
- dev-util/gperf
+ <dev-util/gperf-3.1
virtual/os-headers
virtual/pkgconfig
>=sys-devel/make-3.82-r4
diff --git a/sys-fs/eudev/files/eudev-fix-new-gperf.patch
b/sys-fs/eudev/files/eudev-fix-new-gperf.patch
new file mode 100644
index 0000000000..b9c6c38eae
--- /dev/null
+++ b/sys-fs/eudev/files/eudev-fix-new-gperf.patch
@@ -0,0 +1,22 @@
+From 5bab4d8de0dcbb8e2e7d4d5125b4aea1652a0d60 Mon Sep 17 00:00:00 2001
+From: "Anthony G. Basile" <[email protected]>
+Date: Thu, 5 Jan 2017 16:21:17 -0500
+Subject: [PATCH] src/udev/udev-builtin-keyboard.c: fix build with gperf 3.1
+
+Signed-off-by: Anthony G. Basile <[email protected]>
+---
+ src/udev/udev-builtin-keyboard.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/udev/udev-builtin-keyboard.c
b/src/udev/udev-builtin-keyboard.c
+index 73171c3..fad3520 100644
+--- a/src/udev/udev-builtin-keyboard.c
++++ b/src/udev/udev-builtin-keyboard.c
+@@ -28,7 +28,6 @@
+
+ #include "udev.h"
+
+-static const struct key *keyboard_lookup_key(const char *str, unsigned len);
+ #include "keyboard-keys-from-name.h"
+ #include "keyboard-keys-to-name.h"
+
