gentoo auto-resync : 23:10:2023 - 08:35:49

4 files changed, 95 insertions, 27 deletions

diff --git a/dev-haskell/cabal-install/Manifest b/dev-haskell/cabal-install/Manifest
index ccaaeb464295..0ed50b55eb71 100644
--- a/dev-haskell/cabal-install/Manifest
+++ b/dev-haskell/cabal-install/Manifest
@@ -1,4 +1,8 @@
 AUX cabal-install-0.13.3-nopref.patch 775 BLAKE2B c2c9478da820ffd22ab5450a38f54d74249b8b5000732be2e9cb68229876cdd50062ad7a668bef860be53161b2a820d0e31e3701f5c5f28602e964267a8ad30b SHA512 e0abaebca3d85bf09cffe76a7cdc0dc4df9ef7d0b13950932cbb0bedaeea59173cbf28b2a89f3f1b9e8ea15cb5c611678cf79ea63ea5a3f5acb4417082de19e5
+DIST cabal-install-3.4.1.0-rev2.cabal 16912 BLAKE2B 9844dca8c72e39cf6f81267f9eae07d25eea9ba351d4ec70026ad0d9a6fb15423b066f2d998e1b702bd9acc15f9f0f90a3a4fc4b4d359bf2c4f5748a77c352ae SHA512 287f819c47a4c1b85ce35c18a299ba18bb0907662a2a5980ed84aebbee93b558ba1237c07100175e44c6b85bcd4953b39691219afb119a8a7d1b6d8aede96d1b
 DIST cabal-install-3.4.1.0.tar.gz 640932 BLAKE2B a5b662aeedcf2f76286be8b2487f429b79a8c6e65f494f0e3b69013a15cdc1ca5b9b114aec5ed22ee8398345944040cddf4a61d5bead05a8a4c7eb93cac1cfce SHA512 e8a47dc15d65d0da2886c1d936a10648f58b0f29e36c5cc49936e7f5e9d77780956b79432b75717186c2374bdb7251a47801e0478edc481c154d5e5d0d1a70db
-EBUILD cabal-install-3.4.1.0-r2.ebuild 2706 BLAKE2B 12d28fa05d18915c2c38a27e99f8a862fb3b87e4042dd2f5159728802acb992fce1740fa854a8f9297b9b75f490a410fc9b437cb181873666e6b3b6c50836203 SHA512 ab40b1ba37c1d8fd0d49928af13a72e09ae8250ee11bd881ec1b477e5f6a63df8952f49988dd5bb5300de177c27341168a54cc13509d6f344057fb1e5d3c22c6
-MISC metadata.xml 521 BLAKE2B 70a6d4931fc3d675f4c187feae97577f313d80e153c98944dd5e8036f7fed064c8bc5eeaf7afae7ce5bae78b7a9b958e03551a1c0489a7d6c840e1ed9b3c121a SHA512 f6e3c3afcb77d9c850125d2a9c7cfe2f1b7de1098ff98cb605ab4e5d82959807df3d8ba282ca929e35107f62fe32317bb6cc8a0bfd3c2fdb6ccb8485050f9b38
+DIST cabal-install-3.6.2.0-rev2.cabal 13012 BLAKE2B 06f2bd2876d97560abf7693faf0aa0648a685bea5a443fd517d32236db8dc22c100f672ec79b6e131acd441a91f8e139c46d8a1890f2656d8f2b74be57545b71 SHA512 f6422bd69ff798ac42d1b10790347bffef6e3fc3bfc8fc4be96b6ea990f77199eb388306e45810990fd090d7d7040d72c94f3d65dc6f2f69994bf6a18b4ef134
+DIST cabal-install-3.6.2.0.tar.gz 633319 BLAKE2B e7169cc852413b3cd9d7f763402a5cc4746f9412f008b9b4a456de6002fbc79c8b77835723e3819a4049fc4d5175528040cef543f6a0dfa6f38331be16eddddb SHA512 a02d72fd7d0bf7778b1d4f2925e0b78f6c321cb29d59d559da758bfa6a0cd17fc776bd64911db8d28a208189b35db50aceae109782a1011e059446c4c2d77ad3
+EBUILD cabal-install-3.4.1.0-r3.ebuild 2483 BLAKE2B 7831b558a18ab3d6dd9c50354268b2214276da4628b94aabd206c7e8e098571e0aba98cb967c7f7b82f14d318a2417077addffeb07b2fb82d98656ea6e4c06dd SHA512 f7efdbc93c9214ec7c46bc25dda4ad788bfba5b17eeaff95337125da296de0f31aa4f82eaea28f927ef7bbd97660f9be657ebbf5e046cab49da23069dd5a4ee2
+EBUILD cabal-install-3.6.2.0-r1.ebuild 2058 BLAKE2B 25331a91780e7824a9b8fedf289f59198a03b2d352ed38a69c58b08626b40535322eca663635e74cb9343ea57e9946969aa6634dc31c29c6266bc706f9f7fd22 SHA512 99b0331c0a6b746f6fca6635343dd16c6e7ca68300333218389df078a9de0c41bfe1f3bb7394d20ce4b59332571a948e4800700e59c426765b715daf7028360c
+MISC metadata.xml 653 BLAKE2B 19c1abce7015d5f5f378a333df2362cf985f5c8dfe20f10229fa8df0c96f99f1a4373bdce9400fa410e9524a38070b89a5023ad3aa826d08571e415e47850103 SHA512 922656018aec9236aca6badf75620c9e2cc484002442ae432c7a5ff28d04f05716dda282716fa3cc40d17898148782e8fdc5465967c06c5327029fc14e0569f5
diff --git a/dev-haskell/cabal-install/cabal-install-3.4.1.0-r2.ebuild b/dev-haskell/cabal-install/cabal-install-3.4.1.0-r3.ebuild
index 50a8c1fcbfc7..0c5326fc9d73 100644
--- a/dev-haskell/cabal-install/cabal-install-3.4.1.0-r2.ebuild
+++ b/dev-haskell/cabal-install/cabal-install-3.4.1.0-r3.ebuild
@@ -3,23 +3,31 @@
 
 EAPI=8
 
