[commit: ghc] master: Remove base 3 support from bin-package-db (0faa8f5)

[Ian Lynagh]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : master

https://github.com/ghc/ghc/commit/0faa8f539f94f51002c73fb1b9c8b22a6d6321e2

>---------------------------------------------------------------

commit 0faa8f539f94f51002c73fb1b9c8b22a6d6321e2
Author: Ian Lynagh <ian at well-typed.com>
Date:   Mon Mar 18 12:33:10 2013 +0000

    Remove base 3 support from bin-package-db

>---------------------------------------------------------------

 .../bin-package-db/Distribution/InstalledPackageInfo/Binary.hs   | 6 ------
 libraries/bin-package-db/bin-package-db.cabal                    | 9 +--------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/libraries/bin-package-db/Distribution/InstalledPackageInfo/Binary.hs b/libraries/bin-package-db/Distribution/InstalledPackageInfo/Binary.hs
index f6cbc7c..476897e 100644
--- a/libraries/bin-package-db/Distribution/InstalledPackageInfo/Binary.hs
+++ b/libraries/bin-package-db/Distribution/InstalledPackageInfo/Binary.hs
@@ -36,13 +36,7 @@ readBinPackageDB file
       (\err -> error ("While parsing " ++ show file ++ ": " ++ err))
 
 catchUserError :: IO a -> (String -> IO a) -> IO a
-#ifdef BASE3
-catchUserError io f = io `Exception.catch` \e -> case e of
-                                                 ErrorCall err -> f err
-                                                 _ -> throw e
-#else
 catchUserError io f = io `Exception.catch` \(ErrorCall err) -> f err
-#endif
 
 writeBinPackageDB :: Binary m => FilePath -> [InstalledPackageInfo_ m] -> IO ()
 writeBinPackageDB file ipis = Bin.encodeFile file ipis
diff --git a/libraries/bin-package-db/bin-package-db.cabal b/libraries/bin-package-db/bin-package-db.cabal
index 7fde05d..67c7f65 100644
--- a/libraries/bin-package-db/bin-package-db.cabal
+++ b/libraries/bin-package-db/bin-package-db.cabal
@@ -11,18 +11,11 @@ source-repository head
     type:     darcs
     location: http://darcs.haskell.org/ghc
 
-flag base3
-    default: False
-
 Library {
     exposed-modules:
             Distribution.InstalledPackageInfo.Binary
 
-    if flag(base3)
-        build-depends: base >= 3 && < 4
-        cpp-options: -DBASE3
-    else
-        build-depends: base >= 4 && < 5
+    build-depends: base >= 4 && < 5
 
     build-depends: binary >= 0.5 && < 0.8,
                    Cabal >= 1.8 && < 1.18