Fix build failure with ncurses[tinfo], bug #459770

(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key 0xBEE84C64)

3 files changed, 89 insertions, 1 deletions

diff --git a/app-editors/bvi/ChangeLog b/app-editors/bvi/ChangeLog
index 59b8c2c3c359..39c3e8ba0aee 100644
--- a/app-editors/bvi/ChangeLog
+++ b/app-editors/bvi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/bvi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/bvi/ChangeLog,v 1.19 2013/01/04 09:55:26 ryao Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/bvi/ChangeLog,v 1.20 2013/08/21 17:24:50 ryao Exp $
+
+*bvi-1.3.2-r2 (21 Aug 2013)
+
+  21 Aug 2013; Richard Yao <ryao@gentoo.org> +bvi-1.3.2-r2.ebuild,
+  +files/bvi-1.3.2-tinfo.patch:
+  Fix build failure with ncurses[tinfo], bug #459770
 
 *bvi-1.3.2-r1 (04 Jan 2013)
 
diff --git a/app-editors/bvi/bvi-1.3.2-r2.ebuild b/app-editors/bvi/bvi-1.3.2-r2.ebuild
new file mode 100644
index 000000000000..394297e5ecc1
--- /dev/null
+++ b/app-editors/bvi/bvi-1.3.2-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/bvi/bvi-1.3.2-r2.ebuild,v 1.1 2013/08/21 17:24:50 ryao Exp $
+
+EAPI=3
+
+AUTOTOOLS_AUTORECONF="1"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
+
+inherit multilib eutils autotools-utils
+
+DESCRIPTION="display-oriented editor for binary files, based on the vi texteditor"
+HOMEPAGE="http://bvi.sourceforge.net/"
+SRC_URI="mirror://sourceforge/bvi/${P}.src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+
+DEPEND="sys-libs/ncurses"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/${P}-fix-buffer-overflow.patch"
+		"${FILESDIR}/${P}-tinfo.patch"
+		)
+	sed -i -e 's:ncurses/term.h:term.h:g' bmore.h || die "sed failed in bmore.h"
+	sed -i -e 's:(INSTALL_PROGRAM) -s:(INSTALL_PROGRAM):g' \
+		Makefile.in || die "sed failed in Makefile.in"
+
+	autotools-utils_src_prepare
+}
+
+src_configure() {
+	local myeconfargs=(--with-ncurses="${EPREFIX}"/usr)
+	autotools-utils_src_configure
+
+}
+
+src_install() {
+	autotools-utils_src_install
+	rm -rf "${ED}"/usr/$(get_libdir)/bmore.help
+	dodoc README CHANGES CREDITS bmore.help
+	dohtml -r html/*
+}
diff --git a/app-editors/bvi/files/bvi-1.3.2-tinfo.patch b/app-editors/bvi/files/bvi-1.3.2-tinfo.patch
new file mode 100644
index 000000000000..b00c88811507
--- /dev/null
+++ b/app-editors/bvi/files/bvi-1.3.2-tinfo.patch
@@ -0,0 +1,35 @@
+diff --git a/configure.in b/configure.in
+index 68076d8..81da696 100644
+--- a/configure.in
++++ b/configure.in
+@@ -58,17 +58,19 @@ AC_ARG_WITH(ncurses,
+   fi
+ ])
+ 
+-AC_CHECK_HEADER(ncurses.h,
+-    AC_CHECK_LIB(ncurses, initscr,
+-        AC_DEFINE(HAVE_NCURSES_H) LIBS="${LIBS} -lncurses",
+-        AC_CHECK_LIB(curses, initscr,
+-        AC_DEFINE(HAVE_CURSES_H) LIBS="${LIBS} -lcurses",
+-        AC_MSG_ERROR([bvi requires the curses library]))),
+-    AC_CHECK_HEADER(curses.h,
+-        AC_CHECK_LIB(curses, initscr,
+-		AC_DEFINE(HAVE_CURSES_H) LIBS="${LIBS} -lcurses",
+-		AC_MSG_ERROR([bvi requires the curses library])),
+-		AC_MSG_ERROR([bvi requires the curses library])))
++AC_CHECK_HEADER([ncurses.h],[
++    AC_SEARCH_LIBS([initscr], [ncurses],[
++            AC_DEFINE(HAVE_NCURSES_H)
++	    AC_SEARCH_LIBS([tputs], [tinfo])], [
++        AC_SEARCH_LIBS([initscr], [curses],[
++                AC_DEFINE(HAVE_CURSES_H)
++                AC_SEARCH_LIBS([tputs], [tinfo])],[
++	    AC_MSG_ERROR([bvi requires the curses library])])])],[
++    AC_CHECK_HEADER([curses.h],[
++    	AC_SEARCH_LIBS([initscr], [curses], [
++		AC_DEFINE(HAVE_CURSES_H)],[
++		AC_MSG_ERROR([bvi requires the curses library])])],[
++		AC_MSG_ERROR([bvi requires the curses library])])])
+ 
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ dnl AC_TYPE_SIZE_T