Bump gitit to 0.10.6.2, patched for ghc 7.10.1

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

4 files changed, 135 insertions, 5 deletions

diff --git a/www-apps/gitit/ChangeLog b/www-apps/gitit/ChangeLog
index f0a9037417dc..6c6a6a1450b5 100644
--- a/www-apps/gitit/ChangeLog
+++ b/www-apps/gitit/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/gitit
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/gitit/ChangeLog,v 1.5 2015/03/05 22:00:08 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gitit/ChangeLog,v 1.6 2015/04/05 10:44:05 gienah Exp $
+
+*gitit-0.10.6.2 (05 Apr 2015)
+
+  05 Apr 2015; Mark Wright <gienah@gentoo.org>
+  +files/gitit-0.10.6.2-ghc-7.10.patch, +gitit-0.10.6.2.ebuild:
+  Bump gitit to 0.10.6.2, patched for ghc 7.10.1
 
 *gitit-0.10.6.1-r4 (05 Mar 2015)
 
diff --git a/www-apps/gitit/Manifest b/www-apps/gitit/Manifest
index a9adcc3ff612..81d94c130b1d 100644
--- a/www-apps/gitit/Manifest
+++ b/www-apps/gitit/Manifest
@@ -3,16 +3,19 @@ Hash: SHA256
 
 AUX gitit-0.10.3.1-pandoc-1.12.patch 5581 SHA256 8da14df0f57bc695c6b9962e23a2dae9f9b20caaaf2333389405f014609e3879 SHA512 18e9bb4357dee7d43ff16f6c60f2335bbe18d85f0ae4e3826a726f94d83cacc39d315151a93ff8b8f44d403c910fa44c888e738a1377d6c3c6f76b32622f9678 WHIRLPOOL 55fb7998f7476815957b0519d7595babea9d34731a97393ad73815efeae25bd63f8c66b13df9b858b50a6039dcdb6e0d073f1700506461aa9948582f4cf7ba4d
 AUX gitit-0.10.3.1-tagsoup-0.13.patch 881 SHA256 462502c31eafdaaf5657f10575d44bfccc202288b90662df9fd13c05690ac181 SHA512 ecb2ac8ac1c9f589e36aaca9fd7bebbfedde127b384524051d264e8e808dc886f2fdd295cd68e414d9a0b7ca6073116bcb5b43f9ce54060a499fdcb85796cb07 WHIRLPOOL 7480a8b3717735304e90f36d5ab8aba6d04cff5787888feafbd930d6850fd638167f68e2ec320ae328cd42e0bb36c1f279fd94eded7740dc2340c6102415aee2
+AUX gitit-0.10.6.2-ghc-7.10.patch 1881 SHA256 deaeaecfeca85d86c168f776c25a567bedf3b69a7ae11fc1bbb9d363e821caa1 SHA512 78468f50df36ccbe3b7ec5411cd7873e2dc17a5c2b298b8baacf286526c6cecf22c1fe895ca3d9687a78ecc07bb5054cef6867517f0233139eadc033202bfdde WHIRLPOOL f875fcd7fbe260fdc86d14c3eea760230e457974d1fee14a5fadbe347851c6fae0aeb68bf35a486f91b35d13493eedb13e46200c9be9b745536625079fd2715a
 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
 EBUILD gitit-0.10.3.1-r3.ebuild 2808 SHA256 4023401b80c4b393d157283d89e27ab2bffc7f29c5d9242af65902205f289075 SHA512 c5067d326d28cf99c030dcb9c2a31f9542d7d37b709cbcb602d63bf149549b1239ed0c9193ac97f474d939d7acf1b12eec957f533e6b0ed3f7ec827728f3bce3 WHIRLPOOL b5745fc78782189cd513ae0321be5852f0cf6c048aeedca9ad8ac589222604d0de939344039221f8149b056d1be0ef11f1e559ce18a9c268552bc2e80189e644
 EBUILD gitit-0.10.6.1-r4.ebuild 3551 SHA256 c24fd858d8f162738eae1499590abbb40d1b93e1f525903f459c1948df126dfb SHA512 d402bd3b77001863f7457cd72f0ba0437b4cd3699e2e24c793c8274d5d5fc8691647f07c041ba7d65e4ed51043d03d7c5b604b36b05394ca1925a0be058b72f2 WHIRLPOOL 22a7acc012a7387f95563e946f5ec08de09e573057c99e49afa8ac6285298ac7801c919ca06cda7504c8f7d05fb71c9c6af9b6219e0033ebfe2f604098ec1553
