Restrict the deps in bustle to select gtk+2 in slot 2 fix bug 464260.

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

9 files changed, 297 insertions, 27 deletions

diff --git a/dev-util/bustle/ChangeLog b/dev-util/bustle/ChangeLog
index f90220c26274..2b8f5feb10bb 100644
--- a/dev-util/bustle/ChangeLog
+++ b/dev-util/bustle/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-util/bustle
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bustle/ChangeLog,v 1.16 2013/01/06 09:31:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bustle/ChangeLog,v 1.17 2013/04/03 05:23:10 gienah Exp $
+
+*bustle-0.4.2-r1 (03 Apr 2013)
+
+  03 Apr 2013; Mark Wright <gienah@gentoo.org> +bustle-0.4.2-r1.ebuild,
+  +files/bustle-0.2.3-restrict-gtk2hs-deps-to-gtkplus2.patch,
+  +files/bustle-0.4.0-restrict-gtk2hs-deps-to-gtkplus2.patch,
+  +files/bustle-0.4.2-restrict-gtk2hs-deps-to-gtkplus2.patch,
+  bustle-0.2.3.ebuild, bustle-0.4.0.ebuild, bustle-0.4.2.ebuild:
+  Restrict the deps in bustle to select gtk+2 in slot 2 fix bug 464260.
 
   06 Jan 2013; Agostino Sarubbo <ago@gentoo.org> bustle-0.4.2.ebuild:
   Add ~sparc, wrt bug #449220
diff --git a/dev-util/bustle/Manifest b/dev-util/bustle/Manifest
index c03711d97de8..6caf13d2d0d6 100644
--- a/dev-util/bustle/Manifest
+++ b/dev-util/bustle/Manifest
@@ -1,12 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 0001-bustle-dbus-monitor-fix-linking-order-libs-go-after-.patch 1853 SHA256 6e03a65a4aaef85b28db2fcd0ea54d5f5bf926ad25b9e6193239ef8b7060faac SHA512 9a8956f448aeb0c84b7f1ec3933fa0c7830bb54d8fddce653feff88e27542a3b8af11bc90e3098c6a9ee8befc93c6b1b37ba81d2d276a0666a912cc9539d9175 WHIRLPOOL 2ca1170e79d766ee9e16ddf939658c9c1723a64d2188b891ad9529a58fe4b0f2646cb930739a2d99a7278fc2b7832c1fa90f4f40849429e89dcb3db7c79cb50b
 AUX bustle-0.2.3-ghc-7.4.patch 3171 SHA256 627a4c13c5b349be62af818626dc1e34e59d1cb5df0df62f2d3566d1cb2186f4 SHA512 8983a40d5c2d03c44ed95ea0796f62e8acce8dd13406e310bbe4b91e7d9723d4a6a3aa969499ba7fc8af26affe4971d9f8a06b4df0c083e8d00b88abb045c0f5 WHIRLPOOL e0fe9185bc9e8b977ac7902c848a1594d08ec96626af8ea0a0af0d03d14914637f3f933d29a0c2f429daf1f5c526674a971b1a7cb0563c1d66c02e7cdddc027a
+AUX bustle-0.2.3-restrict-gtk2hs-deps-to-gtkplus2.patch 2003 SHA256 192f5ec3718b8a550be404316350ab82a0a3a8b56d3b602d339214d7a70a6dbd SHA512 f4b7ecbf9992792666b20bd6421aabddd8ce2d2cb0f6301044bf522ba1a6879ca6106616025baa17f71370661c8d2fca765704478911c8b00308caaf9421f8a0 WHIRLPOOL 8aaf0f8247919c2bff7e4fab9043de422e06b47490120d0c4019acbbe41218ebb854fd6343eb34b1a8541a62c590ac515ba21ddecc1defe691a2a157baf48bfa
 AUX bustle-0.4.0-ghc-7.4.patch 1343 SHA256 658e19353f171a27fdd7aba37cdf14899da9c1fcf6e9a4eda15452f468661071 SHA512 f78b0042375241c948fb8389db956f93ca33188ba5fb2b40e10505caa023a97028b372d9f89d83290f86efde65fb0ed894d7cdc7e11032b128dd6a0b88e358c6 WHIRLPOOL 1ac0ef7060a5d24cfdc188ebc0447d70a3e91d5c4d8a5c12ced423652da0435fb5b1ebc135e4481cf1998207dcdf5f75f24848222c4dde4a6bdca24d2338a265
