ltk-0.12.1.0-r3 uses gtk+2 in slot 2, ltk-9999 uses gtk+3 in slot 3 (…

…leksah and ltk are in slot 0)
gentoo-haskell · Apr 1, 2013 · 8ee2bd0 · 8ee2bd0
1 parent 5d4db35
commit 8ee2bd0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/dev-haskell/ltk/ltk-0.12.1.0-r3.ebuild → dev-haskell/ltk/ltk-0.12.1.0-r4.ebuild b/dev-haskell/ltk/ltk-0.12.1.0-r3.ebuild → dev-haskell/ltk/ltk-0.12.1.0-r4.ebuild
@@ -6,6 +6,8 @@ EAPI=5
 
 # ebuild generated by hackport 0.3.1.9999
 
+GTK_MAJ_VER="2"
+
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 CABAL_FEATURES+=" nocabaldep" # needs ghc's version as used by leksah
 inherit base haskell-cabal
@@ -21,10 +23,10 @@ IUSE=""
 
 RDEPEND=">=dev-haskell/cabal-1.6.0:=[profile?]
 		<dev-haskell/cabal-1.18:=[profile?]
-		>=dev-haskell/glib-0.10.0:=[profile?]
-		<dev-haskell/glib-0.13:=[profile?]
-		>=dev-haskell/gtk-0.10.0:=[profile?]
-		<dev-haskell/gtk-0.13:=[profile?]
+		>=dev-haskell/glib-0.10.0:${GTK_MAJ_VER}=[profile?]
+		<dev-haskell/glib-0.13:${GTK_MAJ_VER}=[profile?]
+		>=dev-haskell/gtk-0.10.0:${GTK_MAJ_VER}=[profile?]
+		<dev-haskell/gtk-0.13:${GTK_MAJ_VER}=[profile?]
 		>=dev-haskell/mtl-1.1.0.2:=[profile?]
 		<dev-haskell/mtl-2.2:=[profile?]
 		>=dev-haskell/parsec-2.1.0.1:=[profile?]

diff --git a/dev-haskell/ltk/ltk-9999.ebuild b/dev-haskell/ltk/ltk-9999.ebuild
@@ -1,11 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
 EAPI=5
 
 # ebuild generated by hackport 0.3.1.9999
 
+GTK_MAJ_VER="3"
+
 CABAL_FEATURES="lib profile haddock hoogle hscolour"
 CABAL_FEATURES+=" nocabaldep" # needs ghc's version as used by leksah
 inherit haskell-cabal git-2
@@ -21,10 +23,8 @@ IUSE=""
 
 RDEPEND=">=dev-haskell/cabal-1.6.0:=[profile?]
 		<dev-haskell/cabal-1.17:=[profile?]
-		>=dev-haskell/glib-0.10.0:=[profile?]
-		<dev-haskell/glib-0.13:=[profile?]
-		>=dev-haskell/gtk-0.10.0:=[profile?]
-		<dev-haskell/gtk-0.13:=[profile?]
+		>=dev-haskell/glib-0.13.0:${GTK_MAJ_VER}=[profile?]
+		>=dev-haskell/gtk-0.13.0:${GTK_MAJ_VER}=[profile?]
 		>=dev-haskell/mtl-1.1.0.2:=[profile?]
 		<dev-haskell/mtl-2.2:=[profile?]
 		>=dev-haskell/parsec-2.1.0.1:=[profile?]
@@ -42,6 +42,9 @@ src_prepare() {
 		sed -e 's@build-depends: Cabal >=1.6.0 && <1.17@build-depends: Cabal >=1.6.0 \&\& <1.9@g' \
 			-i "${S}/${PN}.cabal"
 	fi
+	cabal_chdeps \
+		'glib >=0.10.0 && <0.13' 'glib >=0.13.0' \
+		'gtk >=0.10.0 && <0.13' 'gtk >=0.13.0'
 }
 
 src_configure() {