gentoo resync : 15.01.2020

4 files changed, 159 insertions, 8 deletions

diff --git a/sci-mathematics/agda/Manifest b/sci-mathematics/agda/Manifest
index 084f0fb21e16..9b3decfc5ba1 100644
--- a/sci-mathematics/agda/Manifest
+++ b/sci-mathematics/agda/Manifest
@@ -2,6 +2,7 @@ AUX 50agda2-gentoo.el 317 BLAKE2B c295509014fc7f254c5c0650b079d3827b182270c6e1aa
 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 4422 BLAKE2B c5d222e5191cb21102965a280839b8d3d7c8dc8ddaeae239b03b09dfdf5fda4abea07a9df5690e0f986ffecc8632f9c7a6884c9f0e3ce8f80bbaf62622190def SHA512 709169949495bd804cd4fa45622e04856d6078d8b87c240415ec0effbbca69a2941aa8db67b1f5209484663ce2ca79a29d76fed79cf9f2a71ce1c7e3d8b76fe9
-EBUILD agda-2.5.2-r1.ebuild 5256 BLAKE2B fe72cecab078db6668a6796df896bef3383068a778a8360e991233e25dc947275a4a1745efe09065d0d66e53834de43e77a16e49941ef6f452607dd52bd8a41c SHA512 61dfdfc7c7072fcc509f4896387e9b7d5c81cd8db40ef29aa6ba2732d1aeedad0da4385ca8983d2ba1f341de130564747c83a5a57558339c5d1185f2552cafad
+EBUILD agda-2.4.2.5-r2.ebuild 4435 BLAKE2B 23391332d6a47ef08ded30dacafeaadaf90b7952f955370edbed5433e65fa9d589cf3aa5efedba072d936fbed19ac69fb7859ac559cbb50da87c1724479c3505 SHA512 4820821774519193231316539eb749f99a72c0bac66635c9498f91f68dcdd4899d6082c2d40b0a212de505ecada4ecf35b7e726e7279490a9a05699b028920f1
+EBUILD agda-2.5.2-r1.ebuild 5269 BLAKE2B dc51c050ba5a34cdcd4b47914fc0bd6eab1831598874b1d9aa388cdfdfd4c9fb09bec0c60e60abeb050e5a688571ba5d466066124be7044b3d4bee841d3ec6ab SHA512 b18c10ec2c8fdcc6f861c7fb06bc8459edb430cec90ee0b2ffaa139bab0be245ff328ee88289dcb73786bc269036af9c373c7bda212c0dbd54d1113697c0e407
+EBUILD agda-2.5.2-r2.ebuild 5304 BLAKE2B c8b634ef9ba0c757503364ac267792b001b1a62c698450a30ea8874d6adb3740151ca3acf4446753460ff0601217cea4cdce4aa48a75bfd9cd0b8f08f4795218 SHA512 955943813bc8538426e09d9bd506dbc1a09d72fe229a5d1365007751f28d1c2e038c2bcaf587a0a490233b1dc1024abbbfc9408655900764c91c1e57f61ff4a3
 MISC metadata.xml 907 BLAKE2B f4890d2c0e7c8d3eeb57ad9472ae3b5ae287fc7880fa853ec5d1a6c9867aa3e11ef71cd5b46ed5e9fd9e3c3307eea1260c4aa0d9f1598de64f48f43e0c2af137 SHA512 d48af119f929e739634165e1ece14ef2bf55eb996fd0852fd34783a18da04a156bf858b3f0a7ad3cd5c85e55c564bfb3e5552786161fd2ad66f86eb5d3d91426
diff --git a/sci-mathematics/agda/agda-2.4.2.5-r2.ebuild b/sci-mathematics/agda/agda-2.4.2.5-r2.ebuild
index 35d86bd4e84c..634862b133ad 100644
--- a/sci-mathematics/agda/agda-2.4.2.5-r2.ebuild
+++ b/sci-mathematics/agda/agda-2.4.2.5-r2.ebuild
@@ -44,10 +44,10 @@ RDEPEND=">=dev-haskell/binary-0.7.2.1:=[profile?] <dev-haskell/binary-0.8:=[prof
 	>=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.5:=[profile?]
 "
 RDEPEND+="
-		emacs? ( app-emacs/haskell-mode
-			virtual/emacs )
+		emacs? ( >=app-editors/emacs-23.1:*
+			app-emacs/haskell-mode )
 "
-PDEPEND="stdlib? ( =sci-mathematics/agda-stdlib-${PV} )"
+PDEPEND="stdlib? ( ~sci-mathematics/agda-stdlib-${PV} )"
 DEPEND="${RDEPEND}
 	dev-haskell/alex
 	>=dev-haskell/cabal-1.16.0
diff --git a/sci-mathematics/agda/agda-2.5.2-r1.ebuild b/sci-mathematics/agda/agda-2.5.2-r1.ebuild
index 630d67092eb1..9bc509d3579c 100644
--- a/sci-mathematics/agda/agda-2.5.2-r1.ebuild
+++ b/sci-mathematics/agda/agda-2.5.2-r1.ebuild
@@ -63,10 +63,10 @@ RDEPEND=">=dev-haskell/boxes-0.1.3:=[profile?] <dev-haskell/boxes-0.2:=[profile?
 		>=dev-haskell/uulib-0.9.20:=[profile?] )
 "
 RDEPEND+="
-		emacs? ( app-emacs/haskell-mode
-			virtual/emacs )
+		emacs? ( >=app-editors/emacs-23.1:*
+			app-emacs/haskell-mode )
 "
-PDEPEND="stdlib? ( =sci-mathematics/agda-stdlib-${MY_GENTOO_AGDA_STDLIB_V} )"
+PDEPEND="stdlib? ( ~sci-mathematics/agda-stdlib-${MY_GENTOO_AGDA_STDLIB_V} )"
 DEPEND="${RDEPEND}
 	dev-haskell/alex
 	>=dev-haskell/cabal-1.22.2.0
diff --git a/sci-mathematics/agda/agda-2.5.2-r2.ebuild b/sci-mathematics/agda/agda-2.5.2-r2.ebuild
new file mode 100644
index 000000000000..c5ee1f841665
--- /dev/null
+++ b/sci-mathematics/agda/agda-2.5.2-r2.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# 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="http://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/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
+	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 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
+}