summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatoro <matoro@users.noreply.github.com>2022-07-24 01:18:08 -0400
committerSam James <sam@gentoo.org>2022-07-30 06:57:34 +0100
commit62858f4b5c6d5efc3aee8c8a0027e4e0492d2e85 (patch)
treed5d7c6c817090ae309860665c0db7dcd06e0135c /dev-haskell/keys
parentdev-haskell/hashable: drop 1.2.7.0 (diff)
downloadgentoo-62858f4b5c6d5efc3aee8c8a0027e4e0492d2e85.tar.gz
gentoo-62858f4b5c6d5efc3aee8c8a0027e4e0492d2e85.tar.bz2
gentoo-62858f4b5c6d5efc3aee8c8a0027e4e0492d2e85.zip
dev-haskell/keys: revbump 3.12.3-r1
https://github.com/gentoo-haskell/gentoo-haskell/commit/1fe9bd710c44841067e4ba7882d0622227af619f Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-haskell/keys')
-rw-r--r--dev-haskell/keys/Manifest1
-rw-r--r--dev-haskell/keys/keys-3.12.3-r1.ebuild (renamed from dev-haskell/keys/keys-3.12.3.ebuild)35
-rw-r--r--dev-haskell/keys/metadata.xml3
3 files changed, 24 insertions, 15 deletions
diff --git a/dev-haskell/keys/Manifest b/dev-haskell/keys/Manifest
index ffe7a207ec83..c271b319e95d 100644
--- a/dev-haskell/keys/Manifest
+++ b/dev-haskell/keys/Manifest
@@ -1 +1,2 @@
+DIST keys-3.12.3-r1.cabal 2321 BLAKE2B 03ef68a87426ddc2f3e2e32ecaa047a12a0faaeffff34e6fe5e5e8feef2f2086fd5a00ad3fc9947aaddf6d650e7121154299b5d67c23e6d08792a3dcb816cae2 SHA512 d54ba212421849693e75e295e471858a20057230a68054fe931e0c4f054634e4e5e44ec9e38d3c062c31b41a4dc9dac4149dde3993c26ecacde7819038dc93d0
DIST keys-3.12.3.tar.gz 14378 BLAKE2B 0c2c4599dfa9234e9170a285206ad94f988246a9d56440ea5a89680e17cabd488372ec7b444fd997deb27f6315f9d843494dfbbdd4d2a09ef0525829e7340ed6 SHA512 e0bab964eb38388dfb2fe7dcb4999da0263a2162f171f7ed629a2e1de33eb1cb99dc37a6fe32045f136466cebb5aed69e533417256877316c81a02abc700c28d
diff --git a/dev-haskell/keys/keys-3.12.3.ebuild b/dev-haskell/keys/keys-3.12.3-r1.ebuild
index 5d1ecad351ff..f8cd4e442042 100644
--- a/dev-haskell/keys/keys-3.12.3.ebuild
+++ b/dev-haskell/keys/keys-3.12.3-r1.ebuild
@@ -1,34 +1,45 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-# ebuild generated by hackport 0.6.4
+# ebuild generated by hackport 0.7.1.1.9999
CABAL_FEATURES="lib profile haddock hoogle hscolour"
+CABAL_HACKAGE_REVISION="1"
inherit haskell-cabal
DESCRIPTION="Keyed functors and containers"
HOMEPAGE="https://github.com/ekmett/keys/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
+ https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal -> ${PF}.cabal"
LICENSE="BSD"
SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
+KEYWORDS="~amd64 ~ppc64 ~x86"
-RDEPEND=">=dev-haskell/base-orphans-0.5.4:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?]
- >=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
+RDEPEND=">=dev-haskell/comonad-4:=[profile?] <dev-haskell/comonad-6:=[profile?]
>=dev-haskell/free-4:=[profile?] <dev-haskell/free-6:=[profile?]
- >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
+ >=dev-haskell/hashable-1.1.2.3:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
>=dev-haskell/semigroupoids-5.2:=[profile?] <dev-haskell/semigroupoids-6:=[profile?]
>=dev-haskell/semigroups-0.8.3.1:=[profile?] <dev-haskell/semigroups-1:=[profile?]
>=dev-haskell/tagged-0.7.3:=[profile?] <dev-haskell/tagged-1:=[profile?]
>=dev-haskell/transformers-compat-0.3:=[profile?] <dev-haskell/transformers-compat-1:=[profile?]
>=dev-haskell/unordered-containers-0.2.4:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-haskell/void-0.4:=[profile?] <dev-haskell/void-0.8:=[profile?]
- >=dev-lang/ghc-7.8.2:=
+ >=dev-lang/ghc-8.4.3:=
"
DEPEND="${RDEPEND}
- >=dev-haskell/cabal-1.18.1.3
+ >=dev-haskell/cabal-2.2.0.1
"
+BDEPEND="app-text/dos2unix"
+
+src_prepare() {
+ # pull revised cabal from upstream
+ cp "${DISTDIR}/${PF}.cabal" "${S}/${PN}.cabal" || die
+
+ # Convert to unix line endings
+ dos2unix "${S}/${PN}.cabal" || die
+
+ # Apply patches *after* pulling the revised cabal
+ default
+}
diff --git a/dev-haskell/keys/metadata.xml b/dev-haskell/keys/metadata.xml
index 845daf0c0a9e..937381521944 100644
--- a/dev-haskell/keys/metadata.xml
+++ b/dev-haskell/keys/metadata.xml
@@ -5,7 +5,4 @@
<email>haskell@gentoo.org</email>
<name>Gentoo Haskell</name>
</maintainer>
- <upstream>
- <remote-id type="github">ekmett/keys</remote-id>
- </upstream>
</pkgmetadata>