diff --git a/dev-haskell/force-layout/Manifest b/dev-haskell/force-layout/Manifest
index 0caff4b1aad..6a290eeac59 100644
--- a/dev-haskell/force-layout/Manifest
+++ b/dev-haskell/force-layout/Manifest
@@ -1 +1,2 @@
 DIST force-layout-0.4.0.6.tar.gz 5793 BLAKE2B e5d00491e934b04fb6f036c109a5743684834db2b772447fdcaf6ab5c017f6a920b00b86d257b3c2dbe50b4c3e168c55d8a24e5678ae60df9e73113047f416fc SHA512 09fd4f0baefaf7ac5a396dffac0e44bb51552fbc81e0c64ea7e86be76bb777fc7e79c174fa94cd1db12db96e84d4a54d2a36ecf230e3a66e6e26445005b9e57f
+DIST force-layout.cabal 1265 BLAKE2B 3306a7e6187e79bc4719043f7a4fbd267a716fd778248e4561fe188880c8e21faf6c5e2221a1f8beb65e4b7c1c7a1570042e8907d2171028c5e8143567d11e96 SHA512 2f840455dbfe66093531c8907a396ac545cbb059754e2dc66936781d0744d668ace72f104eabb1b18ae1fa99e74dfbd71dc95d9f8e3c8944219f75e6509df047
diff --git a/dev-haskell/force-layout/force-layout-0.4.0.6-r1.ebuild b/dev-haskell/force-layout/force-layout-0.4.0.6-r2.ebuild
similarity index 51%
rename from dev-haskell/force-layout/force-layout-0.4.0.6-r1.ebuild
rename to dev-haskell/force-layout/force-layout-0.4.0.6-r2.ebuild
index eca3d6dcf81..08d5179f751 100644
--- a/dev-haskell/force-layout/force-layout-0.4.0.6-r1.ebuild
+++ b/dev-haskell/force-layout/force-layout-0.4.0.6-r2.ebuild
@@ -1,16 +1,18 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-# ebuild generated by hackport 0.5.9999
+# ebuild generated by hackport 0.6.7.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Simple force-directed layout"
 HOMEPAGE="https://hackage.haskell.org/package/force-layout"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+SRC_URI="
+	https://hackage.haskell.org/package/${P}/${P}.tar.gz
+	https://hackage.haskell.org/package/${P}/revision/6.cabal -> ${PN}.cabal"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
@@ -18,8 +20,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-haskell/data-default-class-0.0.1:=[profile?] <dev-haskell/data-default-class-0.2:=[profile?]
-	>=dev-haskell/lens-3.0:=[profile?]
-	>=dev-haskell/linear-1.10:=[profile?] <dev-haskell/linear-1.21:=[profile?]
+	>=dev-haskell/lens-3.0:=[profile?] <dev-haskell/lens-4.20:=[profile?]
+	>=dev-haskell/linear-1.10:=[profile?] <dev-haskell/linear-1.22:=[profile?]
 	>=dev-lang/ghc-7.4.1:=
 "
 DEPEND="${RDEPEND}
@@ -29,8 +31,10 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	default
 
+	# upstream has fixed these upperbounds
+	cp "${DISTDIR}/${PN}.cabal" "${S}" || die
+
+	# upstream hasn't fixed this yet
 	cabal_chdeps \
-		'base >= 4.2 && < 4.10' 'base >= 4.2' \
-		'containers >=0.4 && < 0.6' 'containers >=0.4' \
-		'lens >= 3.0 && < 4.16' 'lens >= 3.0'
+		'base >= 4.2 && < 4.14' 'base >= 4.2'
 }
diff --git a/dev-haskell/force-layout/metadata.xml b/dev-haskell/force-layout/metadata.xml
index 140aae7a4a4..b7878815d80 100644
--- a/dev-haskell/force-layout/metadata.xml
+++ b/dev-haskell/force-layout/metadata.xml
@@ -5,9 +5,4 @@
 		<email>haskell@gentoo.org</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Simulation engine for doing simple force-based layout,
-		/e.g./ for trees or graphs.  See the diagrams-contrib package
-		for usage examples.
-	</longdescription>
 </pkgmetadata>