Patch agda 2.3.2.1 for haskell-src-exts 1.14

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

4 files changed, 151 insertions, 5 deletions

diff --git a/sci-mathematics/agda/ChangeLog b/sci-mathematics/agda/ChangeLog
index 2eb038eef26d..3692082b1149 100644
--- a/sci-mathematics/agda/ChangeLog
+++ b/sci-mathematics/agda/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/agda
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/ChangeLog,v 1.22 2013/06/19 06:41:49 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/ChangeLog,v 1.23 2013/09/13 06:58:23 gienah Exp $
+
+*agda-2.3.2.1-r1 (13 Sep 2013)
+
+  13 Sep 2013; Mark Wright <gienah@gentoo.org> +agda-2.3.2.1-r1.ebuild,
+  +files/agda-2.3.2.1-haskell-src-exts-1.14.patch:
+  Patch agda 2.3.2.1 for haskell-src-exts 1.14
 
   19 Jun 2013; Sergei Trofimovich <slyfox@gentoo.org> -agda-2.3.0.ebuild:
   Drop old.
diff --git a/sci-mathematics/agda/Manifest b/sci-mathematics/agda/Manifest
index 4519197bc5a8..f64b64e96467 100644
--- a/sci-mathematics/agda/Manifest
+++ b/sci-mathematics/agda/Manifest
@@ -11,10 +11,12 @@ AUX agda-2.3.0.1-haskell-src-exts-1.13.patch 1077 SHA256 d88f7e113b701d6d67bbbd1
 AUX agda-2.3.0.1-mtl-2.1.patch 489 SHA256 c529a4585ceab9f2f2e9746dd36b72ca91dd8c815f43b427022ef7c7517d6199 SHA512 3f78da37ffb7ff3c06b49bc8bf6df9277866b6fe5d4cccfa0120e0959cb79ad7ee13fab4fd089dafed665470efd89a28936a5c2d7f818c9a03f1d2e6bb6cfed4 WHIRLPOOL 6656d1002a38636ae424b71d9b4cd2fb7b92440c769927ffa710507321fb9ebb41de23da4edc3d6038c05ddefdc3a1ebaf0df0f4327b9ae64f9c4df6daa8d327
 AUX agda-2.3.0.1-quickcheck-2.5.patch 1308 SHA256 a07adba140a81eb76042a7f985b2cb711d99e92d1ff7df9ca32a93685d6e6fe9 SHA512 4c15bc38d2341be7b830c48a004f688725ddc2fda2271b44455a7bab3cd50f9fbac1821ca76b812fd78fdc5db252dc7a89cdcf9ba4cdb2a8f4322d1d43216521 WHIRLPOOL be134013d143d76dc7741fea7fc43654f4f55bd583faea9dddc90189f934001196129e2a949f0c104109367e03c0a13e7a25fc51dce6d414429ca486dc657896
 AUX agda-2.3.2-hashable-1.2.patch 2010 SHA256 8ed826fb6c7420274d1e31d2abc680d2d6419c7ef9a474cec0b79a12d4feae5e SHA512 b35bc500c94708241d46f5c9bcd78008d8de83a6d5d59784eac27fb4a0426a7a2c623dce1dfc1209b80bc73ff92c07a462d36e403826033c7c87ea828c1efda2 WHIRLPOOL beaab8e5301baa4bb222166998e92ca4cb7acd11b75d6656f0b22707b4c0e4f6b98217a7ff43aaa41aed75ee2719a4a64338a360f461ff1580d3954d4e0cd518
