gentoo auto-resync : 23:07:2022 - 14:50:52

13 files changed, 256 insertions, 58 deletions

diff --git a/dev-haskell/Manifest.gz b/dev-haskell/Manifest.gz
index 6d883a552508..8e9821d8624f 100644
--- a/dev-haskell/Manifest.gz
+++ b/dev-haskell/Manifest.gz
diff --git a/dev-haskell/cabal-install/Manifest b/dev-haskell/cabal-install/Manifest
index 4456ab3a87cb..f0344a95cbd7 100644
--- a/dev-haskell/cabal-install/Manifest
+++ b/dev-haskell/cabal-install/Manifest
@@ -2,6 +2,8 @@ AUX cabal-install-0.13.3-nopref.patch 775 BLAKE2B c2c9478da820ffd22ab5450a38f54d
 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
 DIST cabal-install-3.4.1.0.tar.gz 640932 BLAKE2B a5b662aeedcf2f76286be8b2487f429b79a8c6e65f494f0e3b69013a15cdc1ca5b9b114aec5ed22ee8398345944040cddf4a61d5bead05a8a4c7eb93cac1cfce SHA512 e8a47dc15d65d0da2886c1d936a10648f58b0f29e36c5cc49936e7f5e9d77780956b79432b75717186c2374bdb7251a47801e0478edc481c154d5e5d0d1a70db
+EBUILD cabal-install-3.2.0.0-r2.ebuild 2585 BLAKE2B 043e4de1d9fea9945d2806ddf1ec2f5a787dd8d26e05b8ff678f4eecb0ef8d2be86222b3b9edfb33f6074f157f7489054d493e5841c279ac7dd67e01f46c2b5d SHA512 3f72b5ee31c2a4000e297fcdf21787a84650aedb3d50f6a3c7894a6c3b1699f3ad999f4446ae0a60cb1e3243cb63829a6972d217130237f2b7b6824129b99db1
 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
+EBUILD cabal-install-3.4.1.0-r2.ebuild 2674 BLAKE2B bb4d4d141daf0d6f9235d758670b7da657302c55f10e3fc10660204ec3acb31896ec82bf415ca2402b45ba58e6e471735aced0f764e350125b1d42e5136852c4 SHA512 220dc808bb1477eeb398dcca071728fcd9917339b4c0e8149646a5348ca4cca9e8555f5295a85c0bb98011c03ac16a80138dee4c97b5a32a07a9d158c9493e92
 MISC metadata.xml 521 BLAKE2B 70a6d4931fc3d675f4c187feae97577f313d80e153c98944dd5e8036f7fed064c8bc5eeaf7afae7ce5bae78b7a9b958e03551a1c0489a7d6c840e1ed9b3c121a SHA512 f6e3c3afcb77d9c850125d2a9c7cfe2f1b7de1098ff98cb605ab4e5d82959807df3d8ba282ca929e35107f62fe32317bb6cc8a0bfd3c2fdb6ccb8485050f9b38
