diff --git a/dev-haskell/cabal-install/Manifest b/dev-haskell/cabal-install/Manifest
index 1e6e6e5555218..7685c019d85e7 100644
--- a/dev-haskell/cabal-install/Manifest
+++ b/dev-haskell/cabal-install/Manifest
@@ -1 +1,2 @@
+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
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
similarity index 66%
rename from dev-haskell/cabal-install/cabal-install-3.4.1.0-r2.ebuild
rename to dev-haskell/cabal-install/cabal-install-3.4.1.0-r3.ebuild
index 50a8c1fcbfc78..0c5326fc9d732 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"
 
-RDEPEND=">=dev-haskell/async-2.0:= <dev-haskell/async-2.3:=
+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:=
 	>=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/metadata.xml b/dev-haskell/cabal-install/metadata.xml
index 1e8264cabe176..9025779d67979 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>