bump contravariant to 1.3

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

5 files changed, 74 insertions, 6 deletions

diff --git a/dev-haskell/contravariant/ChangeLog b/dev-haskell/contravariant/ChangeLog
index 357c62537aca..87f59062f1c6 100644
--- a/dev-haskell/contravariant/ChangeLog
+++ b/dev-haskell/contravariant/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/contravariant
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/contravariant/ChangeLog,v 1.5 2015/01/01 02:23:47 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/contravariant/ChangeLog,v 1.6 2015/03/11 11:56:46 gienah Exp $
+
+*contravariant-1.3 (11 Mar 2015)
+
+  11 Mar 2015; Mark Wright <gienah@gentoo.org> +contravariant-1.3.ebuild,
+  +files/contravariant-1.3-ghc-7.10.patch, metadata.xml:
+  bump contravariant to 1.3
 
 *contravariant-1.2.0.1 (01 Jan 2015)
 
diff --git a/dev-haskell/contravariant/Manifest b/dev-haskell/contravariant/Manifest
index a420def40167..6b22828856c8 100644
--- a/dev-haskell/contravariant/Manifest
+++ b/dev-haskell/contravariant/Manifest
@@ -1,20 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX contravariant-1.3-ghc-7.10.patch 372 SHA256 0189027eb152b9f7254b5680a01645b87fe63ed6c72c4f483c0a76dfc8ab095e SHA512 c0c8284a654213b1d62bc7a51ba7fad6668efdf221d890f9e216abb30fc88405260d69e0b25228de013e9de77dd0a80c0dc52e73d29bf13bf281ab7e677be660 WHIRLPOOL d824fbad19198f39b4fe24a7d42649b9c8bb59bb58e2ce7e9b98db6db60fefab6c614a43c399e4c210cc9eb806a50ab08f3dba5ce313540dcb23828cc42df95c
 DIST contravariant-0.4.4.tar.gz 4901 SHA256 441f943f6339a44b2fc9fb04ddd5f4c5210014470ce57c3271797b76b91084ac SHA512 a54c37a371ce5347ae1df789e15a853e0da9e4e9a4006fe77f00f50cda5e92e72da7daf664be8a0a14422dbeb3e3849aae237b5dcd54904e4eee90086a81eaba WHIRLPOOL 13a277e9fe4979bcd59c4f65288d5e76defbedbdb2ed3e530b6c8b8f559303b3cc2c1ee8ed20f1fd311671404acb5492a5b133b31d6b891af765397dc5044b56
 DIST contravariant-0.6.tar.gz 5489 SHA256 3067376572f1f92fa4b660036eb6674b7618815fcfc105b0b845f00b85e5330c SHA512 f10e93fc69ef26dfde15ae39fe3ff7e466c2b67161604f134b9bede7d18f5032efc3df57c4e78bae3a444bdd19cc4518a987d108fc6a318e934939e15176a7aa WHIRLPOOL 2a6f95647dfb1aabc42a541154a44b5b666f47be347f85ebbd5e88eb8c407f5cdccbbc2bf84c442bf6cd2ab2c8fe875d37bb72f1701fc8b8f1ac4b6728f7990a
 DIST contravariant-1.2.0.1.tar.gz 6640 SHA256 868c3a1ba9bbc2f97330cbc10fb9ac351bf79679e9c5e6625ef7b5b479575e1a SHA512 c5c76c07931bea8381a412ec02e57f9c17d7e44f8eb5dd982a5083b9bbefd1364c9ed264105ef92615dc79b98fc700178f0dc2f03a3069ca542bdb62d7ca3f5a WHIRLPOOL 80799e9f72b67f9055fc205a4a4f7d45b0ce5f5969ea8e60258dd73251439ccbdcf69e56766bfd76daaea7d0ee568b9131f4b7e6cdba1540297b75e9143c7102
 DIST contravariant-1.2.tar.gz 6574 SHA256 0ed101054717ccc031337626317eb262f9f8e75103a5f4f19688bcd8c74af33f SHA512 3b7e34e3b62c761fd569bbfc7ef25cd879c22e5da39e7f21172ede15cd31676e63cb93b46c320dbcee5fa0145ffcd6829b4b9806831a78a5c090797718d2adb2 WHIRLPOOL 7a8cb9e8e8216a84d4ac730fb69bac68a2e06d8bdf76ae54bd1088b0f5cadaeb9eac0fd6de93321c70d21f385b50427729c9aa116b899409c7db896267295198
