From: Arjan Adriaanse <arjan@adriaan.se>
Date: Mon, 4 May 2020 02:38:13 +0000 (+0200)
Subject: app-misc/gtypist: fix crash and upgrade EAPI
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b7994d5cdc2b;p=gentoo.git

app-misc/gtypist: fix crash and upgrade EAPI

Closes: https://bugs.gentoo.org/698764
Signed-off-by: Arjan Adriaanse <arjan@adriaan.se>
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/15639
---

diff --git a/app-misc/gtypist/files/gtypist-2.9.5-link-infow.patch b/app-misc/gtypist/files/gtypist-2.9.5-link-infow.patch
new file mode 100644
index 000000000000..736a031aa41a
--- /dev/null
+++ b/app-misc/gtypist/files/gtypist-2.9.5-link-infow.patch
@@ -0,0 +1,15 @@
+diff --git a/configure.ac b/configure.ac
+index 8742d93..e350926 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -56,8 +56,8 @@ else
+        "further information. On Debian/Ubuntu you need to install libncursesw5-dev."
+    exit 1;
+ fi
+-AC_SEARCH_LIBS(cbreak, tinfo, [],
+-  [AC_MSG_ERROR([Can't find cbreak() in -lncursesw or -ltinfo])])
++AC_SEARCH_LIBS(cbreak, tinfow, [],
++  [AC_MSG_ERROR([Can't find cbreak() in -lncursesw or -ltinfow])])
+ 
+ 
+ # iconv
diff --git a/app-misc/gtypist/gtypist-2.9.5.ebuild b/app-misc/gtypist/gtypist-2.9.5-r1.ebuild
similarity index 83%
rename from app-misc/gtypist/gtypist-2.9.5.ebuild
rename to app-misc/gtypist/gtypist-2.9.5-r1.ebuild
index 0ecb2e7fd225..dc5ae156662e 100644
--- a/app-misc/gtypist/gtypist-2.9.5.ebuild
+++ b/app-misc/gtypist/gtypist-2.9.5-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils elisp-common
+EAPI=7
+inherit elisp-common autotools
 
 DESCRIPTION="Universal typing tutor"
 HOMEPAGE="https://www.gnu.org/software/gtypist/"
@@ -27,8 +27,17 @@ src_unpack() {
 	unpack ${P}.tar.xz
 }
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.8.3-xemacs-compat.patch
+
+	# solution from https://bugs.gentoo.org/698764#c0
+	"${FILESDIR}"/${PN}-2.9.5-link-infow.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.8.3-xemacs-compat.patch
+	default
+
+	eaclocal && eautomake
 }
 
 src_configure() {