Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-haskell/gtk/, dev-haskell/gtk/files/
Date: Sat, 15 May 2021 13:58:44
Message-Id: 1621087111.410a5215518824726cd2d4e1b93057baa3d673e2.slyfox@gentoo
1 commit: 410a5215518824726cd2d4e1b93057baa3d673e2
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 15 13:34:08 2021 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Sat May 15 13:58:31 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=410a5215
7
8 dev-haskell/gtk: drop old
9
10 Package-Manager: Portage-3.0.18, Repoman-3.0.3
11 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
12
13 dev-haskell/gtk/Manifest | 1 -
14 dev-haskell/gtk/files/gtk-0.14.10-glib-2.62.patch | 13 ------
15 dev-haskell/gtk/gtk-0.14.10-r3.ebuild | 52 -----------------------
16 3 files changed, 66 deletions(-)
17
18 diff --git a/dev-haskell/gtk/Manifest b/dev-haskell/gtk/Manifest
19 index bee63e7d513..7228fda1a1e 100644
20 --- a/dev-haskell/gtk/Manifest
21 +++ b/dev-haskell/gtk/Manifest
22 @@ -1,2 +1 @@
23 -DIST gtk-0.14.10.tar.gz 677787 BLAKE2B 536b4ce1bdbb17c662342bd8cb8086354a31842e1fc39e4bb2e4c2e505fb03f4e1ad0b689fb48dcf24d61c280cf659d8f30ac0fe77083e9887054cc8ed5feb75 SHA512 857fa71391e4bc8d884f5bb5e4f072ebd35b6bbcdc3901b6e28e03e79f4732d56430cf395aabc6007d3f7b1e991dcf0c6e21c9b84ccde96b1943d26ad37243eb
24 DIST gtk-0.15.5.tar.gz 678555 BLAKE2B 6110bd1a44d4b276deca20dd69580b8b0442ffca11f84b36fc19c068f4bcc1eb515cba63c98b55bd3bcd5310967d94e053b5466f25729ffb8116dc9e076c3b70 SHA512 3d0a75fd1eebcd0fa7c7bf5a0a2dfd622e28b3ab8f69e0f152e10dee9fb8e13b0f6ce7da3a9f304c3f2233cdf432a6d099afc89b47ce3fb4d1cb96c25d6da26b
25
26 diff --git a/dev-haskell/gtk/files/gtk-0.14.10-glib-2.62.patch b/dev-haskell/gtk/files/gtk-0.14.10-glib-2.62.patch
27 deleted file mode 100644
28 index 78e1dc146b4..00000000000
29 --- a/dev-haskell/gtk/files/gtk-0.14.10-glib-2.62.patch
30 +++ /dev/null
31 @@ -1,13 +0,0 @@
32 -https://github.com/gtk2hs/gtk2hs/issues/276
33 -https://bugs.gentoo.org/712988
34 ---- a/gtk.cabal
35 -+++ b/gtk.cabal
36 -@@ -381,7 +381,7 @@ Library
37 - -- needs to be imported from this module:
38 - x-Signals-Import: Graphics.UI.Gtk.General.Threading
39 - include-dirs: .
40 -- cpp-options: -U__BLOCKS__
41 -+ cpp-options: -U__BLOCKS__ -D__attribute__(A)=
42 - if os(darwin) || os(freebsd)
43 - cpp-options: -D__attribute__(A)= -D_Nullable= -D_Nonnull=
44 - if !flag(deprecated)
45
46 diff --git a/dev-haskell/gtk/gtk-0.14.10-r3.ebuild b/dev-haskell/gtk/gtk-0.14.10-r3.ebuild
47 deleted file mode 100644
48 index 885847eb5d6..00000000000
49 --- a/dev-haskell/gtk/gtk-0.14.10-r3.ebuild
50 +++ /dev/null
51 @@ -1,52 +0,0 @@
52 -# Copyright 1999-2020 Gentoo Authors
53 -# Distributed under the terms of the GNU General Public License v2
54 -
55 -EAPI=7
56 -
57 -# ebuild generated by hackport 0.5.5.9999
58 -#hackport: flags: have-gio:gio,-have-quartz-gtk
59 -
60 -CABAL_FEATURES="lib profile haddock hoogle hscolour"
61 -inherit haskell-cabal
62 -
63 -DESCRIPTION="Binding to the Gtk+ graphical user interface library"
64 -HOMEPAGE="http://projects.haskell.org/gtk2hs/"
65 -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
66 -
67 -LICENSE="LGPL-2.1"
68 -SLOT="2/${PV}"
69 -KEYWORDS="~amd64 ~x86"
70 -IUSE="+deprecated +fmode-binary +gio"
71 -
72 -RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
73 - >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
74 - dev-haskell/mtl:=[profile?]
75 - >=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?]
76 - >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?]
77 - >=dev-lang/ghc-7.4.1:=
78 - dev-libs/glib:2
79 - x11-libs/gtk+:2
80 - gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] )
81 -"
82 -DEPEND="${RDEPEND}
83 - >=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.3
84 - >=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
85 - virtual/pkgconfig
86 -"
87 -
88 -PATCHES=("${FILESDIR}"/${PN}-0.14.10-glib-2.62.patch)
89 -
90 -src_prepare() {
91 - default
92 -
93 - cabal_chdeps \
94 - 'Cabal >= 1.24 && < 2.3' 'Cabal >= 1.24 && < 3.3'
95 -}
96 -
97 -src_configure() {
98 - haskell-cabal_src_configure \
99 - $(cabal_flag deprecated deprecated) \
100 - $(cabal_flag fmode-binary fmode-binary) \
101 - $(cabal_flag gio have-gio) \
102 - --flag=-have-quartz-gtk
103 -}