Fixed build failure against 'USE=tinfo ncurses' in bug #454216 by Reinis Danne.

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

6 files changed, 48 insertions, 58 deletions

diff --git a/dev-haskell/terminfo/ChangeLog b/dev-haskell/terminfo/ChangeLog
index 643fdd033e42..b1ac25befa1d 100644
--- a/dev-haskell/terminfo/ChangeLog
+++ b/dev-haskell/terminfo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/terminfo
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/terminfo/ChangeLog,v 1.25 2012/11/25 06:08:50 gienah Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/terminfo/ChangeLog,v 1.26 2013/02/13 21:26:15 slyfox Exp $
+
+  13 Feb 2013; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/terminfo-0.3.2.5-tinfo.patch, -terminfo-0.3.1.1.ebuild,
+  -terminfo-0.3.1.3.ebuild, terminfo-0.3.2.5.ebuild:
+  Fixed build failure against 'USE=tinfo ncurses' in bug #454216 by Reinis
+  Danne.
 
 *terminfo-0.3.2.5 (25 Nov 2012)
 
diff --git a/dev-haskell/terminfo/Manifest b/dev-haskell/terminfo/Manifest
index 710b376ebd3f..5b85cd5d4c44 100644
--- a/dev-haskell/terminfo/Manifest
+++ b/dev-haskell/terminfo/Manifest
@@ -1,20 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST terminfo-0.3.1.1.tar.gz 42858 SHA256 6aef85f980951d0e19e6af8a1958fc19b802e87ffafaf2e67cfb54d02efdd382 SHA512 bb0596452ce1bc8caf0a995b4bb111432263b454963a78f7488ca670bbf5b76c299d1082916c6958cf73cd3b7b55b6614fa13b4c8cb5b9b34c6ded9f81e8ff99 WHIRLPOOL b3e8f55394774cd2f6a7b9c748aa7e8130e84d56a4c91331e4182321fd6133ac59d904ee9bcb43b87876812521d7dc3a98664b99042f66abf3eb1da2d1984499
-DIST terminfo-0.3.1.3.tar.gz 42968 SHA256 10303a46f71973352eed26f1f076447eacba8b23b9ca9ce73b73992b22656503 SHA512 cd2d88a1d31986b39719568041fb2b55f331e29c67c3b0dd4326a4af54f721fc37ff87c4df9139d52d006db9c44adc1cb606408a5421b31b703c01b07bc8c2f8 WHIRLPOOL 7d772338c9fd91ed01b9d1186d767eba6e60f1361f3c9c9f6aef7cb368d4ce5b5934953df74ac36089d7b7c8955fdc2cc476422e76666c4b0b41292ed5d9c6fb
+AUX terminfo-0.3.2.5-tinfo.patch 1217 SHA256 dfbb8d5c9ca133837e6f6be766fa8e3af2715e39d8994e56a4a84d6cdc15f9b3 SHA512 60552b163295c565d506b1d3c9624d6d0e94e814c37bb38d0cf0911e153c593c2bd13418306b44fbe611b7fd9064307a201860ed1e2ce5f2a7bb16618bd0b615 WHIRLPOOL 2c06869486a8eb08ff63f7bacebfddfdf68cf0c0dd94ef3578c5dbc49b4374b2ba8c0de9ac2ed4731a3ad27466a4169d2bd13d1c208a8d0aa1226770bcb30847
 DIST terminfo-0.3.2.3.tar.gz 41953 SHA256 ae38ebe2e4e2f55291a40c0b5818095c79d4a990feb070c72d8542d24edfc21b SHA512 725a1d520fd01fe6ed62f17834a3d53b879cd7ae1ce90fed6af16e25f8862c99b766415f5631777a3b19ee2474ae69c02da814b1fae2b1ff9072fcfb921eafd1 WHIRLPOOL 4545ca83de99f0f122dce6d6e325e21e4940c5c8847f63c2b0d530f7034cb1a8015f393e2715affedc03d76ee49f5f724cae45e9876d6e200659d5ab2622baa4
 DIST terminfo-0.3.2.5.tar.gz 45361 SHA256 6f419fa3a9afe995993f18022d6a347aedffc9a28a6974701f8421b15f584dc1 SHA512 68a882e6abb6a2e3ee70398761b899d635bfd96118b47437efeb6bc7b1a1d81a3c3e1a7f696d86057d2f8a8dece270ae9005d7905a6da97f12bcf8113ac70203 WHIRLPOOL 9d62f325e6c39f6e295acedcfad8db1312e455cd921c44936dbb982d220ca38b036435b02741415e9cb1e081b2ca63fbb2f5e9c2eb3dd112605fa286ee527b3a