-# ebuild generated by hackport 0.7.9999
-#hackport: flags: -monolithic,+network-uri,-debug-tracetree,-debug-expensive-assertions
+# ebuild generated by hackport 0.8.0.0.9999
+#hackport: flags: -monolithic,+network-uri,-debug-tracetree,-debug-expensive-assertions,-debug-conflict-sets
+
+CABAL_HACKAGE_REVISION=2
 
 CABAL_FEATURES=""
 inherit haskell-cabal ghc-package
 
 DESCRIPTION="The command-line interface for Cabal and Hackage"
 HOMEPAGE="https://www.haskell.org/cabal/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-#keep in sync with ghc-9.0.2
+# Keep in sync with relevant dev-haskell/cabal versions
 KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="debug +lukko +native-dns"
+IUSE="+lukko +native-dns"
+
+CABAL_CHDEPS=(
+	'base       >= 4.8      && < 4.15' 'base >= 4.8'
+	'hashable   >= 1.0      && < 1.4' 'hashable >=1.0'
+	'HTTP       >= 4000.1.5 && < 4000.4' 'HTTP       >= 4000.1.5 && < 4000.5'
+)
 
-RDEPEND=">=dev-haskell/async-2.0:= <dev-haskell/async-2.3:=
+RDEPEND="
+	>=dev-haskell/async-2.0:= <dev-haskell/async-2.3:=
 	>=dev-haskell/base16-bytestring-0.1.1:= <dev-haskell/base16-bytestring-1.1.0.0:=
 	>=dev-haskell/cabal-3.4.1:= <dev-haskell/cabal-3.4.2:=
 	>=dev-haskell/cryptohash-sha256-0.11:= <dev-haskell/cryptohash-sha256-0.12:=
@@ -28,47 +36,37 @@ RDEPEND=">=dev-haskell/async-2.0:= <dev-haskell/async-2.3:=
 	>=dev-haskell/hackage-security-0.6.0.1:= <dev-haskell/hackage-security-0.7:=
 	>=dev-haskell/hashable-1.0:=
 	>=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.5:=
-	>=dev-haskell/mtl-2.0:= <dev-haskell/mtl-2.3:=
 	>=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.2:= <dev-haskell/random-1.3:=
 	>=dev-haskell/regex-base-0.94.0.0:= <dev-haskell/regex-base-0.95:=
 	>=dev-haskell/regex-posix-0.96.0.0:= <dev-haskell/regex-posix-0.97:=
 	>=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-8.4.3:=
