app-i18n/zhcon: Fixed build with sys-libs/ncurses[tinfo]

Closes: https://bugs.gentoo.org/526256
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

diff --git a/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch b/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
index 200014e1d717797b7a52e1bd035afc3b62e6fc93..cf8b07d3de4fd4454a51fc62c1edd48e221fb0a2 100644 (file)
--- a/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
+++ b/app-i18n/zhcon/files/zhcon-0.2.6-curses.patch
@@ -7,7 +7,7 @@ index 63172e4..6c2afcc 100644
  
  AC_CHECK_LIB(util, forkpty)
 -AC_CHECK_LIB(curses, main)
-+AC_SEARCH_LIBS([tgetent], [cursesw curses ncursesw ncurses], [break;])
++AC_SEARCH_LIBS([tgetent], [tinfow tinfo cursesw curses ncursesw ncurses], [break;])
  
  dnl for freebsd
  dnl AC_CHECK_LIB(c, i386_set_ioperm)

diff --git a/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild b/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
index f428d22d614f3a072828441eb636597ae954146a..e32f503d307bb72430d70d5aa11e147031598f50 100644 (file)
--- a/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
+++ b/app-i18n/zhcon/zhcon-0.2.6-r3.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-WANT_AUTOMAKE="1.9"
 
-inherit autotools eutils
+inherit autotools
 
 MY_P="${P/6/5}"
 
@@ -36,11 +35,13 @@ PATCHES=(
 )
 
 src_prepare() {
-       epatch "${DISTDIR}"/zhcon-0.2.5-to-0.2.6.diff.gz
+       eapply "${WORKDIR}"/zhcon-0.2.5-to-0.2.6.diff
        default
        for f in $(grep -lir HAVE_GGI_LIB *); do
                sed -i -e "s/HAVE_GGI_LIB/HAVE_LIBGGI/" "${f}" || die "sed failed"
        done
+       # Required for newer automake
+       touch config.rpath || die
        eautoreconf
 }