Add a patch to handle ncurses[tinfo]

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xF8551514

4 files changed, 59 insertions, 11 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/Manifest b/dev-util/global/Manifest
index 508df5577daf..08358bf827cb 100644
--- a/dev-util/global/Manifest
+++ b/dev-util/global/Manifest
@@ -2,16 +2,27 @@
 Hash: SHA256
 
 AUX 50gtags-gentoo.el 183 SHA256 52531e861595504a3461a483dfc05520acef423932e273cd26461aee66082428 SHA512 5a7b4e3eb4ee7ce479766a01dea5f82ab7499e666130b869c8f61ec9dfa69250b4b98357f6eb3d1b14da0348eb2c7d77ec0146d1e85996254a8fd7eaa3f3ff05 WHIRLPOOL 400021dac347e7954960c2813cbe27fd9b80e7359e08fbd2398c62975e177f6fb39e54b3da9e066adb7cd9f3e3cafa2f9f8fb61da1866bafcef0cf915fe9e44f
+AUX global-6.2.9-tinfo.patch 2047 SHA256 251f54adfc44d603eaa99fb40f54d18525d9ab297030a9c3c6de6b843b668be2 SHA512 f5d83716ba2fde29ad5765665d00b4d2a5b4c8d6351cd6ca9d8c375a6c953f795811e156c0cdb28549837c72abbe2c2bef9ad4cb419e7043115c50858b831698 WHIRLPOOL 97ca014947d3ccfbcb00016023c1a6308dcd4edc637f3a0d150367aa9aabc5811d0866f3aea75877f461bfb89703292032796efa8fef6e7a6c698c54cf3fbf04
 DIST global-6.2.8.tar.gz 1313627 SHA256 c1ed3b2500e00d3fb5dbf23d7e7e6b4feb1af45c12015ef9030114e76628cfd0 SHA512 c84401dd2d492db9eefbf80957db07e5d8e1ce5e174950cda58a0ad6873a9e504fd745ea63ba7f0f688f8eb5f9aa86c4839aec62ec3c7f420168d73b5d47e44f WHIRLPOOL 34e19dff43fa365fb56600a0df9b8f7a22f09f387d2ae72fbf9a3ceb749d0a21c8dd90fdb2fa542b5c4566f1676a3a121693d3352722fefcb6aa3d8d1661f45f
 DIST global-6.2.9.tar.gz 1314940 SHA256 d8d831cbd9bac9f51598af316231290cc328e4f18dc29b58a2f2ae0fee44c303 SHA512 3d23b7c6f0066cb5d6c88f138fd8403d7155c677ea8b6f3bef40c1ff81e7d3246dcd127a2b5c91df7c935b4f53b0ba0e39618a3a1136291724f150710e172488 WHIRLPOOL 4018a43365e9a41601c981c86a73a34cb473fc7eef73303a56ea72ebbc2cb483f4f3d3b82dfc2b79e3e8922d6baef618e70edd01f326e8123f5810e5de4f8285
 EBUILD global-6.2.8.ebuild 1657 SHA256 ffef0b93948c104c02f0a11fa8abc325fe6bae244a5354b2e703b37c9e28a5ec SHA512 1e9338e7b241c98f0a3ca1512911e52d811ad4d62dd4e0e340f6c5d4024f191b4fc2efc08890ae8b02e32e2d432805b7179243bd6b42a5ca88f21138585ad44b WHIRLPOOL a3efcf97036723f435a222f91a7fd5e6b3a3bb95bb160c718e6ff1b0170515fe067c47e53ccb62308d4cbe6fd2eab5c778ba3512f54dadeb43b5b9dee8bb19db
