diff options
author | 2015-08-02 10:52:08 +0000 | |
---|---|---|
committer | 2015-08-02 10:52:08 +0000 | |
commit | a7423845bf4aeff87a084a93f78c678ba987dbbb (patch) | |
tree | a18e52945d6b9fb9bc2f20c4d8157238f411476f /sci-mathematics | |
parent | Drop old. (diff) | |
download | gentoo-2-a7423845bf4aeff87a084a93f78c678ba987dbbb.tar.gz gentoo-2-a7423845bf4aeff87a084a93f78c678ba987dbbb.tar.bz2 gentoo-2-a7423845bf4aeff87a084a93f78c678ba987dbbb.zip |
Drop old.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Diffstat (limited to 'sci-mathematics')
-rw-r--r-- | sci-mathematics/agda/ChangeLog | 8 | ||||
-rw-r--r-- | sci-mathematics/agda/agda-2.3.2-r5.ebuild | 101 | ||||
-rw-r--r-- | sci-mathematics/agda/agda-2.3.2.1-r1.ebuild | 110 | ||||
-rw-r--r-- | sci-mathematics/agda/agda-2.3.2.2-r1.ebuild | 116 | ||||
-rw-r--r-- | sci-mathematics/agda/files/agda-2.3.2-hashable-1.2.patch | 66 | ||||
-rw-r--r-- | sci-mathematics/agda/files/agda-2.3.2.1-haskell-src-exts-1.14.patch | 34 |
6 files changed, 7 insertions, 428 deletions
diff --git a/sci-mathematics/agda/ChangeLog b/sci-mathematics/agda/ChangeLog index 7f8e1fa37ad7..6dcc30fc9198 100644 --- a/sci-mathematics/agda/ChangeLog +++ b/sci-mathematics/agda/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sci-mathematics/agda # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/ChangeLog,v 1.31 2015/04/04 12:52:28 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/ChangeLog,v 1.32 2015/08/02 10:52:08 slyfox Exp $ + + 02 Aug 2015; Sergei Trofimovich <slyfox@gentoo.org> -agda-2.3.2-r5.ebuild, + -agda-2.3.2.1-r1.ebuild, -agda-2.3.2.2-r1.ebuild, + -files/agda-2.3.2-hashable-1.2.patch, + -files/agda-2.3.2.1-haskell-src-exts-1.14.patch: + Drop old. 04 Apr 2015; Mark Wright <gienah@gentoo.org> agda-2.4.2.2-r1.ebuild: Loosen cpphs dep in agda-2.4.2.2-r1 diff --git a/sci-mathematics/agda/agda-2.3.2-r5.ebuild b/sci-mathematics/agda/agda-2.3.2-r5.ebuild deleted file mode 100644 index 3724f2086aaa..000000000000 --- a/sci-mathematics/agda/agda-2.3.2-r5.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/agda-2.3.2-r5.ebuild,v 1.1 2013/04/02 07:23:23 gienah Exp $ - -EAPI=5 - -# ebuild generated by hackport 0.3.9999 - -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="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="epic +stdlib" - -RDEPEND=">=dev-haskell/binary-0.4.4:=[profile?] - <dev-haskell/binary-0.8:=[profile?] - =dev-haskell/deepseq-1.3*:=[profile?] - epic? ( dev-lang/epic:=[profile?] ) - >=dev-haskell/geniplate-0.6.0.3:=[profile?] - <dev-haskell/geniplate-0.7:=[profile?] - >=dev-haskell/hashable-1.1.2.3:=[profile?] - <dev-haskell/hashable-1.3:=[profile?] - >=dev-haskell/hashtables-1.0:=[profile?] - <dev-haskell/hashtables-1.2:=[profile?] - >=dev-haskell/haskeline-0.6.3.2:=[profile?] - <dev-haskell/haskeline-0.8:=[profile?] - >=dev-haskell/haskell-src-exts-1.9.6:=[profile?] - <dev-haskell/haskell-src-exts-1.14:=[profile?] - >=dev-haskell/mtl-2.0:=[profile?] - <dev-haskell/mtl-2.2:=[profile?] - <dev-haskell/parallel-3.3:=[profile?] - >=dev-haskell/quickcheck-2.3:2=[profile?] - <dev-haskell/quickcheck-2.7:2=[profile?] - =dev-haskell/text-0.11*:=[profile?] - =dev-haskell/unordered-containers-0.2*:=[profile?] - =dev-haskell/xhtml-3000.2*:=[profile?] - >=dev-haskell/zlib-0.4.0.1:=[profile?] - <dev-haskell/zlib-0.6:=[profile?] - >=dev-lang/ghc-6.12.1:= - virtual/emacs - app-emacs/haskell-mode" -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() { - CABAL_FILE=${MY_PN}.cabal cabal_chdeps \ - 'binary >= 0.4.4 && < 0.6' 'binary >= 0.4.4 && < 0.8' \ - 'hashable >= 1.1.2.3 && < 1.2' 'hashable >= 1.1.2.3 && < 1.3' \ - 'hashtables == 1.0.*' 'hashtables >= 1.0 && < 1.2' \ - 'QuickCheck >= 2.3 && < 2.6' 'QuickCheck >= 2.3 && < 2.7' - epatch "${FILESDIR}/${PN}-2.3.2-hashable-1.2.patch" - sed -e '/.*emacs-mode.*$/d' \ - -e '/^executable agda/,$d' \ - -i "${S}/${MY_PN}.cabal" \ - || die "Could not remove agda and agda-mode from ${MY_PN}.cabal" - cabal-mksetup - if use epic && use stdlib; then - ewarn "Note that the agda-stdlib README:" - ewarn "http://www.cse.chalmers.se/~nad/listings/lib/README.html" - ewarn 'says: "Currently the library does not support the Epic or JavaScript compiler' - ewarn 'backends." Hence you may wish to remove the epic use flag if you wish to use' - ewarn "the Agda standard library." - fi -} - -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.2.1-r1.ebuild b/sci-mathematics/agda/agda-2.3.2.1-r1.ebuild deleted file mode 100644 index c730dd776823..000000000000 --- a/sci-mathematics/agda/agda-2.3.2.1-r1.ebuild +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/agda-2.3.2.1-r1.ebuild,v 1.2 2013/10/19 11:07:42 gienah Exp $ - -EAPI=5 - -# ebuild generated by hackport 0.3.2.9999 - -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="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="epic +stdlib" - -RDEPEND=">=dev-haskell/binary-0.4.4:=[profile?] - <dev-haskell/binary-0.8:=[profile?] - =dev-haskell/deepseq-1.3*:=[profile?] - >=dev-haskell/geniplate-0.6.0.3:=[profile?] - <dev-haskell/geniplate-0.7:=[profile?] - >=dev-haskell/hashable-1.1.2.3:=[profile?] - <dev-haskell/hashable-1.3:=[profile?] - >=dev-haskell/hashtables-1.0:=[profile?] - <dev-haskell/hashtables-1.2:=[profile?] - >=dev-haskell/haskeline-0.6.3.2:=[profile?] - <dev-haskell/haskeline-0.8:=[profile?] - >=dev-haskell/haskell-src-exts-1.9.6:=[profile?] - <dev-haskell/haskell-src-exts-1.15:=[profile?] - >=dev-haskell/mtl-2.0:=[profile?] - <dev-haskell/mtl-2.2:=[profile?] - <dev-haskell/parallel-3.3:=[profile?] - >=dev-haskell/quickcheck-2.3:=[profile?] - <dev-haskell/quickcheck-2.7:=[profile?] - =dev-haskell/text-0.11*:=[profile?] - =dev-haskell/unordered-containers-0.2*:=[profile?] - =dev-haskell/xhtml-3000.2*:=[profile?] - >=dev-haskell/zlib-0.4.0.1:=[profile?] - <dev-haskell/zlib-0.6:=[profile?] - >=dev-lang/ghc-6.12.1:= - virtual/emacs - app-emacs/haskell-mode - epic? ( <dev-lang/epic-0.10:=[profile?] - >=dev-lang/epic-0.1.13:=[profile?] - ) - || ( >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.1:=[profile?] >=dev-haskell/mtl-2.1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] )" -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}/${PN}-2.3.2.1-haskell-src-exts-1.14.patch" - CABAL_FILE=${MY_PN}.cabal cabal_chdeps \ - 'binary >= 0.4.4 && < 0.6' 'binary >= 0.4.4 && < 0.8' \ - 'hashtables == 1.0.*' 'hashtables >= 1.0 && < 1.2' \ - 'haskell-src-exts >= 1.9.6 && < 1.14' 'haskell-src-exts >= 1.9.6 && < 1.15' \ - 'alex >= 2.3.1 && < 3.1' 'alex >= 2.3.1 && < 3.2' - sed -e '/.*emacs-mode.*$/d' \ - -e '/^executable agda/,$d' \ - -i "${S}/${MY_PN}.cabal" \ - || die "Could not remove agda and agda-mode from ${MY_PN}.cabal" - cabal-mksetup - if use epic && use stdlib; then - ewarn "Note that the agda-stdlib README:" - ewarn "http://www.cse.chalmers.se/~nad/listings/lib/README.html" - ewarn 'says: "Currently the library does not support the Epic or JavaScript compiler' - ewarn 'backends." Hence you may wish to remove the epic use flag if you wish to use' - ewarn "the Agda standard library." - fi -} - -src_configure() { - haskell-cabal_src_configure \ - $(cabal_flag epic epic) -} - -src_compile() { - elisp-compile src/data/emacs-mode/*.el \ - || die "Failed to compile emacs mode" - haskell-cabal_src_compile -} - -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.2.2-r1.ebuild b/sci-mathematics/agda/agda-2.3.2.2-r1.ebuild deleted file mode 100644 index 1ba6c976b985..000000000000 --- a/sci-mathematics/agda/agda-2.3.2.2-r1.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/agda/agda-2.3.2.2-r1.ebuild,v 1.2 2014/02/25 15:40:58 slyfox Exp $ - -EAPI=5 - -# ebuild generated by hackport 0.3.4.9999 - -CABAL_FEATURES="lib profile" -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="epic +stdlib" - -RDEPEND=">=dev-haskell/binary-0.4.4:=[profile?] <dev-haskell/binary-0.8:=[profile?] - >=dev-haskell/deepseq-1.3:=[profile?] <dev-haskell/deepseq-1.4:=[profile?] - >=dev-haskell/geniplate-0.6.0.3:=[profile?] <dev-haskell/geniplate-0.7:=[profile?] - >=dev-haskell/hashtables-1.0:=[profile?] <dev-haskell/hashtables-1.2:=[profile?] - >=dev-haskell/haskeline-0.6.3.2:=[profile?] <dev-haskell/haskeline-0.8:=[profile?] - >=dev-haskell/haskell-src-exts-1.9.6:=[profile?] <dev-haskell/haskell-src-exts-1.15:=[profile?] - <dev-haskell/parallel-3.3:=[profile?] - >=dev-haskell/quickcheck-2.3:=[profile?] <dev-haskell/quickcheck-2.7:=[profile?] - >=dev-haskell/text-0.11:=[profile?] - >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] - >=dev-haskell/xhtml-3000.2:=[profile?] <dev-haskell/xhtml-3000.3:=[profile?] - >=dev-haskell/zlib-0.4.0.1:=[profile?] <dev-haskell/zlib-0.6:=[profile?] - >=dev-lang/ghc-6.12.1:= - epic? ( >=dev-lang/epic-0.1.13:=[profile?] <dev-lang/epic-0.10:=[profile?] ) - || ( ( >=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.1:=[profile?] ) - ( >=dev-haskell/mtl-2.1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?] ) ) - || ( ( >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.2:=[profile?] ) - ( >=dev-haskell/hashable-1.2.1.0:=[profile?] <dev-haskell/hashable-1.3:=[profile?] ) ) - virtual/emacs -" -PDEPEND="stdlib? ( sci-mathematics/agda-stdlib )" -DEPEND="${RDEPEND} - dev-haskell/alex - >=dev-haskell/cabal-1.8.0.2 - dev-haskell/happy -" - -SITEFILE="50${PN}2-gentoo.el" -S="${WORKDIR}/${MY_P}" - -src_prepare() { - CABAL_FILE=${MY_PN}.cabal cabal_chdeps \ - 'binary >= 0.4.4 && < 0.6' 'binary >= 0.4.4 && < 0.8' \ - 'text == 0.11.*' 'text >= 0.11' \ - 'base >= 4.2 && < 4.7' 'base >= 4.2 && < 4.8' \ - 'array >= 0.1 && < 0.5' 'array >= 0.1 && < 0.6' \ - 'process >= 1.0.1.0 && < 1.2' 'process >= 1.0.1.0 && < 1.3' - - sed -e '/.*emacs-mode.*$/d' \ - -e '/^executable agda/,$d' \ - -i "${S}/${MY_PN}.cabal" \ - || die "Could not remove agda and agda-mode from ${MY_PN}.cabal" - - cabal-mksetup - - if use epic && use stdlib; then - ewarn "Note that the agda-stdlib README:" - ewarn "http://www.cse.chalmers.se/~nad/listings/lib/README.html" - ewarn 'says: "Currently the library does not support the Epic or JavaScript compiler' - ewarn 'backends." Hence you may wish to remove the epic use flag if you wish to use' - ewarn "the Agda standard library." - fi - sed -e 's@-Werror@@g' \ - -i "${S}/${MY_PN}.cabal" \ - -i "${S}/mk/config.mk.in" \ - -i "${S}/src/prototyping/eval/Makefile" \ - -i "${S}/src/prototyping/nameless/Makefile" \ - -i "${S}/src/rts/${PN}-rts.cabal" \ - || die "sed to remove -Werror failed" - sed -e '/, "-Werror"/d' \ - -i "${S}/src/full/Agda/Compiler/MAlonzo/Compiler.hs" \ - || die "sed to remove -Werror from Compiler.hs failed" -} - -src_configure() { - haskell-cabal_src_configure \ - $(cabal_flag epic epic) -} - -src_compile() { - BYTECOMPFLAGS="-L ./src/data/emacs-mode" - elisp-compile src/data/emacs-mode/*.el \ - || die "Failed to compile emacs mode" - haskell-cabal_src_compile -} - -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/files/agda-2.3.2-hashable-1.2.patch b/sci-mathematics/agda/files/agda-2.3.2-hashable-1.2.patch deleted file mode 100644 index 407b3616fa20..000000000000 --- a/sci-mathematics/agda/files/agda-2.3.2-hashable-1.2.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- Agda-2.3.2-orig/src/full/Agda/Syntax/Abstract/Name.hs 2012-11-12 11:25:21.000000000 +1100 -+++ Agda-2.3.2/src/full/Agda/Syntax/Abstract/Name.hs 2012-12-18 22:10:22.241674353 +1100 -@@ -239,8 +239,13 @@ - show x = show (nameConcrete x) -- ++ "|" ++ show (nameId x) - - instance Hashable Name where -+#if MIN_VERSION_hashable(1,2,0) -+ {-# INLINE hashWithSalt #-} -+ hashWithSalt salt = (hashWithSalt salt) . nameId -+#else - {-# INLINE hash #-} - hash = hash . nameId -+#endif - - instance Show QName where - show q = concat $ intersperse "." $ map show $ qnameToList q -@@ -255,8 +260,13 @@ - compare = compare `on` qnameName - - instance Hashable QName where -+#if MIN_VERSION_hashable(1,2,0) -+ {-# INLINE hashWithSalt #-} -+ hashWithSalt salt = (hashWithSalt salt) . qnameName -+#else - {-# INLINE hash #-} - hash = hash . qnameName -+#endif - - instance HasRange Name where - getRange = getRange . nameConcrete ---- Agda-2.3.2-orig/src/full/Agda/Syntax/Common.hs 2012-11-12 11:25:21.000000000 +1100 -+++ Agda-2.3.2/src/full/Agda/Syntax/Common.hs 2012-12-18 22:11:29.730050687 +1100 -@@ -272,8 +272,13 @@ - fromEnum (NameId n _) = fromIntegral n - - instance Hashable NameId where -+#if MIN_VERSION_hashable(1,2,0) -+ {-# INLINE hashWithSalt #-} -+ hashWithSalt salt (NameId n m) = hashWithSalt salt (n, m) -+#else - {-# INLINE hash #-} - hash (NameId n m) = hash (n, m) -+#endif - - newtype Constr a = Constr a - ---- Agda-2.3.2-orig/src/full/Agda/Utils/Pointer.hs 2012-11-12 11:25:22.000000000 +1100 -+++ Agda-2.3.2/src/full/Agda/Utils/Pointer.hs 2012-12-18 22:12:18.834049775 +1100 -@@ -1,4 +1,4 @@ --{-# LANGUAGE DeriveDataTypeable #-} -+{-# LANGUAGE DeriveDataTypeable, CPP #-} - module Agda.Utils.Pointer - ( Ptr, newPtr, derefPtr, setPtr - , updatePtr, updatePtrM -@@ -71,7 +71,11 @@ - compare = compare `on` ptrTag - - instance Hashable (Ptr a) where -+#if MIN_VERSION_hashable(1,2,0) -+ hashWithSalt salt = (hashWithSalt salt) . ptrTag -+#else - hash = hash . ptrTag -+#endif - - instance NFData (Ptr a) where - diff --git a/sci-mathematics/agda/files/agda-2.3.2.1-haskell-src-exts-1.14.patch b/sci-mathematics/agda/files/agda-2.3.2.1-haskell-src-exts-1.14.patch deleted file mode 100644 index 4a94b089243c..000000000000 --- a/sci-mathematics/agda/files/agda-2.3.2.1-haskell-src-exts-1.14.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- Agda-2.3.2.1-orig/src/full/Agda/Compiler/MAlonzo/Compiler.hs 2013-06-05 02:19:33.000000000 +1000 -+++ Agda-2.3.2.1/src/full/Agda/Compiler/MAlonzo/Compiler.hs 2013-09-13 14:41:50.525225325 +1000 -@@ -228,7 +228,11 @@ - (a, _) <- conArityAndPars c - Just (HsDefn _ hsc) <- compiledHaskell . defCompiledRep <$> getConstInfo c - let pat = HS.PApp (HS.UnQual $ HS.Ident hsc) $ genericReplicate a HS.PWildCard -+#if MIN_VERSION_haskell_src_exts(1,14,0) -+ return $ HS.Alt dummy pat (HS.UnGuardedAlt $ HS.Tuple HS.Boxed []) (HS.BDecls []) -+#else - return $ HS.Alt dummy pat (HS.UnGuardedAlt $ HS.Tuple []) (HS.BDecls []) -+#endif - cs <- mapM makeClause cs - let rhs = case cs of - [] -> fakeExp "()" -- There is no empty case statement in Haskell -@@ -469,11 +473,19 @@ - ] - where - parse = HS.parseWithMode -+#if MIN_VERSION_haskell_src_exts(1,14,0) -+ HS.defaultParseMode{HS.extensions = L.map HS.EnableExtension [explicitForAll]} -+#else - HS.defaultParseMode{HS.extensions = [explicitForAll]} -+#endif - ok (HS.ParseOk d) = d - ok HS.ParseFailed{} = __IMPOSSIBLE__ - -+#if MIN_VERSION_haskell_src_exts(1,14,0) -+explicitForAll :: HS.KnownExtension -+#else - explicitForAll :: HS.Extension -+#endif - explicitForAll = - -- GHC 7.0.1 cannot parse the following CPP conditional - -- error: missing binary operator before token "(" |