diff --git a/dev-haskell/cabal-install/cabal-install-3.2.0.0-r2.ebuild b/dev-haskell/cabal-install/cabal-install-3.2.0.0-r2.ebuild
new file mode 100644
index 000000000000..6665509be188
--- /dev/null
+++ b/dev-haskell/cabal-install/cabal-install-3.2.0.0-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.6.5.9999
+# hackport: flags: -debug-conflict-sets,-debug-expensive-assertions,-debug-tracetree
+CABAL_FEATURES=""
+inherit haskell-cabal
+
+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-8.10
+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/cabal-3.2:= <dev-haskell/cabal-3.3:=
+	>=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.0:= <dev-haskell/hackage-security-0.7:=
+	>=dev-haskell/hashable-1.0:=
+	>=dev-haskell/http-4000.1.5:= <dev-haskell/http-4000.5:=
+	>=dev-haskell/lukko-0.1:= <dev-haskell/lukko-0.2:=
+	>=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/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
+"
+
+PATCHES=( "${FILESDIR}"/${P}-rankntypes.patch )
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'base       >= 4.8      && < 4.14' 'base       >= 4.8' \
+		'hashable   >= 1.0      && < 1.4' 'hashable >=1.0' \
+		'base16-bytestring >= 0.1.1 && < 0.2' 'base16-bytestring >=0.1.1' \
+		'random     >= 1        && < 1.2' 'random >=1' \
+		'HTTP       >= 4000.1.5 && < 4000.4' 'HTTP       >= 4000.1.5 && < 4000.5'
+	#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 \
+		--flags=-debug-conflict-sets \
+		--flags=-debug-expensive-assertions \
+		--flags=-debug-tracetree \
+		$(cabal_flag native-dns native-dns)
+}
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-r2.ebuild
new file mode 100644
index 000000000000..ad7ac3748fb1
--- /dev/null
+++ b/dev-haskell/cabal-install/cabal-install-3.4.1.0-r2.ebuild
@@ -0,0 +1,78 @@
+# 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
+
+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.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:= )
+"
+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' ' '
+	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/http/Manifest b/dev-haskell/http/Manifest
index 50499d94dad5..955368845ec9 100644
--- a/dev-haskell/http/Manifest
+++ b/dev-haskell/http/Manifest
@@ -1,3 +1,5 @@
-DIST HTTP-4000.3.14.tar.gz 72938 BLAKE2B d1e24a693d5a63d6ff493766e959447e29c6371854360645f398e4b17f807de3d1ffc4716136fcaeb60f4157bd7622b3d8c30269a98ad7ebecf5f3521e292c03 SHA512 bcc9107412f3ff5806369675ae6cfd87c4ecc36490eab6d62c697f47e62ff8b0d1d6a25f9bfb9d8ef1f037492820eb732cb9cbec7ea9e7e4b20699573077b064
-EBUILD http-4000.3.14.ebuild 1852 BLAKE2B 3899ac0746efa3f2670a9d23ef6a1a5aee738ca4c88b5dcb358d639deff3150ed7904496f952a3d776bc4945b75a8e57e124777141b1a99c360b9c5a218f4f70 SHA512 b94a4c6605121be20e8aecb08814a5b5cb4931d6f56d2e2461d3f39f2ca113b71e6f8cb26bf1a631821e7ea8de583a41e66956ec447156baef63accbdf8c36e2
-MISC metadata.xml 2130 BLAKE2B da568c5e9816455abe877e1b4868a243d2962bc8ead519a93518907ef13150994cd3193ba2585b728b60b0cca4fa24a0ac0d0415609cddd32f6343df3dd69f6e SHA512 9b11488b2d702fbc090fd4acc038841fa7ccbbfa862c5c7209cd1e94b658091729ed28b5d9b95fdd040ce39f734910b2762f0eac12fe954696b3fe0dfc89b747
+DIST HTTP-4000.3.16.tar.gz 74516 BLAKE2B a02f66ac69f3e039e465744876b53b94791ca556c90dd13486ccc38138167ef66dedbe985615b62a2a66304b3970643fed4dd268ae9ada2619d373021bd2da97 SHA512 b5136b55967d4db7569a0269b429c8e419878acc548d962af94efa5aa0ddbb8a6ab22bc3096ce3d78b61dc708996c408d4bfa55c6c7fb6c0d915389503cbd755
+DIST HTTP-4000.4.1.tar.gz 74330 BLAKE2B a4efc62f565609efb981c32961ad9fec28246fc67bbbc3da2c8430b7f4c2a96ee378b12b4f6f5f268353db870949cc6b04a9d8489c8f2bee70d783651a2bafc5 SHA512 c1edc529032013391263bcc0f8abd9534fc53a617b5033dfdc478318465cd988732b2644c7144979156c62bd1a08b1ace507b4fb4e2806f22ec7696cbdfd0147
+EBUILD http-4000.3.16.ebuild 1434 BLAKE2B 5e57acc86ca30e67d1d386494aadb460ec5bea4af422a2eb0ec2f8293fd871b479877625e3ec7e5d8dbe513fb34bbfd67eab08f4af7f644df129cdf1dc43c4ca SHA512 1a347de2f2df7321b00130239229f838b8b1053bfa86b2ff491ccb8cf4e6b0466bb0be6ce42d332c3121bb33b87e66d0aff5e4d2c313b7b2f0c7b1f368be93d1
+EBUILD http-4000.4.1.ebuild 1436 BLAKE2B 2c1f0fd07b03c7f5b273479d132389419e67f1b0b4db0ae6849a240022baf5d769ac11756f63fea5c586e43b01c29f1f7c1ba87793077727b3d97320b4278d49 SHA512 e03e3d3f8168b9e437d112f61d03fdfc0adf4a03bc257256832d97f7eac009d10d4676de3c7b90176394a310be12e68a39c4018a8487885caec3ab0b29680f3c
+MISC metadata.xml 1921 BLAKE2B 85057698a772ab77a8760ae7f5b9642dc9b6ed4ba2c9a5c334520223a84b4847071c332377b2529f2614f21022cad639d4456acf2ba34f83a50f9508685519ae SHA512 14bab08c037b6405fe99ad2dbbc5ca894f5b6bd2cd509d8c02d6cf61bfd7a29d7b5b63b40952cc662f513b75f7494e88a81e5505ba2249399c49e37602bb0699
diff --git a/dev-haskell/http/http-4000.3.14.ebuild b/dev-haskell/http/http-4000.3.16.ebuild
index c2e843e563e2..858fd331b35f 100644
--- a/dev-haskell/http/http-4000.3.14.ebuild
+++ b/dev-haskell/http/http-4000.3.16.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.9999
-#hackport: flags: -warp-tests,-mtl1,-warn-as-error,-old-base,-network23
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: -warp-tests,-mtl1,-warn-as-error,-old-base,-network23,+network-uri,-conduit10
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
 
 MY_PN="HTTP"
 MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="A library for client-side HTTP"
 HOMEPAGE="https://github.com/haskell/HTTP"
