Move gtk2hs to slot 2 fix bug 464260. Patch gtk-0.12.0 to fix bugs 464266 - dev-haskell/gtk-0.12.0: build fails with >=ghc-7.4.1 Ambiguous module name and 455012 - dev-haskell/gtk-0.12.0: fails to build with glib-2.32

Package-Manager: portage-2.2.0_alpha171/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

8 files changed, 119 insertions, 142 deletions

diff --git a/dev-haskell/gtk/ChangeLog b/dev-haskell/gtk/ChangeLog
index f0c65e55aa78..938f4b42c893 100644
--- a/dev-haskell/gtk/ChangeLog
+++ b/dev-haskell/gtk/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-haskell/gtk
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk/ChangeLog,v 1.12 2013/01/06 09:19:10 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk/ChangeLog,v 1.13 2013/04/03 05:29:37 gienah Exp $
+
+*gtk-0.12.4-r1 (03 Apr 2013)
+
+  03 Apr 2013; Mark Wright <gienah@gentoo.org> +files/gtk-0.12.0-ghc-7.2.patch,
+  +gtk-0.12.4-r1.ebuild, -gtk-0.12.3.1.ebuild, -gtk-0.12.3.ebuild,
+  -gtk-0.12.4.ebuild, gtk-0.12.0.ebuild:
+  Move gtk2hs to slot 2 fix bug 464260. Patch gtk-0.12.0 to fix bugs 464266 -
+  dev-haskell/gtk-0.12.0: build fails with >=ghc-7.4.1 Ambiguous module name and
+  455012 - dev-haskell/gtk-0.12.0: fails to build with glib-2.32
 
   06 Jan 2013; Agostino Sarubbo <ago@gentoo.org> gtk-0.12.4.ebuild:
   Add ~sparc, wrt bug #449220
diff --git a/dev-haskell/gtk/Manifest b/dev-haskell/gtk/Manifest
index 53eb16ad87e4..983e9f407c94 100644
--- a/dev-haskell/gtk/Manifest
+++ b/dev-haskell/gtk/Manifest
@@ -1,12 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX gtk-0.12.0-ghc-7.2.patch 836 SHA256 b3f4c4b8b8aed4e0dd19eddea78b3ed4b108d10eaf2abaad0c605d32b887c6db SHA512 d6b5dbd7746d2efa7535d6168b3b7ea612907354d95f76131fdd0c12bc31fa177391fee1052a33803c28de96960a59e6f40b95336601a760090f13d189a1b0ee WHIRLPOOL ab3f93f91c4e3e2a21994d3e9d29687d64f7f773d9921673efd094dfb4531f52ebc3f41038a54491d277203c290e97c515be2d60fde28c1366a8c469240fe62b
 AUX gtk-0.12.3-glib-2.32.patch 541 SHA256 319993a82fa416293d3d69fff5aebf22f5bb5e87cac4803c5f5096df3aba6ed1 SHA512 5bb792f9527d5f292e42dea4aeb2e81c5d550dcf9fe5830bbbed9985039b79deeb1accfb8b2d7eeaa334a71e7b5659585d9ad0422bafeff52fede69cf2e2fdb6 WHIRLPOOL 1326f532d9b052eb2e18309883178b65e16a4a7a69fce924243fde6d1e5b75ae688f6cbb2991c9cd45bfbbefcc90d4ec621632c15884685d83bcf723cbfb18b0
 AUX gtk-0.12.3.1-ghc-7.6.patch 12558 SHA256 f767461f273324715071036a05c811564b83bed2687a8492005b730f6a49c1d5 SHA512 e98d8506e77fa8722e7664800b7a30854841879b00496be9c0d0f374cd538ee75eed1f6df05bd101f48e00ba4400acf339abd2eee6d5df8e830d7772dbb04e48 WHIRLPOOL 6b5c3c227d3a0caa4a9904d77cefa4c5fc673cc447c4864a754771ba21d184faa6c2c86658cf5fffa54d9815906a6dbeda40965605e82098f0172ad81a9248ae
 DIST gtk-0.12.0.tar.gz 655682 SHA256 423fdd63794b88c822a3aeb8f8bbf5c846fe7c9630a81516cd0daa0cd2001ee7 SHA512 9e4667c4df9181665aafb38743dfdf51d89144ea36579f7761c73fdff5245f1f496d2bcdb1932958f5b870ccd6eda6a23d2bf04017727812d176c974178a1e6f WHIRLPOOL a112222fbd48cdf04e3bf0cc3acf0337a5cb0ff7cd02695691dc6aa0196efccb8f8c4a73a8870024713a4c9a60c3d71bbe06ff7ddfd11e71878c091a211937de
