gentoo auto-resync : 24:07:2022 - 08:52:43

2 files changed, 24 insertions, 28 deletions

diff --git a/dev-vcs/darcs/Manifest b/dev-vcs/darcs/Manifest
index 44799d6bf789..c5db76961dc8 100644
--- a/dev-vcs/darcs/Manifest
+++ b/dev-vcs/darcs/Manifest
@@ -1,3 +1,3 @@
-DIST darcs-2.16.3.tar.gz 1244848 BLAKE2B 59754a782a456b3c6bba2b382d485b5de00ae3fc7ac1107bcf89877aff9650eb823704eb23912a83643685612a0cfc84ccf2af2303b52249d9e7a3e55c08c7b7 SHA512 267787c5b3111a20158858b42a8b9c2698b80dc40f7d340175e26d74b955643cefffc2f4de9811fa26464eac2e79913150fb3cd73871275725d10a690b9d73c3
-EBUILD darcs-2.16.3.ebuild 4835 BLAKE2B 0bda137c9f96c86958b8d70b71f449d14bd0a96d546e35f3179fbc89e21fad8ff62ebd7c1fc80c803a32e1eda3d503bd10d37688caa09043c40bf0cdc48e5260 SHA512 b7fd2dd9787a161ed6a56e42715bb96cbe6df49f0dd6023265834c1fadf8775e8fdf6bcc5f355021eae8c518c25877002f12aaebcdb6401a891c28e6a9fc7e20
+DIST darcs-2.16.5.tar.gz 1271154 BLAKE2B 84c9005d7bcb789cfa5d1de636221e7647ac469aa9f1e27d55bb07a8b155659d38dbda8a46b98698f348248b0384b4e5bc275737bfede13ebb1a9d11b4e9e304 SHA512 9116043943315417ff314197f6a143435b5545f614c6e6210c3645987a68c69c31f53f823ee5269cb663ccba393f8caf1834120783f15128e43b132c731a0edb
+EBUILD darcs-2.16.5-r1.ebuild 4453 BLAKE2B 49733306f86adfa46a61e07bf50b21c9bfd7af1ce5718cc2225c85586cb5446bafbe56a012f3eda098b37247feb5d4953cd8930cf1c3afbe48efcc98e8e49e62 SHA512 82930faee75a24f7ff1fd229faf91f38cef201e23b0971c595434f1e7e468e131bbd998ced4dc662310002c212f07c668af4c92ae4cb1940a60d4d913269a263
 MISC metadata.xml 379 BLAKE2B a437683b8b43bef45eb5699a266fa9f88c313e6b2dfd1958982e2361bc4f6f8bb754a3d41b5a3ea91fb8b349b28964abfc3c32288f53c564a85188fa51dd76a4 SHA512 29ac12aacafa66083093e2dfc756aced8961483d11f22c633f4b8be1531a47c3ccec7eddad3577fe82a9dc8aa050b88e268595d94e13f4abc01932b596c5f241
diff --git a/dev-vcs/darcs/darcs-2.16.3.ebuild b/dev-vcs/darcs/darcs-2.16.5-r1.ebuild
index f1500273e84b..d93747a6b4f9 100644
--- a/dev-vcs/darcs/darcs-2.16.3.ebuild
+++ b/dev-vcs/darcs/darcs-2.16.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-# ebuild generated by hackport 0.6.6.9999
+# ebuild generated by hackport 0.7.1.1.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"
@@ -18,52 +18,47 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="curl +terminfo +threaded"
 
-RESTRICT=test # conflict-fight-failure (Darcs3) (PatienceDiff): [Failed]
-
 RDEPEND=">=dev-haskell/async-2.0.2:=[profile?] <dev-haskell/async-2.3:=[profile?]
-	>=dev-haskell/attoparsec-0.13.0.1:=[profile?] <dev-haskell/attoparsec-0.14:=[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/constraints-0.13:=[profile?]
-	>=dev-haskell/cryptonite-0.24:=[profile?] <dev-haskell/cryptonite-0.28:=[profile?]
+	>=dev-haskell/constraints-0.11:=[profile?]
+	>=dev-haskell/cryptonite-0.24:=[profile?] <dev-haskell/cryptonite-0.30:=[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/hashable-1.2.3.3:=[profile?] <dev-haskell/hashable-1.4:=[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.16:=[profile?]
+	>=dev-haskell/memory-0.14:=[profile?] <dev-haskell/memory-0.17:=[profile?]
 	>=dev-haskell/mmap-0.5.9:=[profile?] <dev-haskell/mmap-0.6:=[profile?]
-	>=dev-haskell/mtl-2.2.1:=[profile?] <dev-haskell/mtl-2.3:=[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-compat-tdfa-0.95.1:=[profile?] <dev-haskell/regex-compat-tdfa-0.96:=[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.3.2:=[profile?]
 	>=dev-haskell/stm-2.1:=[profile?] <dev-haskell/stm-2.6:=[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/text-1.2.1.3:=[profile?] <dev-haskell/text-1.3:=[profile?]
 	>=dev-haskell/unix-compat-0.5:=[profile?] <dev-haskell/unix-compat-0.6:=[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.2.1:=
+	>=dev-lang/ghc-8.4.3:=
 	curl? ( net-misc/curl )
-	terminfo? ( >=dev-haskell/terminfo-0.4.0.2:=[profile?] <dev-haskell/terminfo-0.5:=[profile?] )
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2 <dev-haskell/cabal-3.3
+	>=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/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
 		>=dev-haskell/monad-control-0.3.2 <dev-haskell/monad-control-1.1
-		>=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-2.14
+		>=dev-haskell/quickcheck-2.13 <dev-haskell/quickcheck-2.15
 		<dev-haskell/system-fileio-0.4
 		>=dev-haskell/system-filepath-0.4.7 <dev-haskell/system-filepath-0.5
 		>=dev-haskell/test-framework-0.8.1.1 <dev-haskell/test-framework-0.9
@@ -74,6 +69,15 @@ DEPEND="${RDEPEND}
 	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'
+}
+
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag curl curl) \
@@ -89,11 +93,3 @@ src_configure() {
 		$(cabal_flag threaded threaded) \
 		--flag=-warn-as-error
 }
-
-src_install() {
-		haskell-cabal_src_install
-
-		# fixup perms in such an awkward way
-		mv "${ED}/usr/share/man/man1/darcs.1" "${S}/darcs.1" || die "darcs.1 not found"
-		doman "${S}/darcs.1"
-}