summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-haskell/tar/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-haskell/tar/files')
-rw-r--r--dev-haskell/tar/files/tar-0.3.1.0-ghc-7.4.patch11
-rw-r--r--dev-haskell/tar/files/tar-0.3.2.0-dir-1.2.patch51
2 files changed, 62 insertions, 0 deletions
diff --git a/dev-haskell/tar/files/tar-0.3.1.0-ghc-7.4.patch b/dev-haskell/tar/files/tar-0.3.1.0-ghc-7.4.patch
new file mode 100644
index 000000000000..4ebea8697f06
--- /dev/null
+++ b/dev-haskell/tar/files/tar-0.3.1.0-ghc-7.4.patch
@@ -0,0 +1,11 @@
+--- tar-0.3.1.0-orig/Codec/Archive/Tar/Write.hs 2009-06-06 23:51:00.000000000 +1000
++++ tar-0.3.1.0/Codec/Archive/Tar/Write.hs 2011-12-24 09:36:10.928384175 +1100
+@@ -119,7 +119,7 @@
+ putString n s = take n s ++ fill (n - length s) '\NUL'
+
+ --TODO: check integer widths, eg for large file sizes
+-putOct :: Integral a => FieldWidth -> a -> String
++putOct :: (Integral a, Show a) => FieldWidth -> a -> String
+ putOct n x =
+ let octStr = take (n-1) $ showOct x ""
+ in fill (n - length octStr - 1) '0'
diff --git a/dev-haskell/tar/files/tar-0.3.2.0-dir-1.2.patch b/dev-haskell/tar/files/tar-0.3.2.0-dir-1.2.patch
new file mode 100644
index 000000000000..e5fc06a98eb1
--- /dev/null
+++ b/dev-haskell/tar/files/tar-0.3.2.0-dir-1.2.patch
@@ -0,0 +1,51 @@
+diff --git a/Codec/Archive/Tar/Pack.hs b/Codec/Archive/Tar/Pack.hs
+index 8e43091..3cc96ef 100644
+--- a/Codec/Archive/Tar/Pack.hs
++++ b/Codec/Archive/Tar/Pack.hs
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP #-}
+ -----------------------------------------------------------------------------
+ -- |
+ -- Module : Codec.Archive.Tar
+@@ -28,8 +29,16 @@ import qualified System.FilePath as FilePath.Native
+ import System.Directory
+ ( getDirectoryContents, doesDirectoryExist, getModificationTime
+ , Permissions(..), getPermissions )
++#if MIN_VERSION_directory(1,2,0)
++-- The directory package switched to the new time package
++import Data.Time.Clock
++ ( UTCTime )
++import Data.Time.Clock.POSIX
++ ( utcTimeToPOSIXSeconds )
++#else
+ import System.Time
+ ( ClockTime(..) )
++#endif
+ import System.IO
+ ( IOMode(ReadMode), openBinaryFile, hFileSize )
+ import System.IO.Unsafe (unsafeInterleaveIO)
+@@ -170,5 +179,11 @@ recurseDirectories base (dir:dirs) = unsafeInterleaveIO $ do
+
+ getModTime :: FilePath -> IO EpochTime
+ getModTime path = do
++#if MIN_VERSION_directory(1,2,0)
++ -- The directory package switched to the new time package
++ t <- getModificationTime path
++ return . floor . utcTimeToPOSIXSeconds $ t
++#else
+ (TOD s _) <- getModificationTime path
+ return $! fromIntegral s
++#endif
+diff --git a/tar.cabal b/tar.cabal
+index 6467e4b..52e0611 100644
+--- a/tar.cabal
++++ b/tar.cabal
+@@ -25,7 +25,7 @@ source-repository head
+
+ library
+ build-depends: base >= 3 && < 5, filepath,
+- directory, old-time, bytestring
++ directory, old-time, time, bytestring
+
+ exposed-modules:
+ Codec.Archive.Tar