+AUX agda-2.3.2.1-haskell-src-exts-1.14.patch 1402 SHA256 9574b8ab4428770347743f67caad84549171efcbf772fad2d368fb8f0bcc972b SHA512 4049478b97cb330766107055bb0f47f7b46b5587f66393a0e0045eb2f8822945b4c32b56a4563903004c37299ab8067f1cff5ccbc801aadf2f347739b6409446 WHIRLPOOL 6ddd946b130bb9a1ba87730d5916c7fdc5875d7248bab839cff4062a392a971fb33a0d1b3fe0171cf13f7e7d604c3d86f84efb6196272743139a1dd3256d0c0c
 AUX agda-make_install.patch 549 SHA256 f23e6fa062ca5ef3c6b1e6b7e9133a19bcf3846e12fdd1659d23d44d252946fc SHA512 28ca830797ecfddf50fa0f3cedd8eebd5a0c1f974749440bb793d597736da2bbb42217b80e25230b941814bca233469b5909471cfa70c4b7fc659a46d7c43d1c WHIRLPOOL 40a5f18241e4b9df5a1997f342eae5f292019a14e222d8ad792f632b3f33c0c2929959ed705514ef94968e022cc3eadf109c24c891bbfdc9b33568318838f472
 DIST Agda-1.0.2.tar.gz 505642 SHA256 2ab56783a26e84f64422316daf0ce160f983667357361e2986baa13fb17e7ea1 SHA512 8c70f33af4734c51318412117a3fdc0fedd3f613fe4c778ef85553c67fcf8358d7491afccf745bc695ad5f0d53d468fec611ffd0524ac984bdfa4fdb29035eee WHIRLPOOL da995cbe0b713311cc2a8566f01a4f194c4042e8caf73e1074280d45e94dc9acc3ade8c4e44059977a6d9074448c71754c3fc3f34391c7928e6bd5d5a3735836
 DIST Agda-2.2.6.tar.gz 1376824 SHA256 3ea0f18d475e9a27ab4a6362e0888aa173f8eb9630085124aaf79df336168ca6 SHA512 b91bf28e7c0e41b83afab98e4552ded960e0b3a9ae0710b63491b5898d87809ce386e706e0d232b09d5745f779954731d64657cf58508a5fcd5b336eda4d08e9 WHIRLPOOL 98814bea70636feeee975569af9ce57183bb1877e0521fb3c09444298ba6ce125996348f9455d66091bf107a469d66d1987348ce96325d392133dfe39e47ca26
 DIST Agda-2.3.0.1.tar.gz 612342 SHA256 5cc016a6cf113979d92af05c10b1e92dead4bf87861086177a017ce1d7605338 SHA512 c9e51b20d74cc5c6b8b9a9d7574478f552d0ae9c1133f017727b2f2f0646e04de0fca79918027ef0664bba708763c909e8eaaec2964a7a2f031ba21235b5c9dc WHIRLPOOL ec0e402caed8aa28e928ef20e2707547d9aeab53b9630fc1cb13136423debe89e0826b161895230dba99479049cf42cbb5edde55c584fe0a0ef2d41f9bed4f8f
+DIST Agda-2.3.2.1.tar.gz 730010 SHA256 790e02ed9af8b9b65ea704b765fd9937444ec1351da9bc2547aa8e9034038eb6 SHA512 d6aa7728d428a66b638f36d7d086be43f4956fa086c5e7dba47520c6b4e2294f149491c8b099c3402c93f9e6d559396573e0f2b72044f6d9c58ef29987c40113 WHIRLPOOL b7fa249ab8a3d11c9f9a00a44b2c3c560953e07d2c4db1eedd411fcfccd62e425a9d2b53c56c96a0002a9878bf21de1f736249751a91cdd795e7289af776c34c
 DIST Agda-2.3.2.tar.gz 726462 SHA256 d47a0b2a0806ea5c109b59280211a47b980b47a8f6ac0ab9fca673f3d4c6e0f6 SHA512 6bf4775517db41795303a4d1a4611856f599ea7595784a37cb5bb7c4608e948807549632d633a731e38502e61a528a0274b5bf8a6eaa0b9d86a9f558726d18cc WHIRLPOOL 7a0c95a72445b66ee297cdb07b5994deafe8b2f608a238226b0a241ad70b2d4f5e2834011fedc90018bfc692ff1aa4eea57143c01f9b1f496ebb4dc189d6353c
 EBUILD agda-1.0.2-r2.ebuild 1234 SHA256 f5e5b1f82c4197d1fd820a54e9273c48074229bf0dd75a78f1ac11d2c744c48b SHA512 0f75e6abdca50c639063a713980d99c65290458e1d12b12772529f2731afd4c45401839d993e92c02b2ff171253252f3dafd1652cd4fc93bdfdf404afcdd0900 WHIRLPOOL eea378424156d044b610e9ac1cd8713caf1dc31afd6c4c8dce0a437a861f326a1703d19e8255400bbc6119c36e36341142cf47b027ae97d31039a418b349796b
 EBUILD agda-2.2.6-r1.ebuild 1350 SHA256 3d17da7d37b43cfe8f3fb3391d226bb33e9323330d52091027a89b2e1be0922c SHA512 9f4116d09e97f24e18d59e780fd620069490e9cef23b8b3653f204edcfb146a8598b8c77e9d2bd84c5862b67bd0a4b2b2e8aac0de5a2d84fed930da9b483b619 WHIRLPOOL 780e2a3d067d69f99fafb4d27fdeefba7d3331e102f37833b8ea022d9d83228874748b3903cfc52c241b89cb1e302be9d7db824c9254f56796eb8763bdc59961