+AUX bustle-0.4.0-restrict-gtk2hs-deps-to-gtkplus2.patch 2341 SHA256 c8eefa55f67dd26cbd181abc1f7290c52b5aa0ea946c5fe145e4acfceaaeb9cb SHA512 607d2eb9fb2dfff04cf13d33bb89f9410aa5c1086484c0723b6ed6a798bcc482b2a58af0c1603dbd699d65c0995d8675ea961b3244183122f185d1dd16f3c999 WHIRLPOOL 9bc49665897dbae7348460f49a84bf5529c7df7d97471c02a33beca22601f52251768537ce4a139a4c9a229d8b3d279b1daf721aa71131c6fa71cfe7bf7efe4e
+AUX bustle-0.4.2-restrict-gtk2hs-deps-to-gtkplus2.patch 1780 SHA256 2ab67f33ffa069c15214f6c08918a2caacefbc0c4a920660340c4837dd32e641 SHA512 b5765864998fb4a65632657630faf499a7ece40e51c396e0055c574f524fef998f226f2bfca00b15b26ee20066ff4fef6627e6d0a94ff3cc9a5bb1b43b493588 WHIRLPOOL 2075edc5fd7f0b43b86bf1c71b9cc23fff136c888f169f4710715dd0cbba41bcf613f44f094c3a2fb633554b4401f79a7914dd937cdf750da5e925f635ec8551
 DIST bustle-0.2.3.tar.gz 39314 SHA256 2a2d0633d6a0714c845715f6aa4392b08d1d241187f22b27122bb1bfcbf6d23a SHA512 ef45b13e10d934da1dad68e61a8ff99a4f45c79c5ad362134546ecf5533703e93453a9357a40f9cc5a26d3a8873f09dc8e1d8053f8403c535ae8227bf2e4bbcd WHIRLPOOL 53bfec22bf71d8a1ad7b56a6c4e05a3ba2ed9b92d68feab1355e5f8fb393749523ed45b9516978073f455250aade62582a41a0eee1e5634e45d88cbb7483fa5e
 DIST bustle-0.4.0-tests.tar.gz 8340 SHA256 7e4c354479edc835457fdecc89ab7fc5e1087ab4637b7b1ac6fadfe860190fbe SHA512 c7685496f3a84c1615752ae9aad22202bfe703147441581abe599a5e5055cdef54f27b4e0d01603b23a83a4b42b0595b5538c5b4d65a522a9e76b8d187ae54b1 WHIRLPOOL 6591ed10c75ef044375bf5e80719aac4a40244f647c4045f45811c9e8736afaafa5b83b92803ef8912c2ecfe9672ac20734fc954ab2bb09cff2842c1e6b4fe5a
 DIST bustle-0.4.0.tar.gz 89873 SHA256 a48acd215f918381b96d6a7fc60528d6f30a982bfc529c329f890485680d2549 SHA512 5a8078976bb85b9f3674a7d8914729710e69c5db7779e012659bab4064d1f170508f7b8e45575d5b40abd48b4054e6e06d89b450320c69d22a841ba54bceb200 WHIRLPOOL a55946ffa82275a9aa556f88b4112be153ab8fa3407565f3849253a5d6ccf863f1262313fe3b356806f5b552c23a14595ce296a69cd1a30af6aafce6054c3321
 DIST bustle-0.4.2.tar.gz 95707 SHA256 bf03fb0a14a2559b6abe4cfeb673b30d86a31a89fb45883d7594644afc434cee SHA512 8a6c1860cb655fc9bd7d42d130d87416c74b988b81749ec8cc1c25cacd3dd4516f59f5cb5954b473c3f6ac32b11853e9bc8881708962144067a0325845dd8562 WHIRLPOOL ebc31713bb202f247a38ed04357598ba9951f72a3fa18b679d83a3ce088dd8a144d7ee5a772ce02715dd735907ba2219541e971d5b1f3a16eb21d22ab1600753
