gentoo resync : 25.11.2020

3 files changed, 4 insertions, 34 deletions

diff --git a/dev-vcs/darcs/Manifest b/dev-vcs/darcs/Manifest
index c30987d52fe4..33fd33725092 100644
--- a/dev-vcs/darcs/Manifest
+++ b/dev-vcs/darcs/Manifest
@@ -1,6 +1,5 @@
-AUX darcs-2.16.1-curl.patch 563 BLAKE2B 764baffc6bcb8e64263969c037fa71ed745da2046176ba85b17edc8cb833c874e6d59b283b646c2ed894da4996b1bec1095d52293a9868a76871f7aff173b62d SHA512 9dae7654eece58a2f631a745bbe46a15c61a4e65cb5d9e29a52f12e29d3df2e1a92d94d38e54e9c4788c314507a168a39bd1ce249fcd2241e7e41bd7553e2b92
 DIST darcs-2.14.5.tar.gz 1063677 BLAKE2B 7f38aa09d5af53e68829a9181f1981eccd173e2af5a044d100758164b668297303aed947ffc579ea1977e4a1f2820d1954b5c5428e429e5ff42ee238e0043611 SHA512 75f89dc920eb9a417e86bcbf185b0ba35e284a0a0c6bbd27c7dec46c4f143f5c37f0559a1ff1b3d3bd39ebdca98fa3a7420bee5e179c1bef0b0fc203e04e0484
-DIST darcs-2.16.2.tar.gz 1242738 BLAKE2B b402c8b2987097d10c61ffd312cc58b788625759cf199a774af8efb9b001d8440705eed75f3dbdd3ca120256c5e2efb9ddda73e12da31b7b07ba9d10ca33de8b SHA512 ee43e570227a5f462e064b71323755d1179809c24ff83a904aefa32494c4655b41b4b3291411b5abc1e1e75be894cde6070aa072b51905ddf8fc2934973b25cb
+DIST darcs-2.16.3.tar.gz 1244848 BLAKE2B 59754a782a456b3c6bba2b382d485b5de00ae3fc7ac1107bcf89877aff9650eb823704eb23912a83643685612a0cfc84ccf2af2303b52249d9e7a3e55c08c7b7 SHA512 267787c5b3111a20158858b42a8b9c2698b80dc40f7d340175e26d74b955643cefffc2f4de9811fa26464eac2e79913150fb3cd73871275725d10a690b9d73c3
 EBUILD darcs-2.14.5.ebuild 4208 BLAKE2B ab83e211185599db01ee7e05f9fe35dadee0b292602fb79f5b933fcc82082d742647b402729c97968013e02f423f07fd7a4b651a1a31823e788e90a73be0b7e7 SHA512 d08c82089cd278b4683825df57062ed9cd661d76bd53f19e51839980f302ffb67abd244eb43b6aa625a68811b46a2597000b193ff1e54fd38df8812024d02ac6
-EBUILD darcs-2.16.2.ebuild 5005 BLAKE2B a22bc498035feee9afb69970bf50fa5bf481fc2dc6bc73ee1e20524d7ab4b5daa6af127058c07f80c86e74a8bc3b74a18668cd2be19c21d1d08c5fc90f4c205b SHA512 df43a2b57e713b550bb172c808cc7f167d562c00e33a447d783bdc29c9c91e6e86507ef2d8e56e267b313be9a316af9897311572a483cbf1cbbcdaed29afcede
+EBUILD darcs-2.16.3.ebuild 4835 BLAKE2B 0bda137c9f96c86958b8d70b71f449d14bd0a96d546e35f3179fbc89e21fad8ff62ebd7c1fc80c803a32e1eda3d503bd10d37688caa09043c40bf0cdc48e5260 SHA512 b7fd2dd9787a161ed6a56e42715bb96cbe6df49f0dd6023265834c1fadf8775e8fdf6bcc5f355021eae8c518c25877002f12aaebcdb6401a891c28e6a9fc7e20
 MISC metadata.xml 378 BLAKE2B 13e2f65cc6ea5e9757b7ef30aa946f38daddca9a592bcce78bda172936de89aee38d0e28ac70d7e886ab12c58c5c27cf49a7c1fe6426811b696bddb8cb9989b2 SHA512 fe6b44da867aebd58b302aa0bb3dc17bc815e300cd7ddf05851fe52f1fe2c4cacebb4624e6ca96c0d8f0a28a05e96075497e9fefc96459a73ff2aea6bc40a5aa
diff --git a/dev-vcs/darcs/darcs-2.16.2.ebuild b/dev-vcs/darcs/darcs-2.16.3.ebuild
index ac19fb3449e2..f1500273e84b 100644
--- a/dev-vcs/darcs/darcs-2.16.2.ebuild
+++ b/dev-vcs/darcs/darcs-2.16.3.ebuild
@@ -22,8 +22,8 @@ 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/base16-bytestring-0.1:=[profile?] <dev-haskell/base16-bytestring-0.2:=[profile?]
-	>=dev-haskell/conduit-1.3.0:=[profile?] <dev-haskell/conduit-1.3.3:=[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/data-ordlist-0.4:=[profile?] <dev-haskell/data-ordlist-0.5:=[profile?]
@@ -42,7 +42,6 @@ RDEPEND=">=dev-haskell/async-2.0.2:=[profile?] <dev-haskell/async-2.3:=[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/sandi-0.4:=[profile?] <dev-haskell/sandi-0.6:=[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?]
@@ -65,7 +64,6 @@ DEPEND="${RDEPEND}
 		>=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/split-0.2.2 <dev-haskell/split-0.3
 		<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
@@ -76,8 +74,6 @@ DEPEND="${RDEPEND}
 	curl? ( virtual/pkgconfig )
 "
 
-PATCHES=("${FILESDIR}"/${PN}-2.16.1-curl.patch)
-
 src_configure() {
 	haskell-cabal_src_configure \
 		$(cabal_flag curl curl) \
diff --git a/dev-vcs/darcs/files/darcs-2.16.1-curl.patch b/dev-vcs/darcs/files/darcs-2.16.1-curl.patch
deleted file mode 100644
index 8216ce2e8c4f..000000000000
--- a/dev-vcs/darcs/files/darcs-2.16.1-curl.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bugs.gentoo.org/737236
-
---- a/src/hscurl.c
-+++ b/src/hscurl.c
-@@ -11,6 +11,9 @@
- #define ENABLE_PIPELINING
- #endif
- 
-+/* workaround for https://bugs.gentoo.org/737236 */
-+#include "cabal_macros.h"
-+
- enum RESULT_CODES
-   {
-     RESULT_OK = 0,
-@@ -46,6 +49,10 @@ struct UrlData
- 
- static int debug = 0;
- #ifndef _WIN32
-+#ifndef PACKAGE_VERSION
-+/* workaround for https://bugs.gentoo.org/737236 */
-+#    define PACKAGE_VERSION CURRENT_PACKAGE_VERSION
-+#endif
- static const char user_agent[] =
-   "darcs/" PACKAGE_VERSION " libcurl/" LIBCURL_VERSION;
- #else