1 |
commit: 5c3e587b4f4e464b3bdc18d35993b8a9d755ad31 |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 4 22:34:35 2018 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 4 22:34:42 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c3e587b |
7 |
|
8 |
dev-haskell/wxdirect: drop SLOW=2.9 as wxGTK:2.9 gone away a while ago |
9 |
|
10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
11 |
|
12 |
dev-haskell/wxdirect/Manifest | 1 - |
13 |
.../wxdirect/files/wxdirect-0.90.1.1-ghc-7.5.patch | 38 -------------------- |
14 |
dev-haskell/wxdirect/wxdirect-0.90.1.1.ebuild | 41 ---------------------- |
15 |
3 files changed, 80 deletions(-) |
16 |
|
17 |
diff --git a/dev-haskell/wxdirect/Manifest b/dev-haskell/wxdirect/Manifest |
18 |
index 9f4b7437a04..d7baf064462 100644 |
19 |
--- a/dev-haskell/wxdirect/Manifest |
20 |
+++ b/dev-haskell/wxdirect/Manifest |
21 |
@@ -1,2 +1 @@ |
22 |
-DIST wxdirect-0.90.1.1.tar.gz 29893 BLAKE2B 2e594ba127ab4340be0e488ebdf3eb3659fcf5eabb659be5ac64e0864607be0f8fd68b95a2ae558557101641071c42965ad1c45c80792007299fdf37e4baafc7 SHA512 f32b62db9c88a282531081a1a1e40757335306306af28a38ed364d28ca532418aca18e44ec6b5a789e02f5dddb455c9a7eb7f7e7c24b8a155df80628dcd2cfa1 |
23 |
DIST wxdirect-0.92.2.0.tar.gz 30544 BLAKE2B 3d51252cc792f2d00be9ec53f139d961c19d6bf5e5aa792b1fe65ed258b2f98b9da30fda28d018b6d26dae72d80d8c394c17ba822e43c2ba89611881b7ba9b29 SHA512 f112fc0a62031bc9eb8e6caa2bd70f0b9fa66a81380785165a07bdffa6fa2b44652ffb9f1165c3b8ab7db8a31273650e36e98c8eb72f7cec5873ecb75f58dc21 |
24 |
|
25 |
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 |
26 |
deleted file mode 100644 |
27 |
index df29d1ba08b..00000000000 |
28 |
--- a/dev-haskell/wxdirect/files/wxdirect-0.90.1.1-ghc-7.5.patch |
29 |
+++ /dev/null |
30 |
@@ -1,38 +0,0 @@ |
31 |
---- wxdirect-0.90.1.1-orig/src/Classes.hs 2014-03-23 01:08:59.000000000 +1100 |
32 |
-+++ wxdirect-0.90.1.1/src/Classes.hs 2014-03-23 15:43:57.402011540 +1100 |
33 |
-@@ -1,3 +1,4 @@ |
34 |
-+{-# LANGUAGE CPP #-} |
35 |
- ----------------------------------------------------------------------------------------- |
36 |
- {-| Module : Classes |
37 |
- Copyright : (c) Daan Leijen 2003 |
38 |
-@@ -24,6 +25,9 @@ |
39 |
- |
40 |
- import qualified Data.Set as Set |
41 |
- import qualified Data.Map as Map |
42 |
-+#if !MIN_VERSION_base(4,6,0) |
43 |
-+import Prelude hiding ( catch ) |
44 |
-+#endif |
45 |
- import Text.Parsec.Prim hiding ( try ) |
46 |
- import HaskellNames( haskellTypeName, isBuiltin ) |
47 |
- import Types |
48 |
---- wxdirect-0.90.1.1-orig/src/CompileClasses.hs 2014-03-23 01:08:59.000000000 +1100 |
49 |
-+++ wxdirect-0.90.1.1/src/CompileClasses.hs 2014-03-23 15:42:14.123894206 +1100 |
50 |
-@@ -96,7 +96,7 @@ |
51 |
- (exportsStatic,exportsClassClasses,classCount) = exportDefs decls exportsClass [] |
52 |
- |
53 |
- methodCount = length decls |
54 |
-- ghcoptions = [ "{-# LANGUAGE ForeignFunctionInterface #-}"] |
55 |
-+ ghcoptions = [ "{-# LANGUAGE CPP, ForeignFunctionInterface #-}"] |
56 |
- |
57 |
- export = concat [ ["module " ++ moduleRoot ++ moduleName |
58 |
- , " ( -- * Global" ] |
59 |
-@@ -111,6 +111,9 @@ |
60 |
- , "import Foreign.C.Types(CInt(..), CWchar(..), CChar(..), CDouble(..))" |
61 |
- , "import " ++ moduleRoot ++ "WxcTypes" |
62 |
- , "import " ++ moduleRoot ++ moduleClassTypesName |
63 |
-+ , "#if (__GLASGOW_HASKELL__>=705)" |
64 |
-+ , "import Foreign.C.Types(CDouble(..), CInt(..), CWchar(..))" |
65 |
-+ , "#endif" |
66 |
- , "" |
67 |
- ] |
68 |
- ] |
69 |
|
70 |
diff --git a/dev-haskell/wxdirect/wxdirect-0.90.1.1.ebuild b/dev-haskell/wxdirect/wxdirect-0.90.1.1.ebuild |
71 |
deleted file mode 100644 |
72 |
index 76c6fd4073b..00000000000 |
73 |
--- a/dev-haskell/wxdirect/wxdirect-0.90.1.1.ebuild |
74 |
+++ /dev/null |
75 |
@@ -1,41 +0,0 @@ |
76 |
-# Copyright 1999-2015 Gentoo Foundation |
77 |
-# Distributed under the terms of the GNU General Public License v2 |
78 |
- |
79 |
-EAPI=5 |
80 |
- |
81 |
-# ebuild generated by hackport 0.3.6.9999 |
82 |
- |
83 |
-WX_GTK_VER="2.9" |
84 |
- |
85 |
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour" |
86 |
-inherit base haskell-cabal |
87 |
- |
88 |
-DESCRIPTION="helper tool for building wxHaskell" |
89 |
-HOMEPAGE="http://haskell.org/haskellwiki/WxHaskell" |
90 |
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" |
91 |
- |
92 |
-LICENSE="BSD" |
93 |
-SLOT="${WX_GTK_VER}/${PV}" |
94 |
-KEYWORDS="~amd64 ~ppc ~sparc ~x86" |
95 |
-IUSE="" |
96 |
- |
97 |
-RDEPEND=">=dev-haskell/parsec-2.1.0:=[profile?] <dev-haskell/parsec-4:=[profile?] |
98 |
- dev-haskell/strict:=[profile?] |
99 |
- >=dev-lang/ghc-7.4.1:= |
100 |
-" |
101 |
-DEPEND="${RDEPEND} |
102 |
- >=dev-haskell/cabal-1.2 |
103 |
-" |
104 |
- |
105 |
-PATCHES=("${FILESDIR}/${PN}-0.90.1.1-ghc-7.5.patch") |
106 |
- |
107 |
-src_prepare() { |
108 |
- base_src_prepare |
109 |
- sed -e "s@executable wxdirect@executable wxdirect-${WX_GTK_VER}@" \ |
110 |
- -i "${S}/${PN}.cabal" \ |
111 |
- || die "Could not change ${PN}.cabal for wxdirect slot ${WX_GTK_VER}" |
112 |
- cabal_chdeps \ |
113 |
- 'process >= 1.1 && < 1.2' 'process >= 1.1' \ |
114 |
- 'time >= 1.0 && < 1.5' 'time >= 1.0' \ |
115 |
- 'filepath < 1.4' 'filepath' |
116 |
-} |