@@ -22,13 +24,14 @@ EBUILD agda-2.3.0.1-r1.ebuild 2682 SHA256 de467510990469f26662ab8167bd02dd7540d5
 EBUILD agda-2.3.0.1.ebuild 2139 SHA256 7bc93ef47608329e0abbdada68be30b976865eddd144866e1b714d1da210f62f SHA512 f5509f8bc9c87c12fd001e95504bf56d6fea038d8cbe7f53a3e31a44d77035693f4f60e86845b30b4d8f376eb6029f7c3d6b2ccb61fb0192fcbc5c99f58619ed WHIRLPOOL f1b9daac6cdd9429a6bfca5c570e1290d5e4021de580e466ff97a6a4044e16cd6cb1eb03cc976ad78aac7fece57bdd1c8b8a9bcc2515b911c88dbbac6fb361b1
 EBUILD agda-2.3.2-r2.ebuild 3076 SHA256 746dabf68f238bd41f4ae9f89b830c043215be9cd93a466c0e96fa8511da84b3 SHA512 51c3ca59a4101ac5b4b7f0cff1b862b875416a49ad3893c79b6352c8a7a007f5880408548373ae8be067e01cd242d715eeae483a53f7de7a630c29f980ed02bf WHIRLPOOL 9973949924cd994a25d934865d6f5444c3efe91c027786d13917fcf7186f192189e65e4db1cbbbdc549eb05bf5c46006a4e5f7e17183b54c3a0428295f03b601
 EBUILD agda-2.3.2-r5.ebuild 3237 SHA256 aee04a11ef26500050c81e08df1843c6fd20114a3b42f4688d226e53fc81ec39 SHA512 c3b099da5caa4188692c9df4441f16aad6e5a6976fdf881f02e35f4966e8b7e8bd784b608832d228f364e091fb8ba34e68643f3f25b47048e7579f8a26d91e68 WHIRLPOOL 7bf515475508e702a5afe69cdf39f83d8418f652adb7b7735f877da65ca27cea9341f76639aad7542a83036f75f28d791b5c73f2470a5019dd68d33417d2921e
+EBUILD agda-2.3.2.1-r1.ebuild 3360 SHA256 c57933aad95928f899898bbc3266ca775d1ec658bb5d18eaa1df900b882cbbde SHA512 a360047e2b16ec314dea5ec6a2b305868ccc6c218dda2a56ceb138a46ba228fb2c501eb521d30153c13f1cbc137c8759d37134649dd90343cfd276a2929c634c WHIRLPOOL 4986624c7b1638e447bb7c0570befe5e7fd50337912c74116dbc5667f4178399fed7b86305fde00ba77bb7f63337ffbabaa682142d662a60db5325424e88a6df
 EBUILD agda-2.3.2.ebuild 2856 SHA256 77a5282ce1dd12925eeee78d18bfb9ee6e20b5382aa8c239579eac34f688f46e SHA512 51eb52b98785ad93ff64b6b33e882c3970b46c99db6c57df053a858c20b260fb16068dc7be085743b45bd694252b0dcc5f5902213377504dd943ffc08f878ab5 WHIRLPOOL 03f712b15fe561c71d78fc991389e78a8f43b9c8fdbf84c0ae5953041a49ce8ecefeb2bb6297f6a2bc5f90592434f0e525803f79e824b3533be943c8947313d8
