gentoo resync : 25.11.2020

6 files changed, 4 insertions, 305 deletions

diff --git a/sci-mathematics/agda/Manifest b/sci-mathematics/agda/Manifest
index 7334f7c783c0..d2a3e137974a 100644
--- a/sci-mathematics/agda/Manifest
+++ b/sci-mathematics/agda/Manifest
@@ -1,8 +1,4 @@
 AUX 50agda2-gentoo.el 317 BLAKE2B c295509014fc7f254c5c0650b079d3827b182270c6e1aa3d1ddf4f4076d94115f0168d4ad0c96a876be57ead4db26219e594a9afed3aba2ce3cab30e8cf19060 SHA512 55b7438896cb66b4b32b0ba0d9468bb2496df1f63a78f3f4b4e19cc038018605c9cbd7880d2be1b40d6d1509ac6df20304cdc8c2ccde69e89777acfc65a1ce8e
-AUX agda-2.4.2.5-hashtables.patch 558 BLAKE2B 88532103f488b643ac84ad37fae3776514034121624c43610910c44a67ac0e68cc5d5d8afece38e2fbf95dbaa3e268e2418d1c34ba4a8fbc60637d63765be42d SHA512 0297fc4605db3dc11f08ec068cfdce908d273c6d14f472e4d00b4416a8e5f671b3b77d4e0cb671671bafd07b39ec46e72eab6cab972145199b25b3c4cfb0b3a6
-DIST Agda-2.4.2.5.tar.gz 1031427 BLAKE2B bf64731e0c068c4f609e9651f0cb6ea763f1e02ddd8909269a140f8ebd036dbb5b36d9f1b038a32016447bbfbd4f9dd6a00a1cc34616efd7099a2b4ddcc7d3bc SHA512 c2e090a42f699200854c20dad868b4b67e99107f0cdbba20ed268f4618fcf80068ee31db37e4b6637f73128d9f652ef9276d8f7adea54628da759d79f5e4f4a2
 DIST Agda-2.5.2.tar.gz 1240885 BLAKE2B bccdaa0c40b8e116f44ee436171cec0a8e1366d7b1f0b469bf459eacf4256e29a00c60a371dcf7971c499e948ce6264861016bb51fcad3251f62cb3e7370c19c SHA512 39ec73316eb7409f7f2618e86a9a3a2c420c93470bf46a1c37a4c4753c6c831d2d6da9ba007086ddee9defd481a695bf142a0a7d360dfa01bdb1fb92467af164
