Move gtk2hs to slot 2 fix bug 464260.

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

4 files changed, 66 insertions, 16 deletions

diff --git a/dev-haskell/glade/ChangeLog b/dev-haskell/glade/ChangeLog
index 387c65056760..d68b5f50964a 100644
--- a/dev-haskell/glade/ChangeLog
+++ b/dev-haskell/glade/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/glade
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glade/ChangeLog,v 1.7 2012/09/12 15:18:19 qnikst Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glade/ChangeLog,v 1.8 2013/04/03 05:26:31 gienah Exp $
+
+*glade-0.12.1-r1 (03 Apr 2013)
+
+  03 Apr 2013; Mark Wright <gienah@gentoo.org> +glade-0.12.1-r1.ebuild,
+  glade-0.12.0.ebuild, glade-0.12.1.ebuild:
+  Move gtk2hs to slot 2 fix bug 464260.
 
   12 Sep 2012; Alexander Vershilov <qnikst@gentoo.org> glade-0.12.0.ebuild,
   glade-0.12.1.ebuild:
diff --git a/dev-haskell/glade/glade-0.12.0.ebuild b/dev-haskell/glade/glade-0.12.0.ebuild
index 9cfeb93c7643..d1c7866475ce 100644
--- a/dev-haskell/glade/glade-0.12.0.ebuild
+++ b/dev-haskell/glade/glade-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/glade/glade-0.12.0.ebuild,v 1.4 2012/09/12 15:18:19 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glade/glade-0.12.0.ebuild,v 1.5 2013/04/03 05:26:31 gienah Exp $
 
 # ebuild generated by hackport 0.2.13
 
@@ -15,16 +15,16 @@ 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-haskell/cairo-0.12*
-		=dev-haskell/glib-0.12*
-		=dev-haskell/gtk-0.12*
+RDEPEND="=dev-haskell/cairo-0.12*:2
+		=dev-haskell/glib-0.12*:2
+		=dev-haskell/gtk-0.12*:2
 		dev-haskell/mtl
-		=dev-haskell/pango-0.12*
+		=dev-haskell/pango-0.12*:2
 		>=dev-lang/ghc-6.10.1
 		gnome-base/libglade:2.0"
 DEPEND="${RDEPEND}
-		dev-haskell/gtk2hs-buildtools"
+		dev-haskell/gtk2hs-buildtools:2"
diff --git a/dev-haskell/glade/glade-0.12.1-r1.ebuild b/dev-haskell/glade/glade-0.12.1-r1.ebuild
new file mode 100644
index 000000000000..e79a6c4ffc94
--- /dev/null
+++ b/dev-haskell/glade/glade-0.12.1-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glade/glade-0.12.1-r1.ebuild,v 1.1 2013/04/03 05:26:31 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.2.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 glade 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="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="=dev-haskell/glib-0.12*:${GTK_MAJ_VER}=[profile?]
+		=dev-haskell/gtk-0.12*:${GTK_MAJ_VER}=[profile?]
+		>=dev-lang/ghc-6.10.4:=
+		gnome-base/libglade:2.0"
+DEPEND="${RDEPEND}
+		dev-haskell/gtk2hs-buildtools:${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" \
+		-i "${S}/SetupMain.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}"
+}
diff --git a/dev-haskell/glade/glade-0.12.1.ebuild b/dev-haskell/glade/glade-0.12.1.ebuild
index 5a5cdd95e20a..92ca4a63f881 100644
--- a/dev-haskell/glade/glade-0.12.1.ebuild
+++ b/dev-haskell/glade/glade-0.12.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/glade/glade-0.12.1.ebuild,v 1.4 2012/09/12 15:18:19 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glade/glade-0.12.1.ebuild,v 1.5 2013/04/03 05:26:31 gienah Exp $
 
 # ebuild generated by hackport 0.2.17.9999
 
@@ -15,13 +15,13 @@ 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-haskell/glib-0.12*[profile?]
-		=dev-haskell/gtk-0.12*[profile?]
+RDEPEND="=dev-haskell/glib-0.12*:2[profile?]
+		=dev-haskell/gtk-0.12*:2[profile?]
 		>=dev-lang/ghc-6.10.1
 		gnome-base/libglade:2.0"
 DEPEND="${RDEPEND}
-		dev-haskell/gtk2hs-buildtools"
+		dev-haskell/gtk2hs-buildtools:2"