From 8fcdcec5fbdd0e3a77391e4f354218014f59f358 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 5 Jan 2018 20:45:13 +0000 Subject: gentoo resync : 05.01.2018 --- dev-haskell/wxdirect/Manifest | 3 -- .../wxdirect/files/wxdirect-0.90.1.1-ghc-7.5.patch | 38 -------------------- dev-haskell/wxdirect/wxdirect-0.90.1.1.ebuild | 41 ---------------------- 3 files changed, 82 deletions(-) delete mode 100644 dev-haskell/wxdirect/files/wxdirect-0.90.1.1-ghc-7.5.patch delete mode 100644 dev-haskell/wxdirect/wxdirect-0.90.1.1.ebuild (limited to 'dev-haskell/wxdirect') diff --git a/dev-haskell/wxdirect/Manifest b/dev-haskell/wxdirect/Manifest index c8fc838bb3ee..cc98e4184ffe 100644 --- a/dev-haskell/wxdirect/Manifest +++ b/dev-haskell/wxdirect/Manifest @@ -1,7 +1,4 @@ -AUX wxdirect-0.90.1.1-ghc-7.5.patch 1811 BLAKE2B bab765c2b0c04af756538db212c8e43e6c447e0725fae4c8968c7c99f917c4c1ff460a34ea3815da944365cf5b7d919201d8e94c6cd57c1a1c45c6f31abebda4 SHA512 b615fdbeef0bbadbed0a4167587843a06b344a71436abd0791ce4654382a36b5ff630a53ac492ce93e3087b817832af2ce67e4db5f8c229f1c32f588617d47e3 -DIST wxdirect-0.90.1.1.tar.gz 29893 BLAKE2B 2e594ba127ab4340be0e488ebdf3eb3659fcf5eabb659be5ac64e0864607be0f8fd68b95a2ae558557101641071c42965ad1c45c80792007299fdf37e4baafc7 SHA512 f32b62db9c88a282531081a1a1e40757335306306af28a38ed364d28ca532418aca18e44ec6b5a789e02f5dddb455c9a7eb7f7e7c24b8a155df80628dcd2cfa1 DIST wxdirect-0.92.2.0.tar.gz 30544 BLAKE2B 3d51252cc792f2d00be9ec53f139d961c19d6bf5e5aa792b1fe65ed258b2f98b9da30fda28d018b6d26dae72d80d8c394c17ba822e43c2ba89611881b7ba9b29 SHA512 f112fc0a62031bc9eb8e6caa2bd70f0b9fa66a81380785165a07bdffa6fa2b44652ffb9f1165c3b8ab7db8a31273650e36e98c8eb72f7cec5873ecb75f58dc21 -EBUILD wxdirect-0.90.1.1.ebuild 1120 BLAKE2B c3890c9ecbef5624cdbf0de02533daf28393484c72c10ac453bcbfdff26cfbe4e18be4e2ffecd0faa15433f107a7a70d25fdd9c4ea88e7476ce676dac53384e3 SHA512 5295225581a14690ec758b1a9725b6e3fba65ad5fc47a1ba1f7184b0f3ed687f3799f04fc5879c28439100b801e702bbf2a4ae2f3648e6b872feff97ff03691f EBUILD wxdirect-0.92.2.0-r1.ebuild 948 BLAKE2B 76cbe6bc2668d9fdf324d6e2c7fe42eb5dd4af31b7de3afb339802d94eda3a5fddddc99cf30bbc5a329ae7eea52c08907af27b2614d26ae1ad67ff64b63a4a94 SHA512 4454d24bddb2a8b48ea6418cdfcf68779492e465c0aab671c7f9be99c215bb7dc60fbc48ec78cc6e4203377bf86bc210931bd09f14e432b93ececea9bba37de9 EBUILD wxdirect-0.92.2.0.ebuild 878 BLAKE2B 73ef3a2c546f42ecffe2faf98a083d2982cb5db83d4b2f11aad2e975dd57ca3988d1c63f6037b6d3d78c5f24a8e494d1e904f2bd3f1ad6de01d5a2b81ece31f7 SHA512 06a0de82f62ba1b50d66c8793486f8b6630e2c7518f82caa6f44ff5edecbd80f650ba2e63acb570d5f7cd18648df9b1dead6259e169aae878834b33e6f7469c0 MISC metadata.xml 552 BLAKE2B 5917920410ec46e81b2af4b10c160023658612e85a79b163c169dca57f7adeb65b5dae7b95f425297d7cb7f622d5b9868bffa2db66dee520768831848b2fbede SHA512 330e53423fa37d149fd7ba27e3e8895c5e2a234d62b5fd7afa60eafd1f482c44ef8ae64bccba670a8090e0899d796ddc01595abda056ce9e35368ac496fb353b 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 deleted file mode 100644 index df29d1ba08b8..000000000000 --- a/dev-haskell/wxdirect/files/wxdirect-0.90.1.1-ghc-7.5.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- 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.90.1.1.ebuild b/dev-haskell/wxdirect/wxdirect-0.90.1.1.ebuild deleted file mode 100644 index 76c6fd4073bb..000000000000 --- a/dev-haskell/wxdirect/wxdirect-0.90.1.1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -# ebuild generated by hackport 0.3.6.9999 - -WX_GTK_VER="2.9" - -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-lang/ghc-7.4.1:= -" -DEPEND="${RDEPEND} - >=dev-haskell/cabal-1.2 -" - -PATCHES=("${FILESDIR}/${PN}-0.90.1.1-ghc-7.5.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}" - cabal_chdeps \ - 'process >= 1.1 && < 1.2' 'process >= 1.1' \ - 'time >= 1.0 && < 1.5' 'time >= 1.0' \ - 'filepath < 1.4' 'filepath' -} -- cgit v1.2.3