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

10 files changed, 622 insertions, 0 deletions

diff --git a/www-apps/gitit/Manifest b/www-apps/gitit/Manifest
new file mode 100644
index 000000000000..577464675a45
--- /dev/null
+++ b/www-apps/gitit/Manifest
@@ -0,0 +1,5 @@
+DIST gitit-0.10.3.1.tar.gz 209218 SHA256 a5aabbac331436121d7178533fad5482fb0e4469852dea48b32063ef7ccea6ea SHA512 a288386bc539fb74d95a8061f30c2ea7fd59d94dedcfe0f383cae5c86ebf45d930df39db02bcd876ea4eccebf98942ec4f12cdec8a8f05d69b3133f495b3dd04 WHIRLPOOL beed0624576de2c38009f52090bd938496615278c76a7871834e78ad441f4fc13f18ef36d8e39798e735bad6cab574db426504a65b8addcb64852393c2dad7d6
+DIST gitit-0.10.6.1.tar.gz 265716 SHA256 c0ceb611e3e61f37af9e1fd1330a493ffbd07c59455cba988f35f3e881cadfd0 SHA512 92fa8c3687760b77023e5f999359544c0089b1d9eb84f2b65652abe0b70104f99befdafb344b052aba4cc46e1cabbcc332e30040fcc6243a745577770404b582 WHIRLPOOL 03e9143a6a00892e3bc24d7d2c3a5e90c0b5f2406113fe62867368aa828e4ce884d8f5d385c755addde9609abdb579d4959e70a3b2617a1c72816e89949a4df7
+DIST gitit-0.10.6.2.tar.gz 271290 SHA256 ea5b443479ee797e8d9c851818feb7fd90830a45e4bff2f740b4e256cd268f58 SHA512 4a7391b004bc8982e1400c4cbac68b89b089136dcd4d9cdeff4dd2c02f409697bc41f4bf1527f002c9957024d308a518d6e71a3fe8ef8cf9a22aec7010f2f7c5 WHIRLPOOL 961d72ddfe7f1548b972912c07b94d308dac79da0297ad77e7017eaa0cc78ca5290766b6063c2f775db6e37b02fb2ca56de528d10c01affea7ff5b5641899e6f
+DIST gitit-0.11.1.tar.gz 275587 SHA256 29bbb782e2066bf831ad1aff471208e928310fc9ab6bfb32a775cd7521f19d1b SHA512 f153e8f402ceed453a29fc8ba06587c13a9370ea351e20031e32b2797bd79ddfa5b77dd770244d8a682b8a283a80e8eca3270a2b3e411c1d5210d1449a946547 WHIRLPOOL 89a95d387f4d7f66ea0124acdaadb2c42f4d9c17b7f54d8eb2026737ac01c1cf02f9a6ce63ecf1f12f665638001641e91aecbf03c2e2add694acd8539c10679a
+DIST gitit-0.11.tar.gz 273093 SHA256 c94271744ec5fe846e1b3994fc0349f4a38120a8d60618bedc1909367acf63a0 SHA512 6a53ecc1d30058693e41a34d8fa6fa420d181d249c8ddda904f46b62d070e90f90af8bcc264a9d8d1cc0ef0b8112ec995e068f44ffb5c61ac241bf01b487a532 WHIRLPOOL 520f2f0a1fb9e2eaed6eb6530c47c0d3aef25c6bd5f3034401deffc0648ab3895eb7c70a9e828b0b51e9d13d883191083912cb68bb3cc231ccca4493bf31bd4a
diff --git a/www-apps/gitit/files/gitit-0.10.3.1-pandoc-1.12.patch b/www-apps/gitit/files/gitit-0.10.3.1-pandoc-1.12.patch
new file mode 100644
index 000000000000..c1f463ce499f
--- /dev/null
+++ b/www-apps/gitit/files/gitit-0.10.3.1-pandoc-1.12.patch
@@ -0,0 +1,129 @@
+commit 48155008397bdaed4f97c5678d83c70d4bc3f0ff
+Author: John MacFarlane <fiddlosopher@gmail.com>
+Date:   Sat Sep 14 19:24:01 2013 -0700
+
+    Changes to allow compilation with pandoc 1.12.
+    
+    TODO:  Better handling of images and other resources in
+    Docx, ODT, PDF exports.
+
+diff --git a/Network/Gitit/ContentTransformer.hs b/Network/Gitit/ContentTransformer.hs
+index 9bf656a..1489c4f 100644
+--- a/Network/Gitit/ContentTransformer.hs
++++ b/Network/Gitit/ContentTransformer.hs
+@@ -85,6 +85,7 @@ import Network.URI (isUnescapedInURI)
+ import Network.URL (encString)
+ import Prelude hiding (catch)
+ import System.FilePath
++import qualified Text.Pandoc.Builder as B
+ import Text.HTML.SanitizeXSS (sanitizeBalance)
+ import Text.Highlighting.Kate
+ import Text.Pandoc hiding (MathML, WebTeX, MathJax)
+@@ -452,8 +453,8 @@ addPageTitleToPandoc :: String -> Pandoc -> ContentTransformer Pandoc
+ addPageTitleToPandoc title' (Pandoc _ blocks) = do
+   updateLayout $ \layout -> layout{ pgTitle = title' }
+   return $ if null title'
+-              then Pandoc (Meta [] [] []) blocks
+-              else Pandoc (Meta [Str title'] [] []) blocks
++              then Pandoc nullMeta blocks
++              else Pandoc (B.setMeta "title" (B.str title') nullMeta) blocks
+ 
+ -- | Adds javascript links for math support.
+ addMathSupport :: a -> ContentTransformer a
+@@ -553,9 +554,10 @@ inlinesToString = concatMap go
+                LineBreak               -> " "
+                Math DisplayMath s      -> "$$" ++ s ++ "$$"
+                Math InlineMath s       -> "$" ++ s ++ "$"
+-               RawInline "tex" s       -> s
++               RawInline (Format "tex") s -> s
+                RawInline _ _           -> ""
+                Link xs _               -> concatMap go xs
+                Image xs _              -> concatMap go xs
+                Note _                  -> ""
++               Span _ xs               -> concatMap go xs
+ 
+diff --git a/Network/Gitit/Export.hs b/Network/Gitit/Export.hs
+index 2eb5c2c..38d5bfa 100644
+--- a/Network/Gitit/Export.hs
++++ b/Network/Gitit/Export.hs
+@@ -79,7 +79,7 @@ respondX templ mimetype ext fn opts page doc = do
+              then fixURLs page doc
+              else return doc
+   respond mimetype ext (fn opts{writerTemplate = template
+-                               ,writerSourceDirectory = repositoryPath cfg
++                               ,writerSourceURL = Just $ baseUrl cfg
+                                ,writerUserDataDir = pandocUserData cfg})
+           page doc'
+ 
+@@ -135,7 +135,7 @@ respondSlides templ slideVariant page doc = do
+                 writerVariables =
+                   ("body",body''):("dzslides-core",dzcore):("highlighting-css",pygmentsCss):variables'
+                ,writerTemplate = template
+-               ,writerSourceDirectory = repositoryPath cfg
++               ,writerSourceURL = Just $ baseUrl cfg
+                ,writerUserDataDir = pandocUserData cfg
+                } (Pandoc meta [])
+     h' <- liftIO $ makeSelfContained (pandocUserData cfg) h
+diff --git a/Network/Gitit/Types.hs b/Network/Gitit/Types.hs
+index a278633..87d6b29 100644
+--- a/Network/Gitit/Types.hs
++++ b/Network/Gitit/Types.hs
+@@ -400,7 +400,7 @@ type Handler = GititServerPart Response
+ fromEntities :: String -> String
+ fromEntities ('&':xs) =
+   case lookupEntity ent of
+-        Just c  -> c : fromEntities rest
++        Just c  -> c ++ fromEntities rest
+         Nothing -> '&' : fromEntities xs
+     where (ent, rest) = case break (\c -> isSpace c || c == ';') xs of
+                              (zs,';':ys) -> (zs,ys)
+diff --git a/data/default.conf b/data/default.conf
+index e2d6cae..8a6d818 100644
+--- a/data/default.conf
++++ b/data/default.conf
+@@ -238,8 +238,8 @@ use-feed: no
+ 
+ base-url:
+ # the base URL of the wiki, to be used in constructing feed IDs
+-# and RPX token_urls.  Set this if use-feed is 'yes' or
+-# authentication-method is 'rpx'.
++# and RPX token_urls, and in exporting docx and pdf.
++# Set this if use-feed is 'yes' or authentication-method is 'rpx'.
+ 
+ absolute-urls: no
+ # make wikilinks absolute with respect to the base-url.
+diff --git a/gitit.cabal b/gitit.cabal
+index 53bf8fb..07a76f7 100644
+--- a/gitit.cabal
++++ b/gitit.cabal
+@@ -117,8 +117,8 @@ Library
+     exposed-modules: Network.Gitit.Interface
+     build-depends:   ghc, ghc-paths
+     cpp-options:     -D_PLUGINS
+-  build-depends:     base >= 3, pandoc >= 1.10.0.5 && < 1.12,
+-                     pandoc-types >= 1.10 && < 1.11, filepath, safe
++  build-depends:     base >= 3, pandoc >= 1.12 && < 1.13,
++                     pandoc-types >= 1.12 && < 1.13, filepath, safe
+   extensions:        CPP
+   if impl(ghc >= 6.12)
+     ghc-options:     -Wall -fno-warn-unused-do-bind
+@@ -134,8 +134,8 @@ Executable           gitit
+                      pretty,
+                      xhtml,
+                      containers,
+-                     pandoc >= 1.10.0.5 && < 1.12,
+-                     pandoc-types >= 1.10 && < 1.11,
++                     pandoc >= 1.12 && < 1.13,
++                     pandoc-types >= 1.12 && < 1.13,
+                      process,
+                      filepath,
+                      directory,
+@@ -164,7 +164,7 @@ Executable           gitit
+                      ConfigFile >= 1 && < 1.2,
+                      feed >= 0.3.6 && < 0.4,
+                      xss-sanitize >= 0.3 && < 0.4,
+-                     tagsoup >= 0.12 && < 0.13,
++                     tagsoup >= 0.13 && < 0.14,
+                      blaze-html >= 0.4 && < 0.7,
+                      json >= 0.4 && < 0.8
+   if impl(ghc >= 6.10)
diff --git a/www-apps/gitit/files/gitit-0.10.3.1-tagsoup-0.13.patch b/www-apps/gitit/files/gitit-0.10.3.1-tagsoup-0.13.patch
new file mode 100644
index 000000000000..1c261b8bff79
--- /dev/null
+++ b/www-apps/gitit/files/gitit-0.10.3.1-tagsoup-0.13.patch
@@ -0,0 +1,22 @@
+diff --git a/Network/Gitit/Types.hs b/Network/Gitit/Types.hs
+index a278633..6f2b65f 100644
+--- a/Network/Gitit/Types.hs
++++ b/Network/Gitit/Types.hs
+@@ -1,4 +1,4 @@
+-{-# LANGUAGE TypeSynonymInstances, ScopedTypeVariables, FlexibleInstances #-}
++{-# LANGUAGE TypeSynonymInstances, ScopedTypeVariables, FlexibleInstances, CPP #-}
+ {-
+ Copyright (C) 2009 John MacFarlane <jgm@berkeley.edu>,
+ Anton van Straaten <anton@appsolutions.com>
+@@ -400,7 +400,11 @@ type Handler = GititServerPart Response
+ fromEntities :: String -> String
+ fromEntities ('&':xs) =
+   case lookupEntity ent of
++#if MIN_VERSION_tagsoup(0,13,0)
++        Just c  -> c ++ fromEntities rest
++#else
+         Just c  -> c : fromEntities rest
++#endif
+         Nothing -> '&' : fromEntities xs
+     where (ent, rest) = case break (\c -> isSpace c || c == ';') xs of
+                              (zs,';':ys) -> (zs,ys)
diff --git a/www-apps/gitit/files/gitit-0.10.6.2-ghc-7.10.patch b/www-apps/gitit/files/gitit-0.10.6.2-ghc-7.10.patch
new file mode 100644
index 000000000000..4644ff43ffa7
--- /dev/null
+++ b/www-apps/gitit/files/gitit-0.10.6.2-ghc-7.10.patch
@@ -0,0 +1,47 @@
+--- gitit-0.10.6.2-orig/Network/Gitit/Authentication.hs	2015-04-03 14:18:02.000000000 +1100
++++ gitit-0.10.6.2/Network/Gitit/Authentication.hs	2015-04-05 20:18:28.239989325 +1000
+@@ -1,4 +1,4 @@
+-{-# LANGUAGE ScopedTypeVariables #-}
++{-# LANGUAGE ScopedTypeVariables, FlexibleContexts #-}
+ {-
+ Copyright (C) 2009 John MacFarlane <jgm@berkeley.edu>,
+                    Henry Laxen <nadine.and.henry@pobox.com>
+--- gitit-0.10.6.2-orig/Network/Gitit/Feed.hs	2015-04-03 14:18:02.000000000 +1100
++++ gitit-0.10.6.2/Network/Gitit/Feed.hs	2015-04-05 20:19:13.496945226 +1000
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP #-}
+ {-
+ Copyright (C) 2009 Gwern Branwen <gwern0@gmail.com> and
+ John MacFarlane <jgm@berkeley.edu>
+@@ -22,7 +23,11 @@
+ module Network.Gitit.Feed (FeedConfig(..), filestoreToXmlFeed) where
+ 
+ import Data.Time (UTCTime, formatTime, getCurrentTime, addUTCTime)
++#if MIN_VERSION_time(1,5,0)
++import Data.Time (defaultTimeLocale)
++#else
+ import System.Locale (defaultTimeLocale)
++#endif
+ import Data.Foldable as F (concatMap)
+ import Data.List (intercalate, sortBy, nub)
+ import Data.Maybe (fromMaybe)
+--- gitit-0.10.6.2-orig/Network/Gitit/Types.hs	2015-04-03 14:18:02.000000000 +1100
++++ gitit-0.10.6.2/Network/Gitit/Types.hs	2015-04-05 20:17:34.038042036 +1000
+@@ -1,4 +1,4 @@
+-{-# LANGUAGE TypeSynonymInstances, ScopedTypeVariables, FlexibleInstances #-}
++{-# LANGUAGE TypeSynonymInstances, ScopedTypeVariables, FlexibleInstances, CPP #-}
+ {-
+ Copyright (C) 2009 John MacFarlane <jgm@berkeley.edu>,
+ Anton van Straaten <anton@appsolutions.com>
+@@ -72,7 +72,11 @@
+ import Data.Text (Text)
+ import Data.List (intersect)
+ import Data.Time (parseTime)
++#if MIN_VERSION_time(1,5,0)
++import Data.Time (defaultTimeLocale)
++#else
+ import System.Locale (defaultTimeLocale)
++#endif
+ import Data.FileStore.Types
+ import Network.Gitit.Server
+ import Text.HTML.TagSoup.Entity (lookupEntity)
diff --git a/www-apps/gitit/gitit-0.10.3.1-r3.ebuild b/www-apps/gitit/gitit-0.10.3.1-r3.ebuild
new file mode 100644
index 000000000000..cd12d895f072
--- /dev/null
+++ b/www-apps/gitit/gitit-0.10.3.1-r3.ebuild
@@ -0,0 +1,79 @@
+# 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="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Wiki using happstack, git or darcs, and pandoc"
+HOMEPAGE="http://gitit.net"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+plugins"
+
+RDEPEND=">=app-text/pandoc-1.12:=[profile?] <app-text/pandoc-1.13:=[profile?]
+		>=dev-haskell/base64-bytestring-0.1:=[profile?]
+		<dev-haskell/base64-bytestring-1.1:=[profile?]
+		>=dev-haskell/blaze-html-0.4:=[profile?]
+		<dev-haskell/blaze-html-0.8:=[profile?]
+		dev-haskell/cgi:=[profile?]
+		>=dev-haskell/configfile-1:=[profile?]
+		<dev-haskell/configfile-1.2:=[profile?]
+		>=dev-haskell/feed-0.3.6:=[profile?]
+		<dev-haskell/feed-0.4:=[profile?]
+		=dev-haskell/filestore-0.6*:=[profile?]
+		>=dev-haskell/happstack-server-7.0:=[profile?] <dev-haskell/happstack-server-7.4:=[profile?]
+		>=dev-haskell/highlighting-kate-0.5.0.1:=[profile?]
+		<dev-haskell/highlighting-kate-0.6:=[profile?]
+		>=dev-haskell/hslogger-1:=[profile?]
+		<dev-haskell/hslogger-1.3:=[profile?]
+		>=dev-haskell/hstringtemplate-0.6:=[profile?]
+		<dev-haskell/hstringtemplate-0.8:=[profile?]
+		>=dev-haskell/http-4000.0:=[profile?]
+		<dev-haskell/http-4000.3:=[profile?]
+		>=dev-haskell/json-0.4:=[profile?]
+		<dev-haskell/json-0.8:=[profile?]
+		dev-haskell/mtl:=[profile?]
+		>=dev-haskell/network-2.1.0.0:=[profile?]
+		<dev-haskell/network-2.5:=[profile?]
+		>=dev-haskell/pandoc-types-1.12:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?]
+		dev-haskell/parsec:=[profile?]
+		dev-haskell/random:=[profile?]
+		>=dev-haskell/recaptcha-0.1:=[profile?]
+		dev-haskell/safe:=[profile?]
+		>dev-haskell/sha-1:=[profile?]
+		<dev-haskell/sha-1.7:=[profile?]
+		dev-haskell/syb:=[profile?]
+		>=dev-haskell/tagsoup-0.13:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?]
+		dev-haskell/text:=[profile?]
+		=dev-haskell/url-2.1*:=[profile?]
+		=dev-haskell/utf8-string-0.3*:=[profile?]
+		dev-haskell/xhtml:=[profile?]
+		>=dev-haskell/xml-1.3.5:=[profile?]
+		=dev-haskell/xss-sanitize-0.3*:=[profile?]
+		=dev-haskell/zlib-0.5*:=[profile?]
+		>=dev-lang/ghc-6.12.1:=
+		plugins? ( dev-haskell/ghc-paths:=[profile?]
+		)"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.6"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-pandoc-1.12.patch
+
+	cabal_chdeps \
+		'happstack-server >= 7.0 && < 7.2' 'happstack-server >= 7.0 && < 7.4' \
+        'blaze-html >= 0.4 && < 0.7' 'blaze-html >= 0.4 && < 0.8'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag plugins plugins)
+}
diff --git a/www-apps/gitit/gitit-0.10.6.1-r4.ebuild b/www-apps/gitit/gitit-0.10.6.1-r4.ebuild
new file mode 100644
index 000000000000..94b4d46360da
--- /dev/null
+++ b/www-apps/gitit/gitit-0.10.6.1-r4.ebuild
@@ -0,0 +1,78 @@
+# 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.4.9999
+
+CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Wiki using happstack, git or darcs, and pandoc"
+HOMEPAGE="http://gitit.net"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri +plugins"
+
+RDEPEND=">=app-text/pandoc-1.12.4:=[profile?] <app-text/pandoc-1.14:=[profile?]
+	>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.9:=[profile?]
+	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
+	>=dev-haskell/blaze-html-0.4:=[profile?] <dev-haskell/blaze-html-0.8:=[profile?]
+	>=dev-haskell/configfile-1:=[profile?] <dev-haskell/configfile-1.2:=[profile?]
+	>=dev-haskell/feed-0.3.6:=[profile?] <dev-haskell/feed-0.4:=[profile?]
+	>=dev-haskell/filestore-0.6:=[profile?] <dev-haskell/filestore-0.7:=[profile?]
+	>=dev-haskell/happstack-server-7.0:=[profile?]
+	>=dev-haskell/highlighting-kate-0.5.0.1:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?]
+	>=dev-haskell/hoauth2-0.4.2:=[profile?] <dev-haskell/hoauth2-0.5:=[profile?]
+	>=dev-haskell/hslogger-1:=[profile?] <dev-haskell/hslogger-1.3:=[profile?]
+	>=dev-haskell/hstringtemplate-0.6:=[profile?] <dev-haskell/hstringtemplate-0.8:=[profile?]
+	>=dev-haskell/http-4000.0:=[profile?] <dev-haskell/http-4000.3:=[profile?]
+	>=dev-haskell/http-client-tls-0.2.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?]
+	>=dev-haskell/http-conduit-2.1.4:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?]
+	>=dev-haskell/json-0.4:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/pandoc-types-1.12.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?]
+	dev-haskell/parsec:=[profile?]
+	dev-haskell/random:=[profile?]
+	>=dev-haskell/recaptcha-0.1:=[profile?]
+	dev-haskell/safe:=[profile?]
+	>dev-haskell/sha-1:=[profile?] <dev-haskell/sha-1.7:=[profile?]
+	dev-haskell/split:=[profile?]
+	dev-haskell/syb:=[profile?]
+	>=dev-haskell/tagsoup-0.13:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-haskell/uri-0.1:=[profile?] <dev-haskell/uri-0.2:=[profile?]
+	>=dev-haskell/url-2.1:=[profile?] <dev-haskell/url-2.2:=[profile?]
+	>=dev-haskell/utf8-string-0.3:=[profile?]
+	>=dev-haskell/uuid-1.3:=[profile?] <dev-haskell/uuid-1.4:=[profile?]
+	dev-haskell/xhtml:=[profile?]
+	>=dev-haskell/xml-1.3.5:=[profile?]
+	>=dev-haskell/xss-sanitize-0.3:=[profile?] <dev-haskell/xss-sanitize-0.4:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
+	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+	plugins? ( dev-haskell/ghc-paths:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_prepare() {
+	cabal_chdeps \
+		'http-conduit >= 2.1.4 && < 2.1.5' 'http-conduit >= 2.1.4 && < 2.2' \
+		'json >= 0.4 && < 0.8' 'json >= 0.4' \
+		'happstack-server >= 7.0 && < 7.4' 'happstack-server >= 7.0' \
+		'utf8-string >= 0.3 && < 0.4' 'utf8-string >= 0.3'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri) \
+		$(cabal_flag plugins plugins)
+}
diff --git a/www-apps/gitit/gitit-0.10.6.2.ebuild b/www-apps/gitit/gitit-0.10.6.2.ebuild
new file mode 100644
index 000000000000..597f01707ab1
--- /dev/null
+++ b/www-apps/gitit/gitit-0.10.6.2.ebuild
@@ -0,0 +1,74 @@
+# 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="bin lib profile haddock hoogle hscolour"
+inherit base haskell-cabal
+
+DESCRIPTION="Wiki using happstack, git or darcs, and pandoc"
+HOMEPAGE="http://gitit.net"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri +plugins"
+
+RDEPEND=">=app-text/pandoc-1.12.4:=[profile?] <app-text/pandoc-1.14:=[profile?]
+	>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.9:=[profile?]
+	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
+	>=dev-haskell/blaze-html-0.4:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
+	>=dev-haskell/configfile-1:=[profile?] <dev-haskell/configfile-1.2:=[profile?]
+	>=dev-haskell/feed-0.3.6:=[profile?] <dev-haskell/feed-0.4:=[profile?]
+	>=dev-haskell/filestore-0.6:=[profile?] <dev-haskell/filestore-0.7:=[profile?]
+	>=dev-haskell/happstack-server-7.0:=[profile?] <dev-haskell/happstack-server-7.5:=[profile?]
+	>=dev-haskell/highlighting-kate-0.5.0.1:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?]
+	>=dev-haskell/hoauth2-0.4.2:=[profile?] <dev-haskell/hoauth2-0.5:=[profile?]
+	>=dev-haskell/hslogger-1:=[profile?] <dev-haskell/hslogger-1.3:=[profile?]
+	>=dev-haskell/hstringtemplate-0.6:=[profile?] <dev-haskell/hstringtemplate-0.9:=[profile?]
+	>=dev-haskell/http-4000.0:=[profile?] <dev-haskell/http-4000.3:=[profile?]
+	>=dev-haskell/http-client-tls-0.2.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?]
+	>=dev-haskell/http-conduit-2.1.4:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?]
+	>=dev-haskell/json-0.4:=[profile?] <dev-haskell/json-0.10:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/old-locale-1:=[profile?]
+	dev-haskell/old-time:=[profile?]
+	>=dev-haskell/pandoc-types-1.12.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?]
+	dev-haskell/parsec:=[profile?]
+	dev-haskell/random:=[profile?]
+	>=dev-haskell/recaptcha-0.1:=[profile?]
+	dev-haskell/safe:=[profile?]
+	>dev-haskell/sha-1:=[profile?] <dev-haskell/sha-1.7:=[profile?]
+	dev-haskell/split:=[profile?]
+	dev-haskell/syb:=[profile?]
+	>=dev-haskell/tagsoup-0.13:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-haskell/uri-0.1:=[profile?] <dev-haskell/uri-0.2:=[profile?]
+	>=dev-haskell/url-2.1:=[profile?] <dev-haskell/url-2.2:=[profile?]
+	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/uuid-1.3:=[profile?] <dev-haskell/uuid-1.4:=[profile?]
+	dev-haskell/xhtml:=[profile?]
+	>=dev-haskell/xml-1.3.5:=[profile?]
+	>=dev-haskell/xss-sanitize-0.3:=[profile?] <dev-haskell/xss-sanitize-0.4:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
+	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+	plugins? ( dev-haskell/ghc-paths:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+PATCHES=("${FILESDIR}/${PN}-0.10.6.2-ghc-7.10.patch")
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri) \
+		$(cabal_flag plugins plugins)
+}
diff --git a/www-apps/gitit/gitit-0.11.1.ebuild b/www-apps/gitit/gitit-0.11.1.ebuild
new file mode 100644
index 000000000000..bc3b205bdec9
--- /dev/null
+++ b/www-apps/gitit/gitit-0.11.1.ebuild
@@ -0,0 +1,72 @@
+# 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="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Wiki using happstack, git or darcs, and pandoc"
+HOMEPAGE="http://gitit.net"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri +plugins"
+
+RDEPEND=">=app-text/pandoc-1.12.4:=[profile?] <app-text/pandoc-1.16:=[profile?]
+	>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.10:=[profile?]
+	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
+	>=dev-haskell/blaze-html-0.4:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
+	>=dev-haskell/configfile-1:=[profile?] <dev-haskell/configfile-1.2:=[profile?]
+	>=dev-haskell/feed-0.3.6:=[profile?] <dev-haskell/feed-0.4:=[profile?]
+	>=dev-haskell/filestore-0.6:=[profile?] <dev-haskell/filestore-0.7:=[profile?]
+	>=dev-haskell/happstack-server-7.0:=[profile?] <dev-haskell/happstack-server-7.5:=[profile?]
+	>=dev-haskell/highlighting-kate-0.5.0.1:=[profile?] <dev-haskell/highlighting-kate-0.7:=[profile?]
+	>=dev-haskell/hoauth2-0.4.2:=[profile?] <dev-haskell/hoauth2-0.5:=[profile?]
+	>=dev-haskell/hslogger-1:=[profile?] <dev-haskell/hslogger-1.3:=[profile?]
+	>=dev-haskell/hstringtemplate-0.6:=[profile?] <dev-haskell/hstringtemplate-0.9:=[profile?]
+	>=dev-haskell/http-4000.0:=[profile?] <dev-haskell/http-4000.3:=[profile?]
+	>=dev-haskell/http-client-tls-0.2.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?]
+	>=dev-haskell/http-conduit-2.1.4:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?]
+	>=dev-haskell/json-0.4:=[profile?] <dev-haskell/json-0.10:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/old-locale-1:=[profile?]
+	dev-haskell/old-time:=[profile?]
+	>=dev-haskell/pandoc-types-1.12.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?]
+	dev-haskell/parsec:=[profile?]
+	dev-haskell/random:=[profile?]
+	>=dev-haskell/recaptcha-0.1:=[profile?]
+	dev-haskell/safe:=[profile?]
+	>dev-haskell/sha-1:=[profile?] <dev-haskell/sha-1.7:=[profile?]
+	dev-haskell/split:=[profile?]
+	dev-haskell/syb:=[profile?]
+	>=dev-haskell/tagsoup-0.13:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-haskell/uri-0.1:=[profile?] <dev-haskell/uri-0.2:=[profile?]
+	>=dev-haskell/url-2.1:=[profile?] <dev-haskell/url-2.2:=[profile?]
+	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/uuid-1.3:=[profile?] <dev-haskell/uuid-1.4:=[profile?]
+	dev-haskell/xhtml:=[profile?]
+	>=dev-haskell/xml-1.3.5:=[profile?]
+	>=dev-haskell/xss-sanitize-0.3:=[profile?] <dev-haskell/xss-sanitize-0.4:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
+	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+	plugins? ( dev-haskell/ghc-paths:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri) \
+		$(cabal_flag plugins plugins)
+}
diff --git a/www-apps/gitit/gitit-0.11.ebuild b/www-apps/gitit/gitit-0.11.ebuild
new file mode 100644
index 000000000000..bc3b205bdec9
--- /dev/null
+++ b/www-apps/gitit/gitit-0.11.ebuild
@@ -0,0 +1,72 @@
+# 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="bin lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Wiki using happstack, git or darcs, and pandoc"
+HOMEPAGE="http://gitit.net"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+network-uri +plugins"
+
+RDEPEND=">=app-text/pandoc-1.12.4:=[profile?] <app-text/pandoc-1.16:=[profile?]
+	>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.10:=[profile?]
+	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
+	>=dev-haskell/blaze-html-0.4:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
+	>=dev-haskell/configfile-1:=[profile?] <dev-haskell/configfile-1.2:=[profile?]
+	>=dev-haskell/feed-0.3.6:=[profile?] <dev-haskell/feed-0.4:=[profile?]
+	>=dev-haskell/filestore-0.6:=[profile?] <dev-haskell/filestore-0.7:=[profile?]
+	>=dev-haskell/happstack-server-7.0:=[profile?] <dev-haskell/happstack-server-7.5:=[profile?]
+	>=dev-haskell/highlighting-kate-0.5.0.1:=[profile?] <dev-haskell/highlighting-kate-0.7:=[profile?]
+	>=dev-haskell/hoauth2-0.4.2:=[profile?] <dev-haskell/hoauth2-0.5:=[profile?]
+	>=dev-haskell/hslogger-1:=[profile?] <dev-haskell/hslogger-1.3:=[profile?]
+	>=dev-haskell/hstringtemplate-0.6:=[profile?] <dev-haskell/hstringtemplate-0.9:=[profile?]
+	>=dev-haskell/http-4000.0:=[profile?] <dev-haskell/http-4000.3:=[profile?]
+	>=dev-haskell/http-client-tls-0.2.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?]
+	>=dev-haskell/http-conduit-2.1.4:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?]
+	>=dev-haskell/json-0.4:=[profile?] <dev-haskell/json-0.10:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/old-locale-1:=[profile?]
+	dev-haskell/old-time:=[profile?]
+	>=dev-haskell/pandoc-types-1.12.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?]
+	dev-haskell/parsec:=[profile?]
+	dev-haskell/random:=[profile?]
+	>=dev-haskell/recaptcha-0.1:=[profile?]
+	dev-haskell/safe:=[profile?]
+	>dev-haskell/sha-1:=[profile?] <dev-haskell/sha-1.7:=[profile?]
+	dev-haskell/split:=[profile?]
+	dev-haskell/syb:=[profile?]
+	>=dev-haskell/tagsoup-0.13:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-haskell/uri-0.1:=[profile?] <dev-haskell/uri-0.2:=[profile?]
+	>=dev-haskell/url-2.1:=[profile?] <dev-haskell/url-2.2:=[profile?]
+	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/uuid-1.3:=[profile?] <dev-haskell/uuid-1.4:=[profile?]
+	dev-haskell/xhtml:=[profile?]
+	>=dev-haskell/xml-1.3.5:=[profile?]
+	>=dev-haskell/xss-sanitize-0.3:=[profile?] <dev-haskell/xss-sanitize-0.4:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
+			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
+	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+	plugins? ( dev-haskell/ghc-paths:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-uri network-uri) \
+		$(cabal_flag plugins plugins)
+}
diff --git a/www-apps/gitit/metadata.xml b/www-apps/gitit/metadata.xml
new file mode 100644
index 000000000000..acf3c3ee2a46
--- /dev/null
+++ b/www-apps/gitit/metadata.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>haskell</herd>
+	<maintainer>
+		<email>haskell@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+		Gitit is a wiki backed by a git, darcs, or mercurial
+		filestore.  Pages and uploaded files can be modified either
+		directly via the VCS&#39;s command-line tools or through
+		the wiki&#39;s web interface. Pandoc is used for markup
+		processing, so pages may be written in
+		(extended) markdown, reStructuredText, LaTeX, HTML,
+		or literate Haskell, and exported in ten different
+		formats, including LaTeX, ConTeXt, DocBook, RTF,
+		OpenOffice ODT, and MediaWiki markup.
+		
+		Notable features include
+		
+		* plugins: dynamically loaded page
+		transformations written in Haskell (see
+		&quot;Network.Gitit.Interface&quot;)
+		
+		* conversion of TeX math to MathML for display in
+		web browsers
+		
+		* syntax highlighting of source code
+		files and code snippets
+		
+		* Atom feeds (site-wide and per-page)
+		
+		* a library, &quot;Network.Gitit&quot;, that makes it simple
+		to include a gitit wiki in any happstack application
+		
+		You can see a running demo at &lt;http://gitit.net&gt;.
+		
+		For usage information:  @gitit --help@
+	</longdescription>
+	<use>
+		<flag name='network-uri'>Get Network.URI from the network-uri package.</flag>
+		<flag name="plugins">enables optional plugin runtime loader</flag>
+	</use>
+</pkgmetadata>