-DIST gtk-0.12.3.1.tar.gz 666428 SHA256 1a9de48357f5bf4f2f10b797e3d6bef970aa4597c0ef48e61330ee4b0f803a6d SHA512 1e3606a50dbeeb3e992c61b86efc005e5ebf62371794a3db31694a2e61acee7b6c2be73ff09b2c03ac90a7d9c61cbf58a82e39fccd8d02e5112079d06f511905 WHIRLPOOL 63746eef3a8084f409173d8bbf1294e80ac4a33f0e72bc37af422ce269678d646be54b1b7d54a6efbf8b87a7420815cb94da587868fc89f716d9e122119bcf4e
-DIST gtk-0.12.3.tar.gz 660880 SHA256 9880787bd65dff701204df5c08e14a535b698fc75786b192a975de3e7158ab28 SHA512 aa5faa02000655bb76cb46541ebc0f63bc6e2ca0696ed0e3c28310e700a95a3e075951ee501c8d2b7509c13d6cd81df7798d949d22940545cc44350196309724 WHIRLPOOL e4671fb13243b2cb0704f55e4f98184bc84b2d65033cebdd15bfedac77f5255dbb827f8d23cb77bf32a34a9a7cfd4bf1d5d10e6b8859e1fd827a5a02cb14c1c4
 DIST gtk-0.12.4.tar.gz 661848 SHA256 e21ed8c3c7c0345bbaec8f1537a8605c64804e9937cef0cc9a84fce65274ce70 SHA512 0ab19e103e9695a19cfe9554b7b5d99d81c05d4464d4ad072028e2bf7a4f509b7b76ff76c476fdebc43514d9da52b1d7f6797e7114963515c32163e964102a65 WHIRLPOOL 56288954983277a1ddfaf5a04a3cd0727dd4998ccba82ab6070975a7f3b6fd99db7b0b09177fdc9006630d1781db5e539dfbe92a6a702f1db76ad13f25b19091