-MISC ChangeLog 4402 SHA256 acbb4306a064acb55210a9dfcc7b51887d62a78cf7a5972f7710e531b46c4033 SHA512 d9da3f2dfe5285843f74cf2e4acaf91bd119fe3ffd533e38a548f6e0dab212046df37547966dd82c22cef1ac79e8b9f6cccf0efddeedabff35e831f5d427d7ee WHIRLPOOL 7d5c0ec7d0f3bdd178676e8fe7e723dbc37aebeea1d24a887991e6fe4154b72cd0a7c84ad41b7e547bead6eed9904fdba8ea5de353e759351796cc56d062c401
+MISC ChangeLog 4605 SHA256 98163930c1fc851395e3335a7a287e7156493a1e7d118064fb73156662a7f404 SHA512 abf6e9d9628fe03d0f77794612575c58a00d2e8634dd7261abf83f513af4d53e520794933028fa044ec0af1570f82491ec9d598198dff9e3a4324849fba3ca53 WHIRLPOOL da07dac216a3aba1ee3a33f35e0f9f206eb761c93395c0edf3293d23966f8857d91d74b3751bf22156a3cb4acfb18c77777963ae9f7fd36f52df152612137035
 MISC metadata.xml 668 SHA256 165c4a13bd018ab925d952bbcc5bfbb90fc3e52a48c0826d15002a0b4f5857d8 SHA512 fffd98368697b3975d1d7dee5947f01195ec3706b511aa5a3ed38aea167d1cd87cb278ca62d9fcf0afce28d8da13dc831d9fe0b0c02c4fc31ced44485e272237 WHIRLPOOL a20fc3187a93fe6e5d8f6639d27faa3632746e81e46a7f40be2bcc3f7e47008c0d2a3978e8eb0f90bd692d166aa3208ca482182d451f781a3fc124dd79d6b9e4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHBUksACgkQcaHudmEf86rzVwCfX0LgpKy08BhYG8dCWVoVC0Bp
