summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2019-03-22 12:11:22 +0100
committerLars Wendler <polynomial-c@gentoo.org>2019-03-22 12:12:01 +0100
commit09ffa628956892f94fefc5ca1f2236eca23e361c (patch)
tree8f0ade9c239818e8aed9d44404a48ef4ebc881f6
parentnet-proxy/squid: [QA] Remove CVS $Id$ line from header. (diff)
downloadgentoo-09ffa628956892f94fefc5ca1f2236eca23e361c.tar.gz
gentoo-09ffa628956892f94fefc5ca1f2236eca23e361c.tar.bz2
gentoo-09ffa628956892f94fefc5ca1f2236eca23e361c.zip
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>
-rw-r--r--app-i18n/zhcon/files/zhcon-0.2.6-curses.patch2
-rw-r--r--app-i18n/zhcon/zhcon-0.2.6-r3.ebuild9
2 files changed, 6 insertions, 5 deletions
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 200014e1d71..cf8b07d3de4 100644
--- 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 f428d22d614..e32f503d307 100644
--- 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
}