-EBUILD agda-2.4.2.5-r2.ebuild 4436 BLAKE2B 95e7429fdf3b03505aa2357e2ff7da7b9246d371cf595a26ef9d05dc23d42f4b1267a4cc3759a89ecd135e77ce390fc9db8ed333591159286dae6f594f8931b7 SHA512 8a0f546dc68745851a8083db3a8dff1e141b727026be86ab207ce848500553964cea1c3ca16ef4ffb3492cc13011ccddd50b03fe7dc63723a6f43730d97c075b
-EBUILD agda-2.5.2-r1.ebuild 5270 BLAKE2B fadb3f989c59b25c576376534c43b16d896f99d6cfb349c9ec59364428eec21651943e5a71daf6951aedda6fe8bc97b031b670652dae66ff954dca20fbcb070d SHA512 9de1a2016cdb763df7e450c80514417f3cff228fe97b3a2f7041722b3a09904c99a24e5c152bba54ea10c28b8c37c2b2ac2a5f1a68ef00d38e8335f93159332d
-EBUILD agda-2.5.2-r2.ebuild 5305 BLAKE2B b5fe5d674d023921cc3a6e3a13d281d3289306f0d7ad08b0f1402fdabff79d8ae7a58ac9a17437fa298d142ee601b02256222bfdbec8994d687ad61522b16e65 SHA512 faa7262d365ebdfb1d3b19e4ee2c1a7b8d4e02d91fb414fba5fedee4da92e6027690fa00e6fc92714e22920f43753d059e79841cebafc6bc2ef8e2f3fa77090c
-MISC metadata.xml 907 BLAKE2B f4890d2c0e7c8d3eeb57ad9472ae3b5ae287fc7880fa853ec5d1a6c9867aa3e11ef71cd5b46ed5e9fd9e3c3307eea1260c4aa0d9f1598de64f48f43e0c2af137 SHA512 d48af119f929e739634165e1ece14ef2bf55eb996fd0852fd34783a18da04a156bf858b3f0a7ad3cd5c85e55c564bfb3e5552786161fd2ad66f86eb5d3d91426
+EBUILD agda-2.5.2-r2.ebuild 5012 BLAKE2B 2632473b655f5331674f251697f37989a02a8e217c523492a2223ea5a5d9989677316b91a5bc35e9989d85c55012bf9bd133e6e037b3a631fb19617c2d195de1 SHA512 a6caec191849f979c4ea3777b3601a8bf2783e9324e86cf6cd632e1b9ea0c10914db976621a697e53fabfb0f1d42aa2528678298c58e639ca17c55455dbe32c8
+MISC metadata.xml 848 BLAKE2B d9882eb994ae956610051e9a634584c99b5725e77184649a9a68716fd07d70cce7d22ad77c2785f3ec6c4f96ccb333d72db40f1e97162371ab1390a9a55f09c2 SHA512 48e8e93adaef133b0491f96f93e5dc3c57ebe235f1568aeb649e10e6fe9eced0cb421cd801e1f0f24c27c084a3efcb58855032a14c74e87d806ab41da0ebff37
diff --git a/sci-mathematics/agda/agda-2.4.2.5-r2.ebuild b/sci-mathematics/agda/agda-2.4.2.5-r2.ebuild
deleted file mode 100644
index 63b99d3e1cba..000000000000
--- a/sci-mathematics/agda/agda-2.4.2.5-r2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.6.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal elisp-common
-
-MY_PN="Agda"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A dependently typed functional programming language and proof assistant"
-HOMEPAGE="https://wiki.portal.chalmers.se/agda/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cpphs +stdlib emacs"
-
-RDEPEND=">=dev-haskell/binary-0.7.2.1:=[profile?] <dev-haskell/binary-0.8:=[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/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/geniplate-mirror-0.6.0.6:=[profile?] <dev-haskell/geniplate-mirror-0.8:=[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/haskell-src-exts-1.16.0.1:=[profile?] <dev-haskell/haskell-src-exts-1.18:=[profile?]
-	>=dev-haskell/parallel-3.2.0.4:=[profile?] <dev-haskell/parallel-3.3:=[profile?]
-	>=dev-haskell/quickcheck-2.8:2=[profile?] <dev-haskell/quickcheck-2.9:2=[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/unordered-containers-0.2.5.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/void-0.5.4:=[profile?] <dev-haskell/void-0.9:=[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.6.2:=
-	>=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/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
-"
-RDEPEND+="
-		emacs? ( >=app-editors/emacs-23.1:*
-			app-emacs/haskell-mode )
-"
-PDEPEND="stdlib? ( ~sci-mathematics/agda-stdlib-${PV} )"
-DEPEND="${RDEPEND}
-	dev-haskell/alex
-	>=dev-haskell/cabal-1.16.0
-	dev-haskell/happy
-	cpphs? ( dev-haskell/cpphs )
-"
-RDEPEND+="!sci-mathematics/agda-executable"
-
-SITEFILE="50${PN}2-gentoo.el"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-hashtables.patch
-
-	sed -e '/.*emacs-mode.*$/d' \
-		-i "${S}/${MY_PN}.cabal" \
-		|| die "Could not remove agda-mode from ${MY_PN}.cabal"
-	sed -e '/^executable agda-mode$/a \ \ buildable: False' \
-		-i "${S}/${MY_PN}.cabal" \
-		|| die "Could not remove agda-mode executable from ${MY_PN}.cabal"
-
-	cabal_chdeps \
-		'zlib >= 0.4.0.1 && < 0.6.1' 'zlib >= 0.4.0.1' \
-		'transformers-compat >= 0.3.3.3 && < 0.5' 'transformers-compat >= 0.3.3.3' \
-		'build-tools: cpphs >= 1.19 && < 1.20' 'build-tools: cpphs >= 1.19' \
-		'alex >= 3.1.0 && < 3.2' 'alex >= 3.1.0'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag cpphs cpphs)
-}
-
-src_compile() {
-	if use emacs; then
-		BYTECOMPFLAGS="-L ./src/data/emacs-mode"
-		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
-}
-
-src_install() {
-	local add="${ED}"/usr/share/"${P}/ghc-$(ghc-version)"
-
-	haskell-cabal_src_install
-
-	export LD_LIBRARY_PATH="${S}/dist/build${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	# generate Primitive.agdai, emulate Setup.hs postinst phase
-	Agda_datadir="${add}" \
-		"${ED}"/usr/bin/agda "${add}"/lib/prim/Agda/Primitive.agda \
-		|| die "Failed to build 'Primitive.agdai'"
-
-	if use emacs; then
-		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"
-	fi
-}
-
-pkg_postinst() {
-	haskell-cabal_pkg_postinst
-	if use emacs; then
-		elisp-site-regen
-	fi
-}
-
-pkg_postrm() {
-	haskell-cabal_pkg_postrm
-	if use emacs; then
-		elisp-site-regen
-	fi
-}
diff --git a/sci-mathematics/agda/agda-2.5.2-r1.ebuild b/sci-mathematics/agda/agda-2.5.2-r1.ebuild
deleted file mode 100644
index 1c7e55a7ad8d..000000000000
--- a/sci-mathematics/agda/agda-2.5.2-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal elisp-common
-
-MY_PN="Agda"
-MY_P="${MY_PN}-${PV}"
-
-## shared with sci-mathematics/agda-stdlib
-# upstream does not maintain version ordering:
-#  https://github.com/agda/agda-stdlib/releases
-# 0.11 -> 2.5.0.20160213 -> 2.5.0.20160412 -> 0.12
-# As Agda-stdlib is tied to Agda version we encode
-# both versions in gentoo version.
-##
-MY_UPSTREAM_AGDA_STDLIB_V="0.13"
-MY_GENTOO_AGDA_STDLIB_V="${PV}.${MY_UPSTREAM_AGDA_STDLIB_V}"
-
-DESCRIPTION="A dependently typed functional programming language and proof assistant"
-HOMEPAGE="https://wiki.portal.chalmers.se/agda/"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+cpphs debug uhc +stdlib emacs"
-
-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?]
-	>=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/edisoncore-1.3.2:=[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/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/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/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?]
-	uhc? ( >=dev-haskell/shuffle-0.1.3.3:=[profile?]
-		>=dev-haskell/uhc-light-1.1.9.2:=[profile?] <dev-haskell/uhc-light-1.2:=[profile?]
-		>=dev-haskell/uhc-util-0.1.6.7:=[profile?] <dev-haskell/uhc-util-0.1.7:=[profile?]
-		>=dev-haskell/uulib-0.9.20:=[profile?] )
-"
-RDEPEND+="
-		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/happy
-	cpphs? ( dev-haskell/cpphs )
-"
-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
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag cpphs cpphs) \
-		$(cabal_flag debug debug) \
-		$(cabal_flag uhc uhc)
-}
-
-src_compile() {
-	if use emacs; then
-		BYTECOMPFLAGS="-L ./src/data/emacs-mode"
-		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
-}
-
-src_install() {
-	local add="${ED}"/usr/share/"${P}/ghc-$(ghc-version)"
-
-	haskell-cabal_src_install
-
-	export LD_LIBRARY_PATH="${S}/dist/build${LD_LIBRARY_PATH+:}${LD_LIBRARY_PATH}"
-	# compile Agda.Primitive and Agda.Builtin modules, emulate Setup.hs postinst phase
-	Agda_datadir="${add}" \
-		"${ED}"/usr/bin/agda "${add}"/lib/prim/Agda/Primitive.agda \
-		|| die "Failed to build 'Primitive.agdai'"
-	for file in "${add}"/lib/prim/Agda/Builtin/*.agda; do
-		Agda_datadir="${add}" \
-			"${ED}"/usr/bin/agda "${file}" \
-			|| die "Failed to build '${file}'"
-	done
-
-	if use emacs; then
-		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"
-	fi
-}
-
-pkg_postinst() {
-	haskell-cabal_pkg_postinst
-	if use emacs; then
-		elisp-site-regen
-	fi
-}
-
-pkg_postrm() {
-	haskell-cabal_pkg_postrm
-	if use emacs; then
-		elisp-site-regen
-	fi
-}
diff --git a/sci-mathematics/agda/agda-2.5.2-r2.ebuild b/sci-mathematics/agda/agda-2.5.2-r2.ebuild
index 620d6ba28f88..bac38fefcb17 100644
--- a/sci-mathematics/agda/agda-2.5.2-r2.ebuild
+++ b/sci-mathematics/agda/agda-2.5.2-r2.ebuild
@@ -28,7 +28,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="+cpphs debug uhc +stdlib emacs"
+IUSE="+cpphs debug +stdlib emacs"
 
 RESTRICT=test # Unrecognized option: --test (did you mean any of --help --js --css ?)
 
@@ -57,10 +57,6 @@ RDEPEND=">=dev-haskell/boxes-0.1.3:=[profile?] <dev-haskell/boxes-0.2:=[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?]
-	uhc? ( >=dev-haskell/shuffle-0.1.3.3:=[profile?]
-		>=dev-haskell/uhc-light-1.1.9.2:=[profile?] <dev-haskell/uhc-light-1.2:=[profile?]
-		>=dev-haskell/uhc-util-0.1.6.7:=[profile?] <dev-haskell/uhc-util-0.1.7:=[profile?]
-		>=dev-haskell/uulib-0.9.20:=[profile?] )
 "
 RDEPEND+="
 		emacs? ( >=app-editors/emacs-23.1:*
@@ -92,8 +88,7 @@ src_prepare() {
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag cpphs cpphs) \
-		$(cabal_flag debug debug) \
-		$(cabal_flag uhc uhc)
+		$(cabal_flag debug debug)
 }
 
 src_compile() {
diff --git a/sci-mathematics/agda/files/agda-2.4.2.5-hashtables.patch b/sci-mathematics/agda/files/agda-2.4.2.5-hashtables.patch
deleted file mode 100644
index 9bba347fa292..000000000000
--- a/sci-mathematics/agda/files/agda-2.4.2.5-hashtables.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/full/Agda/Utils/HashMap.hs b/src/full/Agda/Utils/HashMap.hs
-index 5e1da8b..7c34548 100644
---- a/src/full/Agda/Utils/HashMap.hs
-+++ b/src/full/Agda/Utils/HashMap.hs
-@@ -5,7 +5,7 @@ module Agda.Utils.HashMap
-   ) where
- 
- import Data.Hashable
--import Data.HashMap.Strict as HashMap
-+import Data.HashMap.Strict as HashMap (HashMap, filter, lookup, insert, delete, empty, insertWith, toList, adjust, union, unionWith, elems, fromList, (!), keys, map, unions, foldr)
- import qualified Data.Maybe as Maybe
- 
- -- | Like 'Data.Map.Strict.mapMaybe'.
diff --git a/sci-mathematics/agda/metadata.xml b/sci-mathematics/agda/metadata.xml
index 057c778e5810..ea96b9e3cce7 100644
--- a/sci-mathematics/agda/metadata.xml
+++ b/sci-mathematics/agda/metadata.xml
@@ -18,6 +18,5 @@
 <use>
   <flag name="cpphs">Use cpphs instead of cpp.</flag>
   <flag name="stdlib">Install the standard library.</flag>
-  <flag name="uhc">Add support for the uhc backend.</flag>
 </use>
 </pkgmetadata>