Restrict the deps in cairo to select gtk+2 in slot 2 fix bug 464260.

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

5 files changed, 37 insertions, 16 deletions

diff --git a/dev-haskell/cairo/ChangeLog b/dev-haskell/cairo/ChangeLog
index 891e2ab71882..c319b0adcab1 100644
--- a/dev-haskell/cairo/ChangeLog
+++ b/dev-haskell/cairo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-haskell/cairo
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/ChangeLog,v 1.16 2013/01/06 09:17:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/ChangeLog,v 1.17 2013/04/03 05:23:56 gienah Exp $
+
+*cairo-0.12.4-r1 (03 Apr 2013)
+
+  03 Apr 2013; Mark Wright <gienah@gentoo.org> +cairo-0.12.4-r1.ebuild,
+  -cairo-0.12.4.ebuild, cairo-0.12.0.ebuild, cairo-0.12.3.1.ebuild,
+  cairo-0.12.3.ebuild:
+  Restrict the deps in cairo to select gtk+2 in slot 2 fix bug 464260.
 
   06 Jan 2013; Agostino Sarubbo <ago@gentoo.org> cairo-0.12.4.ebuild:
   Add ~sparc, wrt bug #449220
diff --git a/dev-haskell/cairo/cairo-0.12.0.ebuild b/dev-haskell/cairo/cairo-0.12.0.ebuild
index 1a08066e87be..2df82a00021a 100644
--- a/dev-haskell/cairo/cairo-0.12.0.ebuild
+++ b/dev-haskell/cairo/cairo-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/cairo/cairo-0.12.0.ebuild,v 1.4 2012/09/12 15:13:57 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/cairo-0.12.0.ebuild,v 1.5 2013/04/03 05:23:56 gienah Exp $
 
 # ebuild generated by hackport 0.2.13
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.haskell.org/gtk2hs/"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="0"
+SLOT="2"
 KEYWORDS="amd64 x86"
 IUSE="+svg"
 
@@ -23,7 +23,7 @@ RDEPEND="dev-haskell/mtl
 		>=dev-lang/ghc-6.10.1
 		x11-libs/cairo[svg?]"
 DEPEND="${RDEPEND}
-		dev-haskell/gtk2hs-buildtools"
+		dev-haskell/gtk2hs-buildtools:2"
 
 src_configure() {
 	# x11-libs/cairo seems to build pdf and ps by default
diff --git a/dev-haskell/cairo/cairo-0.12.3.1.ebuild b/dev-haskell/cairo/cairo-0.12.3.1.ebuild
index 6b7f6c8d8667..cbadf9647b09 100644
--- a/dev-haskell/cairo/cairo-0.12.3.1.ebuild
+++ b/dev-haskell/cairo/cairo-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/cairo/cairo-0.12.3.1.ebuild,v 1.4 2012/09/23 08:41:05 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/cairo-0.12.3.1.ebuild,v 1.5 2013/04/03 05:23:56 gienah Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://projects.haskell.org/gtk2hs/"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="0"
+SLOT="2"
 KEYWORDS="amd64 x86"
 IUSE="+svg"
 
@@ -21,7 +21,7 @@ RDEPEND="dev-haskell/mtl[profile?]
 		>=dev-lang/ghc-6.10.1
 		x11-libs/cairo[svg?]"
 DEPEND="${RDEPEND}
-		dev-haskell/gtk2hs-buildtools"
+		dev-haskell/gtk2hs-buildtools:2"
 
 src_configure() {
 	# x11-libs/cairo seems to build pdf and ps by default
diff --git a/dev-haskell/cairo/cairo-0.12.3.ebuild b/dev-haskell/cairo/cairo-0.12.3.ebuild
index 96ef7431bc71..6eadea1f6f29 100644
--- a/dev-haskell/cairo/cairo-0.12.3.ebuild
+++ b/dev-haskell/cairo/cairo-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/cairo/cairo-0.12.3.ebuild,v 1.4 2012/09/12 15:13:57 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/cairo-0.12.3.ebuild,v 1.5 2013/04/03 05:23:56 gienah Exp $
 
 # ebuild generated by hackport 0.2.13
 
@@ -15,7 +15,7 @@ HOMEPAGE="http://projects.haskell.org/gtk2hs/"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="0"
+SLOT="2"
 KEYWORDS="amd64 x86"
 IUSE="+svg"
 
@@ -23,7 +23,7 @@ RDEPEND="dev-haskell/mtl
 		>=dev-lang/ghc-6.10.1
 		x11-libs/cairo[svg?]"
 DEPEND="${RDEPEND}
-		dev-haskell/gtk2hs-buildtools"
+		dev-haskell/gtk2hs-buildtools:2"
 
 PATCHES=("${FILESDIR}"/${P}-fixincl.patch)
 
diff --git a/dev-haskell/cairo/cairo-0.12.4.ebuild b/dev-haskell/cairo/cairo-0.12.4-r1.ebuild
index 71d7c56bd362..fad681e2f64c 100644
--- a/dev-haskell/cairo/cairo-0.12.4.ebuild
+++ b/dev-haskell/cairo/cairo-0.12.4-r1.ebuild
@@ -1,11 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/cairo-0.12.4.ebuild,v 1.6 2013/01/06 09:17:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/cairo-0.12.4-r1.ebuild,v 1.1 2013/04/03 05:23:56 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
@@ -15,7 +17,7 @@ HOMEPAGE="http://projects.haskell.org/gtk2hs/"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
-SLOT="0/${PV}"
+SLOT="${GTK_MAJ_VER}/${PV}"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+svg"
 
@@ -24,7 +26,19 @@ RDEPEND="dev-haskell/mtl:=[profile?]
 		x11-libs/cairo[svg?]"
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.8
-		>=dev-haskell/gtk2hs-buildtools-0.12.4"
+		>=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}"
+}
 
 src_configure() {
 	# x11-libs/cairo seems to build pdf and ps by default