Bump text to 1.2.0.4

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

4 files changed, 95 insertions, 6 deletions

diff --git a/dev-haskell/text/ChangeLog b/dev-haskell/text/ChangeLog
index 7448213eb01b..a1d90f47b42e 100644
--- a/dev-haskell/text/ChangeLog
+++ b/dev-haskell/text/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/text
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/text/ChangeLog,v 1.46 2014/12/20 23:51:00 gienah Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/text/ChangeLog,v 1.47 2015/03/11 11:53:29 gienah Exp $
+
+*text-1.2.0.4 (11 Mar 2015)
+
+  11 Mar 2015; Mark Wright <gienah@gentoo.org>
+  +files/text-1.2.0.4-ghc-7.10.patch, +text-1.2.0.4.ebuild:
+  Bump text to 1.2.0.4
 
   20 Dec 2014; Mark Wright <gienah@gentoo.org> text-1.2.0.3.ebuild:
   Thanks to Chris Kerr for reporting, add quickcheck-unicode to test
diff --git a/dev-haskell/text/Manifest b/dev-haskell/text/Manifest
index 2eb08f726797..5c21e8037073 100644
--- a/dev-haskell/text/Manifest
+++ b/dev-haskell/text/Manifest
@@ -1,22 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX text-1.2.0.4-ghc-7.10.patch 1338 SHA256 041356f001d1fc64d4680dedcf15465728f311e906efd7b2c58faa3c2c46b3db SHA512 c6591c6ed7e3b1e6b4a428272f9b671f8f727ab839624c780a06ca19421e050a77709ac4af4dde629fcb530649483d159bf443bc3aae112bd2101413e4aa4452 WHIRLPOOL 5bc669a69d78fa10d6953301a21e10a349558133853304cdf457442f14cce9aed054dcc1e4274f241c47740306eebb440ca4e371a2af393f203eaf9637f9cf37
 DIST text-0.11.3.1.tar.gz 126477 SHA256 76aad4a647cad7099b5a693eb9a4bc5263f7751392d8d1f87b14c78e2069559f SHA512 78e9b795ebcb4e43be42b34c3f5829e0f5030d93cb6dad59ca2eb4c7df3a5e338f65dc9f90da7b752cf2b1c15e8d973a25293a6418a4abed6e0ddac9222fb3e6 WHIRLPOOL 44621a22c5afdd93e95670dc45e1c8496a743aa7c97d5d7466b89a0170fe5425a34b7ebcd11f26bba4d2c27477f7256d20b1daf7ed60c5a5e5b53fc9236d3912
 DIST text-1.1.0.0.tar.gz 136463 SHA256 80f1ada824f0e3886bb49dc7fd128707ca1a34e06bbf4419873b1677c4d7ba92 SHA512 dd2c4de94ca157a14635b4fabddd5b3f2da6346e2a48e81deaee57e18cac90f264edadb9d6878fc8063236c13dd215df83f08ee9273ee4956635c53289068dca WHIRLPOOL 152724dd869b41f225d4a0d3566ccd361ab80dd7aff5869806cb36df876e93140c5bb539af7f59191bb75df00f035e0fcbb12d65ebddba845683f894784c2719
 DIST text-1.1.0.1.tar.gz 136789 SHA256 9caa6dad36d287ee08b44b2220bca8250810618b492728723da139ea368b1fb8 SHA512 a864b8d2d0ff43e38597c7caf8aef7fd6da63149909a4be34ef56ad79c0b67b913c59298245266e4f82325380e24831a959fa646c2f017c92d244317525ca2b0 WHIRLPOOL 62e56bb7d9f76f5d5d17ab34cd9f965e9739391cf0e52818506aff038709ff7a8c646d94ab884b3853c0712e7052f29dc65af9219e7820cbbd82b5cc3154f013
 DIST text-1.1.1.3.tar.gz 138063 SHA256 0c7c94ee281deba5f58aa2a63c0f7a624227a570b5d5b49c807f2d9b08793ffb SHA512 bfa5301827c72cbb3346fdb485e10094326a7cac71e01bba700ca0344bd4069c5b16c590dd7c38ee85969be06a2d3fcd760b34ff6f98eef176e7e8c325739490 WHIRLPOOL 6a9ebc05cf16d33568f43847be1b67c779eb9fa6c2c2139c5a6e905cc7351a269f14aca819303c60fb3461b306211c7024ef4f5ad3a07bede03536bd8e40a8b0
 DIST text-1.2.0.3.tar.gz 145383 SHA256 1d38bc0a8bf60c2f3581558a7870d6db7eefbe6da5df4d80a42c9b4837f8f986 SHA512 0bc8086fa8e888394f10afea87584a0bb2323708d682884fc5f4d8c69187afb8422386b1a7ca4c3cea9eadce2c09e44398d206d2162c69f565bc38f54b5c5b05 WHIRLPOOL 8a7395964f4e82f48514cb4c8338c594b22505e0a797bfd752597ce4d2093ec96719e6d7a3e28eac23d1cb8aea564ca93f896e3089d5abb1bfa6f06c7bec7d70
