diff options
Diffstat (limited to 'dev-haskell')
9 files changed, 10 insertions, 268 deletions
diff --git a/dev-haskell/gtk2hs-buildtools/ChangeLog b/dev-haskell/gtk2hs-buildtools/ChangeLog index 55260b632c04..cbd70c90925a 100644 --- a/dev-haskell/gtk2hs-buildtools/ChangeLog +++ b/dev-haskell/gtk2hs-buildtools/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for dev-haskell/gtk2hs-buildtools # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs-buildtools/ChangeLog,v 1.31 2014/05/20 13:27:52 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs-buildtools/ChangeLog,v 1.32 2014/06/05 08:05:05 slyfox Exp $ + + 05 Jun 2014; Sergei Trofimovich <slyfox@gentoo.org> + -files/gtk2hs-buildtools-0.12.3-workaround-UName.patch, + -files/gtk2hs-buildtools-0.12.3.1-ghc-7.5.patch, -files/gtk2hs-buildtools-0.12 + .3.1-remove-conditional-compilation-as-it-is-ignored-ghc-7.6.patch, + -files/gtk2hs-buildtools-0.12.4-hashtables.patch, + -gtk2hs-buildtools-0.12.0.ebuild, -gtk2hs-buildtools-0.12.3-r3.ebuild, + -gtk2hs-buildtools-0.12.3.1.ebuild, -gtk2hs-buildtools-0.12.4-r2.ebuild: + Removed ebuild installing nonstandard binary names. *gtk2hs-buildtools-0.12.5.2-r1 (20 May 2014) diff --git a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3-workaround-UName.patch b/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3-workaround-UName.patch deleted file mode 100644 index cd8b66ac6d4f..000000000000 --- a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3-workaround-UName.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/c2hs/toplevel/Main.hs b/c2hs/toplevel/Main.hs -index 47ddd0a..f921c8d 100644 ---- a/c2hs/toplevel/Main.hs -+++ b/c2hs/toplevel/Main.hs -@@ -363,9 +363,11 @@ execute opts args | Help `elem` opts = help - - preCompFile <- getSwitch preCompSB - -- unless (preCompFile==Nothing) $ -- preCompileHeader headerFile (fromJust preCompFile) -- `fatalsHandledBy` ioErrorHandler -+ -- broken when .chs contains C preproc code: -+ -- http://www.mail-archive.com/gtk2hs-devel@lists.sourceforge.net/msg01160.html -+ -- unless (preCompFile==Nothing) $ -+ -- preCompileHeader headerFile (fromJust preCompFile) -+ -- `fatalsHandledBy` ioErrorHandler - - let bndFileWithoutSuffix = stripSuffix bndFile - unless (null bndFile) $ do diff --git a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3.1-ghc-7.5.patch b/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3.1-ghc-7.5.patch deleted file mode 100644 index e9a2e0516a1f..000000000000 --- a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3.1-ghc-7.5.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- gtk2hs-buildtools-0.12.3.1-orig/c2hs/base/general/FileOps.hs 2012-05-28 08:17:27.000000000 +1000 -+++ gtk2hs-buildtools-0.12.3.1/c2hs/base/general/FileOps.hs 2012-07-14 14:17:58.121511985 +1000 -@@ -36,6 +36,7 @@ - import System.Directory (doesFileExist) - import System.IO (Handle, IOMode(..), openFile) - import Control.Monad (liftM) -+import qualified Control.Exception - import System.Random (newStdGen, randomRs) - - import FNameOps (dirname, stripDirname, addPath) -@@ -89,7 +90,9 @@ - in do - h <- openFile fname ReadWriteMode - return (h, fname) -- `catch` \_ -> createLoop (attempts - 1) rs' -+ `Control.Exception.catch` ((\_ -> createLoop (attempts - 1) rs') :: -+ Control.Exception.SomeException -> -+ IO (Handle, FilePath)) - -- - sixChars :: [Int] -> ([Int], String) - sixChars is = ---- gtk2hs-buildtools-0.12.3.1-orig/c2hs/base/state/StateTrans.hs 2012-05-28 08:17:27.000000000 +1000 -+++ gtk2hs-buildtools-0.12.3.1/c2hs/base/state/StateTrans.hs 2012-07-14 14:14:12.365626559 +1000 -@@ -80,6 +80,7 @@ - where - - import Control.Monad (liftM) -+import qualified Control.Exception - import System.IO (fixIO) - import Data.IORef (IORef, newIORef, readIORef, writeIORef) - -@@ -337,7 +338,7 @@ - ioError err - Right a -> return state - ) -- `catch` (\err -> let -+ `Control.Exception.catch` (\err -> let - STB handler' = handler err - in - handler' bs gs) ---- gtk2hs-buildtools-0.12.3.1-orig/c2hs/toplevel/C2HSConfig.hs 2012-05-28 08:17:27.000000000 +1000 -+++ gtk2hs-buildtools-0.12.3.1/c2hs/toplevel/C2HSConfig.hs 2012-07-14 14:12:10.172439583 +1000 -@@ -46,7 +46,7 @@ - - import Foreign (Ptr, FunPtr) - import Foreign (Storable(sizeOf, alignment), toBool) --import Foreign.C (CInt) -+import Foreign.C (CInt(..)) - import System.Info (os) - - -- program settings diff --git a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3.1-remove-conditional-compilation-as-it-is-ignored-ghc-7.6.patch b/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3.1-remove-conditional-compilation-as-it-is-ignored-ghc-7.6.patch deleted file mode 100644 index 8bbf892f431b..000000000000 --- a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3.1-remove-conditional-compilation-as-it-is-ignored-ghc-7.6.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- gtk2hs-buildtools-0.12.3.1-orig/hierarchyGen/Hierarchy.chs.template 2012-05-28 08:17:27.000000000 +1000 -+++ gtk2hs-buildtools-0.12.3.1/hierarchyGen/Hierarchy.chs.template 2012-10-11 12:28:58.851901084 +1100 -@@ -38,11 +38,7 @@ - ) where - - import Foreign.ForeignPtr (ForeignPtr, castForeignPtr, unsafeForeignPtrToPtr) --#if __GLASGOW_HASKELL__>=704 - import Foreign.C.Types (CULong(..), CUInt(..)) --#else --import Foreign.C.Types (CULong, CUInt) --#endif - import System.Glib.GType (GType, typeInstanceIsA) - @MODULE_IMPORTS@ - {# context lib="@CONTEXT_LIB@" prefix="@CONTEXT_PREFIX@" #} diff --git a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.4-hashtables.patch b/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.4-hashtables.patch deleted file mode 100644 index d95271f1c173..000000000000 --- a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.4-hashtables.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- gtk2hs-buildtools-0.12.4-orig/gtk2hs-buildtools.cabal 2012-11-12 10:26:45.000000000 +1100 -+++ gtk2hs-buildtools-0.12.4/gtk2hs-buildtools.cabal 2012-12-09 14:03:02.311776181 +1100 -@@ -55,6 +55,8 @@ - build-depends: base >= 4 && < 5, - process, directory, array, containers, pretty, - filepath, random -+ if (impl(ghc >= 7.6)) -+ build-depends: hashtables - build-tools: alex, happy - other-modules: BaseVersion - Config ---- gtk2hs-buildtools-0.12.4-orig/c2hs/base/general/Binary.hs 2012-11-12 10:26:43.000000000 +1100 -+++ gtk2hs-buildtools-0.12.4/c2hs/base/general/Binary.hs 2012-12-09 13:43:37.136585903 +1100 -@@ -61,8 +61,14 @@ - import Map (Map) - import qualified Map as Map - # if __GLASGOW_HASKELL__>=602 -+# if __GLASGOW_HASKELL__>=706 -+import Data.HashTable.IO as HashTable hiding (mapM_) -+import Prelude -+import Data.List (foldl') -+#else - import Data.HashTable as HashTable - # endif -+# endif - import Data.Array.IO - import Data.Array - import Data.Bits -@@ -94,6 +100,10 @@ - - type BinArray = IOUArray Int Word8 - -+# if __GLASGOW_HASKELL__>=706 -+type HashTable k v = HashTable.BasicHashTable k v -+#endif -+ - --------------------------------------------------------------- - -- BinHandle - --------------------------------------------------------------- -@@ -714,7 +724,11 @@ - newWriteState = do - j_r <- newIORef 0 - #if __GLASGOW_HASKELL__>=602 -+# if __GLASGOW_HASKELL__>=706 -+ out_r <- HashTable.new -+#else - out_r <- HashTable.new (==) HashTable.hashString -+#endif - #else - out_r <- newIORef Map.empty - #endif diff --git a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.0.ebuild b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.0.ebuild deleted file mode 100644 index 21817dd835a5..000000000000 --- a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.0.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.0.ebuild,v 1.6 2013/12/12 06:05:04 gienah Exp $ - -# ebuild generated by hackport 0.2.13 - -EAPI="3" - -CABAL_FEATURES="bin" -inherit haskell-cabal - -DESCRIPTION="Tools to build the Gtk2Hs suite of User Interface libraries." -HOMEPAGE="http://www.haskell.org/gtk2hs/" -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/alex - >=dev-haskell/cabal-1.6.0 - dev-haskell/happy - >=dev-lang/ghc-6.10.1" diff --git a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3-r3.ebuild b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3-r3.ebuild deleted file mode 100644 index cc7e78b71e83..000000000000 --- a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3-r3.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3-r3.ebuild,v 1.6 2013/12/12 06:05:04 gienah Exp $ - -# ebuild generated by hackport 0.2.13 - -EAPI="3" - -CABAL_FEATURES="bin" -inherit base haskell-cabal - -DESCRIPTION="Tools to build the Gtk2Hs suite of User Interface libraries." -HOMEPAGE="http://projects.haskell.org/gtk2hs/" -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/alex - >=dev-haskell/cabal-1.8 - dev-haskell/happy - >=dev-lang/ghc-6.10.1" - -PATCHES=("${FILESDIR}"/${P}-workaround-UName.patch) diff --git a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3.1.ebuild b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3.1.ebuild deleted file mode 100644 index e8d68c07bb0f..000000000000 --- a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3.1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3.1.ebuild,v 1.7 2013/12/12 06:05:04 gienah Exp $ - -EAPI=4 - -CABAL_FEATURES="bin" -inherit base haskell-cabal - -DESCRIPTION="Tools to build the Gtk2Hs suite of User Interface libraries." -HOMEPAGE="http://projects.haskell.org/gtk2hs/" -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/alex - >=dev-haskell/cabal-1.8 - dev-haskell/happy - dev-haskell/random - >=dev-lang/ghc-6.10.1" - -PATCHES=("${FILESDIR}"/${PN}-0.12.3-workaround-UName.patch - "${FILESDIR}"/${PN}-0.12.3.1-ghc-7.5.patch -) - -src_prepare() { - base_src_prepare - # c2hs ignores #if __GLASGOW_HASKELL__ >= 704 - if has_version ">=dev-lang/ghc-7.6.1"; then - epatch "${FILESDIR}"/${PN}-0.12.3.1-remove-conditional-compilation-as-it-is-ignored-ghc-7.6.patch - fi -} diff --git a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.4-r2.ebuild b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.4-r2.ebuild deleted file mode 100644 index e281852007ac..000000000000 --- a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.4-r2.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.4-r2.ebuild,v 1.7 2014/02/02 11:13:33 ago Exp $ - -EAPI=5 - -# ebuild generated by hackport 0.3.9999 - -GTK_MAJ_VER="2" - -CABAL_FEATURES="bin" -inherit base haskell-cabal - -DESCRIPTION="Tools to build the Gtk2Hs suite of User Interface libraries." -HOMEPAGE="http://projects.haskell.org/gtk2hs/" -SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86" -IUSE="" - -RDEPEND="" -DEPEND="${RDEPEND} - dev-haskell/alex - >=dev-haskell/cabal-1.8 - dev-haskell/happy - dev-haskell/hashtables - dev-haskell/random - >=dev-lang/ghc-6.10.4" - -PATCHES=("${FILESDIR}/${PN}-0.12.4-hashtables.patch") - -src_prepare() { - base_src_prepare - sed -e "s@Executable gtk2hsTypeGen@Executable gtk2hsTypeGen${GTK_MAJ_VER}@" \ - -e "s@Executable gtk2hsHookGenerator@Executable gtk2hsHookGenerator${GTK_MAJ_VER}@" \ - -e "s@Executable gtk2hsC2hs@Executable gtk2hsC2hs${GTK_MAJ_VER}@" \ - -i "${S}/${PN}.cabal" \ - || die "Could not change ${PN}.cabal for GTK+ slot 0" -} |