Bump options to 1.2.1, patch for ghc 7.10

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

4 files changed, 79 insertions, 7 deletions

diff --git a/dev-haskell/options/ChangeLog b/dev-haskell/options/ChangeLog
index cfb2072daafe..efac960501d5 100644
--- a/dev-haskell/options/ChangeLog
+++ b/dev-haskell/options/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/options
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/options/ChangeLog,v 1.3 2014/07/25 09:16:29 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/options/ChangeLog,v 1.4 2015/01/01 13:19:02 gienah Exp $
+
+*options-1.2.1 (01 Jan 2015)
+
+  01 Jan 2015; Mark Wright <gienah@gentoo.org>
+  +files/options-1.2.1-ghc-7.10.patch, +options-1.2.1.ebuild:
+  Bump options to 1.2.1, patch for ghc 7.10
 
   25 Jul 2014; Sergei Trofimovich <slyfox@gentoo.org> options-1.2-r1.ebuild:
   Drop trailing '.' from description.
diff --git a/dev-haskell/options/Manifest b/dev-haskell/options/Manifest
index 93a7adfc260a..48101a612a7f 100644
--- a/dev-haskell/options/Manifest
+++ b/dev-haskell/options/Manifest
@@ -1,14 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX options-1.2.1-ghc-7.10.patch 685 SHA256 09183d99fc5a07a69c58d570a0b8c64a4b32da7d64fc37616f101451373e082b SHA512 af74cc6716d3a21caf6f35e13c812047a4a562d7a9a9c7d23f08d7814ccb8dcc0688a2fb34a7a866224c2874b87a13e53703e862b2425ee3922feeecd9218269 WHIRLPOOL 9148f013125778325a49830161ab716417792fe4dd65844c4611c25150a82490291d1ffefd4c0708844382afdcd97a589e345c8981b7e1729f05b076d2ca9819
+DIST options-1.2.1.tar.gz 25252 SHA256 75f84bc3d369f534daef5b9f7db9f581f38974d7ae7bd389b754d30f59bc32f9 SHA512 fedc10b4e8d1dca4a93e90cbc2f37f0570af6657a4ba1492b2da9267a38ba8533b1c599dd36eb2660d016374cc34857a57785fd5c305bad2e5c1d23bbe559ab7 WHIRLPOOL aa62c8c1eba2bb1a90f1966687f7f9d8f34fc4ab2fd276381019a88597c99f86ed48ebe555059b57207be4a4cc5e86e94a501e0c0c9489e21d782c472d4d1b85
 DIST options-1.2.tar.gz 25214 SHA256 7d9353b93ff22a9a20c088a6895d08b02266e1a61e5c7192711c14881a9f1993 SHA512 9c7cfcfbf3e1e487bc80a3ea68ba484b22b7adecf65af5e5f3d3cd9ebcabf952286cf1b29d6e1ef6654eed49aeb70a2936bc977f8c3665bd7ab59340cf2f2f18 WHIRLPOOL 1ef4d4c61464379d35cc8445c331387247d3dd67122b0d8a7b9030a70c67c3e44e41272aef9fa6b792addb2d08dde55dd079a581b4f1f5ffd5f63ffe3054db53
 EBUILD options-1.2-r1.ebuild 1069 SHA256 ed58149dc5ba8531f1494014fb7f7541abaf167817564b5a7d174b4c31859dbf SHA512 fcdb9fa86d799b74b097c3748f39c0e90ccddfb067dc75b191c41f6e547227c91d51b1491db1a726ce5804e14eef8cd160c9ef8c98a68b60949c529da835760f WHIRLPOOL cddceb2a0f15e7354220fde1853d92dde8846e4d614b604fb48cfa24a5475b7ce43673999716c4c416fa027debc66b36aab848d8a39289d355b7fa4bc9956699