-EBUILD bustle-0.2.3.ebuild 1387 SHA256 76ee5661aaa7cb6971f7495a1422b63d4087298a7dd9af191ea99874bc67513d SHA512 c6e602c6d3e91682f3657d764aa1b6216b99fe585d178a01e3b1f0f856c3dea39bc07f54903fae8a0d48f07ea35900a007c96b98ed0c73bb87de313cef8eb651 WHIRLPOOL 32be1bc01667631ada8a740f604e56b0728aae5d6c9dd8808fada9ee1c71a1fa39568a0e9bab326e31925c061e96e5de59bf609f0593cf42961f40750df4074a
-EBUILD bustle-0.4.0.ebuild 1753 SHA256 8219a46a9e9f0f8d1b28046d336b4935d5492858b86ecc2b9919fd8be1817bfd SHA512 427eb60e3c24d4e3759115d10222e3f76a59701250d5a47c94efe71d82d13ddb7aa24c35b15e017a7f65f6c3ef473ad5666dd9054e308c2e295879b52af7c430 WHIRLPOOL a539a32eab3344d82ff402760596d06ff5d96df6dfefd02bfcdffc968314cea86218765be36ea863a94ab585c63f4c2cfe46ebdc774ca3a5a35501440fddf4fd
-EBUILD bustle-0.4.2.ebuild 1592 SHA256 4160e4dc41bb7d58ffd50965d860db4173f1ba3820dfa2e5e18fd8b02556ebc4 SHA512 dbfaf327bc3a0ddd2bafcc15bcccd620e4bb36675f278620f99e35b2a343dc5703c6e59c90351481b6a0ee81c41f643cb03591bb429b11e5d66b08d12440cd55 WHIRLPOOL 4b9b3c6027146d2b82c4162bfbcc531f994934af72999e7edf2f56e95b6f04cf912ca324c1dfa99bfd0bd9a585d05dd8998ba74ab077535be18e40623a6ef4e7
-MISC ChangeLog 2586 SHA256 16cc0d0181ea88f088966aed4481051cc1e453b76161bb9e36c931b64c6e2dce SHA512 d4ece316734c66524a2bc7e4de3848e5d98a98d63e1f7a0fc4a093c38f06bfad82557f90e6b7229ae96ecdacbf7605edec26b4c0f3542d1cf4f2f6cd4cda6884 WHIRLPOOL a73a42d7aec6ac5dd5a1719d85c3a88e98f726aa7df6493da3adb4bd415fadd312bf04a22d987568ec880c8f25f4f2321abf02a01a1129296eba4bee53eecafc
+EBUILD bustle-0.2.3.ebuild 1456 SHA256 84add26dc74e71271d44f752394f717557db2d367c92c53b5d051fcac9f65edd SHA512 eedea6ef967b6ac288692d35d63aff8040bc5245a725acef2931a6c9e13576f97e38dfd47007a8d7a16127c5494a5f13b7c17a7b8288a677865fec234659a107 WHIRLPOOL 7438a80a1008fb7cc4047fe9effed6cc3cdc18d84908fd5dc1b969ba262db5e12389d7386da1d98cda68f0b1d7c9078ee42453f0a5fee9e1f78745d9b776b9ca
+EBUILD bustle-0.4.0.ebuild 1822 SHA256 b21e89455c19ef28d5ca6b4548b7377f27d4a12689323ac3a19f793de5d44b56 SHA512 b435b547641310bf0a32b348a8bc38f72199c7b3c46e68031e11d30b31cd74db571bbfccc88efee45ff3481b630781b5dfe49394f55a581b945fceb50e6108df WHIRLPOOL 36236eb650c87f20d561cf4e1410700f990ed095dd3f5ecaa0afde7cff7e84e9b0d20e280d985ef496fe32b585d77186c7c2d29bcad75c00ee3e4e5518f64a7d
+EBUILD bustle-0.4.2-r1.ebuild 1680 SHA256 10ac3f5f848b7f7c22c70bb3ac19238954c9d029f850a025edef12f11c691320 SHA512 c61a798d6c3efeeea1c67ef44225784343b0e8e1e4356a0d0a0148b72a131d8a873a06a23a689b57d164ba78fdc586ff8c06ee90a5245ad562e5bd2c6986651f WHIRLPOOL c19c50f709d2e33ae20b65ceaf6c6e9d5ff20a5f173ac35923e1dde248adc9953a8f09c9945690d0cd4c28f149f5784e57311de52f7f5403ebd857b4dd8a964b
+EBUILD bustle-0.4.2.ebuild 1677 SHA256 70ade6999a617aca5c7d9ddc72ec8240067059b421b5bb284b82a7e197a566e6 SHA512 36b9d23b2a1e14f0c36032b17717d6aa3fa16ad3b8b2028c774a9707fa42ba1f2f129c411ea3a7a819cb0bef44e41283751625974ae667bac7e0886de3809f05 WHIRLPOOL 27e9dc296e4715ca70f97b6e6eab2df0ced63d91d9974040a4041b70a6ba91b4c06c55f98c1ce5c1a970e3823aa0fc4720b9285c17f869db36b0b97801821b6c
+MISC ChangeLog 3017 SHA256 0c18e7cee29a5769699ed7101f0385d0e739080e5a18051ac29752935eb68811 SHA512 1d0f5acdccee87d9b9783fe36e3bae09701d5d14449132f7f6b890d0894681e82c2cdf309794dee9a5b3aaff6f340fa3ac19499d7c54f29384c2286b620008d2 WHIRLPOOL fd20058ec5001ac186b00d3619b1a85646c4b1c1129984ecdb11b77cc028c5a8961db3dd36f9fdf346a619eccbfc2075a9e08fe9a0f018c9fa7efd57380ea419
 MISC metadata.xml 314 SHA256 2a36dc7de9fdc3b983bc20185c7091d00937b33fc4b71b4e86d4c5def6eebadc SHA512 cd6c3a7d1ba97797fab5cf6dd797c1f5317c17cd878873b941a3e0ebf9ccca056b4c440d940fb011bb62b4002911df5bbd7ff7cb74a02cddd0fc6c38bb3b0276 WHIRLPOOL f229b7f8afe393103347463fc7332a49db6212e04e49ab446fb5e90b85fb68e9ef2c91b8b2e62d807eedbeb317f6e8a7f5ee51f9454c2e212b1d0a9a0d2d3a0f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlFbvJwACgkQoBEVQmGOlx+EBgEAi38jTaoC7hYdViXOGeL9BD6r
