dev-haskell/haskeline: drop old, bug #621912

Reported-by: Ben Kohler
Reported-by: Michał Górny
Bug: https://bugs.gentoo.org/621912
Package-Manager: Portage-2.3.6, Repoman-2.3.2

diff --git a/dev-haskell/haskeline/Manifest b/dev-haskell/haskeline/Manifest
index 5ccfbdf8dc00d8733064ff53aa7ff457c2a2f28e..255985bed4a1808192e85f77fc4c984c7c46942d 100644 (file)
--- a/dev-haskell/haskeline/Manifest
+++ b/dev-haskell/haskeline/Manifest
@@ -1,5 +1,3 @@
-DIST haskeline-0.6.4.6.tar.gz 62349 SHA256 b2f2d275bd1f24370f13bd7607891ffdbbc7564d044dbbdabc5e83b27238d08c SHA512 86acc677e6c202ad311e343b1a58e4195b62ef78ca28b441a4203546c0d7e44a150eca50686b8ef1ef52bfd0eb1662db6d03c58b35c0d2da2a08ef501bd3a3b8 WHIRLPOOL 6a01921a7d3297f61bb3c4a0575580d42485aec59581314d7ba093f95288769b65a3c912bbed1a73903a6069388f368676994899be865a93c4d54c62e2666902
-DIST haskeline-0.6.4.7.tar.gz 62258 SHA256 301a7c21c73f52efe56763cf25d807d22dac3faea70538175ca843134524aaa2 SHA512 e31c186a93fd06318ea9b6998c0fa2eea64bc9f7c054cbd3704cdfdebcfede4e6acae966f5233b78eebaaa3c308310954197282103680790c308fb2b61338ba9 WHIRLPOOL 51f0bdadb7396a4ff3b7eef2d0b9a9bb2312d5a10a0612f5438cdae0d03e1694b21ca5cef4657e5863b0459b28e21d67261c0386a872386333d7fca6efc40345
 DIST haskeline-0.7.1.2.tar.gz 68251 SHA256 24f3c8be221b8eee25438afc7444a39a34a37a82376d195fcd83e357a8fa109d SHA512 11d3ee9507d10d14ad05a45eb269a70a661e755502c7a39c5516508e66bda7c0d56c0d91db3e6ea665ee532001bef246be14a95c12eb257724616753e2b93f6c WHIRLPOOL f3c573d3e27f4d12c1c466c35c080b721973907bcf9110a62dacedbc315e9acabbd7a403423d106efb12cc73f46de9e12bf3c992f2a801e5583ad1b0caf661ce
 DIST haskeline-0.7.1.3.tar.gz 68291 SHA256 b10e439b13f5dad8705cfdfabe1cfd2a9446a7ec1cfdfecf4321d6e48f759eaf SHA512 eed183edd1af5b9d77c61278c40f07599900793e47858771810b48cbd178c34a06264910dd5484f76e5a03e53551e1035e1d291d8e3577ec6f4f5a9ba8d61d5d WHIRLPOOL db91df0b3da4ef833412831a5b4324cba0da35f07526c3d7b327d5b0d7ce6030a954ef08659a4d296847028ef22eaff5b96b2dad34a3fbb6da739fb34231635c
 DIST haskeline-0.7.2.1.tar.gz 68409 SHA256 ae56a3c8ead8e33492e01921452db441568236c70df2a4f9086b08678ddf6427 SHA512 a2f790b9bb27cc8681567c3c0c3476231976d08a0e2d1e9fb69301f55511edd0221034ae8af27ec4c9db4b15f2d72b8b716d013518d0b8d15d98e859dbf0321b WHIRLPOOL ae40dced4b1c307312d673676e237845ab5ca66ce3701d961ca290778c1cf127592669de6d7421885f04683852c1e4b478e8aab1b0160996dcaafb8158282187

diff --git a/dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-6.12.patch b/dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-6.12.patch
deleted file mode 100644 (file)
index 3e9adc6..0000000
--- a/dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-6.12.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Workarounds build failure for ghc-6.12
-
-[18 of 27] Compiling System.Console.Haskeline.Backend.Terminfo ( System/Console/Haskeline/Backend/Terminfo.hs, dist/build/System/Console/Haskeline/Backend/Terminfo.o )
-
-System/Console/Haskeline/Backend/Terminfo.hs:200:9:
-    Inferred type is less polymorphic than expected
-          Quantified type variable `m' escapes
-              In the expression: Writer.tell
-                  In the definition of `output': output = Writer.tell
-diff --git a/System/Console/Haskeline/Backend/Terminfo.hs b/System/Console/Haskeline/Backend/Terminfo.hs
-index 1bd0373..d01e9ba 100644
---- a/System/Console/Haskeline/Backend/Terminfo.hs
-+++ b/System/Console/Haskeline/Backend/Terminfo.hs
-@@ -197,7 +197,7 @@ runActionT m = do
-     return x
- 
- output :: TermAction -> ActionM ()
--output = Writer.tell
-+output = \x -> Writer.tell x
- 
- outputText :: String -> ActionM ()
- outputText str = posixEncode str >>= output . const . termText . B.unpack