-EBUILD gtk-0.12.0.ebuild 1089 SHA256 78258dc62e73fc6bf6dbe077911148aa56eabf9299568c8f3fca5903ddf4f6c0 SHA512 58d4fb207743ff2350d813bfc60fd1cc43151216a5d203d8dfcb0f0ae92ca2ebb8cefcfde1d71157b7f8de83b781974ba50d0981a36b807dc2ea7856d83c9afe WHIRLPOOL 1544bab54fe0de04805f06aabb0c9073b9db80b3e519c90b1e3a7d9884fe64ea11cdb66b931cf82903049db5e60e7f8722dd026303ba25d3a583463a6f36e452
-EBUILD gtk-0.12.3.1.ebuild 1539 SHA256 d2c7c5a513b38667b61ec74d1f0dbe71bbbf4453ad7b7da66f2b1da702ceb82e SHA512 f12dc2da433e7a3bf6a33435263eda2a982759ae1913813ad5ae13de08b7cbf33cc3381d59f9ecef6608e8e45d6a337b51aa99b7e0386fd88c0d2fd5cd00158a WHIRLPOOL 52b41fada74275b177c7fdeeb12265d111d8894ce6dce563d4dd96540514ba5f2b9d9172366658cff3d1b6feff7e1af6266a3daad1ce40721db8a95bb5660a43
-EBUILD gtk-0.12.3.ebuild 1193 SHA256 2407347b8501b0c0c5fd41658d39e9c931f30004245a033514cd84d0d108aa74 SHA512 549d062b6fc198320253173971f4ee6c712db2a7bb6596d667e3f2787d95840c8be80f5eb2081b81568bf761a56d4651383718a8c4049734aed5681eff596700 WHIRLPOOL 5d00af23aa25efd3ed71bdc43f300debbb40fac6dd54cad95664c8d49048ad11a04464fc25738d6c779cb5677c1738424365176b11d09e094fd26c460a3c2095
-EBUILD gtk-0.12.4.ebuild 1117 SHA256 432b075d6fceb3f9383fec1df251d5e59b1dd1f9fbf4069c3d8bd54e1e3e88cd SHA512 22050cf643031a7f6c0d3d6ff2d13eee50c0be16101f379993bdc1247ce2bfa14ae50e96ccf8e03fb8ffb7e34e187f8c01e5bc08f79c075ac88414469b74f600 WHIRLPOOL 09ee39d8633daee745892f854654377ef77f3e4ede39a7ad7f970a89c15f523a7c40b2e7a763f2e38721c4f6ed4ca39031cdc9cccdbce45cbe6055f599df38b8
-MISC ChangeLog 1700 SHA256 f29714300169a7f996a2f105542e4b08f8261d7f47d62d0c4430e678fe7c2e40 SHA512 2c3de1ee1466a4577000fdd27eb7679f5822eebf644434abadebf990500b602055557b55ad3b71b0a24b151d92046e671c0ebcd7b9be94ddca5d1b95953bb47b WHIRLPOOL 46932168553f25f5adaa3e6e2b3b98619521cac9d12bcc5672ffbb9ff38c9aadf371e9a52ca8b0285a2f943d688c505e1d9df64b6214b64ee4f5a6f040398766
+EBUILD gtk-0.12.0.ebuild 1200 SHA256 128d845045467b88ecdf4f74ccfa1f69e895e59d9e39b33bc8c1f802fc0715f3 SHA512 233437943af3f362f4416365047376ce3b7acc6d5609ce5fe45b93e61a31225956fe90831a939db1e2c6cac9389a967705563336f8436f3959d39ef1e1504e8e WHIRLPOOL 80d4bc553fb0d1b15951919eca0d0813aaf97733e630507de126bdaa62ff9007d23c017ac9fd4b6c94a04b80017d116513a1b954c7ad318e7a4a0bb120682b66
+EBUILD gtk-0.12.4-r1.ebuild 2187 SHA256 678e7bd0c348ec03b5c80efe55649a12e85d693607d37d2593aaf3312a7873ee SHA512 df1e53d7ccbccedcc409bce2d0c5c698c3c9d49736d7dbb0c5f7854ae9cad535f835fd785f775f234d8856d15c1b7b3962ea3c8a0c0009b69444168f86d3167a WHIRLPOOL be8e1679429ea5146716d5868d4d75fbeb44a994619fad20af7e19ee79819b6987490686e0b0ad809e670142caccedff9d827214fad7e459e86258a3754e676c
+MISC ChangeLog 2146 SHA256 76ac90c3063079d00d47fa03937a4f8fdab949238df6d4db34ff5c01920fa55c SHA512 c28fb0bee213fdf3ace978bf9cd7eb0f4f89f4b3fe8848deac4d95e3c759ce7ce27ea4a634693f6b513ab3b3755a75b7fab334ffb133bef012c911d6dfedc7f4 WHIRLPOOL 9da09d2b2e48de611c3c19a815d50b2fa6911a65d6888867ef2a8b4de09efc0937655049036cdbe2477597611ba8325cd0f93905a125399ebce0920bd64cd376
 MISC metadata.xml 292 SHA256 5b1d453f724210086fd03e2d27b3f21b45459a0478936718320a88535a8d0b71 SHA512 cb5fc1c61e1a553f954bb1dd7973e3d0aaa137a8a2ccf82c289e1de3689f29413293a8b33efea56e29548644cf596d8edecaf059eb676b2e3a21689feba02d03 WHIRLPOOL e6c18ebebda9b2915b75fc3810db20b90481832d6a1754bba5af553e39a507e26894bc216dbb55c73f50110ca00369dcc4e5f92801a36c62eba798b59cfbd749
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlFbvh4ACgkQoBEVQmGOlx98LQEA3Nyj92Uo9iPWsbLA1o86Fh1f
+FhgJ0carsLS/ST2yrMEA/3CCuBlFSOliVPMzu46Q+sdouuTDhd5omocKs+e2q56e
+=MBxq
+-----END PGP SIGNATURE-----
diff --git a/dev-haskell/gtk/files/gtk-0.12.0-ghc-7.2.patch b/dev-haskell/gtk/files/gtk-0.12.0-ghc-7.2.patch
new file mode 100644
index 000000000000..1d454c5f06ea
--- /dev/null
+++ b/dev-haskell/gtk/files/gtk-0.12.0-ghc-7.2.patch
@@ -0,0 +1,23 @@
+diff --git a/Graphics/UI/Gtk/General/Structs.hsc b/Graphics/UI/Gtk/General/Structs.hsc
+index 2df0385..c1b8452 100644
+--- a/Graphics/UI/Gtk/General/Structs.hsc
++++ b/Graphics/UI/Gtk/General/Structs.hsc
+@@ -1,4 +1,5 @@
+ {-# LANGUAGE ScopedTypeVariables, TypeSynonymInstances #-}
++{-# LANGUAGE FlexibleInstances #-}
+ {-# OPTIONS_HADDOCK hide #-}
+ -- -*-haskell-*-
+ 
+diff --git a/gtk.cabal b/gtk.cabal
+index bd97975..aa7165f 100644
+--- a/gtk.cabal
++++ b/gtk.cabal
+@@ -126,7 +126,7 @@ Flag have-gio
+ 
+ Library
+         build-depends:  base >= 4 && < 5,
+-                        array, containers, haskell98, mtl, bytestring,
++                        array, containers, mtl, bytestring,
+                         glib  >= 0.12.0 && < 0.13,
+                         pango >= 0.12.0 && < 0.13,
+                         cairo >= 0.12.0 && < 0.13
diff --git a/dev-haskell/gtk/gtk-0.12.0.ebuild b/dev-haskell/gtk/gtk-0.12.0.ebuild
index 3b09694333b8..f675aa90f6b0 100644
--- a/dev-haskell/gtk/gtk-0.12.0.ebuild
+++ b/dev-haskell/gtk/gtk-0.12.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk/gtk-0.12.0.ebuild,v 1.4 2012/09/12 14:39:44 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk/gtk-0.12.0.ebuild,v 1.5 2013/04/03 05:29:37 gienah Exp $
 
 # ebuild generated by hackport 0.2.13
 
@@ -8,27 +8,30 @@ EAPI="3"
 
 #nocabaldep is for the fancy cabal-detection feature at build-time
 CABAL_FEATURES="lib profile haddock hscolour nocabaldep"
-inherit haskell-cabal
+inherit base haskell-cabal
 
 DESCRIPTION="Haskell bindings to the Gtk+ graphical user interface library."
 HOMEPAGE="http://www.haskell.org/gtk2hs/"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-SLOT="0"
+SLOT="2"
 KEYWORDS="amd64 x86"
 IUSE="+gio"
 
-RDEPEND="=dev-haskell/cairo-0.12*
-		=dev-haskell/glib-0.12*
+RDEPEND="=dev-haskell/cairo-0.12*:2
+		=dev-haskell/glib-0.12*:2
 		dev-haskell/mtl
-		=dev-haskell/pango-0.12*
+		=dev-haskell/pango-0.12*:2
 		>=dev-lang/ghc-6.10.1
 		dev-libs/glib:2
 		x11-libs/gtk+:2
-		gio? ( =dev-haskell/gio-0.12* )"
+		gio? ( =dev-haskell/gio-0.12*:2 )"
 DEPEND="${RDEPEND}
-		dev-haskell/gtk2hs-buildtools"
+		dev-haskell/gtk2hs-buildtools:2"
+
+PATCHES=("${FILESDIR}/${PN}-0.12.0-ghc-7.2.patch"
+	"${FILESDIR}/${PN}-0.12.3-glib-2.32.patch")
 
 src_configure() {
 	# Upstream has this enabled, so we might as well force it enabled to be sure.
diff --git a/dev-haskell/gtk/gtk-0.12.3.1.ebuild b/dev-haskell/gtk/gtk-0.12.3.1.ebuild
deleted file mode 100644
index 564103daaeb8..000000000000
--- a/dev-haskell/gtk/gtk-0.12.3.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk/gtk-0.12.3.1.ebuild,v 1.1 2012/11/25 06:04:14 gienah Exp $
-
-EAPI=4
-
-# ebuild generated by hackport 0.2.18.9999
-
-#nocabaldep is for the fancy cabal-detection feature at build-time
-CABAL_FEATURES="lib profile haddock hscolour hoogle nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Gtk+ graphical user interface library."
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+gio"
-
-RDEPEND=">=dev-haskell/cairo-0.12.0[profile?]
-		<dev-haskell/cairo-0.13[profile?]
-		>=dev-haskell/glib-0.12.0[profile?]
-		<dev-haskell/glib-0.13[profile?]
-		dev-haskell/mtl[profile?]
-		>=dev-haskell/pango-0.12.0[profile?]
-		<dev-haskell/pango-0.13[profile?]
-		>=dev-lang/ghc-6.10.1
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-		gio? ( =dev-haskell/gio-0.12*[profile?] )"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		dev-haskell/gtk2hs-buildtools"
-
-src_prepare() {
-	# c2hs ignores #if __GLASGOW_HASKELL__ >= 706
-	# I do not know which earlier ghc versions the patch submitted upstream works with
-	if has_version ">=dev-lang/ghc-7.6.1"; then
-		epatch "${FILESDIR}/${PN}-0.12.3.1-ghc-7.6.patch"
-	fi
-}
-
-src_configure() {
-	# Upstream has this enabled, so we might as well force it enabled to be sure.
-	cabal_src_configure \
-		--flags=deprecated \
-		$(cabal_flag gio have-gio)
-}
diff --git a/dev-haskell/gtk/gtk-0.12.3.ebuild b/dev-haskell/gtk/gtk-0.12.3.ebuild
deleted file mode 100644
index 3c2120c81788..000000000000
--- a/dev-haskell/gtk/gtk-0.12.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk/gtk-0.12.3.ebuild,v 1.2 2012/09/12 14:39:44 qnikst Exp $
-
-# ebuild generated by hackport 0.2.13
-
-EAPI=4
-
-#nocabaldep is for the fancy cabal-detection feature at build-time
-CABAL_FEATURES="lib profile haddock hscolour hoogle nocabaldep"
-inherit base haskell-cabal
-
-DESCRIPTION="Binding to the Gtk+ graphical user interface library."
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+gio"
-
-RDEPEND="=dev-haskell/cairo-0.12*[profile?]
-		=dev-haskell/glib-0.12*[profile?]
-		dev-haskell/mtl[profile?]
-		=dev-haskell/pango-0.12*[profile?]
-		>=dev-lang/ghc-6.10.1
-		dev-libs/glib:2
-		x11-libs/gtk+:2
-		gio? ( =dev-haskell/gio-0.12*[profile?] )"
-DEPEND="${RDEPEND}
-		dev-haskell/gtk2hs-buildtools"
-
-PATCHES=("${FILESDIR}"/${P}-glib-2.32.patch)
-
-src_configure() {
-	# Upstream has this enabled, so we might as well force it enabled to be sure.
-	cabal_src_configure \
-		--flags=deprecated \
-		$(cabal_flag gio have-gio)
-}
diff --git a/dev-haskell/gtk/gtk-0.12.4-r1.ebuild b/dev-haskell/gtk/gtk-0.12.4-r1.ebuild
new file mode 100644
index 000000000000..80a71a5f4e3f
--- /dev/null
+++ b/dev-haskell/gtk/gtk-0.12.4-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk/gtk-0.12.4-r1.ebuild,v 1.1 2013/04/03 05:29:37 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.9999
+
+GTK_MAJ_VER="2"
+
+#nocabaldep is for the fancy cabal-detection feature at build-time
+CABAL_FEATURES="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="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="${GTK_MAJ_VER}/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+gio"
+
+RDEPEND=">=dev-haskell/cairo-0.12.0:${GTK_MAJ_VER}=[profile?]
+		<dev-haskell/cairo-0.13:${GTK_MAJ_VER}=[profile?]
+		>=dev-haskell/gio-0.12.0:${GTK_MAJ_VER}=[profile?]
+		<dev-haskell/gio-0.13:${GTK_MAJ_VER}=[profile?]
+		>=dev-haskell/glib-0.12.0:${GTK_MAJ_VER}=[profile?]
+		<dev-haskell/glib-0.13:${GTK_MAJ_VER}=[profile?]
+		dev-haskell/mtl:=[profile?]
+		>=dev-haskell/pango-0.12.0:${GTK_MAJ_VER}=[profile?]
+		<dev-haskell/pango-0.13:${GTK_MAJ_VER}=[profile?]
+		>=dev-lang/ghc-6.10.4:=
+		dev-libs/glib:2
+		x11-libs/gtk+:${GTK_MAJ_VER}
+		gio? ( =dev-haskell/gio-0.12*:${GTK_MAJ_VER}[profile?] )"
+DEPEND="${RDEPEND}
+		>=dev-haskell/cabal-1.8
+		>=dev-haskell/gtk2hs-buildtools-0.12.4:${GTK_MAJ_VER}=
+		virtual/pkgconfig"
+
+src_prepare() {
+	sed -e "s@gtk2hsTypeGen@gtk2hsTypeGen${GTK_MAJ_VER}@" \
+		-e "s@gtk2hsHookGenerator@gtk2hsHookGenerator${GTK_MAJ_VER}@" \
+		-e "s@gtk2hsC2hs@gtk2hsC2hs${GTK_MAJ_VER}@" \
+		-i "${S}/Gtk2HsSetup.hs" \
+		|| die "Could not change Gtk2HsSetup.hs for GTK+ slot ${GTK_MAJ_VER}"
+	sed -e "s@gtk2hsC2hs@gtk2hsC2hs${GTK_MAJ_VER}@" \
+		-e "s@gtk2hsTypeGen@gtk2hsTypeGen${GTK_MAJ_VER}@" \
+		-e "s@gtk2hsHookGenerator@gtk2hsHookGenerator${GTK_MAJ_VER}@" \
+		-i "${S}/${PN}.cabal" \
+		|| die "Could not change ${PN}.cabal for GTK+ slot ${GTK_MAJ_VER}"
+}
+
+src_configure() {
+	# Upstream has this enabled, so we might as well force it enabled to be sure.
+	cabal_src_configure \
+		--flags=deprecated \
+		$(cabal_flag gio have-gio)
+}
diff --git a/dev-haskell/gtk/gtk-0.12.4.ebuild b/dev-haskell/gtk/gtk-0.12.4.ebuild
deleted file mode 100644
index 93cfb77bf8e5..000000000000
--- a/dev-haskell/gtk/gtk-0.12.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk/gtk-0.12.4.ebuild,v 1.6 2013/01/06 09:19:10 ago Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Binding to the Gtk+ graphical user interface library."
-HOMEPAGE="http://projects.haskell.org/gtk2hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-haskell/cairo-0.12.0:=[profile?]
-		<dev-haskell/cairo-0.13:=[profile?]
-		>=dev-haskell/gio-0.12.0:=[profile?]
-		<dev-haskell/gio-0.13:=[profile?]
-		>=dev-haskell/glib-0.12.0:=[profile?]
-		<dev-haskell/glib-0.13:=[profile?]
-		dev-haskell/mtl:=[profile?]
-		>=dev-haskell/pango-0.12.0:=[profile?]
-		<dev-haskell/pango-0.13:=[profile?]
-		>=dev-lang/ghc-6.10.4:=
-		dev-libs/glib:2
-		x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		>=dev-haskell/gtk2hs-buildtools-0.12.4"