| 1 |
commit: dc4ac74a14401a57b9f7d85dfaf6d0c073d51004 |
| 2 |
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Aug 28 21:53:55 2022 +0000 |
| 4 |
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Aug 28 22:01:29 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc4ac74a |
| 7 |
|
| 8 |
net-mail/list-remote-forwards: add 0.0.3, drop 0.0.1-r2 |
| 9 |
|
| 10 |
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org> |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/26981 |
| 12 |
|
| 13 |
net-mail/list-remote-forwards/Manifest | 2 +- |
| 14 |
.../files/list-remote-forwards-0.0.1-ghc84.patch | 26 ---------------------- |
| 15 |
...r2.ebuild => list-remote-forwards-0.0.3.ebuild} | 19 ++++------------ |
| 16 |
3 files changed, 5 insertions(+), 42 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-mail/list-remote-forwards/Manifest b/net-mail/list-remote-forwards/Manifest |
| 19 |
index 90f3106e81b1..8070a53751a5 100644 |
| 20 |
--- a/net-mail/list-remote-forwards/Manifest |
| 21 |
+++ b/net-mail/list-remote-forwards/Manifest |
| 22 |
@@ -1 +1 @@ |
| 23 |
-DIST list-remote-forwards-0.0.1.tar.gz 25869 BLAKE2B decfd8b5d4fcbd5e278f9c58f79687aa33cc91d4d4907ff7a29fe6b745ff49c073e3beaf2876ec071f4ed1099b4575cacb8194049add04c0aa8ebeff3338293e SHA512 b6d8c0e8a72e3dcbc62c00b291da99da6c37c853997c367eb60db128db327c1f862e9dc6d9ad4028aad2e0cec9acc96add28d85d4b22508e1fd00a65bb9b0317 |
| 24 |
+DIST list-remote-forwards-0.0.3.tar.gz 26495 BLAKE2B 7bc0a02133dfabe0f27c7ed861bbb994757eadb4d55d369fdd143da7ef03fcadf7d1f11bb034fc8ade7dc879d4b615a3ae5ed44a1ed5af3e10f1aaffcd79210a SHA512 833bb0a3fda76b43d0004d7906c54aa21920f1db8ff50fc2c0d1da6f98dd49310041fa7101050108cb6cb803084fff0673316a1ce86224d35ba09e8060864a9d |
| 25 |
|
| 26 |
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 |
| 27 |
deleted file mode 100644 |
| 28 |
index bf21a42d5973..000000000000 |
| 29 |
--- a/net-mail/list-remote-forwards/files/list-remote-forwards-0.0.1-ghc84.patch |
| 30 |
+++ /dev/null |
| 31 |
@@ -1,26 +0,0 @@ |
| 32 |
---- a/src/OptionalConfiguration.hs |
| 33 |
-+++ b/src/OptionalConfiguration.hs |
| 34 |
-@@ -31,2 +31,3 @@ import System.IO.Error ( catchIOError ) |
| 35 |
- import MxList ( MxList(..) ) |
| 36 |
-+import qualified Data.Semigroup as S |
| 37 |
- |
| 38 |
-@@ -59,2 +60,19 @@ merge_maybes (Just _) (Just y) = Just y |
| 39 |
- |
| 40 |
-+instance S.Semigroup OptionalConfiguration where |
| 41 |
-+ cfg1 <> cfg2 = |
| 42 |
-+ OptionalConfiguration |
| 43 |
-+ (merge_maybes (database cfg1) (database cfg2)) |
| 44 |
-+ (merge_maybes (domain_query cfg1) (domain_query cfg2)) |
| 45 |
-+ all_excluded_mx |
| 46 |
-+ (merge_maybes (forward_query cfg1) (forward_query cfg2)) |
| 47 |
-+ (merge_maybes (host cfg1) (host cfg2)) |
| 48 |
-+ (merge_maybes (password cfg1) (password cfg2)) |
| 49 |
-+ (merge_maybes (port cfg1) (port cfg2)) |
| 50 |
-+ (merge_maybes (username cfg1) (username cfg2)) |
| 51 |
-+ where |
| 52 |
-+ -- Use only the latter exclude_mx if there are any. |
| 53 |
-+ all_excluded_mx = |
| 54 |
-+ exclude_mx $ if (null (get_mxs $ exclude_mx cfg2)) |
| 55 |
-+ then cfg1 |
| 56 |
-+ else cfg2 |
| 57 |
- |
| 58 |
|
| 59 |
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 |
| 60 |
similarity index 76% |
| 61 |
rename from net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r2.ebuild |
| 62 |
rename to net-mail/list-remote-forwards/list-remote-forwards-0.0.3.ebuild |
| 63 |
index 5f826c60fefc..3f6ac736d824 100644 |
| 64 |
--- a/net-mail/list-remote-forwards/list-remote-forwards-0.0.1-r2.ebuild |
| 65 |
+++ b/net-mail/list-remote-forwards/list-remote-forwards-0.0.3.ebuild |
| 66 |
@@ -1,7 +1,7 @@ |
| 67 |
# Copyright 1999-2022 Gentoo Authors |
| 68 |
# Distributed under the terms of the GNU General Public License v2 |
| 69 |
|
| 70 |
-EAPI=6 |
| 71 |
+EAPI=7 |
| 72 |
|
| 73 |
# ebuild generated by hackport 0.4.4 |
| 74 |
|
| 75 |
@@ -12,16 +12,14 @@ DESCRIPTION="List all remote forwards for mail accounts stored in a database" |
| 76 |
HOMEPAGE="https://hackage.haskell.org/package/list-remote-forwards" |
| 77 |
SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" |
| 78 |
|
| 79 |
-LICENSE="GPL-3" |
| 80 |
+LICENSE="AGPL-3" |
| 81 |
SLOT="0" |
| 82 |
KEYWORDS="~amd64 ~ppc64 ~x86" |
| 83 |
IUSE="" |
| 84 |
|
| 85 |
-RESTRICT=test # Ambiguous packages: dns-3.0.2 resolv-0.1.1.1 |
| 86 |
- |
| 87 |
RDEPEND="" |
| 88 |
DEPEND="${RDEPEND} |
| 89 |
- >=dev-haskell/cabal-1.16.0 |
| 90 |
+ >=dev-haskell/cabal-3.0.0 |
| 91 |
>=dev-haskell/cmdargs-0.10 |
| 92 |
>=dev-haskell/configurator-0.2 |
| 93 |
>=dev-haskell/dns-1.4 |
| 94 |
@@ -32,20 +30,11 @@ DEPEND="${RDEPEND} |
| 95 |
>=dev-haskell/tasty-0.8 |
| 96 |
>=dev-haskell/tasty-hunit-0.8 |
| 97 |
>=dev-haskell/tasty-quickcheck-0.8 |
| 98 |
- >=dev-lang/ghc-7.6.1 |
| 99 |
+ >=dev-lang/ghc-9.0.0 |
| 100 |
test? ( >=dev-haskell/doctest-0.9 |
| 101 |
>=dev-haskell/filemanip-0.3.6 ) |
| 102 |
" |
| 103 |
|
| 104 |
-PATCHES=( |
| 105 |
- "${FILESDIR}"/${P}-ghc84.patch |
| 106 |
-) |
| 107 |
- |
| 108 |
-src_prepare() { |
| 109 |
- sed -i -e "/-optc-O3/d" -e "/-optc-march=native/d" "${PN}.cabal" || die |
| 110 |
- default |
| 111 |
-} |
| 112 |
- |
| 113 |
src_install() { |
| 114 |
haskell-cabal_src_install |
| 115 |
doman "${S}/doc/man1/${PN}.1" |
Archives