Loosen glib and gtk deps in glade-0.12.5.0-r2

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

3 files changed, 45 insertions, 31 deletions

diff --git a/dev-haskell/glade/ChangeLog b/dev-haskell/glade/ChangeLog
index 1334085a1281..810761b08120 100644
--- a/dev-haskell/glade/ChangeLog
+++ b/dev-haskell/glade/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/glade
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glade/ChangeLog,v 1.14 2014/07/25 09:16:23 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glade/ChangeLog,v 1.15 2014/12/14 05:16:04 gienah Exp $
+
+*glade-0.12.5.0-r2 (14 Dec 2014)
+
+  14 Dec 2014; Mark Wright <gienah@gentoo.org> +glade-0.12.5.0-r2.ebuild,
+  -glade-0.12.0.ebuild:
+  Loosen glib and gtk deps in glade-0.12.5.0-r2
 
   25 Jul 2014; Sergei Trofimovich <slyfox@gentoo.org> glade-0.12.0.ebuild,
   glade-0.12.1-r1.ebuild, glade-0.12.1.ebuild, glade-0.12.5.0-r1.ebuild:
diff --git a/dev-haskell/glade/glade-0.12.0.ebuild b/dev-haskell/glade/glade-0.12.0.ebuild
deleted file mode 100644
index 0400e82fe37c..000000000000
--- a/dev-haskell/glade/glade-0.12.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 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.7 2014/07/25 09:16:23 slyfox Exp $
-
-# ebuild generated by hackport 0.2.13
-
-EAPI="3"
-
-#nocabaldep is for the fancy cabal-detection feature at build-time
-CABAL_FEATURES="lib profile haddock hscolour nocabaldep"
-inherit haskell-cabal
-
-DESCRIPTION="Haskell bindings to the gnome-base/libglade library"
-HOMEPAGE="http://www.haskell.org/gtk2hs/"
-SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="=dev-haskell/cairo-0.12*:0
-		=dev-haskell/glib-0.12*:0
-		=dev-haskell/gtk-0.12*:2
-		dev-haskell/mtl
-		=dev-haskell/pango-0.12*:0
-		>=dev-lang/ghc-6.10.1
-		gnome-base/libglade:2.0"
-DEPEND="${RDEPEND}
-		dev-haskell/gtk2hs-buildtools:0"
diff --git a/dev-haskell/glade/glade-0.12.5.0-r2.ebuild b/dev-haskell/glade/glade-0.12.5.0-r2.ebuild
new file mode 100644
index 000000000000..dd2b17eff72d
--- /dev/null
+++ b/dev-haskell/glade/glade-0.12.5.0-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glade/glade-0.12.5.0-r2.ebuild,v 1.1 2014/12/14 05:16:04 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.5.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.5.0:0=[profile?] <dev-haskell/glib-0.14:0=[profile?]
+	>=dev-haskell/gtk-0.12.5.0:${GTK_MAJ_VER}=[profile?] <dev-haskell/gtk-0.14:${GTK_MAJ_VER}=[profile?]
+	>=dev-lang/ghc-6.10.4:=
+	gnome-base/libglade:2.0
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/gtk2hs-buildtools-0.12.5.1-r1:0=
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	cabal_chdeps \
+		'glib >= 0.12.5.0 && < 0.13' 'glib >= 0.12.5.0 && < 0.14' \
+		'gtk >= 0.12.5.0 && < 0.13' 'gtk >= 0.12.5.0 && < 0.14'
+}