summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2013-04-06 16:48:05 +0000
committerSergei Trofimovich <slyfox@gentoo.org>2013-04-06 16:48:05 +0000
commit66639f57a0b8ceca5aa4ecbaf8d5e383f463d06a (patch)
tree10054779398e1602d9df97a643bca911b187fe17 /dev-vcs/darcs/files
parentVersion bump. (diff)
downloadgentoo-2-66639f57a0b8ceca5aa4ecbaf8d5e383f463d06a.tar.gz
gentoo-2-66639f57a0b8ceca5aa4ecbaf8d5e383f463d06a.tar.bz2
gentoo-2-66639f57a0b8ceca5aa4ecbaf8d5e383f463d06a.zip
Drop binary data from tree along with old darcs (bug #464180 by Michał Górny).
(Portage version: 2.2.0_alpha171_p2/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)
Diffstat (limited to 'dev-vcs/darcs/files')
-rw-r--r--dev-vcs/darcs/files/darcs-2.8.1-tar-0.4.patch40
-rw-r--r--dev-vcs/darcs/files/darcs-2.8.3-ghc-7.6.patch.bz2bin9380 -> 0 bytes
-rw-r--r--dev-vcs/darcs/files/darcs-2.8.3-hack-for-haskeline-0.7-breaks-non-utf8.patch62
-rw-r--r--dev-vcs/darcs/files/darcs-2.8.3-tf-0.8.patch26
4 files changed, 0 insertions, 128 deletions
diff --git a/dev-vcs/darcs/files/darcs-2.8.1-tar-0.4.patch b/dev-vcs/darcs/files/darcs-2.8.1-tar-0.4.patch
deleted file mode 100644
index 9bd2c26cd604..000000000000
--- a/dev-vcs/darcs/files/darcs-2.8.1-tar-0.4.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/src/Darcs/Repository.hs b/src/Darcs/Repository.hs
-index f68a77a..3c5af65 100644
---- a/src/Darcs/Repository.hs
-+++ b/src/Darcs/Repository.hs
-@@ -302,19 +302,35 @@ removeMetaFiles :: IO ()
- removeMetaFiles = mapM_ (removeFile . (darcsdir </>)) .
- filter ("meta-" `isPrefixOf`) =<< getDirectoryContents darcsdir
-
-+#if MIN_VERSION_tar(0,4,0)
-+unpackBasic :: Cache -> Tar.Entries Tar.FormatError -> IO ()
-+#else
- unpackBasic :: Cache -> Tar.Entries -> IO ()
-+#endif
- unpackBasic c x = do
- withControlMVar $ \mv -> unpackTar c (basicMetaHandler c mv) x
- removeMetaFiles
-
-+#if MIN_VERSION_tar(0,4,0)
-+unpackPatches :: Cache -> [String] -> Tar.Entries Tar.FormatError -> IO ()
-+#else
- unpackPatches :: Cache -> [String] -> Tar.Entries -> IO ()
-+#endif
- unpackPatches c ps x = do
- withControlMVar $ \mv -> unpackTar c (patchesMetaHandler c ps mv) x
- removeMetaFiles
-
-+#if MIN_VERSION_tar(0,4,0)
-+unpackTar :: Cache -> IO () -> Tar.Entries Tar.FormatError -> IO ()
-+#else
- unpackTar :: Cache -> IO () -> Tar.Entries -> IO ()
-+#endif
- unpackTar _ _ Tar.Done = return ()
-+#if MIN_VERSION_tar(0,4,0)
-+unpackTar _ _ (Tar.Fail e)= fail (show e)
-+#else
- unpackTar _ _ (Tar.Fail e)= fail e
-+#endif
- unpackTar c mh (Tar.Next x xs) = case Tar.entryContent x of
- Tar.NormalFile x' _ -> do
- let p = Tar.entryPath x
diff --git a/dev-vcs/darcs/files/darcs-2.8.3-ghc-7.6.patch.bz2 b/dev-vcs/darcs/files/darcs-2.8.3-ghc-7.6.patch.bz2
deleted file mode 100644
index 81a53813a189..000000000000
--- a/dev-vcs/darcs/files/darcs-2.8.3-ghc-7.6.patch.bz2
+++ /dev/null
Binary files differ
diff --git a/dev-vcs/darcs/files/darcs-2.8.3-hack-for-haskeline-0.7-breaks-non-utf8.patch b/dev-vcs/darcs/files/darcs-2.8.3-hack-for-haskeline-0.7-breaks-non-utf8.patch
deleted file mode 100644
index 65eee6031e99..000000000000
--- a/dev-vcs/darcs/files/darcs-2.8.3-hack-for-haskeline-0.7-breaks-non-utf8.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-CAUTION: The patch is very incomplete!
-It will not work if your locale is not UTF-8.
-diff --git a/src/ByteStringUtils.hs b/src/ByteStringUtils.hs
-index 6394fea..6999312 100644
---- a/src/ByteStringUtils.hs
-+++ b/src/ByteStringUtils.hs
-@@ -71,7 +71,10 @@ import Control.Exception.Extensible ( catch, SomeException )
- import System.IO
- import System.IO.Unsafe ( unsafePerformIO )
- import System.Console.Haskeline ( InputT, runInputTBehavior, defaultSettings, useFileHandle )
-+
-+#if ! MIN_VERSION_haskeline(0,7,0)
- import System.Console.Haskeline.Encoding ( decode, encode )
-+#endif
-
- import Foreign.Storable ( peekElemOff, peek )
- import Foreign.Marshal.Array ( advancePtr )
-@@ -526,6 +529,7 @@ unsafeRunInput = unsafePerformIO . runInputTBehavior (useFileHandle stdin) defau
- isAscii :: B.ByteString -> Bool
- isAscii = B.all (\w -> w < 128)
-
-+#if ! MIN_VERSION_haskeline(0,7,0)
- -- | Decode a ByteString to a String according to the current locale
- -- unsafePerformIO in the locale function is ratified by the fact that GHC 6.12
- -- and above also supply locale conversion with functions with a pure type.
-@@ -533,19 +537,30 @@ isAscii = B.all (\w -> w < 128)
- decodeLocale :: B.ByteString -> String
- decodeLocale = unsafeRunInput . decode
-
-+-- | Encode a String to a ByteString according to the current locale
-+encodeLocale :: String -> B.ByteString
-+encodeLocale = unsafeRunInput . encode
-+#else
-+
-+-- | Yes! I cheat here a lot and just assume you have UTF-8 locale.
-+-- | haskeline-0.7 dropped encoding export.
-+-- | All the blame should be directed to Sergei Trofimovich <slyfox@gentoo.org>
-+
-+decodeLocale :: B.ByteString -> String
-+decodeLocale = unpackPSFromUTF8
-+
-+encodeLocale :: String -> B.ByteString
-+encodeLocale = packStringToUTF8
-+#endif
-+
-+
- -- | Encode a String to a ByteString with latin1 (i.e., the values of the
- -- characters become the values of the bytes; if a character value is greater
- -- than 255, its byte becomes the character value modulo 256)
- encodeLatin1 :: String -> B.ByteString
- encodeLatin1 = B.pack . (map (fromIntegral . ord))
-
---- | Encode a String to a ByteString according to the current locale
--encodeLocale :: String -> B.ByteString
--encodeLocale = unsafeRunInput . encode
--
- -- | Take a @String@ that represents byte values and re-decode it acording to
- -- the current locale.
- decodeString :: String -> String
- decodeString = decodeLocale . encodeLatin1
--
--
diff --git a/dev-vcs/darcs/files/darcs-2.8.3-tf-0.8.patch b/dev-vcs/darcs/files/darcs-2.8.3-tf-0.8.patch
deleted file mode 100644
index 18f0bc5f55b9..000000000000
--- a/dev-vcs/darcs/files/darcs-2.8.3-tf-0.8.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Fix build failure against dev-haskell/test-framework-0.8
-
-[147 of 147] Compiling Main ( src/test.hs, dist/build/darcs-test/darcs-test-tmp/Main.o )
-
-src/test.hs:100:30:
- No instance for (Typeable ShellTest) arising from a use of `Test'
- Possible fix: add an instance declaration for (Typeable ShellTest)
- In the expression: Test (file ++ " (" ++ show fmt ++ ")")
- In the expression:
- Test (file ++ " (" ++ show fmt ++ ")") $ ShellTest fmt file tdir dp
- In an equation for `shellTest':
- shellTest dp fmt tdir file
- = Test (file ++ " (" ++ show fmt ++ ")")
- $ ShellTest fmt file tdir dp
-diff --git a/src/test.hs b/src/test.hs
-index 39adcc1..9687074 100644
---- a/src/test.hs
-+++ b/src/test.hs
-@@ -49,6 +49,7 @@ data ShellTest = ShellTest { format :: Format
- , testdir :: Maybe FilePath -- ^ only if you want to set it explicitly
- , _darcspath :: FilePath
- }
-+ deriving Typeable
-
- runtest' :: ShellTest -> FilePath -> ShIO Result
- runtest' (ShellTest fmt _ _ dp) srcdir =