diff options
Diffstat (limited to 'dev-haskell')
| -rw-r--r-- | dev-haskell/tar/Manifest | 1 | ||||
| -rw-r--r-- | dev-haskell/tar/files/tar-0.3.2.0-dir-1.2.patch | 51 | ||||
| -rw-r--r-- | dev-haskell/tar/tar-0.3.2.0.ebuild | 24 |
3 files changed, 0 insertions, 76 deletions
diff --git a/dev-haskell/tar/Manifest b/dev-haskell/tar/Manifest index 644b835df5e2..731aaeae13df 100644 --- a/dev-haskell/tar/Manifest +++ b/dev-haskell/tar/Manifest @@ -1,4 +1,3 @@ -DIST tar-0.3.2.0.tar.gz 15952 SHA256 492d091041224f293ceb67b0f560a2f4e3f0a304117214ac87912f1495cbf47a SHA512 cbdfdd5f89a4547dc1f2a49074634eacef9d89a8d537ffef0980f0c33ca7feed71da9546d950b69d269a2d491dec3c5447219dd94adaf78bbc875d7718eee5c6 WHIRLPOOL 95d560edac007cecfc82eec4729a2ff821f8b53a59b70e5e45448817b8789b7f11051642799aa1e371cd4fc6704aa6fcb98b1ea319a0a2916293eb9b7297958e DIST tar-0.4.0.1.tar.gz 17875 SHA256 a408274d8325f4e3144c5aa154d72f1ee7b0a7342570fd6805e3be3fe0d97a6d SHA512 7cb042f77dc70b856b4dfd5d0a06620f669f9260a84800ad27e1803ec24a50932bb3775b35a6cc91cefb30ea4cd2b453dd6566007d586327acea0edccc0dee47 WHIRLPOOL 0abad23f2027a01136e28276735e4bd8abab2858ddcb1467e41bca780f573df410ea9b1c47b85c96fefabd7a471d32bf50fa26614f0cbaefb74ad0546f7289be DIST tar-0.4.2.1.tar.gz 29825 SHA256 2fad0ae6c1d671f0fbd60f39b2d7df70c3f33890b92df177052d2d8733955080 SHA512 8684f20fd31a1d4c83fd6b74e6662eac8f8b0075856b47105c5dc72f39eee5ef3ddbf1b45d2cc730f924b385df4e74ff82a03ec45489662dac1b8b91170397f0 WHIRLPOOL 0a064308301357ffb46555d10ca0689a375f7d4e4c17acc1763f180102d91195dae2e42314f3dac53aa5e4f90afe3724a0f385bd3f8ba37dc0bd8186e8a6ef20 DIST tar-0.5.0.3.tar.gz 38764 SHA256 d8d9ad876365f88bdccd02073049e58715cd5ba94de06eb98e21d595244918a3 SHA512 f90899e3a5fe097645e29b143cbf25ccf131f8b794bfea655e5b562369e4d7d492df78e53710d3ca4776233f07ace9335242eafbd3b4ba8d0e1d4664fd24a27d WHIRLPOOL c577f130f64503bd03daa91ddd482539c6e9fb16100d35b12eeec76d53cfb6ce33d979d0572038e89a6c6ddc48d48725549ebf462b52dcc69582dad2ce89a43d 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 deleted file mode 100644 index e5fc06a98eb1..000000000000 --- a/dev-haskell/tar/files/tar-0.3.2.0-dir-1.2.patch +++ /dev/null @@ -1,51 +0,0 @@ -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 diff --git a/dev-haskell/tar/tar-0.3.2.0.ebuild b/dev-haskell/tar/tar-0.3.2.0.ebuild deleted file mode 100644 index 2bc116ee9ae2..000000000000 --- a/dev-haskell/tar/tar-0.3.2.0.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# ebuild generated by hackport 0.2.14 - -EAPI="3" - -CABAL_FEATURES="lib profile haddock hoogle hscolour" -inherit base haskell-cabal - -DESCRIPTION="Reading, writing and manipulating .tar archive files" -HOMEPAGE="http://hackage.haskell.org/package/tar" -SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-macos" -IUSE="" - -RDEPEND=">=dev-lang/ghc-6.10.1" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.2" - -PATCHES=("${FILESDIR}"/${P}-dir-1.2.patch) |