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

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

7 files changed, 68 insertions, 23 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/Manifest b/dev-haskell/cairo/Manifest
index a1822e6bef29..75946d533de7 100644
--- a/dev-haskell/cairo/Manifest
+++ b/dev-haskell/cairo/Manifest
@@ -6,16 +6,18 @@ DIST cairo-0.12.0.tar.gz 47495 SHA256 29736aa5a6c7c3f4401c9ad53768a4806dbc0b3278
 DIST cairo-0.12.3.1.tar.gz 50437 SHA256 91bb958e8fcdff9d5496d6e7888359902e7b0c4e8ddfbf0df949856201c5779c SHA512 d77a67840e641d03b26e88db5ddc536fac32c577d42cf208803fb263eed24f23836abb7bdb5c951db2bcbb9932dd37f691edd95d592866667ed5df0fe0919a04 WHIRLPOOL 3c2a43bc9a7d2686cd56cefd1503fab573b9e083c701c353cec225eaa41156363e99b90de62669f875c7b6b37f4103409461e3f926a2dd08736823dc91815a98
 DIST cairo-0.12.3.tar.gz 50412 SHA256 8d6bfa6488b4baa87f6722685b437b755bb739351bf3168ae681e87d4032fe4d SHA512 f2a747ec02045815cef999496ceb62d0620d86490c68ab893d683a5ebf06b25c42c729a0d26283c6e865718649edaf88ee7e40b56c93d4e55f84c62b5787b93b WHIRLPOOL 83ccbeea940cd90d9966b51a6aa2f3a5be6b35bcd4907e1699081bcfdfab51b4160292536f1b29d322c5d66a2904e01b8f36d7626637d82ded9309b46f3415d5
 DIST cairo-0.12.4.tar.gz 50933 SHA256 783943379a6b02e8645dd29960e057bea8d05a7afa12a918d87e54d561b7c63f SHA512 ab5217d6448b8e6234bc3213ea50b114f5ad02cdb5d3e5fd4e5ead0c1a853096aa219785e07e96f9fd7be956ba15c0fc2a5fe3fdbc0d94f86190d6dc7c50205b WHIRLPOOL d40295d4111c23609e9b7f80364390d26137ea4009c561f458a0599388734a0d5ce249a915d67c07c9ce8e1c3d88c41dfb5285ca7437244cc0cf80a4e2f8d259
