gentoo resync : 13.06.2020

5 files changed, 18 insertions, 100 deletions

diff --git a/dev-haskell/gtk3/Manifest b/dev-haskell/gtk3/Manifest
index 1dffffbd3aec..d3c6a2a0029e 100644
--- a/dev-haskell/gtk3/Manifest
+++ b/dev-haskell/gtk3/Manifest
@@ -1,7 +1,4 @@
-DIST gtk3-0.13.7.tar.gz 673031 BLAKE2B 4a99b1c430cad1d940b9c30cbf4ab2bcddf64d2bdcc645b2ad37c86069a4817c677ccc3552007c9aeb41755125650cea19c70786dd4a64d348bf483bd08a3073 SHA512 c350ae55a7044684e6f2d94592decfcd01d3e96900a468cd417bad52713502c89c328f96cd4ff29647169a76287b8dada9654d46c4dc884c0dab0590ad57762e
-DIST gtk3-0.14.6.tar.gz 675439 BLAKE2B 7b5699db78f68e763ba972c2a82aa4044d2b97e60137443732b199afb2b611758130b9dcc8240da7492d0853c8bbdc88aa9e18884798eb1c33d7f6af7fbd9409 SHA512 d03930164fa117ebd6bcc79b79a9cfc0449c5ed0b3de6999f26ad63673a67a146f989245efa68b4e1484091689b350a5df95ed49bbbe9d4a30fbe418cbb37209
+AUX gtk3-0.14.9-glib-2.62.patch 464 BLAKE2B f82264689e67d179c29963d9c97d907d4be01cf8f372a3f7b2422def12b7425ac8ecadefa0f222430e15460b075ab27711504aa52fb9d1ea8972ac43eaa1d247 SHA512 96632d773afa9696f6942d09739d7964977ecf64624cddf901ae5d7d6d56682c74e246111546d477472cdce2ce0259222840b02249e020a5cdb111170a2b6eec
 DIST gtk3-0.14.9.tar.gz 676542 BLAKE2B d2aeec5fd59dfe71e6c62e6abf60370f12ca8d7a3d3716593151a2f7697e8b53bbf4e8c094df1a2162703422cfb390407c8a83b564fed78c16f94d3d07036122 SHA512 aaf2a257c74f5b0a569d0e61aef535e2f0c8158feb34bed523c7aff31cf155098f93d3a88ba49bea906ae669bf63fb0486f4c747a620c2199c2e7859486e7270