-EBUILD terminfo-0.3.1.1.ebuild 643 SHA256 7bd1035938232c2c362e697f93982f901b05c60036d384bd3ff7cef7ba576885 SHA512 ecfbf86ba9a3897cc86264446ddce87bc9db103bf9322f68f74380d70581c3a6096a1a11efd3851c92f5897e7c9fc7aa2b31519755d3f42dfcee730d63c71b7a WHIRLPOOL 2f167bffa6991ff3ab1013e3abfa28460b378c3e8c7f2f497f206df14da13722d590c493cf2af2cfc78decd31d24cd2a7fefb3b1a3b1d8c709812476acc3bf31
-EBUILD terminfo-0.3.1.3.ebuild 724 SHA256 8283bec83c0293f866412ae822928330af9d5a0872a7d8ed8a9f1def7aef50c1 SHA512 78b8e7a397462287ce6e92ffee4d8a56e33052574cd3f2f34634e38f537f5ae7283cdefbcccecc38c8865fce8db9641001ddc11a2f30f6243771d211ecebd2e1 WHIRLPOOL 9d46780d67fd20e9f325a938b10ad2c56d2c70b43108a06428a4b5073da58dacdb1dc63dc64a00d5f9ce513a5c42acb23942c95de72700110979a0e2943c5c23
 EBUILD terminfo-0.3.2.3.ebuild 731 SHA256 407ed19529309e126fda083a14d3f042bbecdaa796b9e2a5cfd52d591f681f04 SHA512 54dda49332cfc11a39876bfd533c1827fb2b9850b5b6f535136871c371f0ccd7914c0fe66092b9cc00a79f18928b264ae539836a5b25f3a1e6c4d4fa3f782051 WHIRLPOOL dd97ac4612a2a21dfe47e51da27a3aab97aa4f44b3316cc45cb28fc5a6b077cf64911423c006ace3258b578d1dbf5b2280a8f23f6264a33634aec961f8e3fef0
-EBUILD terminfo-0.3.2.5.ebuild 745 SHA256 248d3af88ba5fcd88eab10b17eac785af8591d2e4ee67a5dec465bc5c145a238 SHA512 5ed66af38939dc77e8a67e8ecad937bb11b3c7f809048f1775c0a3f75e12b00ccf6c80770f6d13856fca15949548b88d1d5ad6ec6c57e3025202de474645e9fe WHIRLPOOL 2e9a8d851d87c8a8a9c0cd1d44a5cc079757e66c3548c00daa0a7abe9b56b36d3931417a153ff5c3d9ae364ad3aae9cc9e651ed3ff99b692e114aebb5817025f
-MISC ChangeLog 3209 SHA256 4290ba57092c7f2abdadcebb4756e4d3de6f314236ef512a53c13af0b17307d6 SHA512 6fd30c0677b9c3d1e230e2ec25be7633ec7047946331181e7b08f32ca55611a492a05e81ba5f90b5bbf9c80cf6606e16f6fc9e61727752ed9ff73db7216a0e17 WHIRLPOOL ea96e35153bac00fa3e355112963fa08e501bbc8a1172e037fc2aebd5963b2d53ef3556dde9d91cd3c3e6a6fdac150d53904ef2c218a8d8448f6e061c392f9f6
+EBUILD terminfo-0.3.2.5.ebuild 834 SHA256 8519f6a57d2537e4b9f512620987a6f918d20aa16e5381043ffdabb90d0585d7 SHA512 232d33c599443086576cd3ab31a76c04f2001e8cc269cbd83b6ad461dfa36943d518f0a141f1a787bfb9132772344a936a60ce48120b8053d922f8c4a53f7733 WHIRLPOOL 072afb179c6e516eb03561d8ea696b42a21cde71920dde2175defc04fe0a6f687a5d2587cdd0a20cadc69a2e73e67422e7c0918f67356392b919fa4f58adedc2
+MISC ChangeLog 3466 SHA256 f64178204bd0b362824e34f44aed89af9f38d2e3e33653f5643b5ebe3ff6907f SHA512 38113cca650b6bea94096a0e33ffff5cb08f04e90b536532ae5c73c4cf1119f4230ddc450f8ea32f76cf25d3b1bb88ddd1aa2339c314028399456aeb13261a8a WHIRLPOOL 6a59f2773dd6dbe9d1729c9fbca1ad3ad0a5e83f4d60fca07c27ecf29d150c3c585665cc84e46541c4fe782275bbd69a919b9cba212f3ca32fd602aa3f20bb4e
 MISC metadata.xml 223 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 SHA512 24765bbf1cb187cd262aa7fb3824c1cec65e2bf3f2198099de688916d96401a26458265b15408f22b1fbd6d6a2842df814a57ceda80dfa00d130b24423b7544f WHIRLPOOL 8fd6700f6198db6540eb51edf11372faeb6eb8a542a692e515badf236f62444f2c180f7d08e0f98e9fdfa23de14631b31af50543469aaa27084d6b637e2644c7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlCxtfgACgkQoBEVQmGOlx+vRwEA0hD7u0jkD111hbQzd2YZ3Ywb