-EBUILD cairo-0.12.0.ebuild 945 SHA256 da6820031f4d71f0fe91018f758f9e94e163b96c47c40b50425e1601a9165942 SHA512 22df41c3c718d902044650fce65f5a38b54f65ebd9114d6b7533e095386a9aa0e0ac426e49fe4acc17ab2c953479d92cdccc66b6bc8767394ea8cf3ce9486b1b WHIRLPOOL 77c45ce03b655ad02794f00f1b11cf41c916735c605c912b779888c896f6ef2bda3108a769c2df137746601be3bf8ffd98b5249f4b6cc1ac49ecd02182e07a9c
-EBUILD cairo-0.12.3.1.ebuild 915 SHA256 076ac9a71a89b95fbce363721d2af271187b2ca572f39fb24a1a2b5b681281c6 SHA512 bed56f312bb6f46110a221078d9347366be74bb86cd0a92187a1d9939583ca25e794a62f54a5fa21b2fdb7f0c6f6323146ffbb97f4ae3d5683dc980c9514dfbf WHIRLPOOL 1993ed4c77b422b0a4ac0ab48fd5826128867ccc88ac5d690157d9136bc4aad6d714bb93e0edf3ebdc14c84bed117defb79d9575e4d254b9c1a69a52d08807a8
-EBUILD cairo-0.12.3.ebuild 986 SHA256 015846a3620797b0aec5e6a2806a63eee2a5e6b55bfc9a642e2b57afd60801d1 SHA512 25fa1895d031dab601e8a1daacefcfae4fdd1b0ebdec31054973b4bdea20f5cf458e9c3246c496a1c96bf7a17d5d7099f8b6088f6be8d82fdb4e4fcd22b40d12 WHIRLPOOL 0d17b101a90a7b9fae079e8c9c4bba76d3d1758eb8b1fe211017deced2b6fd5942fc17296022856bf3cd11a0f0cbee5b8be3cd86457a052ac9e0c919f70644df
-EBUILD cairo-0.12.4-r1.ebuild 1529 SHA256 388cf08f3cfc994df7f6a59b88f5ec6f5b677ad66be5bd59627dd89430493e16 SHA512 0605bd319c74661124471376c7fe40cbd4c882bdcab2a5c342ee6d7fde3a3431843bf281688bc798c1b51a03a69934dd7d3ba8fc411385a1a2db99706255d510 WHIRLPOOL 4a31b004d4f29471f2b554fef012b43acfc7d36a71fafddd39505f5229318394cc273d5bf34e4d99080c05bab46e05fd7fb825cf234e56780d5576d9517d9f77
-MISC ChangeLog 2633 SHA256 2cfe7976555f7d9dcc93a3ba52b0d9e0ba4220c45babbbc3654fa29497f94891 SHA512 53afb621f4f2858f788c2f547eea36fae275bec283ad4ae977e482c05db2c6b1ea180dd32ac90d6973ae799bb90b8386e14d0ebf201916f44cec5828e40943b8 WHIRLPOOL 02a8c8b8cb12d0c4e9165bf4486b0ad02f49f93cf11fb58688a5d0919121fcc2e5e09189f3ce1f439b67174195e62c86429989ae7b53eb52fe4617524877fe8d
+DIST cairo-0.12.5.0.tar.gz 53247 SHA256 8bbf953775c371d6a2dc0072c68c6804b886fa52eb030d8fa03e1468bf9e17ce SHA512 c7528162cd2f08d7c9169bb66746c3837ff53d1a702152da334d47d047f411a38aa62f61dc6a58ed29e7abaa494ab08b5bb4a0786cb28715c1e5dca9a41e04cc WHIRLPOOL 79e4bf7db023d9f12541109c94a4f4e83f44043ff1b24e27da8973ea8781543bd7588c1215a2e1e4bfbeac667615ac36862a12371131b93431d2511555bd90e4
+EBUILD cairo-0.12.0.ebuild 945 SHA256 10c9f743ad5b60e72a21b16abdef2a00002653224b66789c55db9c257793cd69 SHA512 491d2d9df845f56fdcf478616ab9f16e6127dd3881b4692d806a181fdf2ceb4bbf8cce0064f3d21e83394ba61abe78c3225c6817d5d62955b57c22b27712da44 WHIRLPOOL 557e9f8d5475cafd9ced4f0c6d43c81f3f310f1a1f005c9dacaeb57e66dddba52a48addd504f1673cc65d074cf378c36f279d82e6162b65f1fdb2710aa685920
+EBUILD cairo-0.12.3.1.ebuild 915 SHA256 4f0eda6211068b03b4dca3c85847491dffede343964e64be26dd49aee4f76789 SHA512 4b19135bf89b0af8f8a3e33fbd677925c9a77e7274266c120058a736bc563972a6fbd02c8f2ba834a2fbe8eecbe7a4103e05d99ac96815d83669b669ba86436c WHIRLPOOL 7c0a27a0a7a9e064af4e91852947fef1603b2c4e55a7fab712f70018bb9714e2bfcea2d4ba10d3c1c3631d4a7186362f044e275cccca11e29069d3b7820f7e0d
+EBUILD cairo-0.12.3.ebuild 986 SHA256 16371df87b74a3dfcb1614281a210b938d256dd7782bcefd9df850dc2392ab27 SHA512 aebbf0ee338a0b0249977fcc8cd85fb0ef45911044f6c8025fadc05361551a3a21c09838aee4dbbd93907292bb9d3707a1f792bfdab112e7e510b0795bc22743 WHIRLPOOL 046c6da914d4aeeb3eebb6f7287a8e83b7a7cacb866ad9667b2a7010403f59a5607b88d9cf91c76b8b448a166b60e816887d395d0c3647f279747d6dea760bb7
+EBUILD cairo-0.12.4-r1.ebuild 1478 SHA256 de5bd4765c75d38a7b48995997c8e7e9c21b3dd0ef6cdc0103fb029b44826af7 SHA512 cda2be32e24d375f0c9e4bafb9e33778dd69e5bc007b57bbf1bffdca09544dc797edbfaaa9381d02b80dba665259805eb7551e8f77009808bf1bee51ecd64967 WHIRLPOOL 5bbffc354516a181e8944cbd8e4edb7be3f7929fbd1cedab784d7dc272f725f9286ce69aa831c85a90096b5ff32766f36ed4ee71bce3c92401bbe7c276b4bcc4
+EBUILD cairo-0.12.5.0-r1.ebuild 1046 SHA256 67420b28ce387478d01c2ff8309e946161d40fd7d717ec18024d24153aeac412 SHA512 7b944aacc232bdebb62eaa8186daabdb09c9cd06baff0fbb7815f74ede33559cc1cce00de01173831104d374fe128844efc45df318379893e18ff38f0b2db30c WHIRLPOOL 5d559198308ae6d1a742423991e9aeec38a34c149c3f213a81ac852c5e205a1d6c4b4746fa7601d858ef298f08cfcf7f174bd7cfc44d9da256a2b1116caffb15
+MISC ChangeLog 2932 SHA256 7f748569a5c5db450f564562d2b93cb755262ff3c88d11f010530ad110046560 SHA512 15c9192bdaad4d11871c11b78cd2de37f9521445bc3bf73e544c30602d77e9a265f19cc3527e7facc7f40f73f549572d79c81e70abda86be529633a4c9813754 WHIRLPOOL d67828c4429f2766b165aa179832329fc49d85b7aeed25267b6425892527917f0b38f3491087edfe68b8e989de1ac83b23673ebc4ca340444a6e05d3030b0210
 MISC metadata.xml 445 SHA256 de19bba189f3bf007551683022f9fa146765a1fbf489b38777c931411b547e78 SHA512 ee9f5f9fb0db0f034c36f0257fcf03a3094feb4985855bd3eedf958a273a1fb947646fb377cef17caa5ba9f8a8fde6140f8529b3d01282be61db571d7addeb36 WHIRLPOOL 2057e5295ea7763de875637cf39d77491ddc6ccf2392e14a071d71211efad1c6199780ea887bc4481b79ee009d59e5334ccb7372e62cdfe7ea785702b3889ea4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKjeB0ACgkQCaWpQKGI+9R1YgCfT/s1y3/r2j8r2FCspdAV5PcN
-oSYAn3/jBGLV2vbX/gUHImnePHbJzfBC
-=Rcqx
+iF4EAREIAAYFAlKpT1cACgkQoBEVQmGOlx9BcQD/Z4vDF5JHqDn/TaFyFtuot0Qv
+EnMcwOwkynjtY5iiZ50A/iNzSek2lOT0pnCnpUXDc3diLfnY3rHO5be/Jl2rns5z
+=Nafm
 -----END PGP SIGNATURE-----
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)
+}