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

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0xBEE84C64

4 files changed, 112 insertions, 2 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/Manifest b/app-editors/bvi/Manifest
index 7048b69fd6e5..3551e2c1c58b 100644
--- a/app-editors/bvi/Manifest
+++ b/app-editors/bvi/Manifest
@@ -1,6 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX bvi-1.3.2-fix-buffer-overflow.patch 622 SHA256 5729f4d044bfa1036d16c236d2400150a1168431cfdc8cf12006c358928ac6f1 SHA512 87549381d8c9ef76c4153917faabe2b814dab9ecfb59e9b0cf75be5d02b917fd88266ad5e846982c8d40b80b3304f7efc912bd13f83f48e7a411f663cb10a28d WHIRLPOOL a26b879cc23428852eccf661dbf6d596b3f62817ba6e0f270f44d83cffff618ab0f4da72f250a34d00a3396855789164b95d5ddeb880d6e85e90968708b6442e
+AUX bvi-1.3.2-tinfo.patch 1342 SHA256 2531f2ee9ebc3bb8cb6e675e6fdb9825ea870a1cab33ccffc3acf5084911f6c4 SHA512 0ebb9dd499f1959eb760f84a15f2ebeb98b60a576459d05f1280ff48b94ac167d5e5a1dc5877f69198e1fc91e7d3a652a6e4a1fc49fb94395191cbadf07d7cc7 WHIRLPOOL ae29c0c19f9d4f3ccee863ae4f65e966c45a79714a73952c8cf3b547dc30f8d315a60edcd62234836a60c29dc587b312ee216acc656ffed5fa3804d7678b846a
 DIST bvi-1.3.2.src.tar.gz 170444 SHA256 ff390af1c474bf870b6171332726b93bad8e716ea378827b55d8aae82dee1c84 SHA512 eb8a01602751b61c471207124c90346375ccf34ba85e661143f6da8f113f48070d132e98213484bd16d0b6b4c8d0fa27776d36f18cac21336076ca35bcfcb58c WHIRLPOOL 5dfa13a5fefe5f6df95e0d0c37961b7998c1eb37296b31771c27c5a71346891d8b2f9dff8ae9b737cfb7df585076ec1efbadac7b492bda706a1d36fbb3d3d6f8
 EBUILD bvi-1.3.2-r1.ebuild 1118 SHA256 90ff22877b08d94c19fb87860c5228b88d99f781b810d31a56cc51c1e16427ee SHA512 212652b2adedede7a56a1744d5a839c2a8ad9b98722dba977bcbfa350f3e2d0f274ac848ffdb23ab2c5af520bec677010a2ae50f6d4e2198d3219be77edf64e0 WHIRLPOOL 8a7bc8620aba5ba8d2174a853aaf97897784eaa0e01e68fb90321d00b8821500c3be23a3419131c9682cc12d0055285bc1b80414cb929c7f02edd350013826f6
+EBUILD bvi-1.3.2-r2.ebuild 1289 SHA256 5a20131e859139467581158a6ed0176a1676ab5e3f192d9c5f518345eed8c87f SHA512 18cb7a83eb8090728e87cf7fea60e06d2d39b94e9f6dff8814cafd2e0381af737e2e6735dece84c090d821f2c9701b3c21551c8c35edb1b1f8f46d8b2da9c370 WHIRLPOOL 8c48980885985509cc2ba1d4e1e279347bedd0ba4891e1402fb990d8152afa3f7118b0cbe05edd6cf6103d2f560f4b84812533c0fb0dc92fd443b440ebb902b3
 EBUILD bvi-1.3.2.ebuild 1022 SHA256 0ec81db57b42b898c452a106f9726702f0042e10f7ae6aff4ecc2b68e4c5aa0b SHA512 6cc44a1b0545faef2809a6c6dd5a1084e1cfd2205a31abea8a000504393cff15a2925ba30622e5b2a8bc6928aed425eaf5f492d058563b0ca317d7270b191040 WHIRLPOOL d3511ef9cfe4ffedf3ddee4549beee975cda7d5b8a4b8760764e204c6bfa2c46580970cf9668eff14ceefef64b36f0ba83df1509dbad9e1873008bc8bb948ab4