+DIST contravariant-1.3.tar.gz 8425 SHA256 b97461950015b696956dd972a12c899f9c469a63e482c88307e3d8f338d1e891 SHA512 7cd78603ac69b5535b2b0ca1c121bc015dc87e4c5dbe78bb1194d93493ab623cfe6d29b9b9063d6ec73df12af4a339de06131976ea964db85075c48458068415 WHIRLPOOL ebb876f042bc86ac917411f1de6859ffebdf25e9302c7ebb5da1d20d268c0d53f837813a8ebef9b348c7f6414bc9c0b180465c67931562bbbe633d852c1d3748
 EBUILD contravariant-0.4.4.ebuild 927 SHA256 07cddc1439892214a580691865fa85468c6b6b4ef4b2d6aa5e385988f1f322ba SHA512 e9f581f4bca0be7390dcb7c9a58ebfb5978fbda9c7ff20e05463ecb069d8c69836fb81b6561d84c8cc82930051ae0e1ea6265be12ab7fccd255e0940ec0e36c9 WHIRLPOOL df82c4eb310c356bb49080d8836eb266d4c9eeb865b57c24b4404a182a6b444b877cea1390023ce470f9b3435f337884e14052e04377be42df5855a09c1d7159
 EBUILD contravariant-0.6.ebuild 921 SHA256 f7608a80d4b223244c17cd87712ac6320f9172a9ed47f0ddad723747835d2d21 SHA512 66e4d5e4ace20e9ae683fc32c0aa66f3503bbeea7ef00e758a2989406424d18998d81d79bf963efe8dafcb27bfa4da1c6da3998a81b473f72a6f382a9240b510 WHIRLPOOL 7a8b3ea463aa166e60cbeec1861a8acbadad5e0586fbf7a3b2ebde6c83ef04ad4c0d24cd7b3b6866ae6e857330aaa6132c456377ee5df18343877ca2a898dab1
 EBUILD contravariant-1.2.0.1.ebuild 1172 SHA256 b348920950f90c8c3aaf6cd20de0dc68a37c53f390017a8f3f4383ec51f80029 SHA512 883ee872bb9e252322efddeaa49dc8f6c04fc2c9920080dd746ee05dcc0648f45eed1f371e84035ee32956cd3747c7eb0b170cfd9e3d99807c0c8b03658b0e41 WHIRLPOOL 33b835854eeacde19f096e37b634da6b1a6a375af105933d2f4794f40a9f737b3fb562e7d2e882a98aef37ff559a25888b427376e6b6b870777f54e79b60f00e
 EBUILD contravariant-1.2.ebuild 1062 SHA256 7c533277d8e48c0aedc7a2af9a0a49b2c47f402fb85ecf5fc44c5f2deae10bc7 SHA512 2c38891806cd202dc0b468efcb2d174ad2ebf304c66098ac91c3f19daf8640a998bd3665a4502bb3f815889a91ed0947dcdb8bcb282347480c19f74101f23ce1 WHIRLPOOL d8566d2b75287ad2b2c1a29e3405570e46a0468fd4ab42249110a8cd9613cb8fb8064afcebd333ee80db70576ff30dbb7a3850bf22b978e7d20103f28c5303f6
