commit: b7994d5cdc2b80af2eb16799c020be54c26bef90 Author: Arjan Adriaanse <arjan <AT> adriaan <DOT> se> AuthorDate: Mon May 4 02:38:13 2020 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Tue May 5 03:06:09 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7994d5c
app-misc/gtypist: fix crash and upgrade EAPI Closes: https://bugs.gentoo.org/698764 Signed-off-by: Arjan Adriaanse <arjan <AT> adriaan.se> Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/15639 app-misc/gtypist/files/gtypist-2.9.5-link-infow.patch | 15 +++++++++++++++ .../{gtypist-2.9.5.ebuild => gtypist-2.9.5-r1.ebuild} | 17 +++++++++++++---- 2 files changed, 28 insertions(+), 4 deletions(-) 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 00000000000..736a031aa41 --- /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 0ecb2e7fd22..dc5ae156662 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() {
