Bump agda to 2.3.0 bug #349460

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

5 files changed, 118 insertions, 9 deletions

diff --git a/sci-mathematics/agda/ChangeLog b/sci-mathematics/agda/ChangeLog
index 747aac9bcf7f..0cbe0345ff99 100644
--- a/sci-mathematics/agda/ChangeLog
+++ b/sci-mathematics/agda/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-mathematics/agda
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/ChangeLog,v 1.10 2010/11/20 13:45:12 kolmodin Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/ChangeLog,v 1.11 2012/01/23 13:52:38 gienah Exp $
+
+*agda-2.3.0 (23 Jan 2012)
+
+  23 Jan 2012; Mark Wright <gienah@gentoo.org> +agda-2.3.0.ebuild,
+  +files/agda-2.3.0-emacs.patch, metadata.xml:
+  Bump agda to 2.3.0 bug #349460
 
 *agda-2.2.6-r1 (20 Nov 2010)
 
diff --git a/sci-mathematics/agda/Manifest b/sci-mathematics/agda/Manifest
index ff258df9a5f5..45f4ee5725c2 100644
--- a/sci-mathematics/agda/Manifest
+++ b/sci-mathematics/agda/Manifest
@@ -1,21 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 50agda-gentoo.el 318 RMD160 8562741e1705eb87f9409a4b25d19d5c11ed42a2 SHA1 68d46099ad58b0d6617b3479aeece4e618040f5c SHA256 64f767d1fb3bef2e0b31f13f8ed5764dd3c5ede563c543694946a26ef16e22ee
 AUX 50agda2-gentoo.el 317 RMD160 eacbf92446738745987e9d3fd67dbf0d226bdbea SHA1 4976702e0326498dc95d14c16783377250f38f19 SHA256 043797b8766a610c08a5aa10b4ea46b955f208b851f0baea4ba4dbff74fb3417
 AUX agda-1.0.2-upstream-fixes.patch 2011 RMD160 2a8800c74748746e78b8e27e9f869ec258535186 SHA1 ea6d31923b5da554145020f4618179a6bb555b42 SHA256 634253f00a400f4e4e2c2714287ff6a7ebd1b5623d60770a6963e42d3a9f8cac
 AUX agda-2.2.6-emacs.patch 945 RMD160 b9897c1e9a53c269535d5fd9171273da47a2ee40 SHA1 05df4ee7c6a1e0348a6d03818a69768e00854b34 SHA256 aa3e0fc6164cb0d722fc5dc31e23b2372320c2f2a4a45c1e722df2dd3de8f5a5
+AUX agda-2.3.0-emacs.patch 949 RMD160 4ef386a55009863f819a31f596a709a427291822 SHA1 4f811e03d7a40c96445bf944581caba7a162ab6e SHA256 1449803290440d01d792254edb68f4a3692394f6ea1fdc8128d993dadc66e5a0
 AUX agda-make_install.patch 549 RMD160 323539535e17244e979f0fd14684f4375e0de4ef SHA1 f7e9a2b633b7c03f305db1210f954f34e5dc4037 SHA256 f23e6fa062ca5ef3c6b1e6b7e9133a19bcf3846e12fdd1659d23d44d252946fc
 DIST Agda-1.0.2.tar.gz 505642 RMD160 6686a0bd5920a83a3e08ef2894b8ddf1620f21c2 SHA1 fffcb8ca8d565e40756cd57035d869a90d2538cc SHA256 2ab56783a26e84f64422316daf0ce160f983667357361e2986baa13fb17e7ea1
 DIST Agda-2.2.6.tar.gz 1376824 RMD160 436b8ca196c0141e58d352dc88d4fa048dfa7cee SHA1 f9d2ed26379d572f47d1a7da3945407929af28c6 SHA256 3ea0f18d475e9a27ab4a6362e0888aa173f8eb9630085124aaf79df336168ca6
+DIST Agda-2.3.0.tar.gz 608029 RMD160 759a5d057def93ca6cd87f5e40f5a32953fbbad6 SHA1 128fcca71d1c1ddc2cdbfeb61e5ad41ad4d7ec97 SHA256 608e130bd33a1c14ea544b46bfb55c0c8e31ab43952572df38df90d086e30cdc
 EBUILD agda-1.0.2-r2.ebuild 1234 RMD160 548f429956b77cf1514b6b8b7cbe1d48bf2966d8 SHA1 970eaae13da56585a9c2fb5d96be5162405b17fb SHA256 f5e5b1f82c4197d1fd820a54e9273c48074229bf0dd75a78f1ac11d2c744c48b
 EBUILD agda-2.2.6-r1.ebuild 1350 RMD160 39158bf9155e5b46bce03ad1520b803829d6bd7f SHA1 40b51ac6f2b6f6ad88e98aafcdfc98487dd3cc94 SHA256 3d17da7d37b43cfe8f3fb3391d226bb33e9323330d52091027a89b2e1be0922c
