gentoo auto-resync : 23:07:2022 - 08:50:15

4 files changed, 85 insertions, 10 deletions

diff --git a/dev-haskell/cabal-install/Manifest b/dev-haskell/cabal-install/Manifest
index 9ed946ae2873..4456ab3a87cb 100644
--- a/dev-haskell/cabal-install/Manifest
+++ b/dev-haskell/cabal-install/Manifest
@@ -1,5 +1,7 @@
 AUX cabal-install-0.13.3-nopref.patch 775 BLAKE2B c2c9478da820ffd22ab5450a38f54d74249b8b5000732be2e9cb68229876cdd50062ad7a668bef860be53161b2a820d0e31e3701f5c5f28602e964267a8ad30b SHA512 e0abaebca3d85bf09cffe76a7cdc0dc4df9ef7d0b13950932cbb0bedaeea59173cbf28b2a89f3f1b9e8ea15cb5c611678cf79ea63ea5a3f5acb4417082de19e5
 AUX cabal-install-3.2.0.0-rankntypes.patch 415 BLAKE2B 8a0459bac359c3f53750f50131e8fb0fa30ae5346ab718f0471959b543d17c91a691649066349ea129777bfc238dcc66ef4df6b222e5e76ae65ccbef863a57b1 SHA512 1b650dcef65df682b7058f67d43664910f8ffdf558a81d1df033080df1255460e45a3685b5897129339c00fe20d8cff23e1b3d5bc0f08c041b4e177fac9fe9d2
 DIST cabal-install-3.2.0.0.tar.gz 632084 BLAKE2B 55cdbddebed17489f1c031bd867de7868878aa289193b826dd8274860e4f08d48f71cad33af1b62da16f71629ae4ff5745c3ceeada1680dbcc222793eba49a06 SHA512 ad937b2df42b688e4608aa2b91a25daf1042e5573626202e5182cbfeca9acc5933194853405a6396c60d0d28d6d0d5c5276fd85cb6acf4be2c8cd12afe747062
-EBUILD cabal-install-3.2.0.0.ebuild 2539 BLAKE2B bf9f97243a4f0ced09975d9f081e6bed4b697621e3dbc6413fb1f1490442502cfc4fd42abb4ad485a7a608ee34ac20a16b55f6405610d26d95542d3a414d76b9 SHA512 6456dd630f610b61be70aaa052497204062db38ba151f508e183b8fdcb9ba31ba3cbc57d14c2d0ee627fc595df585a7e7e59613b9bdee3925229018ba17ce683
-MISC metadata.xml 607 BLAKE2B c00391e18263bfd9f5a10ba96678cfa31536e89e89fa7c8268140303b1f114ab6073e451119f175eaec479eea9dd6e877fab5e8662c72780d48dad7f5002f496 SHA512 cfee4b76196ee3ffdc8a8e65ae312419047ed1ee2c085b47c8b606f60098c52735515f956379c10e5171fe3f625ff6ee6018a2a4434706596e2301df11027d34
+DIST cabal-install-3.4.1.0.tar.gz 640932 BLAKE2B a5b662aeedcf2f76286be8b2487f429b79a8c6e65f494f0e3b69013a15cdc1ca5b9b114aec5ed22ee8398345944040cddf4a61d5bead05a8a4c7eb93cac1cfce SHA512 e8a47dc15d65d0da2886c1d936a10648f58b0f29e36c5cc49936e7f5e9d77780956b79432b75717186c2374bdb7251a47801e0478edc481c154d5e5d0d1a70db
+EBUILD cabal-install-3.2.0.0.ebuild 2551 BLAKE2B c166cda31d9ff4b49ee0b0777324997b5f8fc99da62d7448eac2f13a6eb7d6dc12b6b0dc9e10c9dacf2df5ee3db700df26900eb4a5df37d2a605b10ed1dc4ae4 SHA512 9e3f52f6b3dfdb843fc8cc42fb29ffc723664d21ec052a6f4ca26911ed0d00f30be906333e2d586644d8ccd1be734e993ca991665a26ad13aace120ce9b1a296
+EBUILD cabal-install-3.4.1.0-r1.ebuild 2608 BLAKE2B 3a69c523bb8489bf67e5b4de16a9c6fa62a26549ad671f142f924cb48601ce736d2447c68ab423c081a0a7b83542281a7fed1d0542e2ec34d255b7294c4eb1d4 SHA512 69bd0b4de8f7ea22eee8bd5a519ebae8af2f80a11c4347f27e0279488d16fd1daacfdaba8723ec0d31d7ae58f1492a44ef55e7ee08de5d43f0ed0cc1463b5272
+MISC metadata.xml 521 BLAKE2B 70a6d4931fc3d675f4c187feae97577f313d80e153c98944dd5e8036f7fed064c8bc5eeaf7afae7ce5bae78b7a9b958e03551a1c0489a7d6c840e1ed9b3c121a SHA512 f6e3c3afcb77d9c850125d2a9c7cfe2f1b7de1098ff98cb605ab4e5d82959807df3d8ba282ca929e35107f62fe32317bb6cc8a0bfd3c2fdb6ccb8485050f9b38
diff --git a/dev-haskell/cabal-install/cabal-install-3.2.0.0.ebuild b/dev-haskell/cabal-install/cabal-install-3.2.0.0.ebuild
index 085a26c438fa..f4d9b998fb9d 100644
--- a/dev-haskell/cabal-install/cabal-install-3.2.0.0.ebuild
+++ b/dev-haskell/cabal-install/cabal-install-3.2.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
@@ -6,7 +6,7 @@ EAPI=7
 # ebuild generated by hackport 0.6.5.9999
 # hackport: flags: -debug-conflict-sets,-debug-expensive-assertions,-debug-tracetree
 CABAL_FEATURES=""
-inherit haskell-cabal
+inherit haskell-cabal ghc-package
 
 DESCRIPTION="The command-line interface for Cabal and Hackage"
 HOMEPAGE="https://www.haskell.org/cabal/"
diff --git a/dev-haskell/cabal-install/cabal-install-3.4.1.0-r1.ebuild b/dev-haskell/cabal-install/cabal-install-3.4.1.0-r1.ebuild
new file mode 100644
index 000000000000..7d4b0c20b8f0
--- /dev/null
+++ b/dev-haskell/cabal-install/cabal-install-3.4.1.0-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.9999
+#hackport: flags: -monolithic,+network-uri,-debug-tracetree,-debug-expensive-assertions
+
+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
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +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.4.1:= <dev-haskell/cabal-3.4.2:=
+	>=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/http-4000.1.5:= <dev-haskell/http-4000.4:=
+	>=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:= )
+"
+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'
+
+	# 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 \
+		$(cabal_flag debug 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 6e16048a9b72..1e8264cabe17 100644
--- a/dev-haskell/cabal-install/metadata.xml
+++ b/dev-haskell/cabal-install/metadata.xml
@@ -5,12 +5,8 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		The 'cabal' command-line program simplifies the process of managing
-		Haskell software by automating the fetching, configuration, compilation
-		and installation of Haskell libraries and programs.
-	</longdescription>
 	<use>
-		<flag name="native-dns">Enable use of the resolv and windns packages for performing DNS lookups</flag>
+		<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>
 </pkgmetadata>