diff --git a/dev-haskell/tar/Manifest b/dev-haskell/tar/Manifest
index 3d6a1a40e251f..0ef9757a471ce 100644
--- a/dev-haskell/tar/Manifest
+++ b/dev-haskell/tar/Manifest
@@ -1,2 +1,2 @@
-DIST tar-0.5.1.1-rev4.cabal 5459 BLAKE2B 6feab7587be8c2533c200cc9f57411f3cb4f5a31dbff09502c983c181b6dc0c8521e8db02fd0a3f14c3237dce4872d0adfe739452ed38252f7696dd80de80297 SHA512 aa1c41951d93ce368cffeb6a5ea43b70cca042557e0509c7901901710b2c01b715c37923e9325fb438ad83c2a50c8f227777641e9931700ba0bce6ae6d974200
+DIST tar-0.5.1.1-rev6.cabal 5459 BLAKE2B 5d5d32a2273b470406f0c373114108587657d560d1f75b30419af15a32bc2e6af5d210bd478ca2625f75027f0fdab824f9d4436a4815588eb94183d637b4a601 SHA512 53bacac3b92d359faab5b9a2124c6d95e03493063065a44dd4609267e27c055231fdd35ef48e4b0b494ea9bc973132b15c76f78bf86cf1ce189d7755e45d8d3e
 DIST tar-0.5.1.1.tar.gz 39155 BLAKE2B 8e85489e3b43044dab8ec4405413873c2be4d50cfd4a5adc80e3ec231428a120db1faa033d2e57643dad40f18a934a381f3d5657838aad42d2aa7eea951c1faf SHA512 8d0a8d3ae178570e0842a2321a7fc86a6bba28c471ec27bafbc07fc4ac0e4183f8113c99ebc7126dc71759c33083791122be32563fb0d5a2b2d39cb3b36171f2
diff --git a/dev-haskell/tar/metadata.xml b/dev-haskell/tar/metadata.xml
index 9373815219443..dde923e3418a6 100644
--- a/dev-haskell/tar/metadata.xml
+++ b/dev-haskell/tar/metadata.xml
@@ -5,4 +5,8 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="hackage">tar</remote-id>
+		<remote-id type="github">haskell/tar</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/tar/tar-0.5.1.1-r2.ebuild b/dev-haskell/tar/tar-0.5.1.1-r2.ebuild
deleted file mode 100644
index 50ba67936c3c3..0000000000000
--- a/dev-haskell/tar/tar-0.5.1.1-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# ebuild generated by hackport 0.7.1.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
-CABAL_HACKAGE_REVISION="4"
-inherit haskell-cabal
-RESTRICT="test" # Test deps need porting
-
-CABAL_FILE="${S}/${PN}.cabal"
-CABAL_DISTFILE="${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
-
-DESCRIPTION="Reading, writing and manipulating \".tar\" archive files"
-HOMEPAGE="https://hackage.haskell.org/package/tar"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
-	https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
-		-> ${CABAL_DISTFILE}"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
-
-RDEPEND=">=dev-lang/ghc-8.4.3:=
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2.0.1"
-#	test? ( dev-haskell/bytestring-handle
-#		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
-#		>=dev-haskell/tasty-0.10 <dev-haskell/tasty-1.5
-#		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
-
-BDEPEND="app-text/dos2unix"
-
-src_prepare() {
-	# pull revised cabal from upstream
-	cp "${DISTDIR}/${CABAL_DISTFILE}" "${CABAL_FILE}" || die
-
-	# Convert to unix line endings
-	dos2unix "${CABAL_FILE}" || die
-
-	# Apply patches *after* pulling the revised cabal
-	default
-}
diff --git a/dev-haskell/tar/tar-0.5.1.1-r3.ebuild b/dev-haskell/tar/tar-0.5.1.1-r3.ebuild
new file mode 100644
index 0000000000000..d4debed420635
--- /dev/null
+++ b/dev-haskell/tar/tar-0.5.1.1-r3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=6
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour" # test-suite
+inherit haskell-cabal
+RESTRICT="test" # Test deps need porting
+
+DESCRIPTION="Reading, writing and manipulating \".tar\" archive files"
+HOMEPAGE="https://hackage.haskell.org/package/tar"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-lang/ghc-8.8.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-3.0.0.0
+"
+#	test? (
+#		dev-haskell/bytestring-handle
+#		>=dev-haskell/quickcheck-2 <dev-haskell/quickcheck-3
+#		>=dev-haskell/tasty-0.10 <dev-haskell/tasty-1.5
+#		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11
+#	)