-MISC ChangeLog 2365 RMD160 cd0db7d9f6ddf9f6ad251d3ac6ecf401b85f153a SHA1 d72f4c0fc6f440b5aea13b1a08a793a79fcd33d7 SHA256 2cc020cae3bf3e8dd8d730b45218eac66afab3682cde07700139ea3c5dab093a
-MISC metadata.xml 534 RMD160 0441029b6e1a3409af8ae8dc66ce2b6bb13cea6c SHA1 018fada115cd6275c73c53cbb929be2857dd9024 SHA256 4b2301380c3d5573d7a34753fd9191a558783e2a5a1de759780dd96fc9d9c42c
+EBUILD agda-2.3.0.ebuild 1733 RMD160 c8b696557dce9605a78fa43d94480f509e6971dc SHA1 cbb53d484fe0ade3cf19654e5d8d42d30b708b9d SHA256 1834f27e475f421ae26bfae63f7b966db771e07ea5eb98abf18caebf85d0ee52
+MISC ChangeLog 2538 RMD160 781303b9b9b493ad7eb289e6fba4c51d3b39e3b1 SHA1 f57afc8e95f365554183183661bf17f12d14e3dd SHA256 ad9793384fa4750f13e2fdfffc449cf8c11cef3b457768ea5d4d54360db3c6d4
+MISC metadata.xml 609 RMD160 0516de60055208b328bd1dc3cb40899c547d04a4 SHA1 d9c0302d62b58244ef263c16b638bb3024903b9a SHA256 ef7342967cdea0f879c68428600d4e41e0fb59cec6d41262640420b9784fdad0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAkzn0OEACgkQ1n/CYbXjntKlGQCbBdmOBBhA+9dH2knzhHMRbB6N
-gN4An3ZhN6ewJ8UsokkrZutn4xQSE4+M
-=ZfNq
+iF4EAREIAAYFAk8dZjMACgkQoBEVQmGOlx/+VgD/WCthhxo75HFbqvprBKN1m8B4
+Qh1MMOkmBz38erIeEPUA/RcWeJKQud96d+yO4oaTWwmqX1QLyh/MAp7vQ/AoltQR
+=iiEO
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/agda/agda-2.3.0.ebuild b/sci-mathematics/agda/agda-2.3.0.ebuild
new file mode 100644
index 000000000000..469ba891b76e
--- /dev/null
+++ b/sci-mathematics/agda/agda-2.3.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/agda-2.3.0.ebuild,v 1.1 2012/01/23 13:52:38 gienah Exp $
+
+# ebuild generated by hackport 0.2.14
+
+EAPI="3"
+
+CABAL_FEATURES="lib"
+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="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="epic"
+
+RDEPEND="<dev-haskell/binary-0.6
+		epic? ( dev-lang/epic )
+		=dev-haskell/hashable-1.1*
+		=dev-haskell/hashtables-1.0*
+		>=dev-haskell/haskeline-0.6.3.2
+		>=dev-haskell/haskell-src-exts-1.9.6
+		=dev-haskell/mtl-2.0*
+		=dev-haskell/quickcheck-2.4*
+		=dev-haskell/xhtml-3000.2*
+		<dev-haskell/zlib-0.6
+		>=dev-lang/ghc-6.10.4"
+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() {
+	sed -e 's@epic >= 0.1.13 && < 0.2@epic >= 0.1.13 \&\& < 0.10@' \
+		-i "${S}/${MY_PN}.cabal" || die "Could not loosen dependencies"
+	epatch "${FILESDIR}"/${P}-emacs.patch
+	cabal-mksetup
+}
+
+src_configure() {
+	cabal_src_configure $(cabal_flag 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.0-emacs.patch b/sci-mathematics/agda/files/agda-2.3.0-emacs.patch
new file mode 100644
index 000000000000..bfe89a34f29a
--- /dev/null
+++ b/sci-mathematics/agda/files/agda-2.3.0-emacs.patch
@@ -0,0 +1,27 @@
+--- agda-9999-orig/Agda.cabal	2011-11-26 00:25:45.382153242 +1100
++++ agda-9999/Agda.cabal	2011-11-26 17:43:50.076056097 +1100
+@@ -40,7 +40,6 @@
+                     doc/release-notes/*.txt
+ data-dir:           src/data
+ data-files:         Agda.css
+-                    emacs-mode/*.el
+                     EpicInclude/AgdaPrelude.e
+                     EpicInclude/stdagda.c
+                     EpicInclude/stdagda.h
+@@ -323,16 +322,3 @@
+   if impl(ghc >= 7.2)
+     ghc-options:    -fwarn-identities
+   ghc-prof-options: -auto-all
+-
+-executable agda-mode
+-  hs-source-dirs:   src/agda-mode
+-  main-is:          Main.hs
+-  other-modules:    Paths_Agda
+-  if flag(use-locale)
+-    build-depends:  base >= 4.2 && < 4.5
+-  else
+-    build-depends:  base == 4.1.*,
+-                    utf8-string == 0.3.*
+-  build-depends:    filepath >= 1.1 && < 1.3,
+-                    process >= 1.0.1.0 && < 1.2,
+-                    directory >= 1.0 && < 1.2
diff --git a/sci-mathematics/agda/metadata.xml b/sci-mathematics/agda/metadata.xml
index d60792b2fbcc..711ce7a4000b 100644
--- a/sci-mathematics/agda/metadata.xml
+++ b/sci-mathematics/agda/metadata.xml
@@ -9,4 +9,7 @@
   theory á la Martin-Löf, extended with dependent record types,
   inductive definitions, module structures and a class hierarchy mechanism.
 </longdescription>
+<use>
+  <flag name='epic'>Add support for the epic compiler.</flag>
+</use>
 </pkgmetadata>