[gentoo-commits] repo/gentoo:master commit in: dev-haskell/wxdirect/files/, dev-haskell/wxdirect/

[Sergei Trofimovich]

commit:     f7a7039c608b3a411f7208b9436ad7b1dbffc169
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Aug  5 06:51:12 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Aug  5 06:51:12 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7a7039c

dev-haskell/wxdirect: bump up to 0.92.3.0

Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 dev-haskell/wxdirect/Manifest                      |  1 +
 .../wxdirect/files/wxdirect-0.90.0.1-ghc-7.5.patch | 49 ++++++++++++++++++++++
 .../wxdirect/files/wxdirect-0.90.1.1-ghc-7.5.patch | 38 +++++++++++++++++
 dev-haskell/wxdirect/wxdirect-0.92.3.0-r1.ebuild   | 46 ++++++++++++++++++++
 4 files changed, 134 insertions(+)

diff --git a/dev-haskell/wxdirect/Manifest b/dev-haskell/wxdirect/Manifest
index d7baf064462..ecf20b6fbdb 100644
--- a/dev-haskell/wxdirect/Manifest
+++ b/dev-haskell/wxdirect/Manifest
@@ -1 +1,2 @@
 DIST wxdirect-0.92.2.0.tar.gz 30544 BLAKE2B 3d51252cc792f2d00be9ec53f139d961c19d6bf5e5aa792b1fe65ed258b2f98b9da30fda28d018b6d26dae72d80d8c394c17ba822e43c2ba89611881b7ba9b29 SHA512 f112fc0a62031bc9eb8e6caa2bd70f0b9fa66a81380785165a07bdffa6fa2b44652ffb9f1165c3b8ab7db8a31273650e36e98c8eb72f7cec5873ecb75f58dc21
+DIST wxdirect-0.92.3.0.tar.gz 30586 BLAKE2B cb174838000a39b0067338297adb7c1e0b96bd524297950f5d3ede244ec914d2a1b3c717669b5af53f29b55266473c7042b7c90990b70c6177e85fc11d76bc34 SHA512 02dfd9496f1a36480c82a4cf03e3a0ded0a45ede984b70e923b2289323f9c4561b7c0a2ab2db34ee2021b7b5fe62c25ea4a8b61bcbbe3414f821dacb14190f8b

diff --git a/dev-haskell/wxdirect/files/wxdirect-0.90.0.1-ghc-7.5.patch b/dev-haskell/wxdirect/files/wxdirect-0.90.0.1-ghc-7.5.patch
new file mode 100644
index 00000000000..75d9bf21c72
--- /dev/null
+++ b/dev-haskell/wxdirect/files/wxdirect-0.90.0.1-ghc-7.5.patch
@@ -0,0 +1,49 @@
+--- wxdirect-0.90.0.1-orig/wxdirect.cabal	2012-04-19 01:05:11.000000000 +1000
++++ wxdirect-0.90.0.1/wxdirect.cabal	2012-05-19 21:12:02.612085338 +1000
+@@ -66,7 +66,7 @@
+   if flag(splitBase)
+     build-depends:
+         base       >= 4     && < 5,
+-        containers >= 0.2   && < 0.5
++        containers >= 0.2   && < 0.6
+   else
+     build-depends:
+         base       >= 3     && < 4,
+--- wxdirect-0.90.0.1-orig/src/Classes.hs	2012-04-19 01:05:10.000000000 +1000
++++ wxdirect-0.90.0.1/src/Classes.hs	2012-07-14 13:58:48.072492467 +1000
+@@ -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.90.0.1-orig/src/CompileClasses.hs	2012-04-19 01:05:10.000000000 +1000
++++ wxdirect-0.90.0.1/src/CompileClasses.hs	2012-05-19 21:28:27.358052781 +1000
+@@ -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" ]
+@@ -103,6 +103,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/files/wxdirect-0.90.1.1-ghc-7.5.patch b/dev-haskell/wxdirect/files/wxdirect-0.90.1.1-ghc-7.5.patch
new file mode 100644
index 00000000000..df29d1ba08b
--- /dev/null
+++ b/dev-haskell/wxdirect/files/wxdirect-0.90.1.1-ghc-7.5.patch
@@ -0,0 +1,38 @@
+--- wxdirect-0.90.1.1-orig/src/Classes.hs	2014-03-23 01:08:59.000000000 +1100
++++ wxdirect-0.90.1.1/src/Classes.hs	2014-03-23 15:43:57.402011540 +1100
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP #-}
+ -----------------------------------------------------------------------------------------
+ {-| Module      :  Classes
+     Copyright   :  (c) Daan Leijen 2003
+@@ -24,6 +25,9 @@
+ 
+ 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 Text.Parsec.Prim hiding ( try )
+ import HaskellNames( haskellTypeName, isBuiltin )
+ import Types
+--- wxdirect-0.90.1.1-orig/src/CompileClasses.hs	2014-03-23 01:08:59.000000000 +1100
++++ wxdirect-0.90.1.1/src/CompileClasses.hs	2014-03-23 15:42:14.123894206 +1100
+@@ -96,7 +96,7 @@
+            (exportsStatic,exportsClassClasses,classCount) = exportDefs decls exportsClass []
+ 
+            methodCount  = length decls
+-           ghcoptions   = [ "{-# LANGUAGE ForeignFunctionInterface #-}"]
++           ghcoptions   = [ "{-# LANGUAGE CPP, ForeignFunctionInterface #-}"]
+ 
+            export   = concat  [ ["module " ++ moduleRoot ++ moduleName
+                                 , "    ( -- * Global" ]
+@@ -111,6 +111,9 @@
+                                 , "import Foreign.C.Types(CInt(..), CWchar(..), CChar(..), CDouble(..))"
+                                 , "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.92.3.0-r1.ebuild b/dev-haskell/wxdirect/wxdirect-0.92.3.0-r1.ebuild
new file mode 100644
index 00000000000..fa70c6b2eb0
--- /dev/null
+++ b/dev-haskell/wxdirect/wxdirect-0.92.3.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.5.3.9999
+
+WX_GTK_VER="3.0"
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="helper tool for building wxHaskell"
+HOMEPAGE="https://wiki.haskell.org/WxHaskell"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="${WX_GTK_VER}/${PV}"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=dev-haskell/parsec-2.1.0:=[profile?] <dev-haskell/parsec-4:=[profile?]
+	dev-haskell/strict:=[profile?]
+	>=dev-lang/ghc-7.4.1:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.2
+"
+
+src_prepare() {
+	default
+
+	cabal_chdeps \
+		'process    >= 1.1   && < 1.5' 'process    >= 1.1'\
+		'base       >= 3     && < 4' 'base >=3'\
+		'containers >= 0.1   && < 0.3' 'containers >=0.1'
+
+	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}"
+
+	# embed ${CHOST}-cpp instead of "cpp" to support sys-devel/gcc-config[-native-symlinks]
+	# Ideally it should also obey CPP variable
+	sed -e 's/"cpp"/"'${CHOST}-cpp'"/g' \
+		-i src/ParseC.hs || die
+}