Thanks to tomprince for adding support for agda-stdlib. Bump to 2.3.0.1, EAPI=4, [profile?] for haskell lib depends.

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

6 files changed, 135 insertions, 22 deletions

diff --git a/sci-mathematics/agda/ChangeLog b/sci-mathematics/agda/ChangeLog
index 0cbe0345ff99..c5e173b0f6b0 100644
--- a/sci-mathematics/agda/ChangeLog
+++ b/sci-mathematics/agda/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-mathematics/agda
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/ChangeLog,v 1.12 2012/03/25 13:55:19 gienah Exp $
+
+*agda-2.3.0.1 (25 Mar 2012)
+
+  25 Mar 2012; Mark Wright <gienah@gentoo.org> +agda-2.3.0.1.ebuild,
+  +files/agda-2.3.0.1-emacs.patch, agda-2.3.0.ebuild, metadata.xml:
+  Thanks to tomprince for adding support for agda-stdlib. Bump to 2.3.0.1,
+  EAPI=4, [profile?] for haskell lib depends.
 
 *agda-2.3.0 (23 Jan 2012)
 
diff --git a/sci-mathematics/agda/Manifest b/sci-mathematics/agda/Manifest
index 45f4ee5725c2..0e46d128da76 100644
--- a/sci-mathematics/agda/Manifest
+++ b/sci-mathematics/agda/Manifest
@@ -6,19 +6,22 @@ AUX 50agda2-gentoo.el 317 RMD160 eacbf92446738745987e9d3fd67dbf0d226bdbea SHA1 4
 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-2.3.0.1-emacs.patch 955 RMD160 1fae765f23993f8352717381895022c85f1959e4 SHA1 6d1fbf83b3e8d28bd8259a7f38943e20050caf89 SHA256 8a124f71c4580923a2d8ecd39064a999da313bf7f7085e322d8259421f17496b
 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.1.tar.gz 612342 RMD160 5228de0bffc63b6604c4d2263fc2a5587262c6ec SHA1 9fe8bc82c1267f4974928b807a8701790a208c86 SHA256 5cc016a6cf113979d92af05c10b1e92dead4bf87861086177a017ce1d7605338
 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
-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
+EBUILD agda-2.3.0.1.ebuild 1769 RMD160 6f3e6fde29cb734f9f1240b84710028ab5179d03 SHA1 004317f3fb15aa6026102f9c6c4dfab4d2e017cd SHA256 ef53e7e5dd595c5f54b63df598981da3c8f50862b785d28c49a5d90c0e9960ac
+EBUILD agda-2.3.0.ebuild 2176 RMD160 a729ac0acd95d29859d2f4a68b8eebe33cd3080e SHA1 454f3737ff33658a371d4335ab248416e2291f7b SHA256 d943ba545696902ba673a35416b34c77542983a00e21bd3ee1df64c0e79d1fd0
+MISC ChangeLog 2826 RMD160 efa9b593aace71292f3e7a04b93fbb47aa6786f9 SHA1 3cbb4dd7a303c0614d85d761a83dbedfc5df44c4 SHA256 66c5e84634c07e0c229c42438b8d3a670246e0b2e2e901fd3bb9724285287dbd
+MISC metadata.xml 668 RMD160 466ee13a2463be6ace75b275eb851eeb2a37f59c SHA1 3f9dcf39927834481b84649e667c144d22509a32 SHA256 165c4a13bd018ab925d952bbcc5bfbb90fc3e52a48c0826d15002a0b4f5857d8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk8dZjMACgkQoBEVQmGOlx/+VgD/WCthhxo75HFbqvprBKN1m8B4
-Qh1MMOkmBz38erIeEPUA/RcWeJKQud96d+yO4oaTWwmqX1QLyh/MAp7vQ/AoltQR
-=iiEO
+iF4EAREIAAYFAk9vJEQACgkQoBEVQmGOlx8Q+AEA25fYtSdI7OBRDYy5mSf2XlkC
+3X1MSUiY8UGXFodor+sA/R349Hl/PKpTda2sDcwuRa0QURoCva4Yn66Ymh6yuoEA
+=ZknJ
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/agda/agda-2.3.0.1.ebuild b/sci-mathematics/agda/agda-2.3.0.1.ebuild
new file mode 100644
index 000000000000..9822de9ac0eb
--- /dev/null
+++ b/sci-mathematics/agda/agda-2.3.0.1.ebuild
@@ -0,0 +1,69 @@
+# 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.1.ebuild,v 1.1 2012/03/25 13:55:19 gienah Exp $
+
+# ebuild generated by hackport 0.2.14
+
+EAPI="4"
+
+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="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="epic +stdlib"
+
+RDEPEND="<dev-haskell/binary-0.6[profile?]
+		epic? ( dev-lang/epic[profile?] )
+		=dev-haskell/hashable-1.1*[profile?]
+		=dev-haskell/hashtables-1.0*[profile?]
+		>=dev-haskell/haskeline-0.6.3.2[profile?]
+		>=dev-haskell/haskell-src-exts-1.9.6[profile?]
+		=dev-haskell/mtl-2.0*[profile?]
+		=dev-haskell/quickcheck-2.4*[profile?]
+		=dev-haskell/xhtml-3000.2*[profile?]
+		<dev-haskell/zlib-0.6[profile?]
+		>=dev-lang/ghc-6.10.4"
+PDEPEND="stdlib? ( sci-mathematics/agda-stdlib )"
+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}"/${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/agda-2.3.0.ebuild b/sci-mathematics/agda/agda-2.3.0.ebuild
index 469ba891b76e..72abd016e20d 100644
--- a/sci-mathematics/agda/agda-2.3.0.ebuild
+++ b/sci-mathematics/agda/agda-2.3.0.ebuild
@@ -1,12 +1,12 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/agda-2.3.0.ebuild,v 1.2 2012/03/25 13:55:19 gienah Exp $
 
 # ebuild generated by hackport 0.2.14
 
