gentoo auto-resync : 23:10:2023 - 08:35:49

4 files changed, 43 insertions, 50 deletions

diff --git a/dev-haskell/semirings/Manifest b/dev-haskell/semirings/Manifest
index 26cb389e21c4..707f94715356 100644
--- a/dev-haskell/semirings/Manifest
+++ b/dev-haskell/semirings/Manifest
@@ -1,4 +1,4 @@
-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
-EBUILD semirings-0.6.ebuild 1331 BLAKE2B 9eb52aa534d93ae3e98a30b59659eb2bc8b0f3f2cb638e48f1efb2ec3b33d9fdab9d3596d3835b06c8ffbfd8b0b129003a640add2f3a677252e91af7757c49ce SHA512 ef405a766dd9e52308e675588f4ef5d33c6176751de52079df386ba93e7b4c0a15e87dfe235c6423618ff3d845132497e4225bc58c2e0ce7f875f7a336c78b3a
-MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
+EBUILD semirings-0.6-r2.ebuild 844 BLAKE2B cd2ed176b291713e60e661e0732cf0c422542d7424e156e40a808c313061fefbca5076abf09b7f4d1d036ab5ddfe68deacfaf08d7fcc80ccb1e735b0bbec8f1a SHA512 ca8edd83fe88ee77be6760f6e160b3bec9fc09eaf5b66e1aaf2da50d6cb5d7b9a3532a8e9b11924caa70e7a28fe7e3651775c5dc7d6ffd3bf582dbf1471f9fb2
+MISC metadata.xml 382 BLAKE2B 02c56efdbb1764cb3ff787e9e16f20cde0dbd1c5bed347b6680c5f408912aadb3b02bad6de45ac6f791309d0b4fda4d97d63807b9d8647ccd403ff50864859a4 SHA512 14c2cc95202aa606d3f1b451aaba7b0ac14fed262e4d1b1c9f3c0b0cc6490861cb75facbd323897b5c58d6cc8ada854b329a8bf8c9442e3ce436b5dd03ea17c3
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>haskell@gentoo.org</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
-}