[commit: haskeline] master: Remove the "base2" flag now that we require ghc>=6.10.1. (7a80a68)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/haskeline

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/7a80a6841cfe3b742fa4d0d5e4e1aa851e8774ba

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

commit 7a80a6841cfe3b742fa4d0d5e4e1aa851e8774ba
Author: Judah Jacobson <judah.jacobson at gmail.com>
Date:   Sun Feb 19 23:45:11 2012 +0000

    Remove the "base2" flag now that we require ghc>=6.10.1.

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

 System/Console/Haskeline/Backend/IConv.hsc |    4 ----
 haskeline.cabal                            |   19 +++++--------------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/System/Console/Haskeline/Backend/IConv.hsc b/System/Console/Haskeline/Backend/IConv.hsc
index a217ac4..f972606 100644
--- a/System/Console/Haskeline/Backend/IConv.hsc
+++ b/System/Console/Haskeline/Backend/IConv.hsc
@@ -11,11 +11,7 @@ import Foreign.C
 import Foreign
 import Data.ByteString (ByteString, useAsCStringLen, append)
 -- TODO: Base or Internal, depending on whether base>=3.
-#ifdef OLD_BASE
-import Data.ByteString.Base (createAndTrim')
-#else
 import Data.ByteString.Internal (createAndTrim')
-#endif
 import qualified Data.ByteString as B
 import qualified Data.ByteString.UTF8 as UTF8
 import Data.Maybe (fromMaybe)
diff --git a/haskeline.cabal b/haskeline.cabal
index b4d4581..3c4a58c 100644
--- a/haskeline.cabal
+++ b/haskeline.cabal
@@ -21,9 +21,6 @@ Stability:      Experimental
 Build-Type:     Custom
 extra-source-files: examples/Test.hs CHANGES
 
-flag base2
-    Description: Use the base packages from before version 6.8
-
 -- There are three main advantages to the terminfo backend over the portable,
 -- "dumb" alternative.  First, it enables more efficient control sequences
 -- when redrawing the input.  Second, and more importantly, it enables us
@@ -44,19 +41,13 @@ flag libiconv
     Default: False
 
 Library
-    if flag(base2) {
-        Build-depends: base == 2.*
-        cpp-options:    -DOLD_BASE
+    if impl(ghc>=6.11) {
+        Build-depends: base >=4.1 && < 4.6, containers>=0.1 && < 0.5, directory>=1.0 && < 1.2,
+                       bytestring==0.9.*
     }
     else {
-        if impl(ghc>=6.11) {
-            Build-depends: base >=4.1 && < 4.6, containers>=0.1 && < 0.5, directory>=1.0 && < 1.2,
-                           bytestring==0.9.*
-        }
-        else {
-            Build-depends: base>=3 && <4.1 , containers>=0.1 && < 0.3, directory==1.0.*,
-                           bytestring==0.9.*
-        }
+        Build-depends: base>=3 && <4.1 , containers>=0.1 && < 0.3, directory==1.0.*,
+                       bytestring==0.9.*
     }
     Build-depends:  filepath >= 1.1 && < 1.4, mtl >= 1.1 && < 2.1,
                     utf8-string==0.3.* && >=0.3.6