commit: 3ea9ef2b91417f18c3aa2faec4861348298f6671 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Mon Feb 8 22:15:41 2016 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Mon Feb 8 22:15:49 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ea9ef2b
sci-mathematics/agda: fix hastables build failure, bu #574204 While at it made USE=emacs depend and files optional, fixed agda library reregistration. Reported-by: Toralf Förster Bug: https://bugs.gentoo.org/show_bug.cgi?id=574204 Package-Manager: portage-2.2.27 sci-mathematics/agda/agda-2.4.2.5-r1.ebuild | 131 +++++++++++++++++++++ .../agda/files/agda-2.4.2.5-hashtables.patch | 13 ++ 2 files changed, 144 insertions(+) diff --git a/sci-mathematics/agda/agda-2.4.2.5-r1.ebuild b/sci-mathematics/agda/agda-2.4.2.5-r1.ebuild new file mode 100644 index 0000000..950d7ce --- /dev/null +++ b/sci-mathematics/agda/agda-2.4.2.5-r1.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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="http://wiki.portal.chalmers.se/agda/"; +SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${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/transformers-compat-0.5:=[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.2:=[profile?] ) + ( >=dev-haskell/hashtables-1.2.0.2:=[profile?] <dev-haskell/hashtables-1.3:=[profile?] ) ) + || ( ( >=dev-haskell/mtl-2.1.1:=[profile?] <=dev-haskell/mtl-2.1.3.1:=[profile?] ) + ( >=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[profile?] ) ) + || ( ( >=dev-haskell/transformers-0.3:=[profile?] <dev-haskell/transformers-0.4:=[profile?] ) + ( >=dev-haskell/transformers-0.4.1.0:=[profile?] <dev-haskell/transformers-0.5:=[profile?] ) ) +" +RDEPEND+=" + emacs? ( app-emacs/haskell-mode + virtual/emacs ) +" +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' +} + +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/files/agda-2.4.2.5-hashtables.patch b/sci-mathematics/agda/files/agda-2.4.2.5-hashtables.patch new file mode 100644 index 0000000..9bba347 --- /dev/null +++ b/sci-mathematics/agda/files/agda-2.4.2.5-hashtables.patch @@ -0,0 +1,13 @@ +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'.
