add new version, drop old

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xEAD50D64D8D3571A!

5 files changed, 143 insertions, 33 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/Manifest b/dev-haskell/cgi/Manifest
index e4eeab5a290b..319f2e6186cb 100644
--- a/dev-haskell/cgi/Manifest
+++ b/dev-haskell/cgi/Manifest
@@ -2,19 +2,26 @@
 Hash: SHA256
 
 AUX cgi-3001.1.8.4-mci.patch 713 SHA256 efdd11fbd322f463c41b107a97aee6e09c11835a06956e66974b32c09b29d20b SHA512 4aed38d7b8c8cd90018c00220799d947287ce81fdd41a550a4cfada40df151f9248f9b76a02795f2724af5e440f865f662aea5de4168d742ae63a32784ab6d82 WHIRLPOOL 223f44f3cac76a88ddc6537bcba35b1a6f63bb836bff4c99128569e46817003021c454dd957be635c8ffb273404334b3e1144f0eabae1e3605b36047c3b909cb
-DIST cgi-3001.1.8.2.tar.gz 21380 SHA256 ff554133be634cd61ca53929182e919d9c8784e1e5461eb01ca64c56ec3a9e26 SHA512 0b26c1f80898162a4d80d492c67c29f821e0a9232187d82eb3d17178155a0528100ca69f3415dda0401f90d12b2dd15f66efaac7e083eac761d4c2a8e7cf8da4 WHIRLPOOL 605851e9a8cb3c94d31757e8523bbde84b92b8514e51cdd219e289a73483b3d157f2124c0147f3e87b5ae2745635f5095a3ddb3c43162b0e07305ebb859758c7
+AUX cgi-3001.1.8.5-ghc78.patch 2824 SHA256 4ace1c94221d12142fb3a4987039f8555799bd2bedf82c3e74d42d6da9a0069f SHA512 cef79686d4196cb8bd15fabb0deb69382dcfe2907f59565cf1f77ceb31c83f20dcd0ab07430da0c217594bfe13bddebe9b4aafca197229e0788a2b813843de9a WHIRLPOOL 1c7641c95296793fd699d02fd0670ca90c61602bc3724372f17f3ba7398844f13068defd7cbabe3a3a418e9cc568a4f02abc274de550ea9e010382abb42e098f
 DIST cgi-3001.1.8.3.tar.gz 21319 SHA256 c4e92212f55c89d59e3319d5bc7011e715aef1695525b77b38f468d731d84cdd SHA512 421ed1a7c7548f1785a693074807fab91cdf4c86b9085a0520b0ffc6127cf53b095dfc07e6f9ed65d475445a28e485ec219d742de369e6271c0c6fe5e7599957 WHIRLPOOL 0634c08ae1fa409cde4c7e95a62d9fefe531e56061101e8ec256bc5a4d7d227a2fb1a14e3b234f97d8448b130674d66b29d48242533441e190b7c87cdbecfae8
 DIST cgi-3001.1.8.4.tar.gz 21421 SHA256 f6d11fc59d1d3651d628bdf2b36c1a735c08334956701dec2d0f05d572b61ec0 SHA512 0ccbad2b1393cf4149c84eaf9d5601ce976998554cf9240a61a72348eee917869c7b1e00286b22dcac3280c79c551e2947c1040ddeac3c1ec91483dbe2c18ed0 WHIRLPOOL bb51330b2d30ddf2c82d4dc87a568234e23abe785f9a33513cd359a6e28cdedc374fb33da131458ecd53d515833f2fd160a62de0afb1f2068692e8e634764826
-EBUILD cgi-3001.1.8.2.ebuild 792 SHA256 5a07a5909f2b7217bedc6d6f415785dad08da701f970767bcdbbdf0abc253d2f SHA512 5f54267a2831a380ffb407780465194cde9142bda9d11a8fdeaec6e45933d94befb38d95247002db9f7e72a000d757c7980d8ed20346a919a8b28c65ca0f78c7 WHIRLPOOL 328b4d90efd92af02696576c5d0883250db983f81cd68c7f6ebce8d2d8e22548e982fcafcf730351277db3d2d561f0d0164901b4f4ed5649313a61657532247b
+DIST cgi-3001.1.8.5.tar.gz 21423 SHA256 46cfb262f95348e88629fe30a9a8319aec510601be3a550cfb02fb1267b2db39 SHA512 e8409f6fe09d789538a025cff1aa594b5206c75cd16a7e399914d83e42a2d1c09d5c18083d037c7c3e061518f49447aa8eb41ae7adabbd0663d00af420b677a2 WHIRLPOOL a637446f02b032f2b98c06f1f3f813e2222e7db82fc3790bb542f9fdfd445ac1b8755128e426061c95c6b00749a68642850d9c7ca84fb2617550202c209b8a07
 EBUILD cgi-3001.1.8.3.ebuild 911 SHA256 6b2b250e36eaed6d453c1d399da6f3bdb99b043a50fa2822aee99df9ef245b9c SHA512 70df8edbdcc63693a054733b3a206fec87310cf92e2dc4b5416a8dff1bf5c4fefc4005477e3d58e625a8c114e1c76792bfb1befff4d3620c4309bfed7c752e1c WHIRLPOOL 22036c0e601ae0df0734f065d2f016204c5dbe447839582b453f8fad5be1111cb661fd532312df5b0485d78d8330bbc44564698a1798987f4603d88fb5be925c
 EBUILD cgi-3001.1.8.4-r1.ebuild 1165 SHA256 6a030ee39d0c6590b8dbc41f6cd25dab049a0cda660740f85c182975f5609ad2 SHA512 e3d45a07096c97d5d0a262b8104324c413aebe0c303a3613070629f0c8b0269f0a6c94843eb72e59ba529a65e6720dc327c8b31d8b07cd21d5d98997c603a603 WHIRLPOOL fd9b50253fc4a99a064f61cc7245948ff810d36eddf0bac026c3978a61bd6a402f488904159bc1cd26471b85bffc0b4130a5a288d9536f9fe6776364ebc1bc8b
 EBUILD cgi-3001.1.8.4.ebuild 1112 SHA256 29dd2efa1fec4bd917d5c28150101276082212053e314086b0e3e4c65a37006a SHA512 34e57ee8a4b5f1bf8cca7cdfd94e9b05afd40cee49536f4f34af9bccf8320f34f884fe01eb23c7c857dbf5b44ddede22ef549e9771f1bc0d47045b32e7371f53 WHIRLPOOL ff43ea85898e86797fd262cc8c2a5d9a4669a335e0d2d0dc6371d775613a53a267e09550a47bfec0c5b4f065fe297c2294f66aab906b1027b6ed0bf60d01ca10