-MISC ChangeLog 589 SHA256 a02348b0db36ac5af6c4f79b2538e9f06cea7228bb547d3db6e0cb41997bb323 SHA512 83ed0111716a4245918422026ad5e168414fc2725f87385a38e1d407a3e10db1b47808b332f52f71c463f1cbf6463f899d3cb99911935208e818f2b4ead32e26 WHIRLPOOL 2b87eb2ef27fc5c5e259ac10147aecc2e4446cc6c914c9acea473a70967afeb30587724b1e102965d975af3452b26ceaa5086d7800455250ecd8c7ced3ca07d5
+EBUILD options-1.2.1.ebuild 1115 SHA256 39352ddb6ad749be19eca907c8ee9f976b1340371829c95f919514e8a67215a3 SHA512 af25901e1494c9f36d48b63a0ccf951c21436d4e7880e7f7d4fae6daa9944d6d9016833d21aff798cb22160948b9ba0f5ea6f760ef32dfb428fb8f95f8e72ed6 WHIRLPOOL 992799c3a487f0c89399c09d7b0ea1a2f1d5ee9cad705c7991864b3c5ca2eb013c79798b59961c65c4e4ed61486f37477dcebfa4052e4a7a65bb8bddcfc1c650
+MISC ChangeLog 773 SHA256 a877b79043e4ce83b9facacced6ef6a472a10cd2d4fa329db10a8c168a8f7a44 SHA512 4a14010a69888f401538430b113499fdac82f1070c8610939a9eba6bef0e44c833d813019a983eac41b30922a74cb3485ad87ebe2b4c29e4cea703c5b19985d8 WHIRLPOOL f84d2d05fc70ded51a8f2e469c171d2deeac6317eb46803f7323de87d5d1a3c160ab74e77d10086bf09e969b63e74a5f6296e4113b494629e8b6c0eed18ddd01
 MISC metadata.xml 1791 SHA256 3961bec7e8b2abbbbedfcd65962903ed1aebc295543da5537cd7658e45e266c9 SHA512 6e7ab7420ee0e268988627a35d37517121e18397322587e66565a058068bb24c10d63ec6fd0e55e6f2d22fb1b1a7bacbd83670c7a63bf279cd9d64a24f206cb2 WHIRLPOOL f9d6677eefe450a85371ea387a45d020886bf3715662a81a49b849424f5ce523a08d3df14ae8ca4c4194ad09726f6d20a12c9b24db7e9e381aacb2cf42f032c9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlPSIPYACgkQcaHudmEf86q7MQCfU8BNFpunag1HNXvce+IwIpaP
-P34AnRzo72QQm0XPI0JcUryJpXNUkd1a
-=7OGn
+iF4EAREIAAYFAlSlSU0ACgkQoBEVQmGOlx9xAAD8CdPaorYE+qAs320nPGGbCf/7
+4mmMWK/q19sGcqgdEVQBAKezR9UjBC9iFprnt2X8eillXwbMCIUCEi4ymYxln8Mq
+=9YxH
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/options/files/options-1.2.1-ghc-7.10.patch b/dev-haskell/options/files/options-1.2.1-ghc-7.10.patch
new file mode 100644
index 000000000000..9578c926528e
--- /dev/null
+++ b/dev-haskell/options/files/options-1.2.1-ghc-7.10.patch
@@ -0,0 +1,24 @@
+--- options-1.2.1-orig/lib/Options/Tokenize.hs	2014-12-14 16:34:53.000000000 +1100
++++ options-1.2.1/lib/Options/Tokenize.hs	2015-01-02 00:14:05.390013340 +1100
+@@ -11,6 +11,7 @@
+ 	, tokenize
+ 	) where
+ 
++import           Control.Applicative
+ import           Control.Monad.Error hiding (throwError)
+ import qualified Control.Monad.Error
+ import           Control.Monad.State
+@@ -53,6 +54,13 @@
+ 
+ newtype Tok a = Tok { unTok :: ErrorT String (StateT TokState Identity) a }
+ 
++instance Functor Tok where
++    fmap  = liftM
++
++instance Applicative Tok where
++    pure  = return
++    (<*>) = ap
++
+ instance Monad Tok where
+ 	return = Tok . return
+ 	m >>= f = Tok (unTok m >>= unTok . f)
diff --git a/dev-haskell/options/options-1.2.1.ebuild b/dev-haskell/options/options-1.2.1.ebuild
new file mode 100644
index 000000000000..9d0d93cedf5d
--- /dev/null
+++ b/dev-haskell/options/options-1.2.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/options/options-1.2.1.ebuild,v 1.1 2015/01/01 13:19: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="A powerful and easy-to-use command-line option parser"
+HOMEPAGE="https://john-millikin.com/software/haskell-options/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # needs old chell
+
+RDEPEND=">=dev-haskell/monads-tf-0.1:=[profile?]
+	>=dev-haskell/transformers-0.2:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/chell-0.3.1 <dev-haskell/chell-0.5
+		>=dev-haskell/chell-quickcheck-0.2 <dev-haskell/chell-quickcheck-0.3 )
+"
+
+PATCHES=("${FILESDIR}/${PN}-1.2.1-ghc-7.10.patch")
+
+src_prepare() {
+	base_src_prepare
+	cabal_chdeps \
+		'chell >= 0.3.1 && < 0.4' 'chell >= 0.3.1 && < 0.5'
+}