@@ -19,19 +20,13 @@ SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
-IUSE="conduit10 +network-uri"
-
-RESTRICT=test # requires network
 
-RDEPEND=">=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
-	>=dev-haskell/parsec-2.0:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2.4:=[profile?] <dev-haskell/network-2.6:=[profile?] )
+RDEPEND=">=dev-lang/ghc-8.4.3:=
+	>=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?]
+	>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
+	>=dev-haskell/cabal-2.2.0.1
 	test? ( >=dev-haskell/httpd-shed-0.4 <dev-haskell/httpd-shed-0.5
 		>=dev-haskell/hunit-1.2.0.1 <dev-haskell/hunit-1.7
 		>=dev-haskell/puremd5-0.2.4 <dev-haskell/puremd5-2.2
@@ -40,20 +35,11 @@ DEPEND="${RDEPEND}
 		>=dev-haskell/test-framework-hunit-0.3.0 <dev-haskell/test-framework-hunit-0.4 )
 "
 
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'base >= 4.3.0.0 && < 4.14' 'base >= 4.3.0.0'
-}
-
 src_configure() {
 	haskell-cabal_src_configure \
-		$(cabal_flag conduit10 conduit10) \
+		--flag=-conduit10 \
 		--flag=-mtl1 \
-		$(cabal_flag network-uri network-uri) \
+		--flag=network-uri \
 		--flag=-network23 \
 		--flag=-old-base \
 		--flag=-warn-as-error \
diff --git a/dev-haskell/http/http-4000.4.1.ebuild b/dev-haskell/http/http-4000.4.1.ebuild
new file mode 100644
index 000000000000..cf5e8423a02d
--- /dev/null
+++ b/dev-haskell/http/http-4000.4.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.7.1.2.9999
+#hackport: flags: -warp-tests,-mtl1,-warn-as-error,-old-base,-network23,+network-uri,-conduit10
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="HTTP"
+MY_P="${MY_PN}-${PV}"
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A library for client-side HTTP"
+HOMEPAGE="https://github.com/haskell/HTTP"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?]
+	>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/httpd-shed-0.4 <dev-haskell/httpd-shed-0.5
+		>=dev-haskell/hunit-1.2.0.1 <dev-haskell/hunit-1.7
+		>=dev-haskell/puremd5-0.2.4 <dev-haskell/puremd5-2.2
+		>=dev-haskell/split-0.1.3 <dev-haskell/split-0.3
+		>=dev-haskell/test-framework-0.2.0 <dev-haskell/test-framework-0.9
+		>=dev-haskell/test-framework-hunit-0.3.0 <dev-haskell/test-framework-hunit-0.4 )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		--flag=-conduit10 \
+		--flag=-mtl1 \
+		--flag=network-uri \
+		--flag=-network23 \
+		--flag=-old-base \
+		--flag=-warn-as-error \
+		--flag=-warp-tests
+}
diff --git a/dev-haskell/http/metadata.xml b/dev-haskell/http/metadata.xml
index b45d3251d695..35fde4e13547 100644
--- a/dev-haskell/http/metadata.xml
+++ b/dev-haskell/http/metadata.xml
@@ -10,19 +10,19 @@
 		HTTP connections, transmitting requests and processing the responses coming back, all
 		from within the comforts of Haskell. It's dependent on the network package to operate,
 		but other than that, the implementation is all written in Haskell.