+DIST text-1.2.0.4.tar.gz 145245 SHA256 865dbb8e824c197cdda6a15e8764c057335febe05573a764e54867460e0b9700 SHA512 be01b4bb45b337a650b34c04fb39e413537c0f9c423cf079267dac446c691e24575221aeb0f7cadeb4966b163055ee601fa830a86e5cf9dfe429d9c35e79db2b WHIRLPOOL 75a36931c7fca808fa6a29011e172bd51eadfd3bfb81ec57ce336d44d702a566dbf178a8022411b7ca09f8fdfa0dd25ce329a31bdda33af1f3aae1aac63cafe2
 EBUILD text-0.11.3.1.ebuild 1126 SHA256 70590d923896b45e69e8fab6be155016c1132b61884585ec7593b190ae40f17a SHA512 d14aedf2f107252bfc45494335b47d760acd331a4021e833db6819848ed11cfceaf9868065b83b22165fe180ee667d871760109f2c10018abd130c8f6e15e7d9 WHIRLPOOL 000326029480883c4f972856dc3d77493dcb47fd7b1d6580d4d0ff06653674ae5eb58d2f9dbd04960414a4ecd8bb717ae6e03719ff846d9769e41add2185be78
 EBUILD text-1.1.0.0.ebuild 1101 SHA256 9f7ef8ba71605d5e6739269134f2f207a0f329cd925fdc792c8c2fb56077fe8f SHA512 48554e7cdcefe8368ed502f66233e4b2ceeb4fc40125f476912641c9e0672447b4316e8830ca0584132e83de12be08106c413fdc57de6735e60f2959b72efd6f WHIRLPOOL aa6796794412f151dc205eff53c1af54418f0a15deb5dd0d468056380fccd71aec87ad795abf399e0b2116423cd7787907a435d41272af34538a3d1cc6e0c753
 EBUILD text-1.1.0.1.ebuild 1101 SHA256 638118ec0aae06a24ee027cc69dd25bd4793b46b3be820d5e4958dc4851b2c80 SHA512 188388a08c40f61997e85444f2aa93a4e94e8d8adfbef4ba3ccb7105ca6e7c7b7f2ff56a70d295a879bd8948d4a9b2f44268de4b6d63727a24822d5b10685a7b WHIRLPOOL 2848344fc254930704a64c8c502aef426344199b018b14d15183b36cd6ab25e8cc34e3023328d481828e9a30ac218477a99ecbfb66c28f69cbc3541e85b76539
 EBUILD text-1.1.1.3.ebuild 1161 SHA256 9442536f6af7d2fde12fef9b8709658e5ef7cde63b07a946fa4ea0f0640deb55 SHA512 3c21bd7b11514aa1589cb755c6c3105ae2cbed53f121002ee950e52c35e42226087415e494fc89b6378291cd097bb97d880ad13440a37c94e655698064fd689e WHIRLPOOL 6d6c61a6aba21f05365bfcccf1d79c0c92dbdad372a9342c87b3e3b62cc11be36fe5070a38cd87459b6b69fe92259d3ce3ddb2da2e4e82d58517aa92a94b7e46
 EBUILD text-1.2.0.3.ebuild 1112 SHA256 356f5b0359c4f8adcc1adce29432aa8e8841b09fec85ec9cf4be3a2037d83292 SHA512 3c834572104bb800b4b931cebc788ffe05804ab6766cb9035db4d5d9f4f94bd85e2c87e8341d1af7ba7d1424afde7aff9420bcfd6f01f2383374a0c4b557d379 WHIRLPOOL a1ccb7fe9dbc2692c13c25edb9e6fbafebba67d9d288f94430aa9acebb01584a0abbc0b5d019511f592ed0bff46e6de590be6fe767ddbbd54ddb9bb0fd93c3df