-EBUILD gtk3-0.13.7.ebuild 1682 BLAKE2B 6f1b8efc247d07b8d25548ff49a210fdad8b78b474c85392de9f7d8013855bdf8975377189104a0034c93b0960c19f4ddcd9158e35a0e7d1f16868103a02ebf2 SHA512 20b098345e51cbadf389ce951297bd8f1f12d1ebe18075fa05c97d0a719d70b5b7293cf3cc0120927673e2f80ec7ff50e830282b0b5e16680ae3ddb44b7db40b
-EBUILD gtk3-0.14.6.ebuild 1234 BLAKE2B d53412d150a734fd275199ecbc469f7901470524da101025ad9ab0a373a0fbe70cbc341b494da67ff42e7b94db25b45c445360b0a6218a2643714346bfc1fae1 SHA512 81edc5dcfa9149b84cbb3303c10ec7c220856c1d97a32b8b45838430c0524710aa5ccd82e8e841606888de5c87fa24ee92d4fed6fbf928b35f5288d8836fae95
-EBUILD gtk3-0.14.9-r2.ebuild 1434 BLAKE2B 53786f9b64e26917c61fee4485f454f4714d7dea1ce66c9f5f6ed12ed25c7b2c31aa0a826a1a72374d6de6e9a2d5775e58c88ca35e06db2e233c98d9dd67e47f SHA512 a81a1e03beba2f6baa6f511c6107a86ebe402759cccad2db045544cefcf4d27622848c217d258af99aec0c6cc19b6335ea4d9c9e824af72845513dd1fa2ef156
+EBUILD gtk3-0.14.9-r3.ebuild 1488 BLAKE2B 82967e7f8dedcf83ee883957b9c4c9dded87464257492c29f9b769274770cff67ee36bbde28bc7efeead5bb82e72034a14f548a0badf12775d393773a2583843 SHA512 1fe25ae48f096095aa5615cadf2e9b42a2430d95779911b10a9206f3e204bc2fff69de25520eedc03ced2ad07e7eee3c47244118817d6818ce5750d2917e2951
 MISC metadata.xml 684 BLAKE2B 73d54f823aeec358194a2890de13039ae184f4eb480ffa2b2c48891348b293330cad0e54bdc2ae4f1631017e5cddb4e7cce200c5835938b8cfaeb6aaf05891d6 SHA512 ea4adf337f95bf29283b9bf86c871e34f48e955fab90cafef7a8fa0804e4cdead514b54a7f3f0f6d8c10384d30285309545962fc059d78b36b357a985105c0fa
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
new file mode 100644
index 000000000000..da921a2cf415
--- /dev/null
+++ b/dev-haskell/gtk3/files/gtk3-0.14.9-glib-2.62.patch
@@ -0,0 +1,11 @@
+--- a/gtk3.cabal
++++ b/gtk3.cabal
+@@ -372,7 +372,7 @@ Library
+         -- needs to be imported from this module:
+         x-Signals-Import: Graphics.UI.Gtk.General.Threading
+         include-dirs:   .
+-        cpp-options: -DDISABLE_DEPRECATED -U__BLOCKS__
++        cpp-options: -DDISABLE_DEPRECATED -U__BLOCKS__ -D__attribute__(A)=
+         if os(darwin) || os(freebsd)
+           cpp-options: -D__attribute__(A)= -D_Nullable= -D_Nonnull=
+         if os(windows)
diff --git a/dev-haskell/gtk3/gtk3-0.13.7.ebuild b/dev-haskell/gtk3/gtk3-0.13.7.ebuild
deleted file mode 100644
index f515449a1c5f..000000000000
--- a/dev-haskell/gtk3/gtk3-0.13.7.ebuild
+++ /dev/null
@@ -1,52 +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.4.9999
-
-#nocabaldep is for the fancy cabal-detection feature at build-time
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Gtk+ graphical user interface library"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="examples +fmode-binary +gio"
-
-RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
-	>=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?]
-	>=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	dev-haskell/transformers:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	dev-libs/glib:2
-	x11-libs/gtk+:3
-	gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/gtk2hs-buildtools-0.13.0.3:0=
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# workaround for module order
-	cabal_chdeps \
-		'other-modules:' 'exposed-modules:'
-	# fix build with gcc 5.1.0 and later https://github.com/gtk2hs/gtk2hs/issues/104
-	sed -e 's@gccProg, "--cppopts=-E"@gccProg, "--cppopts=-E", "--cppopts=-P"@' \
-		-i Gtk2HsSetup.hs || die
-}
-
-src_configure() {
-	cabal_src_configure \
-		$(cabal_flag examples build-demos) \
-		$(cabal_flag fmode-binary fmode-binary) \
-		$(cabal_flag gio have-gio) \
-		--flags=-have-quartz-gtk
-}
diff --git a/dev-haskell/gtk3/gtk3-0.14.6.ebuild b/dev-haskell/gtk3/gtk3-0.14.6.ebuild
deleted file mode 100644
index 4a1e749390e9..000000000000
--- a/dev-haskell/gtk3/gtk3-0.14.6.ebuild
+++ /dev/null
@@ -1,40 +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
-#hackport: flags: have-gio:gio,build-demos:examples
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Gtk+ 3 graphical user interface library"
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE="+fmode-binary +gio"
-
-RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[profile?]
-	>=dev-haskell/glib-0.13.0.0:=[profile?] <dev-haskell/glib-0.14:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/pango-0.13.0.0:=[profile?] <dev-haskell/pango-0.14:=[profile?]
-	>=dev-haskell/text-0.11.0.6:=[profile?] <dev-haskell/text-1.3:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	dev-libs/glib:2
-	x11-libs/gtk+:3
-	gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24
-	virtual/pkgconfig
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag fmode-binary fmode-binary) \
-		$(cabal_flag gio have-gio)
-}
diff --git a/dev-haskell/gtk3/gtk3-0.14.9-r2.ebuild b/dev-haskell/gtk3/gtk3-0.14.9-r3.ebuild
index 700014ceb8be..c42fc3fe4dc0 100644
--- a/dev-haskell/gtk3/gtk3-0.14.9-r2.ebuild
+++ b/dev-haskell/gtk3/gtk3-0.14.9-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,16 +29,18 @@ RDEPEND=">=dev-haskell/cairo-0.13.0.0:=[profile?] <dev-haskell/cairo-0.14:=[prof
 	gio? ( >=dev-haskell/gio-0.13.0:=[profile?] <dev-haskell/gio-0.14:=[profile?] )
 "
 DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.1
+	>=dev-haskell/cabal-1.24 <dev-haskell/cabal-3.3
 	>=dev-haskell/gtk2hs-buildtools-0.13.2.0 <dev-haskell/gtk2hs-buildtools-0.14
 	virtual/pkgconfig
 "
 
+PATCHES=("${FILESDIR}"/${PN}-0.14.9-glib-2.62.patch)
+
 src_prepare() {
 	default
 
 	cabal_chdeps \
-		'Cabal >= 1.24 && < 2.3' 'Cabal >= 1.24 && < 3.1'
+		'Cabal >= 1.24 && < 2.3' 'Cabal >= 1.24 && < 3.3'
 }
 
 src_configure() {