-MISC ChangeLog 2066 SHA256 eb2b43e5c3478c271d235088ce7aad2bb54f03bd548e40ea556fdecf05da2510 SHA512 1a6cf3b5d80c90f0e571bae5aa10f87681c525534fc9abfbd053e2ec4f7f3e427bb88545f4514be2c874262a6b908bcfba2e3d89b32c1300329b64893c7cd907 WHIRLPOOL 28b4b8c2e3e1d7d93271d435f686f39e94d3c2cf22cdd84852f6ab68045e058c6ccdc03d69a1a895bc6e47f6c9961b4bff4ac27ffef05f7e558fca7470816f1b
+MISC ChangeLog 2248 SHA256 147ae93f97cb7989bb76cff05a7777e141dbd894689d8a8019d30dc511a2f443 SHA512 b87f011389a8a4bd9bfbef6e3d5b92ef142115f0f42e66dda85b8c2b81218780b455ba7f2d9001911f54c6e6182e4ebacd481fa4cf5276826fb6f8d07d72e656 WHIRLPOOL d78f34a65cffec5c72cb9c6a884aa87c12b3ce7ec549367699b4d4cd456a91ba1d913e1cf78aad1275623007f9118b73d13666d503045a726a9d4ffb24c78a87
 MISC metadata.xml 228 SHA256 a317cd066ed83c5b5acf9d49869cb2f153499bb90cee389334bee9781534f5e8 SHA512 1638d4580908d32ad6fad71d109a58d699c9111d26c1073ae95b20248fc2a5da91a1f73153f01942df25c64865586e970e6532a312cd374d9866bf21264ddc54 WHIRLPOOL 11e5655c66af420e31f60d3ab19ef3ff55222271dd63bca94b548c7a63bbc73e8edfb4d80648d143c7d8315f8ba66bc4140dcf97ff85ea472e2a7cab1de98264
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iQIcBAEBCAAGBQJSFPfVAAoJECDuEZm+6Exk15IQAJkSddXF4HLW3dOWfIrKwS7b
+ptOrDzawcRvj9MKVmSRGE3eJY/HPVkXoWW5zX046YAGodAhMByeLwtFcixT2ycnI
+qDXUbyBOxYtUqt7ssp9nKwUeLPobCYLRgJuHjIuKEtqDrq/IRSczasT0+Gai5ewE
+aw/VZM8RN53RwCfyKMrgBNJIlMkMAg8FHjLkl0Xz95mzdZuG2HuLbAxZq13IjvFM
+mV8vCp7uYZCV9JQTqGh6IN5I40f+5Mh/up7+j3hjoL+XE9MYfQyQnb8k47E1BIjN
+sx2xjChWwM+sDd15B97KRQUwXX3WkdfFQvttMpXSVYCMaao5J9iRHQJNef7wu7j1
+W50P9P8ycQVpjaoRUeFvxX4uC3dsHQFctKits7fLwFNpPIm1DpUgRsNpBrjP3/AY
+pgyWvXTcyc6p3oXqzYB1be+J+stGml1t4x+pjHUbh4VJzFKjAPRMvzK8SSypKHEm
+rBkpaQDQMNmcAby7KajFhF8rAKku4jCei3MiLOC//1gqE42AhGNHYMgwGkKatxjV
+6xSmH72SKGwXrKQ+KOVA3RgTdQ2nWN3Cn/DfDsAglA5mvSjwSyZoQAyfsTq1d2u8
+K4iyHc08ftOj0ccFG31D9o493peFe0oDBFii7tdGCuMTR7+5TtNZKnm1LTTNPv8b
+LvJaliRQirIYBDQlMw0J
+=+lOU
+-----END PGP SIGNATURE-----
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