diff --git a/dev-haskell/wxdirect/Manifest b/dev-haskell/wxdirect/Manifest index 87b4b10f87381..5362333126f05 100644 --- a/dev-haskell/wxdirect/Manifest +++ b/dev-haskell/wxdirect/Manifest @@ -1,3 +1,2 @@ -DIST wxdirect-0.13.1.3.tar.gz 32748 SHA256 2691991b319db1a57b9ee8895f78474ac4cbb947040e250d86975a30e8cf7411 SHA512 fc0ae01937c524105edcc39a8cbb3b0ac45d2d8b34346f59ada30171ed78f1a3e0be4010ffe63cd37ee0cc38c1b08e31628281efaa3ccc847a19f9518ecbe08c WHIRLPOOL db92071df161d4f25ddbd0af24153a21c3eb51877496f5fa60cf655bf71fc7c19f06f70fd3919798fcde50052205d04932307d8eaec65bb47dc9e561cb8ba02f DIST wxdirect-0.90.1.1.tar.gz 29893 SHA256 282968b7fc52ed67f1efaf357cac05ffad58b7f80128062549801b6309ed7045 SHA512 f32b62db9c88a282531081a1a1e40757335306306af28a38ed364d28ca532418aca18e44ec6b5a789e02f5dddb455c9a7eb7f7e7c24b8a155df80628dcd2cfa1 WHIRLPOOL fbcb554ddaa6d96d3b87dc2c1423802409a8d763c59981446c7005b56455f275854587c49eb56da371ff350eacd1d76059f8b850844ffa05ef177b8338d10f12 DIST wxdirect-0.92.2.0.tar.gz 30544 SHA256 2303834061c544f7e32ffd7aaf91e644ee89e178487689f109f06625f0eefd3b SHA512 f112fc0a62031bc9eb8e6caa2bd70f0b9fa66a81380785165a07bdffa6fa2b44652ffb9f1165c3b8ab7db8a31273650e36e98c8eb72f7cec5873ecb75f58dc21 WHIRLPOOL 86f23acadec66f9fcb658c0e9faac33800396c11819c5950285f72e23233603866fad0e00c376636c69d3f7a16ee91ff327cf715f33edfa0628f20d8837ba883 diff --git a/dev-haskell/wxdirect/files/wxdirect-0.13.1.3-ghc-7.10.patch b/dev-haskell/wxdirect/files/wxdirect-0.13.1.3-ghc-7.10.patch deleted file mode 100644 index 38889be35d398..0000000000000 --- a/dev-haskell/wxdirect/files/wxdirect-0.13.1.3-ghc-7.10.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/src/HaskellNames.hs b/src/HaskellNames.hs -index 6e1910e..bd61137 100644 ---- a/src/HaskellNames.hs -+++ b/src/HaskellNames.hs -@@ -147,6 +147,7 @@ isBuiltin name - {----------------------------------------------------------------------------------------- - Haddock prologue - -----------------------------------------------------------------------------------------} -+getPrologue :: [Char] -> [Char] -> [Char] -> [String] -> IO [String] - getPrologue moduleName content contains inputFiles - = do time <- getCurrentTime - return (prologue time) -diff --git a/wxdirect.cabal b/wxdirect.cabal -index 83be4af..02b56af 100644 ---- a/wxdirect.cabal -+++ b/wxdirect.cabal -@@ -61,7 +61,7 @@ executable wxdirect-2.8 - - build-depends: - parsec >= 2.1.0 && < 4, -- time >= 1.0 && < 1.5, -+ time >= 1.0, - strict >= 0.3 && < 1.0, - directory >= 1.0 && < 2.0 - diff --git a/dev-haskell/wxdirect/files/wxdirect-0.13.1.3-ghc-7.6.patch b/dev-haskell/wxdirect/files/wxdirect-0.13.1.3-ghc-7.6.patch deleted file mode 100644 index dfc484a1eb9a6..0000000000000 --- a/dev-haskell/wxdirect/files/wxdirect-0.13.1.3-ghc-7.6.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- wxdirect-0.13.1.3-orig/src/ParseEiffel.hs 2012-09-30 20:02:15.000000000 +1000 -+++ wxdirect-0.13.1.3/src/ParseEiffel.hs 2014-03-23 14:15:23.118131281 +1100 -@@ -1,3 +1,4 @@ -+{-# LANGUAGE ScopedTypeVariables #-} - ----------------------------------------------------------------------------------------- - {-| Module : ParseEiffel - Copyright : (c) Daan Leijen 2003 -@@ -12,6 +13,8 @@ - ----------------------------------------------------------------------------------------- - module ParseEiffel( parseEiffel ) where - -+import Prelude hiding ( catch ) -+import Control.Exception ( catch, IOException ) - import Data.Char( digitToInt ) - import Text.ParserCombinators.Parsec - import qualified Text.ParserCombinators.Parsec.Token as P ---- wxdirect-0.13.1.3-orig/src/Classes.hs 2012-09-30 20:02:15.000000000 +1000 -+++ wxdirect-0.13.1.3/src/Classes.hs 2014-03-23 14:15:23.118131281 +1100 -@@ -1,3 +1,4 @@ -+{-# LANGUAGE CPP #-} - ----------------------------------------------------------------------------------------- - {-| Module : Classes - Copyright : (c) Daan Leijen 2003 -@@ -28,7 +29,9 @@ - import Data.List( sort, sortBy ) - import qualified Data.Set as Set - import qualified Data.Map as Map -+#if !MIN_VERSION_base(4,6,0) - import Prelude hiding ( catch ) -+#endif - import HaskellNames( haskellTypeName, isBuiltin ) - import Types - ---- wxdirect-0.13.1.3-orig/src/CompileClasses.hs 2012-09-30 20:02:15.000000000 +1000 -+++ wxdirect-0.13.1.3/src/CompileClasses.hs 2014-03-23 14:15:23.119131301 +1100 -@@ -89,7 +89,7 @@ - (exportsStatic,exportsClassClasses,classCount) = exportDefs decls exportsClass [] - - methodCount = length decls -- ghcoptions = [ "{-# LANGUAGE ForeignFunctionInterface #-}"] -+ ghcoptions = [ "{-# LANGUAGE CPP, ForeignFunctionInterface #-}"] - - export = concat [ ["module " ++ moduleRoot ++ moduleName - , " ( -- * Global" ] -@@ -104,6 +104,9 @@ - , "import System.IO.Unsafe( unsafePerformIO )" - , "import " ++ moduleRoot ++ "WxcTypes" - , "import " ++ moduleRoot ++ moduleClassTypesName -+ , "#if (__GLASGOW_HASKELL__>=705)" -+ , "import Foreign.C.Types(CDouble(..), CInt(..), CWchar(..))" -+ , "#endif" - , "" - ] - ] diff --git a/dev-haskell/wxdirect/wxdirect-0.13.1.3.ebuild b/dev-haskell/wxdirect/wxdirect-0.13.1.3.ebuild deleted file mode 100644 index 116f193fdc999..0000000000000 --- a/dev-haskell/wxdirect/wxdirect-0.13.1.3.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -# ebuild generated by hackport 0.3.6.9999 - -WX_GTK_VER="2.8" - -CABAL_FEATURES="bin lib profile haddock hoogle hscolour" -inherit base haskell-cabal - -DESCRIPTION="helper tool for building wxHaskell" -HOMEPAGE="http://haskell.org/haskellwiki/WxHaskell" -SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" - -LICENSE="BSD" -SLOT="${WX_GTK_VER}/${PV}" -KEYWORDS="~amd64 ~ppc ~sparc ~x86" -IUSE="" - -RDEPEND=">=dev-haskell/parsec-2.1.0:=[profile?] =dev-haskell/strict-0.3:=[profile?] =dev-lang/ghc-6.12.1:= -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.8.0.2 -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.13.1.3-ghc-7.6.patch - "${FILESDIR}"/${PN}-0.13.1.3-ghc-7.10.patch -) - -src_prepare() { - base_src_prepare - sed -e "s@executable wxdirect@executable wxdirect-${WX_GTK_VER}@" \ - -i "${S}/${PN}.cabal" \ - || die "Could not change ${PN}.cabal for wxdirect slot ${WX_GTK_VER}" -}