add new version, drop old

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xEAD50D64D8D3571A!)

4 files changed, 130 insertions, 27 deletions

diff --git a/dev-haskell/cgi/ChangeLog b/dev-haskell/cgi/ChangeLog
index c8432c029607..3e68b934d587 100644
--- a/dev-haskell/cgi/ChangeLog
+++ b/dev-haskell/cgi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/cgi
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cgi/ChangeLog,v 1.34 2014/01/11 14:59:52 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cgi/ChangeLog,v 1.35 2014/02/24 07:03:35 qnikst Exp $
+
+*cgi-3001.1.8.5 (24 Feb 2014)
+
+  24 Feb 2014; Alexander Vershilov <qnikst@gentoo.org> +cgi-3001.1.8.5.ebuild,
+  +files/cgi-3001.1.8.5-ghc78.patch, -cgi-3001.1.8.2.ebuild:
+  add new version, drop old
 
 *cgi-3001.1.8.4-r1 (11 Jan 2014)
 
diff --git a/dev-haskell/cgi/cgi-3001.1.8.2.ebuild b/dev-haskell/cgi/cgi-3001.1.8.2.ebuild
deleted file mode 100644
index 76408266f7dd..000000000000
--- a/dev-haskell/cgi/cgi-3001.1.8.2.ebuild
+++ /dev/null
@@ -1,26 +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/cgi/cgi-3001.1.8.2.ebuild,v 1.3 2012/12/28 22:24:15 slyfox Exp $
-
-# ebuild generated by hackport 0.2.9
-
-CABAL_FEATURES="lib profile haddock hscolour hoogle"
-inherit haskell-cabal
-
-DESCRIPTION="A library for writing CGI programs"
-HOMEPAGE="http://andersk.mit.edu/haskell/cgi/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="dev-haskell/monadcatchio-mtl
-		>=dev-haskell/mtl-1.0
-		>=dev-haskell/network-2.0
-		>=dev-haskell/parsec-2.0
-		>=dev-haskell/xhtml-3000.0.0
-		>=dev-lang/ghc-6.10.1"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.2"
diff --git a/dev-haskell/cgi/cgi-3001.1.8.5.ebuild b/dev-haskell/cgi/cgi-3001.1.8.5.ebuild
new file mode 100644
index 000000000000..c68c6f45d446
--- /dev/null
+++ b/dev-haskell/cgi/cgi-3001.1.8.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cgi/cgi-3001.1.8.5.ebuild,v 1.1 2014/02/24 07:03:35 qnikst Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.6.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A library for writing CGI programs"
+HOMEPAGE="http://andersk.mit.edu/haskell/cgi/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/monadcatchio-mtl:=[profile?]
+	>=dev-haskell/mtl-1.0:=[profile?]
+	>=dev-haskell/network-2.0:=[profile?]
+	>=dev-haskell/parsec-2.0:=[profile?]
+	>=dev-haskell/xhtml-3000.0.0:=[profile?]
+	>=dev-lang/ghc-6.10.4:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6.0.3
+"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ghc78.patch
+}
diff --git a/dev-haskell/cgi/files/cgi-3001.1.8.5-ghc78.patch b/dev-haskell/cgi/files/cgi-3001.1.8.5-ghc78.patch
new file mode 100644
index 000000000000..86766314132b
--- /dev/null
+++ b/dev-haskell/cgi/files/cgi-3001.1.8.5-ghc78.patch
@@ -0,0 +1,90 @@
+diff --git a/Network/CGI/Protocol.hs b/Network/CGI/Protocol.hs
+index 6b9d2ec..e9a14ff 100644
+--- a/Network/CGI/Protocol.hs
++++ b/Network/CGI/Protocol.hs
+@@ -11,7 +11,7 @@
+ -- An implementation of the program side of the CGI protocol.
+ --
+ -----------------------------------------------------------------------------
+-
++{-# LANGUAGE CPP, DeriveDataTypeable #-}
+ module Network.CGI.Protocol (
+   -- * CGI request
+   CGIRequest(..), Input(..), 
+@@ -44,7 +44,12 @@ import System.IO (Handle, hPutStrLn, stderr, hFlush, hSetBinaryMode)
+ import qualified Data.ByteString.Lazy.Char8 as BS
+ import Data.ByteString.Lazy.Char8 (ByteString)
+ 
++#if MIN_VERSION_base(4,7,0)
++import Data.Typeable
++#else
+ import Data.Typeable (Typeable(..), mkTyConApp, mkTyCon)
++#endif
++
+ 
+ import Network.CGI.Header
+ import Network.CGI.Multipart
+@@ -72,8 +77,10 @@ data CGIRequest =
+                }
+     deriving (Show)
+ 
++#if ! MIN_VERSION_base(4,7,0)
+ instance Typeable CGIResult where
+     typeOf _ = mkTyConApp (mkTyCon "Network.CGI.Protocol.CGIResult") []
++#endif
+ 
+ -- | The value of an input parameter, and some metadata.
+ data Input = Input {
+@@ -90,7 +97,11 @@ data Input = Input {
+ -- | The result of a CGI program.
+ data CGIResult = CGIOutput ByteString
+                | CGINothing
++#if MIN_VERSION_base(4,7,0)
++                 deriving (Show, Read, Eq, Ord, Typeable)
++#else
+                  deriving (Show, Read, Eq, Ord)
++#endif		 
+ 
+ --
+ -- * Running CGI actions
+
+
+diff --git a/Network/CGI/Monad.hs b/Network/CGI/Monad.hs
+index 2294f8c..7ed116c 100644
+--- a/Network/CGI/Monad.hs
++++ b/Network/CGI/Monad.hs
+@@ -1,4 +1,5 @@
+ {-# OPTIONS_GHC -fglasgow-exts #-}
++{-# LANGUAGE CPP, DeriveDataTypeable #-}
+ -----------------------------------------------------------------------------
+ -- |
+ -- Module      :  Network.CGI.Monad
+@@ -40,8 +41,12 @@ import Control.Monad.Error (MonadError(..))
+ import Control.Monad.Reader (ReaderT(..), asks)
+ import Control.Monad.Writer (WriterT(..), tell)
+ import Control.Monad.Trans (MonadTrans, MonadIO, liftIO, lift)
++#if MIN_VERSION_base(4,7,0)
++import Data.Typeable
++#else
+ import Data.Typeable (Typeable(..), Typeable1(..), 
+-                      mkTyConApp, mkTyCon)
++                      mkTyConApp, mkTyCon)		      
++#endif		      
+ 
+ import Network.CGI.Protocol
+ 
+@@ -55,10 +60,14 @@ type CGI a = CGIT IO a
+ 
+ -- | The CGIT monad transformer.
+ newtype CGIT m a = CGIT { unCGIT :: ReaderT CGIRequest (WriterT Headers m) a }
++#if MIN_VERSION_base(4,7,0)
++			deriving (Typeable)
+ 
++#else
+ instance (Typeable1 m, Typeable a) => Typeable (CGIT m a) where
+     typeOf _ = mkTyConApp (mkTyCon "Network.CGI.Monad.CGIT") 
+                 [typeOf1 (undefined :: m a), typeOf (undefined :: a)]
++#endif		
+ 
+ instance (Functor m, Monad m) => Functor (CGIT m) where
+     fmap f c = CGIT (fmap f (unCGIT c))