gentoo resync : 25.08.2020

8 files changed, 55 insertions, 215 deletions

diff --git a/dev-haskell/missingh/Manifest b/dev-haskell/missingh/Manifest
index e05992fd9f4a..103ec63dc894 100644
--- a/dev-haskell/missingh/Manifest
+++ b/dev-haskell/missingh/Manifest
@@ -1,9 +1,3 @@
-AUX missingh-1.2.0.2-ghc-7.7.patch 1713 BLAKE2B 210d5e03c921e3dd645144b5b82d8dd004aa202ff0b8d6807dedbfe6a1fdfdb141b5804bd7e2c847cedf8458e6324b9c5b9b837e8ed43138eb426b63c098e232 SHA512 a34f0a449a77b4e08e9198c5b58965bfdd3acf2e72fbea2ff8a6b0370254ce6f61cc5d012a2abcf33cba3d884a01b614ff96a69065ada0599fdd7613c100b613
-AUX missingh-1.3.0.1-ghc-8.0.patch 1293 BLAKE2B a7399a61fc8f2ddde96fd323b9193ec160de17b3b549d348a27ea75468f3e18ecc2cdc4ec0fa57f17554824771a3a354cbbde60018dca8cb71d4c522c8521f78 SHA512 7bcf4252f2d102c9aae8717cc5d389aebaaefff7382b7b93d48a54419a2b48d90d7f86d76f31d1f38c1d2ff3bd8e627eaf6c1155c61cd047600930e635ae5ca6
-DIST MissingH-1.2.0.2.tar.gz 115774 BLAKE2B ae1e4db5de9c9559f9687bfed16e52dba3fe782e6ce33e72bb60fe1cd5044cc70b0f839064144711c0f5863786c75ec34b17acd1449a8ca7387a5596185594e2 SHA512 148146468688d855af988874b28ec3e3ebafb99b8168d50734294ecc5400c832826e11c9714727f83381979f8f8a7c6e7bf6479e582e484ec0abcb741d22a0a9
-DIST MissingH-1.2.1.0.tar.gz 116445 BLAKE2B 66d319c3bdb883eb5a8349c6bf98cd119b143fb4180c3f3376f136d2fd398666ef92a47164516a33a7f7fe3a5da5ba41ffe1998b715168c27f0466dd042e09e6 SHA512 54ad72973ef20a2eb6a0e72ae8ff496ee48d359ba491bf094957737e02fce217fb00e950735f8c0b36a7fe48a7322a122e447b0c67e0205e8d1b6450ac4df3e3
-DIST MissingH-1.3.0.1.tar.gz 116812 BLAKE2B f2b17ed9df625558bf05719e490547f4fd605a494922d1b8daf0602fe913346a1e028940e63645de2c786339555b4480bce237f6ae613a2741d0d81acb75ec7c SHA512 e7c6f95d5437d86516f9aba79026b2abdd5131917a09da452623be68b2377067f8f093412c9919ebc904c4e61d43e755282d5bb333596de935c705958111dcf3
-EBUILD missingh-1.2.0.2.ebuild 1324 BLAKE2B 8efe25c9dd6f02464705a6e8484ab6d53a59325f5b4cca84e11b15bc7dfaad9b2c49e743d6f9cad8cc796ce35e2f6178130546055010323e52d79a8a8491beb0 SHA512 675d5bc886785443f7cce0125459578d7d67f361714312da890eefe558d32e07b336cd8d7df571e3cd28429691a179fb63530a6a685efdf9e1a5fc9c8339eced
-EBUILD missingh-1.2.1.0.ebuild 943 BLAKE2B 38ebd7f6501ca555d50cbb16c202fc11b939e9537dafe5e5e08f4022fb6e8feea465669e3a58c65b977d5c2d2af22262814b52803150d237f80eefb3236a74c8 SHA512 a49d4f7bdd1c03f6808b52073b124c25e501cb77743add82d684fd4c9ebdfefffd567a8e3fcfff312b3a054cafa10995936b497e472190014f7840a71ae409ef
-EBUILD missingh-1.3.0.1.ebuild 1045 BLAKE2B bb3a23c8ecc76f3d40495d0eee52c3d028fddcf35fd5b669bc633f5e6293af90f325ffb9c6933e5f7544bc9657f057fb0e9f3e8cb433fe96e20dc78d3caaec3c SHA512 672dadde94b5008b5e698dbe00948f0d75fca799ff79b09ece312e4f20c4d85a95ecf0e4d012536b770bc4acd8b0aee02a74fa1d1f4ae01c5e7c965ecabe1fb7
-MISC metadata.xml 309 BLAKE2B 38a21e309ee9c95cb23ae88096df03c3d4abae37fe26b0ba4539ed254003ac1b1388d7b900ba38f8685133016edb3ea6b41c01b162d6310cc5d386e4e6d76dac SHA512 02afac1cf4005fbf51a79f989e031521fbb4860a96a70dab38f8821e8c7e18f15d54a6f856a93f628cea60f8493b06e3094bebac67a977477e66df0b89b8c8bc
+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 374 BLAKE2B d6a62a349daae36cd69a91d56db0d25327fdbf018566b5dd5221a0c596a9658bb7b3935345b8aa6cc751c3304f3515c676376b6af8232ea8c55953b14449af4d SHA512 a92763db9fc45ad5465ff832c70f98430f2c702ea2fa4227ba1a4e9a68ce19c2502feb59da6cf379068973334716787b007c58db769e97e86fb50546256f58c0
diff --git a/dev-haskell/missingh/files/missingh-1.2.0.2-ghc-7.7.patch b/dev-haskell/missingh/files/missingh-1.2.0.2-ghc-7.7.patch
deleted file mode 100644
index 0b249462fa51..000000000000
--- a/dev-haskell/missingh/files/missingh-1.2.0.2-ghc-7.7.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- MissingH-1.2.0.2-orig/src/System/Cmd/Utils.hs	2013-08-22 00:35:27.000000000 +1000
-+++ MissingH-1.2.0.2/src/System/Cmd/Utils.hs	2013-09-28 01:17:29.697333968 +1000
-@@ -325,7 +325,11 @@
-                 Just (Exited (ExitSuccess)) -> return ()
-                 Just (Exited (ExitFailure fc)) ->
-                     cmdfailed funcname fp args fc
-+#if (__GLASGOW_HASKELL__ >= 707)
-+                Just (Terminated sig _) ->
-+#else
-                 Just (Terminated sig) ->
-+#endif
-                     warnfail fp args $ "Terminated by signal " ++ show sig
-                 Just (Stopped sig) ->
-                     warnfail fp args $ "Stopped by signal " ++ show sig
-@@ -351,7 +355,11 @@
-        case ec of
-             Exited ExitSuccess -> return ()
-             Exited (ExitFailure fc) -> cmdfailed "safeSystem" command args fc
-+#if (__GLASGOW_HASKELL__ >= 707)
-+            Terminated s _ -> cmdsignalled "safeSystem" command args s
-+#else
-             Terminated s -> cmdsignalled "safeSystem" command args s
-+#endif
-             Stopped s -> cmdsignalled "safeSystem" command args s
- #endif
- 
---- MissingH-1.2.0.2-orig/testsrc/Eithertest.hs	2013-08-22 00:35:27.000000000 +1000
-+++ MissingH-1.2.0.2/testsrc/Eithertest.hs	2013-09-28 01:19:32.177332800 +1000
-@@ -6,6 +6,7 @@
- For license and copyright information, see the file LICENSE
- 
- -}
-+{-# LANGUAGE CPP #-}
- 
- module Eithertest(tests) where
- import Test.HUnit
-@@ -13,8 +14,10 @@
- import Test.HUnit.Tools
- import Control.Exception
- 
-+#if (__GLASGOW_HASKELL__ < 707)
- instance Eq ErrorCall where
-     (ErrorCall x) == (ErrorCall y) = x == y
-+#endif
- 
- test_maybeToEither =
-     let f msg inp exp = TestLabel msg $ TestCase $ assertEqual "" exp inp in
diff --git a/dev-haskell/missingh/files/missingh-1.3.0.1-ghc-8.0.patch b/dev-haskell/missingh/files/missingh-1.3.0.1-ghc-8.0.patch
deleted file mode 100644
index ac4563960636..000000000000
--- a/dev-haskell/missingh/files/missingh-1.3.0.1-ghc-8.0.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- MissingH-1.3.0.1-orig/src/Data/BinPacking.hs	2014-10-28 23:46:24.000000000 +1100
-+++ MissingH-1.3.0.1/src/Data/BinPacking.hs	2016-04-20 10:23:16.403505044 +1000
-@@ -69,7 +69,7 @@
- > [(size, obj)] is the sizes and objects
- > result is Either error or results
- -}
--type BinPacker = (Num size, Ord size, Show size, Show obj) => 
-+type BinPacker = forall size obj . (Num size, Ord size, Show size, Show obj) => 
-                   [size]        -- The sizes of bins
-                -> [(size, obj)] -- The sizes and objects
-                -> Either (BinPackerError size obj) [[(size, obj)]] -- Either error or results
---- MissingH-1.3.0.1-orig/src/System/IO/HVFS.hs	2014-10-28 23:46:24.000000000 +1100
-+++ MissingH-1.3.0.1/src/System/IO/HVFS.hs	2016-04-24 18:50:36.893741944 +1000
-@@ -60,7 +60,10 @@
- import System.IO.PlafCompat
- import System.Posix.Types
- import System.Time
--import System.Directory
-+import System.Directory (createDirectory, doesDirectoryExist, doesFileExist,
-+                         getCurrentDirectory, getDirectoryContents, getModificationTime,
-+                         removeDirectory, removeFile, renameDirectory,
-+                         renameFile, setCurrentDirectory)
- 
- #if MIN_VERSION_directory(1,2,0)
- import Data.Time.Clock.POSIX ( utcTimeToPOSIXSeconds )
diff --git a/dev-haskell/missingh/metadata.xml b/dev-haskell/missingh/metadata.xml
index d3ff43ef4921..c06a693b89c3 100644
--- a/dev-haskell/missingh/metadata.xml
+++ b/dev-haskell/missingh/metadata.xml
@@ -4,6 +4,9 @@
   <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>
