gentoo resync : 18.12.2020

3 files changed, 69 insertions, 60 deletions

diff --git a/sci-mathematics/agda/Manifest b/sci-mathematics/agda/Manifest
index d2a3e137974a..c897506b233c 100644
--- a/sci-mathematics/agda/Manifest
+++ b/sci-mathematics/agda/Manifest
@@ -1,4 +1,4 @@
 AUX 50agda2-gentoo.el 317 BLAKE2B c295509014fc7f254c5c0650b079d3827b182270c6e1aa3d1ddf4f4076d94115f0168d4ad0c96a876be57ead4db26219e594a9afed3aba2ce3cab30e8cf19060 SHA512 55b7438896cb66b4b32b0ba0d9468bb2496df1f63a78f3f4b4e19cc038018605c9cbd7880d2be1b40d6d1509ac6df20304cdc8c2ccde69e89777acfc65a1ce8e
-DIST Agda-2.5.2.tar.gz 1240885 BLAKE2B bccdaa0c40b8e116f44ee436171cec0a8e1366d7b1f0b469bf459eacf4256e29a00c60a371dcf7971c499e948ce6264861016bb51fcad3251f62cb3e7370c19c SHA512 39ec73316eb7409f7f2618e86a9a3a2c420c93470bf46a1c37a4c4753c6c831d2d6da9ba007086ddee9defd481a695bf142a0a7d360dfa01bdb1fb92467af164
-EBUILD agda-2.5.2-r2.ebuild 5012 BLAKE2B 2632473b655f5331674f251697f37989a02a8e217c523492a2223ea5a5d9989677316b91a5bc35e9989d85c55012bf9bd133e6e037b3a631fb19617c2d195de1 SHA512 a6caec191849f979c4ea3777b3601a8bf2783e9324e86cf6cd632e1b9ea0c10914db976621a697e53fabfb0f1d42aa2528678298c58e639ca17c55455dbe32c8
-MISC metadata.xml 848 BLAKE2B d9882eb994ae956610051e9a634584c99b5725e77184649a9a68716fd07d70cce7d22ad77c2785f3ec6c4f96ccb333d72db40f1e97162371ab1390a9a55f09c2 SHA512 48e8e93adaef133b0491f96f93e5dc3c57ebe235f1568aeb649e10e6fe9eced0cb421cd801e1f0f24c27c084a3efcb58855032a14c74e87d806ab41da0ebff37
+DIST Agda-2.6.1.2.tar.gz 2722270 BLAKE2B cf8d4bff2c189d87696c3f03f1b32777e8bd060102f108e0b96aca87e6b3b1cc84077a1e0fe3f9ef42293f683aa855eb60ade8b0863b3f78c96b4ebb63e456a5 SHA512 5ab35d9b581ed918481dd25619739dfa43ea3d86b9522989fe8c83b3aa8749bee81fb12e7cd6b4270c4890a3719386c62b220163324407a1201273d1dfe9d615
+EBUILD agda-2.6.1.2.ebuild 5008 BLAKE2B b675f0523e8d4d4da57a45c86a5bcef173f80736bd1405df505d801622181e33c4ae5e71cdf289f034a8c807f02f34eee34b75e6ab574b5198d10e6f465405bf SHA512 d22d07552bc9c87728f01f3ed67a536c5752cb26016e5606ee4c68ae5e64d71f49b949fba893282a8a7fad060e40a7a2090e0b971480bedcad8752fe593c0130
+MISC metadata.xml 1743 BLAKE2B 6705852b3c4c52a22788ee01fa511bcb63410f39ae6da3168c6907e39674ace7c6c76c7b39c23d2dee9c2b98c45a264d76b7cf8ae7de8f5ccf1c99a4a843ee0d SHA512 c4b75de7cac6776cb24ef9ac3fac04be88c5d434acfb9e41d9c4b98deb59f02d07e04078907629dd956f72bfbe2d6e3f7cd24f801c1b2a1636c05555442a9851
diff --git a/sci-mathematics/agda/agda-2.5.2-r2.ebuild b/sci-mathematics/agda/agda-2.6.1.2.ebuild
index bac38fefcb17..ab5ba3366d32 100644
--- a/sci-mathematics/agda/agda-2.5.2-r2.ebuild
+++ b/sci-mathematics/agda/agda-2.6.1.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-# ebuild generated by hackport 0.5.1
+# ebuild generated by hackport 0.6.6.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal elisp-common
@@ -18,7 +18,7 @@ MY_P="${MY_PN}-${PV}"
 # As Agda-stdlib is tied to Agda version we encode
 # both versions in gentoo version.
 ##
-MY_UPSTREAM_AGDA_STDLIB_V="0.13"
+MY_UPSTREAM_AGDA_STDLIB_V="1.4"
 MY_GENTOO_AGDA_STDLIB_V="${PV}.${MY_UPSTREAM_AGDA_STDLIB_V}"
 
 DESCRIPTION="A dependently typed functional programming language and proof assistant"
