Bump glib to glib-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)

6 files changed, 63 insertions, 12 deletions

diff --git a/dev-haskell/glib/ChangeLog b/dev-haskell/glib/ChangeLog
index e9541bbcf20c..6a1dc11a88e4 100644
--- a/dev-haskell/glib/ChangeLog
+++ b/dev-haskell/glib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-haskell/glib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glib/ChangeLog,v 1.18 2013/12/07 19:32:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glib/ChangeLog,v 1.19 2013/12/12 06:03:43 gienah Exp $
+
+*glib-0.12.5.0-r1 (12 Dec 2013)
+
+  12 Dec 2013; Mark Wright <gienah@gentoo.org> +glib-0.12.5.0-r1.ebuild,
+  glib-0.12.0.ebuild, glib-0.12.3.1.ebuild, glib-0.12.4-r1.ebuild, metadata.xml:
+  Bump glib to glib-0.12.5.0-r1. Move cairo, glib, gio, gtk2hs-buildtools, pango
+  to slot 0.
 
   07 Dec 2013; Pacho Ramos <pacho@gentoo.org> glib-0.12.4-r1.ebuild:
   x86 stable, bug #488808
diff --git a/dev-haskell/glib/glib-0.12.0.ebuild b/dev-haskell/glib/glib-0.12.0.ebuild
index f23a64959a55..7786e96d2499 100644
--- a/dev-haskell/glib/glib-0.12.0.ebuild
+++ b/dev-haskell/glib/glib-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/glib/glib-0.12.0.ebuild,v 1.5 2013/04/03 05:26:58 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glib/glib-0.12.0.ebuild,v 1.6 2013/12/12 06:03:43 gienah Exp $
 
 # ebuild generated by hackport 0.2.13
 
@@ -15,11 +15,11 @@ HOMEPAGE="http://www.haskell.org/gtk2hs/"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-SLOT="2"
+SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.1
 		dev-libs/glib:2"
 DEPEND="${RDEPEND}
-		dev-haskell/gtk2hs-buildtools:2"
+		dev-haskell/gtk2hs-buildtools:0"
diff --git a/dev-haskell/glib/glib-0.12.3.1.ebuild b/dev-haskell/glib/glib-0.12.3.1.ebuild
index 00ce0d9969a1..b5946c6aef70 100644
--- a/dev-haskell/glib/glib-0.12.3.1.ebuild
+++ b/dev-haskell/glib/glib-0.12.3.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/glib/glib-0.12.3.1.ebuild,v 1.6 2013/04/03 05:26:58 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glib/glib-0.12.3.1.ebuild,v 1.7 2013/12/12 06:03:43 gienah Exp $
 
 EAPI=4
 
@@ -13,14 +13,14 @@ HOMEPAGE="http://projects.haskell.org/gtk2hs/"
 SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-SLOT="2"
+SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/ghc-6.10.1
 		dev-libs/glib:2"
 DEPEND="${RDEPEND}
-		dev-haskell/gtk2hs-buildtools:2"
+		dev-haskell/gtk2hs-buildtools:0"
 
 src_prepare() {
 	# c2hs ignores #if __GLASGOW_HASKELL__ >= 706
diff --git a/dev-haskell/glib/glib-0.12.4-r1.ebuild b/dev-haskell/glib/glib-0.12.4-r1.ebuild
index 0b4816434811..05c5b34c6f32 100644
--- a/dev-haskell/glib/glib-0.12.4-r1.ebuild
+++ b/dev-haskell/glib/glib-0.12.4-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/glib/glib-0.12.4-r1.ebuild,v 1.3 2013/12/07 19:32:12 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glib/glib-0.12.4-r1.ebuild,v 1.4 2013/12/12 06:03:43 gienah Exp $
 
 EAPI=5
 
@@ -17,7 +17,7 @@ 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="0/${PV}"
 KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
@@ -25,7 +25,7 @@ RDEPEND=">=dev-lang/ghc-6.10.4:=
 		dev-libs/glib:2"
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.8
-		>=dev-haskell/gtk2hs-buildtools-0.12.4:${GTK_MAJ_VER}=
+		>=dev-haskell/gtk2hs-buildtools-0.12.4:0=
 		virtual/pkgconfig"
 
 src_prepare() {
@@ -33,8 +33,8 @@ src_prepare() {
 		-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}"
+		|| die "Could not change Gtk2HsSetup.hs for GTK+ slot 0"
 	sed -e "s@gtk2hsC2hs@gtk2hsC2hs${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/glib/glib-0.12.5.0-r1.ebuild b/dev-haskell/glib/glib-0.12.5.0-r1.ebuild
new file mode 100644
index 000000000000..fef5298c7c49
--- /dev/null
+++ b/dev-haskell/glib/glib-0.12.5.0-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glib/glib-0.12.5.0-r1.ebuild,v 1.1 2013/12/12 06:03:43 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.5.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 GLIB library for Gtk2Hs."
+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="+closure_signals"
+
+RDEPEND=">=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?]
+	>=dev-lang/ghc-6.10.4:=
+	dev-libs/glib:2
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/gtk2hs-buildtools-0.12.5.1-r1:0=
+	virtual/pkgconfig
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag closure_signals closure_signals)
+}
diff --git a/dev-haskell/glib/metadata.xml b/dev-haskell/glib/metadata.xml
index 2f5607ea9893..d121939ec190 100644
--- a/dev-haskell/glib/metadata.xml
+++ b/dev-haskell/glib/metadata.xml
@@ -5,4 +5,14 @@
 	<maintainer>
 		<email>haskell@gentoo.org</email>
 	</maintainer>
+	<longdescription>
+		The GNU Library is a collection of C data structures and utility
+		function for dealing with Unicode. This package only binds as
+		much functionality as required to support the packages that
+		wrap libraries that are themselves based on GLib.
+	</longdescription>
+	<use>
+		<flag name='closure_signals'>Use the the GClosure-based signals
+        	implementation.</flag>
+        </use>
 </pkgmetadata>