gentoo resync : 25.08.2020

6 files changed, 84 insertions, 7 deletions

diff --git a/dev-haskell/cabal-install/Manifest b/dev-haskell/cabal-install/Manifest
index 4fbc9298e72d..f977ef0866fb 100644
--- a/dev-haskell/cabal-install/Manifest
+++ b/dev-haskell/cabal-install/Manifest
@@ -4,8 +4,10 @@ DIST cabal-install-1.18.1.0.tar.gz 257577 BLAKE2B ea5d1eb3458657b81f04b2de1bd17b
 DIST cabal-install-1.20.0.3.tar.gz 274779 BLAKE2B 4b46e3722305566e9671677292a3ef64df9ca018dc54c088759a396b04bbbfbe28a72dc058cc98cf8ec552846d47a07d9d792a02a5834aa7808052183b4a93b0 SHA512 a272c7eb1c87a933b30697afa7bf78f95fb0afa203e791448d5e96d5c62105533347b8b777af7a7e6db5703654c319045e089d46d2263a09ed5ada10144ce12f
 DIST cabal-install-1.22.7.0.tar.gz 302579 BLAKE2B e8a92bc69f0b00e5fc12145277216652fa52fb1de9ce3458b5fc3d9bc6f89cfe3a95d26dd7585566b55c55c2a9b2d021336baa10694aa39ca442bdb58c6997e7 SHA512 a88895ee38bf7451ba6a2e929ff224643ea0a536a9633d463d91a471e41b6aae302af2c3ca4fc914e4b3401fcadb137bb0c68c9fb7d0f768835374aef1b22766
 DIST cabal-install-1.24.0.2.tar.gz 499937 BLAKE2B c2e1ea88e20b1a43064010117e1830b052c339464f3188a931e7ca72220287a2862ea25423e5190e8f3fe6ed6b38dc7b688474796faf3d049626b04cf6c191cc SHA512 bd055a52ff0ac697e6f21a588d53dd811d50ee9410659a242c00a5665b360ef10c024df4872b9070c33aa49f779c8817b883b40087d3f4e0be4096a54b2ad5f0
-EBUILD cabal-install-1.18.1.0.ebuild 1416 BLAKE2B 3e87f5ff4f19dcae30eccbfda6b5dfda99508fe37987cd35ef5e96da55a010eece5bfb87b4c29553df8728d5024a5f20f45825f4c32a96bbfd6e131e3c12ef49 SHA512 fb1a19d36fece5093c634bdd3dc519f8583ab548b8179abf357a988638a171e70fa2f457c0999582784207b53d9cd039ba8634f38876636f2cc3fcd4d844c044
-EBUILD cabal-install-1.20.0.3-r2.ebuild 1629 BLAKE2B 6cb1d44d0ccc2f2d632b0da3af327e0896286e654c3949d0ca3084690985974867257a31836dab4e87016a77da9100e9fa1f29ba5eb06e74548cc203001324bd SHA512 5a7ec59f48a7c85c9ce2fa741823b07c6228b6706cb111e58d3c7a386f96cebb74effb1533b2a53e7b74e9744e14278284b52f5f446b2ab2118c00e2f187f66f
-EBUILD cabal-install-1.22.7.0.ebuild 1883 BLAKE2B 736dde7384f9d3a099fd4bb63013d1d3e9cc0ac19452b19e93e8b6c0b62def45488c53917a9a03680a6bd3a1fd799df08f30a9223c51583b7e1177879f1e0c24 SHA512 c30d749043b2e3bc08f7a8715256b507f86b76c3349c851743e14f2005e6a5a7e866de618bb1f60e726b3174cfdf03e7bcc9cadafa998d8659d140582cb6fea8
+DIST cabal-install-3.0.0.0.tar.gz 654045 BLAKE2B 5036948651098b83f073b5ce29e2aaa31e4382f07e8b1e79d206889bd9c74fb88789f4b1cbb3bddc6d03375a6e3a3e164d6bda4ea19e3f944904ab11d7693fce SHA512 0b15313fc11bc6b6018e01b6a3a65242306977c16ce9333ea1191c1ce0020b180451235a7a65b47bc01791e05d1b246bf9d573fc7e981a46fcfc7da0fed04cca
+EBUILD cabal-install-1.18.1.0.ebuild 1404 BLAKE2B 18b1074ecee7904e6fc46066754795caa5fac2f038ae3a3892a1891f23f9b50e4ec84a3a435418645f9a545999f6b2ca8410612edd64692247d5c56cb6a3d2e1 SHA512 24ce6ab581d6a2b28933fb5b2c6c045712e54627edff52ccb4004eabcc4c00e92027ad2cb5102fcc445f02f1522a5b525e53f0d2ea72e2f8c6ad44dd1bb8cfc5
+EBUILD cabal-install-1.20.0.3-r2.ebuild 1617 BLAKE2B 2fe558681193ec82df3d8ec1eab1169d0da922311876e1a4605bf139d2a58f6d000651d6e70d784564eaefb11b5878672e98fd8d5b8f34fc28706487e91530c7 SHA512 3d0141e49223aee98f920e6376264da936855e38eb2bd649192d5cbee0874bac51a90ac3635bc37c0fc3094de881cd95a6fa212264747d2e1cf75112a21e3313
+EBUILD cabal-install-1.22.7.0.ebuild 1871 BLAKE2B ab2ecf9c710b3c2e3c39acf655fe201903d693a5bfeb075607af9ca933c92f70b32b5dbf0c52712826c1eb49c30048ef66a6fa7fb77daa8873e1e197b53af706 SHA512 5fa9f10924bf7e38fdc44921f5720b951e424966d74f68edda1c62933058761091cd624d660a09d5a7a52ac934591dfe2fd096153bc817e403cb3920ff9e62ff
 EBUILD cabal-install-1.24.0.2.ebuild 2408 BLAKE2B c2b3610a41005997f6ac0fac5e8c950722a9250d3490fb8c07cef67b31b8547579e0fb83467e7aba7b7d87dc44cb7b9dfa27e6298ea72dcfb8d1d649dbf8e795 SHA512 255447d3d772615b66e16cc92276a82d1e898d9e0960c3448c98279719cbd56cdc69c93e6604a91af8dda9a3feb27eeec3e4874b974430702800d0f9f1fbdc2c