@@ -28,67 +28,66 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="+cpphs debug +stdlib emacs"
+IUSE="+cpphs debug emacs enable-cluster-counting +stdlib"
 
-RESTRICT=test # Unrecognized option: --test (did you mean any of --help --js --css ?)
-
-RDEPEND=">=dev-haskell/boxes-0.1.3:=[profile?] <dev-haskell/boxes-0.2:=[profile?]
+RDEPEND=">=dev-haskell/aeson-1.1.2.0:=[profile?] <dev-haskell/aeson-1.6:=[profile?]
+	>=dev-haskell/async-2.2:=[profile?] <dev-haskell/async-2.3:=[profile?]
+	>=dev-haskell/blaze-html-0.8:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
+	>=dev-haskell/boxes-0.1.3:=[profile?] <dev-haskell/boxes-0.2:=[profile?]
 	>=dev-haskell/data-hash-0.2.0.0:=[profile?] <dev-haskell/data-hash-0.3:=[profile?]
-	>=dev-haskell/edisoncore-1.3.1.1:=[profile?]
 	>=dev-haskell/edit-distance-0.2.1.2:=[profile?] <dev-haskell/edit-distance-0.3:=[profile?]
-	>=dev-haskell/equivalence-0.2.5:=[profile?] <dev-haskell/equivalence-0.4:=[profile?]
-	>=dev-haskell/fail-4.9:=[profile?] <dev-haskell/fail-4.10:=[profile?]
+	>=dev-haskell/equivalence-0.3.2:=[profile?] <dev-haskell/equivalence-0.4:=[profile?]
+	>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
 	>=dev-haskell/geniplate-mirror-0.6.0.6:=[profile?] <dev-haskell/geniplate-mirror-0.8:=[profile?]
-	>=dev-haskell/gitrev-1.2:=[profile?] <dev-haskell/gitrev-2.0:=[profile?]
-	>=dev-haskell/hashable-1.2.1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?]
-	>=dev-haskell/haskeline-0.7.1.3:=[profile?] <dev-haskell/haskeline-0.8:=[profile?]
-	>=dev-haskell/ieee754-0.7.8:=[profile?] <dev-haskell/ieee754-0.8:=[profile?]
-	>=dev-haskell/monadplus-1.4:=[profile?] <dev-haskell/monadplus-1.5:=[profile?]
+	>=dev-haskell/gitrev-1.3.1:=[profile?] <dev-haskell/gitrev-2.0:=[profile?]
+	>=dev-haskell/hashable-1.2.1.0:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
+	>=dev-haskell/hashtables-1.2.0.2:=[profile?] <dev-haskell/hashtables-1.3:=[profile?]
+	>=dev-haskell/haskeline-0.7.2.3:=[profile?] <dev-haskell/haskeline-0.9:=[profile?]
+	>=dev-haskell/ieee754-0.7.8:=[profile?] <dev-haskell/ieee754-0.9:=[profile?]
+	>=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
 	>=dev-haskell/murmur-hash-0.1:=[profile?] <dev-haskell/murmur-hash-0.2:=[profile?]
-	>=dev-haskell/parallel-3.2.0.4:=[profile?] <dev-haskell/parallel-3.3:=[profile?]
-	>=dev-haskell/regex-tdfa-1.2.2:=[profile?] <dev-haskell/regex-tdfa-1.3:=[profile?]
-	>=dev-haskell/semigroups-0.18:=[profile?] <dev-haskell/semigroups-0.19:=[profile?]
-	>=dev-haskell/strict-0.3.2:=[profile?] <dev-haskell/strict-0.4:=[profile?]
-	>=dev-haskell/text-0.11.3.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-haskell/transformers-compat-0.3.3.3:=[profile?] <dev-haskell/transformers-compat-0.6:=[profile?]
+	>=dev-haskell/regex-tdfa-1.3.1.0:=[profile?] <dev-haskell/regex-tdfa-1.4:=[profile?]
+	>=dev-haskell/split-0.2.0.0:=[profile?] <dev-haskell/split-0.2.4:=[profile?]
+	>=dev-haskell/stm-2.4.4:=[profile?] <dev-haskell/stm-2.6:=[profile?]
+	>=dev-haskell/strict-0.3.2:=[profile?] <dev-haskell/strict-0.5:=[profile?]
+	>=dev-haskell/text-1.2.3.1:=[profile?] <dev-haskell/text-1.3:=[profile?]
 	>=dev-haskell/unordered-containers-0.2.5.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/xhtml-3000.2.1:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?]
