Add a patch to handle ncurses[tinfo]

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key F8551514)

3 files changed, 42 insertions, 5 deletions

diff --git a/dev-util/global/ChangeLog b/dev-util/global/ChangeLog
index ae09f11a625f..df3653ff0ffe 100644
--- a/dev-util/global/ChangeLog
+++ b/dev-util/global/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/global
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/global/ChangeLog,v 1.113 2013/08/28 15:34:45 floppym Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/global/ChangeLog,v 1.114 2014/01/06 13:28:10 naota Exp $
+
+  06 Jan 2014; Naohiro Aota <naota@gentoo.org> +files/global-6.2.9-tinfo.patch,
+  global-6.2.9.ebuild:
+  Add a patch to handle ncurses[tinfo]
 
 *global-6.2.9 (28 Aug 2013)
 
diff --git a/dev-util/global/files/global-6.2.9-tinfo.patch b/dev-util/global/files/global-6.2.9-tinfo.patch
new file mode 100644
index 000000000000..ef247d4abbcb
--- /dev/null
+++ b/dev-util/global/files/global-6.2.9-tinfo.patch
@@ -0,0 +1,28 @@
+diff --git a/m4/check_curses.m4 b/m4/check_curses.m4
+index 14aaec5..dca7c0e 100644
+--- a/m4/check_curses.m4
++++ b/m4/check_curses.m4
+@@ -229,16 +229,17 @@ AC_DEFUN([AC_NCURSES], [
+ ])
+ 
+ AC_DEFUN([AC_SEARCH_NCURSES], [
++    PKG_CHECK_MODULES(NCURSES,ncurses)
+     AS_MESSAGE(checking "location of ncurses.h file"...)
+ 
+-    AC_NCURSES(/usr/include, ncurses.h, -lncurses,, "ncurses on /usr/include")
+-    AC_NCURSES(/usr/include/ncurses, ncurses.h, -lncurses, -I/usr/include/ncurses, "ncurses on /usr/include/ncurses")
+-    AC_NCURSES(/usr/local/include, ncurses.h, -L/usr/local/lib -lncurses, -I/usr/local/include, "ncurses on /usr/local")
+-    AC_NCURSES(/usr/local/include/ncurses, ncurses.h, -L/usr/local/lib -L/usr/local/lib/ncurses -lncurses, -I/usr/local/include/ncurses, "ncurses on /usr/local/include/ncurses")
++    AC_NCURSES(/usr/include, ncurses.h, $NCURSES_LIBS,, "ncurses on /usr/include")
++    AC_NCURSES(/usr/include/ncurses, ncurses.h, $NCURSES_LIBS, -I/usr/include/ncurses, "ncurses on /usr/include/ncurses")
++    AC_NCURSES(/usr/local/include, ncurses.h, -L/usr/local/lib $NCURSES_LIBS, -I/usr/local/include, "ncurses on /usr/local")
++    AC_NCURSES(/usr/local/include/ncurses, ncurses.h, -L/usr/local/lib -L/usr/local/lib/ncurses $NCURSES_LIBS, -I/usr/local/include/ncurses, "ncurses on /usr/local/include/ncurses")
+ 
+-    AC_NCURSES(/usr/local/include/ncurses, curses.h, -L/usr/local/lib -lncurses, -I/usr/local/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/local/.../ncurses")
++    AC_NCURSES(/usr/local/include/ncurses, curses.h, -L/usr/local/lib $NCURSES_LIBS, -I/usr/local/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/local/.../ncurses")
+ 
+-    AC_NCURSES(/usr/include/ncurses, curses.h, -lncurses, -I/usr/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/include/ncurses")
++    AC_NCURSES(/usr/include/ncurses, curses.h, $NCURSES_LIBS, -I/usr/include/ncurses -DRENAMED_NCURSES, "renamed ncurses on /usr/include/ncurses")
+ 
+     dnl
+     dnl We couldn't find ncurses, try SysV curses
diff --git a/dev-util/global/global-6.2.9.ebuild b/dev-util/global/global-6.2.9.ebuild
index 662c9036e3fe..e4579ac8864d 100644
--- a/dev-util/global/global-6.2.9.ebuild
+++ b/dev-util/global/global-6.2.9.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/global/global-6.2.9.ebuild,v 1.1 2013/08/28 15:34:44 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/global/global-6.2.9.ebuild,v 1.2 2014/01/06 13:28:10 naota Exp $
 
 EAPI="5"
 
-inherit elisp-common eutils
+inherit elisp-common eutils autotools
 
 DESCRIPTION="GNU Global is a tag system to find the locations of a specified object in various sources."
 HOMEPAGE="http://www.gnu.org/software/global/global.html"
@@ -24,6 +24,11 @@ DEPEND="${DEPEND}
 
 SITEFILE="50gtags-gentoo.el"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+	eautoreconf
+}
+
 src_configure() {
 	econf "$(use_with emacs lispdir "${SITELISP}/${PN}")"
 }