Patch test-framework-th-prime-0.0.7 to build with cpphs-1.19

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

diff --git a/dev-haskell/test-framework-th-prime/ChangeLog b/dev-haskell/test-framework-th-prime/ChangeLog
index fdea20e5c19687bdb589a071e8c110ed39cc5b0e..fe5b7c413ca6762e7872b5092f670cb2bdefd69f 100644 (file)
--- a/dev-haskell/test-framework-th-prime/ChangeLog
+++ b/dev-haskell/test-framework-th-prime/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-haskell/test-framework-th-prime
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/test-framework-th-prime/ChangeLog,v 1.4 2014/12/14 11:35:04 gienah Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/test-framework-th-prime/ChangeLog,v 1.5 2015/04/04 12:56:01 gienah Exp $
+
+  04 Apr 2015; Mark Wright <gienah@gentoo.org>
+  +files/test-framework-th-prime-0.0.7-cpphs-1.19.patch,
+  test-framework-th-prime-0.0.7.ebuild:
+  Patch test-framework-th-prime-0.0.7 to build with cpphs-1.19
 
 *test-framework-th-prime-0.0.7 (14 Dec 2014)
 

diff --git a/dev-haskell/test-framework-th-prime/Manifest b/dev-haskell/test-framework-th-prime/Manifest
index 810f4102bf778bca2856910aa6fdcca0d1329ac0..d70737aec08b3e5438e8a683d6f92b22b351a8f7 100644 (file)
--- a/dev-haskell/test-framework-th-prime/Manifest
+++ b/dev-haskell/test-framework-th-prime/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX test-framework-th-prime-0.0.7-cpphs-1.19.patch 543 SHA256 3012e0b1f20234d0401ceb840ffefd727932d03de4bcf37f6260bb4461436bb6 SHA512 111948aee97ba397d402b472f557b960cf68c077e049f4c2b87a58cb9e812e85eeeb0d672ac6a2b045a60b0cbbe9f6107a65ed11e17e80004792e621aad3d1a7 WHIRLPOOL ffbf9b6110dde64b93f9bfef6d0ee2113b75187b44dede96223ea9ebafb860a8e8bbe444522d2273773f2e6c2bdae0554037ac40cf22423380898eef7c7a1dbd
 DIST test-framework-th-prime-0.0.5.tar.gz 3758 SHA256 f44248b6c5ce67f0c98a23e83834cca36fd6be3688d6afd0c00c2138d9b25d53 SHA512 9aaf9113b65030c50e2e740a0de1bd09e133e2d507ab67bf4175572a4cde5a57be8a78abc53003ca20de68377588041645570cfdd0884c7d985d36841a622a06 WHIRLPOOL f0a0cf2746a6ff0b7111dc8457a5c1ed76370c89bb1fe836addeb1676b9d34c80394a3c4a8db9974559d330e7d51dddd4394856f963209a6dce17d3643be7126
 DIST test-framework-th-prime-0.0.6.tar.gz 3801 SHA256 9839bc464c53ce692f50f0ebe43728e080eed1c42ed72884437e1262a63ed385 SHA512 4a35f24250b080565e9536762cc91e520978465b27a2227d06ff7518581a5d1a10d7f8b756979d6758c7d2a5c3d112a3aaabf0097f6342d76ef795a5741bf99c WHIRLPOOL 9130a5bd2c1bfc274495c0f09463834f7fea9bd42734884d5af72361e0a934c845c79646c14713e8b2f6f262770be939f62234180bf9e3fef21cf0440fec9770
 DIST test-framework-th-prime-0.0.7.tar.gz 3832 SHA256 176c91d29e7a4d832ff780db9d78d00f687ef59dc295b3347cc0be33a531cd14 SHA512 724b4de8cfdf10341bc95a6f437359fe0210ab0b7bef63761912d85d71ae552cef230f20bd50a723cf7aafcd45c30def6dc80b37c876986418db6072193f0daa WHIRLPOOL 226197b6014ab6c79a96519c354701c868476ce555a37da49a6325468c0a7943700d5c983eeeaff5a88630a1c2c03a5a447ecbef69fcea8ef15335bfe90982b2
 EBUILD test-framework-th-prime-0.0.5.ebuild 823 SHA256 edc6238f6d176d40c1e45f072b51f1e5f103134bfed27af5d1504825430ecbe9 SHA512 4ff1f3ec8621e7a5c0914811803781eea28660c0102652faf446ef6f2d8f83351051bcf043e7a4064a5c7011ca895f76b9dc6f0cbfeb5b5697747d461c483e86 WHIRLPOOL 2c048b350b23224aa195931afdaa057671f0219dcb7194e007f6f54924cc7223595393d0489b21ced770fb4a80232a40d0df1dea74bfcb4559d80acafb3b7c40
 EBUILD test-framework-th-prime-0.0.6.ebuild 857 SHA256 a0b5f934f9d8789bfd52ed84489af1bc5880668b78960d0d962cb71d213db795 SHA512 1883e082d08432453b7cf06bd071e0889dd9950e45cfc54025c6b700312a68604e580f2cdadcb5748bd812e468c0bb1546dcb4c50bc7802a19f9c951cc306f3f WHIRLPOOL 94ddf2f9c516f6ac9a56fa73cb8606f28a4db62617d2b961526d59100cddec39b8233c90f0f8d6304e1a98ccec586d07d5075b842415cd63a742cdc192989cfc
