proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

11 files changed, 389 insertions, 0 deletions

diff --git a/dev-haskell/cgi/Manifest b/dev-haskell/cgi/Manifest
new file mode 100644
index 000000000000..b79c96ea97ed
--- /dev/null
+++ b/dev-haskell/cgi/Manifest
@@ -0,0 +1,6 @@
+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
+DIST cgi-3001.1.8.5.tar.gz 21423 SHA256 46cfb262f95348e88629fe30a9a8319aec510601be3a550cfb02fb1267b2db39 SHA512 e8409f6fe09d789538a025cff1aa594b5206c75cd16a7e399914d83e42a2d1c09d5c18083d037c7c3e061518f49447aa8eb41ae7adabbd0663d00af420b677a2 WHIRLPOOL a637446f02b032f2b98c06f1f3f813e2222e7db82fc3790bb542f9fdfd445ac1b8755128e426061c95c6b00749a68642850d9c7ca84fb2617550202c209b8a07
+DIST cgi-3001.2.2.0.tar.gz 17184 SHA256 a9cbace379f7946ce5c5aefddfa7d823fb2e5f566aaa5c07a5066a10c18a817e SHA512 b6f5a9703fd903142c8b0a4f9d3fe47e3faf0b74bf8b61328e468cc236c91e77f6dce4e0f08486a496b67bfc70402080c78f3b238d5badfa7c1cfbf4488706e3 WHIRLPOOL 964601ff6beae2b3762fd73ba40ad8eb708ddf2785f4fb26c41cdf0e4afaf140f628e0c40d4d692435f3c1099b8aa8d35c160a99bd536937881a44d756ee6c2f
+DIST cgi-3001.2.2.1.tar.gz 17211 SHA256 35fc308be7da2c2bda7298c7e8e32829e9a8d253a05dfe4a8d4ef02a0c94f4b2 SHA512 0a139427dc9981d9b43195dae48594c14298df89364a4fde79b970a7a7100b92ac6105fe1cf94fa873ebf3f05bce6fac98bdaf8549beef0844edc0d47554bd1e WHIRLPOOL 72fb10de91a7c0e9468e9a2c80843dcc2cf13b457df772f7e914315f357d502dc635b990476fb69f40dce87c6e19a894568f95cc53cfa0e7e04122dc8bf172db
+DIST cgi-3001.2.2.2.tar.gz 17270 SHA256 23850f29cd80a5ac671c5663b8b3b3aae45e269c8db5a8216082c487d4ed3760 SHA512 cc59574d6f8711977e2f733c9a58378b6775b20de1ca07fb343f6b989a787e54bbeddb76ab8f6248cf80aebf007d8c31fbfaa03bbbde503d4402a7769957126d WHIRLPOOL 49b4347e35763077d5dedc47ef2b888f1ba4db49ea38b4a4f684a8b8fc163bfd1ddee04c0ce7bbe47fa08cf242bd19485a138c7e6630edc4c1358b03cde41a73
diff --git a/dev-haskell/cgi/cgi-3001.1.8.3.ebuild b/dev-haskell/cgi/cgi-3001.1.8.3.ebuild
new file mode 100644
index 000000000000..a261de46406d
--- /dev/null
+++ b/dev-haskell/cgi/cgi-3001.1.8.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.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/extensible-exceptions:=[profile?]
+		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.2"
diff --git a/dev-haskell/cgi/cgi-3001.1.8.4-r1.ebuild b/dev-haskell/cgi/cgi-3001.1.8.4-r1.ebuild
new file mode 100644
index 000000000000..321c7c389965
--- /dev/null
+++ b/dev-haskell/cgi/cgi-3001.1.8.4-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.2.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit base 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="+extensible-exceptions-in-base"
+
+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:=
+		!extensible-exceptions-in-base? ( dev-haskell/extensible-exceptions:=[profile?]
+		)"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.2"
+
+PATCHES=("${FILESDIR}"/${P}-mci.patch)
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag extensible-exceptions-in-base extensible-exceptions-in-base)
+}
diff --git a/dev-haskell/cgi/cgi-3001.1.8.4.ebuild b/dev-haskell/cgi/cgi-3001.1.8.4.ebuild
new file mode 100644
index 000000000000..f91cbff4436e
--- /dev/null
+++ b/dev-haskell/cgi/cgi-3001.1.8.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.2.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="+extensible-exceptions-in-base"
+
+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:=
+		!extensible-exceptions-in-base? ( dev-haskell/extensible-exceptions:=[profile?]
+		)"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.2"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag extensible-exceptions-in-base extensible-exceptions-in-base)
+}
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..52db1dc03050
--- /dev/null
+++ b/dev-haskell/cgi/cgi-3001.1.8.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="+extensible-exceptions-in-base"
+
+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:=
+	!extensible-exceptions-in-base? ( dev-haskell/extensible-exceptions:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6.0.3
+"
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-ghc78.patch
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag extensible-exceptions-in-base extensible-exceptions-in-base)
+}
diff --git a/dev-haskell/cgi/cgi-3001.2.2.0.ebuild b/dev-haskell/cgi/cgi-3001.2.2.0.ebuild
new file mode 100644
index 000000000000..f2648ef7612b
--- /dev/null
+++ b/dev-haskell/cgi/cgi-3001.2.2.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A library for writing CGI programs"
+HOMEPAGE="https://github.com/cheecheeo/haskell-cgi"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri"
+
+RDEPEND="<dev-haskell/exceptions-0.7:=[profile?]
+	>=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/multipart-0.1.2:=[profile?] <dev-haskell/multipart-0.2:=[profile?]
+	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/xhtml-3000.0.0:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
+	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri)
+}
diff --git a/dev-haskell/cgi/cgi-3001.2.2.1.ebuild b/dev-haskell/cgi/cgi-3001.2.2.1.ebuild
new file mode 100644
index 000000000000..4c8c14e18263
--- /dev/null
+++ b/dev-haskell/cgi/cgi-3001.2.2.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A library for writing CGI programs"
+HOMEPAGE="https://github.com/cheecheeo/haskell-cgi"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri"
+
+RDEPEND="<dev-haskell/exceptions-0.9:=[profile?]
+	>=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/multipart-0.1.2:=[profile?] <dev-haskell/multipart-0.2:=[profile?]
+	<dev-haskell/old-locale-1.1:=[profile?]
+	<dev-haskell/old-time-1.2:=[profile?]
+	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/xhtml-3000.0.0:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
+	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri)
+}
diff --git a/dev-haskell/cgi/cgi-3001.2.2.2.ebuild b/dev-haskell/cgi/cgi-3001.2.2.2.ebuild
new file mode 100644
index 000000000000..098e042cdd3e
--- /dev/null
+++ b/dev-haskell/cgi/cgi-3001.2.2.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+#hackport: flags: -old-mtl
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="A library for writing CGI programs"
+HOMEPAGE="https://github.com/cheecheeo/haskell-cgi"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri"
+
+RDEPEND="<dev-haskell/exceptions-0.9:=[profile?]
+	>=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/multipart-0.1.2:=[profile?] <dev-haskell/multipart-0.2:=[profile?]
+	<dev-haskell/old-locale-1.1:=[profile?]
+	<dev-haskell/old-time-1.2:=[profile?]
+	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/xhtml-3000.0.0:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-2.7:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
+	!network-uri? ( <dev-haskell/network-2.6:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri) \
+		--flag=-old-mtl
+}
diff --git a/dev-haskell/cgi/files/cgi-3001.1.8.4-mci.patch b/dev-haskell/cgi/files/cgi-3001.1.8.4-mci.patch
new file mode 100644
index 000000000000..b672947ab1f9
--- /dev/null
+++ b/dev-haskell/cgi/files/cgi-3001.1.8.4-mci.patch
@@ -0,0 +1,15 @@
+Gentoo-bug: https://bugs.gentoo.org/show_bug.cgi?id=497496
+Gentoo-Haskell-bug: https://github.com/gentoo-haskell/gentoo-haskell/issues/297
+diff --git a/Network/CGI/Monad.hs b/Network/CGI/Monad.hs
+index 758ab03..9c41fc3 100644
+--- a/Network/CGI/Monad.hs
++++ b/Network/CGI/Monad.hs
+@@ -119,7 +119,7 @@ catchCGI = catch
+ 
+ -- | Catches any exception thrown by an CGI action, and returns either
+ --   the exception, or if no exception was raised, the result of the action.
+-tryCGI :: (MonadCGI m, MonadCatchIO m) => m a -> m (Either SomeException a)
++tryCGI :: (MonadCGI m, MonadCatchIO m, Functor m) => m a -> m (Either SomeException a)
+ tryCGI = try
+ 
+ {-# DEPRECATED handleExceptionCGI "Use catchCGI instead." #-}
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))
diff --git a/dev-haskell/cgi/metadata.xml b/dev-haskell/cgi/metadata.xml
new file mode 100644
index 000000000000..bf336346991f
--- /dev/null
+++ b/dev-haskell/cgi/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<longdescription>
+		This is a Haskell library for writing CGI programs.
+	</longdescription>
+	<use>
+		<flag name="extensible-exceptions-in-base">Required to be
+                enabled for &gt;=dev-lang/ghc-7.</flag>
+	</use>
+	<use>
+		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">cheecheeo/haskell-cgi</remote-id>
+	</upstream>
+</pkgmetadata>