-		
+
 		A basic API for issuing single HTTP requests + receiving responses is provided. On top
 		of that, a session-level abstraction is also on offer  (the @BrowserAction@ monad);
 		it taking care of handling the management of persistent connections, proxies,
 		state (cookies) and authentication credentials required to handle multi-step
 		interactions with a web server.
-		
+
 		The representation of the bytes flowing across is extensible via the use of a type class,
 		letting you pick the representation of requests and responses that best fits your use.
 		Some pre-packaged, common instances are provided for you (@ByteString@, @String@.)
-		
+
 		Here's an example use:
-		
+
 		&gt;
 		&gt;    do
 		&gt;      rsp &lt;- Network.HTTP.simpleHTTP (getRequest "http://www.haskell.org/")
@@ -35,13 +35,9 @@
 		&gt;               request $ getRequest "https://google.com/"
 		&gt;      fmap (take 100) (getResponseBody rsp)
 		&gt;
-		
+
 		Git repository available at &lt;https://github.com/haskell/HTTP.git&gt;
 	</longdescription>
-	<use>
-		<flag name="conduit10">Use version 1.0.x or below of the conduit package (for the test suite).</flag>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">haskell/HTTP</remote-id>
 	</upstream>
diff --git a/dev-haskell/onetuple/Manifest b/dev-haskell/onetuple/Manifest
index d8ebb8265cd0..27228cec4a4d 100644
--- a/dev-haskell/onetuple/Manifest
+++ b/dev-haskell/onetuple/Manifest
@@ -1,3 +1,4 @@
-DIST OneTuple-0.3.1.tar.gz 5148 BLAKE2B 114cb7d8ba0ff28b7ad2ff7b3874446259a9a88f18a8ff6114975e60f712c466cd31861cac4bc2bf47f02280c155b3f2eb2f0880f0f39dfb855f6ad1b6dd4d69 SHA512 92678ca3e05c6da7d60e460efa88dbd8c19f8ec6b149dc5a9a493f93bd944b7d0c3ac650a3c1ad9d3742bc2a8bfaef1bab8a6e4ba71ebbb1fc0c9f7a07c0906c
-EBUILD onetuple-0.3.1.ebuild 764 BLAKE2B 7f585276b87b956655bdaf45a14892477a334ee84bdcb61a54c7badbd4346276d12faaa0297628d56bce4f54da3a1d4081d3dee553daf62d4a9fd3cd0572aa26 SHA512 1074b0bcfbaf74f2c9f4c7e64d9749ef1954c3fa30887c6a42ec835be3f300b7f91ad5e371e3144e17d536593cdc2181d4db1a0d79639df5c1d8264165983287
+DIST onetuple-0.3.1-rev2.cabal 2262 BLAKE2B 8cc887f52d2dc6efba347c945c3d7e2075b0051259179e6e46c3a3c5bc53434cc03ba07d5d2fb4427a6a158fa716038478b1f6337c4721f1303369c7bbf95e08 SHA512 c665b01a6c234f90c662cc48b268ea970da8ba29b38c8cdd43426d9361d2d1b6a8f9ec56fd4166358c3be35d4b45373d7f83c7e1c650207173d5149d949681a0
+DIST onetuple-0.3.1.tar.gz 5148 BLAKE2B 114cb7d8ba0ff28b7ad2ff7b3874446259a9a88f18a8ff6114975e60f712c466cd31861cac4bc2bf47f02280c155b3f2eb2f0880f0f39dfb855f6ad1b6dd4d69 SHA512 92678ca3e05c6da7d60e460efa88dbd8c19f8ec6b149dc5a9a493f93bd944b7d0c3ac650a3c1ad9d3742bc2a8bfaef1bab8a6e4ba71ebbb1fc0c9f7a07c0906c
+EBUILD onetuple-0.3.1.ebuild 648 BLAKE2B 2529b4e226a06d988ece68c5e260b9841067141a4505c99d5ac5245bff6bf1050b9b142274a7f5932535e863f57286deb698ed286180a5e956cbcf8f20b9800c SHA512 33f6c62d97ac6c3f3a9ae3415778cb1acd4c4ae6ab11fe12a31d9bb722ba7b885833c09fccc28f93bdcba2961628adf18b33e448d17ec1e222d92384bcaa0426
 MISC metadata.xml 250 BLAKE2B 3adf9597d5114c480b4cc9fb5c3e231d8475b795cd6dce77986e13583ab6e59b43857cf2328570490abef0062a8b8a6b73d231867f9b62124855515cdc044d6d SHA512 5ef2c1d34a3438b39a38c041d45bb06bd0f1ae8a3f8b971bd5aaf36dee560f380e9abefab0c2a4cd7b518e151f5c6a0d0c7cd53caee9a384818f1bdc7deeadc4
