bump contravariant to 1.3

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 618E971F)

4 files changed, 66 insertions, 1 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/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