+R1Ezi57aeT25r97XTQIBAMIumqZilBE3+vYn1YgcfhEQG5z6fxCQOuQbRwiBMRX2
+=mUi/
+-----END PGP SIGNATURE-----
diff --git a/dev-util/bustle/bustle-0.2.3.ebuild b/dev-util/bustle/bustle-0.2.3.ebuild
index 3ae6e882cd52..bf0ea3fb1f60 100644
--- a/dev-util/bustle/bustle-0.2.3.ebuild
+++ b/dev-util/bustle/bustle-0.2.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bustle/bustle-0.2.3.ebuild,v 1.5 2012/07/28 14:02:24 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bustle/bustle-0.2.3.ebuild,v 1.6 2013/04/03 05:23:10 gienah Exp $
 
 # ebuild generated by hackport 0.2.13
 
@@ -19,7 +19,8 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 PATCHES=("${FILESDIR}/0001-bustle-dbus-monitor-fix-linking-order-libs-go-after-.patch"
-	"${FILESDIR}"/${P}-ghc-7.4.patch)
+	"${FILESDIR}"/${P}-ghc-7.4.patch
+	"${FILESDIR}"/${P}-restrict-gtk2hs-deps-to-gtkplus2.patch)
 
 RDEPEND="sys-apps/dbus
 		x11-libs/cairo