-EBUILD global-6.2.9.ebuild 1664 SHA256 95ed36f1bf4d81739cef5a948c24e0b7a534d6f39e1159d5dd41fc6050a78e86 SHA512 454255b99f9d0b584c1a2ff5742d44aab97360d15a23792efcc44a762f1a32d65e190a846b12b52d549e32874b8ba8ceb6e75b87431e39882dea896bd923fb65 WHIRLPOOL ce9fe4e10cc2caf154e1557179bbe6cde04cbfeed001b757602161b932bdf8d84e47c43a869b7ebf7ee0246f100c6b6a4564749174ec5be2cb1774d065d4afab
-MISC ChangeLog 14853 SHA256 77d983138d696e45d3768e153cf70529748f96cdc18476c8b68071d2b3c51c07 SHA512 416916b9be87c2fa5654f236dd74ef153eb5ce25743c127a2730f1fc5bc5faf54bba8ab0956b147e7fabcb8d1c6433eaf37e68abf87634f4f08c85fa63bebc27 WHIRLPOOL 96db27ce10ccf122feab038e8d0ab2fc2eb4404f11b43ba7d07c2db21137cd480a590fe6f4cb8a99fbdcf4780c922566dc1e7c19e1209d444b28b67ea17289b4
+EBUILD global-6.2.9.ebuild 1743 SHA256 2e800b596b98c8d98b8e392c1d5b8478c9283082ff1ef0aa939ec3c165a8b4e6 SHA512 4a145610f046e8dbb5057f04492a3512ca1d57be62deaca510c712a978722aae6480ab28c0b4dce72423e6ed834df1c96409a29992b62013212f24951e0e9f49 WHIRLPOOL 0fa46659b91fe714b058502abd1e738cdf21bfb2e47bd347afbbf5c02c3538caae9ab86882b618438b6dcb23ea36449dba3abd416858f32a3084b8e3db1e278b
+MISC ChangeLog 14994 SHA256 326ee7b9e89a7178d846ff93fd46d8a84e8335cafc2f598170add045fc30fd41 SHA512 5b0b2e59f383a1fefc133d079bf4706ff5cd0bda0b8dabc82a74ba6b34fe4ea672379ece7e6737d7746c253fbd419c13095d7361f31c6df7812f458c6ff2ff95 WHIRLPOOL 7ce0a7d08ce072ff1b86121116dc642fa8d5aeb4350861fa74201277f578adb03022a0622c9d64e4cf47c28ec3e3d334e029c1aa022bbb8a958f5d604b7daf31
 MISC metadata.xml 455 SHA256 2e5eb68ad825e802fcd03625ff035bcf9a1100870a86a743c14a14b49b2a2dc0 SHA512 d209aa576390ec2362518c11d98401e57cbde8b3ef06c6dfd0f1210b5069df499e14e5beda80302780067a54d6c1fd6c0dceebbbfde9f5df70f2f27cf0c37215 WHIRLPOOL b61a89370d64bed8ec01f63661a84f9ad33e3a5618f85dad2146e6a8e9a5f273ebe3a59d98f6c2440829b876695b77731d04bb3fbb38dc2dd9bea74266e3c21c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlIeGJYACgkQC77qH+pIQ6StVwD/bc5UGchNIO4/5YXADo+e1hyB
-6ggsXfpdWwqgbPle4+UBALa3bg5RmyH+/z/2pa6iVAV6Zg6sTmjoZYaY7bp6Y3KG
-=QF6S
+iQIcBAEBCAAGBQJSyq9zAAoJEDYO1FT4VRUUd9wQAJ7L+Nq+wFWN/oVXLtqNYdea
+XcJrR7aXBi3b3dxryMu23EP7pIzkkLlGNH+FMXeQfLgQ/689tBATTEA2Q16rsFzU
+FBIzICpKATIJAxP8mvDK42Kj55ffz+2jVA5pzR1FxjV1mzE6n5qxZCdlt12mSqXb
+UJP6h1TenvCZ5BR4r1ZQVW/di0q+dYZQrMgMakFhLTiSTPU3dmnFloqRPdXLpQUM
+ODMEAnuuj9fmw0AZdROkB1Tk8VNgaaMQkzesqJv7HAzB1A+sFXOgZOlUTSWTh/Xv
+S4jNmU1nJZctxldMX/LpiQ33SfeBKSzrX/xmozPxnZA5v7aNxzxoJ5jMcTa3xOWV
+HajAXbDyNQajnmJzoWqLGhLkUziAUBhScQnBMu/DRM4IeQuAgDmbhOsEnc6nbQtL
+KNWHr8bqPdNPT5gus5L0LDV/rs5J/u2AEOAOhf5nGvVp3xTdE3so0UcB4fFgnTIq
+heWffnyHkFPE3uAtapNzXgi/URlwATxZmTSiZ+ZHLAzdi2UbczyWUnn6Ip96IU1W
+nhoAYjkDRmH+oLz6JegVnZ3RPOZQjIgiBSXQOGiGiaRgt4G25ReE83fKJMwtL2CW
+C3WQzR6BohMltLL4dPtoQhBqYZpGZCOT66D3wiaPdOcBgrxKhsJYU87ZsGGQ/ha6
+EYPjQJ3CjqgOit8BbPox
+=7W7i
 -----END PGP SIGNATURE-----
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}")"
 }