From ab3da91fb6c91a9df52fff8f991570f456fd3c7a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 18 Dec 2020 11:06:49 +0000 Subject: gentoo resync : 18.12.2020 --- sci-mathematics/agda-stdlib/Manifest | 6 +- .../agda-stdlib/agda-stdlib-2.5.2.0.13.ebuild | 68 ---------------------- .../agda-stdlib/agda-stdlib-2.6.1.2.1.4.ebuild | 67 +++++++++++++++++++++ sci-mathematics/agda-stdlib/metadata.xml | 9 +-- 4 files changed, 73 insertions(+), 77 deletions(-) delete mode 100644 sci-mathematics/agda-stdlib/agda-stdlib-2.5.2.0.13.ebuild create mode 100644 sci-mathematics/agda-stdlib/agda-stdlib-2.6.1.2.1.4.ebuild (limited to 'sci-mathematics/agda-stdlib') diff --git a/sci-mathematics/agda-stdlib/Manifest b/sci-mathematics/agda-stdlib/Manifest index b302dfcd9db8..32cb093ede72 100644 --- a/sci-mathematics/agda-stdlib/Manifest +++ b/sci-mathematics/agda-stdlib/Manifest @@ -1,5 +1,5 @@ AUX 50agda-stdlib-gentoo.el 58 BLAKE2B e9b9bef913e26c63e4b0e19a1e4b5c0e370959689ae18e74ed54e7a8c1415c19fb517af9be59feee3e636042bc22fb68f1fd5457f551a436b920b42685aec1f4 SHA512 f45f0e59a1becd5d2b13b452219cc77b553dad9480a848ea62f276e106ab911ed1594e826fe487b886fe9b6e8aadcfde47de4fb1b0ab144ae98b6ac9eb385cfd AUX standard-library.agda-lib 55 BLAKE2B 057e933b07b291fd505f2e64f43b087c2aa4f4828ba2a03b5a53b9cac0f0fd0ab1f523c91efd6090e34e376dcc61d90bc5193063b6f07280c0eb2d688a07dedc SHA512 b1e2cbffe4b99157661fe6f4685580c7524890735db0a20ae1942e076b00d0df13624f587ea7584319e5665484da63beb3e0e5c77226bdbe02a4a80fa33a17b4 -DIST agda-stdlib-2.5.2.0.13.tar.gz 264701 BLAKE2B f35b419aac1b80af86217a86fb8e21a2f3427ef9629c8f2e284036859cd89da16ce1b64ceb87f8a3030b5bdb2a68b4f59f74a717fc1e13378ecb20cc6b28f59c SHA512 340a7b9cb15793cdbe99f558a32eaab3476b94b4d43d45bdc92c6b368197d075c977fd2f6ce0c5b0baf584289a2218b07dd030ad2b83f6d9e4bc7effee91eece -EBUILD agda-stdlib-2.5.2.0.13.ebuild 2175 BLAKE2B debbd1f201004b20b3e41ad446eac17e2e5ae53175d2c5c56e1a35e94239835d337f5f87bc9b2f03b39a8b7bc1f52476cf02147f5c47fab5ce9e18aac4086e25 SHA512 18c5b73a3dc72a8ee6839381428f27617d299f7c0f61af6c10ce32279e9d50b43b6a36ae02ed675ee1a196914d7f1a2331318976e038c6fc827ec66f95cc9a23 -MISC metadata.xml 584 BLAKE2B 9d0eb0995feecbe10282cabba0b56dfe8278149f16840a477b55e6cf63675c79a642922eca2980f193447b1cdfdb59c4f1524a6cd9ec264175e2a753de6b918f SHA512 5d4446db6dac997893534b330f16a5631ff7472fa9178ced3c7300848a0c1733718985f3f6fa2f39adb905e973f8926371043cc08dac99e795e62850e1f2f2dd +DIST agda-stdlib-2.6.1.2.1.4.tar.gz 816654 BLAKE2B c8e6b6f86f32dd2e3d57da4a21066be4a441e71bc3a7cb96d8000f28c56cbb114a00e5df2777b00a8a9fc1a0f94b00bdf4b72eb46f0245ab482a41b6a9d772ee SHA512 90c05d54eaf1d7c78d00f73044afa1f3b4d99df622d40b3cea88fe280f0770ccaeddd787d8fb384c150123f592bb6a7ec24b842a9fcc2936f581d847928223ca +EBUILD agda-stdlib-2.6.1.2.1.4.ebuild 2129 BLAKE2B 11076c1eb8fc55fb03ce65f8d2016da39eeaed2bfc0ed02a9aeec3266a000cee1a9be5a503af8df108f8ac36b1416ba9d6897e187554a5ef74d194171003f462 SHA512 8e63daeed5284581872533700ca043fd627fa39ec81962f92fa82083b907745d05c0049458af194cc0e5d838eddff6b3ab9c2b8aab4a9ac1be507ee23ab461e1 +MISC metadata.xml 470 BLAKE2B 52d4855254478477d97adcee7dcb01a4683af84456ad3f1affc646821cddc1b6d761d879c5b9576ce02c4d768db5c0685466fe69f294a4380dce69e4626704f0 SHA512 220f1b52f17bd50cc8bc435fb3bfb8db5097c9bd000a552f620c69312633fe8380a315e9ad220f7d8018a1f7d9d866e332aed0cc84172340c1f3764c4ae1990b 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 4659c6572de9..000000000000 --- 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-9999 build has - # /var/tmp/portage/sci-mathematics/agda-9999/work/agda-9999/dist/build/autogen/Paths_Agda.hs - # containing: - # datadir = "/usr/share/agda-9999/ghc-7.6.1" - # it fails without the --css option like: - # /usr/share/agda-9999/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/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 000000000000..55a498c1f260 --- /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-9999 build has + # /var/tmp/portage/sci-mathematics/agda-9999/work/agda-9999/dist/build/autogen/Paths_Agda.hs + # containing: + # datadir = "/usr/share/agda-9999/ghc-7.6.1" + # it fails without the --css option like: + # /usr/share/agda-9999/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 06549522e123..37374b54118e 100644 --- a/sci-mathematics/agda-stdlib/metadata.xml +++ b/sci-mathematics/agda-stdlib/metadata.xml @@ -5,13 +5,10 @@ sci-mathematics@gentoo.org Gentoo Mathematics Project - - haskell@gentoo.org - Gentoo Haskell + + haskell@gentoo.org + Gentoo Haskell - - Install agda-lib-ffi for compilation using the MAlonzo backend - agda/agda-stdlib -- cgit v1.2.3