diff --git a/dev-haskell/missingh/missingh-1.2.0.2.ebuild b/dev-haskell/missingh/missingh-1.2.0.2.ebuild
deleted file mode 100644
index 7b5d141a05ce..000000000000
--- a/dev-haskell/missingh/missingh-1.2.0.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit base haskell-cabal
-
-MY_PN="MissingH"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Large utility library"
-HOMEPAGE="http://software.complete.org/missingh"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="dev-haskell/hslogger:=[profile?]
-	dev-haskell/hunit:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/regex-compat:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	virtual/libiconv
-	>=dev-haskell/cabal-1.8.0.2
-	test? ( dev-haskell/quickcheck
-		dev-haskell/testpack )
-"
-
-# libiconv is needed for the trick below to make it compile with ghc-6.12
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=("${FILESDIR}/${PN}-1.2.0.2-ghc-7.7.patch")
-
-src_prepare() {
-	base_src_prepare
-	# (non-ASCII non-UTF-8 source breaks hscolour)
-	cd src/System/Time
-	mv ParseDate.hs ParseDate.hs.ISO-8859-1
-	iconv -f ISO-8859-1 -t UTF-8 -c ParseDate.hs.ISO-8859-1 > ParseDate.hs || die "unable to recode ParseDate.hs to UTF-8"
-}
diff --git a/dev-haskell/missingh/missingh-1.2.1.0.ebuild b/dev-haskell/missingh/missingh-1.2.1.0.ebuild
deleted file mode 100644
index 99bcc7bbed06..000000000000
--- a/dev-haskell/missingh/missingh-1.2.1.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.6.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="MissingH"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Large utility library"
-HOMEPAGE="http://software.complete.org/missingh"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="dev-haskell/hslogger:=[profile?]
-	dev-haskell/hunit:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/regex-compat:=[profile?]
-	>=dev-lang/ghc-6.12.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8.0.2
-	test? ( dev-haskell/errorcall-eq-instance
-		dev-haskell/quickcheck
-		dev-haskell/testpack )
-"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-haskell/missingh/missingh-1.3.0.1.ebuild b/dev-haskell/missingh/missingh-1.3.0.1.ebuild
deleted file mode 100644
index 7c5973af14b6..000000000000
--- a/dev-haskell/missingh/missingh-1.3.0.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.4.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-inherit haskell-cabal
-
-MY_PN="MissingH"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Large utility library"
-HOMEPAGE="https://github.com/jgoerzen/missingh/wiki"
-SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="dev-haskell/hslogger:=[profile?]
-	dev-haskell/hunit:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	dev-haskell/network:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/random:=[profile?]
-	dev-haskell/regex-compat:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-	test? ( dev-haskell/errorcall-eq-instance
-		dev-haskell/quickcheck
-		dev-haskell/testpack )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-1.3.0.1-ghc-8.0.patch"
-}
diff --git a/dev-haskell/missingh/missingh-1.4.3.0.ebuild b/dev-haskell/missingh/missingh-1.4.3.0.ebuild
new file mode 100644
index 000000000000..102bc03f9c1d
--- /dev/null
+++ b/dev-haskell/missingh/missingh-1.4.3.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 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
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="MissingH"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Large utility library"
+HOMEPAGE="https://hackage.haskell.org/package/MissingH"
+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"
+
+RESTRICT=test # tests are present for removed modules
+
+RDEPEND=">=dev-haskell/hslogger-1.3.0.0:=[profile?] <dev-haskell/hslogger-1.4:=[profile?]
+	>=dev-haskell/mtl-1.1.1.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=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/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?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.12
+	test? ( >=dev-haskell/errorcall-eq-instance-0.3 <dev-haskell/errorcall-eq-instance-0.4
+		>=dev-haskell/hunit-1.6 <dev-haskell/hunit-1.7 )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag network-3 network--ge-3_0_0)
+}