summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wright <gienah@gentoo.org>2015-01-04 12:57:10 +0000
committerMark Wright <gienah@gentoo.org>2015-01-04 12:57:10 +0000
commit747af18e2c1a7bf967de5121bd72c4f0d5e38040 (patch)
treea3eec3e852e211e823cb6bc55f88ea6ea0417ecc /dev-haskell
parentStabilize on alpha/amd64/ia64/ppc/ppc64/sparc/x86 (diff)
downloadhistorical-747af18e2c1a7bf967de5121bd72c4f0d5e38040.tar.gz
historical-747af18e2c1a7bf967de5121bd72c4f0d5e38040.tar.bz2
historical-747af18e2c1a7bf967de5121bd72c4f0d5e38040.zip
Bump conduit-extra to 1.1.6.1, patched for ghc 7.10.1 RC1 https://github.com/snoyberg/conduit/pull/195
Package-Manager: portage-2.2.15/cvs/Linux x86_64 Manifest-Sign-Key: 0x618E971F
Diffstat (limited to 'dev-haskell')
-rw-r--r--dev-haskell/conduit-extra/ChangeLog11
-rw-r--r--dev-haskell/conduit-extra/Manifest11
-rw-r--r--dev-haskell/conduit-extra/conduit-extra-1.1.6.1.ebuild42
-rw-r--r--dev-haskell/conduit-extra/files/conduit-extra-1.1.6.1-ghc-7.10.patch8
4 files changed, 66 insertions, 6 deletions
diff --git a/dev-haskell/conduit-extra/ChangeLog b/dev-haskell/conduit-extra/ChangeLog
index 40ab754747b8..95e895eb1004 100644
--- a/dev-haskell/conduit-extra/ChangeLog
+++ b/dev-haskell/conduit-extra/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for dev-haskell/conduit-extra
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/conduit-extra/ChangeLog,v 1.5 2014/12/22 07:30:02 gienah Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/conduit-extra/ChangeLog,v 1.6 2015/01/04 12:57:02 gienah Exp $
+
+*conduit-extra-1.1.6.1 (04 Jan 2015)
+
+ 04 Jan 2015; Mark Wright <gienah@gentoo.org> +conduit-extra-1.1.6.1.ebuild,
+ +files/conduit-extra-1.1.6.1-ghc-7.10.patch:
+ Bump conduit-extra to 1.1.6.1, patched for ghc 7.10.1 RC1
+ https://github.com/snoyberg/conduit/pull/195
*conduit-extra-1.1.5.1 (22 Dec 2014)
diff --git a/dev-haskell/conduit-extra/Manifest b/dev-haskell/conduit-extra/Manifest
index 1ea8271a8aac..016581464cdd 100644
--- a/dev-haskell/conduit-extra/Manifest
+++ b/dev-haskell/conduit-extra/Manifest
@@ -1,18 +1,21 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
+AUX conduit-extra-1.1.6.1-ghc-7.10.patch 382 SHA256 f9732eab55ba99db3a4363817d392922fbc8dce49f668da4bcc0a9e3e801f99f SHA512 38221763d8840f696f3cfa006f56c7b0839d052add2ece93853c39432dc16e5c64f21b6395134c1c816f7afc0227d3e2ed26d2a8fd367aa6fea9112db3d403e4 WHIRLPOOL 3f0c1602e203eaa821560789c03a21e83802e8c54a6bd019ecf9663a75a1441b361cbee85086fbf7e043c123db8564f9a3446684fd7be203f06d0e605eb6e4f1
DIST conduit-extra-1.1.1.tar.gz 24216 SHA256 e29bad31e8da3b1ccd33ab07d57b61634b914b46a457190fd5ea81f5cf9be6a0 SHA512 a8771addd9650b55d0ad98a188229314003d915a027ed37b8639a9217177afee3440029aeb0337036445a0b22212e2d5558027eb57c4c1e36d4f3953b980a018 WHIRLPOOL 18c4af4d6365c1b8a5c26282458c0a384a8ffff5e32e76e240fb51a0e31e7c8e27d1f8aa9a49dfe832150ee4e2a4907c8ca4f926522ebaf6ed58bdd79c0eda30
DIST conduit-extra-1.1.4.2.tar.gz 27321 SHA256 2f7c1de24befbafbdc711c2e4312b8d969de410276e6457d23208867147b4f68 SHA512 4c2095379da921a31e0620884b863a4e94b063227ca8c2e27dcf9c084c0a426694f44abd82ca12a88d4854360ca04b8398b48e21c38734e6b8d0927723ad906a WHIRLPOOL fe5941570db22e32347b6a091991de8c389e55b063049659652ea61326c0b7522c6445fa66848bb8a8fa56d0d94a74322b16c1b511015f4504ae4f564968f93a
DIST conduit-extra-1.1.5.1.tar.gz 27559 SHA256 81a1461b102bc25620f4123b1e3c0e037d1c57511e79e718b07734c7cc33631a SHA512 71cc13689f7230a70c72482ad61eb8f791088e48bfa136dc4058db736f6b895e5e40e96e27d603c1689b196a56b0f042e526a3106678632bbfdbabb261b5d6d3 WHIRLPOOL b79516758771244857a3d077e4bc1d572749445d8a8f0970e93c95c9692e0b8f8c82906dd9a988f892775f167fefc6b5202b580041c90b5ccacc74ee01082c5c
+DIST conduit-extra-1.1.6.1.tar.gz 27602 SHA256 90f4337609ff2128c72154064e22c3bbad1492f30d583eecda73fa3f70251575 SHA512 0a28de48653f263658a05676763bd5920e699c6f06fe95cbb6441cad7dc7dd270d016f695414e1357240464bb09a2c8983748a2fa747c4df9fd73129447b5e72 WHIRLPOOL a20b316b92a6dfb2fbe85b9e1f57375ba8e5dcbaac67d34545f9101bedcce0711fdd3429da2ff1a09bc097b0525d8f1a031f84438b822333908d98b96b7f746c
EBUILD conduit-extra-1.1.1.ebuild 1247 SHA256 fc719230ca27a7287bb0ba9ba6dd72ed1f18d3f6f979d3f769cde924c73f04e0 SHA512 2db58c02e44b83a0c79ca75358cfbaf21082734ea365717e5e577592e9ecaa57e53654b8d1220b3a3c0358a23a0a5d3dd2af3128663c949140d4963cca125704 WHIRLPOOL d054600f0cb6b86cb9a0711a9120e77f3cab4d756d873107d9f84aba00fda0cd51a636baf5421318d97a055edcb85459b460b3682e964a35a39fe315384c137a
EBUILD conduit-extra-1.1.4.2.ebuild 1298 SHA256 1858947453b1aab56d6fff220d161c34b74611701e932ac68d371bd6609d6f21 SHA512 ff6eeb6b3934ebcfc54ed57bc102a42b33c7c549da0c2db5462795ebb8473692fe869387ab3b9a092b96e906dd3e7fb868b4c3df9313ec41e47e9a45e772f910 WHIRLPOOL 0b953de74b26cba5e71e816020f60c5f136c7b3c81075e324171a566c2ee037bc8af83237b6454f579804c1b8f7332ce931d91b020358828d69a5c4f6a8d0e52
EBUILD conduit-extra-1.1.5.1.ebuild 1298 SHA256 6056f06446c81357b5bddbcfa974c295d0fec2ec6db64f41fc1f0366738dcd8e SHA512 dbbe10b2a63a6ae56bf09ad6acbd4cfeadb341f8f8e011176a12a6d42a07b404533c34c03b2ec489d1a6808181365ac84163f5100cb1570e5a60833972d53527 WHIRLPOOL 43edd4aa3b02251e42fddf71396d9eb67f156871148b0d4c33d966ad26b58d7833eaf0bfc8a8ab08cc3b4c8c3e122aa011c8b49928cd8de38b100d71546b40e9
-MISC ChangeLog 932 SHA256 870e0ee8bacb2552feca41ece558a79abc2af3b82fae12d49e99da97f72d38b7 SHA512 6f457f9c1f0031d8049a827f7c6ce5f58d9056406e87a6011cca3cb9fefe16d993802c44423e686091881a1cd8eccf867571017109715fbca06e2ce1a908193d WHIRLPOOL 35ba13f801c435c7549c6b7b4191c9b84c15a0415221d0a1863ca1eddc5bf0d6adde7f68748461d7316c8aaa58efaf45493ece0f0e1c0dee35a0faad0336d822
+EBUILD conduit-extra-1.1.6.1.ebuild 1357 SHA256 15c930227eeb25a9c2cad0edb51040e204a00e577780989327981bb7564a42b9 SHA512 9578134e39f62c47b40c0ea7a3871c6405083d347d487dba22c0c0801ce6e1386b9ed5307d61c09950a002b93079ebf63605883b9900deebf9009ce8d20e4c00 WHIRLPOOL 1b629cb23c3af7e8f744e1898ce980ec8daf40a873b0e74c8187d7ea132eef0efe043ba0f98cef9249cc5a0b7a0332efb4fefbf133172cd7b713a7b48fd8c5d5
+MISC ChangeLog 1203 SHA256 718841fa391cbf71046e89c6a519bdfe85c01ed73695f1256647922b3c7a1e4e SHA512 aa9ff5c58c7798d6e937313bdbbeb5f025bc11db6492c84d23d6b24e5b47ac7343cfc38348e99e4e50b331d034759f7d0565ecf5bf278d5f20cf78c9dca60d0d WHIRLPOOL 8dcfea1f9b934094a7fce697b7a964376687efc9ff0ce03a6d610af85a14a054518b509783af530bcbbf3a3a9e1b49b2bdd00109d475deb82a91aeb379164e89
MISC metadata.xml 313 SHA256 d2b96779600d48c744c76b14e7c555423e921e5f0688de00314e40bf5ea9fddd SHA512 b793fe04ad8bb26c5f24055939b5ef756026a4c649d6737f1c46a9ba5eb4befd8e2f6f26f18afdb4007d6a9d67f4b43364808de5c83a790c43ba25583b990f7d WHIRLPOOL 2dfa6eb73eeaf118540787ef6e48a08f2a01b4c7dab373c6c68675170d719420a35a516970737db8e2a324451ee79b1542c216c5e3ea4b373cfde9b248bdb92c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iF4EAREIAAYFAlSXyH8ACgkQoBEVQmGOlx8nSgD6A2o5hyJHJglY6mCIDm27B/rr
-MTS279vHwBNL5EVDXtcBAKPUOkraXOC0XEfwKGssQQV+wW6UgSYdB1Bs80s8a3dd
-=0OGm
+iF4EAREIAAYFAlSpOKUACgkQoBEVQmGOlx+zyQEAuiCxP9iXfcdRKAl+OwOrrckQ
+5d9T81UAe/7FN515wDMBAJQhgZ/r17cOI0CaIu/iurC9fNtdqm008w8DA73KC4Fs
+=nRWT
-----END PGP SIGNATURE-----
diff --git a/dev-haskell/conduit-extra/conduit-extra-1.1.6.1.ebuild b/dev-haskell/conduit-extra/conduit-extra-1.1.6.1.ebuild
new file mode 100644
index 000000000000..76b755e9b04d
--- /dev/null
+++ b/dev-haskell/conduit-extra/conduit-extra-1.1.6.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/conduit-extra/conduit-extra-1.1.6.1.ebuild,v 1.1 2015/01/04 12:57:02 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit base haskell-cabal
+
+DESCRIPTION="Batteries included conduit: adapters for common libraries"
+HOMEPAGE="http://github.com/snoyberg/conduit"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/attoparsec-0.10:=[profile?]
+ >=dev-haskell/blaze-builder-0.3:=[profile?]
+ >=dev-haskell/conduit-1.1:=[profile?] <dev-haskell/conduit-1.3:=[profile?]
+ dev-haskell/monad-control:=[profile?]
+ >=dev-haskell/network-2.3:=[profile?]
+ >=dev-haskell/primitive-0.5:=[profile?]
+ >=dev-haskell/resourcet-1.1:=[profile?]
+ dev-haskell/stm:=[profile?]
+ >=dev-haskell/streaming-commons-0.1.8:=[profile?]
+ dev-haskell/text:=[profile?]
+ dev-haskell/transformers:=[profile?]
+ dev-haskell/transformers-base:=[profile?]
+ >=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+ >=dev-haskell/cabal-1.8
+ test? ( dev-haskell/async
+ dev-haskell/exceptions
+ >=dev-haskell/hspec-1.3 )
+"
+
+PATCHES=("${FILESDIR}/${PN}-1.1.6.1-ghc-7.10.patch")
diff --git a/dev-haskell/conduit-extra/files/conduit-extra-1.1.6.1-ghc-7.10.patch b/dev-haskell/conduit-extra/files/conduit-extra-1.1.6.1-ghc-7.10.patch
new file mode 100644
index 000000000000..29768e902d0c
--- /dev/null
+++ b/dev-haskell/conduit-extra/files/conduit-extra-1.1.6.1-ghc-7.10.patch
@@ -0,0 +1,8 @@
+--- conduit-extra-1.1.6.1-orig/test/Data/Conduit/TextSpec.hs 2015-01-04 19:32:04.000000000 +1100
++++ conduit-extra-1.1.6.1/test/Data/Conduit/TextSpec.hs 2015-01-04 23:39:46.786637326 +1100
+@@ -1,4 +1,4 @@
+-{-# LANGUAGE OverloadedStrings #-}
++{-# LANGUAGE FlexibleContexts, OverloadedStrings #-}
+ module Data.Conduit.TextSpec (spec) where
+
+ import qualified Data.Conduit.Text as CT