[gentoo-commits] repo/gentoo:master commit in: sys-apps/fbset/, sys-apps/fbset/files/

[gentoo-commits] repo/gentoo:master commit in: sys-apps/fbset/, sys-apps/fbset/files/

[Steve Arnold]

commit:     460e5389d2fb5003af2741d50ea347be9e7f104c
Author:     Stephen L Arnold <nerdboy <AT> gentoo <DOT> org>
AuthorDate: Fri Apr  6 06:16:31 2018 +0000
Commit:     Steve Arnold <nerdboy <AT> gentoo <DOT> org>
CommitDate: Fri Apr  6 06:58:09 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=460e5389

sys-apps/fbset: add types patch for musl, update EAPI and copyright date

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-apps/fbset/fbset-2.1.ebuild                        | 10 ++++++----
 sys-apps/fbset/files/fbset-2.1-add-linux-types-h.patch | 11 +++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/sys-apps/fbset/fbset-2.1.ebuild b/sys-apps/fbset/fbset-2.1.ebuild
index cd50cd3945d..1c334fdbfb9 100644
--- a/sys-apps/fbset/fbset-2.1.ebuild
+++ b/sys-apps/fbset/fbset-2.1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 inherit toolchain-funcs flag-o-matic eutils
 
 DESCRIPTION="A utility to set the framebuffer videomode"
@@ -16,10 +18,10 @@ DEPEND="sys-devel/bison
 	sys-devel/flex"
 RDEPEND=""
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+src_prepare() {
 	epatch "${FILESDIR}/${P}-build.patch"
+	epatch "${FILESDIR}/${P}-add-linux-types-h.patch"
+	default
 }
 
 src_compile() {

diff --git a/sys-apps/fbset/files/fbset-2.1-add-linux-types-h.patch b/sys-apps/fbset/files/fbset-2.1-add-linux-types-h.patch
new file mode 100644
index 00000000000..589d61b0ee8
--- /dev/null
+++ b/sys-apps/fbset/files/fbset-2.1-add-linux-types-h.patch
@@ -0,0 +1,11 @@
+--- a/fbset.h	2018-04-05 18:17:18.292975594 +0000
++++ b/fbset.h	2018-04-05 18:22:20.448747231 +0000
+@@ -17,6 +17,8 @@
+ 
+ #ifdef __GLIBC__
+ #include <asm/types.h>
++#else
++#include <linux/types.h>
+ #endif
+ 
+ #define VERSION         "Linux Frame Buffer Device Configuration " \