-MISC ChangeLog 6597 SHA256 0e23a4655b7ba2cca4c8f3eec1f247f2e99581fa534de8e7181c73dd32ad5b34 SHA512 a6e3b217d96ffa5b59c1e2b9a0c247206bd1393d85c1373e00480522bc38f57a1ff4da4f481e41d05b92ed2d462fe88670b66cb21473c46b904018f72df42636 WHIRLPOOL d8b652058119eb3a8d7b6e7e87b97f2016de93059d52bad560353a15edb0cc38859ee2c0ff8e969d61ace12324ee33af6864a91758d04d1c0d0220a31808da18
+EBUILD text-1.2.0.4.ebuild 1162 SHA256 018d809a59bb3cc78b8419bc7bfea197f76a4e463099cec5ce4c333c867c0dcd SHA512 e0d1834a87310b3eaa8a4c93a5d52b5f9d36312abef92fd936b159479b0bcd1366892620adc2c1d3b5aa4d8d1be59fd4a3bccbb3cf1f21543aeac4feb0ad891e WHIRLPOOL b8530b106edcce05ef1a3695a7f4c940aa5d177aa514f00ec1111bc8e1f4ee45e6cf6e3c736a88f3f11d442d93fce8193077eec241ca9cfb1902c11c47685b7f
+MISC ChangeLog 6757 SHA256 e463c64b83a4228fdcc8729fefc7a96b80141ef7e818817ff222be39153d289b SHA512 315e99b21b350228e0f203055f89121f7507a56a1347f3b92b238cd6d182e7b14e591e82e0a25dbacb51f72dc984ae3226cd7929309cdd0413f946f3e9e0108d WHIRLPOOL 5e17886a73938715f68dfe6170caa90818a7c718f3ac9b1f316a0a1c258a906ce6acc502c648dad611e88a04fd145367681d574e444c377491cb52e9b1632f62
 MISC metadata.xml 1474 SHA256 d5ffa0c2a2ace1cc4c4e32cef52fbf82f3d4a7300ec33835ad270f76a4fe6423 SHA512 452dc63cc63deca70ce33bc2abc0c0afc1f6a05009be6df09a123c661bd9a2dbb631c0952838c561228ba18de29313f8e5846af60a389a37fd11257920a3414d WHIRLPOOL 0cd7d3b829f2fcb0de24d63db8325a5f7cc2668eabe9e6b5cd1cbbdf9b5e56132ee5568d219d82a8130c03612d1c1ddb721613cdaa2969bed064db3e190abe4c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlSWC2oACgkQoBEVQmGOlx+3AgD7Bfu3nR3sFLug0tyOk4QfjFKw
-RVhovk/rcMciyEM0ExcBAKPNdGWeQtXElwnJwAIknrJASHGcOSgsOX1QJCJ73s4g
-=kuEg
+iF4EAREIAAYFAlUALMMACgkQoBEVQmGOlx8eHQEAmG7T3gw8o4rVysPh8+FXDOJv
+MUimx+hua0MedMxM3VoBAKlKIjBxRYE90+tTMgZfZcrEWiprgV6ZPEOz2E3c99fg
+=WRy9
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/text/files/text-1.2.0.4-ghc-7.10.patch b/dev-haskell/text/files/text-1.2.0.4-ghc-7.10.patch
new file mode 100644
index 000000000000..e25a52bece8f
--- /dev/null
+++ b/dev-haskell/text/files/text-1.2.0.4-ghc-7.10.patch
@@ -0,0 +1,41 @@
+ommit f74427c954fb4479f9db5025f27775e29ace125f
+Author: Bryan O'Sullivan <bos@serpentine.com>
+Date:   Fri Jan 9 16:14:15 2015 -0800
+
+    Fix test suite under GHC 7.10
+
+diff --git a/tests/Tests/Properties.hs b/tests/Tests/Properties.hs
+index 47474b0..6844723 100644
+--- a/tests/Tests/Properties.hs
++++ b/tests/Tests/Properties.hs
+@@ -14,7 +14,7 @@ import Data.Bits ((.&.))
+ import Data.Char (chr, isDigit, isHexDigit, isLower, isSpace, isUpper, ord)
+ import Data.Int (Int8, Int16, Int32, Int64)
+ import Data.Monoid (Monoid(..))
+-import Data.String (fromString)
++import Data.String (IsString(fromString))
+ import Data.Text.Encoding.Error
+ import Data.Text.Foreign
+ import Data.Text.Internal.Encoding.Utf8
+@@ -812,7 +812,7 @@ tl_hexadecimal m s ox =
+           p = if ox then "0x" else ""
+           n = getPositive m :: Int
+ 
+-isFloaty c = c `elem` "+-.0123456789eE"
++isFloaty c = c `elem` ("+-.0123456789eE" :: String)
+ 
+ t_read_rational p tol (n::Double) s =
+     case p (T.pack (show n) `T.append` t) of
+diff --git a/tests/cabal.config b/tests/cabal.config
+index 28241f0..64f6bbb 100644
+--- a/tests/cabal.config
++++ b/tests/cabal.config
+@@ -1,7 +1,6 @@
+ -- These flags help to speed up building the test suite.
+ 
+ documentation: False
+-executable-profiling: False
+ executable-stripping: False
+ flags: developer
+ library-profiling: False
+
diff --git a/dev-haskell/text/text-1.2.0.4.ebuild b/dev-haskell/text/text-1.2.0.4.ebuild
new file mode 100644
index 000000000000..0ba8b3b66a12
--- /dev/null
+++ b/dev-haskell/text/text-1.2.0.4.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/text/text-1.2.0.4.ebuild,v 1.1 2015/03/11 11:53:29 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="An efficient packed Unicode text type"
+HOMEPAGE="https://github.com/bos/text"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="developer"
+
+RDEPEND=">=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	test? ( >=dev-haskell/hunit-1.2
+		>=dev-haskell/quickcheck-2.7
+		dev-haskell/quickcheck-unicode
+		dev-haskell/random
+		>=dev-haskell/test-framework-0.4
+		>=dev-haskell/test-framework-hunit-0.2
+		>=dev-haskell/test-framework-quickcheck2-0.2 )
+"
+
+PATCHES=("${FILESDIR}/${P}-ghc-7.10.patch")
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag developer developer)
+}