@@ -27,12 +28,12 @@ RDEPEND="sys-apps/dbus
 		gnome-base/libglade:2.0"
 DEPEND="${RDEPEND}
 		>=dev-haskell/cabal-1.8
-		dev-haskell/cairo
-		dev-haskell/glade
-		dev-haskell/glib
-		>dev-haskell/gtk-0.11
+		dev-haskell/cairo:2
+		dev-haskell/glade:2
+		dev-haskell/glib:2
+		>dev-haskell/gtk-0.11:2
 		dev-haskell/mtl
-		dev-haskell/pango
+		dev-haskell/pango:2
 		dev-haskell/parsec
 		>=dev-lang/ghc-6.10.1"
 
diff --git a/dev-util/bustle/bustle-0.4.0.ebuild b/dev-util/bustle/bustle-0.4.0.ebuild
index b6ddd04635c1..109ab99f6515 100644
--- a/dev-util/bustle/bustle-0.4.0.ebuild
+++ b/dev-util/bustle/bustle-0.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bustle/bustle-0.4.0.ebuild,v 1.4 2012/03/10 16:04:21 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bustle/bustle-0.4.0.ebuild,v 1.5 2013/04/03 05:23:10 gienah Exp $
 
 # ebuild generated by hackport 0.2.14
 
@@ -26,13 +26,13 @@ RDEPEND="net-libs/libpcap
 DEPEND="${RDEPEND}
 		dev-haskell/binary
 		>=dev-haskell/cabal-1.8
-		dev-haskell/cairo
+		dev-haskell/cairo:2
 		=dev-haskell/dbus-core-0.9*
-		dev-haskell/glade
-		dev-haskell/glib
-		>dev-haskell/gtk-0.11
+		dev-haskell/glade:2
+		dev-haskell/glib:2
+		>dev-haskell/gtk-0.11:2
 		dev-haskell/mtl
-		dev-haskell/pango
+		dev-haskell/pango:2
 		dev-haskell/parsec
 		dev-haskell/pcap
 		dev-haskell/text
@@ -46,7 +46,8 @@ DEPEND="${RDEPEND}
 		)
 "
 
