diff options
author | Repository mirror & CI <repomirrorci@gentoo.org> | 2022-08-28 22:31:47 +0000 |
---|---|---|
committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2022-08-28 22:31:47 +0000 |
commit | d238711220c59540fa43cb4f583086d359fed975 (patch) | |
tree | a788331c4377b1caf9501ba655fd88e368107a31 | |
parent | 2022-08-28 22:20:24 UTC (diff) | |
parent | net-mail/mailbox-count: add 0.0.6, drop 0.0.5 (diff) | |
download | gentoo-d238711220c59540fa43cb4f583086d359fed975.tar.gz gentoo-d238711220c59540fa43cb4f583086d359fed975.tar.bz2 gentoo-d238711220c59540fa43cb4f583086d359fed975.zip |
Merge updates from master
17 files changed, 38 insertions, 70 deletions
diff --git a/dev-haskell/configurator/configurator-0.3.0.0-r1.ebuild b/dev-haskell/configurator/configurator-0.3.0.0-r1.ebuild index 6fbdc4a01a11..4139b3a7ef3b 100644 --- a/dev-haskell/configurator/configurator-0.3.0.0-r1.ebuild +++ b/dev-haskell/configurator/configurator-0.3.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-haskell/attoparsec-0.10.0.2:=[profile?] diff --git a/dev-haskell/convertible/convertible-1.1.1.0.ebuild b/dev-haskell/convertible/convertible-1.1.1.0.ebuild index f45791f8a35d..c7e8e872d1aa 100644 --- a/dev-haskell/convertible/convertible-1.1.1.0.ebuild +++ b/dev-haskell/convertible/convertible-1.1.1.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -15,7 +15,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~x86" IUSE="" RDEPEND="dev-haskell/mtl:=[profile?] diff --git a/dev-haskell/dns/dns-4.0.1.ebuild b/dev-haskell/dns/dns-4.0.1.ebuild index 18e2a2d7703f..6b0b8beb8d5c 100644 --- a/dev-haskell/dns/dns-4.0.1.ebuild +++ b/dev-haskell/dns/dns-4.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~x86" IUSE="" RESTRICT=test # uses internet to test resolver diff --git a/dev-haskell/filemanip/filemanip-0.3.6.3.ebuild b/dev-haskell/filemanip/filemanip-0.3.6.3.ebuild index bc5f91a4df5e..58e0c162de50 100644 --- a/dev-haskell/filemanip/filemanip-0.3.6.3.ebuild +++ b/dev-haskell/filemanip/filemanip-0.3.6.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~x86" IUSE="" RDEPEND="dev-haskell/mtl:=[profile?] diff --git a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild index 829c73553edb..fe3a0775516b 100644 --- a/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild +++ b/dev-haskell/hdbc-postgresql/hdbc-postgresql-2.5.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz" LICENSE="BSD" SLOT="2/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-db/postgresql-7:* diff --git a/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild b/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild index 5cb19571040f..a1f6e8fb6a5c 100644 --- a/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild +++ b/dev-haskell/hdbc-sqlite3/hdbc-sqlite3-2.3.3.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~x86" IUSE="+splitbase" RDEPEND=">=dev-db/sqlite-3.0 diff --git a/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild b/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild index 90831462697a..0211d08448d8 100644 --- a/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild +++ b/dev-haskell/hdbc/hdbc-2.4.0.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,7 +18,7 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz" LICENSE="BSD" SLOT="2/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~x86" IUSE="" RESTRICT="test" # Requires unmaintaned dev-haskell/testpack diff --git a/dev-util/shelltestrunner/shelltestrunner-1.9.ebuild b/dev-util/shelltestrunner/shelltestrunner-1.9.ebuild index 08c5a41f64ef..72b8f6338c5c 100644 --- a/dev-util/shelltestrunner/shelltestrunner-1.9.ebuild +++ b/dev-util/shelltestrunner/shelltestrunner-1.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/net-mail/list-remote-forwards/Manifest b/net-mail/list-remote-forwards/Manifest index 90f3106e81b1..8070a53751a5 100644 --- a/net-mail/list-remote-forwards/Manifest +++ b/net-mail/list-remote-forwards/Manifest @@ -1 +1 @@ -DIST list-remote-forwards-0.0.1.tar.gz 25869 BLAKE2B decfd8b5d4fcbd5e278f9c58f79687aa33cc91d4d4907ff7a29fe6b745ff49c073e3beaf2876ec071f4ed1099b4575cacb8194049add04c0aa8ebeff3338293e SHA512 b6d8c0e8a72e3dcbc62c00b291da99da6c37c853997c367eb60db128db327c1f862e9dc6d9ad4028aad2e0cec9acc96add28d85d4b22508e1fd00a65bb9b0317 +DIST list-remote-forwards-0.0.3.tar.gz 26495 BLAKE2B 7bc0a02133dfabe0f27c7ed861bbb994757eadb4d55d369fdd143da7ef03fcadf7d1f11bb034fc8ade7dc879d4b615a3ae5ed44a1ed5af3e10f1aaffcd79210a SHA512 833bb0a3fda76b43d0004d7906c54aa21920f1db8ff50fc2c0d1da6f98dd49310041fa7101050108cb6cb803084fff0673316a1ce86224d35ba09e8060864a9d 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" diff --git a/net-mail/mailbox-count/Manifest b/net-mail/mailbox-count/Manifest index d732e867fcb3..82e675aa3c26 100644 --- a/net-mail/mailbox-count/Manifest +++ b/net-mail/mailbox-count/Manifest @@ -1 +1 @@ -DIST mailbox-count-0.0.5.tar.gz 21476 BLAKE2B 3ad79233ae1dbb202bc46c60e8a7d13d5d6820f74e090056f37eacb7b37c2f18498f599603d1ee32a7ac43b5f9931f26aba1780ff5160333c66129889ac6812b SHA512 3c63bd9021f64ba745572907eae8bc25e9ddc7d443d5ab84626dd90f95af71267cbffb9d371f0e308988fbdf14f3a126d93a727d55bf9ee3e02037e687267d26 +DIST mailbox-count-0.0.6.tar.gz 21176 BLAKE2B 655815d463e14ee8c32cc955819d6b95d5359a644fb09433cb8ab303f07a98ce33b4c048be724253f30d8855a921abb5a7a29e62391ef8a1a9288e2f430710fc SHA512 285aeeaa8cfaade6c91a850154772e47aa212f73d1206c3c8262d08a15b95f15ce812152ca5acf79f5390f476ed6af52a73e03af4ab297e1268044a4a9ece6b5 diff --git a/net-mail/mailbox-count/mailbox-count-0.0.5.ebuild b/net-mail/mailbox-count/mailbox-count-0.0.6.ebuild index bcdc6ed7c3f7..77d6b2bd5bdf 100644 --- a/net-mail/mailbox-count/mailbox-count-0.0.5.ebuild +++ b/net-mail/mailbox-count/mailbox-count-0.0.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="AGPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~x86" IUSE="" RDEPEND=" @@ -24,10 +24,10 @@ RDEPEND=" >=dev-haskell/missingh-1.2 >=dev-haskell/tasty-0.8 >=dev-haskell/tasty-hunit-0.8 - >=dev-lang/ghc-8.0 + >=dev-lang/ghc-9.0 " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.16.0 + >=dev-haskell/cabal-3.0.0 test? ( >=dev-haskell/doctest-0.9 >=dev-haskell/filemanip-0.3.6 )" diff --git a/net-misc/haeredes/Manifest b/net-misc/haeredes/Manifest index 249f6bb8f49d..fbc46dda4050 100644 --- a/net-misc/haeredes/Manifest +++ b/net-misc/haeredes/Manifest @@ -1 +1 @@ -DIST haeredes-0.5.2.tar.gz 20443 BLAKE2B e64926917c98b6b2a5d8dae698dbebf1f38359e0b017b4a47e0ade053d52a826c6400ce76b16f505b6f4654889a74d107e9c312e2c5209ac49ddc7c13a52664b SHA512 81e4e53f8bd3284af5a51f0e1b89ab28aa79111f8e448d0bc35b4010974faa5e719783171fe8b66620dccdef1985fe9dde9f607b00d6535c7bb0650579617fd5 +DIST haeredes-0.5.3.tar.gz 20357 BLAKE2B 54be7f0a4bd09cd85c0cf7b2baed589258749bb2b05764ca61d4656e6c19832dfbd249d425e6a9ede30fc8f5711392491adca4c025014dc6e05c6009108c98dd SHA512 3bf0a14b45f9c3c929cc97559ca03a3df1c542196daf574917171dacd3c47117a908ed0c849b3527bd2dcf8f99a15228845d3a8ae97e051f707162d62cfccc13 diff --git a/net-misc/haeredes/haeredes-0.5.2.ebuild b/net-misc/haeredes/haeredes-0.5.3.ebuild index dcc46bef668f..a7306b0994cd 100644 --- a/net-misc/haeredes/haeredes-0.5.2.ebuild +++ b/net-misc/haeredes/haeredes-0.5.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,7 +12,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="AGPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~x86" IUSE="" # The test suite requires network access. @@ -22,10 +22,10 @@ RDEPEND=">=dev-haskell/cmdargs-0.10:= >=dev-haskell/dns-1.4:= >=dev-haskell/iproute-1.2:= >=dev-haskell/parallel-io-0.3:= - >=dev-lang/ghc-7.6.2:= + >=dev-lang/ghc-9.0.0:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.16.0 + >=dev-haskell/cabal-3.0.0 test? ( >=dev-haskell/doctest-0.9 >=dev-haskell/filemanip-0.3.6 dev-util/shelltestrunner ) diff --git a/net-misc/hath/Manifest b/net-misc/hath/Manifest index c3ea3a427f3f..feae8c85fb73 100644 --- a/net-misc/hath/Manifest +++ b/net-misc/hath/Manifest @@ -1 +1 @@ -DIST hath-0.5.0.tar.gz 31258 BLAKE2B 496832d35cf88ccda3a8ce394a1b4b17f673d1873c44d6ee112881e1da0431a069feb3612a3d1c00b14005690f4a71898d3755635b4bc444f23fbe23fe6f95b5 SHA512 877b95f3b608315f2dd393097747918f20499ae9ffaf69d26f7113639458cb30425a63ecb358cb2cab7f543c658aa7297f3f54b0f500dffe3bda3c9e63647a99 +DIST hath-0.5.7.tar.gz 31087 BLAKE2B 2449872bae187dfd67ab94da7df55bec7a9735bcd85a9dbd96ef7ce1afdd3f83ed666eb02b6de54719ba32b96de75ff168136f07760023ea2db7bb55bf51f70e SHA512 daa1ae22e8a01f63db6849c7c9e90917051644c681848c66bbd5cb7178326a125868c9f52d506bb5561595fd1bb8b16ae922b91e1be44ccb86e346fc1730a6dd diff --git a/net-misc/hath/hath-0.5.0.ebuild b/net-misc/hath/hath-0.5.7.ebuild index 3f2f323611b6..499eaadef44b 100644 --- a/net-misc/hath/hath-0.5.0.ebuild +++ b/net-misc/hath/hath-0.5.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz" LICENSE="AGPL-3" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~x86" IUSE="" RDEPEND=">=dev-haskell/cmdargs-0.10:= @@ -22,10 +22,10 @@ RDEPEND=">=dev-haskell/cmdargs-0.10:= >=dev-haskell/tasty-0.8:= >=dev-haskell/tasty-hunit-0.8:= >=dev-haskell/tasty-quickcheck-0.8.1:= - >=dev-lang/ghc-8.0.1:= + >=dev-lang/ghc-9.0.0:= " DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.24.0.0 + >=dev-haskell/cabal-3.0.0.0 test? ( dev-util/shelltestrunner ) " |