gentoo auto-resync : 30:07:2022 - 09:09:33

4 files changed, 51 insertions, 69 deletions

diff --git a/dev-haskell/semirings/Manifest b/dev-haskell/semirings/Manifest
index bfbc6610249b..9c3e863d6c4e 100644
--- a/dev-haskell/semirings/Manifest
+++ b/dev-haskell/semirings/Manifest
@@ -1,3 +1,4 @@
-DIST semirings-0.5.4.tar.gz 18490 BLAKE2B d3d67bca474ae7cbf3e016ef17da5ead593250d9cdda051a0fcd84bdb142ced3af74a0f287921e6edcde9916dea4d128f11cc77d8a65bff85470d533565e4749 SHA512 d24a178031e494e1b337585272e0cc960da7935007affc0fea893fe1cac0acd79569a6d8dc9cfddbb7f435a48c34b7aa0d6e589a16741c7c9b5fe00d52b95441
-EBUILD semirings-0.5.4.ebuild 1046 BLAKE2B bdf5a6bba062023d5eb94f1c09171393ac75ef677a988e3095182581c12a6901c45496b9a877ee5dcd16c27456b3081888046e151da726d619cf9d43a7a9d11c SHA512 a06ce8d7f6e2d7da0cf0495aebdfad85524f166cb6776f319f87095d87b8ef8818ce0e4ee7905e3a19c7b45095aa798bbeecb797e0466dfa415f99e55b83fed6
-MISC metadata.xml 1641 BLAKE2B a618c1318d0a716c6a2cb62e8ce0357c940a39f2810cc71e4ddd2b698f811dd7f119078156e7fb8456eecd38553974450bf777d0645941f27ec9083b6c7f2b1a SHA512 6bfea836b89bbaf61efa35acf0f9a83849c5ad0ae00c3d37fe995ed6ff86976cce40b41dd4eca9f4d35ca51820586d36f44f82f30866162093bcdd565a8ffedb
+DIST semirings-0.6.cabal 2668 BLAKE2B d1c1293a9f2ad63caf291bd1e409afef54815815ea3e750cc915a4872725f8d1f69fdf7097fd724f8f4762a98f9b36653b38df900a31c4fef775615c7031e838 SHA512 1b2afdf824ff308726b258b82cc9b18718da01795bcfae23c073dfb484faa1a44ee59af479a8719ed950e5811bbdce64bea4e7b7a0cf59986c24f89e256de156
+DIST semirings-0.6.tar.gz 19640 BLAKE2B 9cd6d17cfdc2fde31741a6db085d972fd8ed131ad003102c1b4991e8157f4b22a05508306c64b1a4f730ce1f99e3d40861b60332689d9b16e122c3ff59a80e0c SHA512 01675527d47b5283ae6beb6feb38b4a5527a46a780b75e4b712c0b1e4b57218fa8238ba100a20947a2e2b53c4a314ad4e1a71f989bd5194fe6378dba048c870c
+EBUILD semirings-0.6.ebuild 1318 BLAKE2B 78c568bf0e276034952bc277559c3525a3c3c0efa62bd80ccf3dfb4d6d7ea018e4e8a8178e5fdaf721344e71556745448e89c5532a97ec66e88be12a6072fec7 SHA512 6cfec416f4f3babbc8459255b5a0a8dcf1f869d276da241ba0fdae48bc19f1a361d5c0ccf27582be89b3476ac87ef32c9ebb592398454340b0982349323ccd7f
+MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/semirings/metadata.xml b/dev-haskell/semirings/metadata.xml
index 7695d99e80cf..937381521944 100644
--- a/dev-haskell/semirings/metadata.xml
+++ b/dev-haskell/semirings/metadata.xml
@@ -5,36 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<use>
-		<flag name="hashable">
-			Enisable the use of the `hashable` package. Disabling this may be useful
-			for accelerating builds in sandboxes for expert users.
-			Note: `-hashable` implies `-unordered-containers`, as we are necessarily
-			not able to supply those instances as well.
-		</flag>
-		<flag name="containers">
-			Enable the use of the `containers` package. Disabling this may be useful
-			for accelerating builds in sandboxes for expert users.
-		</flag>
-		<flag name="unordered-containers">
-			Enable the use of the `unordered-containers` package. Disabling this may
-			be useful for accelerating builds in sandboxes for expert users.
-		</flag>
-	</use>
-	<longdescription>
-		Haskellers are usually familiar with monoids and semigroups. A monoid has an appending operation `&lt;&gt;` (or `mappend`),
-		and an identity element, `mempty`. A semigroup has an appending `&lt;&gt;` operation, but does not require a `mempty` element.
-		
-		A Semiring has two appending operations, `plus` and `times`, and two respective identity elements, `zero` and `one`.
-		
-		More formally, a Semiring R is a set equipped with two binary relations `+` and `*`, such that:
-		
-		(R,+) is a commutative monoid with identity element 0,
-		
-		(R,*) is a monoid with identity element 1,
-		
-		(*) left and right distributes over addition, and
-		
-		multiplication by '0' annihilates R.
-	</longdescription>
 </pkgmetadata>
diff --git a/dev-haskell/semirings/semirings-0.5.4.ebuild b/dev-haskell/semirings/semirings-0.5.4.ebuild
deleted file mode 100644
index 37ae6599ef4c..000000000000
--- a/dev-haskell/semirings/semirings-0.5.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-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"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+containers +hashable +unordered-containers"
-
-RDEPEND="dev-haskell/base-compat-batteries:=[profile?]
-	>=dev-lang/ghc-7.10.1:=[gmp]
-	hashable? ( >=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
-			unordered-containers? ( >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] ) )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.22.2.0
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag containers containers) \
-		$(cabal_flag hashable hashable) \
-		$(cabal_flag unordered-containers unordered-containers)
-}
diff --git a/dev-haskell/semirings/semirings-0.6.ebuild b/dev-haskell/semirings/semirings-0.6.ebuild
new file mode 100644
index 000000000000..dea5b95c40f1
--- /dev/null
+++ b/dev-haskell/semirings/semirings-0.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 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 ~ppc64 ~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
+}