dev-haskell/diagrams-core: bump to 1.4.2-r1, allow newer linear

This pulls from upstream's revision on hackage. Upstream still has not
updated for newer base, but there is [an issue][1] open.

[1]: diagrams/diagrams-core#112

Signed-off-by: Wolfgang E. Sanyer <[email protected]>

dev-haskell/diagrams-core/Manifest

@@ -1 +1,2 @@
 DIST diagrams-core-1.4.2.tar.gz 52710 BLAKE2B 4ea7e8026d06fed942862307f8c02bf828495d91976ec171e4ad3ab94574f69ed9395ea7209de49a8ac93389567945c98ae3615020b20266ec21027836b164cf SHA512 4fbee285d117f6d51f010df6ad9bec4d2f5d99b80b9527764b42511bb68478293548bee370afbffeb3c8ec773708581b91f570d2bd02fb50a40586e9d6e90e63
+DIST diagrams-core.cabal 2997 BLAKE2B 00496feb62206b24d3b540ba5a1e80be133f8fec2ad3a1270b70c313611fda8658d478750eaa3dc91a868961981e83cf7447806695b424e1c785e46d4f707407 SHA512 ac8a6d626fb5e2200e0fb4aa6620d7c011cd6a5fe83d62bfb36748b7868862e6febd7f8db2376f690742c38e1cbccca4eedad21e58ac05d60ffe39c772500997

dev-haskell/diagrams-core/diagrams-core-1.4.2.ebuild → dev-haskell/diagrams-core/diagrams-core-1.4.2-r1.ebuild

@@ -1,16 +1,19 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-# ebuild generated by hackport 0.6.1.9999
+# ebuild generated by hackport 0.6.7.9999
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 inherit haskell-cabal
 
 DESCRIPTION="Core libraries for diagrams EDSL"
 HOMEPAGE="http://projects.haskell.org/diagrams"
-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/1.cabal -> ${PN}.cabal
+	"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
@@ -20,8 +23,8 @@ IUSE=""
 RDEPEND=">=dev-haskell/adjunctions-4.0:=[profile?] <dev-haskell/adjunctions-5.0:=[profile?]
 	>=dev-haskell/distributive-0.2.2:=[profile?] <dev-haskell/distributive-1.0:=[profile?]
 	>=dev-haskell/dual-tree-0.2:=[profile?] <dev-haskell/dual-tree-0.3:=[profile?]
-	>=dev-haskell/lens-4.0:=[profile?]
-	>=dev-haskell/linear-1.11.3:=[profile?] <dev-haskell/linear-1.21:=[profile?]
+	>=dev-haskell/lens-4.0:=[profile?] <dev-haskell/lens-4.20:=[profile?]
+	>=dev-haskell/linear-1.11.3:=[profile?] <dev-haskell/linear-1.22:=[profile?]
 	>=dev-haskell/monoid-extras-0.3:=[profile?] <dev-haskell/monoid-extras-0.6:=[profile?]
 	dev-haskell/mtl:=[profile?]
 	>=dev-haskell/profunctors-5.0:=[profile?] <dev-haskell/profunctors-6.0:=[profile?]
@@ -33,11 +36,13 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.18
 "
 
-src_prepare() {
+src_prepare(){
 	default
 
+	# Pulled from upstream revision on hackage
+	cp "${DISTDIR}/${PN}.cabal" "${S}" || die
+
+	# upstream has not updated this yet
 	cabal_chdeps \
-		'base >= 4.2 && < 4.14' 'base >= 4.2' \
-		'containers >= 0.4.2 && < 0.7' 'containers >= 0.4.2' \
-		'lens >= 4.0 && < 4.19' 'lens >= 4.0'
+		'base >= 4.2 && < 4.14' 'base >= 4.2'
 }

dev-haskell/diagrams-core/metadata.xml

@@ -5,9 +5,4 @@
 		<email>[email protected]</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		The core modules underlying diagrams,
-		an embedded domain-specific language
-		for compositional, declarative drawing.
-	</longdescription>
 </pkgmetadata>