diff --git a/dev-haskell/onetuple/onetuple-0.3.1.ebuild b/dev-haskell/onetuple/onetuple-0.3.1.ebuild
index c48f928ad58f..fd5f34ec6e41 100644
--- a/dev-haskell/onetuple/onetuple-0.3.1.ebuild
+++ b/dev-haskell/onetuple/onetuple-0.3.1.ebuild
@@ -13,12 +13,10 @@ inherit haskell-cabal
 
 DESCRIPTION="Singleton Tuple"
 HOMEPAGE="https://hackage.haskell.org/package/OneTuple"
-SRC_URI="https://hackage.haskell.org/package/${CABAL_PN}/${CABAL_PN}-${PV}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-S="${WORKDIR}/${CABAL_PN}-${PV}"
 
 RDEPEND=">=dev-haskell/base-orphans-0.8.6:=[profile?]
 	>=dev-haskell/hashable-1.3.5.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
diff --git a/dev-haskell/yaml/Manifest b/dev-haskell/yaml/Manifest
index 2e4d048be6d9..1f7179635392 100644
--- a/dev-haskell/yaml/Manifest
+++ b/dev-haskell/yaml/Manifest
@@ -1,3 +1,3 @@
-DIST yaml-0.11.5.0.tar.gz 30049 BLAKE2B 96e7d8b39ac392ac927a61991a2c645dd564e36a7676984193e447ad591bddedb9029136aa6f71c65a0665a05516f907a0151b85d7e7f22169d7d5ddc98e6c5d SHA512 a4209cdbe75413191aed5a72f13a0cc4af04906a3e8ce629711689624f334b31681dcfc2fc89fdae20a874c5e6831e9663a30188d34d8067491ff8958912930b
-EBUILD yaml-0.11.5.0.ebuild 1447 BLAKE2B bb4c5153892b6c9c1a8c88dcbc2ce8858065ee6d517049f2c14023b44e19688db86105b317862257da198c63becece04d42990220fbf4d138f3842c8dfd03f95 SHA512 df881eb513c30fa19dfef6451666ad02eb03a05b5560169c381993d6be27807a92b8ef3e5d1a5bc1f7524b31569e650ca6d92380a60fffc37c03a7f16dfc56c0
-MISC metadata.xml 779 BLAKE2B 37084534c009b52c9fe81c01805cc962e9c70df4a30e899ff64ec26e37ee516c73d9229d38ca7730ad531480e0b8a0adce1f933a1d61a35b6995e89a7d11a04f SHA512 065bff5d71ad7bd06352e8ee1a1422c6479370c5216b97921570c56389b1e192b960f1492c99b181e7054d31a3016a551af9f02d9f10a8694b5c7adf6f157f9f
+DIST yaml-0.11.8.0.tar.gz 31674 BLAKE2B a4c508eecb4e5b931e6832ceee0bd694fc6879cc6c3482a48e44c1b865207e3525c52cd51a9e2ec74a9ef98e1537f8d559151da80c0ef07351ace1665e5b5f09 SHA512 f47ae0a158bfd323e06ff31db348f916077882f4198b160c7f3f88e89ae0e62a9f17ff5ba29c15a1d74a52d040245613eced5267c38f9658d0a19007efb402f7
+EBUILD yaml-0.11.8.0.ebuild 1675 BLAKE2B 934c0b1a4ccb626c5a89d18a64e6167869c2a74f4d6daf6c69aef1943796424d86d2e5c3a7accda6bab58aa4a293e763701dfa914b72000affa4d782b68c4e29 SHA512 5ac93d35ce22a279698e993960475574d33e5d44f433209274719f680115a673f54f96095b2122a1571db510f0d3e1fba72aceb0cec2d442694d83fabc5e0b75
+MISC metadata.xml 807 BLAKE2B 75d34a7e6b7c7b265990b2df5e2b1c9b1f061e49902451171356314c39fa09950a1308ea68cf95fca409776282a6377bbc707c493224e88adcfca56fe4472f5d SHA512 9242395c3a196123d1b9b8e4a8adf7d01cfbd1b70d1a93c1bb5203cc1d46eb48b751aab88d2875ad5729e578cd8218d5ffad1a3fc6f4b2c4c3f2905693c6b797
diff --git a/dev-haskell/yaml/metadata.xml b/dev-haskell/yaml/metadata.xml
index 2eae49bd2eae..3d126b223c2e 100644
--- a/dev-haskell/yaml/metadata.xml
+++ b/dev-haskell/yaml/metadata.xml
@@ -7,14 +7,14 @@
 	</maintainer>
 	<longdescription>
 		Provides support for parsing and emitting Yaml documents.
