Move gtk2hs to slot 2 fix bug 464260.

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

5 files changed, 67 insertions, 45 deletions

diff --git a/dev-haskell/pango/ChangeLog b/dev-haskell/pango/ChangeLog
index 83bd6d82cd91..af482a52a9a2 100644
--- a/dev-haskell/pango/ChangeLog
+++ b/dev-haskell/pango/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/pango
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/pango/ChangeLog,v 1.15 2013/01/06 09:20:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/pango/ChangeLog,v 1.16 2013/04/03 05:30:39 gienah Exp $
+
+*pango-0.12.4-r1 (03 Apr 2013)
+
+  03 Apr 2013; Mark Wright <gienah@gentoo.org> +pango-0.12.4-r1.ebuild,
+  -pango-0.12.4.ebuild, pango-0.12.0.ebuild, pango-0.12.3.ebuild:
+  Move gtk2hs to slot 2 fix bug 464260.
 
   06 Jan 2013; Agostino Sarubbo <ago@gentoo.org> pango-0.12.4.ebuild:
   Add ~sparc, wrt bug #449220
diff --git a/dev-haskell/pango/pango-0.12.0.ebuild b/dev-haskell/pango/pango-0.12.0.ebuild
index f80dfde190fb..70ff5bbcb034 100644
--- a/dev-haskell/pango/pango-0.12.0.ebuild
+++ b/dev-haskell/pango/pango-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/pango/pango-0.12.0.ebuild,v 1.4 2012/09/12 15:23:10 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/pango/pango-0.12.0.ebuild,v 1.5 2013/04/03 05:30:39 gienah Exp $
 
 # ebuild generated by hackport 0.2.13
 
@@ -15,15 +15,15 @@ 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*
+RDEPEND="=dev-haskell/cairo-0.12*:2
+		=dev-haskell/glib-0.12*:2
 		dev-haskell/mtl
 		>=dev-lang/ghc-6.10.1
 		x11-libs/cairo
 		x11-libs/pango"
 DEPEND="${RDEPEND}
-		dev-haskell/gtk2hs-buildtools"
+		dev-haskell/gtk2hs-buildtools:2"
diff --git a/dev-haskell/pango/pango-0.12.3.ebuild b/dev-haskell/pango/pango-0.12.3.ebuild
index 4d5ce1ddc9aa..fbca61cb8c31 100644
--- a/dev-haskell/pango/pango-0.12.3.ebuild
+++ b/dev-haskell/pango/pango-0.12.3.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/pango/pango-0.12.3.ebuild,v 1.6 2012/09/12 15:23:10 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/pango/pango-0.12.3.ebuild,v 1.7 2013/04/03 05:30:39 gienah Exp $
 
 EAPI=4
 
@@ -13,15 +13,15 @@ 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/cairo-0.12*[profile?]
-		=dev-haskell/glib-0.12*[profile?]
+RDEPEND="=dev-haskell/cairo-0.12*:2[profile?]
+		=dev-haskell/glib-0.12*:2[profile?]
 		dev-haskell/mtl[profile?]
 		>=dev-lang/ghc-6.10.1
 		x11-libs/cairo
 		x11-libs/pango"
 DEPEND="${RDEPEND}
-		>=dev-haskell/gtk2hs-buildtools-0.12.3-r3"
+		>=dev-haskell/gtk2hs-buildtools-0.12.3-r3:2"
diff --git a/dev-haskell/pango/pango-0.12.4-r1.ebuild b/dev-haskell/pango/pango-0.12.4-r1.ebuild
new file mode 100644
index 000000000000..3cd596531c11
--- /dev/null
+++ b/dev-haskell/pango/pango-0.12.4-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/pango/pango-0.12.4-r1.ebuild,v 1.1 2013/04/03 05:30:39 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 Pango text rendering engine."
+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-haskell/cairo-0.12.0:${GTK_MAJ_VER}=[profile?]
+		<dev-haskell/cairo-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-lang/ghc-6.10.4:=
+		x11-libs/cairo
+		x11-libs/pango"
+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}"
+}
diff --git a/dev-haskell/pango/pango-0.12.4.ebuild b/dev-haskell/pango/pango-0.12.4.ebuild
deleted file mode 100644
index 2073fa545ac6..000000000000
--- a/dev-haskell/pango/pango-0.12.4.ebuild
+++ /dev/null
@@ -1,32 +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/pango/pango-0.12.4.ebuild,v 1.6 2013/01/06 09:20: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 Pango text rendering engine."
-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/glib-0.12.0:=[profile?]
-		<dev-haskell/glib-0.13:=[profile?]
-		dev-haskell/mtl:=[profile?]
-		>=dev-lang/ghc-6.10.4:=
-		x11-libs/cairo
-		x11-libs/pango"
-DEPEND="${RDEPEND}
-		>=dev-haskell/cabal-1.8
-		>=dev-haskell/gtk2hs-buildtools-0.12.4"