Bump glade to glade-0.12.5.0-r1. Move cairo, glib, gio, gtk2hs-buildtools, pango to slot 0.

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

5 files changed, 54 insertions, 15 deletions

diff --git a/dev-haskell/glade/ChangeLog b/dev-haskell/glade/ChangeLog
index ce3f60a8589f..f4d4973f9889 100644
--- a/dev-haskell/glade/ChangeLog
+++ b/dev-haskell/glade/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-haskell/glade
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glade/ChangeLog,v 1.10 2013/12/07 19:32:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glade/ChangeLog,v 1.11 2013/12/12 06:07:28 gienah Exp $
+
+*glade-0.12.5.0-r1 (12 Dec 2013)
+
+  12 Dec 2013; Mark Wright <gienah@gentoo.org> +glade-0.12.5.0-r1.ebuild,
+  glade-0.12.0.ebuild, glade-0.12.1-r1.ebuild, glade-0.12.1.ebuild:
+  Bump glade to glade-0.12.5.0-r1. Move cairo, glib, gio, gtk2hs-buildtools,
+  pango to slot 0.
 
   07 Dec 2013; Pacho Ramos <pacho@gentoo.org> glade-0.12.1-r1.ebuild:
   x86 stable, bug #488808
diff --git a/dev-haskell/glade/glade-0.12.0.ebuild b/dev-haskell/glade/glade-0.12.0.ebuild
index d1c7866475ce..0199753bf183 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-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.5 2013/04/03 05:26:31 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glade/glade-0.12.0.ebuild,v 1.6 2013/12/12 06:07:28 gienah Exp $
 
 # ebuild generated by hackport 0.2.13
 
@@ -19,12 +19,12 @@ SLOT="2"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND="=dev-haskell/cairo-0.12*:2
-		=dev-haskell/glib-0.12*:2
+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*:2
+		=dev-haskell/pango-0.12*:0
 		>=dev-lang/ghc-6.10.1
 		gnome-base/libglade:2.0"
 DEPEND="${RDEPEND}
-		dev-haskell/gtk2hs-buildtools:2"
+		dev-haskell/gtk2hs-buildtools:0"
diff --git a/dev-haskell/glade/glade-0.12.1-r1.ebuild b/dev-haskell/glade/glade-0.12.1-r1.ebuild
index e189c843178c..809f74af1dcf 100644
--- a/dev-haskell/glade/glade-0.12.1-r1.ebuild
+++ b/dev-haskell/glade/glade-0.12.1-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.3 2013/12/07 19:32:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glade/glade-0.12.1-r1.ebuild,v 1.4 2013/12/12 06:07:28 gienah Exp $
 
 EAPI=5
 
@@ -17,16 +17,16 @@ 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}"
+SLOT="2/${PV}"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND="=dev-haskell/glib-0.12*:${GTK_MAJ_VER}=[profile?]
+RDEPEND="=dev-haskell/glib-0.12*:0=[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}
+		dev-haskell/gtk2hs-buildtools:0
 		virtual/pkgconfig"
 
 src_prepare() {
@@ -35,10 +35,10 @@ src_prepare() {
 		-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}"
+		|| die "Could not change Gtk2HsSetup.hs for GTK+ slot 0"
 	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}"
+		|| die "Could not change ${PN}.cabal for GTK+ slot 0"
 }
diff --git a/dev-haskell/glade/glade-0.12.1.ebuild b/dev-haskell/glade/glade-0.12.1.ebuild
index 92ca4a63f881..d8b5bcfc6a6a 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-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.5 2013/04/03 05:26:31 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glade/glade-0.12.1.ebuild,v 1.6 2013/12/12 06:07:28 gienah Exp $
 
 # ebuild generated by hackport 0.2.17.9999
 
@@ -19,9 +19,9 @@ SLOT="2"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-RDEPEND="=dev-haskell/glib-0.12*:2[profile?]
+RDEPEND="=dev-haskell/glib-0.12*:0[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:2"
+		dev-haskell/gtk2hs-buildtools:0"
diff --git a/dev-haskell/glade/glade-0.12.5.0-r1.ebuild b/dev-haskell/glade/glade-0.12.5.0-r1.ebuild
new file mode 100644
index 000000000000..d25a78cf4614
--- /dev/null
+++ b/dev-haskell/glade/glade-0.12.5.0-r1.ebuild
@@ -0,0 +1,32 @@
+# 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.5.0-r1.ebuild,v 1.1 2013/12/12 06:07:28 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.13:0=[profile?]
+	>=dev-haskell/gtk-0.12.5.0:${GTK_MAJ_VER}=[profile?] <dev-haskell/gtk-0.13:${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
+"