diff --git a/dev-haskell/witherable/Manifest b/dev-haskell/witherable/Manifest
index 747251cd78430..90832bc1f8092 100644
--- a/dev-haskell/witherable/Manifest
+++ b/dev-haskell/witherable/Manifest
@@ -1,2 +1,2 @@
-DIST witherable-0.4.2-rev2.cabal 2285 BLAKE2B 973c4d8502b8f4441b6d0bc9d8684f9a5bb750b89868bf393c27c3eef0a36de548821891b0745df804efc6d7f0f75bf41e5a101cf5d461e52824e687b5261e60 SHA512 839310a6771e4a1de5241528c5ff78de78b0ddb22597c30059cae1cb79ec9d3779f90ef345eed96eab7907e41a83ca73a9a0ce25185e57a3bc282d8704827e3b
+DIST witherable-0.4.2-rev4.cabal 2342 BLAKE2B c33bfbe39c7a7a17ebfd156a30155cadc50f8ae6c852caef3f8c3853fd75d0cef24c6cb86270f8b8860790bb17f0fad41d995786a44bbf9d34b35369f34d9027 SHA512 a2170aa691bb07dd39da3d09192836a30d4d2dbf3e499bf19112369deedc64b946baaa890d5cbd2aaa964cd40b3bc2f491a4b19404d2d592d883ec814d867927
 DIST witherable-0.4.2.tar.gz 11876 BLAKE2B 58294fc66aa0e60cbb3a75b73ddc89ed3bb64ba62c2a462028afdfe0a86c219cb80db8a008c6abd9c5688fb684c05f2156dd51c796efd586a1a2f72a30ca7e7e SHA512 14ad590e24b93fc25f16fecaf71d6f9f891a903dd76e052d9f6c21b464f0d28df4f019d33ac36086341a6c5bd20833d7b0c2d19543460d1530899c0c25cea852
diff --git a/dev-haskell/witherable/metadata.xml b/dev-haskell/witherable/metadata.xml
index 9373815219443..1db55be5ffc8c 100644
--- a/dev-haskell/witherable/metadata.xml
+++ b/dev-haskell/witherable/metadata.xml
@@ -5,4 +5,8 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="hackage">witherable</remote-id>
+		<remote-id type="github">fumieval/witherable</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-haskell/witherable/witherable-0.4.2.ebuild b/dev-haskell/witherable/witherable-0.4.2-r1.ebuild
similarity index 53%
rename from dev-haskell/witherable/witherable-0.4.2.ebuild
rename to dev-haskell/witherable/witherable-0.4.2-r1.ebuild
index 2525331e904e8..6fb6284e0924d 100644
--- a/dev-haskell/witherable/witherable-0.4.2.ebuild
+++ b/dev-haskell/witherable/witherable-0.4.2-r1.ebuild
@@ -3,46 +3,35 @@
 
 EAPI=8
 
-# ebuild generated by hackport 0.7.1.1.9999
+# ebuild generated by hackport 0.8.4.0.9999
+
+CABAL_HACKAGE_REVISION=4
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
-CABAL_HACKAGE_REVISION="2"
 inherit haskell-cabal
 
 DESCRIPTION="filterable traversable"
 HOMEPAGE="https://github.com/fumieval/witherable"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz
-	https://hackage.haskell.org/package/${P}/revision/${CABAL_HACKAGE_REVISION}.cabal
-		-> ${P}-rev${CABAL_HACKAGE_REVISION}.cabal"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 
-RDEPEND=">=dev-haskell/base-orphans-0.8.4:=[profile?] <dev-haskell/base-orphans-0.9:=[profile?]
+RDEPEND="
+	>=dev-haskell/base-orphans-0.8.4:=[profile?] <dev-haskell/base-orphans-0.10:=[profile?]
 	>=dev-haskell/hashable-1.2.7.0:=[profile?] <dev-haskell/hashable-1.5:=[profile?]
 	>=dev-haskell/indexed-traversable-0.1.1:=[profile?] <dev-haskell/indexed-traversable-0.2:=[profile?]
 	>=dev-haskell/indexed-traversable-instances-0.1:=[profile?] <dev-haskell/indexed-traversable-instances-0.2:=[profile?]
 	>=dev-haskell/unordered-containers-0.2.12.0:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
-	>=dev-haskell/vector-0.12.2.0:=[profile?] <dev-haskell/vector-0.13:=[profile?]
-	>=dev-lang/ghc-8.4.3:=
+	>=dev-haskell/vector-0.12.2.0:=[profile?] <dev-haskell/vector-0.14:=[profile?]
+	>=dev-lang/ghc-8.8.1:=
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.4
-	test? ( >=dev-haskell/quickcheck-2.14.2
+	>=dev-haskell/cabal-3.0.0.0
+	test? (
+		>=dev-haskell/quickcheck-2.14.2
 		dev-haskell/quickcheck-instances
 		dev-haskell/tasty
-		dev-haskell/tasty-quickcheck )
+		dev-haskell/tasty-quickcheck
+	)
 "
-BDEPEND="app-text/dos2unix"
-
-src_prepare() {
-	# pull revised cabal from upstream
-	cp "${DISTDIR}/${P}-rev${CABAL_HACKAGE_REVISION}.cabal" "${S}/${PN}.cabal" || die
-
-	# Convert to unix line endings
-	dos2unix "${S}/${PN}.cabal" || die
-
-	# Apply patches *after* pulling the revised cabal
-	default
-}