Port to directory-1.2 coming with ghc-7.6 (bug #483728 by quarks).

Package-Manager: portage-2.2.0_alpha194_p2/cvs/Linux x86_64
Manifest-Sign-Key: 0x611FF3AA

4 files changed, 69 insertions, 21 deletions

diff --git a/dev-haskell/tar/ChangeLog b/dev-haskell/tar/ChangeLog
index 39e692a517df..80fd0e0e5ad7 100644
--- a/dev-haskell/tar/ChangeLog
+++ b/dev-haskell/tar/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/tar
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/tar/ChangeLog,v 1.21 2013/03/31 10:26:22 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/tar/ChangeLog,v 1.22 2013/09/05 18:43:46 slyfox Exp $
+
+  05 Sep 2013; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/tar-0.3.2.0-dir-1.2.patch, tar-0.3.2.0.ebuild:
+  Port to directory-1.2 coming with ghc-7.6 (bug #483728 by quarks).
 
   31 Mar 2013; Agostino Sarubbo <ago@gentoo.org> tar-0.4.0.1.ebuild:
   Stable for sparc, wrt bug #456516
diff --git a/dev-haskell/tar/Manifest b/dev-haskell/tar/Manifest
index 248b6ea96ef1..ffa57432a2b6 100644
--- a/dev-haskell/tar/Manifest
+++ b/dev-haskell/tar/Manifest
@@ -1,29 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX tar-0.3.1.0-ghc-7.4.patch 504 SHA256 5f3d90b53b52eac46c08f35839eb4ea3423450ff403efc5f72261e25a568e39d SHA512 6f938c77e1cc2e6812013b15e5a8d398e349bd516381191d27484fe51864fa10a3868b2c74243431a5109a6543170fb3673558d352a95f20c9ef4988e9345c17 WHIRLPOOL fc507d92725ed1eaf406b121ae6ec0aadc68fd487870fd186e419383f606e0ecec3a5b23ca7187a38f7c3074d3b677808266c60a2995c30a896e6cd0dd9127d7
+AUX tar-0.3.2.0-dir-1.2.patch 1677 SHA256 46089a39fd93279353bcbd9d919f53e0133669bfc6fba9970b00cb098ffb0a37 SHA512 4b7daf65c4448696ba2b7366fff59a4914db38b264b1645c51dac3b0756dda72f3b63ccd6671749d2d2a3d313944e4f565ab7cecc5f35d10f19af42299f8b018 WHIRLPOOL 2566b591055b5dfdd7b5e6bb2699995f726492f9ad13a3366dcf321c811d64d54f47d9adb11090c0b3c5abcb7679db1e2be5031f1a599b0e5959aec5ddded888
 DIST tar-0.3.1.0.tar.gz 15840 SHA256 0364496ecf0d2de16577fe371a631bdd8a9e2cb3b5377f66c860f4e30bd626d8 SHA512 b117b9ab299833d6ce35f6c5d417a3e8c913fa55a13d5d829f5e195ae7067d0b4b920aa37e2dc19caaf7f08e8761f623f93b99faf6451341fa24eaf1db0762ea WHIRLPOOL 576387ffdbec8d919739260966abd8a29f04928c1dcf763d33436f6e0f0fb960b9b62f304f81f94bbdf2463b05e75e3a64f5a2b8625e51123f7924d5c4fab323
 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
 EBUILD tar-0.3.1.0.ebuild 741 SHA256 1cce05674e5533b26aa765db8a838903ce534890699230959b9b129870fe9fb6 SHA512 85ac9c4916f0e94cd5c1e223c90d26871be9da29b45e6121dad18cfff84eafc17572834fdab724b849eb9f55fff4ac0ce3e9d85be437c65ecbbc01f2cdfecab2 WHIRLPOOL 5540756f950ca3ecfc8d3af8a595cd39c76e3844f3c7b3533f90377610ea6ab5a85e66bafb59cda7c292e93cc7225215c2dca2e59bec6122c5dc03b831779bb9
-EBUILD tar-0.3.2.0.ebuild 708 SHA256 1277a97e61a601ea64aa8d01a50edac73a9559523af9605050fbba144cbb12a2 SHA512 9d377305b8d531042d817f2adac101e864bcfc8aba940c63b5a27f1c18435c29005da902be8da2f00794d67a2bc6d67025597032fcf1f4d0c9d4faca7da05a86 WHIRLPOOL a02482a75d4d8c79a87a25ba0a70477c816186bb4de9cda33a588115963ba1f9fe8fe777f74f9d1d04aabecc9a231e91f9b8ee79fd991144075d534e4476f4f8
+EBUILD tar-0.3.2.0.ebuild 757 SHA256 975d1462d8b593d8dd722bfd89f1791c213b5420ae3c6abac9f4e849ccf15bb3 SHA512 6b059a9262763946d53146b541d778fb82fbd9c8a5df4524c39ba5526b7dec818227d177b9ee1a743371f3118b6f4bd2d1def7bb03404fd649e7006f610640e7 WHIRLPOOL 21e027d42b7333abdb94657ba216337b9be3871c9f93729c9682772fd0e7b75d0fece327df633d632a3ec432bc58c51911fb2384d8077a243593f22598916449
 EBUILD tar-0.4.0.1.ebuild 715 SHA256 b4ae7d289fd875fdf0cd864a9fde6b1c188de2c8bb27df637d099830450bd19e SHA512 39f160fc2ffbd64a600260b94c226430567abf2352c18311e41b56cf38ef280cba0ba22e92adc2f9a8afaf53ef7758261aa7c8b224dd25afee6732f7d2b344ed WHIRLPOOL 878a01c9c72328fd62650f80e252bd26f973e461301a2bfec783d49a76be8ea210884390adcb0b57195d14502101f298feacd2c219222081b5233fbe567ef533
-MISC ChangeLog 2755 SHA256 f075932bedf2424614df028d07f1ff5467ef1ffd0f633d0bbb3babc16e74507f SHA512 07ff7eb54ec93bad9a56ecbf2a6c9add225ffb79f0c21d600a612773abd27b39259b5a087f7de86b4594e0fde9953bba44fa40f89a229081ec58bfd976c4f2b8 WHIRLPOOL dd35f67ca5dd1354bd8791bf7a05dd8f289556c0e0ed16c524d962b74a1a974b3aeb1c0ff8edc810e07a2c14bcba598ef5fd696bb1e93b2e104327e7d4124261
+MISC ChangeLog 2938 SHA256 1cb3893d027808c568b41b75e9176e44b4e1582c74535da87f5a8e390389f411 SHA512 f83e468aa11d289aa443f8001e22f239c1c603c51955ecc379d7fefaa08d5ed4e1e72e49573247ccff6b015e52d4878dd6ad442f0508f1c805c19e918bd656bb WHIRLPOOL 9f5e9ef5bc60cc1e9c5e75462dff173bdd912b2d23fa7f12032b40230f00cc56c1df519b95afdc43998805ced54e42ac47f81734ff8f3417d5f7ed26032aa016
 MISC metadata.xml 675 SHA256 b3527a6d2729e1b04a8db18b6064f3d218a3c3c89f09fa10f29ed6629ade62c4 SHA512 c6d4f3471cf1adaddc3e7c1e4b53e239b919fb8d943075a7a7424d9ddc3215fc01578e4234472ca0766ac12c06cc98257beaf9b70714f6c0b08f25e2ba91ddd6 WHIRLPOOL 49814b6b9feeb6efd22456b886f8b69f8924999648905dc989895e289f6edb71082af96398e0891354dd7b48059600b1033fc3f156f709b529141beed25f6a44
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRWA66AAoJELp701BxlEWfqAwP/3w4B8aBtXdsReijYyZss3gf
-qzFIt0R/Sjd42ljfBCwg9Y4+BrcWagtvjNzawWqE/tEGNBPHSzsWI6nPy8domO63
-UOKzwix+pAIxf6oo0jhF2Yjg1dMGUMOENSmpBCjvMBa63j+rkLBNHsMaSHwomAzY
-tbNNi5O7+aKXBwXth4h+lfdY0mUwQlG13mjy3mGiGkns9oto0u+EtH5Nbw1KcYnc
-hKYgn1cw4HATVUV2YuDb3qRBO+ApjSsIMBTwR2Xr3/MO5b+vZHS99EKKpa/m1F7O
-oNgadG0nAue4ltG9maL/MSoZbBnNd9qPwM4taZ1Bj5V7IzQ2RgDZgVY7I4kubgwy
-J1o3RYbnkf2x5V/VhXDzJSZ/WG2BEvg7aApWFNGX4/45sULmEf5AhMLwfD+Olc7v
-BGuP1B9jjShn4My3DioIP+GTNDm75HuO+Y8KEgFCdvZjrZ9naiD9Aj/hR1CL2Pmf
-6CZVtk7pUTmVKJZYK+P0zZNHrbfPkUlhsLOzSR26Hs7897zPIiUMX7421oOBm4Hn
-FtNpexy88PXBPhPNcZ+RYeHWVsCokBGf+hsw14fLWmpdslCZJtZ2jmq0YBD/U6Gd
-Oyt6Y1qsvqlX4HoZbkawbgJA5eeT7XMHGeSsqdXxEsEfkiKS9mNcIeB8sQA4lAcK
-FfYo6nrwTc5WECEpFo4i
-=ymPp
+iEYEAREIAAYFAlIo0CYACgkQcaHudmEf86q+sQCePfKwXkdogXocuhG9FPC3yXu4
+v3EAoINnVi9ZbAQq3NMyRbIvLIB1t0YX
+=vrr/
 -----END PGP SIGNATURE-----
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
diff --git a/dev-haskell/tar/tar-0.3.2.0.ebuild b/dev-haskell/tar/tar-0.3.2.0.ebuild
index 6f65c0a298ab..e04ce24667ff 100644
--- a/dev-haskell/tar/tar-0.3.2.0.ebuild
+++ b/dev-haskell/tar/tar-0.3.2.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/tar/tar-0.3.2.0.ebuild,v 1.8 2012/12/10 21:53:13 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/tar/tar-0.3.2.0.ebuild,v 1.9 2013/09/05 18:43:46 slyfox Exp $
 
 # ebuild generated by hackport 0.2.14
 
 EAPI="3"
 
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
+inherit base haskell-cabal
 
 DESCRIPTION="Reading, writing and manipulating .tar archive files."
 HOMEPAGE="http://hackage.haskell.org/package/tar"
@@ -21,3 +21,5 @@ IUSE=""
 RDEPEND=">=dev-lang/ghc-6.10.1"
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.2"
+
+PATCHES=("${FILESDIR}"/${P}-dir-1.2.patch)