dev-haskell/diagrams-lib: bump to 1.4.3-r1, allows newer linear.

The linear change is per upstream. There is [a ticket][1] open for
bumping `base`.

[1]: diagrams/diagrams-core#112

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

dev-haskell/diagrams-lib/Manifest

@@ -1 +1,2 @@
 DIST diagrams-lib-1.4.3.tar.gz 199116 BLAKE2B b0348ae07c7a42aff85081e4043776225855eb3b607610631d5c5ea3e45e59e0f1204effea343f0ca6435e3eec03e5453ae3175adb57b6425e31eeafa395e408 SHA512 a2328074704b5c2c91e284b2de8dc87c1a1c116ebb5986db08642a3d5f28db19502c92bd282abd201f4d5335aeca141859c6e7ca4698c5b5d6273d1b82617a79
+DIST diagrams-lib.cabal 8232 BLAKE2B b206e48cbe6d71c342630c1ce809c3226d3b2ad3a0fd7b1881c7636a11734c47254ebdabdfe183f1b47c67a0c9e1680863f334a791d8dd72a85bd921559555e4 SHA512 39b7d38bdeec47767fc94471d31b081aac0bbc1da6d4aabc6a98b31c2bbb176630cc7485e8069a5e996dfc2049abbd3203b031c4c4ce026cb46a1f1170f856bd

dev-haskell/diagrams-lib/diagrams-lib-1.4.3.ebuild → dev-haskell/diagrams-lib/diagrams-lib-1.4.3-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 test-suite"
 inherit haskell-cabal
 
 DESCRIPTION="Embedded domain-specific language for declarative graphics"
 HOMEPAGE="http://diagrams.github.io"
-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}"
@@ -34,9 +37,9 @@ RDEPEND=">=dev-haskell/active-0.2:=[profile?] <dev-haskell/active-0.3:=[profile?
 	>=dev-haskell/fsnotify-0.2.1:=[profile?] <dev-haskell/fsnotify-0.4:=[profile?]
 	>=dev-haskell/hashable-1.1:=[profile?] <dev-haskell/hashable-1.4:=[profile?]
 	>=dev-haskell/intervals-0.7:=[profile?] <dev-haskell/intervals-0.10:=[profile?]
-	>=dev-haskell/juicypixels-3.3.4:=[profile?]
-	>=dev-haskell/lens-4.6:=[profile?]
-	>=dev-haskell/linear-1.20.1:=[profile?] <dev-haskell/linear-1.21:=[profile?]
+	>=dev-haskell/juicypixels-3.3.4:=[profile?] <dev-haskell/juicypixels-3.4:=[profile?]
+	>=dev-haskell/lens-4.6:=[profile?] <dev-haskell/lens-4.20:=[profile?]
+	>=dev-haskell/linear-1.20.1:=[profile?] <dev-haskell/linear-1.22:=[profile?]
 	>=dev-haskell/monoid-extras-0.3:=[profile?] <dev-haskell/monoid-extras-0.6:=[profile?]
 	>=dev-haskell/mtl-2.0:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
 	>=dev-haskell/optparse-applicative-0.11:=[profile?]
@@ -51,22 +54,18 @@ DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.22.2.0
 	test? ( dev-haskell/numeric-extras
 		>=dev-haskell/quickcheck-2.7
-		>=dev-haskell/tasty-0.10
-		>=dev-haskell/tasty-hunit-0.9.2
-		>=dev-haskell/tasty-quickcheck-0.8 )
+		>=dev-haskell/tasty-0.10 <dev-haskell/tasty-1.3
+		>=dev-haskell/tasty-hunit-0.9.2 <dev-haskell/tasty-hunit-0.11
+		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
 "
 
 src_prepare() {
 	default
 
+	# pull in dep bumps from upstream
+	cp "${DISTDIR}/${PN}.cabal" "${S}" || die
+
+	# upstream has not bumped this yet
 	cabal_chdeps \
-		'base >= 4.8 && < 4.14' 'base >= 4.8' \
-		'containers >= 0.3 && < 0.7' 'containers >= 0.3' \
-		'JuicyPixels >= 3.3.4 && < 3.4' 'JuicyPixels >= 3.3.4' \
-		'lens >= 4.6 && < 4.19' 'lens >= 4.6' \
-		'tasty >= 0.10 && < 1.3' 'tasty >= 0.10' \
-		'tasty-hunit >= 0.9.2 && < 0.11' 'tasty-hunit >= 0.9.2' \
-		'tasty-quickcheck >= 0.8 && < 0.11' 'tasty-quickcheck >= 0.8' \
-		'deepseq >= 1.3 && < 1.5' 'deepseq >= 1.3' \
-		'optparse-applicative >= 0.11 && < 0.16' 'optparse-applicative >= 0.11'
+		'base >= 4.8 && < 4.14' 'base >= 4.8'
 }

dev-haskell/diagrams-lib/metadata.xml

@@ -5,13 +5,4 @@
 		<email>[email protected]</email>
 		<name>Gentoo Haskell</name>
 	</maintainer>
-	<longdescription>
-		Diagrams is a flexible, extensible EDSL for creating
-		graphics of many types.  Graphics can be created
-		in arbitrary vector spaces and rendered with
-		multiple backends.  diagrams-lib provides a
-		standard library of primitives and operations for
-		creating diagrams.  To get started using it, see
-		"Diagrams.Prelude".
-	</longdescription>
 </pkgmetadata>