-MISC metadata.xml 668 BLAKE2B acbff9d85af49bb29555d6a9d98d0b4342c5617e19bbb087d767bd5d1167df74e804890b4b1cd4d93f06b6565fa73f66e6f3d9b53e2923312fb6ceaa75a494d1 SHA512 fcf0bad8448b59a5019e8cb993952fb1f073ca0a7f78a41d83d403759837099900fcb03ce2a38c800515c4e88ee5fe49fa108b6b8b384eda0d28e08b2d3d2e13
+EBUILD cabal-install-3.0.0.0.ebuild 2473 BLAKE2B 4d648dc0b2c118e574013f63601657f5cf3da3667d3e8625166b087f9b2c30594cf2901c90abbd11faefaba90979c7668d95ae9c33bd2bc7becfc6c9757c0cc8 SHA512 8849d37c06b253f4b3e6927a8d728aa47dfe50cf16d1abc557cea09eeed16b771e5f7fe2ff303994793f3a51e97b178ded109b1d082d2b809776610cc0a179c9
+MISC metadata.xml 773 BLAKE2B 3be3014c36c393086afcfd6723ff532907dc89eba816f512fb05b25966ccbce4cc1726a45284703f8ac9cebd25cc070a9870d592828d8928f22db78e85a21279 SHA512 e6176c36f85f5764e8974654fcc599a1f4c9f840d8761c32d1d5e7103d6e536667618fafb37c0741c57bfd1c0cb9d283cf0cfd0e0084710bec2ed1263f25cb6c
diff --git a/dev-haskell/cabal-install/cabal-install-1.18.1.0.ebuild b/dev-haskell/cabal-install/cabal-install-1.18.1.0.ebuild
index eeae03986a07..b03eebc1bce2 100644
--- a/dev-haskell/cabal-install/cabal-install-1.18.1.0.ebuild
+++ b/dev-haskell/cabal-install/cabal-install-1.18.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+noprefs"
 
 RDEPEND=""
diff --git a/dev-haskell/cabal-install/cabal-install-1.20.0.3-r2.ebuild b/dev-haskell/cabal-install/cabal-install-1.20.0.3-r2.ebuild
index f8b969f4f52a..acfa6f958558 100644
--- a/dev-haskell/cabal-install/cabal-install-1.20.0.3-r2.ebuild
+++ b/dev-haskell/cabal-install/cabal-install-1.20.0.3-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+noprefs"
 
 RDEPEND=""