diff --git a/dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-7.5.patch b/dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-7.5.patch
deleted file mode 100644 (file)
index 086f05b..0000000
--- a/dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-7.5.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- haskeline-0.6.4.7-orig/haskeline.cabal     2012-05-14 04:29:12.000000000 +1000
-+++ haskeline-0.6.4.7/haskeline.cabal  2012-06-30 22:20:29.154377863 +1000
-@@ -50,7 +50,7 @@
-     }
-     else {
-         if impl(ghc>=6.11) {
--            Build-depends: base >=4.1 && < 4.6, containers>=0.1 && < 0.6, directory>=1.0 && < 1.2,
-+            Build-depends: base >=4.1 && < 4.7, containers>=0.1 && < 0.6, directory>=1.0 && < 1.2,
-                            bytestring>=0.9 && < 0.11
-         }
-         else {
---- haskeline-0.6.4.7-orig/System/Console/Haskeline/Monads.hs  2012-05-14 04:29:12.000000000 +1000
-+++ haskeline-0.6.4.7/System/Console/Haskeline/Monads.hs       2012-06-30 22:21:34.478861860 +1000
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE CPP #-}
- module System.Console.Haskeline.Monads(
-                 module Control.Monad.Trans,
-                 module System.Console.Haskeline.MonadException,
-@@ -18,7 +19,9 @@
- 
- import Control.Monad.Trans
- import System.Console.Haskeline.MonadException
-+#if !MIN_VERSION_base(4,6,0)
- import Prelude hiding (catch)
-+#endif
- 
- import Control.Monad.Reader hiding (MonadReader,ask,asks,local)
- import qualified Control.Monad.Reader as Reader
---- haskeline-0.6.4.7-orig/System/Console/Haskeline/MonadException.hs  2012-05-14 04:29:12.000000000 +1000
-+++ haskeline-0.6.4.7/System/Console/Haskeline/MonadException.hs       2012-06-30 22:21:29.657752340 +1000
-@@ -1,3 +1,4 @@
-+{-# LANGUAGE CPP #-}
- {- | This module redefines some of the functions in "Control.Exception.Extensible" to
- work for more general monads than only 'IO'.
- -}
-@@ -18,7 +19,9 @@
- 
- import qualified Control.Exception.Extensible as E
- import Control.Exception.Extensible(Exception,SomeException)
-+#if !MIN_VERSION_base(4,6,0)
- import Prelude hiding (catch)
-+#endif
- import Control.Monad.Reader
- import Control.Monad.State
- import Control.Concurrent(ThreadId)

diff --git a/dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-7.6.patch b/dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-7.6.patch
deleted file mode 100644 (file)
index f09a30a..0000000
--- a/dev-haskell/haskeline/files/haskeline-0.6.4.7-ghc-7.6.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/haskeline.cabal b/haskeline.cabal
-index 2fa8d2e..0f43bfe 100644
---- a/haskeline.cabal
-+++ b/haskeline.cabal
-@@ -50,7 +50,7 @@ Library
-     }
-     else {
-         if impl(ghc>=6.11) {
--            Build-depends: base >=4.1 && < 4.7, containers>=0.1 && < 0.6, directory>=1.0 && < 1.2,
-+            Build-depends: base >=4.1 && < 4.7, containers>=0.1 && < 0.6, directory>=1.0 && < 1.3,
-                            bytestring>=0.9 && < 0.11
-         }
-         else {
-@@ -102,7 +102,7 @@ Library
-         install-includes: win_console.h
-         cpp-options: -DMINGW
-     } else {
--        Build-depends: unix>=2.0 && < 2.6
-+        Build-depends: unix>=2.0 && < 2.7
-                         -- unix-2.3 doesn't build on ghc-6.8.1 or earlier
-         c-sources: cbits/h_iconv.c
-                    cbits/h_wcwidth.c

diff --git a/dev-haskell/haskeline/haskeline-0.6.4.6-r1.ebuild b/dev-haskell/haskeline/haskeline-0.6.4.6-r1.ebuild
deleted file mode 100644 (file)
index 8011617..0000000
--- a/dev-haskell/haskeline/haskeline-0.6.4.6-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# ebuild generated by hackport 0.2.14
-
-EAPI="4"
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="A command-line interface for user input, written in Haskell"
-HOMEPAGE="http://trac.haskell.org/haskeline"
-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-haskell/mtl-2.2[profile?]
-               >=dev-haskell/terminfo-0.3.1.3[profile?]
-               <dev-haskell/utf8-string-0.4[profile?]
-               >=dev-lang/ghc-6.10.4"
-DEPEND="${RDEPEND}
-               >=dev-haskell/cabal-1.6"
-
-src_prepare() {
-       sed -e 's@mtl >= 1.1 && < 2.1@mtl >= 1.1 \&\& < 2.2@' \
-               -i "${S}/${PN}.cabal" || die "Could not loosen dependencies"
-}

diff --git a/dev-haskell/haskeline/haskeline-0.6.4.7-r1.ebuild b/dev-haskell/haskeline/haskeline-0.6.4.7-r1.ebuild
deleted file mode 100644 (file)
index cdf51c6..0000000
--- a/dev-haskell/haskeline/haskeline-0.6.4.7-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit base haskell-cabal
-
-DESCRIPTION="A command-line interface for user input, written in Haskell"
-HOMEPAGE="http://trac.haskell.org/haskeline"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-haskell/extensible-exceptions-0.1.1.0:=[profile?]
-               <dev-haskell/extensible-exceptions-0.2:=[profile?]
-               >=dev-haskell/mtl-1.1:=[profile?]
-               <dev-haskell/mtl-2.2:=[profile?]
-               >=dev-haskell/terminfo-0.3.1.3:=[profile?]
-               <dev-haskell/terminfo-0.4:=[profile?]
-               >=dev-haskell/utf8-string-0.3.6:=[profile?]
-               <dev-haskell/utf8-string-0.4:=[profile?]
-               >=dev-lang/ghc-6.10.4:="
-DEPEND="${RDEPEND}
-               >=dev-haskell/cabal-1.6"
-
-PATCHES=("${FILESDIR}/${PN}-0.6.4.7-ghc-7.5.patch"
-       "${FILESDIR}/${PN}-0.6.4.7-ghc-7.6.patch"
-       "${FILESDIR}/${PN}-0.6.4.7-ghc-6.12.patch"
-       )