From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7F4CB138334 for ; Fri, 19 Jul 2019 07:03:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ABF3EE07F6; Fri, 19 Jul 2019 07:03:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7E678E07F6 for ; Fri, 19 Jul 2019 07:03:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 40E80348096 for ; Fri, 19 Jul 2019 07:03:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 225796E6 for ; Fri, 19 Jul 2019 07:03:48 +0000 (UTC) From: "Sergei Trofimovich" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergei Trofimovich" Message-ID: <1563519820.16bd6ea96ff5d6acbbbc2d4542abe43d3735fa17.slyfox@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-haskell/editline/files/, dev-haskell/editline/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-haskell/editline/editline-0.2.1.1-r1.ebuild dev-haskell/editline/files/editline-0.2.1.1-tinfo.patch X-VCS-Directories: dev-haskell/editline/files/ dev-haskell/editline/ X-VCS-Committer: slyfox X-VCS-Committer-Name: Sergei Trofimovich X-VCS-Revision: 16bd6ea96ff5d6acbbbc2d4542abe43d3735fa17 X-VCS-Branch: master Date: Fri, 19 Jul 2019 07:03:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e5c567e2-40c9-480f-8561-11004e52eb38 X-Archives-Hash: 7e066cc93dade37f9c35d8e68f318d49 commit: 16bd6ea96ff5d6acbbbc2d4542abe43d3735fa17 Author: Sergei Trofimovich gentoo org> AuthorDate: Fri Jul 19 07:02:41 2019 +0000 Commit: Sergei Trofimovich gentoo org> CommitDate: Fri Jul 19 07:03:40 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16bd6ea9 dev-haskell/editline: fix build against ncurses[tinfo], bug #689988 Reported-by: Toralf Förster Closes: https://bugs.gentoo.org/689988 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Sergei Trofimovich gentoo.org> dev-haskell/editline/editline-0.2.1.1-r1.ebuild | 36 ++++++++++++++++++++++ .../editline/files/editline-0.2.1.1-tinfo.patch | 13 ++++++++ 2 files changed, 49 insertions(+) diff --git a/dev-haskell/editline/editline-0.2.1.1-r1.ebuild b/dev-haskell/editline/editline-0.2.1.1-r1.ebuild new file mode 100644 index 00000000000..d235b455832 --- /dev/null +++ b/dev-haskell/editline/editline-0.2.1.1-r1.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# ebuild generated by hackport 0.3.9999 + +CABAL_FEATURES="lib profile haddock hoogle hscolour" +inherit autotools eutils haskell-cabal + +DESCRIPTION="Bindings to the editline library (libedit)" +HOMEPAGE="http://code.haskell.org/editline" +SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=">=dev-lang/ghc-6.10.4:= + dev-libs/libedit" +DEPEND="${RDEPEND} + >=dev-haskell/cabal-1.2" + +PATCHES=( + "${FILESDIR}"/${P}-ghc-7.8.patch + "${FILESDIR}"/${P}-tinfo.patch +) + +src_prepare() { + default + eautoconf + + cabal_chdeps \ + 'base < 4.7' 'base' +} diff --git a/dev-haskell/editline/files/editline-0.2.1.1-tinfo.patch b/dev-haskell/editline/files/editline-0.2.1.1-tinfo.patch new file mode 100644 index 00000000000..2f073b6a2c7 --- /dev/null +++ b/dev-haskell/editline/files/editline-0.2.1.1-tinfo.patch @@ -0,0 +1,13 @@ +https://bugs.gentoo.org/689988 +--- a/configure.ac ++++ b/configure.ac +@@ -31,7 +31,8 @@ dnl does it. + AC_CHECK_LIB(curses, tgetent, HaveLibTermcap=YES; LibTermcap=curses, + [AC_CHECK_LIB(ncurses, tgetent, HaveLibTermcap=YES; LibTermcap=ncurses, + [AC_CHECK_LIB(termcap, tgetent, HaveLibTermcap=YES; LibTermcap=termcap, +- HaveLibTermcap=NO; LibTermcap=not-installed)])]) ++ [AC_CHECK_LIB(tinfo, tgetent, HaveLibTermcap=YES; LibTermcap=tinfo, ++ HaveLibTermcap=NO; LibTermcap=not-installed)])])]) + + if test "x$HaveLibTermcap" = xYES ; then + HaveLibEdit=YES