Bump glade to glade-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

6 files changed, 63 insertions, 22 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/Manifest b/dev-haskell/glade/Manifest
index ff0cfad85c61..b3abb51cc1df 100644
--- a/dev-haskell/glade/Manifest
+++ b/dev-haskell/glade/Manifest
@@ -3,15 +3,17 @@ Hash: SHA256
 
 DIST glade-0.12.0.tar.gz 149722 SHA256 b8d2a223c921be8415a2be460e4e4ef0d2f5f86e604f13bec7fd049fee0cf440 SHA512 b18ef6453684cb45d6c1e15a88c2bf93230cd16e5074c1c4737b08979ee66a0101904024cb3d39dadad95248925f327888a734e6f555014126d9dd2ee617ebe0 WHIRLPOOL ed0151b2a75ebc7fa4725e5113efff90d884d51dd037f39f4931b162c0ce0491cec65991e6e83f3292625c7df541752f9e88617a252c902d28aed8be4a8654fd
 DIST glade-0.12.1.tar.gz 153938 SHA256 2025c44fbaada6463a99e3c5b39bdc8c9b846b59fe04194ec5dffd65be6c8f84 SHA512 82ac4a4cff6124eabce0744a5b8cefbae6609c9acb023fdeb0285eb9b7c84bc6b6aa09f43dacf1ba1b35f7a7e7b3f03f213869ee087d926002af5f0992b0a1ce WHIRLPOOL 5a3761fa2670269018115d9fd6abd244fec3196dd5416d80414dc385f976fabf970cfacc288d2a71288698bc379e28dc3916a6303b091e813a2bd8acc2fb9b3f
