app-i18n/uim: fix build with sys-libs/ncurses[tinfo]

Closes: https://bugs.gentoo.org/588172
Package-Manager: Portage-2.3.24, Repoman-2.3.6

3 files changed, 67 insertions, 0 deletions

diff --git a/app-i18n/uim/files/uim-1.8.6-tinfo.patch b/app-i18n/uim/files/uim-1.8.6-tinfo.patch
new file mode 100644
index 000000000000..51105c909f54
--- /dev/null
+++ b/app-i18n/uim/files/uim-1.8.6-tinfo.patch
@@ -0,0 +1,65 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1058,27 +1058,25 @@
+       ;;
+       yes|*)
+         use_uim_fep="yes"
+-	AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
+-	  [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
+-	    AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")])
+-	AC_CHECK_FUNCS(forkpty)
+-	if test $ac_cv_func_forkpty = no; then
+-	  AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"])
+-	fi
+-	AC_SUBST(FEP_LIBADD)
+       ;;
+     esac
+   ],
+-  [ use_uim_fep="yes"
+-    AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
+-      [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
+-        AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")])
+-    AC_CHECK_FUNCS(forkpty)
+-    if test $ac_cv_func_forkpty = no; then
+-      AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"])
+-    fi
+-    AC_SUBST(FEP_LIBADD)
+-  ])
++  [use_uim_fep="yes"])
++
++if test "x$use_uim_fep" != "xno"; then
++  PKG_CHECK_MODULES(CURSES, ncurses,
++    [FEP_LIBADD="$CURSES_LIBS $FEP_LIBADD"],
++    [
++      AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
++        [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
++          AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")])
++    ])
++  AC_CHECK_FUNCS(forkpty)
++  if test $ac_cv_func_forkpty = no; then
++    AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"])
++  fi
++  AC_SUBST(FEP_LIBADD)
++fi
+ 
+ AC_ARG_ENABLE(emacs,
+   AC_HELP_STRING([--disable-emacs],
+@@ -1210,10 +1208,14 @@
+     saved_LDFLAGS=$LDFLAGS
+     CPPFLAGS="${CPPFLAGS} -I$libedit_path/include"
+     LDFLAGS="${LDFLAGS} -L$libedit_path/lib"
+-    AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses",
+-        [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses",
+-            AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...")
+-            use_libedit="no")])
++    PKG_CHECK_MODULES(CURSES, ncurses,
++        [LIBEDIT_LIBS="$CURSES_LIBS"],
++        [
++            AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses",
++                [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses",
++                    AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...")
++                    use_libedit="no")])
++        ])
+     if test "x$use_libedit" != "xno"; then
+         AC_CHECK_LIB(edit, el_init,
+             [LIBEDIT_LIBS="-ledit $LIBEDIT_LIBS -L$libedit_path/lib"
diff --git a/app-i18n/uim/uim-1.8.6-r1.ebuild b/app-i18n/uim/uim-1.8.6-r1.ebuild
index 7b43e2abb809..84c5fa527ebd 100644
--- a/app-i18n/uim/uim-1.8.6-r1.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r1.ebuild
@@ -78,6 +78,7 @@ RDEPEND="${CDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-tinfo.patch
 	"${FILESDIR}"/${PN}-zh-TW.patch
 )
 DOCS=( AUTHORS NEWS README RELNOTE )
diff --git a/app-i18n/uim/uim-1.8.6-r2.ebuild b/app-i18n/uim/uim-1.8.6-r2.ebuild
index b7fb23b5ab89..ccec49f28693 100644
--- a/app-i18n/uim/uim-1.8.6-r2.ebuild
+++ b/app-i18n/uim/uim-1.8.6-r2.ebuild
@@ -82,6 +82,7 @@ RDEPEND="${CDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
 	"${FILESDIR}"/${P}-libressl.patch
+	"${FILESDIR}"/${P}-tinfo.patch
 	"${FILESDIR}"/${PN}-zh-TW.patch
 )
 DOCS=( AUTHORS NEWS README RELNOTE )