-MISC ChangeLog 972 SHA256 2f12cad219c0b594feeb07c8bf29345ede49559b92b7c71c6bf5f5f4e9d009ca SHA512 608cdcc7889d9aeb1c0f70c0921e1fc640ef6ef608aebc71eb9a182c5e10328a97cf25023322aec7afaffb8f6db89f24943feb4d0a000d4ff6ba20e164a76363 WHIRLPOOL 0b8202aa057379fc9ce47395074fe109ace6d7430510a2cc86f5c0eb480c54cc42a4f8fa39caf297a889f4970ddcc1b036512cba6bbda19a24e58d062a7af6d3
-MISC metadata.xml 547 SHA256 3edfbe093034222c2e947ff33a72e6c6a12ebef9d4fce6b962771879af2d196e SHA512 030521cae85f3d1b5b6394457253bcb70740da9be0720c49bc06c21c142d9e48a368211742eb3eed2bf36bca01aeffadf6ecc6e40a88f4af15c737411fb4fc9c WHIRLPOOL 74dacc9ee5816b67e4b3575fb9b25a228d3e067490338fdaf5f2a8eb484173cf9b74719c068594f1b220155d730eec98f8a3b06f4067ee2c76adbfb750cdfdd1
+EBUILD contravariant-1.3.ebuild 1429 SHA256 6f7044a79e7b6e666e2b040791294fc0c3ff3f587ddc27e0f00cb517680605e3 SHA512 737b65056af4548ac1a23df6d4d757cf5eb57fa84be083b1642c56fe17c7699e3c62e1a7c3d4cf4d7d15522e9c4527ad72951a0ced9388423b861b536a64f050 WHIRLPOOL b091b026fc7cdb5a9ffc954e64e511bb449e5f6ec62a0a25b1632daa3e5f7021864e86e3d2d919a7cc45d6f4c38b5a8d4c4fb4718b24648ad85d63118e046bf1
+MISC ChangeLog 1166 SHA256 b8f117b8954191ff16c1d58ba053672167978d7e55a5ea9fe0ab2262dd8dfc39 SHA512 448eeb65bde6f319a83e399951c8baf202d3e01941d4aa2f45f9c5e2f5febbd39d77f39f82a767b48dbacabf57400c235f6c1edec7ca94fa1bc3f6ecd5aeba69 WHIRLPOOL bddead7fdd61b238a30852c4a2b3e08b85134a3aa076b01d92e7ef8072b3bf98ed0d0809d891a2ef8eeba36125b6dd89e3eabe22d9e0d5d9901dc28d329b9e12
+MISC metadata.xml 1081 SHA256 f6d1bfb47d88f9f306c714ebcd5add9873b55f1cc1f55a0d9593422c76cb0bb2 SHA512 9204d0a89abfae0a8829e29af5b160dcefa02f40b6c0dd14fef3e6a1192871990a410e5ec8b4ed19a4408623042103f3b29933723f0bce491e09598fddaeb960 WHIRLPOOL 79b1117ba70ef509624321d902d91b100da7d18d79b6eb0a002fbb652accd1221834956db608d3879079e52be74fe0f3e705448bf78c4268b53007e41e46df3b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlSkr7kACgkQoBEVQmGOlx8InQEApeCOcqECw9QUj0z8wAiNCkmc
-m9kUragFRS3epueFLRMBANWjbp1VJGaXuMeiKFjyZQ5Hon5LkLllvCl1XCqGS0ZA
-=6lUi
+iF4EAREIAAYFAlUALYMACgkQoBEVQmGOlx9I8wEAsKBxwWRrVTwtpbBtROEGkYU6
+W4NbcHKcua6awbmItG4A/0mh/ZltQZhuvo8VcQ0udEX/CBjzdAZ2oDXAM/F1cPpx
+=wT57
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/contravariant/contravariant-1.3.ebuild b/dev-haskell/contravariant/contravariant-1.3.ebuild
new file mode 100644
index 000000000000..46d988de4c58
--- /dev/null
+++ b/dev-haskell/contravariant/contravariant-1.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/contravariant/contravariant-1.3.ebuild,v 1.1 2015/03/11 11:56:46 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.4.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit base haskell-cabal
+
+DESCRIPTION="Contravariant functors"
+HOMEPAGE="http://github.com/ekmett/contravariant/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+semigroups +statevar +tagged"
+
+RDEPEND=">=dev-haskell/transformers-0.2:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
+	>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
+	>=dev-haskell/void-0.6:=[profile?] <dev-haskell/void-1:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+	semigroups? ( >=dev-haskell/semigroups-0.15.2:=[profile?] <dev-haskell/semigroups-1:=[profile?] )
+	statevar? ( >=dev-haskell/statevar-1.1:=[profile?] <dev-haskell/statevar-1.2:=[profile?] )
+	tagged? ( >=dev-haskell/tagged-0.4.4:=[profile?] <dev-haskell/tagged-1:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.6
+"
+
+PATCHES=("${FILESDIR}/${PN}-1.3-ghc-7.10.patch")
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag semigroups semigroups) \
+		$(cabal_flag statevar statevar) \
+		$(cabal_flag tagged tagged)
+}
diff --git a/dev-haskell/contravariant/files/contravariant-1.3-ghc-7.10.patch b/dev-haskell/contravariant/files/contravariant-1.3-ghc-7.10.patch
new file mode 100644
index 000000000000..a797bbcfd0af
--- /dev/null
+++ b/dev-haskell/contravariant/files/contravariant-1.3-ghc-7.10.patch
@@ -0,0 +1,11 @@
+--- contravariant-1.3-orig/src/Data/Functor/Contravariant/Compose.hs	2015-03-10 04:41:19.000000000 +1100
++++ contravariant-1.3/src/Data/Functor/Contravariant/Compose.hs	2015-03-11 21:55:46.287717619 +1100
+@@ -20,6 +20,8 @@
+ 
+ #if __GLASGOW_HASKELL__ < 710
+ import Control.Applicative
++#else
++import Control.Applicative ((<$>))
+ #endif
+ 
+ import Data.Functor.Contravariant
diff --git a/dev-haskell/contravariant/metadata.xml b/dev-haskell/contravariant/metadata.xml
index 02aee8ba630e..262049d6ed60 100644
--- a/dev-haskell/contravariant/metadata.xml
+++ b/dev-haskell/contravariant/metadata.xml
@@ -6,6 +6,14 @@
 		Haskell 98 contravariant functors
 	</longdescription>
         <use>
+          <flag name='semigroups'>You can disable the use of the `semigroups`
+          package using `-f-semigroups`. Disabling this is an unsupported
+          configuration, but it may be useful for accelerating builds in
+          sandboxes for expert users.</flag>
+          <flag name='statevar'>You can disable the use of the `StateVar`
+          package using `-f-StateVar`. Disabling this is an unsupported
+          configuration, but it may be useful for accelerating builds in
+          sandboxes for expert users.</flag>
           <flag name='tagged'>You can disable the use of the `tagged` package
           on older versons of GHC using `-f-tagged`. Disabling this is an
           unsupported configuration, but it may be useful for accelerating