dev-vcs/darcs: Revision bump

Loosen constraints on various packages

Signed-off-by: hololeap <hololeap@protonmail.com>
Signed-off-by: Sam James <sam@gentoo.org>

2 files changed, 54 insertions, 31 deletions

diff --git a/dev-vcs/darcs/darcs-2.16.5-r2.ebuild b/dev-vcs/darcs/darcs-2.16.5-r5.ebuild
index 08e3e750800a..a6159b1da38d 100644
--- a/dev-vcs/darcs/darcs-2.16.5-r2.ebuild
+++ b/dev-vcs/darcs/darcs-2.16.5-r5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-# ebuild generated by hackport 0.7.1.1.9999
+# ebuild generated by hackport 0.8.4.0.9999
 #hackport: flags: +library,+executable,-hpc,-warn-as-error,+pkgconfig,-rts,-static,-optimize,hashed-storage-diff:diff,+http
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
@@ -11,49 +11,67 @@ inherit haskell-cabal
 
 DESCRIPTION="a distributed, interactive, smart revision control system"
 HOMEPAGE="http://darcs.net/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0/${PV}"
 KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="curl +terminfo +threaded"
 
-RDEPEND=">=dev-haskell/async-2.0.2:=[profile?] <dev-haskell/async-2.3:=[profile?]
+CABAL_CHDEPS=(
+	'constraints       >= 0.11 && < 0.13' 'constraints >=0.11'
+	'hashable          >= 1.2.3.3 && < 1.4' 'hashable >=1.2.3.3'
+	'attoparsec        >= 0.13.0.1 && < 0.14' 'attoparsec >=0.13.0.1'
+	'regex-tdfa        >= 1.3.1.0 && < 1.3.2' 'regex-tdfa        >= 1.3.1.0'
+	'cryptonite        >= 0.24 && < 0.30' 'cryptonite >=0.24'
+	'memory            >= 0.14 && < 0.17' 'memory >= 0.14'
+	'fgl               >= 5.5.2.3 && < 5.8' 'fgl >=5.5.2.3'
+	'base      >= 4.10 && < 4.16' 'base >= 4.10'
+	'base              >= 4.10 && < 4.16' 'base >= 4.10'
+	'bytestring        >= 0.10.6 && < 0.11' 'bytestring >= 0.10.6'
+	'time              >= 1.5.0.1 && < 1.10' 'time >= 1.5.0.1'
+	'unix-compat       >= 0.5 && < 0.6' 'unix-compat >= 0.5'
+)
+
+RDEPEND="
+	>=dev-haskell/async-2.0.2:=[profile?] <dev-haskell/async-2.3:=[profile?]
 	>=dev-haskell/attoparsec-0.13.0.1:=[profile?]
 	>=dev-haskell/base16-bytestring-0.1.1.7:=[profile?] <dev-haskell/base16-bytestring-1.1:=[profile?]
 	>=dev-haskell/conduit-1.3.0:=[profile?] <dev-haskell/conduit-1.4:=[profile?]
 	>=dev-haskell/constraints-0.11:=[profile?]
-	>=dev-haskell/cryptonite-0.24:=[profile?] <dev-haskell/cryptonite-0.30:=[profile?]
+	>=dev-haskell/cryptonite-0.24:=[profile?]
 	>=dev-haskell/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?]
-	>=dev-haskell/fgl-5.5.2.3:=[profile?] <dev-haskell/fgl-5.8:=[profile?]
+	>=dev-haskell/fgl-5.5.2.3:=[profile?]
 	>=dev-haskell/hashable-1.2.3.3:=[profile?]
 	>=dev-haskell/haskeline-0.7.2:=[profile?] <dev-haskell/haskeline-0.9:=[profile?]
 	>=dev-haskell/html-1.0.1.2:=[profile?] <dev-haskell/html-1.1:=[profile?]
 	>=dev-haskell/http-conduit-2.3:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?]
 	>=dev-haskell/http-types-0.12.1:=[profile?] <dev-haskell/http-types-0.12.4:=[profile?]
-	>=dev-haskell/memory-0.14:=[profile?] <dev-haskell/memory-0.17:=[profile?]
+	>=dev-haskell/memory-0.14:=[profile?]
 	>=dev-haskell/mmap-0.5.9:=[profile?] <dev-haskell/mmap-0.6:=[profile?]
 	>=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?]
 	>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.8:=[profile?]
 	>=dev-haskell/old-time-1.1.0.3:=[profile?] <dev-haskell/old-time-1.2:=[profile?]