-		
+
 		This package includes the full libyaml C library version 0.1.12 by Kirill
 		Simonov (&lt;http://pyyaml.org/wiki/LibYAML&gt;) in the package so you
 		don't need to worry about any non-Haskell dependencies.
 	</longdescription>
 	<use>
-		<flag name="no-examples">don't build the examples</flag>
-		<flag name="no-exe">don't install the yaml2json executable</flag>
+		<flag name="examples">Install the haskell-yaml-examples executable</flag>
+		<flag name="executable">Install the yaml2json and json2yaml executables</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">snoyberg/yaml</remote-id>
diff --git a/dev-haskell/yaml/yaml-0.11.5.0.ebuild b/dev-haskell/yaml/yaml-0.11.8.0.ebuild
index ec7829b83f61..a1a113a969b2 100644
--- a/dev-haskell/yaml/yaml-0.11.5.0.ebuild
+++ b/dev-haskell/yaml/yaml-0.11.8.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.6.9999
+# ebuild generated by hackport 0.7.1.1.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
 inherit haskell-cabal
@@ -15,33 +15,45 @@ SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE="+no-examples +no-exe"
+IUSE="examples executable"
 
 RDEPEND=">=dev-haskell/aeson-0.11:=[profile?]
 	>=dev-haskell/attoparsec-0.11.3.0:=[profile?]
 	>=dev-haskell/conduit-1.2.8:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
 	>=dev-haskell/libyaml-0.1:=[profile?] <dev-haskell/libyaml-0.2:=[profile?]
-	dev-haskell/mtl:=[profile?]
 	>=dev-haskell/resourcet-0.3:=[profile?] <dev-haskell/resourcet-1.3:=[profile?]
 	>=dev-haskell/scientific-0.3:=[profile?]
-	dev-haskell/text:=[profile?]
 	dev-haskell/unordered-containers:=[profile?]
 	dev-haskell/vector:=[profile?]
-	>=dev-lang/ghc-8.0.2:=
-	!no-examples? ( dev-haskell/raw-strings-qq:=[profile?] )
+	>=dev-lang/ghc-8.4.3:=
+	examples? ( dev-haskell/raw-strings-qq:=[profile?] )
+	executable? ( dev-haskell/optparse-applicative:=[profile?] )
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24.2.0
+	>=dev-haskell/cabal-2.2.0.1
 	test? ( dev-haskell/base-compat
 		>=dev-haskell/hspec-1.3
 		dev-haskell/hunit
 		dev-haskell/mockery
 		dev-haskell/temporary
-		no-examples? ( dev-haskell/raw-strings-qq ) )
+		!examples? ( dev-haskell/raw-strings-qq ) )
 "
 
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'executable examples' 'executable haskell-yaml-examples'
+}
+
 src_configure() {
+	local examples_flag="no-examples"
+	use examples && examples_flag="-no-examples"
+
+	local exe_flag="no-exe"
+	use executable && exe_flag="-no-exe"
+
 	haskell-cabal_src_configure \
-		$(cabal_flag no-examples no-examples) \
-		$(cabal_flag no-exe no-exe)
+		--flag="${examples_flag}" \
+		--flag="${exe_flag}"
 }