-EBUILD glade-0.12.0.ebuild 895 SHA256 79c6e7fc77d124d295cce843a4d0425849905d2d51bdc739acad04eac250f454 SHA512 12095f9e3b127a9ae5c09d03d3ff35b66a8232160cd19f29a0277b7115d3ea0784eeb7f2b0f9c0f8ab001da913784ea0e6e79ea20a116f95a32fe899b7e12f1d WHIRLPOOL 037f258d99ad620c4f6afaa54433d9d2e62a700888da3bd49b71d24d2d014f3b52ebd605447e0ffe363baadbf654256b587b91b50b211e7aadabd89555021802
-EBUILD glade-0.12.1-r1.ebuild 1515 SHA256 b1a14eeb4adeed8538e4a48f04003c6017e90394cf4c0f5036d9a7f1df1f85a5 SHA512 05948949f3800db10553e32c08f4857936959c29534b22e175a7671effaf0a15282e01257c40882e515c26d6b5f437275b956e3f096f46ddad976ab18162397d WHIRLPOOL ebfe1fa0e42dca99e988b6fd4a55cd462c65bea4eda73b6b30f151ab74138117e8867f9135ac5fa180840bb66cbb3f5b8c66bdddb221a4d5c0f1d94a7d938a35
-EBUILD glade-0.12.1.ebuild 831 SHA256 8416ce0df220912441ca9ab3061fcd2d35235a528977888d17499da0eeeaaec2 SHA512 3f0cea261a03e74c09a5d95d61c601f0aced62cc1fcb4d1a9fa232af6204b3673c262293d444d8cc14a12bf053020c7fd5f172f81415c9170094c0ae6e27a28b WHIRLPOOL c2a42ffe83b078b85787bd12bffc5466595f45d921a305d8253eb48db4bdbea326e00dc0b305264a5babf66495a8933e2ee5cd82c86ef1d80da07bbd9c445663
-MISC ChangeLog 1530 SHA256 b2cfb6ed06313a2a247f9e32d215e912212af0718e5dc09f11e1421c55e17176 SHA512 80c262ff957f07cc5a8137e86b03044b2e2019ff03ccbd5bacb2afe90decf330fe49d2f4c02aed377a989da551d57bbc27a5a916603d4c623250694e31a78fab WHIRLPOOL 4de877ee841d5d158fd2c9082e684a68e1a0a94fa859510109e6ee87cfc7769bfd4861532141d6244754df6b3359d790833391fbb4283c26a0b4dd660582f0f0
+DIST glade-0.12.5.0.tar.gz 152942 SHA256 79eea09019429ba552b49ae11cf287577937234bd54713aa82ecf3968b3f7435 SHA512 5ea6ac03e919b881b53649c340d23eacc4c7e7055d9425b581c38bbc08192ad65e009b9bf03e9f224cee69ee2301354b2e42f4c7c845349b2b34fcdf8994c865 WHIRLPOOL 0d3e313d7a9f9c079e3a47fb2995dc70163a31fe6ae26d99e9c637e5b9e6512c49d0e27ebd26492117f01cddf3b22b89cea9f837028171da050c1766a1a279da
+EBUILD glade-0.12.0.ebuild 895 SHA256 745885b4135686437ad11e0553c8796d477e742f82bf9d5ea958b46751311003 SHA512 c8a2869692e62740ea9a947c67a6128278fd98a636cf3c73c8c25979775ecd815c1581eec78aa127197259d41063869271a6c969d4d081c8f8c3710d9bd46087 WHIRLPOOL 7fef334fb003b48f36b3ddf94cf2af00aeb39ae5a9ef08027c8fbdbb22424285d3ea5de2c02aeb598a73869781a175a2f356ab0af2a7bdb1fbbcf73a689e3853
+EBUILD glade-0.12.1-r1.ebuild 1451 SHA256 ace85d452cc167b911e969bcc739282ab00d710899904623523010dcc0ec81e3 SHA512 4113ebce959d059afcef39c2a034d890036778c82634bb6a6b163692858f4a9ce04b2387015dace9ba3689ad5478462d2654a33643f9cca2fdddd73d41471d56 WHIRLPOOL 034fe4f8d3ba0b294b968e35119037640f019f61c079402dc6b9007524691b2e104d1cd81fa025d3014f03be206aa5c85e70e0de648f52661582f14bacc543ba
+EBUILD glade-0.12.1.ebuild 831 SHA256 5e9dc9ab93b093ec9806ea31a2481746348e15501c13e4944b1d92b93bdd3600 SHA512 6d7d197b82f240319c5395c78fc8daadf2830dac02a43bcb42b1f7eff5c9ff9aaf57ba092779491ab02b4a49aa3d02bee44395ddddd5950ae56b99abd37b736a WHIRLPOOL 67099bc30859dfba7fe55ab52710d4f4cb6baea0a2d1e4c211cdd8ddf965cd4f30867531676e458f9e22e2f7033037b5a711b33e43ce721ccbebd281b964119c
+EBUILD glade-0.12.5.0-r1.ebuild 1014 SHA256 e1fc7eb54fc76ab368102af4017e4701ce936ace60be3339d3bb9817daef4d80 SHA512 ee6bc95e2f49d682af818fd28a8d8018c08a6b2215c4df68fb46c654ad9bd69093e74b28a3878e8f6305c884a60e29e846e84432bfe5fa2640356b48b7536860 WHIRLPOOL 876d065e42e85075a0f3591b7b5610aa417e83cdb0346be9995e7e383e98d98543ae40eb15cbf0f7d2cabb3ec36f5cda4c3b6670505a1e9b7d65b1a7286578b6
+MISC ChangeLog 1804 SHA256 e5e62059ab6a40d3083d486d256e76d7582c03135a69514019940ebe2de3b859 SHA512 9287059e83657a854fe7dbcfc791b1448d25c4a4359a62852c575e80c2857605be4e1058df251c4e53a4105d39bf5ba55057f4f0b0d4923a8246b953cb2baec9 WHIRLPOOL 3a61fb04d7b68e5673ce8c5ad3ad26c3bbcc21a74d4116fbc26a65c28d7b799ba7950bae4f0f367ed81702dbac7cbf557b809b2533e8ea0543ed753010e58d18
 MISC metadata.xml 574 SHA256 97d9e060c45e3cc6f5e4a47430571a50303b17af205ce974d50be9661126bf16 SHA512 dcedae85048319ecc101770c43f56a9a7322016e405d095e88a3c38339bf4f09c37cbebc23c3b0bc1593846e90851a78849594cdd599d55dd5ba71fd89b22c90 WHIRLPOOL 23ccd3a7a1b9c99716ce4da76983d2774e71ffeddc71e1dc63a597b38404f0167f5cfeba44d60234235b1bfb15bbe5887fe080ef48b24da99d337b326dac4cd8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlKjd9gACgkQCaWpQKGI+9TY6ACeKnS2R3CR1lh7CnRyF3MtfTht
-2TgAmwRNFQY/5gGUcWzS79c16zQMIwKd
-=BHT/
+iF4EAREIAAYFAlKpUVMACgkQoBEVQmGOlx+dMgD/dz/NaOJ/OllH7LxMgAdM7xk4
+gLLXi3YhmZ+f8zcmbX8A/3UazKNPoIeeO5V/54pWYndk4gjJ9vOowmF1L4nADtG/
+=bxMW
 -----END PGP SIGNATURE-----
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
+"