From a8009be496487ba3d14376401461f9f19f33858d Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Mon, 19 Jan 2015 22:30:11 +0000 Subject: [PATCH] =?utf8?q?Port=20to=20ghc-7.8=20(bug=20#537058=20by=20Tora?= =?utf8?q?lf=20F=C3=B6rster).?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x611FF3AA --- dev-haskell/editline/ChangeLog | 9 +++++++-- dev-haskell/editline/Manifest | 15 +++++++------- dev-haskell/editline/editline-0.2.1.0.ebuild | 20 ------------------- dev-haskell/editline/editline-0.2.1.1.ebuild | 17 +++++++++++----- .../files/editline-0.2.1.1-ghc-7.8.patch | 13 ++++++++++++ 5 files changed, 39 insertions(+), 35 deletions(-) delete mode 100644 dev-haskell/editline/editline-0.2.1.0.ebuild create mode 100644 dev-haskell/editline/files/editline-0.2.1.1-ghc-7.8.patch diff --git a/dev-haskell/editline/ChangeLog b/dev-haskell/editline/ChangeLog index e6ed1657dd6f..88a501b5b319 100644 --- a/dev-haskell/editline/ChangeLog +++ b/dev-haskell/editline/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-haskell/editline -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/editline/ChangeLog,v 1.4 2014/07/25 09:16:37 slyfox Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/editline/ChangeLog,v 1.5 2015/01/19 22:30:07 slyfox Exp $ + + 19 Jan 2015; Sergei Trofimovich + +files/editline-0.2.1.1-ghc-7.8.patch, -editline-0.2.1.0.ebuild, + editline-0.2.1.1.ebuild: + Port to ghc-7.8 (bug #537058 by Toralf Förster). 25 Jul 2014; Sergei Trofimovich editline-0.2.1.0.ebuild, editline-0.2.1.1.ebuild: diff --git a/dev-haskell/editline/Manifest b/dev-haskell/editline/Manifest index 95ff5f7ca45f..60dd6000ea81 100644 --- a/dev-haskell/editline/Manifest +++ b/dev-haskell/editline/Manifest @@ -1,16 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST editline-0.2.1.0.tar.gz 43928 SHA256 83618e5f86074fdc11d7f5033aa2886284462941be38fa02966acc92712c46e1 SHA512 ea3ab9e12c8e35bfc4e050bf66bdd1ab94cce8dd3fa91b455a8bdefc872f702f74717a511bc3b8d6bade663f20cff493d98a642379a5a84a569241c79150a0b3 WHIRLPOOL 7f215b4a3fb3996052e0bdcdb6cda0c3b0aa1543907bb41e6e9f6d6d900accb446312c2632a97e8d45b7b3d5b17d3b0d8df4c9f7c0cff439764706c5de6ae7dc +AUX editline-0.2.1.1-ghc-7.8.patch 564 SHA256 5032c65916f172ec5ff9ec47e40bffcf6b03ace00bffee880d819eb059416171 SHA512 e3c9742d854294a77e6a646dc7d2b4fe96c9d2ad6d9c789278dfe7a6b20b55ee27da732f630211bcb705e5443cce1de716762dbe5f0b1c01fd5457a771cb8a93 WHIRLPOOL 4f12832a5539dd893ca6b2d5c6de8110de96814c026f9884ac1c75e68536e78343e101266f22636081f35348d9b8083fc8b704091916e41d9a8f851b8f0e209e DIST editline-0.2.1.1.tar.gz 47240 SHA256 9fb64f89a38ad847de7d3537e9dff75d8fcebd12fc789a175cc892a0e4873f80 SHA512 c4fa4438ecf318637ff42292411024f9df86d3edab5ac2107fe3978a9778ce03f62348fc4cf9c5a2f06e74e1abf0c8963f5a6d686113ba31a5c59fd7a75295d6 WHIRLPOOL 4b254eabcf6edb0d20a2bf7546b628656fd1dc5009cf1684c74b8871fa3d0402f3acdde3ec00bc69c9d43c44d2c6432fc92b8429ec7b87f28976c2407ecee909 -EBUILD editline-0.2.1.0.ebuild 608 SHA256 87882238727f7acb0d06495aece974654b9afc083db95040d4c3683278957a3d SHA512 83c1a761626d9303e22ee8fedc36d6511f8e11842668e6e6b40f5f3672837615097a96dd7d0a614878e7128b62cee6f78c2dacc80d7dc6b857dfb72bb863c2ed WHIRLPOOL fb8d4bdeb7e68065b0897d2368ba6d0eb9699a108aae442e38bc983e19ba835d241c9b636f0cc1dd8a16ee22f54b1f7e026c677aa6e8ab7d2eb3ac604eac87b0 -EBUILD editline-0.2.1.1.ebuild 682 SHA256 88ff52a4d71ee342bde17599b02329481940ab07740a35d1eaa297c4a75bb50b SHA512 946f44d2ce13535d39294820bab02880dc9eca1a4da924bbcfecf3f75980dd029519d0ed3c26dca27e05e6cb14715dff15324140ad45279a77c2fccd72d03e86 WHIRLPOOL c92d6d8f82d4cb586e4936f1ff6a70de5a703503272364cbf3288c8eb3cc5f28994dfdde919de723178b5485e476607764c220d01428b574c834b2d82498dd53 -MISC ChangeLog 796 SHA256 e3580e1082b6adeea257ab7d464a55ad89da3f8dc4028bff9106ecd3735f2790 SHA512 fd8246860b8b4c9cf3dbc51c9f5eda39192c8bef9d5e11b92104474523aecbdb51a899936f14bb46ff56a5baa80af75b1b997894c584bf44692ff837963977c1 WHIRLPOOL 92dfd0ce8ccfc55c27ba28bf206fd93cb5bd0309e48fd54e3c72e891d912b582cde0538fd467b9a9304d44cddb1f0cc992e243ce8774df4cda4516c0d8388f15 +EBUILD editline-0.2.1.1.ebuild 786 SHA256 8c6a10b95073c31956df6ad53a589e81e57f50c416a852aedef17f71fd57413f SHA512 b8ded8b44279669dbd09026a3b9bbaddb3f142df486535d661a7ea5f1069df6edee5f7706fb4db260531f8fd77e469858f3abcede993409dd76d1e2518005ac7 WHIRLPOOL f1d0965bda90656b088a718a586d58b22a599ba126a8bed1ea714a8c3fab77e6b18b7cdc0d69e8b48385ecba63a9591afa3311f0485903389311f2df80c2ceb8 +MISC ChangeLog 997 SHA256 0bc02fceb3f198c26b62a1d3e2fca923583865998394249d41fd18aaff11a9ea SHA512 e01d26ea5a00dd2339600be39fbb901980913e9c86b52ea21a0edb00ee221dbf88f6d6ca76c035746fcc489034bb0e8a839768760610aa8e16bfcbc31476ed50 WHIRLPOOL 125c3d463ab5841a8b117efbd40061fe0a4fa08f46d1cfab7ba983438e7899f34369284768fce9feb509a15d2475783f1ae7dfd4f8aa03ae18ffc52c27d8ed4b MISC metadata.xml 223 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 SHA512 24765bbf1cb187cd262aa7fb3824c1cec65e2bf3f2198099de688916d96401a26458265b15408f22b1fbd6d6a2842df814a57ceda80dfa00d130b24423b7544f WHIRLPOOL 8fd6700f6198db6540eb51edf11372faeb6eb8a542a692e515badf236f62444f2c180f7d08e0f98e9fdfa23de14631b31af50543469aaa27084d6b637e2644c7 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iEYEAREIAAYFAlPSIPQACgkQcaHudmEf86q49gCfedhZDXKexFAV/6m/osHRZZaO -3MUAoIV3OxTIyf0IDPaqRh3lPXbfmOr/ -=kuY4 +iEYEAREIAAYFAlS9hXMACgkQcaHudmEf86q7DgCeKwQtGEk0o9XEGRCX/hccGmI/ +oZMAn1XxfSM228zeAzL5+BwDhz/1T7+c +=919f -----END PGP SIGNATURE----- diff --git a/dev-haskell/editline/editline-0.2.1.0.ebuild b/dev-haskell/editline/editline-0.2.1.0.ebuild deleted file mode 100644 index 2a0eca3332b5..000000000000 --- a/dev-haskell/editline/editline-0.2.1.0.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/editline/editline-0.2.1.0.ebuild,v 1.3 2014/07/25 09:16:37 slyfox Exp $ - -CABAL_FEATURES="lib profile haddock" -inherit 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" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-lang/ghc-6.6.1 - dev-libs/libedit" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.2" diff --git a/dev-haskell/editline/editline-0.2.1.1.ebuild b/dev-haskell/editline/editline-0.2.1.1.ebuild index 3bfbf7321de9..0886afe3a1d3 100644 --- a/dev-haskell/editline/editline-0.2.1.1.ebuild +++ b/dev-haskell/editline/editline-0.2.1.1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/editline/editline-0.2.1.1.ebuild,v 1.2 2014/07/25 09:16:37 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/editline/editline-0.2.1.1.ebuild,v 1.3 2015/01/19 22:30:07 slyfox Exp $ EAPI=5 # ebuild generated by hackport 0.3.9999 CABAL_FEATURES="lib profile haddock hoogle hscolour" -inherit haskell-cabal +inherit eutils haskell-cabal DESCRIPTION="Bindings to the editline library (libedit)" HOMEPAGE="http://code.haskell.org/editline" @@ -19,6 +19,13 @@ KEYWORDS="~amd64 ~x86" IUSE="" RDEPEND=">=dev-lang/ghc-6.10.4:= - dev-libs/libedit" + dev-libs/libedit" DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.2" + >=dev-haskell/cabal-1.2" + +src_prepare() { + epatch "${FILESDIR}"/${P}-ghc-7.8.patch + + cabal_chdeps \ + 'base < 4.7' 'base' +} diff --git a/dev-haskell/editline/files/editline-0.2.1.1-ghc-7.8.patch b/dev-haskell/editline/files/editline-0.2.1.1-ghc-7.8.patch new file mode 100644 index 000000000000..4a55ecd5626b --- /dev/null +++ b/dev-haskell/editline/files/editline-0.2.1.1-ghc-7.8.patch @@ -0,0 +1,13 @@ +diff --git a/System/Console/Editline/Readline.hsc b/System/Console/Editline/Readline.hsc +index 1ea9d6c..3b95b59 100644 +--- a/System/Console/Editline/Readline.hsc ++++ b/System/Console/Editline/Readline.hsc +@@ -173,7 +173,7 @@ import Foreign.Marshal.Array ( mallocArray, peekArray0, pokeArray0 ) + import Foreign.C.Types ( CInt(..), CChar, CFile ) + import Foreign.C.String ( newCString, peekCString, withCString, + castCharToCChar, castCCharToChar ) +-import GHC.Handle ( fdToHandle ) ++import GHC.IO.Handle.FD ( fdToHandle ) + + {-# CFILES HsReadline_cbits.c #-} + -- 2.26.2