[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/agda-stdlib/

2022-05-14 Thread Sam James
commit: d4dbb3835041c14069f388aabb3afd2593067a72
Author: Sam James  gentoo  org>
AuthorDate: Sat May  7 06:51:07 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 15 01:00:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4dbb383

sci-mathematics/agda-stdlib: egrep -> grep -E

Signed-off-by: Sam James  gentoo.org>

 sci-mathematics/agda-stdlib/agda-stdlib-2.6.1.2.1.4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sci-mathematics/agda-stdlib/agda-stdlib-2.6.1.2.1.4.ebuild 
b/sci-mathematics/agda-stdlib/agda-stdlib-2.6.1.2.1.4.ebuild
index 55a498c1f260..73afc2f8ee30 100644
--- a/sci-mathematics/agda-stdlib/agda-stdlib-2.6.1.2.1.4.ebuild
+++ b/sci-mathematics/agda-stdlib/agda-stdlib-2.6.1.2.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -50,7 +50,7 @@ src_compile() {
# datadir= "/usr/share/agda-/ghc-7.6.1"
# it fails without the --css option like:
# /usr/share/agda-/ghc-7.4.1/Agda.css: copyFile: does not exist
-   local cssdir=$(egrep 'datadir *=' 
"${S}/dist/build/autogen/Paths_lib.hs" | sed -e 's@datadir= \(.*\)@\1@')
+   local cssdir=$(grep -E 'datadir *=' 
"${S}/dist/build/autogen/Paths_lib.hs" | sed -e 's@datadir= \(.*\)@\1@')
agda --html -i "${S}" -i "${S}"/src --css="${cssdir}/Agda.css" 
"${S}"/README.agda || die
 }
 



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/agda/

2021-03-15 Thread Sergei Trofimovich
commit: 332ed48e88b914b4122704fe8c501293ce403a3c
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Mar 15 19:34:46 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Mar 15 22:32:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=332ed48e

sci-mathematics/agda: allow ghc-8.10.4

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sci-mathematics/agda/agda-2.6.1.2.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sci-mathematics/agda/agda-2.6.1.2.ebuild 
b/sci-mathematics/agda/agda-2.6.1.2.ebuild
index 3468e60ca04..a2a59db413d 100644
--- a/sci-mathematics/agda/agda-2.6.1.2.ebuild
+++ b/sci-mathematics/agda/agda-2.6.1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -81,6 +81,9 @@ src_prepare() {
-i "${S}/${MY_PN}.cabal" \
|| die "Could not remove agda-mode from ${MY_PN}.cabal"
fi
+
+   cabal_chdeps \
+   'if impl(ghc >= 8.6.4) && impl(ghc < 8.10.3)' 'if impl(ghc >= 
8.6.4) && impl(ghc < 8.11.0)'
 }
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/agda-stdlib/files/

2021-01-20 Thread David Seifert
commit: a5eb99172bd78c8c3ff090c555da11ed3405436f
Author: Jakov Smolic  sartura  hr>
AuthorDate: Wed Jan 20 10:15:59 2021 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Jan 20 10:15:59 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5eb9917