-PATCHES=("${FILESDIR}"/${P}-ghc-7.4.patch)
+PATCHES=("${FILESDIR}"/${P}-ghc-7.4.patch
+	"${FILESDIR}"/${P}-restrict-gtk2hs-deps-to-gtkplus2.patch)
 
 src_configure() {
 	cabal_src_configure $(use test && use_enable test tests) #395351
diff --git a/dev-util/bustle/bustle-0.4.2-r1.ebuild b/dev-util/bustle/bustle-0.4.2-r1.ebuild
new file mode 100644
index 000000000000..2f075744d0c8
--- /dev/null
+++ b/dev-util/bustle/bustle-0.4.2-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bustle/bustle-0.4.2-r1.ebuild,v 1.1 2013/04/03 05:23:10 gienah Exp $
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.9999
+
+CABAL_FEATURES="bin test-suite"
+inherit base haskell-cabal
+
+DESCRIPTION="Draw pretty sequence diagrams of D-Bus traffic"
+HOMEPAGE="http://willthompson.co.uk/bustle/"
+SRC_URI="http://willthompson.co.uk/${PN}/releases/${PV}/${P}.tar.gz http://dev.gentoo.org/~slyfox/bustle-0.4.0-tests.tar.gz"
+
+LICENSE="LGPL-2 GPL-2" # bustle-dbus-monitor.c is GPL-2, rest is LGPL-2
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="dev-libs/glib:2
+		net-libs/libpcap
+		sys-apps/dbus
+		x11-libs/cairo
+		x11-libs/pango
+		gnome-base/libglade:2.0"
+DEPEND="${RDEPEND}
+		test? ( dev-haskell/hunit
+			dev-haskell/quickcheck
+			dev-haskell/test-framework
+			dev-haskell/test-framework-hunit
+		)
+		>=dev-haskell/cabal-1.8
+		dev-haskell/cairo:2
+		>=dev-haskell/dbus-0.10
+		dev-haskell/glib:2
+		>=dev-haskell/gtk-0.12.3:2
+		dev-haskell/mtl
+		dev-haskell/pango:2
+		dev-haskell/parsec
+		dev-haskell/pcap
+		dev-haskell/text
+		>=dev-lang/ghc-6.10.4"
+
+PATCHES=("${FILESDIR}"/${P}-restrict-gtk2hs-deps-to-gtkplus2.patch)
+
+src_compile() {
+	# compile haskell part
+	cabal_src_compile || die "could not build haskell parts"
+
+	# compile C part
+	emake \
+		"CC=$(tc-getCC)" \
+		"CFLAGS=${CFLAGS}" \
+		"CPPFLAGS=${CPPFLAGS}" \
+		"LDFLAGS=${LDFLAGS}"
+}
+
+src_install() {
+	# install haskell part
+	cabal_src_install || die "could not install haskell parts"
+
+	dobin "${S}"/dist/build/bustle-pcap
+
+	dodoc README HACKING NEWS
+}
diff --git a/dev-util/bustle/bustle-0.4.2.ebuild b/dev-util/bustle/bustle-0.4.2.ebuild
index c105f9e6234d..bafe353ebdd9 100644
--- a/dev-util/bustle/bustle-0.4.2.ebuild
+++ b/dev-util/bustle/bustle-0.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bustle/bustle-0.4.2.ebuild,v 1.7 2013/01/06 09:31:27 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bustle/bustle-0.4.2.ebuild,v 1.8 2013/04/03 05:23:10 gienah Exp $
 
 EAPI=5
 
 # ebuild generated by hackport 0.3.9999
 
 CABAL_FEATURES="bin test-suite"
-inherit haskell-cabal
+inherit base haskell-cabal
 
 DESCRIPTION="Draw pretty sequence diagrams of D-Bus traffic"
 HOMEPAGE="http://willthompson.co.uk/bustle/"
@@ -31,17 +31,19 @@ DEPEND="${RDEPEND}
 			dev-haskell/test-framework-hunit
 		)
 		>=dev-haskell/cabal-1.8
-		dev-haskell/cairo
+		dev-haskell/cairo:2
 		>=dev-haskell/dbus-0.10
-		dev-haskell/glib
-		>=dev-haskell/gtk-0.12.3
+		dev-haskell/glib:2
+		>=dev-haskell/gtk-0.12.3:2
 		dev-haskell/mtl
-		dev-haskell/pango
+		dev-haskell/pango:2
 		dev-haskell/parsec
 		dev-haskell/pcap
 		dev-haskell/text
 		>=dev-lang/ghc-6.10.4"
 
