Bump cairo to cairo-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, 58 insertions, 15 deletions

diff --git a/dev-haskell/cairo/ChangeLog b/dev-haskell/cairo/ChangeLog
index 70b0181ad370..f088786168c2 100644
--- a/dev-haskell/cairo/ChangeLog
+++ b/dev-haskell/cairo/ChangeLog
@@ -1,6 +1,14 @@
 # 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.19 2013/12/07 19:33:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/ChangeLog,v 1.20 2013/12/12 05:59:00 gienah Exp $
+
+*cairo-0.12.5.0-r1 (12 Dec 2013)
+
+  12 Dec 2013; Mark Wright <gienah@gentoo.org> +cairo-0.12.5.0-r1.ebuild,
+  cairo-0.12.0.ebuild, cairo-0.12.3.1.ebuild, cairo-0.12.3.ebuild,
+  cairo-0.12.4-r1.ebuild:
+  Bump cairo to cairo-0.12.5.0-r1. Move cairo, glib, gio, gtk2hs-buildtools,
+  pango to slot 0.
 
   07 Dec 2013; Pacho Ramos <pacho@gentoo.org> cairo-0.12.4-r1.ebuild:
   x86 stable, bug #488808
diff --git a/dev-haskell/cairo/cairo-0.12.0.ebuild b/dev-haskell/cairo/cairo-0.12.0.ebuild
index 2df82a00021a..29942582c0f6 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-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.5 2013/04/03 05:23:56 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/cairo-0.12.0.ebuild,v 1.6 2013/12/12 05:59:00 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="2"
+SLOT="0"
 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:2"
+		dev-haskell/gtk2hs-buildtools:0"
 
 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 cbadf9647b09..a091272f86ab 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-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.5 2013/04/03 05:23:56 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/cairo-0.12.3.1.ebuild,v 1.6 2013/12/12 05:59:00 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="2"
+SLOT="0"
 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:2"
+		dev-haskell/gtk2hs-buildtools:0"
 
 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 6eadea1f6f29..95ca2b68829b 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-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.5 2013/04/03 05:23:56 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/cairo-0.12.3.ebuild,v 1.6 2013/12/12 05:59:00 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="2"
+SLOT="0"
 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:2"
+		dev-haskell/gtk2hs-buildtools:0"
 
 PATCHES=("${FILESDIR}"/${P}-fixincl.patch)
 
diff --git a/dev-haskell/cairo/cairo-0.12.4-r1.ebuild b/dev-haskell/cairo/cairo-0.12.4-r1.ebuild
index 3a1559d7ba50..c1c0ebd8e7c9 100644
--- a/dev-haskell/cairo/cairo-0.12.4-r1.ebuild
+++ b/dev-haskell/cairo/cairo-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/cairo/cairo-0.12.4-r1.ebuild,v 1.3 2013/12/07 19:33:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/cairo/cairo-0.12.4-r1.ebuild,v 1.4 2013/12/12 05:59:00 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="BSD"
-SLOT="${GTK_MAJ_VER}/${PV}"
+SLOT="0/${PV}"
 KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="+svg"
 
@@ -26,7 +26,7 @@ RDEPEND="dev-haskell/mtl:=[profile?]
 		x11-libs/cairo[svg?]"
 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() {
@@ -34,10 +34,10 @@ 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"
 }
 
 src_configure() {
diff --git a/dev-haskell/cairo/cairo-0.12.5.0-r1.ebuild b/dev-haskell/cairo/cairo-0.12.5.0-r1.ebuild
new file mode 100644
index 000000000000..ae101e7b2179
--- /dev/null
+++ b/dev-haskell/cairo/cairo-0.12.5.0-r1.ebuild
@@ -0,0 +1,35 @@
+# 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.5.0-r1.ebuild,v 1.1 2013/12/12 05:59:00 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour nocabaldep"
+inherit haskell-cabal
+
+DESCRIPTION="Binding to the Cairo library."
+HOMEPAGE="http://projects.haskell.org/gtk2hs/"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+pdf +postscript +svg"
+
+RDEPEND="dev-haskell/mtl:=[profile?]
+	>=dev-haskell/utf8-string-0.2:=[profile?] <dev-haskell/utf8-string-0.4:=[profile?]
+	>=dev-lang/ghc-6.10.4:=
+	x11-libs/cairo[svg?]"
+DEPEND="${RDEPEND}
+	>=dev-haskell/gtk2hs-buildtools-0.12.5.1-r1:0=
+	virtual/pkgconfig
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag pdf cairo_pdf) \
+		$(cabal_flag postscript cairo_ps) \
+		$(cabal_flag svg cairo_svg)
+}