dev-lang/whitespace: tweak for ghc-7.10, bug #556746

Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/556746

Package-Manager: portage-2.2.20

diff --git a/dev-lang/whitespace/Manifest b/dev-lang/whitespace/Manifest
index dc1f50556e8910c5234819ab51afff44acaf13b0..ff9357eea47a4504062e42f940c6e3fac88cc8f7 100644 (file)
--- a/dev-lang/whitespace/Manifest
+++ b/dev-lang/whitespace/Manifest
@@ -1 +1,2 @@
+DIST whitespace-0.4.tar.gz 16428 SHA256 e9133161bf712cd584334a4e9d75b1eb7dd64e48f956a73fc6e833a6bc5a09f9 SHA512 2a1c932d650f6cfd55bb7c08b8882086143bc9ec2b0f639a7452116d86f12daff1a1268d7451003a6bf8635fbf1ad23e9203410fd423ce16d4239c1b552d7046 WHIRLPOOL 30a3a9ab19b43868c012a27d4cf990029db598fd7cfcb7a762e52031c0c5d6d0e278e9670b7c0d0fc637f73ad00e7fc08d9bec840e6deda1b8e208b07ffdfa3d
 DIST wspace-0.3.tgz 15471 SHA256 53e47bf05df991c1d0f88a75cf5208bfc42d42b87f8fe3e8ee6a05ac78544a73 SHA512 d162e804b0b6c4cba164552678ef3a094153e89a0df5f684e52b93229d88699cf9c7fd31641b88fd8c4653c158b1e77193ebd9cd1edfc47863a09798f67d3487 WHIRLPOOL 48f71bab55c281607d0d537d9b532b95439744f7e11a6fd96b60145ef2489413ebd85617a3292b2a016eadc9d4cf6146505b614d50fba0d1c9b156be1ba87db9

diff --git a/dev-lang/whitespace/files/whitespace-0.4-ghc-7.10.patch b/dev-lang/whitespace/files/whitespace-0.4-ghc-7.10.patch
new file mode 100644 (file)
index 0000000..6ee31f4
--- /dev/null
+++ b/dev-lang/whitespace/files/whitespace-0.4-ghc-7.10.patch
@@ -0,0 +1,37 @@
+diff --git a/VM.hs b/VM.hs
+index 8ef93ce..e8113a0 100644
+--- a/VM.hs
++++ b/VM.hs
+@@ -1,7 +1,7 @@
+ module VM where
+ 
+-import Array
+-import IO
++import Data.Array
++import System.IO
+ import System.Random
+ 
+ {- Stack machine for running whitespace programs -}
+diff --git a/main.hs b/main.hs
+index 83c60b7..a22ff15 100644
+--- a/main.hs
++++ b/main.hs
+@@ -26,7 +26,7 @@ import Input
+ import VM
+ import Tokens
+ 
+-import System(getArgs)
++import System.Environment (getArgs)
+ 
+ main :: IO ()
+ main = do
+diff --git a/whitespace.cabal b/whitespace.cabal
+index 95ae434..e57ac58 100644
+--- a/whitespace.cabal
++++ b/whitespace.cabal
+@@ -15,4 +15,4 @@ Extra-Source-Files:  VM.hs Tokens.hs Input.hs
+ 
+ Executable wspace
+   Main-is:           main.hs
+-  Build-Depends:     haskell98, random
++  Build-Depends:     base, array, random

diff --git a/dev-lang/whitespace/metadata.xml b/dev-lang/whitespace/metadata.xml
index 410c5e5c0b8d1e119f8400e0fcc42d1b69eef5e4..ad80e7d01b1a15239e899fafc577c22f32bf5d1c 100644 (file)
--- a/dev-lang/whitespace/metadata.xml
+++ b/dev-lang/whitespace/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+       <herd>haskell</herd>
        <maintainer>
                <email>yac@gentoo.org</email>
                <name>Jan Matejka</name>

diff --git a/dev-lang/whitespace/whitespace-0.4.ebuild b/dev-lang/whitespace/whitespace-0.4.ebuild
new file mode 100644 (file)
index 0000000..d6cd70d
--- /dev/null
+++ b/dev-lang/whitespace/whitespace-0.4.ebuild
@@ -0,0 +1,30 @@
+# 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.5.9999
+
+CABAL_FEATURES="bin"
+inherit eutils haskell-cabal
+
+DESCRIPTION="Whitespace, an esoteric programming language"
+HOMEPAGE="https://github.com/haroldl/whitespace-nd"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+       >=dev-haskell/cabal-1.6.0.3
+       dev-haskell/random
+       >=dev-lang/ghc-6.10.4
+"
+
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-ghc-7.10.patch
+}