-	>=dev-haskell/zlib-0.4.0.1:=[profile?]
-	>=dev-lang/ghc-7.10.1:=
-	>=dev-haskell/hashtables-1.0.1.8:=[profile?] <dev-haskell/hashtables-1.3:=[profile?]
-	>=dev-haskell/mtl-2.1.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/uri-encode-1.5.0.4:=[profile?] <dev-haskell/uri-encode-1.6:=[profile?]
+	>=dev-haskell/zlib-0.6:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+	>=dev-lang/ghc-8.0.2:=
+	enable-cluster-counting? ( >=dev-haskell/text-icu-0.7:=[profile?] <dev-haskell/text-icu-0.8:=[profile?] )
 "
 RDEPEND+="
-		emacs? ( >=app-editors/emacs-23.1:*
-			app-emacs/haskell-mode )
+	emacs? (
+		>=app-editors/emacs-23.1:*
+		app-emacs/haskell-mode )
 "
 PDEPEND="stdlib? ( ~sci-mathematics/agda-stdlib-${MY_GENTOO_AGDA_STDLIB_V} )"
 DEPEND="${RDEPEND}
 	dev-haskell/alex
-	>=dev-haskell/cabal-1.22.2.0
+	>=dev-haskell/cabal-1.24.2.0 <dev-haskell/cabal-3.3
 	dev-haskell/happy
-	cpphs? ( dev-haskell/cpphs )
+	cpphs? ( >=dev-haskell/cpphs-1.20.9 )
 "
-RDEPEND+="!sci-mathematics/agda-executable"
 
 SITEFILE="50${PN}2-gentoo.el"
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
 	default
+
 	if ! use emacs; then
 		sed -e '/.*emacs-mode.*$/d' \
 			-i "${S}/${MY_PN}.cabal" \
 			|| die "Could not remove agda-mode from ${MY_PN}.cabal"
 	fi
-	cabal_chdeps \
-		'EdisonCore >= 1.3.1.1 && < 1.3.2' 'EdisonCore >= 1.3.1.1'
 }
 
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag cpphs cpphs) \
-		$(cabal_flag debug debug)
+		$(cabal_flag debug debug) \
+		$(cabal_flag enable-cluster-counting enable-cluster-counting)
 }
 
 src_compile() {
@@ -97,13 +96,8 @@ src_compile() {
 		elisp-compile src/data/emacs-mode/*.el \
 			|| die "Failed to compile emacs mode"
 	fi
-	haskell-cabal_src_compile
-}
-
-src_test() {
 	export LD_LIBRARY_PATH="${S}/dist/build${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-
-	dist/build/agda/agda --test +RTS -M1g || die
+	haskell-cabal_src_compile
 }
 
 src_install() {
diff --git a/sci-mathematics/agda/metadata.xml b/sci-mathematics/agda/metadata.xml
index ea96b9e3cce7..5606f0f0585e 100644
--- a/sci-mathematics/agda/metadata.xml
+++ b/sci-mathematics/agda/metadata.xml
@@ -1,22 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-  <email>sci-mathematics@gentoo.org</email>
-  <name>Gentoo Mathematics Project</name>
-  </maintainer>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-  <name>Gentoo Haskell</name>
-  </maintainer>
-<longdescription lang="en">
-  Agda is an interactive proof editor, or proof assistant. Its input language,
-  called Agda language (or simply Agda), is based on a constructive type
-  theory á la Martin-Löf, extended with dependent record types,
-  inductive definitions, module structures and a class hierarchy mechanism.
-</longdescription>
-<use>
-  <flag name="cpphs">Use cpphs instead of cpp.</flag>
-  <flag name="stdlib">Install the standard library.</flag>
-</use>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<use>
+		<flag name="cpphs">Use cpphs instead of cpp.</flag>
+		<flag name="debug">Enable debugging features that may slow Agda down.</flag>
+		<flag name="enable-cluster-counting">Enable the --count-clusters flag. (If enable-cluster-counting is False, then the --count-clusters flag triggers an error message.)</flag>
+		<flag name="stdlib">Install the standard library.</flag>
+	</use>
+	<longdescription>
+		Agda is a dependently typed functional programming language: It has
+		inductive families, which are similar to Haskell&#39;s GADTs, but they
+		can be indexed by values and not just types. It also has
+		parameterised modules, mixfix operators, Unicode characters, and an
+		interactive Emacs interface (the type checker can assist in the
+		development of your code).
+		
+		Agda is also a proof assistant: It is an interactive system for
+		writing and checking proofs. Agda is based on intuitionistic type
+		theory, a foundational system for constructive mathematics developed
+		by the Swedish logician Per Martin-L&amp;#xf6;f. It has many
+		similarities with other proof assistants based on dependent types,
+		such as Coq, Epigram and NuPRL.
+		
+		This package includes both a command-line program (agda) and an
+		Emacs mode. If you want to use the Emacs mode you can set it up by
+		running @agda-mode setup@ (see the README).
+		
+		Note that the Agda package does not follow the package versioning
+		policy, because it is not intended to be used by third-party
+		packages.
+	</longdescription>
 </pkgmetadata>