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/gtk3/files/, dev-haskell/gtk3/
Date: Sat, 12 Sep 2020 20:23:28
Message-Id: 1599942193.b0da609e8d3bdc5628997855009e28a7ff18481c.slyfox@gentoo
1 commit: b0da609e8d3bdc5628997855009e28a7ff18481c
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 12 20:22:54 2020 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 12 20:23:13 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0da609e
7
8 dev-haskell/gtk3: drop old
9
10 Package-Manager: Portage-3.0.6, Repoman-3.0.1
11 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
12
13 dev-haskell/gtk3/Manifest | 1 -
14 dev-haskell/gtk3/files/gtk3-0.14.9-glib-2.62.patch | 11 -----
15 dev-haskell/gtk3/gtk3-0.14.9-r3.ebuild | 50 ----------------------
16 3 files changed, 62 deletions(-)
17
18 diff --git a/dev-haskell/gtk3/Manifest b/dev-haskell/gtk3/Manifest
19 index 82f096dd588..9be0518f773 100644
20 --- a/dev-haskell/gtk3/Manifest
21 +++ b/dev-haskell/gtk3/Manifest
22 @@ -1,2 +1 @@
23 -DIST gtk3-0.14.9.tar.gz 676542 BLAKE2B d2aeec5fd59dfe71e6c62e6abf60370f12ca8d7a3d3716593151a2f7697e8b53bbf4e8c094df1a2162703422cfb390407c8a83b564fed78c16f94d3d07036122 SHA512 aaf2a257c74f5b0a569d0e61aef535e2f0c8158feb34bed523c7aff31cf155098f93d3a88ba49bea906ae669bf63fb0486f4c747a620c2199c2e7859486e7270
24 DIST gtk3-0.15.5.tar.gz 677124 BLAKE2B a6a21411fb0af55dd718b2b3b63e303d05c8636ad19ed82935ce9263f29b05f85775ee0b7123ba9b6671dcf798fbdabbdbb9831e0b1e48a2663a8c2bbfd5d5e9 SHA512 937b250f04e797b821d560a768f9eaee448f2d2d98571b6ef401de44177f50861f557e653afc7f055dfa2e15180dca9d82e36469f0fb97dff5a170ebc6c62519
25
26 diff --git a/dev-haskell/gtk3/files/gtk3-0.14.9-glib-2.62.patch b/dev-haskell/gtk3/files/gtk3-0.14.9-glib-2.62.patch
27 deleted file mode 100644
28 index da921a2cf41..00000000000
29 --- a/dev-haskell/gtk3/files/gtk3-0.14.9-glib-2.62.patch
30 +++ /dev/null
31 @@ -1,11 +0,0 @@
32 ---- a/gtk3.cabal
33 -+++ b/gtk3.cabal
34 -@@ -372,7 +372,7 @@ Library
35 - -- needs to be imported from this module:
36 - x-Signals-Import: Graphics.UI.Gtk.General.Threading
37 - include-dirs: .
38 -- cpp-options: -DDISABLE_DEPRECATED -U__BLOCKS__
39 -+ cpp-options: -DDISABLE_DEPRECATED -U__BLOCKS__ -D__attribute__(A)=
40 - if os(darwin) || os(freebsd)
41 - cpp-options: -D__attribute__(A)= -D_Nullable= -D_Nonnull=
42 - if os(windows)
43
44 diff --git a/dev-haskell/gtk3/gtk3-0.14.9-r3.ebuild b/dev-haskell/gtk3/gtk3-0.14.9-r3.ebuild
45 deleted file mode 100644
46 index f3975676440..00000000000
47 --- a/dev-haskell/gtk3/gtk3-0.14.9-r3.ebuild
48 +++ /dev/null
49 @@ -1,50 +0,0 @@
50 -# Copyright 1999-2020 Gentoo Authors
51 -# Distributed under the terms of the GNU General Public License v2
52 -
53 -EAPI=7
54 -
55 -# ebuild generated by hackport 0.5.5.9999
56 -#hackport: flags: have-gio:gio,build-demos:examples
57 -
58 -CABAL_FEATURES="lib profile haddock hoogle hscolour"
59 -inherit haskell-cabal
60 -
61 -DESCRIPTION="Binding to the Gtk+ 3 graphical user interface library"
62 -HOMEPAGE="http://projects.haskell.org/gtk2hs/"
63 -SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
64 -
65 -LICENSE="LGPL-2.1"
66 -SLOT="0/${PV}"
67 -KEYWORDS="~amd64 ~x86"
68 -IUSE="+fmode-binary +gio"
69 -
70 -RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
71 - >=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
72 - dev-haskell/mtl:=[profile?]
73 - >=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?]
74 - >=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?]
75 - >=dev-lang/ghc-7.4.1:=
76 - dev-libs/glib:2
77 - x11-libs/gtk+:3
78 - gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] )
79 -"
80 -DEPEND="${RDEPEND}
81 - >=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.3
82 - >=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
83 - virtual/pkgconfig
84 -"
85 -
86 -PATCHES=("${FILESDIR}"/${PN}-0.14.9-glib-2.62.patch)
87 -
88 -src_prepare() {
89 - default
90 -
91 - cabal_chdeps \
92 - 'Cabal >= 1.24 && < 2.3' 'Cabal >= 1.24 && < 3.3'
93 -}
94 -
95 -src_configure() {
96 - haskell-cabal_src_configure \
97 - $(cabal_flag fmode-binary fmode-binary) \
98 - $(cabal_flag gio have-gio)
99 -}