-MISC ChangeLog 979 SHA256 52b13fc83bc504d2256cade4f049a6d8168731580dca5a1cdaeaea78649d6844 SHA512 a32cd675b34f6bb09a497a04c94b6c9c199c0112ad4a3231f2b80c8a694c20015fcfda8b3537f723faed1af31bc9f47bc7050a2582b4baf62b49a2325d9218fe WHIRLPOOL f7de30d2fb86881fe6cc722546d70470d6927767ddf92581ad4da45731ab5364007a70b09d2b4024bf9169e1cccae161070664e86d875787d688410c66efd71e
+EBUILD gitit-0.10.6.2.ebuild 3538 SHA256 95d1d09db682ef523943145d0c3bda04ff032236cd263c9c03eb31309688152a SHA512 703f745684f87a954a637f52c726d7f7691fedcf47c0b64b609c099606c48ba35f98ab31e77303e0b9eae608976d92d4b03ceeaf709485a39e950114ca544da8 WHIRLPOOL b36e6bd4a313ddeae65eeddd5526aec93cdc2cb442366611c7ee56fd59fefe86818f44c4035651d6615b5374fe192154c952499a1624e313f5266a90b1af0b24
+MISC ChangeLog 1171 SHA256 a75c71de114b6e474a27208ced48d20214a256a7d8884300fbb1e497f0227b36 SHA512 6f4f5020f40c36f0951be6d96ef43bf223f1d53986ce5f1290236af58e595109dee9d56b1cd7e73af6d53ad7e71f5a94a6f66776c447422999c7de63f590f66c WHIRLPOOL cab6e5d51ee758ca84f04d8aea2b3960da48b29ff51ab3fcbf7731e6710dfdcafadf9df8cf91ddeafb081305856d2bda884b8fffae6bdf044e8c1609f0eccb18
 MISC metadata.xml 1460 SHA256 799f184dc4ce53073e2c8db4f680540643ee7054c9f2434fbe8b4f733a6dadfa SHA512 5c0a3cbeec6e1b3052e3d2f19380e9bd8a1bdc2fc7a05aa957dcd52aa58e59270fccb04cbfd9e2d3bf28da7f6ef8187923cd1734c8130f314d0ddd2bea481657 WHIRLPOOL c548b9a61d6f0507321ce1b92f18becc001b5c115dafd0847e3a22b32c5e4bb41bff013731da8360b3243cf894d522341467649582d2da694b96552e74809118
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlT40dIACgkQcaHudmEf86pe3gCePKqeP/UjcJfoBoZeRs9A6iub
-ZS0An21zhI1jBt8w4D5+sWmn8x1rlDAE
-=ln1d
+iF4EAREIAAYFAlUhEfsACgkQoBEVQmGOlx/WHAEAms78URmi7RDW8bgkdTwkpnJ0
+V1EI6hMpl2a1q6NaXSUBALIJgtk6wZUAW4//GpyIGLua4L8BJ8mbrcuBcNb6HDdU
+=Z51C
 -----END PGP SIGNATURE-----
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.6.2.ebuild b/www-apps/gitit/gitit-0.10.6.2.ebuild
new file mode 100644
index 000000000000..a1cf62a1ffe0
--- /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
+# $Header: /var/cvsroot/gentoo-x86/www-apps/gitit/gitit-0.10.6.2.ebuild,v 1.1 2015/04/05 10:44:05 gienah Exp $
+
+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)
+}