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

3 files changed, 28 insertions, 20 deletions

diff --git a/dev-haskell/missingh/Manifest b/dev-haskell/missingh/Manifest
index 4067ffc7a98a..e8e3f5b691f0 100644
--- a/dev-haskell/missingh/Manifest
+++ b/dev-haskell/missingh/Manifest
@@ -1,3 +1,3 @@
 DIST MissingH-1.4.3.0.tar.gz 107358 BLAKE2B fa6cf7efd1a60defce6ec0e6bbee229b71f5afe4140cca31dd47c54fbeb8a2a7b0f3e41e4ccba3e010ab85c21fad4d9bb392bd4481a01a945a77de7366b6eae6 SHA512 eb42ad9fd09347d2ec661f8181c6d2c95fb4f9f05634373ac27b377508056afd909b4925f725b9e11441ee9877b66b46038005e469d0b754f8f6cb1cda66d1dc
-EBUILD missingh-1.4.3.0.ebuild 1802 BLAKE2B a9565127b5c652ca83e79bac95d7c8ba673c539b3e60288086904c59eccf8d00997bc03a0ed1e91675de8daaed5c15115e3c8799673f8acfa3a2e1b57c381281 SHA512 0bf184d531fe9dccfa00557550d3356f17b00fd563e41b3b952b4c2bb2dd5410e42dd903d583f97b54a468d3ef218c46de77520c017b69be68af587ef71f93f0
-MISC metadata.xml 375 BLAKE2B eee19d2ac2e127d4cdf73b7208ed1aae0db0f77de0e9fa97e720bd112bc982de7d7ec6af924ec5e99e91cfaaad9c2ce12190017cfce9f08ddf2a71e10916ed0b SHA512 c47354834a6763e1b5c69290d8aec9d78b3f2232828cea01b160052bd2d674fa5c4b25477e40ead35c8cff5f1d4545d001048167836d0a3d830008417ff749ff
+EBUILD missingh-1.4.3.0-r1.ebuild 1770 BLAKE2B 35cf8eabb4c5eb43c09c2675c08e773032f2d11a8e529ff72396897fde5a42684d35772dd949ad6da6f598cde3cdafe6b047b66abcf6aff893ccb175229590de SHA512 a62c18174577d1ed927fe8e5890875a748e993af9fb39749a9f5ec5c869b723276bfbc9901542bd624c21bfe4800a24a10f5948cd1de967a869946c63b5d8637
+MISC metadata.xml 544 BLAKE2B 998eb783069a5ea57ad421980aeffae4c10de64bf30a6626e330a371cde2bcfb32a496840c5708e86a97a202e9bb9abdff93c1ff249ee09f1691ca55b67a54eb SHA512 99aaed1f41668eb70a2e848717e6dca89014118a669d6a93e4fd71b9639262b8a67659df1fcae49f898106bb965b4831ad57afa9d9b5bcd573a7dd25e151be24
diff --git a/dev-haskell/missingh/metadata.xml b/dev-haskell/missingh/metadata.xml
index 2139218ddd52..a15becf07ceb 100644
--- a/dev-haskell/missingh/metadata.xml
+++ b/dev-haskell/missingh/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>haskell@gentoo.org</email>
-  </maintainer>
-  <use>
-    <flag name="network-3">Use network-3</flag>
-  </use>
-  <upstream>
-    <remote-id type="github">jgoerzen/missingh</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		MissingH is a library of all sorts of utility functions for
+		Haskell programmers.  It is written in pure Haskell and thus should
+		be extremely portable and easy to use.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">jgoerzen/missingh</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/missingh/missingh-1.4.3.0.ebuild b/dev-haskell/missingh/missingh-1.4.3.0-r1.ebuild
index 102bc03f9c1d..a307a2039f37 100644
--- a/dev-haskell/missingh/missingh-1.4.3.0.ebuild
+++ b/dev-haskell/missingh/missingh-1.4.3.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 # ebuild generated by hackport 0.6.4.9999
-#hackport: flags: network--ge-3-0-0:network-3
+#hackport: flags: +network--ge-3-0-0
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -18,8 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="+network-3"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux"
 
 RESTRICT=test # tests are present for removed modules
 
@@ -28,12 +27,11 @@ RDEPEND=">=dev-haskell/hslogger-1.3.0.0:=[profile?] <dev-haskell/hslogger-1.4:=[
 	>=dev-haskell/old-locale-1.0:=[profile?] <dev-haskell/old-locale-1.1:=[profile?]
 	>=dev-haskell/old-time-1.1:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
 	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-haskell/random-1.0.1.1:=[profile?] <dev-haskell/random-1.2:=[profile?]
+	dev-haskell/random
 	>=dev-haskell/regex-compat-0.95.1:=[profile?] <dev-haskell/regex-compat-0.96:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
-	network-3? ( >=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2:=[profile?]
-				>=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?] )
-	!network-3? ( >=dev-haskell/network-2.6.3.1:=[profile?] <dev-haskell/network-2.9:=[profile?] )
+	>=dev-haskell/network-3.0:=[profile?] <dev-haskell/network-3.2:=[profile?]
+	>=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?]
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.12
@@ -43,7 +41,14 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	default
+	cabal_chdeps \
+		'base                >= 4.5.0.0 && < 4.15' 'base                >= 4.5.0.0' \
+		'random              >= 1.0.1.1 && < 1.2' 'random'
+}
+
 src_configure() {
 	haskell-cabal_src_configure \
-		$(cabal_flag network-3 network--ge-3_0_0)
+		--flag=network--ge-3_0_0
 }