gentoo auto-resync : 29:08:2022 - 04:45:37

3 files changed, 8 insertions, 41 deletions

diff --git a/net-mail/list-remote-forwards/Manifest b/net-mail/list-remote-forwards/Manifest
index 47f8daf228a5..1ddff1d18bde 100644
--- a/net-mail/list-remote-forwards/Manifest
+++ b/net-mail/list-remote-forwards/Manifest
@@ -1,4 +1,3 @@
-AUX list-remote-forwards-0.0.1-ghc84.patch 978 BLAKE2B 295f2ca369794739da3ff45bf6a5ca57b102942c93b8dd8c4e99d9a70906a469c761aa0fdbe50311d6e56d5bb0725610dd473c49152f4cdd3462cd2da2a8418d SHA512 4f9addb938b14590d98e4e17e6764987ebe4192d7492de1ce2c917881ec20ecd15898988c223dac695ed8f71d7b2fe74f8b798a52960f215fd4c9c9a02c9a72e
-DIST list-remote-forwards-0.0.1.tar.gz 25869 BLAKE2B decfd8b5d4fcbd5e278f9c58f79687aa33cc91d4d4907ff7a29fe6b745ff49c073e3beaf2876ec071f4ed1099b4575cacb8194049add04c0aa8ebeff3338293e SHA512 b6d8c0e8a72e3dcbc62c00b291da99da6c37c853997c367eb60db128db327c1f862e9dc6d9ad4028aad2e0cec9acc96add28d85d4b22508e1fd00a65bb9b0317
-EBUILD list-remote-forwards-0.0.1-r2.ebuild 1098 BLAKE2B e378f6538393fcd77aa3789734f8ce4eb8d8545cdd246f06b6a7ebad4a9d928616d0cafff2b7fb8abe790d42773218397be7293bcf331fce2d1dbebec0a273fe SHA512 4f580e297e26d3f0f4e984e822d0447d53e5c4c071961165f53b4d47a6f4bc730670c808961329aaaa129c2eb8fd7a4256c9b12777604729998fa7f622793f48
+DIST list-remote-forwards-0.0.3.tar.gz 26495 BLAKE2B 7bc0a02133dfabe0f27c7ed861bbb994757eadb4d55d369fdd143da7ef03fcadf7d1f11bb034fc8ade7dc879d4b615a3ae5ed44a1ed5af3e10f1aaffcd79210a SHA512 833bb0a3fda76b43d0004d7906c54aa21920f1db8ff50fc2c0d1da6f98dd49310041fa7101050108cb6cb803084fff0673316a1ce86224d35ba09e8060864a9d
+EBUILD list-remote-forwards-0.0.3.ebuild 998 BLAKE2B f096347ce8d137ac047147a1b3f80b00af29001a83181082f937d24a2d05a66ed3ad752b0e8ac285a80124708149185ddc6aed17f33831dfdb6afa0441145f25 SHA512 40497b089aa21b2129c320d27ead8aa26429fdb51b4f8b06c619c65739e95abfe82c2c28430fc543cb46b7af8b2bc2c89f64357c044d0798a1322f8da34172ee
 MISC metadata.xml 4176 BLAKE2B ebc5feaa3fbc0cf1551aa2e80bb4e971918181f16e8b365c99297789d41b6dec7f138d2ccfb7ee69972e026299ad5b2e554ce3e136232af0f5eb4c46790bfb2e SHA512 277cc5c1b55a8890e26adf5762d4cd522dbbe81c9eaa0eb6a8126e2ddbbf3919bbac703e22fab0f924c08fd656d23dda4a74c48db26323552b1cc1595b6062af
diff --git a/net-mail/list-remote-forwards/files/list-remote-forwards-0.0.1-ghc84.patch b/net-mail/list-remote-forwards/files/list-remote-forwards-0.0.1-ghc84.patch
deleted file mode 100644
index bf21a42d5973..000000000000
--- a/net-mail/list-remote-forwards/files/list-remote-forwards-0.0.1-ghc84.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/src/OptionalConfiguration.hs
-+++ b/src/OptionalConfiguration.hs
-@@ -31,2 +31,3 @@ import System.IO.Error ( catchIOError )
- import MxList ( MxList(..) )
-+import qualified Data.Semigroup as S
- 
-@@ -59,2 +60,19 @@ merge_maybes (Just _) (Just y) = Just y
- 
-+instance S.Semigroup OptionalConfiguration where
-+  cfg1 <> cfg2 =
-+    OptionalConfiguration
-+      (merge_maybes (database cfg1) (database cfg2))
-+      (merge_maybes (domain_query cfg1) (domain_query cfg2))
-+      all_excluded_mx
-+      (merge_maybes (forward_query cfg1) (forward_query cfg2))
-+      (merge_maybes (host cfg1) (host cfg2))
-+      (merge_maybes (password cfg1) (password cfg2))
-+      (merge_maybes (port cfg1) (port cfg2))
-+      (merge_maybes (username cfg1) (username cfg2))
-+    where
-+      -- Use only the latter exclude_mx if there are any.
-+      all_excluded_mx =
-+        exclude_mx $ if (null (get_mxs $ exclude_mx cfg2))
-+                     then cfg1
-+                     else cfg2
- 
diff --git a/net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r2.ebuild b/net-mail/list-remote-forwards/list-remote-forwards-0.0.3.ebuild
index 9eaad075cb50..3f6ac736d824 100644
--- a/net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r2.ebuild
+++ b/net-mail/list-remote-forwards/list-remote-forwards-0.0.3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 # ebuild generated by hackport 0.4.4
 
@@ -12,16 +12,14 @@ DESCRIPTION="List all remote forwards for mail accounts stored in a database"
 HOMEPAGE="https://hackage.haskell.org/package/list-remote-forwards"
 SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
-LICENSE="GPL-3"
+LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
-RESTRICT=test # Ambiguous packages: dns-3.0.2 resolv-0.1.1.1
-
 RDEPEND=""
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.16.0
+	>=dev-haskell/cabal-3.0.0
 	>=dev-haskell/cmdargs-0.10
 	>=dev-haskell/configurator-0.2
 	>=dev-haskell/dns-1.4
@@ -32,15 +30,11 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/tasty-0.8
 	>=dev-haskell/tasty-hunit-0.8
 	>=dev-haskell/tasty-quickcheck-0.8
-	>=dev-lang/ghc-7.6.1
+	>=dev-lang/ghc-9.0.0
 	test? ( >=dev-haskell/doctest-0.9
 		>=dev-haskell/filemanip-0.3.6 )
 "
 
-PATCHES=(
-	"${FILESDIR}"/${P}-ghc84.patch
-)
-
 src_install() {
 	haskell-cabal_src_install
 	doman "${S}/doc/man1/${PN}.1"