Move gtk2hs to slot 2 fix bug 464260.

(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 618E971F)

6 files changed, 56 insertions, 60 deletions

diff --git a/dev-haskell/glib/ChangeLog b/dev-haskell/glib/ChangeLog
index f2ddb2e26dd5..9d3c82d9cf2c 100644
--- a/dev-haskell/glib/ChangeLog
+++ b/dev-haskell/glib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-haskell/glib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glib/ChangeLog,v 1.15 2013/01/06 09:18:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glib/ChangeLog,v 1.16 2013/04/03 05:26:58 gienah Exp $
+
+*glib-0.12.4-r1 (03 Apr 2013)
+
+  03 Apr 2013; Mark Wright <gienah@gentoo.org> +glib-0.12.4-r1.ebuild,
+  -glib-0.12.3.ebuild, -glib-0.12.4.ebuild, glib-0.12.0.ebuild,
+  glib-0.12.3.1.ebuild:
+  Move gtk2hs to slot 2 fix bug 464260.
 
   06 Jan 2013; Agostino Sarubbo <ago@gentoo.org> glib-0.12.4.ebuild:
   Add ~sparc, wrt bug #449220
diff --git a/dev-haskell/glib/glib-0.12.0.ebuild b/dev-haskell/glib/glib-0.12.0.ebuild
index b1df0c00130b..f23a64959a55 100644
--- a/dev-haskell/glib/glib-0.12.0.ebuild
+++ b/dev-haskell/glib/glib-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/glib/glib-0.12.0.ebuild,v 1.4 2012/09/12 14:53:15 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glib/glib-0.12.0.ebuild,v 1.5 2013/04/03 05:26:58 gienah Exp $
 
 # ebuild generated by hackport 0.2.13
 
@@ -15,11 +15,11 @@ 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=""
 
 RDEPEND=">=dev-lang/ghc-6.10.1
 		dev-libs/glib:2"
 DEPEND="${RDEPEND}
-		dev-haskell/gtk2hs-buildtools"
+		dev-haskell/gtk2hs-buildtools:2"
diff --git a/dev-haskell/glib/glib-0.12.3.1.ebuild b/dev-haskell/glib/glib-0.12.3.1.ebuild
index 35cef84c9c88..00ce0d9969a1 100644
--- a/dev-haskell/glib/glib-0.12.3.1.ebuild
+++ b/dev-haskell/glib/glib-0.12.3.1.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/glib/glib-0.12.3.1.ebuild,v 1.5 2012/11/25 05:43:19 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glib/glib-0.12.3.1.ebuild,v 1.6 2013/04/03 05:26:58 gienah Exp $
 
 EAPI=4
 
@@ -13,14 +13,14 @@ HOMEPAGE="http://projects.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=""
 
 RDEPEND=">=dev-lang/ghc-6.10.1
 		dev-libs/glib:2"
 DEPEND="${RDEPEND}
-		dev-haskell/gtk2hs-buildtools"
+		dev-haskell/gtk2hs-buildtools:2"
 
 src_prepare() {
 	# c2hs ignores #if __GLASGOW_HASKELL__ >= 706
diff --git a/dev-haskell/glib/glib-0.12.3.ebuild b/dev-haskell/glib/glib-0.12.3.ebuild
deleted file mode 100644
index 5e9091d0747f..000000000000
--- a/dev-haskell/glib/glib-0.12.3.ebuild
+++ /dev/null
@@ -1,25 +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/glib/glib-0.12.3.ebuild,v 1.2 2012/09/12 14:53:15 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 GLIB library for Gtk2Hs."
-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=""
-
-RDEPEND=">=dev-lang/ghc-6.10.1
-		dev-libs/glib:2"
-DEPEND="${RDEPEND}
-		dev-haskell/gtk2hs-buildtools"
diff --git a/dev-haskell/glib/glib-0.12.4-r1.ebuild b/dev-haskell/glib/glib-0.12.4-r1.ebuild
new file mode 100644
index 000000000000..08b6b52c3070
--- /dev/null
+++ b/dev-haskell/glib/glib-0.12.4-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glib/glib-0.12.4-r1.ebuild,v 1.1 2013/04/03 05:26:58 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 GLIB library for Gtk2Hs."
+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=""
+
+RDEPEND=">=dev-lang/ghc-6.10.4:=
+		dev-libs/glib:2"
+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}@" \
+		-i "${S}/${PN}.cabal" \
+		|| die "Could not change ${PN}.cabal for GTK+ slot ${GTK_MAJ_VER}"
+}
diff --git a/dev-haskell/glib/glib-0.12.4.ebuild b/dev-haskell/glib/glib-0.12.4.ebuild
deleted file mode 100644
index 17e8ea017112..000000000000
--- a/dev-haskell/glib/glib-0.12.4.ebuild
+++ /dev/null
@@ -1,26 +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/glib/glib-0.12.4.ebuild,v 1.6 2013/01/06 09:18:50 ago Exp $
-
-EAPI=5
-
-# ebuild generated by hackport 0.3.9999
-
-#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 GLIB library for Gtk2Hs."
-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-lang/ghc-6.10.4:=
-		dev-libs/glib:2"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		>=dev-haskell/gtk2hs-buildtools-0.12.4"