diff --git a/dev-haskell/cabal-install/cabal-install-1.22.7.0.ebuild b/dev-haskell/cabal-install/cabal-install-1.22.7.0.ebuild
index dc2091ad235f..81f2a4b03b57 100644
--- a/dev-haskell/cabal-install/cabal-install-1.22.7.0.ebuild
+++ b/dev-haskell/cabal-install/cabal-install-1.22.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+network-uri +noprefs"
 
 RESTRICT=test # missing files
diff --git a/dev-haskell/cabal-install/cabal-install-3.0.0.0.ebuild b/dev-haskell/cabal-install/cabal-install-3.0.0.0.ebuild
new file mode 100644
index 000000000000..d2d67c73fd0d
--- /dev/null
+++ b/dev-haskell/cabal-install/cabal-install-3.0.0.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.2.9999
+#hackport: flags: -monolithic,+network-uri,-debug-tracetree,-debug-expensive-assertions
+
+CABAL_FEATURES=""
+inherit haskell-cabal
+
+DESCRIPTION="The command-line interface for Cabal and Hackage"
+HOMEPAGE="http://www.haskell.org/cabal/"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+# keep in sync with ghc-8.8
+KEYWORDS="~amd64 ~x86"
+IUSE="+native-dns"
+
+RDEPEND=">=dev-haskell/async-2.0:= <dev-haskell/async-2.3:=
+	>=dev-haskell/base16-bytestring-0.1.1:= <dev-haskell/base16-bytestring-0.2:=
+	>=dev-haskell/binary-0.7.3:= <dev-haskell/binary-0.9:=
+	>=dev-haskell/cabal-3.0:= <dev-haskell/cabal-3.1:=
+	>=dev-haskell/cryptohash-sha256-0.11:= <dev-haskell/cryptohash-sha256-0.12:=
+	>=dev-haskell/echo-0.1.3:= <dev-haskell/echo-0.2:=
+	>=dev-haskell/edit-distance-0.2.2:= <dev-haskell/edit-distance-0.3:=
+	>=dev-haskell/fail-4.9:= <dev-haskell/fail-4.10:=
+	>=dev-haskell/hackage-security-0.5.2.2:= <dev-haskell/hackage-security-0.6:=
+	>=dev-haskell/hashable-1.0:= <dev-haskell/hashable-1.4:=
+	>=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.4:=
+	>=dev-haskell/mtl-2.0:= <dev-haskell/mtl-2.3:=
+	>=dev-haskell/network-2.6:= <dev-haskell/network-3.2:=
+	>=dev-haskell/network-uri-2.6.0.2:= <dev-haskell/network-uri-2.7:=
+	>=dev-haskell/parsec-3.1.13.0:= <dev-haskell/parsec-3.2:=
+	>=dev-haskell/random-1:= <dev-haskell/random-1.2:=
+	>=dev-haskell/stm-2.0:= <dev-haskell/stm-2.6:=
+	>=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:=
+	>=dev-haskell/text-1.2.3:= <dev-haskell/text-1.3:=
+	>=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:=
+	>=dev-lang/ghc-7.10.1:=
+	native-dns? ( >=dev-haskell/resolv-0.1.1:= <dev-haskell/resolv-0.2:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.22.2.0
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base       >= 4.8      && < 4.13' 'base       >= 4.8'
+	#if use noprefs; then
+	#	epatch "${FILESDIR}/${PN}"-0.13.3-nopref.patch
+	#fi
+
+	# no chance to link to -threaded on ppc64, alpha and others
+	# who use UNREG, not only ARM
+	if ! ghc-supports-threaded-runtime; then
+		cabal_chdeps '-threaded' ' '
+	fi
+	eapply_user
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-debug-conflict-sets \
+		--flag=-debug-expensive-assertions \
+		--flag=-debug-tracetree \
+		--flag=-monolithic \
+		$(cabal_flag native-dns native-dns) \
+		--flag=network-uri
+}
diff --git a/dev-haskell/cabal-install/metadata.xml b/dev-haskell/cabal-install/metadata.xml
index 31f7b7e26dba..659d87e35f01 100644
--- a/dev-haskell/cabal-install/metadata.xml
+++ b/dev-haskell/cabal-install/metadata.xml
@@ -12,6 +12,7 @@
 	</longdescription>
 	<use>
 		<flag name="noprefs">Ignore 'preferred-versions' file from hackage's tarball.</flag>
+		<flag name="native-dns">Enable use of the resolv and windns packages for performing DNS lookups</flag>
 		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
 	</use>
 </pkgmetadata>