From dd7a928b50acc2d5cea423fda1b106f189946d6c Mon Sep 17 00:00:00 2001 From: Mark Wright Date: Fri, 3 Apr 2015 03:06:06 +0000 Subject: [PATCH] Loosen base dep in utf8-string-0.3.8 to allow ghc 7.10 Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0x618E971F --- dev-haskell/utf8-string/ChangeLog | 5 ++++- dev-haskell/utf8-string/Manifest | 20 +++++-------------- .../utf8-string/utf8-string-0.3.8.ebuild | 7 ++++++- 3 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dev-haskell/utf8-string/ChangeLog b/dev-haskell/utf8-string/ChangeLog index 46483be3a395..022a8a5b2ae3 100644 --- a/dev-haskell/utf8-string/ChangeLog +++ b/dev-haskell/utf8-string/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-haskell/utf8-string # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/utf8-string/ChangeLog,v 1.35 2015/02/28 13:27:36 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/utf8-string/ChangeLog,v 1.36 2015/04/03 03:05:56 gienah Exp $ + + 03 Apr 2015; Mark Wright utf8-string-0.3.8.ebuild: + Loosen base dep in utf8-string-0.3.8 to allow ghc 7.10 28 Feb 2015; Agostino Sarubbo utf8-string-0.3.8.ebuild: Stable for ia64, wrt bug #535022 diff --git a/dev-haskell/utf8-string/Manifest b/dev-haskell/utf8-string/Manifest index d8e2d5a68685..c8ef12bedbea 100644 --- a/dev-haskell/utf8-string/Manifest +++ b/dev-haskell/utf8-string/Manifest @@ -4,23 +4,13 @@ Hash: SHA256 DIST utf8-string-0.3.7.tar.gz 8845 SHA256 785b4b31476adab9d4ea553a9a6b590acb0b906836abb3facd218c18b8eea9e8 SHA512 44e64e5ff42a2e4defe97d78468d070791ad82f0405173046666de398b14e55b8758a34ae624086dfa597d46a67eb12886375e04d58255e18e6d1b446c7efd79 WHIRLPOOL fe552302ead77fcf96b47ca3f37be9081892e0ea442799a2874aa423baf6874f42593cf6c119ecd0fde479df15d1cadc3b646ba923326a4f3bbddecd6ed5b66b DIST utf8-string-0.3.8.tar.gz 9129 SHA256 80757cbc00197ff71311dc8c1ca00284537442c2dc93f06685d369a6816d49c0 SHA512 70f6ceaf4d9d6e6fe7b787facbb733f276ac5ba10c49c43e0da283b481f0579e0933f6343f5158973a6f0aac342f5b76258281dbd0c420bf652ad3c3787eb1fb WHIRLPOOL f6fc065ad16cb36ef068c3c15ade87cf2305bcfa630b9e5187429aa2b8fdd6893ed158ff77c42efe41d1dfded1ca3a84d0905cfefb3f7fea06debb9f30dc97d6 EBUILD utf8-string-0.3.7-r1.ebuild 829 SHA256 216c1239d253fcf5f2f82d51e7f6aa562f4d6e0c29718a8d6ccf436ebc3803f9 SHA512 fcf8e2da89c08401e794d7a5230969a38e43c2f25e32582aed48bf6533d2e525f46522846aed226d47fd556c60e1713f00fe8170afdf2a9b04fbd9292beee0bf WHIRLPOOL 3ad26d172b7c313fc50c86a090e6be3f6b0653029f4f85507d90ffbc68ac09bc3063e2e42cc8bc18065b201b489d74813668322de92d5ee9f5ff49a1da6116ed -EBUILD utf8-string-0.3.8.ebuild 740 SHA256 39d12cc3f6a1fb6b393210e1677ea2f5db9257f2a7c9e2edfd5dd60317a38733 SHA512 8c1391949bb2019b0f4787ac0bbe2cc015faf06ad7a94f815ae875b829d22db89fc9ca89a83c7b70596839941e33a46ef692e83786d66a0e306163c2cc0fbeb2 WHIRLPOOL 068728c28f9627822c5f79fc25ddfba9ca6da836030aa6e2528aedae877509bc8781bf30eb91f59e81d398c2f1b212709c09a51faa9254b18468a61179b77283 -MISC ChangeLog 4423 SHA256 d54e328448f4005041c9e906ee29cad8f284027f6917211fd161f609d3075ff9 SHA512 d57c94ca1435a32f21a8ecde98ab0492ebe416ed91e0e7fea261e314fd2ef978a61907b5644c652c9a91d544798a24ccd90ed4fd92f53c314a29d9d54977596d WHIRLPOOL 382ff51641dc05ca12aa5b4980e3b1d98f8315ed4161865d02a172fc37d0447508b914bb64ec153b2bdf4659bf4bbe2ca380dfde8a5c5e09c004a9099977fd6d +EBUILD utf8-string-0.3.8.ebuild 813 SHA256 3dae2046daa1d16c61a435a1fd9d64557e232b505ced9395b8f6347847782c59 SHA512 7f5bcc4c00b496d74e04d94714dff94d536f3c300e0aa104b6d5b8a1bc13545f9cbf3e1bb99147df1a83ce254b3ea89186178ce94161b9c1e90dadc2a84606a8 WHIRLPOOL 83d268886a6c08598606c9593f271a227c89468b2f607a0f0a032b1e579bbdb0bf4087688acda9477fa42c94ff1d74b934755db57113526767c16d2cd5d2148c +MISC ChangeLog 4557 SHA256 75f4984d2b7430e4d51a00af896ae5ac05976c10c0ca7783f8de17069ae92659 SHA512 ea72e1b28fc5550c56e606909e43052667d70c21b791c4f048858ee14436a5dd84f90db3fa70d38b4dafe53180608a0831980fefa0a214b05c028e85d23a9598 WHIRLPOOL 714852c27a003cae06c7561ce462db8eee63b78899aef72795e2cb03e1d9d135e64b9694be5c1b4d9923e997a87995b9eec455f87bd05c15105a57812dd490de MISC metadata.xml 223 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 SHA512 24765bbf1cb187cd262aa7fb3824c1cec65e2bf3f2198099de688916d96401a26458265b15408f22b1fbd6d6a2842df814a57ceda80dfa00d130b24423b7544f WHIRLPOOL 8fd6700f6198db6540eb51edf11372faeb6eb8a542a692e515badf236f62444f2c180f7d08e0f98e9fdfa23de14631b31af50543469aaa27084d6b637e2644c7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJU8cJJAAoJELp701BxlEWfy9AP+QGJFiZPqdisUKNuCWAUg2oh -RGc9ZEiKDn2BlUYs5kqCCbg5CWzfx866M6XRYRoTHTrtWmFglqASZO5YzZ65/PbZ -lVdFhG0rKT/D0LSeEWUSvy00tsaGHQF5vCcYgrPErAFGZ5FNRj/B2FdPpAQoB+Nj -C74taLmZpp4JQJWj5jOVp+Urk50eCPIqqv9oCJmT7exSoFVxduacwRYqCldINGQ5 -O0QW4i60pAh5V71mEf/bUcWOggTE0APOGVTXDMzyheCQ1PYJOXk8zVDzeYocSEU2 -jFphZ7KuzdyFzuHbQv0wi2DkbOFmou6YEjsRDJ9BGgPvext6xnwP1X2pliprCDjd -cx7rNvZXCWgBIieE570M0TZFtIrvmCklnciY0BlHZdBtvbZtuf1gu0SsWNpH8WUy -mt/ZWc17G7kk5cXEm0iJWRP3V+mlb13OumUTcbgAzAkvyVLkP+G23988lH4uuP5W -F6vHfxrkKQUkY5hQr0AIHi9sOrf3IP3oKgZBZw+LrEmAAp1IAwwaKQMMl+gcP6Yy -T43PDgtJEKyVgamGm083QYD/DlcYxDkDH1MxqkdGrUYkkIKCQexc052Q+iTeY4T1 -KGXBiGmyRrqsI9iIvJA3SwMjp3Vlfwlz4jTxTme/vLlUQiUuHdoTUk5nHOVp5kKr -vNF9qyKmhfjAopxW1khU -=3Mvs +iF4EAREIAAYFAlUeA5wACgkQoBEVQmGOlx8XygEArZRHsqIn1MNQR2QLIQw6C5e8 +AQ41BmorxtYWPVk52jsA/1KWbktif3IBb9y6XWL28fIaq8wHLfUqkZPDZsM5YOrf +=sfO3 -----END PGP SIGNATURE----- diff --git a/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild b/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild index f105460bbe45..0f83d1d0d86b 100644 --- a/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild +++ b/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild,v 1.8 2015/02/28 13:27:36 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/utf8-string/utf8-string-0.3.8.ebuild,v 1.9 2015/04/03 03:05:56 gienah Exp $ EAPI=5 @@ -23,3 +23,8 @@ RDEPEND=">=dev-lang/ghc-7.4.1:= DEPEND="${RDEPEND} >=dev-haskell/cabal-1.2 " + +src_prepare() { + cabal_chdeps \ + 'base >= 3 && < 4.8' 'base >= 3' +} -- 2.26.2