-EAPI="3"
+EAPI="4"
 
-CABAL_FEATURES="lib"
+CABAL_FEATURES="lib profile"
 inherit haskell-cabal eutils elisp-common
 
 MY_PN="Agda"
@@ -19,19 +19,20 @@ SRC_URI="http://hackage.haskell.org/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="epic"
+IUSE="epic +stdlib"
 
-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
+RDEPEND="<dev-haskell/binary-0.6[profile?]
+		epic? ( dev-lang/epic[profile?] )
+		=dev-haskell/hashable-1.1*[profile?]
+		=dev-haskell/hashtables-1.0*[profile?]
+		>=dev-haskell/haskeline-0.6.3.2[profile?]
+		>=dev-haskell/haskell-src-exts-1.9.6[profile?]
+		=dev-haskell/mtl-2.0*[profile?]
+		=dev-haskell/quickcheck-2.4*[profile?]
+		=dev-haskell/xhtml-3000.2*[profile?]
+		<dev-haskell/zlib-0.6[profile?]
 		>=dev-lang/ghc-6.10.4"
+PDEPEND="stdlib? ( sci-mathematics/agda-stdlib )"
 DEPEND="${RDEPEND}
 		dev-haskell/alex
 		>=dev-haskell/cabal-1.8
@@ -41,9 +42,14 @@ SITEFILE="50${PN}2-gentoo.el"
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	epatch "${FILESDIR}"/${P}-emacs.patch
+	epatch "${FILESDIR}"/${P}-ghc-7.4.patch
 	sed -e 's@epic >= 0.1.13 && < 0.2@epic >= 0.1.13 \&\& < 0.10@' \
+		-e 's@base >= 4.2 && < 4.5@base >= 4.2 \&\& < 4.6@' \
+		-e 's@array >= 0.1 && < 0.4@array >= 0.1 \&\& < 0.5@' \
+		-e 's@filepath >= 1.1 && < 1.3@filepath >= 1.1 \&\& < 1.4@' \
+		-e 's@old-time == 1.0.\*@old-time >= 1.0 \&\& < 1.2@' \
 		-i "${S}/${MY_PN}.cabal" || die "Could not loosen dependencies"
-	epatch "${FILESDIR}"/${P}-emacs.patch
 	cabal-mksetup
 }
 
diff --git a/sci-mathematics/agda/files/agda-2.3.0.1-emacs.patch b/sci-mathematics/agda/files/agda-2.3.0.1-emacs.patch
new file mode 100644
index 000000000000..e08dc988986b
--- /dev/null
+++ b/sci-mathematics/agda/files/agda-2.3.0.1-emacs.patch
@@ -0,0 +1,27 @@
+--- Agda-2.3.0.1-orig/Agda.cabal	2012-03-12 21:09:34.000000000 +1100
++++ Agda-2.3.0.1/Agda.cabal	2012-03-26 00:07:55.476482395 +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
+@@ -326,16 +325,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.6
+-  else
+-    build-depends:  base == 4.1.*,
+-                    utf8-string == 0.3.*
+-  build-depends:    filepath >= 1.1 && < 1.4,
+-                    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 711ce7a4000b..a3f9b74a1fa7 100644
--- a/sci-mathematics/agda/metadata.xml
+++ b/sci-mathematics/agda/metadata.xml
@@ -11,5 +11,6 @@
 </longdescription>
 <use>
   <flag name='epic'>Add support for the epic compiler.</flag>
+  <flag name='stdlib'>Install the standard library.</flag>
 </use>
 </pkgmetadata>