commit: 0eb8588ed7e4b5aaeb655d0fc366960f0ba87f99
Author: hololeap <hololeap <AT> protonmail <DOT> com>
AuthorDate: Tue Oct 3 05:11:31 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 23 03:10:34 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eb8588e
dev-haskell/semirings: Revision bump
Just to refresh the ebuild, make sure ::gentoo and ::haskell have the
same revision number.
Signed-off-by: hololeap <hololeap <AT> protonmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-haskell/semirings/Manifest | 2 +-
dev-haskell/semirings/metadata.xml | 4 +++
dev-haskell/semirings/semirings-0.6-r2.ebuild | 36 ++++++++++++++++++++
dev-haskell/semirings/semirings-0.6.ebuild | 47 ---------------------------
4 files changed, 41 insertions(+), 48 deletions(-)
diff --git a/dev-haskell/semirings/Manifest b/dev-haskell/semirings/Manifest
index a6a5a7fa2a34..d934fe605edf 100644
--- a/dev-haskell/semirings/Manifest
+++ b/dev-haskell/semirings/Manifest
@@ -1,2 +1,2 @@
-DIST semirings-0.6.cabal 2668 BLAKE2B
d1c1293a9f2ad63caf291bd1e409afef54815815ea3e750cc915a4872725f8d1f69fdf7097fd724f8f4762a98f9b36653b38df900a31c4fef775615c7031e838
SHA512
1b2afdf824ff308726b258b82cc9b18718da01795bcfae23c073dfb484faa1a44ee59af479a8719ed950e5811bbdce64bea4e7b7a0cf59986c24f89e256de156
+DIST semirings-0.6-rev1.cabal 2668 BLAKE2B
d1c1293a9f2ad63caf291bd1e409afef54815815ea3e750cc915a4872725f8d1f69fdf7097fd724f8f4762a98f9b36653b38df900a31c4fef775615c7031e838
SHA512
1b2afdf824ff308726b258b82cc9b18718da01795bcfae23c073dfb484faa1a44ee59af479a8719ed950e5811bbdce64bea4e7b7a0cf59986c24f89e256de156
DIST semirings-0.6.tar.gz 19640 BLAKE2B
9cd6d17cfdc2fde31741a6db085d972fd8ed131ad003102c1b4991e8157f4b22a05508306c64b1a4f730ce1f99e3d40861b60332689d9b16e122c3ff59a80e0c
SHA512
01675527d47b5283ae6beb6feb38b4a5527a46a780b75e4b712c0b1e4b57218fa8238ba100a20947a2e2b53c4a314ad4e1a71f989bd5194fe6378dba048c870c
diff --git a/dev-haskell/semirings/metadata.xml
b/dev-haskell/semirings/metadata.xml
index 937381521944..bfc3eb60560a 100644
--- a/dev-haskell/semirings/metadata.xml
+++ b/dev-haskell/semirings/metadata.xml
@@ -5,4 +5,8 @@
<email>[email protected]</email>
<name>Gentoo Haskell</name>
</maintainer>
+ <upstream>
+ <remote-id type="hackage">semirings</remote-id>
+ <remote-id type="github">chessai/semirings</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/dev-haskell/semirings/semirings-0.6-r2.ebuild
b/dev-haskell/semirings/semirings-0.6-r2.ebuild
new file mode 100644
index 000000000000..1d556bcd783c
--- /dev/null
+++ b/dev-haskell/semirings/semirings-0.6-r2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+#hackport: flags: +containers,+unordered-containers
+
+CABAL_HACKAGE_REVISION=1
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="two monoids as one, in holy haskimony"
+HOMEPAGE="https://github.com/chessai/semirings";
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+ dev-haskell/base-compat-batteries:=[profile?]
+ >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.5
+ =dev-haskell/unordered-containers-0.2*:=[profile?]
+ >=dev-lang/ghc-8.10.6:=
+"
+DEPEND="
+ ${RDEPEND}
+ >=dev-haskell/cabal-3.2.1.0
+"
+
+src_configure() {
+ haskell-cabal_src_configure \
+ --flag=containers \
+ --flag=unordered-containers
+}
diff --git a/dev-haskell/semirings/semirings-0.6.ebuild
b/dev-haskell/semirings/semirings-0.6.ebuild
deleted file mode 100644
index 96e2fd6f602c..000000000000
--- a/dev-haskell/semirings/semirings-0.6.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.7.1.1.9999
-#hackport: flags: +containers,+unordered-containers
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-CABAL_HACKAGE_REVISION="1"
-inherit haskell-cabal
-
-DESCRIPTION="two monoids as one, in holy haskimony"
-HOMEPAGE="https://github.com/chessai/semirings";
-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 ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND="dev-haskell/base-compat-batteries:=[profile?]
- >=dev-haskell/hashable-1.1:=[profile?]
<dev-haskell/hashable-1.5:=[profile?]
- >=dev-haskell/unordered-containers-0.2:=[profile?]
<dev-haskell/unordered-containers-0.3:=[profile?]
- >=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
- >=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
-}
-
-src_configure() {
- haskell-cabal_src_configure \
- --flag=containers \
- --flag=unordered-containers
-}