-D2YAn2Np55sm2u+4A9EdXUa4t5RK0cIO
-=0/Yh
+iF4EAREIAAYFAlIytv8ACgkQoBEVQmGOlx9CRQD/ePx/CTbPhendZmf8E4HKleIg
+Wz7xMixNQZ5lNLxfJYUBAJqnMb8BEr9a1gYUxxK8AOcAR4Oug9QlWVazPw3vrldl
+=SRkR
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/agda/agda-2.3.2.1-r1.ebuild b/sci-mathematics/agda/agda-2.3.2.1-r1.ebuild
new file mode 100644
index 000000000000..7df444320289
--- /dev/null
+++ b/sci-mathematics/agda/agda-2.3.2.1-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/agda-2.3.2.1-r1.ebuild,v 1.1 2013/09/13 06:58:23 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.2.9999
+
+CABAL_FEATURES="lib profile"
+inherit haskell-cabal eutils elisp-common
+
+MY_PN="Agda"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A dependently typed functional programming language and proof assistant"
+HOMEPAGE="http://wiki.portal.chalmers.se/agda/"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="epic +stdlib"
+
+RDEPEND=">=dev-haskell/binary-0.4.4:=[profile?]
+		<dev-haskell/binary-0.8:=[profile?]
+		=dev-haskell/deepseq-1.3*:=[profile?]
+		>=dev-haskell/geniplate-0.6.0.3:=[profile?]
+		<dev-haskell/geniplate-0.7:=[profile?]
+		>=dev-haskell/hashable-1.1.2.3:=[profile?]
+		<dev-haskell/hashable-1.3:=[profile?]
+		>=dev-haskell/hashtables-1.0:=[profile?]
+		<dev-haskell/hashtables-1.2:=[profile?]
+		>=dev-haskell/haskeline-0.6.3.2:=[profile?]
+		<dev-haskell/haskeline-0.8:=[profile?]
+		>=dev-haskell/haskell-src-exts-1.9.6:=[profile?]
+		<dev-haskell/haskell-src-exts-1.15:=[profile?]
+		>=dev-haskell/mtl-2.0:=[profile?]
+		<dev-haskell/mtl-2.2:=[profile?]
+		<dev-haskell/parallel-3.3:=[profile?]
+		>=dev-haskell/quickcheck-2.3:=[profile?]
+		<dev-haskell/quickcheck-2.7:=[profile?]
+		=dev-haskell/text-0.11*:=[profile?]
+		=dev-haskell/unordered-containers-0.2*:=[profile?]
+		=dev-haskell/xhtml-3000.2*:=[profile?]
+		>=dev-haskell/zlib-0.4.0.1:=[profile?]
+		<dev-haskell/zlib-0.6:=[profile?]
+		>=dev-lang/ghc-6.12.1:=
+		virtual/emacs
+		app-emacs/haskell-mode
+		epic? ( <dev-lang/epic-0.10:=[profile?]
+			>=dev-lang/epic-0.1.13:=[profile?]
+		)
+		|| ( >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.1:=[profile?] >=dev-haskell/mtl-2.1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] )"
+DEPEND="${RDEPEND}
+		dev-haskell/alex
+		>=dev-haskell/cabal-1.8
+		dev-haskell/happy"
+
+SITEFILE="50${PN}2-gentoo.el"
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-2.3.2.1-haskell-src-exts-1.14.patch"
+	CABAL_FILE=${MY_PN}.cabal cabal_chdeps \
+		'binary >= 0.4.4 && < 0.6' 'binary >= 0.4.4 && < 0.8' \
+		'hashtables == 1.0.*' 'hashtables >= 1.0 && < 1.2' \
+		'haskell-src-exts >= 1.9.6 && < 1.14' 'haskell-src-exts >= 1.9.6 && < 1.15'
+	sed -e '/.*emacs-mode.*$/d' \
+		-e '/^executable agda/,$d' \
+		-i "${S}/${MY_PN}.cabal" \
+		|| die "Could not remove agda and agda-mode from ${MY_PN}.cabal"
+	cabal-mksetup
+	if use epic && use stdlib; then
+		ewarn "Note that the agda-stdlib README:"
+		ewarn "http://www.cse.chalmers.se/~nad/listings/lib/README.html"
+		ewarn 'says: "Currently the library does not support the Epic or JavaScript compiler'
+		ewarn 'backends." Hence you may wish to remove the epic use flag if you wish to use'
+		ewarn "the Agda standard library."
+	fi
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag epic epic)
+}
+
+src_install() {
+	haskell-cabal_src_install
+	elisp-install ${PN} src/data/emacs-mode/*.el \
+		|| die "Failed to install emacs mode"
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}" \
+		|| die "Failed to install elisp site file"
+}
+
+pkg_postinst() {
+	ghc-package_pkg_postinst
+	elisp-site-regen
+}
+
+pkg_postrm() {
+	ghc-package_pkg_prerm
+	elisp-site-regen
+}
diff --git a/sci-mathematics/agda/files/agda-2.3.2.1-haskell-src-exts-1.14.patch b/sci-mathematics/agda/files/agda-2.3.2.1-haskell-src-exts-1.14.patch
new file mode 100644
index 000000000000..4a94b089243c
--- /dev/null
+++ b/sci-mathematics/agda/files/agda-2.3.2.1-haskell-src-exts-1.14.patch
@@ -0,0 +1,34 @@
+--- Agda-2.3.2.1-orig/src/full/Agda/Compiler/MAlonzo/Compiler.hs	2013-06-05 02:19:33.000000000 +1000
++++ Agda-2.3.2.1/src/full/Agda/Compiler/MAlonzo/Compiler.hs	2013-09-13 14:41:50.525225325 +1000
+@@ -228,7 +228,11 @@
+         (a, _) <- conArityAndPars c
+         Just (HsDefn _ hsc) <- compiledHaskell . defCompiledRep <$> getConstInfo c
+         let pat = HS.PApp (HS.UnQual $ HS.Ident hsc) $ genericReplicate a HS.PWildCard
++#if MIN_VERSION_haskell_src_exts(1,14,0)
++        return $ HS.Alt dummy pat (HS.UnGuardedAlt $ HS.Tuple HS.Boxed []) (HS.BDecls [])
++#else
+         return $ HS.Alt dummy pat (HS.UnGuardedAlt $ HS.Tuple []) (HS.BDecls [])
++#endif
+   cs <- mapM makeClause cs
+   let rhs = case cs of
+               [] -> fakeExp "()" -- There is no empty case statement in Haskell
+@@ -469,11 +473,19 @@
+   ]
+   where
+     parse = HS.parseWithMode
++#if MIN_VERSION_haskell_src_exts(1,14,0)
++              HS.defaultParseMode{HS.extensions = L.map HS.EnableExtension [explicitForAll]}
++#else
+               HS.defaultParseMode{HS.extensions = [explicitForAll]}
++#endif
+     ok (HS.ParseOk d)   = d
+     ok HS.ParseFailed{} = __IMPOSSIBLE__
+ 
++#if MIN_VERSION_haskell_src_exts(1,14,0)
++explicitForAll :: HS.KnownExtension
++#else
+ explicitForAll :: HS.Extension
++#endif
+ explicitForAll =
+ -- GHC 7.0.1 cannot parse the following CPP conditional
+ -- error: missing binary operator before token "("