-asVy9MsR1GjmOD2MCfUA/Aq20eQ27C3S6qYO3vxctSJOrx8JMd3F8RKs/nhVRSfM
-=d76w
+iEYEAREIAAYFAlEcBNoACgkQcaHudmEf86pdcgCcCouuCIgkwTRY1PU9JmllTf9g
+n5cAn0yRvKfOW3Dm2ByinmBvbmIcMcND
+=PkSW
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/terminfo/files/terminfo-0.3.2.5-tinfo.patch b/dev-haskell/terminfo/files/terminfo-0.3.2.5-tinfo.patch
new file mode 100644
index 000000000000..ca10da2e03ae
--- /dev/null
+++ b/dev-haskell/terminfo/files/terminfo-0.3.2.5-tinfo.patch
@@ -0,0 +1,25 @@
+http://bugs.gentoo.org/454216
+
+Mon Jan  7 16:34:47 FET 2013  Judah Jacobson <judah.jacobson@gmail.com>
+  * Search for terminfo in libtinfo; fixes GHC #7281.
+  
+  Patch from Paul Johnson.
+diff -rN -u old-terminfo/configure.ac new-terminfo/configure.ac
+--- old-terminfo/configure.ac	2013-02-14 00:16:11.816111434 +0300
++++ new-terminfo/configure.ac	2013-02-14 00:16:11.819111434 +0300
+@@ -39,10 +39,11 @@
+     TERMINFO_INCLUDES="$CursesIncludes term.h"
+ fi
+ 
+-AC_CHECK_LIB(ncursesw, setupterm, HaveLibCurses=YES; LibCurses=ncursesw,
+-  [AC_CHECK_LIB(ncurses, setupterm, HaveLibCurses=YES; LibCurses=ncurses,
+-    [AC_CHECK_LIB(curses, setupterm, HaveLibCurses=YES; LibCurses=curses,
+-      HaveLibCurses=NO; LibCurses=not-installed)])])
++AC_CHECK_LIB(tinfo, setupterm, HaveLibCurses=YES; LibCurses=tinfo,
++  [AC_CHECK_LIB(ncursesw, setupterm, HaveLibCurses=YES; LibCurses=ncursesw,
++    [AC_CHECK_LIB(ncurses, setupterm, HaveLibCurses=YES; LibCurses=ncurses,
++      [AC_CHECK_LIB(curses, setupterm, HaveLibCurses=YES; LibCurses=curses,
++        HaveLibCurses=NO; LibCurses=not-installed)])])])
+ 
+ if test "x$HaveLibCurses" = "xNO" ; then
+     AC_MSG_FAILURE([curses library not found, so this package cannot be built])
diff --git a/dev-haskell/terminfo/terminfo-0.3.1.1.ebuild b/dev-haskell/terminfo/terminfo-0.3.1.1.ebuild
deleted file mode 100644
index cae7ab6d3f25..000000000000
--- a/dev-haskell/terminfo/terminfo-0.3.1.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/terminfo/terminfo-0.3.1.1.ebuild,v 1.12 2012/09/12 15:34:53 qnikst Exp $
-
-CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell bindings to the terminfo library."
-HOMEPAGE="http://code.haskell.org/terminfo"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
-IUSE=""
-
-DEPEND=">=dev-lang/ghc-6.10
-		>=dev-haskell/cabal-1.4
-		sys-libs/ncurses"
diff --git a/dev-haskell/terminfo/terminfo-0.3.1.3.ebuild b/dev-haskell/terminfo/terminfo-0.3.1.3.ebuild
deleted file mode 100644
index f48292284c3d..000000000000
--- a/dev-haskell/terminfo/terminfo-0.3.1.3.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/terminfo/terminfo-0.3.1.3.ebuild,v 1.7 2012/09/12 15:34:53 qnikst Exp $
-
-# ebuild generated by hackport 0.2.13
-
-EAPI="3"
-
-CABAL_FEATURES="lib profile haddock hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell bindings to the terminfo library."
-HOMEPAGE="http://code.haskell.org/terminfo"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.3
-		sys-libs/ncurses"
-
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.4"
diff --git a/dev-haskell/terminfo/terminfo-0.3.2.5.ebuild b/dev-haskell/terminfo/terminfo-0.3.2.5.ebuild
index b48bc66bed77..50d838ba4b6e 100644
--- a/dev-haskell/terminfo/terminfo-0.3.2.5.ebuild
+++ b/dev-haskell/terminfo/terminfo-0.3.2.5.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/terminfo/terminfo-0.3.2.5.ebuild,v 1.1 2012/11/25 06:08:50 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/terminfo/terminfo-0.3.2.5.ebuild,v 1.2 2013/02/13 21:26:15 slyfox Exp $
 
 EAPI=5
 
 # ebuild generated by hackport 0.3.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
+inherit autotools eutils haskell-cabal
 
 DESCRIPTION="Haskell bindings to the terminfo library."
 HOMEPAGE="http://code.haskell.org/terminfo"
@@ -22,3 +22,9 @@ RDEPEND=">=dev-lang/ghc-6.10.4:=
 		sys-libs/ncurses"
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.4"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+
+	eautoreconf
+}