-MISC ChangeLog 4699 SHA256 137904b06d0cf150e01f2fbcda59b2faa26135e16c0f559b0ce9325a625210d7 SHA512 aaff8efd2aae6a81807516d6a7eb4ac71903a4b4cf9d83855fe8cbdfd8d651068bb0b01ac1f0bd80061ff71d0c215482c6d51ecfd831bf0ddb24602e7106d14b WHIRLPOOL 47ea06fd69a33edb1fe0920539d65598d7fad1a1530b1c8ab197409316f47da23b74eb4f96143c1f2706d3621137f9fdcfe4f05c135a7e116772598288fb586e
+EBUILD cgi-3001.1.8.5.ebuild 930 SHA256 00673687a49692d11c14da5eb77bc6d04790d38c6498b15f9ec54b84742faf65 SHA512 4f45e3fb54723a7548c481d5adcd4b37d01aab98ae0473cfeb715ecb624845f970bc200ffde4534d364fcfc9576fc839fc90c2cb27fedd760c97353e18665f70 WHIRLPOOL ebefe4730c1f353b1731f8ed3a452929aeb6eea2aa4d000114d4b0643e2669036f3db038b61a3949b060268c4d9f9a240a6da86e380eadcfb49e16775fbb80d8
+MISC ChangeLog 4899 SHA256 b60c8ca8796f60eadfe28928890388f11144bf93f158b9043d9b60d0ee9fbcc7 SHA512 b6329bc946dc402a24a96ef726d70d522e099d15e628c2d9812a216f66ab8b4c9d9296e8a662a6d49d0ba6d08ea93047cc78ddaa33499a43f3c2ca969be42396 WHIRLPOOL 03a24e3ef31709441c817d340cab7bcbea1cbb260c8502664a9d1348c08a4068a76a10da73aad442cb2532a91c0b2ee6038ae0052bd2fe2bd4af4789ea1eeed8
 MISC metadata.xml 454 SHA256 54efa9a8eb6e1a2cabec3db13efbe4ad92806ef268b4a179583cfcb53e55de8d SHA512 73d35607d998c51fe658b83c91eb9c34906384b763af8045af65a13059df55ccdaeacea2b40d2d835b16adeaae22a23ec3650ac7a165e9a4a4b7b787447127ee WHIRLPOOL 1107ac3d2a6160ce94ebbd52959cf39617f02b37f1b3b7e9ec5f75362b7bb180bb1540217f645ffbc7fc3008577ea5e230628e50b64d2cea04f69a2ae0c8cedc
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlLRWycACgkQcaHudmEf86qwMgCdFLpYZgWK59Cnmj237Ag9Ym9r
-cc8AnjR8eXmzBpsvQRQVOHjOqBd14av3
-=duUW
+iQF8BAEBCABmBQJTCu7QXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwMTlGQTEwRTVCMUJCNjdFRDM5Qzg3RjdF
+QUQ1MEQ2NEQ4RDM1NzFBAAoJEOrVDWTY01caaLMH/R15GgFk3LhQBpoYrjDnreab
+HEIjUlIGt/k+D0h13AKgSMys7ieqNuslJwYuRsXaW3ldjz2qOyE6RtswHa1I4Xxk
++azdezcpwuVWz51fTMPqJv1a14YBMlbUt7uAEklhILsGs1bOklymzCNzHzS33AtT
+DfR+iLhI27ZQWkQq5GE/iR6ATj/U68mcZBZu4Oarj4T52pVkjEIOXkmWeEgL+F31
+ujpSYsWpgHeV7Ih+BWLeoMCNy6To0V1j/X2ao7AF2utPo+yv+d5llRkQWaevhpx+
+xzXFCaP+LzeRLDVhLGLbmmaQGyFRkBNCVO5MqRbsN+jPc/wDswfHtd9IpfFRG1Y=
+=/Wje
 -----END PGP SIGNATURE-----
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))