commit: 0ae15cbc7c82d77d452d9e2a525691195ff205ac Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Sat Sep 12 20:22:09 2020 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Sat Sep 12 20:23:13 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ae15cbc
dev-haskell/gtk2hs-buildtools: drop old Package-Manager: Portage-3.0.6, Repoman-3.0.1 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> dev-haskell/gtk2hs-buildtools/Manifest | 4 -- .../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 ----------------- .../gtk2hs-buildtools-0.13.5.1.ebuild | 47 ---------------------- 8 files changed, 261 deletions(-) diff --git a/dev-haskell/gtk2hs-buildtools/Manifest b/dev-haskell/gtk2hs-buildtools/Manifest index 1fb8abf8176..180fe94efb0 100644 --- a/dev-haskell/gtk2hs-buildtools/Manifest +++ b/dev-haskell/gtk2hs-buildtools/Manifest @@ -1,5 +1 @@ -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 -DIST gtk2hs-buildtools-0.13.5.1.tar.gz 178132 BLAKE2B b89696a0a0b1fc3f43413e78993133250f1a5850ee14cf4a8f10adc85135d3822ace8f3eaa8a9d2a9ff7276c202991d72c2ef866fe4b9032fcc45b2d4c5e4b0e SHA512 ddce2ae75756086b89032e3e15654e235432fdf843ef14c0833d371b3912d9489727a711cd92afc9ba96abc543c102a428b78db39cb56a35d81be6f54398b68f DIST gtk2hs-buildtools-0.13.8.0.tar.gz 178465 BLAKE2B 73a3bea8e002ba641f08f3104b7c8759dba2649e8b050ac769470c7d67441e86365c4687f2645fed62cb79cbe38947c02c2622224e4568440a8d2745a045b333 SHA512 fa427979f20f10ca8baf38c80c28a5190d18b767046de347950ea799660e1d54939d668c01c469da36d2df6c347f7ba67e2e85f3a7000021f8d37852093e03fd 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 a772e67c687..00000000000 --- 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 3caf5f769ca..00000000000 --- 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 ae5edd1a471..00000000000 --- 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 4cc3c6b146b..00000000000 --- a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.5.1-r1.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# 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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~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 38fd7f4ec89..00000000000 --- a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.0.4-r3.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# 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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~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 a6162d03911..00000000000 --- a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.2.2.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# 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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="+closuresignals" - -RDEPEND=">=dev-haskell/cabal-1.24.0.0:=[profile?] <dev-haskell/cabal-1.25:=[profile?] - dev-haskell/hashtables:=[profile?] - dev-haskell/random:=[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/gtk2hs-buildtools-0.13.5.1.ebuild b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.5.1.ebuild deleted file mode 100644 index 4a86905df25..00000000000 --- a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.13.5.1.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# ebuild generated by hackport 0.6.1.9999 - -CABAL_FEATURES="lib profile 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="https://hackage.haskell.org/package/${P}/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" -IUSE="+closuresignals" - -RDEPEND=">=dev-haskell/cabal-1.24.0.0:=[profile?] - dev-haskell/fail:=[profile?] - dev-haskell/hashtables:=[profile?] - dev-haskell/random:=[profile?] - >=dev-lang/ghc-7.8.2:= -" -DEPEND="${RDEPEND} - dev-haskell/alex - >=dev-haskell/cabal-1.18.1.3 - dev-haskell/happy -" -# These patches are available in -r1. Disabled here -# due to incompatibility with <dev-haskell/cabal-3 -# PATCHES=("${FILESDIR}"/${PN}-0.13.1.0-ia64.patch -# "${FILESDIR}"/${PN}-0.13.5.1-p1-cabal-3.patch -# "${FILESDIR}"/${PN}-0.13.5.1-p2-cabal-3.patch -# "${FILESDIR}"/${PN}-0.13.5.1-p3-cabal-3.patch -# "${FILESDIR}"/${PN}-0.13.5.1-p4-cabal-3.patch -# "${FILESDIR}"/${PN}-0.13.5.1-p5-cabal-3.patch -# "${FILESDIR}"/${PN}-0.13.5.1-p6-cabal-3.patch -# "${FILESDIR}"/${PN}-0.13.5.1-p7-cabal-3.patch -# "${FILESDIR}"/${PN}-0.13.5.1-p8-cabal-3.patch -# "${FILESDIR}"/${PN}-0.13.5.1-p9-cabal-3.patch) - -src_configure() { - haskell-cabal_src_configure \ - $(cabal_flag closuresignals closuresignals) -}