sci-mathematics/agda-stdlib: Remove unused file

Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 sci-mathematics/agda-stdlib/files/50agda-stdlib-gentoo.el | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sci-mathematics/agda-stdlib/files/50agda-stdlib-gentoo.el 
b/sci-mathematics/agda-stdlib/files/50agda-stdlib-gentoo.el
deleted file mode 100644
index 62264a4451a..000
--- a/sci-mathematics/agda-stdlib/files/50agda-stdlib-gentoo.el
+++ /dev/null
@@ -1 +0,0 @@
-(setq agda2-include-dirs '("." "/usr/share/agda-stdlib"))



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/agda-lib-ffi/, profiles/

2021-01-19 Thread Michał Górny
commit: 04f0d93484ddb0af9554d43b1600c3844b08d500
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Jan 19 08:36:01 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Jan 19 08:39:07 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04f0d934

sci-mathematics/agda-lib-ffi: Remove last-rited pkg

Signed-off-by: Michał Górny  gentoo.org>

 profiles/package.mask  |  5 
 sci-mathematics/agda-lib-ffi/Manifest  |  2 --
 .../agda-lib-ffi/agda-lib-ffi-0.0.2-r2.ebuild  | 35 --
 .../agda-lib-ffi/agda-lib-ffi-0.0.2.ebuild | 33 
 sci-mathematics/agda-lib-ffi/metadata.xml  | 11 ---
 5 files changed, 86 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index edb8393e90f..08f8db56b54 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -308,11 +308,6 @@ app-text/peg-markdown
 # Removal in 30 days.  Bug #652192.
 dev-libs/ustr
 
-# Jack Todaro  (2020-12-17)
-# Old and redundant package. Has not been kept
-# up to date and no longer works. Masked for removal.
-sci-mathematics/agda-lib-ffi
-
 # Lars Wendler  (2020-12-09)
 # Masked until most broken packages have been fixed (bug #732648)
 >=sys-devel/autoconf-2.70

diff --git a/sci-mathematics/agda-lib-ffi/Manifest 
b/sci-mathematics/agda-lib-ffi/Manifest
deleted file mode 100644
index 16b65e15da9..000
--- a/sci-mathematics/agda-lib-ffi/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST agda-stdlib-2.4.2.3.tar.gz 252558 BLAKE2B 
2373b9d395a64fe7f23bbb583d8cfc5b2572f5aa3ea98b687e8f122ae1accae835e4ed1ebfe7252a5bc5e519898b9ca39e1f19e16bb9f4195246f9904cc2c9af
 SHA512 
d503fc2abd18ab8c367a1947301e0302a6ff9fcbb6376a01f016aa2ab7a9a967e5adb96c5013db1892f4acd9fab62bead11c58c4d443784aff1e42ee4ffd4aa9
-DIST lib-0.7.tar.gz 226400 BLAKE2B 
4203486fa35d6dbfdcdfa227da43c771e8e2c78d906c06dae8cc3eb473c6ac0029554b98a0a665de80f1d1b5806a82ef68491050b0f90e80065a08ab91dba7c1
 SHA512 
557aa7b9b143f2e4a2249881a98c753035962bc5d941e6b4fe86aab8642986aa9db7ca6fc2b2da8486f9294ff30c4c2edfa0222ba95d9216ed2d0e00c114

diff --git a/sci-mathematics/agda-lib-ffi/agda-lib-ffi-0.0.2-r2.ebuild 
b/sci-mathematics/agda-lib-ffi/agda-lib-ffi-0.0.2-r2.ebuild
deleted file mode 100644
index 9f4b8f627c6..000
--- a/sci-mathematics/agda-lib-ffi/agda-lib-ffi-0.0.2-r2.ebuild
+++ /dev/null
@@ -1,35 +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.3.5
-
-CABAL_FEATURES="lib"
-inherit haskell-cabal
-
-AGDA_PN="agda-stdlib"
-AGDA_PV="2.4.2.3"
-AGDA_P="${AGDA_PN}-${AGDA_PV}"
-
-DESCRIPTION="Auxiliary Haskell code used by Agda's standard library"
-HOMEPAGE="https://wiki.portal.chalmers.se/agda/;
-SRC_URI="https://github.com/agda/${AGDA_PN}/archive/${AGDA_PV}.tar.gz -> 
${AGDA_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-   >=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${AGDA_P}/ffi"
-
-src_prepare() {
-   cabal_chdeps \
-   'base >= 4.5.0.0 && < 4.9' 'base >= 4.5.0.0'
-}

diff --git a/sci-mathematics/agda-lib-ffi/agda-lib-ffi-0.0.2.ebuild 
b/sci-mathematics/agda-lib-ffi/agda-lib-ffi-0.0.2.ebuild
deleted file mode 100644
index a547e511ba1..000
--- a/sci-mathematics/agda-lib-ffi/agda-lib-ffi-0.0.2.ebuild
+++ /dev/null
@@ -1,33 +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.3.5
-
-CABAL_FEATURES="lib"
-inherit haskell-cabal
-
-AGDA_P="lib-0.7"
-
-DESCRIPTION="Auxiliary Haskell code used by Agda's standard library"
-HOMEPAGE="https://wiki.portal.chalmers.se/agda/;
-SRC_URI="https://www.cse.chalmers.se/~nad/software/${AGDA_P}.tar.gz;
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-lang/ghc-6.10.4:=
-"
-DEPEND="${RDEPEND}
-   >=dev-haskell/cabal-1.8
-"
-
-S="${WORKDIR}/${AGDA_P}/ffi"
-
-src_prepare() {
-   cabal_chdeps \
-   'base >= 3.0.3.1 && < 4.7' 'base >= 3.0.3.1'
-}

diff --git a/sci-mathematics/agda-lib-ffi/metadata.xml 
b/sci-mathematics/agda-lib-ffi/metadata.xml
deleted file mode 100644
index bf554338893..000
--- a/sci-mathematics/agda-lib-ffi/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-http://www.gentoo.org/dtd/metadata.dtd;>
-
-   
-   hask...@gentoo.org
-   Gentoo Haskell
-   
-   
-   agda/agda-stdlib
-   
-



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/agda/

2020-12-27 Thread Sergei Trofimovich
commit: 6280ade282f64f7b956e0505330af307a0a7c6df
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Dec 27 10:17:14 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Dec 27 10:17:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6280ade2

sci-mathematics/agda: set USE=-cpphs by default

USE=cpphs is not compatible to profiling builds.

Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/761805
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sci-mathematics/agda/agda-2.6.1.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sci-mathematics/agda/agda-2.6.1.2.ebuild 
b/sci-mathematics/agda/agda-2.6.1.2.ebuild
index ab5ba3366d3..3468e60ca04 100644
--- a/sci-mathematics/agda/agda-2.6.1.2.ebuild
+++ b/sci-mathematics/agda/agda-2.6.1.2.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 emacs enable-cluster-counting +stdlib"
+IUSE="cpphs debug emacs enable-cluster-counting +stdlib"
 
 RDEPEND=">=dev-haskell/aeson-1.1.2.0:=[profile?] 
=dev-haskell/async-2.2:=[profile?] 

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/agda/

2020-12-16 Thread Sergei Trofimovich
commit: e5aacecc6e64f671a3c4f984a5debd488bd6663b
Author: Jack Todaro  posteo  org>
AuthorDate: Thu Dec 17 05:37:41 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Dec 17 07:29:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5aacecc

sci-mathematics/agda: drop old

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Jack Todaro  posteo.org>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sci-mathematics/agda/Manifest |   1 -
 sci-mathematics/agda/agda-2.5.2-r2.ebuild | 145 --
 2 files changed, 146 deletions(-)

diff --git a/sci-mathematics/agda/Manifest b/sci-mathematics/agda/Manifest
index 0514a033175..a7b61c39d28 100644
--- a/sci-mathematics/agda/Manifest
+++ b/sci-mathematics/agda/Manifest
@@ -1,2 +1 @@
-DIST Agda-2.5.2.tar.gz 1240885 BLAKE2B 
bccdaa0c40b8e116f44ee436171cec0a8e1366d7b1f0b469bf459eacf4256e29a00c60a371dcf7971c499e948ce6264861016bb51fcad3251f62cb3e7370c19c
 SHA512 
39ec73316eb7409f7f2618e86a9a3a2c420c93470bf46a1c37a4c4753c6c831d2d6da9ba007086ddee9defd481a695bf142a0a7d360dfa01bdb1fb92467af164
 DIST Agda-2.6.1.2.tar.gz 2722270 BLAKE2B 
cf8d4bff2c189d87696c3f03f1b32777e8bd060102f108e0b96aca87e6b3b1cc84077a1e0fe3f9ef42293f683aa855eb60ade8b0863b3f78c96b4ebb63e456a5
 SHA512 
5ab35d9b581ed918481dd25619739dfa43ea3d86b9522989fe8c83b3aa8749bee81fb12e7cd6b4270c4890a3719386c62b220163324407a1201273d1dfe9d615

diff --git a/sci-mathematics/agda/agda-2.5.2-r2.ebuild 
b/sci-mathematics/agda/agda-2.5.2-r2.ebuild
deleted file mode 100644
index bac38fefcb1..000
--- a/sci-mathematics/agda/agda-2.5.2-r2.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2020 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="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 +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/data-hash-0.2.0.0:=[profile?] 
=dev-haskell/edisoncore-1.3.1.1:=[profile?]
-   >=dev-haskell/edit-distance-0.2.1.2:=[profile?] 
=dev-haskell/equivalence-0.2.5:=[profile?] 
=dev-haskell/fail-4.9:=[profile?] =dev-haskell/geniplate-mirror-0.6.0.6:=[profile?] 
=dev-haskell/gitrev-1.2:=[profile?] =dev-haskell/hashable-1.2.1.0:=[profile?] 
=dev-haskell/haskeline-0.7.1.3:=[profile?] 
=dev-haskell/ieee754-0.7.8:=[profile?] 
=dev-haskell/monadplus-1.4:=[profile?] 
=dev-haskell/murmur-hash-0.1:=[profile?] 
=dev-haskell/parallel-3.2.0.4:=[profile?] 
=dev-haskell/regex-tdfa-1.2.2:=[profile?] 
=dev-haskell/semigroups-0.18:=[profile?] 
=dev-haskell/strict-0.3.2:=[profile?] 
=dev-haskell/text-0.11.3.1:=[profile?] 
=dev-haskell/transformers-compat-0.3.3.3:=[profile?] 
=dev-haskell/unordered-containers-0.2.5.0:=[profile?] 
=dev-haskell/xhtml-3000.2.1:=[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/mtl-2.1.1:=[profile?] = 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)
-}
-
-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
-   

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/agda-stdlib/

2020-12-16 Thread Sergei Trofimovich
commit: a33e948d458167e5e7154128cded0dead5b6ac74
Author: Jack Todaro  posteo  org>
AuthorDate: Thu Dec 17 05:38:42 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Dec 17 07:29:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a33e948d

sci-mathematics/agda-stdlib: drop old

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Jack Todaro  posteo.org>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sci-mathematics/agda-stdlib/Manifest   |  1 -
 .../agda-stdlib/agda-stdlib-2.5.2.0.13.ebuild  | 68 --
 2 files changed, 69 deletions(-)

diff --git a/sci-mathematics/agda-stdlib/Manifest 
b/sci-mathematics/agda-stdlib/Manifest
index 690b60fabc1..e1618be0a6c 100644
--- a/sci-mathematics/agda-stdlib/Manifest
+++ b/sci-mathematics/agda-stdlib/Manifest
@@ -1,2 +1 @@
-DIST agda-stdlib-2.5.2.0.13.tar.gz 264701 BLAKE2B 
f35b419aac1b80af86217a86fb8e21a2f3427ef9629c8f2e284036859cd89da16ce1b64ceb87f8a3030b5bdb2a68b4f59f74a717fc1e13378ecb20cc6b28f59c
 SHA512 
340a7b9cb15793cdbe99f558a32eaab3476b94b4d43d45bdc92c6b368197d075c977fd2f6ce0c5b0baf584289a2218b07dd030ad2b83f6d9e4bc7effee91eece
 DIST agda-stdlib-2.6.1.2.1.4.tar.gz 816654 BLAKE2B 
c8e6b6f86f32dd2e3d57da4a21066be4a441e71bc3a7cb96d8000f28c56cbb114a00e5df2777b00a8a9fc1a0f94b00bdf4b72eb46f0245ab482a41b6a9d772ee
 SHA512 
90c05d54eaf1d7c78d00f73044afa1f3b4d99df622d40b3cea88fe280f0770ccaeddd787d8fb384c150123f592bb6a7ec24b842a9fcc2936f581d847928223ca

diff --git a/sci-mathematics/agda-stdlib/agda-stdlib-2.5.2.0.13.ebuild 
b/sci-mathematics/agda-stdlib/agda-stdlib-2.5.2.0.13.ebuild
deleted file mode 100644
index 4659c6572de..000
--- a/sci-mathematics/agda-stdlib/agda-stdlib-2.5.2.0.13.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal elisp-common
-
-## shared with sci-mathematics/agda
-# 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 -> 0.13
-# 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}"
-MY_UPSTREAM_AGDA_V="${PV%.${MY_UPSTREAM_AGDA_STDLIB_V}}"
-
-DESCRIPTION="Agda standard library"
-HOMEPAGE="https://wiki.portal.chalmers.se/agda/;
-SRC_URI="https://github.com/agda/${PN}/archive/v${MY_UPSTREAM_AGDA_STDLIB_V}.tar.gz
 -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="profile +ffi"
-
-RDEPEND=">=sci-mathematics/agda-${MY_UPSTREAM_AGDA_V}:=[profile?]
-   ffi? ( sci-mathematics/agda-lib-ffi )
-"
-DEPEND="${RDEPEND}
-   >=dev-haskell/cabal-1.16.0
-   >=dev-haskell/filemanip-0.3.6.2[profile?] 
=dev-lang/ghc-7.6.3
-"
-
-S=${WORKDIR}/${PN}-${MY_UPSTREAM_AGDA_STDLIB_V}
-
-src_compile() {
-   haskell-cabal_src_compile
-   "${S}"/dist/build/GenerateEverything/GenerateEverything \
-   || die "GenerateEverything failed"
-   local prof
-   use profile && prof="--ghc-flag=-prof"
-   agda +RTS -K1G -RTS ${prof} \
-   -i "${S}" -i "${S}"/src "${S}"/Everything.agda || die
-   # Although my agda- build has
-   # 
/var/tmp/portage/sci-mathematics/agda-/work/agda-/dist/build/autogen/Paths_Agda.hs
-   # containing:
-   # datadir= "/usr/share/agda-/ghc-7.6.1"
-   # it fails without the --css option like:
-   # /usr/share/agda-/ghc-7.4.1/Agda.css: copyFile: does not exist
-   local cssdir=$(egrep 'datadir *=' 
"${S}/dist/build/autogen/Paths_lib.hs" | sed -e 's@datadir= \(.*\)@\1@')
-   agda --html -i "${S}" -i "${S}"/src --css="${cssdir}/Agda.css" 
"${S}"/README.agda || die
-}
-
-src_test() {
-   agda -i "${S}" -i "${S}"/src README.agda || die
-}
-
-src_install() {
-   insinto usr/share/agda-stdlib
-   insopts --preserve-timestamps
-   doins -r src/*
-   dodoc -r html/*
-   doins "${FILESDIR}/standard-library.agda-lib"
-}



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/agda/

2020-12-16 Thread Sergei Trofimovich
commit: b89200027e54bf1a45ef3e227a88da56838d00ea
Author: Jack Todaro  posteo  org>
AuthorDate: Thu Dec 17 05:29:59 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Dec 17 07:29:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8920002

sci-mathematics/agda: bump up to 2.6.1.2

Signed-off-by: Jack Todaro  posteo.org>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sci-mathematics/agda/Manifest|   1 +
 sci-mathematics/agda/agda-2.6.1.2.ebuild | 139 +++
 sci-mathematics/agda/metadata.xml|  51 
 3 files changed, 173 insertions(+), 18 deletions(-)

diff --git a/sci-mathematics/agda/Manifest b/sci-mathematics/agda/Manifest
index 797f3b17f0d..0514a033175 100644
--- a/sci-mathematics/agda/Manifest
+++ b/sci-mathematics/agda/Manifest
@@ -1 +1,2 @@
 DIST Agda-2.5.2.tar.gz 1240885 BLAKE2B 
bccdaa0c40b8e116f44ee436171cec0a8e1366d7b1f0b469bf459eacf4256e29a00c60a371dcf7971c499e948ce6264861016bb51fcad3251f62cb3e7370c19c
 SHA512 
39ec73316eb7409f7f2618e86a9a3a2c420c93470bf46a1c37a4c4753c6c831d2d6da9ba007086ddee9defd481a695bf142a0a7d360dfa01bdb1fb92467af164
+DIST Agda-2.6.1.2.tar.gz 2722270 BLAKE2B 
cf8d4bff2c189d87696c3f03f1b32777e8bd060102f108e0b96aca87e6b3b1cc84077a1e0fe3f9ef42293f683aa855eb60ade8b0863b3f78c96b4ebb63e456a5
 SHA512 
5ab35d9b581ed918481dd25619739dfa43ea3d86b9522989fe8c83b3aa8749bee81fb12e7cd6b4270c4890a3719386c62b220163324407a1201273d1dfe9d615

diff --git a/sci-mathematics/agda/agda-2.6.1.2.ebuild 
b/sci-mathematics/agda/agda-2.6.1.2.ebuild
new file mode 100644
index 000..ab5ba3366d3
--- /dev/null
+++ b/sci-mathematics/agda/agda-2.6.1.2.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.6.
+
+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="1.4"
+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 emacs enable-cluster-counting +stdlib"
+
+RDEPEND=">=dev-haskell/aeson-1.1.2.0:=[profile?] 
=dev-haskell/async-2.2:=[profile?] =dev-haskell/blaze-html-0.8:=[profile?] 
=dev-haskell/boxes-0.1.3:=[profile?] =dev-haskell/data-hash-0.2.0.0:=[profile?] 
=dev-haskell/edit-distance-0.2.1.2:=[profile?] 
=dev-haskell/equivalence-0.3.2:=[profile?] 
=dev-haskell/exceptions-0.8:=[profile?] 
=dev-haskell/geniplate-mirror-0.6.0.6:=[profile?] 
=dev-haskell/gitrev-1.3.1:=[profile?] 
=dev-haskell/hashable-1.2.1.0:=[profile?] 
=dev-haskell/hashtables-1.2.0.2:=[profile?] 
=dev-haskell/haskeline-0.7.2.3:=[profile?] 
=dev-haskell/ieee754-0.7.8:=[profile?] 
=dev-haskell/mtl-2.2.1:=[profile?] =dev-haskell/murmur-hash-0.1:=[profile?] 
=dev-haskell/regex-tdfa-1.3.1.0:=[profile?] 
=dev-haskell/split-0.2.0.0:=[profile?] 
=dev-haskell/stm-2.4.4:=[profile?] =dev-haskell/strict-0.3.2:=[profile?] 
=dev-haskell/text-1.2.3.1:=[profile?] =dev-haskell/unordered-containers-0.2.5.0:=[profile?] 
=dev-haskell/uri-encode-1.5.0.4:=[profile?] 
=dev-haskell/zlib-0.6:=[profile?] =dev-lang/ghc-8.0.2:=
+   enable-cluster-counting? ( >=dev-haskell/text-icu-0.7:=[profile?] 

 http://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-  sci-mathemat...@gentoo.org
-  Gentoo Mathematics Project
-  
-
-  hask...@gentoo.org
-  Gentoo Haskell
-  
-
-  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.
-
-
-  Use cpphs instead of cpp.
-  Install the standard library.
-
+   
+   hask...@gentoo.org
+   Gentoo Haskell
+   
+   
+   Use cpphs instead of cpp.
+   Enable debugging features that may slow Agda 
down.
+   Enable the 
--count-clusters flag. (If enable-cluster-counting is False, then the 
--count-clusters flag triggers an error message.)
+   Install the standard library.
+   
+   
+   Agda is a dependently typed functional programming language: It 
has
+   inductive families, which are similar to Haskells GADTs, 
but they
+   can be indexed by values and not just types. 

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/agda-stdlib/

2020-12-16 Thread Sergei Trofimovich
commit: 91089b1b6477243613403652fe95b9be2baf1462
Author: Jack Todaro  posteo  org>
AuthorDate: Thu Dec 17 05:37:00 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Dec 17 07:29:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91089b1b

sci-mathematics/agda-stdlib: bump up to 2.6.1.2.1.4

Signed-off-by: Jack Todaro  posteo.org>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sci-mathematics/agda-stdlib/Manifest   |  1 +
 .../agda-stdlib/agda-stdlib-2.6.1.2.1.4.ebuild | 67 ++
 sci-mathematics/agda-stdlib/metadata.xml   |  9 +--
 3 files changed, 71 insertions(+), 6 deletions(-)

diff --git a/sci-mathematics/agda-stdlib/Manifest 
b/sci-mathematics/agda-stdlib/Manifest
index 4279dcb29b8..690b60fabc1 100644
--- a/sci-mathematics/agda-stdlib/Manifest
+++ b/sci-mathematics/agda-stdlib/Manifest
@@ -1 +1,2 @@
 DIST agda-stdlib-2.5.2.0.13.tar.gz 264701 BLAKE2B 
f35b419aac1b80af86217a86fb8e21a2f3427ef9629c8f2e284036859cd89da16ce1b64ceb87f8a3030b5bdb2a68b4f59f74a717fc1e13378ecb20cc6b28f59c
 SHA512 
340a7b9cb15793cdbe99f558a32eaab3476b94b4d43d45bdc92c6b368197d075c977fd2f6ce0c5b0baf584289a2218b07dd030ad2b83f6d9e4bc7effee91eece
+DIST agda-stdlib-2.6.1.2.1.4.tar.gz 816654 BLAKE2B 
c8e6b6f86f32dd2e3d57da4a21066be4a441e71bc3a7cb96d8000f28c56cbb114a00e5df2777b00a8a9fc1a0f94b00bdf4b72eb46f0245ab482a41b6a9d772ee
 SHA512 
90c05d54eaf1d7c78d00f73044afa1f3b4d99df622d40b3cea88fe280f0770ccaeddd787d8fb384c150123f592bb6a7ec24b842a9fcc2936f581d847928223ca

diff --git a/sci-mathematics/agda-stdlib/agda-stdlib-2.6.1.2.1.4.ebuild 
b/sci-mathematics/agda-stdlib/agda-stdlib-2.6.1.2.1.4.ebuild
new file mode 100644
index 000..55a498c1f26
--- /dev/null
+++ b/sci-mathematics/agda-stdlib/agda-stdlib-2.6.1.2.1.4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CABAL_FEATURES="profile"
+inherit haskell-cabal elisp-common
+
+## shared with sci-mathematics/agda
+# 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 -> 0.13
+# As Agda-stdlib is tied to Agda version we encode
+# both versions in gentoo version.
+##
+MY_UPSTREAM_AGDA_STDLIB_V="1.4"
+MY_GENTOO_AGDA_STDLIB_V="${PV}.${MY_UPSTREAM_AGDA_STDLIB_V}"
+MY_UPSTREAM_AGDA_V="${PV%.${MY_UPSTREAM_AGDA_STDLIB_V}}"
+
+DESCRIPTION="Agda standard library"
+HOMEPAGE="https://wiki.portal.chalmers.se/agda/;
+SRC_URI="https://github.com/agda/${PN}/archive/v${MY_UPSTREAM_AGDA_STDLIB_V}.tar.gz
 -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=sci-mathematics/agda-${MY_UPSTREAM_AGDA_V}:=[profile?]
+"
+DEPEND="${RDEPEND}
+   >=dev-haskell/cabal-1.24.2.0
+   >=dev-haskell/filemanip-0.3.6.2[profile?] 
=dev-lang/ghc-8.0.2
+"
+
+S=${WORKDIR}/${PN}-${MY_UPSTREAM_AGDA_STDLIB_V}
+
+src_compile() {
+   haskell-cabal_src_compile
+   "${S}"/dist/build/GenerateEverything/GenerateEverything \
+   || die "GenerateEverything failed"
+   local prof
+   use profile && prof="--ghc-flag=-prof"
+   agda +RTS -K1G -RTS ${prof} \
+   -i "${S}" -i "${S}"/src "${S}"/Everything.agda || die
+   # Although my agda- build has
+   # 
/var/tmp/portage/sci-mathematics/agda-/work/agda-/dist/build/autogen/Paths_Agda.hs
+   # containing:
+   # datadir= "/usr/share/agda-/ghc-7.6.1"
+   # it fails without the --css option like:
+   # /usr/share/agda-/ghc-7.4.1/Agda.css: copyFile: does not exist
+   local cssdir=$(egrep 'datadir *=' 
"${S}/dist/build/autogen/Paths_lib.hs" | sed -e 's@datadir= \(.*\)@\1@')
+   agda --html -i "${S}" -i "${S}"/src --css="${cssdir}/Agda.css" 
"${S}"/README.agda || die
+}
+
+src_test() {
+   agda -i "${S}" -i "${S}"/src README.agda || die
+}
+
+src_install() {
+   insinto usr/share/agda-stdlib
+   insopts --preserve-timestamps
+   doins -r src/*
+   dodoc -r html/*
+   doins "${FILESDIR}/standard-library.agda-lib"
+}

diff --git a/sci-mathematics/agda-stdlib/metadata.xml 
b/sci-mathematics/agda-stdlib/metadata.xml
index 06549522e12..37374b54118 100644
--- a/sci-mathematics/agda-stdlib/metadata.xml
+++ b/sci-mathematics/agda-stdlib/metadata.xml
@@ -5,13 +5,10 @@
 sci-mathemat...@gentoo.org
 Gentoo Mathematics Project
   
-  
-hask...@gentoo.org
-Gentoo Haskell
+
+  hask...@gentoo.org
+  Gentoo Haskell
   
-  
-Install agda-lib-ffi for compilation using the MAlonzo 
backend
-  
   
 agda/agda-stdlib
   



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/agda/

2020-11-15 Thread Sergei Trofimovich
commit: 5f89d073a6ddceaff9ec0c2b34586c76178d817f
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Nov 15 16:35:02 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Nov 15 16:41:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f89d073

sci-mathematics/agda: drop USE=uhc

uhc is masked for removal.

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sci-mathematics/agda/agda-2.5.2-r2.ebuild | 9 ++---
 sci-mathematics/agda/metadata.xml | 1 -
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/sci-mathematics/agda/agda-2.5.2-r2.ebuild 
b/sci-mathematics/agda/agda-2.5.2-r2.ebuild
index 620d6ba28f8..bac38fefcb1 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-lang/ghc-7.10.1:=
>=dev-haskell/hashtables-1.0.1.8:=[profile?] 
=dev-haskell/mtl-2.1.1:=[profile?] =dev-haskell/shuffle-0.1.3.3:=[profile?]
-   >=dev-haskell/uhc-light-1.1.9.2:=[profile?] 
=dev-haskell/uhc-util-0.1.6.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/metadata.xml 
b/sci-mathematics/agda/metadata.xml
index 057c778e581..ea96b9e3cce 100644
--- a/sci-mathematics/agda/metadata.xml
+++ b/sci-mathematics/agda/metadata.xml
@@ -18,6 +18,5 @@
 
   Use cpphs instead of cpp.
   Install the standard library.
-  Add support for the uhc backend.
 
 



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/agda-stdlib/

2020-10-08 Thread Sergei Trofimovich
commit: 5f3bacb87367edb140d02e00fec2fc6214207356
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Oct  8 18:22:38 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Oct  8 18:22:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f3bacb8

sci-mathematics/agda-stdlib: drop old

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sci-mathematics/agda-stdlib/Manifest   |  1 -
 .../agda-stdlib/agda-stdlib-2.4.2.5.ebuild | 66 --
 2 files changed, 67 deletions(-)

diff --git a/sci-mathematics/agda-stdlib/Manifest 
b/sci-mathematics/agda-stdlib/Manifest
index 3b6c51e561f..4279dcb29b8 100644
--- a/sci-mathematics/agda-stdlib/Manifest
+++ b/sci-mathematics/agda-stdlib/Manifest
@@ -1,2 +1 @@
-DIST agda-stdlib-2.4.2.5.tar.gz 253379 BLAKE2B 
c635040892bf940057bacf35f85fa6b7e3b49d1877ca7310933c27312b37566f3df077ad021d34e7855daa1e23b2495df82fe288e8416a11f630beeb313ca027
 SHA512 
b15ed5838916240c8602fe7a4bccddf43c71ab3a18ecb5a6dc85199b908e261b04cf794a4d93c90af0a9263a36603c392280639ace7fecead0c39269c2623302
 DIST agda-stdlib-2.5.2.0.13.tar.gz 264701 BLAKE2B 
f35b419aac1b80af86217a86fb8e21a2f3427ef9629c8f2e284036859cd89da16ce1b64ceb87f8a3030b5bdb2a68b4f59f74a717fc1e13378ecb20cc6b28f59c
 SHA512 
340a7b9cb15793cdbe99f558a32eaab3476b94b4d43d45bdc92c6b368197d075c977fd2f6ce0c5b0baf584289a2218b07dd030ad2b83f6d9e4bc7effee91eece

diff --git a/sci-mathematics/agda-stdlib/agda-stdlib-2.4.2.5.ebuild 
b/sci-mathematics/agda-stdlib/agda-stdlib-2.4.2.5.ebuild
deleted file mode 100644
index be6d6baf391..000
--- a/sci-mathematics/agda-stdlib/agda-stdlib-2.4.2.5.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal elisp-common
-
-DESCRIPTION="Agda standard library"
-HOMEPAGE="https://wiki.portal.chalmers.se/agda/;
-SRC_URI="https://github.com/agda/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="profile +ffi"
-
-# filemanip is used in lib.cabal to make the GenerateEverything and
-# AllNonAsciiChars executables, so agda-stdlib does not require a subslot
-# dependency on filemanip.
-
-RDEPEND="~sci-mathematics/agda-${PV}:=[profile?]
-   >=dev-haskell/filemanip-0.3.6.2[profile?] 
=dev-lang/ghc-6.12.1
-   ffi? ( sci-mathematics/agda-lib-ffi )
-"
-DEPEND="${RDEPEND}
-   >=dev-haskell/cabal-1.8.0.2
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-   cabal-mksetup
-   eapply_user
-}
-
-src_compile() {
-   haskell-cabal_src_compile
-   "${S}"/dist/build/GenerateEverything/GenerateEverything \
-   || die "GenerateEverything failed"
-   local prof
-   use profile && prof="--ghc-flag=-prof"
-   agda +RTS -K1G -RTS ${prof} \
-   -i "${S}" -i "${S}"/src "${S}"/Everything.agda || die
-   # Although my agda- build has
-   # 
/var/tmp/portage/sci-mathematics/agda-/work/agda-/dist/build/autogen/Paths_Agda.hs
-   # containing:
-   # datadir= "/usr/share/agda-/ghc-7.6.1"
-   # it fails without the --css option like:
-   # /usr/share/agda-/ghc-7.4.1/Agda.css: copyFile: does not exist
-   local cssdir=$(egrep 'datadir *=' 
"${S}/dist/build/autogen/Paths_lib.hs" | sed -e 's@datadir= \(.*\)@\1@')
-   agda --html -i "${S}" -i "${S}"/src --css="${cssdir}/Agda.css" 
"${S}"/README.agda || die
-}
-
-src_test() {
-   agda -i "${S}" -i "${S}"/src README.agda || die
-}
-
-src_install() {
-   insinto usr/share/agda-stdlib
-   insopts --preserve-timestamps
-   doins -r src/*
-   dodoc -r html/*
-   elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-}



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/agda/files/, sci-mathematics/agda/

2020-10-08 Thread Sergei Trofimovich
commit: e138bb5c3fba0f8a276b9edab767d1c628fbc53c
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Oct  8 18:21:44 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Oct  8 18:21:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e138bb5c

sci-mathematics/agda: drop old

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sci-mathematics/agda/Manifest  |   1 -
 sci-mathematics/agda/agda-2.4.2.5-r2.ebuild| 130 --
 sci-mathematics/agda/agda-2.5.2-r1.ebuild  | 148 -
 .../agda/files/agda-2.4.2.5-hashtables.patch   |  13 --
 4 files changed, 292 deletions(-)

diff --git a/sci-mathematics/agda/Manifest b/sci-mathematics/agda/Manifest
index fa2726ed4da..797f3b17f0d 100644
--- a/sci-mathematics/agda/Manifest
+++ b/sci-mathematics/agda/Manifest
@@ -1,2 +1 @@
-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

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 63b99d3e1cb..000
--- 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.
-
-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/boxes-0.1.3:=[profile?] =dev-haskell/data-hash-0.2.0.0:=[profile?] 
=dev-haskell/edit-distance-0.2.1.2:=[profile?] 
=dev-haskell/equivalence-0.2.5:=[profile?] 
=dev-haskell/geniplate-mirror-0.6.0.6:=[profile?] 
=dev-haskell/hashable-1.2.1.0:=[profile?] 
=dev-haskell/haskeline-0.7.1.3:=[profile?] 
=dev-haskell/haskell-src-exts-1.16.0.1:=[profile?] 
=dev-haskell/parallel-3.2.0.4:=[profile?] 
=dev-haskell/quickcheck-2.8:2=[profile?] 
=dev-haskell/strict-0.3.2:=[profile?] 
=dev-haskell/text-0.11.3.1:=[profile?] 
=dev-haskell/transformers-compat-0.3.3.3:=[profile?]
-   >=dev-haskell/unordered-containers-0.2.5.0:=[profile?] 
=dev-haskell/void-0.5.4:=[profile?] =dev-haskell/xhtml-3000.2.1:=[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/mtl-2.1.1:=[profile?] =dev-haskell/transformers-0.3:=[profile?] 
= 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
-  

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/agda/

2019-12-24 Thread Sergei Trofimovich
commit: 6e983fec6727b4776eb34d2aaf01b73f486bb163
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Dec 24 11:06:26 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Dec 24 11:06:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e983fec

sci-mathematics/agda: allow multiple revisions of agda-stdlib

Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sci-mathematics/agda/agda-2.4.2.5-r2.ebuild | 2 +-
 sci-mathematics/agda/agda-2.5.2-r1.ebuild   | 2 +-
 sci-mathematics/agda/agda-2.5.2-r2.ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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 b958c29c542..634862b133a 100644
--- a/sci-mathematics/agda/agda-2.4.2.5-r2.ebuild
+++ b/sci-mathematics/agda/agda-2.4.2.5-r2.ebuild
@@ -47,7 +47,7 @@ RDEPEND+="
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 d5d805f48ba..9bc509d3579 100644
--- a/sci-mathematics/agda/agda-2.5.2-r1.ebuild
+++ b/sci-mathematics/agda/agda-2.5.2-r1.ebuild
@@ -66,7 +66,7 @@ RDEPEND+="
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
index 2f77831b072..c5ee1f84166 100644
--- a/sci-mathematics/agda/agda-2.5.2-r2.ebuild
+++ b/sci-mathematics/agda/agda-2.5.2-r2.ebuild
@@ -66,7 +66,7 @@ RDEPEND+="
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



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/agda/

2019-12-23 Thread Sergei Trofimovich
commit: 861844514f824a9220319ba16520dc9654bd7af3
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Dec 23 22:56:44 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Dec 23 22:59:12 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86184451

sci-mathematics/agda: allow edisoncore-1.3.2

Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/703418
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sci-mathematics/agda/agda-2.5.2-r2.ebuild | 150 ++
 1 file changed, 150 insertions(+)

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 000..2f77831b072
--- /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/data-hash-0.2.0.0:=[profile?] 
=dev-haskell/edisoncore-1.3.1.1:=[profile?]
+   >=dev-haskell/edit-distance-0.2.1.2:=[profile?] 
=dev-haskell/equivalence-0.2.5:=[profile?] 
=dev-haskell/fail-4.9:=[profile?] =dev-haskell/geniplate-mirror-0.6.0.6:=[profile?] 
=dev-haskell/gitrev-1.2:=[profile?] =dev-haskell/hashable-1.2.1.0:=[profile?] 
=dev-haskell/haskeline-0.7.1.3:=[profile?] 
=dev-haskell/ieee754-0.7.8:=[profile?] 
=dev-haskell/monadplus-1.4:=[profile?] 
=dev-haskell/murmur-hash-0.1:=[profile?] 
=dev-haskell/parallel-3.2.0.4:=[profile?] 
=dev-haskell/regex-tdfa-1.2.2:=[profile?] 
=dev-haskell/semigroups-0.18:=[profile?] 
=dev-haskell/strict-0.3.2:=[profile?] 
=dev-haskell/text-0.11.3.1:=[profile?] 
=dev-haskell/transformers-compat-0.3.3.3:=[profile?] 
=dev-haskell/unordered-containers-0.2.5.0:=[profile?] 
=dev-haskell/xhtml-3000.2.1:=[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/mtl-2.1.1:=[profile?] =dev-haskell/shuffle-0.1.3.3:=[profile?]
+   >=dev-haskell/uhc-light-1.1.9.2:=[profile?] 
=dev-haskell/uhc-util-0.1.6.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 

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/agda/

2019-12-20 Thread Ulrich Müller
commit: 1e5f45b1ed0fa6ae2b44a8872085f93cf0738a49
Author: Ulrich Müller  gentoo  org>
AuthorDate: Fri Dec 20 16:28:16 2019 +
Commit: Ulrich Müller  gentoo  org>
CommitDate: Fri Dec 20 22:48:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e5f45b1

sci-mathematics/agda: Update virtual/emacs dependency.

The virtual is deprecated, depend on app-editors/emacs instead.

Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Ulrich Müller  gentoo.org>

 sci-mathematics/agda/agda-2.4.2.5-r2.ebuild | 4 ++--
 sci-mathematics/agda/agda-2.5.2-r1.ebuild   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

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 35d86bd4e84..b958c29c542 100644
--- a/sci-mathematics/agda/agda-2.4.2.5-r2.ebuild
+++ b/sci-mathematics/agda/agda-2.4.2.5-r2.ebuild
@@ -44,8 +44,8 @@ RDEPEND=">=dev-haskell/binary-0.7.2.1:=[profile?] 
=dev-haskell/transformers-0.3:=[profile?] 
=dev-haskell/boxes-0.1.3:=[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} )"
 DEPEND="${RDEPEND}



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/agda-stdlib/files/

2017-02-16 Thread Sergei Trofimovich
commit: 15db6e80760c5c0633251eaf0058ca8e6a10ff2f
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Feb 17 00:01:46 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Feb 17 00:01:53 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15db6e80

sci-mathematics/agda-stdlib: add forgotten 'standard-library.agda-lib'

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sci-mathematics/agda-stdlib/files/standard-library.agda-lib | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sci-mathematics/agda-stdlib/files/standard-library.agda-lib 
b/sci-mathematics/agda-stdlib/files/standard-library.agda-lib
new file mode 100644
index 00..7cd8525ff7
--- /dev/null
+++ b/sci-mathematics/agda-stdlib/files/standard-library.agda-lib
@@ -0,0 +1,2 @@
+name: standard-library
+include: /usr/share/agda-stdlib



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/agda/

2016-11-18 Thread Sergei Trofimovich
commit: a84b472107985b2e36a2f1a80b9ca68dd24f3b89
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Nov 18 22:40:43 2016 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Nov 18 22:41:10 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a84b4721

sci-mathematics/agda: allow alex-3.2, bug #600034

Reported-by: Anton Kochkov
Bug: https://bugs.gentoo.org/600034

Package-Manager: portage-2.3.2

 sci-mathematics/agda/agda-2.4.2.5-r2.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 988c01d..49586fb 100644
--- a/sci-mathematics/agda/agda-2.4.2.5-r2.ebuild
+++ b/sci-mathematics/agda/agda-2.4.2.5-r2.ebuild
@@ -73,7 +73,8 @@ src_prepare() {
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'
+   'build-tools: cpphs >= 1.19 && < 1.20' 'build-tools: cpphs >= 
1.19' \
+   'alex >= 3.1.0 && < 3.2' 'alex >= 3.1.0'
 }
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/agda/

2016-09-11 Thread Sergei Trofimovich
commit: 1a1716a480f35485b9d51ad130b6a3d165a0cfe2
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Sep 11 20:46:51 2016 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Sep 11 20:46:51 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a1716a4

sci-mathematics/agda: allow cpphs-1.20

Package-Manager: portage-2.3.0

 sci-mathematics/agda/agda-2.4.2.5-r2.ebuild | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 56ea734..988c01d 100644
--- a/sci-mathematics/agda/agda-2.4.2.5-r2.ebuild
+++ b/sci-mathematics/agda/agda-2.4.2.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -72,7 +72,8 @@ src_prepare() {
 
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'
+   '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'
 }
 
 src_configure() {



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/agda/

2016-04-22 Thread Sergei Trofimovich
commit: 10b7c1d38595a6b70f2eef15d89937d479993f48
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Apr 22 08:08:19 2016 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Apr 22 08:08:56 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10b7c1d3

sci-mathematics/agda: drop old

Package-Manager: portage-2.2.28

 sci-mathematics/agda/agda-2.4.2.5-r1.ebuild | 131 
 sci-mathematics/agda/agda-2.4.2.5.ebuild| 116 
 2 files changed, 247 deletions(-)

diff --git a/sci-mathematics/agda/agda-2.4.2.5-r1.ebuild 
b/sci-mathematics/agda/agda-2.4.2.5-r1.ebuild
deleted file mode 100644
index 950d7ce..000
--- a/sci-mathematics/agda/agda-2.4.2.5-r1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# 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.
-
-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/boxes-0.1.3:=[profile?] =dev-haskell/data-hash-0.2.0.0:=[profile?] 
=dev-haskell/edit-distance-0.2.1.2:=[profile?] 
=dev-haskell/equivalence-0.2.5:=[profile?] 
=dev-haskell/geniplate-mirror-0.6.0.6:=[profile?] 
=dev-haskell/hashable-1.2.1.0:=[profile?] 
=dev-haskell/haskeline-0.7.1.3:=[profile?] 
=dev-haskell/haskell-src-exts-1.16.0.1:=[profile?] 
=dev-haskell/parallel-3.2.0.4:=[profile?] 
=dev-haskell/quickcheck-2.8:2=[profile?] 
=dev-haskell/strict-0.3.2:=[profile?] 
=dev-haskell/text-0.11.3.1:=[profile?] 
=dev-haskell/transformers-compat-0.3.3.3:=[profile?] 
=dev-haskell/unordered-containers-0.2.5.0:=[profile?] 
=dev-haskell/void-0.5.4:=[profile?] =dev-haskell/xhtml-3000.2.1:=[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.0.2:=[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/transformers-0.3:=[profile?] 
=dev-haskell/transformers-0.4.1.0:=[profile?] 
= 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/agda-2.4.2.5.ebuild 
b/sci-mathematics/agda/agda-2.4.2.5.ebuild
deleted file mode 100644
index 7534c2a..000
--- a/sci-mathematics/agda/agda-2.4.2.5.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.5.
-
-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"
-

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/agda/, sci-mathematics/agda/files/

2016-04-03 Thread Sergei Trofimovich
commit: bdf8483c7e14f6ebe1fb5cf8c79ce290688f3278
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Apr  3 21:07:28 2016 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Apr  3 21:24:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdf8483c

sci-mathematics/agda: allow transformers-compat-0.4

Package-Manager: portage-2.2.28

 sci-mathematics/agda/agda-2.4.2.5-r2.ebuild| 129 +
 sci-mathematics/agda/files/agda-make_install.patch |  14 ---
 2 files changed, 129 insertions(+), 14 deletions(-)

diff --git a/sci-mathematics/agda/agda-2.4.2.5-r2.ebuild 
b/sci-mathematics/agda/agda-2.4.2.5-r2.ebuild
new file mode 100644
index 000..56ea734
--- /dev/null
+++ b/sci-mathematics/agda/agda-2.4.2.5-r2.ebuild
@@ -0,0 +1,129 @@
+# 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.
+
+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/boxes-0.1.3:=[profile?] =dev-haskell/data-hash-0.2.0.0:=[profile?] 
=dev-haskell/edit-distance-0.2.1.2:=[profile?] 
=dev-haskell/equivalence-0.2.5:=[profile?] 
=dev-haskell/geniplate-mirror-0.6.0.6:=[profile?] 
=dev-haskell/hashable-1.2.1.0:=[profile?] 
=dev-haskell/haskeline-0.7.1.3:=[profile?] 
=dev-haskell/haskell-src-exts-1.16.0.1:=[profile?] 
=dev-haskell/parallel-3.2.0.4:=[profile?] 
=dev-haskell/quickcheck-2.8:2=[profile?] 
=dev-haskell/strict-0.3.2:=[profile?] 
=dev-haskell/text-0.11.3.1:=[profile?] 
=dev-haskell/transformers-compat-0.3.3.3:=[profile?]
+   >=dev-haskell/unordered-containers-0.2.5.0:=[profile?] 
=dev-haskell/void-0.5.4:=[profile?] =dev-haskell/xhtml-3000.2.1:=[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/mtl-2.1.1:=[profile?] =dev-haskell/transformers-0.3:=[profile?] 
= 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'
+}
+
+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-make_install.patch 
b/sci-mathematics/agda/files/agda-make_install.patch
deleted file mode 100644
index 0d008ac..000
--- a/sci-mathematics/agda/files/agda-make_install.patch
+++ /dev/null
@@ -1,14 +0,0 @@
 Agda-1.1-cvs20050601/src/Makefile.in.old   2006-07-12 14:47:06.0 
+0200
-+++ Agda-1.1-cvs20050601/src/Makefile.in   2006-07-12 14:47:25.0 
+0200
-@@ -74,10 +74,9 @@
- 
- install_bin: emacsagda agdachecker
-   ${INSTALL} -d ${destdir}/bin/
-+  ${INSTALL} -d ${bindir}
-   cp emacsagda ${destdir}/bin/emacsagda-${VERSION}
--  -rm ${destdir}/bin/emacsagda
-   (cd ${destdir}/bin; ln -s emacsagda-${VERSION} emacsagda)
--  -(cd ${bindir}; ln -s ${destdir}/bin/emacsagda emacsagda)
- # No more energy to create variants
-   ${INSTALL} agdachecker ${bindir}
- 



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/agda-lib-ffi/

2016-04-03 Thread Sergei Trofimovich
commit: 80bc27bf80d0e3df2293dccf29430c41aa7a1c51
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Apr  3 21:08:58 2016 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Apr  3 21:24:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80bc27bf

sci-mathematics/agda-lib-ffi: allow ghc-8

Package-Manager: portage-2.2.28

 sci-mathematics/agda-lib-ffi/agda-lib-ffi-0.0.2-r2.ebuild | 5 +
 sci-mathematics/agda-lib-ffi/metadata.xml | 1 +
 2 files changed, 6 insertions(+)

diff --git a/sci-mathematics/agda-lib-ffi/agda-lib-ffi-0.0.2-r2.ebuild 
b/sci-mathematics/agda-lib-ffi/agda-lib-ffi-0.0.2-r2.ebuild
index 2774fd4..8e31023 100644
--- a/sci-mathematics/agda-lib-ffi/agda-lib-ffi-0.0.2-r2.ebuild
+++ b/sci-mathematics/agda-lib-ffi/agda-lib-ffi-0.0.2-r2.ebuild
@@ -29,3 +29,8 @@ DEPEND="${RDEPEND}
 "
 
 S="${WORKDIR}/${AGDA_P}/ffi"
+
+src_prepare() {
+   cabal_chdeps \
+   'base >= 4.5.0.0 && < 4.9' 'base >= 4.5.0.0'
+}

diff --git a/sci-mathematics/agda-lib-ffi/metadata.xml 
b/sci-mathematics/agda-lib-ffi/metadata.xml
index f3e416a..adc5490 100644
--- a/sci-mathematics/agda-lib-ffi/metadata.xml
+++ b/sci-mathematics/agda-lib-ffi/metadata.xml
@@ -3,6 +3,7 @@
 

hask...@gentoo.org
+   Gentoo Haskell


Auxiliary Haskell code used by Agda's standard library.



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/agda/

2016-04-03 Thread Sergei Trofimovich
commit: 8f91cf2917b73d6ab65d76be77a80ea5d97a9b81
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Apr  3 14:37:53 2016 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Apr  3 14:39:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f91cf29

sci-mathematics/agda: drop unused local USE-description: 'epic'

Package-Manager: portage-2.2.28

 sci-mathematics/agda/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sci-mathematics/agda/metadata.xml 
b/sci-mathematics/agda/metadata.xml
index bd5064d..ea96b9e 100644
--- a/sci-mathematics/agda/metadata.xml
+++ b/sci-mathematics/agda/metadata.xml
@@ -17,7 +17,6 @@
 
 
   Use cpphs instead of cpp.
-  Add support for the epic compiler.
   Install the standard library.
 
 



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/agda-stdlib/

2016-04-03 Thread Sergei Trofimovich
commit: 669e602164fff463c1e6f6119f4b2a1b1481160c
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Apr  3 14:38:23 2016 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Apr  3 14:39:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=669e6021

sci-mathematics/agda-stdlib: drop old

Package-Manager: portage-2.2.28

 sci-mathematics/agda-stdlib/Manifest   |  3 -
 sci-mathematics/agda-stdlib/agda-stdlib-0.8.ebuild | 67 --
 sci-mathematics/agda-stdlib/agda-stdlib-0.9.ebuild | 67 --
 .../agda-stdlib/agda-stdlib-2.4.2.3.ebuild | 66 -
 4 files changed, 203 deletions(-)

diff --git a/sci-mathematics/agda-stdlib/Manifest 
b/sci-mathematics/agda-stdlib/Manifest
index baeaa65..020b3fa 100644
--- a/sci-mathematics/agda-stdlib/Manifest
+++ b/sci-mathematics/agda-stdlib/Manifest
@@ -1,4 +1 @@
-DIST agda-stdlib-0.8.tar.gz 246158 SHA256 
e8b8380bb03871ee3348aa2df32201a387ca0af02171d32ac58664f58467ed0d SHA512 
5ac3bda61eb209a4db650edbbdfb96b73cb58b24e43842957696a20a93454d9846a19e4866af0b736c2c3390184223473da75277e490a6a8348531431ca27af0
 WHIRLPOOL 
ccb5f294cb303b7d502227a6f908fa4904c56c55af1c3897753da3f39c7271cd07c292b56e030b8d80f97e6d6a8ad9f0a5fba1f22e0d169bdb4cb79e6e2db060
-DIST agda-stdlib-0.9.tar.gz 248895 SHA256 
923b487876235863e4f778aa40c508984b26636d50d531f0f31ca9dc45ab3717 SHA512 
aa297e250c5d98ca3f267c5ef95fc33999f9b120256c1983774d814b940a0f5952e524024908e3716af71ad544a586576c1bae6cca19e63797b1d4004ba88413
 WHIRLPOOL 
dd200c61e91e397dfc7de8f6269edaefc20aa3daf5ead9e9fbab62468e5385481a74d5cec62df88e5c5304e06dfbd47b1870f71f70aba7fad29eceb0d836e2b1
-DIST agda-stdlib-2.4.2.3.tar.gz 252558 SHA256 
bb444fb35096be277c07aa27652c24509449fee9188325bb13eaac68b91eca7d SHA512 
d503fc2abd18ab8c367a1947301e0302a6ff9fcbb6376a01f016aa2ab7a9a967e5adb96c5013db1892f4acd9fab62bead11c58c4d443784aff1e42ee4ffd4aa9
 WHIRLPOOL 
829e5613f2e03cda80608ef0899db413c98a505c9ba595d3aacd12171fc2e30e18e72365770a85655c7670fc5d45103c3b186d2bf8d9697aebae15bc9f40feaf
 DIST agda-stdlib-2.4.2.5.tar.gz 253379 SHA256 
9b46956e88a886cd08a8e6e83bea6115844860d7e927279abacc52e84b302b16 SHA512 
b15ed5838916240c8602fe7a4bccddf43c71ab3a18ecb5a6dc85199b908e261b04cf794a4d93c90af0a9263a36603c392280639ace7fecead0c39269c2623302
 WHIRLPOOL 
6414b268a813309e7315d6e2ff9345efdb95d1559966f8755607045a685d4b7cf521750ac7efa8dd90001357d7c825d31589dfd2fe771d379f45d79739c7d66c

diff --git a/sci-mathematics/agda-stdlib/agda-stdlib-0.8.ebuild 
b/sci-mathematics/agda-stdlib/agda-stdlib-0.8.ebuild
deleted file mode 100644
index cc2c341..000
--- a/sci-mathematics/agda-stdlib/agda-stdlib-0.8.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-CABAL_FEATURES="bin"
-inherit haskell-cabal elisp-common
-
-DESCRIPTION="Agda standard library"
-HOMEPAGE="http://wiki.portal.chalmers.se/agda/;
-SRC_URI="https://github.com/agda/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="profile +ffi"
-
-# filemanip is used in lib.cabal to make the GenerateEverything and
-# AllNonAsciiChars executables, so agda-stdlib does not require a subslot
-# dependency on filemanip.
-
-RDEPEND=">=sci-mathematics/agda-2.4:=[profile?]
-   =dev-haskell/filemanip-0.3*[profile?]
-   >=sci-mathematics/agda-executable-2.3.0.1:=
-   >=dev-lang/ghc-6.12.1
-   ffi? ( =sci-mathematics/agda-lib-ffi-0.0.2 )
-"
-DEPEND="${RDEPEND}
-   >=dev-haskell/cabal-1.8.0.2
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-src_prepare() {
-   cabal-mksetup
-}
-
-src_compile() {
-   haskell-cabal_src_compile
-   "${S}"/dist/build/GenerateEverything/GenerateEverything \
-   || die "GenerateEverything failed"
-   local prof
-   use profile && prof="--ghc-flag=-prof"
-   agda +RTS -K1G -RTS ${prof} \
-   -i "${S}" -i "${S}"/src "${S}"/Everything.agda || die
-   # Although my agda- build has
-   # 
/var/tmp/portage/sci-mathematics/agda-/work/agda-/dist/build/autogen/Paths_Agda.hs
-   # containing:
-   # datadir= "/usr/share/agda-/ghc-7.6.1"
-   # it fails without the --css option like:
-   # /usr/share/agda-/ghc-7.4.1/Agda.css: copyFile: does not exist
-   local cssdir=$(egrep 'datadir *=' 
"${S}/dist/build/autogen/Paths_lib.hs" | sed -e 's@datadir= \(.*\)@\1@')
-   agda --html -i "${S}" -i "${S}"/src --css="${cssdir}/Agda.css" 
"${S}"/README.agda || die
-}
-
-src_test() {
-   agda -i "${S}" -i "${S}"/src README.agda || die
-}
-
-src_install() {
-   insinto usr/share/agda-stdlib
-   insopts --preserve-timestamps
-   doins -r src/*
-   dodoc -r html/*
-   elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
-}

diff --git a/sci-mathematics/agda-stdlib/agda-stdlib-0.9.ebuild 

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/agda/

2016-04-03 Thread Sergei Trofimovich
commit: 4e2efc914fdca78085ff8cd8af4283bcc2efcff3
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Apr  3 14:37:25 2016 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Apr  3 14:39:25 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e2efc91

sci-mathematics/agda: drop old

Package-Manager: portage-2.2.28

 sci-mathematics/agda/Manifest   |   3 -
 sci-mathematics/agda/agda-2.4.0.1.ebuild| 124 ---
 sci-mathematics/agda/agda-2.4.2.2-r1.ebuild | 128 
 sci-mathematics/agda/agda-2.4.2.3-r1.ebuild | 116 -
 sci-mathematics/agda/agda-2.4.2.3-r2.ebuild | 119 --
 sci-mathematics/agda/agda-2.4.2.3-r3.ebuild | 119 --
 6 files changed, 609 deletions(-)

diff --git a/sci-mathematics/agda/Manifest b/sci-mathematics/agda/Manifest
index 7122931..b67110a 100644
--- a/sci-mathematics/agda/Manifest
+++ b/sci-mathematics/agda/Manifest
@@ -1,4 +1 @@
-DIST Agda-2.4.0.1.tar.gz 906887 SHA256 
58e678b9d193e19d4e69d8899129d9ae16df08a394873af850797f03cc2cbe86 SHA512 
edd56ecea83241f3cb1aca4ac1e17970acf122c323a4ff38e2b5d8e46e46b1afd90fbbd460a6674a51cbb13a7cbf3a57b489e91a92ce3e709b2fc3d659013601
 WHIRLPOOL 
4e94c4277e8be99bd5a513c274fd5712f1d4a3e99d1e626a3b195b9cf83f9216de62220cfb5e8298cc0f11560a9c32dc0116db3bd67c2240842fa798f733065c
-DIST Agda-2.4.2.2.tar.gz 963302 SHA256 
2344107654d0cb2a18dcf179ed3ea0f427839e058771ed628da64fbaed55bbc3 SHA512 
62376775255099570d9eb7814de77a239d0806669ee0993283429a400c7c45ca756c6735bab85b4d3a4b82defae544364ac9107fd622f2df1ebcbded3113204d
 WHIRLPOOL 
dd220346109b7e137cca2e3b091c581b0b4ed0e23340209c7eebc48b39d807a569c984fbe1aee813d18a7f953db86e82b6a6aa7e197e6a2c5569dc311625f45f
-DIST Agda-2.4.2.3.tar.gz 990268 SHA256 
bc6def45e32498f51863d67acfbe048c039d630c6a36761ed27e99a5f68d7b27 SHA512 
84c24c517c830128032af8de9c8ce9ed8d5333becf65e6c96d67104caae1b66fb37ae9bcdff8f42a3e2997f4dcef2f4ea5addd7c94c45a0533c833da9af4d55a
 WHIRLPOOL 
ccef337495a5bc6d4272821700126a793ac0cac8b0ebbef44be478b725545797959c0edba910b5e2b68076e7c5c01e98580ea40016d02b268960dfba5f62a24a
 DIST Agda-2.4.2.5.tar.gz 1031427 SHA256 
959658a372d93b735d92191b372d221461026c98de4f92e56d198b576dfb67ee SHA512 
c2e090a42f699200854c20dad868b4b67e99107f0cdbba20ed268f4618fcf80068ee31db37e4b6637f73128d9f652ef9276d8f7adea54628da759d79f5e4f4a2
 WHIRLPOOL 
dd2d579242b395835a25910409df1eacaa5c7253a43d7cd6fbeb51146df5252ef2f255d063d15c5cc6bd3fab9e568a60b798539c4f73747411f31919970dee1e

diff --git a/sci-mathematics/agda/agda-2.4.0.1.ebuild 
b/sci-mathematics/agda/agda-2.4.0.1.ebuild
deleted file mode 100644
index a278e74..000
--- a/sci-mathematics/agda/agda-2.4.0.1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.2.
-
-CABAL_FEATURES="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="epic +stdlib"
-
-RDEPEND=">=dev-haskell/binary-0.6:=[profile?] 
=dev-haskell/boxes-0.1.3:=[profile?] =dev-haskell/equivalence-0.2.3:=[profile?] 
=dev-haskell/geniplate-0.6.0.3:=[profile?] 
=dev-haskell/hashtables-1.0:=[profile?] 
=dev-haskell/haskeline-0.7:=[profile?] 
=dev-haskell/haskell-src-exts-1.9.6:=[profile?] 
=dev-haskell/mtl-2.1.1:=[profile?] =dev-haskell/quickcheck-2.7.5:2=[profile?] 
=dev-haskell/stmonadtrans-0.3.2:=[profile?] 
=dev-haskell/strict-0.3.2:=[profile?] 
=dev-haskell/text-0.11:=[profile?] =dev-haskell/transformers-0.3:=[profile?] 
=dev-haskell/unordered-containers-0.2:=[profile?] 
=dev-haskell/xhtml-3000.2:=[profile?] 
=dev-haskell/zlib-0.4.0.1:=[profile?] =dev-lang/ghc-7.4.1:=
-   || ( ( >=dev-haskell/hashable-1.1.2.3:=[profile?] 
=dev-haskell/hashable-1.2.1.0:=[profile?] 
=dev-lang/epic-0.1.13:=[profile?] 
= 2.1.1 && < 2.2' 'mtl >= 2.1.1 && < 2.3' \
-   'transformers == 0.3.*' 'transformers >= 0.3 && < 0.5'
-
-   sed -e '/.*emacs-mode.*$/d' \
-   -i "${S}/${MY_PN}.cabal" \
-   || die "Could not remove agda-mode from ${MY_PN}.cabal"
-
-   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' \
-   

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/agda/files/, sci-mathematics/agda/

2016-02-08 Thread Sergei Trofimovich
commit: 3ea9ef2b91417f18c3aa2faec4861348298f6671
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Feb  8 22:15:41 2016 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Feb  8 22:15:49 2016 +
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 000..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.
+
+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/boxes-0.1.3:=[profile?] =dev-haskell/data-hash-0.2.0.0:=[profile?] 
=dev-haskell/edit-distance-0.2.1.2:=[profile?] 
=dev-haskell/equivalence-0.2.5:=[profile?] 
=dev-haskell/geniplate-mirror-0.6.0.6:=[profile?] 
=dev-haskell/hashable-1.2.1.0:=[profile?] 
=dev-haskell/haskeline-0.7.1.3:=[profile?] 
=dev-haskell/haskell-src-exts-1.16.0.1:=[profile?] 
=dev-haskell/parallel-3.2.0.4:=[profile?] 
=dev-haskell/quickcheck-2.8:2=[profile?] 
=dev-haskell/strict-0.3.2:=[profile?] 
=dev-haskell/text-0.11.3.1:=[profile?] 
=dev-haskell/transformers-compat-0.3.3.3:=[profile?] 
=dev-haskell/unordered-containers-0.2.5.0:=[profile?] 
=dev-haskell/void-0.5.4:=[profile?] =dev-haskell/xhtml-3000.2.1:=[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.0.2:=[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/transformers-0.3:=[profile?] 
=dev-haskell/transformers-0.4.1.0:=[profile?] 
= 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 000..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, 

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/agda/

2016-01-13 Thread Jauhien Piatlicki
commit: 48a5452baa282fe2426ab7a02b8723557274f668
Author: Jauhien Piatlicki  gentoo  org>
AuthorDate: Wed Jan 13 10:47:17 2016 +
Commit: Jauhien Piatlicki  gentoo  org>
CommitDate: Wed Jan 13 10:48:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48a5452b

sci-mathematics/agda: fix dev-haskell/cpphs dependency

Package-Manager: portage-2.2.26

 sci-mathematics/agda/agda-2.4.2.3-r3.ebuild | 119 
 1 file changed, 119 insertions(+)

diff --git a/sci-mathematics/agda/agda-2.4.2.3-r3.ebuild 
b/sci-mathematics/agda/agda-2.4.2.3-r3.ebuild
new file mode 100644
index 000..f3ca8c3
--- /dev/null
+++ b/sci-mathematics/agda/agda-2.4.2.3-r3.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.
+
+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"
+
+RDEPEND=">=dev-haskell/base-orphans-0.3.1:=[profile?] 
=dev-haskell/binary-0.6:=[profile?] =dev-haskell/boxes-0.1.3:=[profile?] =dev-haskell/data-hash-0.2.0.0:=[profile?] 
=dev-haskell/edit-distance-0.2.1.2:=[profile?] 
=dev-haskell/equivalence-0.2.5:=[profile?] 
=dev-haskell/geniplate-mirror-0.6.0.6:=[profile?] 
=dev-haskell/haskeline-0.7:=[profile?] 
=dev-haskell/haskell-src-exts-1.16.0.1:=[profile?] 
=dev-haskell/old-time-1.1.0.0:=[profile?] 
=dev-haskell/parallel-3.2.0.4:=[profile?] 
=dev-haskell/quickcheck-2.8:2=[profile?] 
=dev-haskell/strict-0.3.2:=[profile?] 
=dev-haskell/text-0.11:=[profile?] =dev-haskell/transformers-compat-0.3.3.2:=[profile?] 
=dev-haskell/unordered-containers-0.2:=[profile?] 
=dev-haskell/xhtml-3000.2:=[profile?] 
=dev-haskell/zlib-0.4.0.1:=[profile?] =dev-lang/ghc-7.4.1:=
+   || ( ( >=dev-haskell/hashable-1.1.2.3:=[profile?] 
=dev-haskell/hashable-1.2.1.0:=[profile?] 
=dev-haskell/hashtables-1.0:=[profile?] 
=dev-haskell/hashtables-1.2.0.2:=[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/transformers-0.3:=[profile?] 
=dev-haskell/transformers-0.4.1.0:=[profile?] 
= 0.3.1 && < 0.4' 'base-orphans >= 0.3.1 && < 
0.5' \
+   'data-hash == 0.2.0.0' 'data-hash >= 0.2.0.0 && < 0.3' \
+   'geniplate-mirror >= 0.6.0.6 && < 0.7' 'geniplate-mirror >= 
0.6.0.6 && < 0.8'
+   sed -e '/.*emacs-mode.*$/d' \
+   -i "${S}/${MY_PN}.cabal" \
+   || die "Could not remove agda-mode from ${MY_PN}.cabal"
+}
+
+src_configure() {
+   haskell-cabal_src_configure \
+   $(cabal_flag cpphs cpphs)
+}
+
+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_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'"
+
+   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() {
+   elisp-site-regen
+}
+
+pkg_postrm() {
+   elisp-site-regen
+}



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/agda-stdlib/, sci-mathematics/agda/

2016-01-13 Thread Jauhien Piatlicki
commit: 209a2dd35c6018418423076916182c4d0889acfb
Author: Jauhien Piatlicki  gentoo  org>
AuthorDate: Wed Jan 13 15:01:38 2016 +
Commit: Jauhien Piatlicki  gentoo  org>
CommitDate: Wed Jan 13 15:02:59 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=209a2dd3

sci-mathematics/{agda,agda-stdlib}: version bump

Gentoo-Bug: 561772

Package-Manager: portage-2.2.26

 sci-mathematics/agda-stdlib/Manifest   |   1 +
 .../agda-stdlib/agda-stdlib-2.4.2.5.ebuild |  67 
 sci-mathematics/agda/Manifest  |   1 +
 sci-mathematics/agda/agda-2.4.2.5.ebuild   | 116 +
 4 files changed, 185 insertions(+)

diff --git a/sci-mathematics/agda-stdlib/Manifest 
b/sci-mathematics/agda-stdlib/Manifest
index 3065d6d..baeaa65 100644
--- a/sci-mathematics/agda-stdlib/Manifest
+++ b/sci-mathematics/agda-stdlib/Manifest
@@ -1,3 +1,4 @@
 DIST agda-stdlib-0.8.tar.gz 246158 SHA256 
e8b8380bb03871ee3348aa2df32201a387ca0af02171d32ac58664f58467ed0d SHA512 
5ac3bda61eb209a4db650edbbdfb96b73cb58b24e43842957696a20a93454d9846a19e4866af0b736c2c3390184223473da75277e490a6a8348531431ca27af0
 WHIRLPOOL 
ccb5f294cb303b7d502227a6f908fa4904c56c55af1c3897753da3f39c7271cd07c292b56e030b8d80f97e6d6a8ad9f0a5fba1f22e0d169bdb4cb79e6e2db060
 DIST agda-stdlib-0.9.tar.gz 248895 SHA256 
923b487876235863e4f778aa40c508984b26636d50d531f0f31ca9dc45ab3717 SHA512 
aa297e250c5d98ca3f267c5ef95fc33999f9b120256c1983774d814b940a0f5952e524024908e3716af71ad544a586576c1bae6cca19e63797b1d4004ba88413
 WHIRLPOOL 
dd200c61e91e397dfc7de8f6269edaefc20aa3daf5ead9e9fbab62468e5385481a74d5cec62df88e5c5304e06dfbd47b1870f71f70aba7fad29eceb0d836e2b1
 DIST agda-stdlib-2.4.2.3.tar.gz 252558 SHA256 
bb444fb35096be277c07aa27652c24509449fee9188325bb13eaac68b91eca7d SHA512 
d503fc2abd18ab8c367a1947301e0302a6ff9fcbb6376a01f016aa2ab7a9a967e5adb96c5013db1892f4acd9fab62bead11c58c4d443784aff1e42ee4ffd4aa9
 WHIRLPOOL 
829e5613f2e03cda80608ef0899db413c98a505c9ba595d3aacd12171fc2e30e18e72365770a85655c7670fc5d45103c3b186d2bf8d9697aebae15bc9f40feaf
+DIST agda-stdlib-2.4.2.5.tar.gz 253379 SHA256 
9b46956e88a886cd08a8e6e83bea6115844860d7e927279abacc52e84b302b16 SHA512 
b15ed5838916240c8602fe7a4bccddf43c71ab3a18ecb5a6dc85199b908e261b04cf794a4d93c90af0a9263a36603c392280639ace7fecead0c39269c2623302
 WHIRLPOOL 
6414b268a813309e7315d6e2ff9345efdb95d1559966f8755607045a685d4b7cf521750ac7efa8dd90001357d7c825d31589dfd2fe771d379f45d79739c7d66c

diff --git a/sci-mathematics/agda-stdlib/agda-stdlib-2.4.2.5.ebuild 
b/sci-mathematics/agda-stdlib/agda-stdlib-2.4.2.5.ebuild
new file mode 100644
index 000..8d36ca1
--- /dev/null
+++ b/sci-mathematics/agda-stdlib/agda-stdlib-2.4.2.5.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+CABAL_FEATURES="bin"
+inherit haskell-cabal elisp-common
+
+DESCRIPTION="Agda standard library"
+HOMEPAGE="http://wiki.portal.chalmers.se/agda/;
+SRC_URI="https://github.com/agda/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="profile +ffi"
+
+# filemanip is used in lib.cabal to make the GenerateEverything and
+# AllNonAsciiChars executables, so agda-stdlib does not require a subslot
+# dependency on filemanip.
+
+RDEPEND="~sci-mathematics/agda-${PV}:=[profile?]
+   >=dev-haskell/filemanip-0.3.6.2[profile?] 
=dev-lang/ghc-6.12.1
+   ffi? ( sci-mathematics/agda-lib-ffi )
+"
+DEPEND="${RDEPEND}
+   >=dev-haskell/cabal-1.8.0.2
+"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+   cabal-mksetup
+   eapply_user
+}
+
+src_compile() {
+   haskell-cabal_src_compile
+   "${S}"/dist/build/GenerateEverything/GenerateEverything \
+   || die "GenerateEverything failed"
+   local prof
+   use profile && prof="--ghc-flag=-prof"
+   agda +RTS -K1G -RTS ${prof} \
+   -i "${S}" -i "${S}"/src "${S}"/Everything.agda || die
+   # Although my agda- build has
+   # 
/var/tmp/portage/sci-mathematics/agda-/work/agda-/dist/build/autogen/Paths_Agda.hs
+   # containing:
+   # datadir= "/usr/share/agda-/ghc-7.6.1"
+   # it fails without the --css option like:
+   # /usr/share/agda-/ghc-7.4.1/Agda.css: copyFile: does not exist
+   local cssdir=$(egrep 'datadir *=' 
"${S}/dist/build/autogen/Paths_lib.hs" | sed -e 's@datadir= \(.*\)@\1@')
+   agda --html -i "${S}" -i "${S}"/src --css="${cssdir}/Agda.css" 
"${S}"/README.agda || die
+}
+
+src_test() {
+   agda -i "${S}" -i "${S}"/src README.agda || die
+}
+
+src_install() {
+   insinto usr/share/agda-stdlib
+   insopts --preserve-timestamps
+   doins -r src/*
+   dodoc -r html/*
+   elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die
+}

diff --git a/sci-mathematics/agda/Manifest b/sci-mathematics/agda/Manifest
index 913d708..7122931 100644
--- 

[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/agda-stdlib/

2015-11-23 Thread Justin Lecher
commit: 067f2d2d638ded5988c36e5541d0e98eafa0a6b9
Author: Justin Lecher  gentoo  org>
AuthorDate: Mon Nov 23 10:21:09 2015 +
Commit: Justin Lecher  gentoo  org>
CommitDate: Mon Nov 23 10:46:39 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=067f2d2d

sci-mathematics/agda-stdlib: Replace INSOPTIONS by insopts()

Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=566490

Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher  gentoo.org>

 sci-mathematics/agda-stdlib/agda-stdlib-0.8.ebuild | 4 ++--
 sci-mathematics/agda-stdlib/agda-stdlib-0.9.ebuild | 4 ++--
 sci-mathematics/agda-stdlib/agda-stdlib-2.4.2.3.ebuild | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sci-mathematics/agda-stdlib/agda-stdlib-0.8.ebuild 
b/sci-mathematics/agda-stdlib/agda-stdlib-0.8.ebuild
index 6ccbc88..cc2c341 100644
--- a/sci-mathematics/agda-stdlib/agda-stdlib-0.8.ebuild
+++ b/sci-mathematics/agda-stdlib/agda-stdlib-0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -60,7 +60,7 @@ src_test() {
 
 src_install() {
insinto usr/share/agda-stdlib
-   export INSOPTIONS=--preserve-timestamps
+   insopts --preserve-timestamps
doins -r src/*
dodoc -r html/*
elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die

diff --git a/sci-mathematics/agda-stdlib/agda-stdlib-0.9.ebuild 
b/sci-mathematics/agda-stdlib/agda-stdlib-0.9.ebuild
index 6ccbc88..cc2c341 100644
--- a/sci-mathematics/agda-stdlib/agda-stdlib-0.9.ebuild
+++ b/sci-mathematics/agda-stdlib/agda-stdlib-0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -60,7 +60,7 @@ src_test() {
 
 src_install() {
insinto usr/share/agda-stdlib
-   export INSOPTIONS=--preserve-timestamps
+   insopts --preserve-timestamps
doins -r src/*
dodoc -r html/*
elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die

diff --git a/sci-mathematics/agda-stdlib/agda-stdlib-2.4.2.3.ebuild 
b/sci-mathematics/agda-stdlib/agda-stdlib-2.4.2.3.ebuild
index 867f355..3f5fb3f 100644
--- a/sci-mathematics/agda-stdlib/agda-stdlib-2.4.2.3.ebuild
+++ b/sci-mathematics/agda-stdlib/agda-stdlib-2.4.2.3.ebuild
@@ -59,7 +59,7 @@ src_test() {
 
 src_install() {
insinto usr/share/agda-stdlib
-   export INSOPTIONS=--preserve-timestamps
+   insopts --preserve-timestamps
doins -r src/*
dodoc -r html/*
elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die



[gentoo-commits] repo/gentoo:master commit in: sci-mathematics/agda/

2015-09-27 Thread Sergei Trofimovich
commit: 6c5210c2c89fea8b5462ad4ea1c6070c75c9b52b
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Sep 27 17:54:38 2015 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Sep 27 17:54:38 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c5210c2

sci-mathematics/agda: fix .agdai file generation on install, bug #559326

As we build dynamically linked binaries now we need to
add LD_LIBRARY_PATH to temporary llibrary localtions
to generate .agdai files.

Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/559326

Package-Manager: portage-2.2.22

 sci-mathematics/agda/agda-2.4.2.3-r2.ebuild | 119 
 1 file changed, 119 insertions(+)

diff --git a/sci-mathematics/agda/agda-2.4.2.3-r2.ebuild 
b/sci-mathematics/agda/agda-2.4.2.3-r2.ebuild
new file mode 100644
index 000..b163a57
--- /dev/null
+++ b/sci-mathematics/agda/agda-2.4.2.3-r2.ebuild
@@ -0,0 +1,119 @@
+# 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.5.
+
+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"
+
+RDEPEND=">=dev-haskell/base-orphans-0.3.1:=[profile?] 
=dev-haskell/binary-0.6:=[profile?] =dev-haskell/boxes-0.1.3:=[profile?] =dev-haskell/data-hash-0.2.0.0:=[profile?] 
=dev-haskell/edit-distance-0.2.1.2:=[profile?] 
=dev-haskell/equivalence-0.2.5:=[profile?] 
=dev-haskell/geniplate-mirror-0.6.0.6:=[profile?] 
=dev-haskell/haskeline-0.7:=[profile?] 
=dev-haskell/haskell-src-exts-1.16.0.1:=[profile?] 
=dev-haskell/old-time-1.1.0.0:=[profile?] 
=dev-haskell/parallel-3.2.0.4:=[profile?] 
=dev-haskell/quickcheck-2.8:2=[profile?] 
=dev-haskell/strict-0.3.2:=[profile?] 
=dev-haskell/text-0.11:=[profile?] =dev-haskell/transformers-compat-0.3.3.2:=[profile?] 
=dev-haskell/unordered-containers-0.2:=[profile?] 
=dev-haskell/xhtml-3000.2:=[profile?] 
=dev-haskell/zlib-0.4.0.1:=[profile?] =dev-lang/ghc-7.4.1:=
+   || ( ( >=dev-haskell/hashable-1.1.2.3:=[profile?] 
=dev-haskell/hashable-1.2.1.0:=[profile?] 
=dev-haskell/hashtables-1.0:=[profile?] 
=dev-haskell/hashtables-1.2.0.2:=[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/transformers-0.3:=[profile?] 
=dev-haskell/transformers-0.4.1.0:=[profile?] 
= 0.3.1 && < 0.4' 'base-orphans >= 0.3.1 && < 
0.5' \
+   'data-hash == 0.2.0.0' 'data-hash >= 0.2.0.0 && < 0.3' \
+   'geniplate-mirror >= 0.6.0.6 && < 0.7' 'geniplate-mirror >= 
0.6.0.6 && < 0.8'
+   sed -e '/.*emacs-mode.*$/d' \
+   -i "${S}/${MY_PN}.cabal" \
+   || die "Could not remove agda-mode from ${MY_PN}.cabal"
+}
+
+src_configure() {
+   haskell-cabal_src_configure \
+   $(cabal_flag cpphs cpphs)
+}
+
+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_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'"
+
+   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() {
+   elisp-site-regen
+}
+
+pkg_postrm() {
+   elisp-site-regen
+}