+	>=dev-haskell/parsec-3.1.9:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
 	>=dev-haskell/regex-applicative-0.2:=[profile?] <dev-haskell/regex-applicative-0.4:=[profile?]
 	>=dev-haskell/regex-base-0.94.0.1:=[profile?] <dev-haskell/regex-base-0.94.1:=[profile?]
-	>=dev-haskell/regex-tdfa-1.3.1.0:=[profile?] <dev-haskell/regex-tdfa-1.4:=[profile?]
-	>=dev-haskell/stm-2.1:=[profile?] <dev-haskell/stm-2.6:=[profile?]
+	>=dev-haskell/regex-tdfa-1.3.1.0:=[profile?]
 	>=dev-haskell/tar-0.5:=[profile?] <dev-haskell/tar-0.6:=[profile?]
 	>=dev-haskell/temporary-1.2.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?]
-	>=dev-haskell/unix-compat-0.5:=[profile?] <dev-haskell/unix-compat-0.6:=[profile?]
+	>=dev-haskell/text-1.2.1.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/unix-compat-0.5:=[profile?]
 	>=dev-haskell/utf8-string-1:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
 	>=dev-haskell/vector-0.11:=[profile?] <dev-haskell/vector-0.13:=[profile?]
 	>=dev-haskell/zip-archive-0.3:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?]
 	>=dev-haskell/zlib-0.6.1.2:=[profile?] <dev-haskell/zlib-0.7.0.0:=[profile?]
-	>=dev-lang/ghc-8.4.3:=
-	curl? ( net-misc/curl )
+	>=dev-lang/ghc-8.10.6:=
+	curl? (
+		net-misc/curl
+	)
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.4 <dev-haskell/cabal-3.7
-	test? ( >=dev-haskell/cmdargs-0.10.10 <dev-haskell/cmdargs-0.11
-		>=dev-haskell/exceptions-0.6
+	>=dev-haskell/cabal-3.2.1.0 <dev-haskell/cabal-3.7
+	test? (
+		>=dev-haskell/cmdargs-0.10.10 <dev-haskell/cmdargs-0.11
 		>=dev-haskell/findbin-0.0.5 <dev-haskell/findbin-0.1
 		>=dev-haskell/hunit-1.3 <dev-haskell/hunit-1.7
 		>=dev-haskell/leancheck-0.9 <dev-haskell/leancheck-0.10
@@ -65,18 +83,18 @@ DEPEND="${RDEPEND}
 		>=dev-haskell/test-framework-hunit-0.3.0.2 <dev-haskell/test-framework-hunit-0.4
 		>=dev-haskell/test-framework-leancheck-0.0.1 <dev-haskell/test-framework-leancheck-0.1
 		>=dev-haskell/test-framework-quickcheck2-0.3.0.3 <dev-haskell/test-framework-quickcheck2-0.4
-		dev-haskell/transformers-base )
-	curl? ( virtual/pkgconfig )
+		dev-haskell/transformers-base
+	)
+	curl? (
+		virtual/pkgconfig
+	)
 "
 
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'constraints       >= 0.11 && < 0.13' 'constraints >=0.11' \
-		'hashable          >= 1.2.3.3 && < 1.4' 'hashable >=1.2.3.3' \
-		'attoparsec        >= 0.13.0.1 && < 0.14' 'attoparsec >=0.13.0.1' \
-		'regex-tdfa        >= 1.3.1.0 && < 1.3.2' 'regex-tdfa        >= 1.3.1.0'
+pkg_pretend() {
+	if use test; then
+		ewarn "Tests take a very long time to complete. You may want to disable them"
+		ewarn "on older machines."
+	fi
 }
 
 src_configure() {
diff --git a/dev-vcs/darcs/metadata.xml b/dev-vcs/darcs/metadata.xml
index 8bb74459783f..6a3e81bd0e0e 100644
--- a/dev-vcs/darcs/metadata.xml
+++ b/dev-vcs/darcs/metadata.xml
@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>haskell@gentoo.org</email>
-</maintainer>
-<use>
-  <flag name="terminfo">Use the terminfo package for enhanced console support.</flag>
-  <flag name="threaded">Use threading and SMP support.</flag>
-</use>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<use>
+		<flag name="curl">Use libcurl for HTTP support.</flag>
+		<flag name="terminfo">Use the terminfo package for enhanced console support.</flag>
+		<flag name="threaded">Use threading and SMP support.</flag>
+	</use>
+	<upstream>
+		<remote-id type="hackage">darcs</remote-id>
+	</upstream>
 </pkgmetadata>