-EBUILD test-framework-th-prime-0.0.7.ebuild 852 SHA256 1eb40c5b4ec85684948493aabae226173025bb5a456b755ed00520febc3017c4 SHA512 dc2d959f271244db25ea9bc6e911be4ff409777be079807e4abac6326d2df03730bbd44c6141c32230450859c844bf5ba6c4bac2358a049a327f39028e9bdc8a WHIRLPOOL 7d419401d0a6bcc0dce37d7dd617574edfd293f92452d79bd767d9195c5858bc10a58509c1e839c26a2399b29f6798540c286ef2aa98b0bab18c1854a63369c3
-MISC ChangeLog 933 SHA256 b3efe0a3aa14900113c671c5cda0544e0ae7b62c2839839e446b721a3d8eb5ea SHA512 421b4f57e1246da127d16054888de2c4a01fd428303e5591341841bcf6af1a95cf0e9789dc6d1400d8ee285f0caf8131c8f4eac52725838049337194aebce7ef WHIRLPOOL 1971e0a4694da3a98cce725fc17bd8065391ded04481d1cdd98bb95e863fff06e50d39a1e26b2d8a785f8064d47f398a42e629c1f1b68588ec1a43da5686188f
+EBUILD test-framework-th-prime-0.0.7.ebuild 911 SHA256 4ddf824893a422e824fef9bb40e6fa2892256ba4819ce0ec1d9c05716885f24a SHA512 715cb1d23ef5284852c2e2df152c6a03059780a14d201fc309e6e0e0823737976397b3342ee24b792201673aa5de171cd43ee0e90445f86d167d05ea657c75b5 WHIRLPOOL 8dc66efcf4daba0fb48957e17f93b3fb5e259b24b3769fa6fa7747207a762b9120ae3f9c1b2fe07d23882bf678877849ec5f5696ca88b0ea3c120c337fb92051
+MISC ChangeLog 1141 SHA256 36ca6f9acb39308e1cba264593af029cdc3444d1be241801b8352e13e2f39923 SHA512 ce3267f26217e49c932660edc51c35edb739c96bb5da15a81f4a6cff6eb48984034a81e1b0e43ad3c96238cadea555a36ce249708ffc8eef24742ae39f502e25 WHIRLPOOL 5ccbd8492792d1770dbf0d69ab31a6656345c99b3c76572fc929e3c9f28aabeb4ae0c5ab710ad55e5a4a31af64617ba7fd299f9a4a5a4527c97f2b7c85bbaf07
 MISC metadata.xml 276 SHA256 7e512de37ada5e14c47c7a50a1fd0d48f084a0a610411fd8ee167161085e8a64 SHA512 28d53382296923f20bb15c76bb7bc70e513fc50827a43a19c523a873de236374e4fb6023fb8ad28fd89893d13fe66e1263b0f46d0806e0e781bc1b827ce93219 WHIRLPOOL 0c08e406856b2a4ee8ae402761621954425d0d3c0eaaa3d0b76e3517961de3455c3514d20ea3d048d3722ce73e19fb81cf4e7cb450fa7906a2145108642187ec
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlSNde4ACgkQoBEVQmGOlx9vpQD/YTkGr2DMmY8FrXSrAIZ68cBR
-Dn36O5wTzmaRtLTSSHIA/jN8PXrl/0E4VGwaWNaTMNFLzhOSaLx5zd+8k1K48Rd2
-=vxFV
+iF4EAREIAAYFAlUf32cACgkQoBEVQmGOlx+lcgEAxlYaN7uRUwHlG0SyTLDUTM/j
+SRGQim13DIezTczO4Q4BAJ53XQ9gA4IoWic9HlqBJzLGMtaURkky7az9GdthsORL
+=nrOI
 -----END PGP SIGNATURE-----

diff --git a/dev-haskell/test-framework-th-prime/files/test-framework-th-prime-0.0.7-cpphs-1.19.patch b/dev-haskell/test-framework-th-prime/files/test-framework-th-prime-0.0.7-cpphs-1.19.patch
new file mode 100644 (file)
index 0000000..a638dcd
--- /dev/null
+++ b/dev-haskell/test-framework-th-prime/files/test-framework-th-prime-0.0.7-cpphs-1.19.patch
@@ -0,0 +1,11 @@
+--- test-framework-th-prime-0.0.7-orig/Test/Framework/TH/Prime/Parser.hs       2014-10-08 12:01:25.000000000 +1100
++++ test-framework-th-prime-0.0.7/Test/Framework/TH/Prime/Parser.hs    2015-04-04 23:46:56.120211323 +1100
+@@ -10,7 +10,7 @@
+ import Language.Haskell.Exts.Parser
+ import Language.Haskell.Exts.Syntax hiding (VarName, Exp)
+ import Language.Haskell.TH hiding (Match)
+-import Language.Preprocessor.Cpphs
++import Language.Preprocessor.Cpphs (cppIfdef, defaultBoolOptions)
+ 
+ ----------------------------------------------------------------
+ 

diff --git a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.7.ebuild b/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.7.ebuild
index 945f1b05ea75662b06466e04996f952d77989f95..1a3ece7888317b67e2ae1e33cd22a9073cf92a36 100644 (file)
--- a/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.7.ebuild
+++ b/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.7.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.7.ebuild,v 1.1 2014/12/14 11:35:04 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/test-framework-th-prime/test-framework-th-prime-0.0.7.ebuild,v 1.2 2015/04/04 12:56:01 gienah Exp $
 
 EAPI=5
 
 # ebuild generated by hackport 0.4.4.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
+inherit base haskell-cabal
 
 DESCRIPTION="Template Haskell for test framework"
 HOMEPAGE="http://hackage.haskell.org/package/test-framework-th-prime"
@@ -26,3 +26,5 @@ RDEPEND=">=dev-haskell/cpphs-0.2.1:=[profile?]
 DEPEND="${RDEPEND}
        >=dev-haskell/cabal-1.6
 "
+
+PATCHES=("${FILESDIR}/${PN}-0.0.7-cpphs-1.19.patch")