+PATCHES=("${FILESDIR}"/${P}-restrict-gtk2hs-deps-to-gtkplus2.patch)
+
 src_compile() {
 	# compile haskell part
 	cabal_src_compile || die "could not build haskell parts"
diff --git a/dev-util/bustle/files/bustle-0.2.3-restrict-gtk2hs-deps-to-gtkplus2.patch b/dev-util/bustle/files/bustle-0.2.3-restrict-gtk2hs-deps-to-gtkplus2.patch
new file mode 100644
index 000000000000..18091352ab5a
--- /dev/null
+++ b/dev-util/bustle/files/bustle-0.2.3-restrict-gtk2hs-deps-to-gtkplus2.patch
@@ -0,0 +1,40 @@
+--- bustle-0.2.3-orig/bustle.cabal	2013-04-03 15:15:36.278582601 +1100
++++ bustle-0.2.3/bustle.cabal	2013-04-03 15:21:14.334592030 +1100
+@@ -27,30 +27,30 @@
+   if flag(PostCabalizedGtk2HS)
+     -- Since gtk2hs 0.11, pango is a separate package, and its module names
+     -- have changed.
+-    Build-Depends:  mtl, base >= 4 && < 5, containers, parsec,
++    Build-Depends:  haskell98, mtl, base >= 4 && < 5, containers, parsec,
+                     filepath, process,
+-                    gtk > 0.11, glade, pango, glib, cairo
++                    gtk > 0.11 && < 0.13, glade < 0.13, pango < 0.13, glib < 0.13, cairo < 0.13
+   else
+-    Build-Depends:  mtl, base >= 4 && < 5, containers, parsec,
++    Build-Depends:  haskell98, mtl, base >= 4 && < 5, containers, parsec,
+                     filepath, process,
+-                    gtk > 0.10 && < 0.11, glade, pango, glib, cairo
++                    gtk > 0.10 && < 0.11, glade < 0.13, pango < 0.13, glib < 0.13, cairo < 0.13
+ 
+ Executable bustle-count
+   Main-is:        bustle-count.hs
+   Other-modules:  Bustle.Parser, Bustle.Stats, Bustle.Types,
+                   Bustle.Noninteractive
+-  Build-Depends:  base >= 4 && < 5, containers, parsec
++  Build-Depends:  haskell98, base >= 4 && < 5, containers, parsec
+   Ghc-options:    -Wall -fno-warn-unused-imports -fno-warn-unused-do-bind
+ 
+ Executable bustle-time
+   Main-is:        bustle-time.hs
+   Other-modules:  Bustle.Parser, Bustle.Stats, Bustle.Types,
+                   Bustle.Noninteractive
+-  Build-Depends:  base >= 4 && < 5, containers, parsec
++  Build-Depends:  haskell98, base >= 4 && < 5, containers, parsec
+   Ghc-options:    -Wall -fno-warn-unused-imports -fno-warn-unused-do-bind
+ 
+ Executable bustle-dot
+   Main-is:        bustle-dot.hs
+   Other-modules:  Bustle.Parser, Bustle.Types
+-  Build-Depends:  base >= 4 && < 5, containers, parsec
++  Build-Depends:  haskell98, base >= 4 && < 5, containers, parsec
+   Ghc-options:    -Wall -fno-warn-unused-imports -fno-warn-unused-do-bind
diff --git a/dev-util/bustle/files/bustle-0.4.0-restrict-gtk2hs-deps-to-gtkplus2.patch b/dev-util/bustle/files/bustle-0.4.0-restrict-gtk2hs-deps-to-gtkplus2.patch
new file mode 100644
index 000000000000..fb7a149722b4
--- /dev/null
+++ b/dev-util/bustle/files/bustle-0.4.0-restrict-gtk2hs-deps-to-gtkplus2.patch
@@ -0,0 +1,76 @@
+--- bustle-0.4.0-orig/bustle.cabal	2013-04-03 15:59:57.193656822 +1100
++++ bustle-0.4.0/bustle.cabal	2013-04-03 15:09:21.825572157 +1100
+@@ -86,16 +86,17 @@
+     Build-Depends: base >= 4 && < 5
+                  , binary
+                  , bytestring
+-                 , cairo
++                 , cairo < 0.13
+                  , containers
+                  , dbus-core == 0.9.*
+                  , directory
+                  , filepath
+-                 , glade
+-                 , glib
+-                 , gtk > 0.11
++                 , glade < 0.13
++                 , glib < 0.13
++                 , gtk > 0.11 && < 0.13
++                 , haskell98
+                  , mtl
+-                 , pango
++                 , pango < 0.13
+                  , parsec
+                  , pcap
+                  , process
+@@ -105,16 +106,17 @@
+     Build-Depends: base >= 4 && < 5
+                  , binary
+                  , bytestring
+-                 , cairo
++                 , cairo < 0.13
+                  , containers
+                  , dbus-core == 0.9.*
+                  , directory
+                  , filepath
+-                 , glade
+-                 , glib
++                 , glade < 0.13
++                 , glib < 0.13
+                  , gtk > 0.10 && < 0.11
++                 , haskell98
+                  , mtl
+-                 , pango
++                 , pango < 0.13
+                  , parsec
+                  , pcap
+                  , process
+@@ -133,8 +135,8 @@
+   C-sources: c-sources/pcap-monitor.c
+   pkgconfig-depends: glib-2.0
+   Build-Depends: base >= 4 && < 5
+-               , gtk > 0.11
+-               , glib
++               , gtk > 0.11 && < 0.13
++               , glib < 0.13
+ 
+ Executable dump-messages
+   if flag(InteractiveTests) && flag(PostCabalizedGtk2HS)
+@@ -177,14 +179,14 @@
+     main-is: Test/Renderer.hs
+     other-modules: Bustle.Renderer
+     Build-Depends: base
+-                 , cairo
++                 , cairo < 0.13
+                  , containers
+                  , dbus-core
+                  , directory
+                  , filepath
+-                 , gtk
++                 , gtk < 0.13
+                  , mtl
+-                 , pango
++                 , pango < 0.13
+                  , test-framework
+                  , test-framework-hunit
+                  , HUnit
diff --git a/dev-util/bustle/files/bustle-0.4.2-restrict-gtk2hs-deps-to-gtkplus2.patch b/dev-util/bustle/files/bustle-0.4.2-restrict-gtk2hs-deps-to-gtkplus2.patch
new file mode 100644
index 000000000000..74ab26ff8fcd
--- /dev/null
+++ b/dev-util/bustle/files/bustle-0.4.2-restrict-gtk2hs-deps-to-gtkplus2.patch
@@ -0,0 +1,61 @@
+--- bustle-0.4.2-orig/bustle.cabal	2012-11-15 02:19:34.000000000 +1100
++++ bustle-0.4.2/bustle.cabal	2013-04-03 15:07:35.381569187 +1100
+@@ -82,15 +82,15 @@
+ 
+   Build-Depends: base >= 4 && < 5
+                , bytestring
+-               , cairo
++               , cairo < 0.13
+                , containers
+                , dbus >= 0.10
+                , directory
+                , filepath
+-               , glib
+-               , gtk >= 0.12.3
++               , glib < 0.13
++               , gtk >= 0.12.3 && < 0.13
+                , mtl
+-               , pango
++               , pango < 0.13
+                , parsec
+                , pcap
+                , process
+@@ -111,15 +111,15 @@
+   pkgconfig-depends: glib-2.0
+   Build-Depends: base >= 4 && < 5
+                , bytestring
+-               , cairo
++               , cairo < 0.13
+                , containers
+                , dbus
+                , directory
+                , filepath
+-               , gtk > 0.12
+-               , glib
++               , gtk > 0.12 && < 0.13
++               , glib < 0.13
+                , mtl
+-               , pango
++               , pango < 0.13
+                , parsec
+                , pcap
+                , text
+@@ -163,15 +163,15 @@
+     main-is: Test/Renderer.hs
+     other-modules: Bustle.Renderer
+     Build-Depends: base
+-                 , cairo
++                 , cairo < 0.13
+                  , containers
+                  , dbus >= 0.10
+                  , directory
+                  , filepath
+-                 , gtk
++                 , gtk < 0.13
+                  , mtl
+                  , text
+-                 , pango
++                 , pango < 0.13
+                  , test-framework
+                  , test-framework-hunit
+                  , HUnit