-	lukko? ( >=dev-haskell/lukko-0.1:= <dev-haskell/lukko-0.2:= )
-	native-dns? ( >=dev-haskell/resolv-0.1.1:= <dev-haskell/resolv-0.2:= )
+	lukko? (
+		>=dev-haskell/lukko-0.1:= <dev-haskell/lukko-0.2:=
+	)
+	native-dns? (
+		>=dev-haskell/resolv-0.1.1:= <dev-haskell/resolv-0.2:=
+	)
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-2.2.0.1
 "
 
 src_prepare() {
-	default
-
-	#if use noprefs; then
-	#	epatch "${FILESDIR}/${PN}"-0.13.3-nopref.patch
-	#fi
-
-	cabal_chdeps \
-		'base       >= 4.8      && < 4.15' 'base >= 4.8' \
-		'hashable   >= 1.0      && < 1.4' 'hashable >=1.0' \
-		'HTTP       >= 4000.1.5 && < 4000.4' 'HTTP       >= 4000.1.5 && < 4000.5'
-
 	# 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' ' '
+		export CABAL_CHDEPS+=( '-threaded' ' ' )
 	fi
-	eapply_user
+	haskell-cabal_src_prepare
 }
 
 src_configure() {
 	haskell-cabal_src_configure \
-		$(cabal_flag debug debug-conflict-sets) \
+		--flag=-debug-conflict-sets \
 		--flag=-debug-expensive-assertions \
 		--flag=-debug-tracetree \
 		$(cabal_flag lukko lukko) \
diff --git a/dev-haskell/cabal-install/cabal-install-3.6.2.0-r1.ebuild b/dev-haskell/cabal-install/cabal-install-3.6.2.0-r1.ebuild
new file mode 100644
index 000000000000..e630e108f1b6
--- /dev/null
+++ b/dev-haskell/cabal-install/cabal-install-3.6.2.0-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.0.0.9999
+#hackport: flags: -monolithic,+network-uri,-debug-tracetree,-debug-expensive-assertions,-debug-conflict-sets
+
+CABAL_HACKAGE_REVISION=2
+
+CABAL_FEATURES=""
+inherit haskell-cabal
+
+DESCRIPTION="The command-line interface for Cabal and Hackage"
+HOMEPAGE="https://www.haskell.org/cabal/"
+
+LICENSE="BSD"
+SLOT="0"
+
+# Keep in sync with relevant dev-haskell/cabal versions
+KEYWORDS="~amd64 ~x86"
+IUSE="+lukko +native-dns"
+
+RDEPEND="
+	>=dev-haskell/async-2.0:= <dev-haskell/async-2.3:=
+	>=dev-haskell/base16-bytestring-0.1.1:= <dev-haskell/base16-bytestring-1.1.0.0:=
+	>=dev-haskell/cabal-3.6.1.0:= <dev-haskell/cabal-3.7:=
+	>=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/hackage-security-0.6.0.1:= <dev-haskell/hackage-security-0.7:=
+	>=dev-haskell/hashable-1.0:= <dev-haskell/hashable-1.5:=
+	>=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.5:=
+	>=dev-haskell/network-uri-2.6.0.2:= <dev-haskell/network-uri-2.7:=
+	>=dev-haskell/random-1.2:= <dev-haskell/random-1.3:=
+	>=dev-haskell/regex-base-0.94.0.0:= <dev-haskell/regex-base-0.95:=
+	>=dev-haskell/regex-posix-0.96.0.0:= <dev-haskell/regex-posix-0.97:=
+	>=dev-haskell/stm-2.0:= <dev-haskell/stm-2.6:=
+	>=dev-haskell/tar-0.5.0.3:= <dev-haskell/tar-0.6:=
+	>=dev-haskell/zlib-0.5.3:= <dev-haskell/zlib-0.7:=
+	>=dev-lang/ghc-8.4.3:=
+	lukko? (
+		>=dev-haskell/lukko-0.1:= <dev-haskell/lukko-0.2:=
+	)
+	native-dns? (
+		>=dev-haskell/resolv-0.1.1:= <dev-haskell/resolv-0.2:=
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-debug-conflict-sets \
+		--flag=-debug-expensive-assertions \
+		--flag=-debug-tracetree \
+		$(cabal_flag lukko lukko) \
+		--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 1e8264cabe17..9025779d6797 100644
--- a/dev-haskell/cabal-install/metadata.xml
+++ b/dev-haskell/cabal-install/metadata.xml
@@ -9,4 +9,8 @@
 		<flag name="lukko">Use @lukko@ for file-locking</flag>
 		<flag name="native-dns">Enable use of the [resolv](https://hackage.haskell.org/package/resolv) &amp; [windns](https://hackage.haskell.org/package/windns) packages for performing DNS lookups</flag>
 	</use>
+	<upstream>
+		<remote-id type="hackage">cabal-install</remote-id>
+		<remote-id type="github">haskell/cabal</remote-id>
+	</upstream>
 </pkgmetadata>