From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:57:42 +0100 Subject: gentoo resync : 14.07.2018 --- dev-haskell/gtk2hs-buildtools/Manifest | 10 ----- .../gtk2hs-buildtools-0.13.0.4-alex-3.1.6.patch | 9 ----- .../files/gtk2hs-buildtools-0.13.0.4-ia64.patch | 47 ---------------------- .../files/gtk2hs-buildtools-0.13.1.0-ia64.patch | 47 ---------------------- .../gtk2hs-buildtools-0.12.5.1-r1.ebuild | 33 --------------- .../gtk2hs-buildtools-0.13.0.4-r3.ebuild | 38 ----------------- .../gtk2hs-buildtools-0.13.2.2.ebuild | 36 ----------------- dev-haskell/gtk2hs-buildtools/metadata.xml | 22 ---------- 8 files changed, 242 deletions(-) delete mode 100644 dev-haskell/gtk2hs-buildtools/Manifest delete mode 100644 dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.0.4-alex-3.1.6.patch delete mode 100644 dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.0.4-ia64.patch delete mode 100644 dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.1.0-ia64.patch delete mode 100644 dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.5.1-r1.ebuild delete mode 100644 dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.0.4-r3.ebuild delete mode 100644 dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.2.2.ebuild delete mode 100644 dev-haskell/gtk2hs-buildtools/metadata.xml (limited to 'dev-haskell/gtk2hs-buildtools') diff --git a/dev-haskell/gtk2hs-buildtools/Manifest b/dev-haskell/gtk2hs-buildtools/Manifest deleted file mode 100644 index acca7f96aa98..000000000000 --- a/dev-haskell/gtk2hs-buildtools/Manifest +++ /dev/null @@ -1,10 +0,0 @@ -AUX gtk2hs-buildtools-0.13.0.4-alex-3.1.6.patch 282 BLAKE2B a7e9f917a5a3420f99c36fede670d1c620f798d8f490be697c0ed2e76973766d8fc09236b24250b7fe6ca725b90cc22a05d8711a16161ff0def2fb87f5ffbf0a SHA512 7f151b2c3f765f4362485b476c79660ffac51c06a0ef97c1afe37270fde6e665d8a7d57808ade533279a51c4e8730c1f8b1311a7f124c03a282cebb4d49770c9 -AUX gtk2hs-buildtools-0.13.0.4-ia64.patch 1689 BLAKE2B 5c935b8c635502dc751fdb92790afe6129bbb1a70985d5a97873f53f8347006f9135a3f8018b6127d83a5e9722d8d117e8b37b805c54821ce1d4667217110c61 SHA512 9d42873e69369af9a8dd5ca517ad967e3b1e6df2b529c24054d6ab9c379f7fcf88bd1f8da432e9a93e9eae0c5c59288ec0cc36283f743b41dd90a05d7a48578d -AUX gtk2hs-buildtools-0.13.1.0-ia64.patch 1864 BLAKE2B 3c0ba7b61e0294d4922ccd6768592fb754dfaca384d6acb642f1c27f7055239dcc5ab3c0327a8f774ecd0cb3da26c3c3d95ac8b6e640641ff94625671705a5a4 SHA512 75b4db420e37838c31db7dcaf9ba6c6ad48fe47407822d7bdc975a3e03dad8f1f7ab3a3f425c1665c8434c8137dfb86f2414a036d455379448fa4251cec8d402 -DIST gtk2hs-buildtools-0.12.5.1.tar.gz 169038 BLAKE2B 5cfb74ddafa9137a5893edab4273ce446d1905ac96524320941bc4ae2addc1e7e225caff38634760ca17052d3b6f4bafee0933ee4ccaf73eab0e837903e3c419 SHA512 ec25d74209c79414b66cf15e7b041be39f2179d37a4ecc5a2859022db2245ebf7258d13e130d9b8eae53a35575fc200c7ab0bbc4e99571bc2e7b410a9d268c56 -DIST gtk2hs-buildtools-0.13.0.4.tar.gz 169272 BLAKE2B 25d32aae481560dfd74b7484e2533a88fef84c7c12aae0154f9e3eb80b8efbc872b35290f852c440f17a6c104fc0e50e27698bbab9c3247255ea0185e741bfe8 SHA512 ac5eba81fbeb0387a6294868259e2122b1b90aa76d5c7c9062df6796ec697cca87b73789275deaa1374fa34985b67e5b342b4cd3284393fa17f7c13543657299 -DIST gtk2hs-buildtools-0.13.2.2.tar.gz 178124 BLAKE2B b1fdaecc2260f53407a9d7bf6d5307db06a02cc0ebb0aeceafd30ba88cde60c7aeb7f169c653c7dbc191c46cb0369f8746d09a88824389003dcc51bc3ce4acad SHA512 4d5dac91529fa8856f1e3369ed97d688e7423767a2db5387f092ebc65f624d4689ead154a7036177a1de8978726901196b8161c846f5afd134ffda1e29517b06 -EBUILD gtk2hs-buildtools-0.12.5.1-r1.ebuild 757 BLAKE2B ed65b947c6c73856b980f695ec727ec64e67fe2cb38d381753858ef51a2ebf3e86214e596aa470a8b1bfa9fcb270b094b0febc4d04c60699944ef4c24c349d46 SHA512 0cbaafa9aa9e292559aa5099cfaa427c33d96ac8e824e6064a24c681550ea72e4bff23464049298dd98159212eee7ab0a87670998a20688e9c47500b70c8d300 -EBUILD gtk2hs-buildtools-0.13.0.4-r3.ebuild 859 BLAKE2B 0e2be10327e6637f5a188e3be1f1d8a35b7de1a9e327cd894d40a0c3b44f7f81a606b0122add6a0d9b7ee0009a8f5015a221ff933a20d48f5693ada9315449aa SHA512 6df76d9d797d45f76c88d4ab8c02da77dc8569e240bbee529d8602409d9bfe835310f06a8a28e212b42b8be3a787e5980a0bbe1333c577d38260f238936c5c4b -EBUILD gtk2hs-buildtools-0.13.2.2.ebuild 974 BLAKE2B 92680fa2db97a011fbf378bb8dcc35a7321199855765731358e2cf2633b1eb56ce29ca5f254e6f64f00cfd81044c480e9ff9087aa4be382267a0cb9a015216db SHA512 49a9928b52c3b0d6e9c6f6755e77eb3376ee7905d5b8b04eec2cc0c6933cf2c8b351a86be2fb1947b2f192ad6cd66edfb2af5e995a5b7960ee2ce72202c660df -MISC metadata.xml 838 BLAKE2B d807057f72ce471a31e5eda4e4c26d8c2e7a6e5c6a932dc577c293d5f52704ce64b055a2dc194fbce71d8028ee7d5dca05f863fa2519fc841f585400d05849de SHA512 81b67b9c4d461b291561a2ee3873c80c257fc0e3e8641724381567d378aafae21f8056b60b00d432a0db60f5795d6b7a78a74cce9e10722b809f46c6701e7feb diff --git a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.0.4-alex-3.1.6.patch b/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.0.4-alex-3.1.6.patch deleted file mode 100644 index a772e67c687e..000000000000 --- a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.0.4-alex-3.1.6.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/c2hs/c/CLexer.x b/c2hs/c/CLexer.x -index 77702ed..1cd2483 100644 ---- a/c2hs/c/CLexer.x -+++ b/c2hs/c/CLexer.x -@@ -68,3 +68,3 @@ module CLexer (lexC, parseError) where - --import Data.Char (isDigit) -+import Data.Char (ord, isDigit) - import Data.Word (Word8) diff --git a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.0.4-ia64.patch b/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.0.4-ia64.patch deleted file mode 100644 index 3caf5f769cab..000000000000 --- a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.0.4-ia64.patch +++ /dev/null @@ -1,47 +0,0 @@ -ia64 is is a special showflake. - -Technically does nothing bad, -but it alone uses '__builtin_offsetof (struct sigcontext' -in system headers. c2hs does not handle that. - -https://bugs.gentoo.org/498638 -diff --git a/c2hs/c/C.hs b/c2hs/c/C.hs -index f79b6d9..aa1b5e4 100644 ---- a/c2hs/c/C.hs -+++ b/c2hs/c/C.hs -@@ -1 +1,2 @@ -+{-# LANGUAGE CPP, PatternGuards #-} - -- C->Haskell Compiler: interface to C processing routines -@@ -94,2 +95,20 @@ isuffix = ".i" - -+-- This stanza workarounds very specific limitation -+-- of c2hs of not being able to expang __builtin_offsetof -+-- used by all glib/gtk headers at least on ia64. -+raw_mangle :: String -> String -+raw_mangle s = case s of -+ [] -> [] -+#ifdef ia64_HOST_ARCH -+ _ | Just (h, rest) <- chop_head "__builtin_offsetof (struct sigcontext, sc_gr[0])" -+ "200" -- ia64/linux/glibc, sigh -+ -> h ++ raw_mangle rest -+#endif /* ia64_HOST_ARCH */ -+ (h:t) -> h : raw_mangle t -+ where chop_head prefix new_prefix = -+ case splitAt p_len s of -+ (h, t) | h == prefix -> Just (new_prefix, t) -+ _ -> Nothing -+ where p_len = length prefix -+ - -- given a file name (with suffix), parse that file as a C header and do the -@@ -106,3 +124,3 @@ loadAttrC fname = do - traceInfoRead fname -- contents <- readFileCIO fname -+ contents <- raw_mangle `fmap` readFileCIO fname - -@@ -126,4 +144,4 @@ loadAttrC fname = do - errmsgs <- showErrors -- fatal ("C header contains \ -- \errors:\n\n" ++ errmsgs) -- fatal error -+ fatal ("C header contains " ++ -+ "errors:\n\n" ++ errmsgs) -- fatal error - else do diff --git a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.1.0-ia64.patch b/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.1.0-ia64.patch deleted file mode 100644 index ae5edd1a471f..000000000000 --- a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.13.1.0-ia64.patch +++ /dev/null @@ -1,47 +0,0 @@ -ia64 is is a special showflake. - -Technically does nothing bad, -but it alone uses '__builtin_offsetof (struct sigcontext' -in system headers. c2hs does not handle that. - -https://bugs.gentoo.org/498638 -diff --git a/c2hs/c/C.hs b/c2hs/c/C.hs -index f79b6d9..aa1b5e4 100644 ---- a/c2hs/c/C.hs -+++ b/c2hs/c/C.hs -@@ -1 +1,2 @@ -+{-# LANGUAGE CPP, PatternGuards #-} - -- C->Haskell Compiler: interface to C processing routines -@@ -94,2 +95,20 @@ isuffix = ".i" - -+-- This stanza workarounds very specific limitation -+-- of c2hs of not being able to expang __builtin_offsetof -+-- used by all glib/gtk headers at least on ia64. -+raw_mangle :: String -> String -+raw_mangle s = case s of -+ [] -> [] -+#ifdef ia64_HOST_ARCH -+ _ | Just (h, rest) <- chop_head "__builtin_offsetof (struct sigcontext, sc_gr[0])" -+ "200" -- ia64/linux/glibc, sigh -+ -> h ++ raw_mangle rest -+#endif /* ia64_HOST_ARCH */ -+ (h:t) -> h : raw_mangle t -+ where chop_head prefix new_prefix = -+ case splitAt p_len s of -+ (h, t) | h == prefix -> Just (new_prefix, t) -+ _ -> Nothing -+ where p_len = length prefix -+ - -- given a file name (with suffix), parse that file as a C header and do the -@@ -106,3 +124,3 @@ loadAttrC fname = do - traceInfoRead fname -- contents <- readFileCIO fname -+ contents <- raw_mangle `fmap` readFileCIO fname - -@@ -126,4 +144,4 @@ loadAttrC fname = do - errmsgs <- showErrors -- fatal ("C header contains \ -- \errors:\n\n" ++ errmsgs) -- fatal error -+ fatal ("C header contains " ++ -+ "errors:\n\n" ++ errmsgs) -- fatal error - else do diff --git a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.5.1-r1.ebuild b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.5.1-r1.ebuild deleted file mode 100644 index f30199e6d8a5..000000000000 --- a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.5.1-r1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -# ebuild generated by hackport 0.3.5.9999 - -CABAL_FEATURES="bin" -inherit 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="+closuresignals" - -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 -" - -src_configure() { - haskell-cabal_src_configure \ - $(cabal_flag closuresignals closuresignals) -} diff --git a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.0.4-r3.ebuild b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.0.4-r3.ebuild deleted file mode 100644 index 2966829c08e9..000000000000 --- a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.0.4-r3.ebuild +++ /dev/null @@ -1,38 +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.4.5.9999 - -CABAL_FEATURES="bin" -inherit 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="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86" -IUSE="+closuresignals" - -RDEPEND="dev-haskell/random:= - dev-haskell/hashtables:= - >=dev-lang/ghc-7.4.1:= -" -DEPEND="${RDEPEND} - dev-haskell/alex - >=dev-haskell/cabal-1.8 - dev-haskell/happy -" - -src_prepare() { - epatch "${FILESDIR}"/${P}-ia64.patch - epatch "${FILESDIR}"/${P}-alex-3.1.6.patch -} - -src_configure() { - haskell-cabal_src_configure \ - $(cabal_flag closuresignals closuresignals) -} diff --git a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.2.2.ebuild b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.2.2.ebuild deleted file mode 100644 index f3ead4fd56ce..000000000000 --- a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.2.2.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# ebuild generated by hackport 0.5.9999 - -CABAL_FEATURES="bin lib profile" # duplicate symbols: haddock hoogle hscolour" -inherit 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="+closuresignals" - -RDEPEND=">=dev-haskell/cabal-1.24.0.0:=[profile?] =dev-lang/ghc-7.8.2:= -" -DEPEND="${RDEPEND} - dev-haskell/alex - >=dev-haskell/cabal-1.18.1.3 - dev-haskell/happy -" - -PATCHES=("${FILESDIR}"/${PN}-0.13.1.0-ia64.patch) - -src_configure() { - haskell-cabal_src_configure \ - $(cabal_flag closuresignals closuresignals) -} diff --git a/dev-haskell/gtk2hs-buildtools/metadata.xml b/dev-haskell/gtk2hs-buildtools/metadata.xml deleted file mode 100644 index af96940296fd..000000000000 --- a/dev-haskell/gtk2hs-buildtools/metadata.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - haskell@gentoo.org - Gentoo Haskell - - - This package provides a set of helper programs necessary to - build the Gtk2Hs suite of libraries. These tools include - a modified c2hs binding tool that is used to generate - FFI declarations, a tool to build a type hierarchy that - mirrors the C type hierarchy of GObjects found in glib, - and a generator for signal declarations that are used - to call back from C to Haskell. These tools are not needed - to actually run Gtk2Hs programs. - - - Use the the GClosure-based signals - implementation. - - -- cgit v1.2.3