diff options
author | Sergei Trofimovich <slyfox@gentoo.org> | 2012-12-24 21:39:39 +0000 |
---|---|---|
committer | Sergei Trofimovich <slyfox@gentoo.org> | 2012-12-24 21:39:39 +0000 |
commit | 3b518348035b3d1db15edd6507a464935c8434f6 (patch) | |
tree | 41aa27ee59b53f7e621e3e8db3f523187e2e84c2 /dev-vcs/darcs/files | |
parent | Migrate to distutils-r1. Restrict python2.5 as reported by dol-sen. (diff) | |
download | gentoo-2-3b518348035b3d1db15edd6507a464935c8434f6.tar.gz gentoo-2-3b518348035b3d1db15edd6507a464935c8434f6.tar.bz2 gentoo-2-3b518348035b3d1db15edd6507a464935c8434f6.zip |
Removed old.
(Portage version: 2.2.0_alpha149_p1/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Diffstat (limited to 'dev-vcs/darcs/files')
9 files changed, 0 insertions, 547 deletions
diff --git a/dev-vcs/darcs/files/darcs-1.0.9-bashcomp.patch b/dev-vcs/darcs/files/darcs-1.0.9-bashcomp.patch deleted file mode 100644 index 2c5e34521e45..000000000000 --- a/dev-vcs/darcs/files/darcs-1.0.9-bashcomp.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -urwpN darcs-1.0.9-orig/darcs_completion darcs-1.0.9/darcs_completion ---- darcs-1.0.9-orig/darcs_completion 2007-06-07 21:42:57.000000000 +0200 -+++ darcs-1.0.9/darcs_completion 2007-06-07 21:43:12.000000000 +0200 -@@ -3,7 +3,6 @@ - # darcs command line completion. - # Copyright 2002 "David Roundy" <droundy@abridgegame.org> - # --have darcs && - _darcs() - { - local cur -@@ -48,5 +47,5 @@ _darcs() - return 0 - - } --[ "$have" ] && complete -F _darcs -o default darcs -+complete -F _darcs -o default darcs - diff --git a/dev-vcs/darcs/files/darcs-2.4.4-issue1770-curl_multi_perform-no-running-handles.patch b/dev-vcs/darcs/files/darcs-2.4.4-issue1770-curl_multi_perform-no-running-handles.patch deleted file mode 100644 index dd61a027d4d5..000000000000 --- a/dev-vcs/darcs/files/darcs-2.4.4-issue1770-curl_multi_perform-no-running-handles.patch +++ /dev/null @@ -1,38 +0,0 @@ -Fri Apr 16 00:47:39 CEST 2010 Dmitry Kurochkin <dmitry.kurochkin@gmail.com> - * Fix hscurl.c when URL is downloaded during the first call to curl_multi_perform. - Turns out that the first call to curl_multi_perform() can fetch the URL or - result in error. I can easily reproduce this using HTTP server on localhost. - This means that situation when running_handles is zero is valid, so remove the - error and handle it correctly. -diff -rN -u old-darcs.net/src/hscurl.c new-darcs.net/src/hscurl.c ---- old-darcs.net/src/hscurl.c 2010-06-28 19:35:56.382397912 +0200 -+++ new-darcs.net/src/hscurl.c 2010-06-28 19:35:57.544398155 +0200 -@@ -19,7 +19,6 @@ - RESULT_MULTI_INIT_FAIL, - RESULT_EASY_INIT_FAIL, - RESULT_SLIST_APPEND_FAIL, -- RESULT_NO_RUNNING_HANDLES, - RESULT_MULTI_INFO_READ_FAIL, - RESULT_UNKNOWN_MESSAGE, - RESULT_FILE_OPEN_FAIL -@@ -33,7 +32,6 @@ - "curl_multi_init() failed", - "curl_easy_init() failed", - "curl_slist_append() failed", -- "curl_multi_perform() - no running handles", - "curl_multi_info_read() failed", - "curl_multi_info_read() returned unknown message", - "fopen() failed" -@@ -67,11 +65,9 @@ - error = curl_multi_perform(multi, &running_handles); - if (error != CURLM_OK && error != CURLM_CALL_MULTI_PERFORM) - return curl_multi_strerror(error); -- if (running_handles == 0) -- return error_strings[RESULT_NO_RUNNING_HANDLES]; - - running_handles_last = running_handles; -- while (1) -+ while (running_handles_last > 0) - { - while (error == CURLM_CALL_MULTI_PERFORM) - error = curl_multi_perform(multi, &running_handles); diff --git a/dev-vcs/darcs/files/darcs-2.4.4-tests-emailformat.patch b/dev-vcs/darcs/files/darcs-2.4.4-tests-emailformat.patch deleted file mode 100644 index e1fe5dfe8f1d..000000000000 --- a/dev-vcs/darcs/files/darcs-2.4.4-tests-emailformat.patch +++ /dev/null @@ -1,39 +0,0 @@ -Tue Nov 16 23:36:37 EET 2010 Sergei Trofimovich <slyfox@community.haskell.org> - * tests/emailformat.sh: use ghc --make instead of ghci - - linux-alpha and linux-ia64 don't have ghci support. - No need to fail there. -diff -rN -u old-darcs.net/tests/emailformat.sh new-darcs.net/tests/emailformat.sh ---- old-darcs.net/tests/emailformat.sh 2010-11-16 23:40:10.207480789 +0200 -+++ new-darcs.net/tests/emailformat.sh 2010-11-16 23:40:10.706480789 +0200 -@@ -6,8 +6,10 @@ - switch_to_latin9_locale - rm -rf temp1 - rm -rf temp2 -+rm -rf temp3 - mkdir temp1 - mkdir temp2 -+mkdir temp3 - cd temp1 - - seventysevenaddy="<aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa@bbbbbbbbbb.cccccccccc.abrasoft.com>" -@@ -34,10 +36,17 @@ - grep $seventysevenaddy mail_as_file - - # Check that there are no non-ASCII characters in the mail --ghc -e 'getContents >>= return . not . any (> Data.Char.chr 127)' < mail_as_file | grep '^True$' -+cd ../temp3 -+cat > is_ascii.hs <<EOF -+import Data.Char (chr) - -+main = getContents >>= print . not . any (> Data.Char.chr 127) -+EOF -+ -+ghc --make is_ascii.hs -o is_ascii -+./is_ascii < ../temp1/mail_as_file | grep '^True$' - - cd .. - rm -rf temp1 - rm -rf temp2 -- -+rm -rf temp3 diff --git a/dev-vcs/darcs/files/darcs-2.5.2-ghc-7.2.patch b/dev-vcs/darcs/files/darcs-2.5.2-ghc-7.2.patch deleted file mode 100644 index 22dfea864e33..000000000000 --- a/dev-vcs/darcs/files/darcs-2.5.2-ghc-7.2.patch +++ /dev/null @@ -1,142 +0,0 @@ -diff --git a/Distribution/ShellHarness.hs b/Distribution/ShellHarness.hs -index 78a8a9b..949b752 100644 ---- a/Distribution/ShellHarness.hs -+++ b/Distribution/ShellHarness.hs -@@ -12,10 +12,9 @@ import System.Environment ( getEnv, getEnvironment ) - import System.Exit ( ExitCode (..) ) - import System.FilePath - import System.IO --import System( system ) - import System.Process ( ProcessHandle, - runInteractiveProcess, waitForProcess, -- getProcessExitCode ) -+ getProcessExitCode, system ) - import Data.Maybe - import Data.List ( isInfixOf, isPrefixOf, (\\), nubBy, isSuffixOf ) - import Control.Concurrent -diff --git a/darcs.cabal b/darcs.cabal -index 887a27b..56e36fa 100644 ---- a/darcs.cabal -+++ b/darcs.cabal -@@ -124,7 +124,7 @@ Executable witnesses - else - buildable: True - -- build-tools: ghc >= 6.10 && < 7.2 -+ build-tools: ghc >= 6.10 && < 7.4 - - hs-source-dirs: src - include-dirs: src -@@ -182,7 +182,7 @@ Executable witnesses - text == 0.11.*, - old-time == 1.0.*, - directory >= 1.0.0.0 && < 1.2.0.0, -- process == 1.0.*, -+ process >= 1.0 && < 1.2, - containers >= 0.1 && < 0.5, - array >= 0.1 && < 0.4, - random == 1.0.*, -@@ -192,7 +192,7 @@ Executable witnesses - test-framework >= 0.2.2, - test-framework-quickcheck2 >= 0.2.2 - if !os(windows) -- build-depends: unix >= 1.0 && < 2.5 -+ build-depends: unix >= 1.0 && < 2.6 - if flag(http) - build-depends: network >= 2.2 && < 2.4, - HTTP >= 3000.0 && < 4000.2 -@@ -208,7 +208,7 @@ Library - else - buildable: True - -- build-tools: ghc >= 6.10 && < 7.2 -+ build-tools: ghc >= 6.10 && < 7.4 - - hs-source-dirs: src - include-dirs: src -@@ -385,14 +385,14 @@ Library - tar == 0.3.* - - if !os(windows) -- build-depends: unix >= 1.0 && < 2.5 -+ build-depends: unix >= 1.0 && < 2.6 - - build-depends: base >= 3, - bytestring >= 0.9.0 && < 0.10, - text == 0.11.*, - old-time == 1.0.*, - directory >= 1.0.0.0 && < 1.2.0.0, -- process == 1.0.*, -+ process >= 1.0 && < 1.2, - containers >= 0.1 && < 0.5, - array >= 0.1 && < 0.4, - random == 1.0.* -@@ -483,7 +483,7 @@ Executable darcs - src/umask.c - src/Crypt/sha2.c - -- build-tools: ghc >= 6.10 && < 7.2 -+ build-tools: ghc >= 6.10 && < 7.4 - - -- We need optimizations, regardless of what Hackage says - -- Note: "if true" works around a cabal bug with order of flag composition -@@ -533,14 +533,14 @@ Executable darcs - tar == 0.3.* - - if !os(windows) -- build-depends: unix >= 1.0 && < 2.5 -+ build-depends: unix >= 1.0 && < 2.6 - - build-depends: base >= 3, - bytestring >= 0.9.0 && < 0.10, - text == 0.11.*, - old-time == 1.0.*, - directory >= 1.0.0.0 && < 1.2.0.0, -- process == 1.0.*, -+ process >= 1.0 && < 1.2, - containers >= 0.1 && < 0.5, - array >= 0.1 && < 0.4, - random == 1.0.* -@@ -615,7 +615,7 @@ Executable unit - else - buildable: True - -- build-tools: ghc >= 6.10 && < 7.2 -+ build-tools: ghc >= 6.10 && < 7.4 - - build-depends: base < 5, - extensible-exceptions >= 0.1 && < 0.2, -@@ -678,7 +678,7 @@ Executable unit - cc-options: -DHAVE_SIGINFO_H - - if !os(windows) -- build-depends: unix >= 1.0 && < 2.5 -+ build-depends: unix >= 1.0 && < 2.6 - - build-depends: base >= 3, - bytestring >= 0.9.0 && < 0.10, -@@ -686,7 +686,7 @@ Executable unit - text == 0.11.*, - old-time == 1.0.*, - directory >= 1.0.0.0 && < 1.2.0.0, -- process == 1.0.*, -+ process >= 1.0 && < 1.2, - containers >= 0.1 && < 0.5, - array >= 0.1 && < 0.4, - hashed-storage >= 0.5.2 && < 0.6, -diff --git a/src/Darcs/RepoPath.hs b/src/Darcs/RepoPath.hs -index aa00156..8c5432b 100644 ---- a/src/Darcs/RepoPath.hs -+++ b/src/Darcs/RepoPath.hs -@@ -60,11 +60,9 @@ import qualified Darcs.Patch.FileName as PatchFileName ( FileName, fp2fn, fn2fp - #include "impossible.h" - - class FilePathOrURL a where -- {-# INLINE toPath #-} - toPath :: a -> String - - class FilePathOrURL a => FilePathLike a where -- {-# INLINE toFilePath #-} - toFilePath :: a -> FilePath - - -- | Paths which are relative to the local darcs repository and normalized. diff --git a/dev-vcs/darcs/files/darcs-2.5.2-ghc-7.4.patch b/dev-vcs/darcs/files/darcs-2.5.2-ghc-7.4.patch deleted file mode 100644 index 3b51fea4a953..000000000000 --- a/dev-vcs/darcs/files/darcs-2.5.2-ghc-7.4.patch +++ /dev/null @@ -1,139 +0,0 @@ ---- darcs-2.5.2-orig/darcs.cabal 2011-12-19 20:44:08.644140399 +1100 -+++ darcs-2.5.2/darcs.cabal 2011-12-24 10:03:14.325396692 +1100 -@@ -124,7 +124,7 @@ - else - buildable: True - -- build-tools: ghc >= 6.10 && < 7.4 -+ build-tools: ghc >= 6.10 && < 7.6 - - hs-source-dirs: src - include-dirs: src -@@ -174,17 +174,17 @@ - mtl >= 1.0 && < 2.1, - parsec >= 2.0 && < 3.2, - html == 1.0.*, -- filepath >= 1.1.0.0 && < 1.3.0.0, -+ filepath >= 1.1.0.0 && < 1.5.0.0, - haskeline >= 0.6.2.2 && < 0.7, - hashed-storage >= 0.5.2 && < 0.6, - base >= 3, - bytestring >= 0.9.0 && < 0.10, - text == 0.11.*, -- old-time == 1.0.*, -+ old-time >= 1.0 && < 1.2, - directory >= 1.0.0.0 && < 1.2.0.0, - process >= 1.0 && < 1.2, - containers >= 0.1 && < 0.5, -- array >= 0.1 && < 0.4, -+ array >= 0.1 && < 0.5, - random == 1.0.*, - tar == 0.3.*, - zlib >= 0.5.1.0 && < 0.6.0.0, -@@ -208,7 +208,7 @@ - else - buildable: True - -- build-tools: ghc >= 6.10 && < 7.4 -+ build-tools: ghc >= 6.10 && < 7.6 - - hs-source-dirs: src - include-dirs: src -@@ -379,7 +379,7 @@ - mtl >= 1.0 && < 2.1, - parsec >= 2.0 && < 3.2, - html == 1.0.*, -- filepath >= 1.1.0.0 && < 1.3.0.0, -+ filepath >= 1.1.0.0 && < 1.5.0.0, - haskeline >= 0.6.2.2 && < 0.7, - hashed-storage >= 0.5.2 && < 0.6, - tar == 0.3.* -@@ -390,11 +390,11 @@ - build-depends: base >= 3, - bytestring >= 0.9.0 && < 0.10, - text == 0.11.*, -- old-time == 1.0.*, -+ old-time >= 1.0 && < 1.2, - directory >= 1.0.0.0 && < 1.2.0.0, - process >= 1.0 && < 1.2, - containers >= 0.1 && < 0.5, -- array >= 0.1 && < 0.4, -+ array >= 0.1 && < 0.5, - random == 1.0.* - - -@@ -483,7 +483,7 @@ - src/umask.c - src/Crypt/sha2.c - -- build-tools: ghc >= 6.10 && < 7.4 -+ build-tools: ghc >= 6.10 && < 7.6 - - -- We need optimizations, regardless of what Hackage says - -- Note: "if true" works around a cabal bug with order of flag composition -@@ -527,7 +527,7 @@ - mtl >= 1.0 && < 2.1, - parsec >= 2.0 && < 3.2, - html == 1.0.*, -- filepath >= 1.1.0.0 && < 1.3.0.0, -+ filepath >= 1.1.0.0 && < 1.5.0.0, - haskeline >= 0.6.2.2 && < 0.7, - hashed-storage >= 0.5.2 && < 0.6, - tar == 0.3.* -@@ -538,11 +538,11 @@ - build-depends: base >= 3, - bytestring >= 0.9.0 && < 0.10, - text == 0.11.*, -- old-time == 1.0.*, -+ old-time >= 1.0 && < 1.2, - directory >= 1.0.0.0 && < 1.2.0.0, - process >= 1.0 && < 1.2, - containers >= 0.1 && < 0.5, -- array >= 0.1 && < 0.4, -+ array >= 0.1 && < 0.5, - random == 1.0.* - - if flag(curl) -@@ -615,7 +615,7 @@ - else - buildable: True - -- build-tools: ghc >= 6.10 && < 7.4 -+ build-tools: ghc >= 6.10 && < 7.6 - - build-depends: base < 5, - extensible-exceptions >= 0.1 && < 0.2, -@@ -623,7 +623,7 @@ - mtl >= 1.0 && < 2.1, - parsec >= 2.0 && < 3.2, - html == 1.0.*, -- filepath >= 1.1.0.0 && < 1.3.0.0, -+ filepath >= 1.1.0.0 && < 1.5.0.0, - QuickCheck >= 2.1.0.0, - HUnit >= 1.0, - test-framework >= 0.2.2, -@@ -684,11 +684,11 @@ - bytestring >= 0.9.0 && < 0.10, - haskeline >= 0.6.2.2 && < 0.7, - text == 0.11.*, -- old-time == 1.0.*, -+ old-time >= 1.0 && < 1.2, - directory >= 1.0.0.0 && < 1.2.0.0, - process >= 1.0 && < 1.2, - containers >= 0.1 && < 0.5, -- array >= 0.1 && < 0.4, -+ array >= 0.1 && < 0.5, - hashed-storage >= 0.5.2 && < 0.6, - random == 1.0.* - ---- darcs-2.5.2-orig/src/Darcs/Utils.hs 2011-03-14 09:40:46.000000000 +1100 -+++ darcs-2.5.2/src/Darcs/Utils.hs 2011-12-24 10:07:16.125342597 +1100 -@@ -62,7 +62,7 @@ - , TreeMonad, tree ) - import Storage.Hashed.Tree( Tree, listImmediate, findTree ) - --showHexLen :: (Integral a) => Int -> a -> String -+showHexLen :: (Integral a, Show a) => Int -> a -> String - showHexLen n x = let s = showHex x "" - in replicate (n - length s) ' ' ++ s - diff --git a/dev-vcs/darcs/files/darcs-2.5.2-mtl-2.1.patch b/dev-vcs/darcs/files/darcs-2.5.2-mtl-2.1.patch deleted file mode 100644 index 2718e9ec0368..000000000000 --- a/dev-vcs/darcs/files/darcs-2.5.2-mtl-2.1.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- darcs-2.5.2-orig/darcs.cabal 2012-04-12 00:35:07.075608173 +1000 -+++ darcs-2.5.2/darcs.cabal 2012-04-12 00:40:06.173429235 +1000 -@@ -171,7 +171,7 @@ - build-depends: base < 5, - extensible-exceptions >= 0.1 && < 0.2, - regex-compat >= 0.71 && < 0.96, -- mtl >= 1.0 && < 2.1, -+ mtl >= 1.0 && < 2.2, - parsec >= 2.0 && < 3.2, - html == 1.0.*, - filepath >= 1.1.0.0 && < 1.5.0.0, -@@ -376,7 +376,7 @@ - build-depends: base < 5, - extensible-exceptions >= 0.1 && < 0.2, - regex-compat >= 0.71 && < 0.96, -- mtl >= 1.0 && < 2.1, -+ mtl >= 1.0 && < 2.2, - parsec >= 2.0 && < 3.2, - html == 1.0.*, - filepath >= 1.1.0.0 && < 1.5.0.0, -@@ -524,7 +524,7 @@ - build-depends: base < 5, - extensible-exceptions >= 0.1 && < 0.2, - regex-compat >= 0.71 && < 0.96, -- mtl >= 1.0 && < 2.1, -+ mtl >= 1.0 && < 2.2, - parsec >= 2.0 && < 3.2, - html == 1.0.*, - filepath >= 1.1.0.0 && < 1.5.0.0, -@@ -620,7 +620,7 @@ - build-depends: base < 5, - extensible-exceptions >= 0.1 && < 0.2, - regex-compat >= 0.71 && < 0.96, -- mtl >= 1.0 && < 2.1, -+ mtl >= 1.0 && < 2.2, - parsec >= 2.0 && < 3.2, - html == 1.0.*, - filepath >= 1.1.0.0 && < 1.5.0.0, diff --git a/dev-vcs/darcs/files/darcs-2.5.2-relax-http-libs-deps.patch b/dev-vcs/darcs/files/darcs-2.5.2-relax-http-libs-deps.patch deleted file mode 100644 index 05b1ea20e6a7..000000000000 --- a/dev-vcs/darcs/files/darcs-2.5.2-relax-http-libs-deps.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- darcs-2.5.2-orig/darcs.cabal 2011-12-19 20:43:28.551322710 +1100 -+++ darcs-2.5.2/darcs.cabal 2011-12-19 20:44:08.644140399 +1100 -@@ -195,7 +195,7 @@ - build-depends: unix >= 1.0 && < 2.6 - if flag(http) - build-depends: network >= 2.2 && < 2.4, -- HTTP >= 3000.0 && < 4000.2 -+ HTTP >= 3000.0 && < 4000.3 - - - -- ---------------------------------------------------------------------- -@@ -420,7 +420,7 @@ - - if flag(http) - build-depends: network >= 2.2 && < 2.4, -- HTTP >= 3000.0 && < 4000.2 -+ HTTP >= 3000.0 && < 4000.3 - cpp-options: -DHAVE_HTTP - x-have-http: - -@@ -554,7 +554,7 @@ - - if flag(http) - build-depends: network >= 2.2 && < 2.4, -- HTTP >= 3000.0 && < 4000.2 -+ HTTP >= 3000.0 && < 4000.3 - cpp-options: -DHAVE_HTTP - x-have-http: - -@@ -705,7 +705,7 @@ - - if flag(http) - build-depends: network >= 2.2 && < 2.4, -- HTTP >= 3000.0 && < 4000.2 -+ HTTP >= 3000.0 && < 4000.3 - - if flag(color) - x-use-color: diff --git a/dev-vcs/darcs/files/darcs-2.5.2-relax-regex-libs-deps.patch b/dev-vcs/darcs/files/darcs-2.5.2-relax-regex-libs-deps.patch deleted file mode 100644 index 1b6a37d75d37..000000000000 --- a/dev-vcs/darcs/files/darcs-2.5.2-relax-regex-libs-deps.patch +++ /dev/null @@ -1,69 +0,0 @@ -diff -rN -u old-darcs-2.5.2/darcs.cabal new-darcs-2.5.2/darcs.cabal ---- old-darcs-2.5.2/darcs.cabal 2011-06-03 20:24:32.079482374 +0200 -+++ new-darcs-2.5.2/darcs.cabal 2011-06-03 20:24:32.080482374 +0200 -@@ -166,11 +166,11 @@ - cpp-options: -DWIN32 - c-sources: src/win32/send_email.c - build-depends: unix-compat >= 0.1.2, -- regex-posix >= 0.94.4 && < 0.95 -+ regex-posix >= 0.94.4 && < 0.96 - - build-depends: base < 5, - extensible-exceptions >= 0.1 && < 0.2, -- regex-compat >= 0.71 && < 0.94, -+ regex-compat >= 0.71 && < 0.96, - mtl >= 1.0 && < 2.1, - parsec >= 2.0 && < 3.2, - html == 1.0.*, -@@ -368,14 +368,14 @@ - cpp-options: -DWIN32 - c-sources: src/win32/send_email.c - build-depends: unix-compat >= 0.1.2, -- regex-posix >= 0.94.4 && < 0.95 -+ regex-posix >= 0.94.4 && < 0.96 - - if os(solaris) - cc-options: -DHAVE_SIGINFO_H - - build-depends: base < 5, - extensible-exceptions >= 0.1 && < 0.2, -- regex-compat >= 0.71 && < 0.94, -+ regex-compat >= 0.71 && < 0.96, - mtl >= 1.0 && < 2.1, - parsec >= 2.0 && < 3.2, - html == 1.0.*, -@@ -516,14 +516,14 @@ - cpp-options: -DWIN32 - c-sources: src/win32/send_email.c - build-depends: unix-compat >= 0.1.2, -- regex-posix >= 0.94.4 && < 0.95 -+ regex-posix >= 0.94.4 && < 0.96 - - if os(solaris) - cc-options: -DHAVE_SIGINFO_H - - build-depends: base < 5, - extensible-exceptions >= 0.1 && < 0.2, -- regex-compat >= 0.71 && < 0.94, -+ regex-compat >= 0.71 && < 0.96, - mtl >= 1.0 && < 2.1, - parsec >= 2.0 && < 3.2, - html == 1.0.*, -@@ -619,7 +619,7 @@ - - build-depends: base < 5, - extensible-exceptions >= 0.1 && < 0.2, -- regex-compat >= 0.71 && < 0.94, -+ regex-compat >= 0.71 && < 0.96, - mtl >= 1.0 && < 2.1, - parsec >= 2.0 && < 3.2, - html == 1.0.*, -@@ -672,7 +672,7 @@ - cpp-options: -DWIN32 - c-sources: src/win32/send_email.c - build-depends: unix-compat >= 0.1.2, -- regex-posix >= 0.94.4 && < 0.95 -+ regex-posix >= 0.94.4 && < 0.96 - - if os(solaris) - cc-options: -DHAVE_SIGINFO_H diff --git a/dev-vcs/darcs/files/darcs-2.5.2-tests-ghc-7.2.patch b/dev-vcs/darcs/files/darcs-2.5.2-tests-ghc-7.2.patch deleted file mode 100644 index c43df9a9328a..000000000000 --- a/dev-vcs/darcs/files/darcs-2.5.2-tests-ghc-7.2.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/tests/hspwd.hs b/tests/hspwd.hs -index b93a7d5..f6fe2dd 100644 ---- a/tests/hspwd.hs -+++ b/tests/hspwd.hs -@@ -1,5 +1,5 @@ - module Main where - --import Directory ( getCurrentDirectory ) -+import System.Directory ( getCurrentDirectory ) - - main = getCurrentDirectory >>= putStr -diff --git a/tests/trackdown-bisect-helper.hs b/tests/trackdown-bisect-helper.hs -index 5c325c4..7fcb4a4 100644 ---- a/tests/trackdown-bisect-helper.hs -+++ b/tests/trackdown-bisect-helper.hs -@@ -15,8 +15,9 @@ patches with the linear implementation. - - - import Control.Monad -+import System.Environment - import System.IO --import System -+import System.Process - import System.Random - import Data.List - import Control.Exception |