reinit the tree, so we can have metadata

7 files changed, 467 insertions, 0 deletions

diff --git a/dev-util/bustle/Manifest b/dev-util/bustle/Manifest
new file mode 100644
index 000000000000..f02b66e43c80
--- /dev/null
+++ b/dev-util/bustle/Manifest
@@ -0,0 +1,12 @@
+AUX bustle-0.4.2-restrict-gtk2hs-deps-to-gtkplus2.patch 1780 SHA256 2ab67f33ffa069c15214f6c08918a2caacefbc0c4a920660340c4837dd32e641 SHA512 b5765864998fb4a65632657630faf499a7ece40e51c396e0055c574f524fef998f226f2bfca00b15b26ee20066ff4fef6627e6d0a94ff3cc9a5bb1b43b493588 WHIRLPOOL 2075edc5fd7f0b43b86bf1c71b9cc23fff136c888f169f4710715dd0cbba41bcf613f44f094c3a2fb633554b4401f79a7914dd937cdf750da5e925f635ec8551
+AUX bustle-0.4.7-gtk-0.13.patch 6428 SHA256 0d6654717a4fe09f323aa9a6a522874c790a5f046be9a0084730ee89b96981c6 SHA512 49103d8b1019be025f52c2999dbbe34232a0133797a3e4ccc1e82e8ce61da71953c5b9084cdefc6f7cbba19c78032de1fcbd146f695abd07497ce867e5b03aff WHIRLPOOL 3ae726c122785b4dda2f3c85b1f1683db4a0f4f6a18161d04fe341d2e3fbd2e992f4855a47981427f342fcb67d81947270d8f6dbe3c19dd43195cf57ca2d0092
+DIST bustle-0.4.0-tests.tar.gz 8340 SHA256 7e4c354479edc835457fdecc89ab7fc5e1087ab4637b7b1ac6fadfe860190fbe SHA512 c7685496f3a84c1615752ae9aad22202bfe703147441581abe599a5e5055cdef54f27b4e0d01603b23a83a4b42b0595b5538c5b4d65a522a9e76b8d187ae54b1 WHIRLPOOL 6591ed10c75ef044375bf5e80719aac4a40244f647c4045f45811c9e8736afaafa5b83b92803ef8912c2ecfe9672ac20734fc954ab2bb09cff2842c1e6b4fe5a
+DIST bustle-0.4.2.tar.gz 95707 SHA256 bf03fb0a14a2559b6abe4cfeb673b30d86a31a89fb45883d7594644afc434cee SHA512 8a6c1860cb655fc9bd7d42d130d87416c74b988b81749ec8cc1c25cacd3dd4516f59f5cb5954b473c3f6ac32b11853e9bc8881708962144067a0325845dd8562 WHIRLPOOL ebc31713bb202f247a38ed04357598ba9951f72a3fa18b679d83a3ce088dd8a144d7ee5a772ce02715dd735907ba2219541e971d5b1f3a16eb21d22ab1600753
+DIST bustle-0.4.7.tar.gz 114231 SHA256 08b12207561157e639bc64e0b274e70e4909f50079cd97564c916d66a3f088b9 SHA512 c9b93ffda797a87342f5ba506db3c892bff8084fa0ec5897d676bef5e8367507970ae3e09555cda9b4de0c7b175dc396f2ccfb394d224e64225c0e7ded2164fd WHIRLPOOL 8f6a80b881b9c13498351e2dc4910406dc151db9c320b8fba291c9577b41eede58003b943de13bf637d28226e7301e4dfdc8f2b6a0fa4fda2792962505fd0153
+DIST bustle-0.5.4.tar.gz 122720 SHA256 921c2cbbb957dcb02c3aa8fd1eeff3534cb437fa9eeca1c25206ad1e741a3f14 SHA512 56eaeef831fb5929d57a008ae71d8409048ce5d12eaada98830ef742baf3479264203465d77591cb338374096eac2dc2b68b44f075b2761f16df63fad54b91fd WHIRLPOOL b804441443af0f6e922a3c16bb57b70b09332fe68834c2eec35f8e169b2247a506cbdaf5aea0df09985665f9993b615fb7e64892c77134cf7de898ed76af4b89
+EBUILD bustle-0.4.2-r1.ebuild 1563 SHA256 a3de5b3a5bbe90fcc3728e63ed4f4d9da3fb6b22d82f54f6f99ccbfdcadf6e3c SHA512 0d714abbcde8f37318a9c61e85857951d28003c9c5e44ee208cb4f9684f04f9f967e7e8e328d02ec87b6cc6853bc01035f996803931dde51c4914770ed83ad23 WHIRLPOOL a93b3a8215b39ef585247770ed4ef926fc95f71f99ba347edf935c8e0e82de32a8314668d8ea44e0c39c28920c218e7360d0b5d616f2a8e07de28d47b0fa6857
+EBUILD bustle-0.4.7-r1.ebuild 1504 SHA256 b614f09082f8f44783f9d206cc0bbaaf0148e6f0bc29c4535699f5dd509db35d SHA512 8cff7f0958a3438316d612185c0691037cbf0ef086889476595d9605ae8ed15f6cb8f7b08fc0320aea0ea4c9c5fd8f42950aa13969e9e0069beda9f6cd55ff0b WHIRLPOOL edbe849ae62fb151d88ead69e2e021d410bc512dc8a958d8d7af1b7290f79e43c6ead613ad76103a9093ea4b108c7cc0c74ffdea1a059166817f06d71c054ded
+EBUILD bustle-0.5.4.ebuild 1625 SHA256 c98ed501aeb593f6045d6264b3a3b6ec0c5961c01b512154b99b3c443836db80 SHA512 08b4f1faffbdf9e7a9706b9228da978013f61914efc0889f64d5d2943f64c944d82df34636c9ef3d9b4b6e0019e3908723d418336c9a30f2471a63285baa8a7e WHIRLPOOL 6ae14bbf5d36453700acf7db8590893e80b3e9533955e8610ebc1119b3bedec0b1de610037e7af00374fad2ef150069cd9af4176caa0da4a4c2628de317acf7c
+MISC ChangeLog 4629 SHA256 7242e3c3d2cf053ab97e8c9e609342d13ce596c498de8c863b45325d6fa8eea4 SHA512 8b88ae6c0423df5e5df4fd2d7641f11187ac73e9826d7ba5142d04e23085a4f4fa229b79b1879335da6dda62506756fc6657e8c065a3d658c6a8bde0e54f3746 WHIRLPOOL f271e2665fb5b7490e7b46981b753abf13276846781b58534fecb0d0f314cca2206d00415ed52c386614bd63a50225c55995815f0f676b24819fdd2250ab6260
+MISC ChangeLog-2015 4384 SHA256 b01386dce0401596a3dd41b6d1c15f4a16e0f5efe194d0c03af723155beebd76 SHA512 9f34d48c6b325d70f08f7c8d330d77ad818a8bd9062dc1e36caecfc0a863295bcb4e8430a974865a380d988a66c4a8947c08c1c2a90931a9ef63ebf3d7f8d8c2 WHIRLPOOL b45fb6743dc552ea481a7578284977bcfe0bf09d3da2c8d0c737905709918ac2cc9445718c3292de0e29f1b98c1ae7f0124277266bffb33ab95978ef1ab496ec
+MISC metadata.xml 502 SHA256 559d549f19f2909b92d0ae77989b8c1981ace3fb3d5e06fc7c18ed37d1f71987 SHA512 834e9820081006344e30580673ccb789750d1af67807f908b21fc5fe0cf1b8554b32b446aa592c52a1dd26e4d36f2f91c3cff569b8c4797ded9c5c6ea1bfa65d WHIRLPOOL 3ade14c2d6d1869a5e4ae3c0c3fb521ec147410ca54eb2ba4d9d03e3ed1d4625d6f5f2fbb7040fd5081f0164866467f2f353b1de9f27a3914b88a42c8d0ddb00
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..d04c99c8998a
--- /dev/null
+++ b/dev-util/bustle/bustle-0.4.2-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 https://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:0
+		>=dev-haskell/dbus-0.10
+		dev-haskell/glib:0
+		>=dev-haskell/gtk-0.12.3:2
+		dev-haskell/mtl
+		dev-haskell/pango:0
+		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.7-r1.ebuild b/dev-util/bustle/bustle-0.4.7-r1.ebuild
new file mode 100644
index 000000000000..3f1b1336bc15
--- /dev/null
+++ b/dev-util/bustle/bustle-0.4.7-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.3.6.9999
+
+CABAL_FEATURES="bin test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Draw pretty sequence diagrams of D-Bus traffic"
+HOMEPAGE="http://hackage.haskell.org/package/bustle"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2 GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~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}
+	>=dev-haskell/cabal-1.8.0.2
+	dev-haskell/cairo
+	>=dev-haskell/dbus-0.10
+	dev-haskell/glib
+	>=dev-haskell/gtk-0.13
+	>=dev-haskell/hgettext-0.1.5
+	dev-haskell/mtl
+	>=dev-haskell/pango-0.13
+	dev-haskell/parsec
+	dev-haskell/pcap
+	dev-haskell/setlocale
+	dev-haskell/text
+	>=dev-lang/ghc-6.12.1
+	virtual/pkgconfig
+	test? ( dev-haskell/hunit
+		dev-haskell/quickcheck
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit )
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gtk-0.13.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
+	doman bustle-pcap.1
+	dodoc README HACKING NEWS
+}
diff --git a/dev-util/bustle/bustle-0.5.4.ebuild b/dev-util/bustle/bustle-0.5.4.ebuild
new file mode 100644
index 000000000000..f397b7fa6968
--- /dev/null
+++ b/dev-util/bustle/bustle-0.5.4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+# ebuild generated by hackport 0.4.5.9999
+
+CABAL_FEATURES="bin test-suite"
+inherit eutils haskell-cabal
+
+DESCRIPTION="Draw sequence diagrams of D-Bus traffic"
+HOMEPAGE="http://hackage.haskell.org/package/bustle"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2 GPL-2 GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="interactivetests +threaded"
+
+RESTRICT=test # fails one propery test
+
+RDEPEND="dev-haskell/cairo:=
+	>=dev-haskell/dbus-0.10:=
+	dev-haskell/gio:=
+	dev-haskell/glib:=
+	>=dev-haskell/gtk3-0.13.7:0=
+	>=dev-haskell/hgettext-0.1.5:=
+	dev-haskell/mtl:=
+	dev-haskell/pango:=
+	dev-haskell/parsec:=
+	dev-haskell/pcap:=
+	dev-haskell/setlocale:=
+	dev-haskell/text:=
+	>=dev-lang/ghc-7.4.1:=
+	dev-libs/glib:2
+	dev-perl/Locale-gettext
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.8
+	virtual/pkgconfig
+	test? ( dev-haskell/hunit
+		dev-haskell/quickcheck
+		dev-haskell/test-framework
+		dev-haskell/test-framework-hunit )
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag interactivetests interactivetests) \
+		$(cabal_flag threaded threaded)
+}
+
+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
+	doman bustle-pcap.1
+	dodoc README.md HACKING.md NEWS.md
+}
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
diff --git a/dev-util/bustle/files/bustle-0.4.7-gtk-0.13.patch b/dev-util/bustle/files/bustle-0.4.7-gtk-0.13.patch
new file mode 100644
index 000000000000..f2691521c4bd
--- /dev/null
+++ b/dev-util/bustle/files/bustle-0.4.7-gtk-0.13.patch
@@ -0,0 +1,172 @@
+diff --git a/Bustle/Diagram.hs b/Bustle/Diagram.hs
+index d558beb..ef96d60 100644
+--- a/Bustle/Diagram.hs
++++ b/Bustle/Diagram.hs
+@@ -450,7 +450,7 @@ mkLayout :: (MonadIO m)
+ mkLayout s e a = liftIO $ do
+     ctx <- cairoCreateContext Nothing
+     layout <- layoutEmpty ctx
+-    layoutSetMarkup layout (Markup.unMarkup s)
++    layoutSetMarkup layout (Markup.unMarkup s) :: IO String
+     layoutSetFontDescription layout (Just font)
+     layoutSetEllipsize layout e
+     layoutSetAlignment layout a
+diff --git a/Bustle/UI.hs b/Bustle/UI.hs
+index a78797e..9843b29 100644
+--- a/Bustle/UI.hs
++++ b/Bustle/UI.hs
+@@ -30,6 +30,7 @@ import Data.IORef
+ import qualified Data.Set as Set
+ import Data.List (intercalate)
+ import Data.Time
++import qualified Data.Text as T
+ import Data.Monoid (mempty)
+ import Text.Printf
+ 
+@@ -281,6 +282,7 @@ promptToSave wi = io $ do
+     case mdetails of
+         Just (RecordedLog tempFilePath) -> do
+             let tempFileName = takeFileName tempFilePath
++                title :: String
+                 title = printf (__ "Save log '%s' before closing?") tempFileName
+             prompt <- messageDialogNew (Just (wiWindow wi))
+                                        [DialogModal]
+@@ -459,7 +461,7 @@ wiSetLogDetails :: WindowInfo
+                 -> IO ()
+ wiSetLogDetails wi logDetails = do
+     writeIORef (wiLogDetails wi) (Just logDetails)
+-    windowSetTitle (wiWindow wi) (printf (__ "%s - Bustle") (logWindowTitle logDetails))
++    windowSetTitle (wiWindow wi) (printf (__ "%s - Bustle") (logWindowTitle logDetails) :: String)
+ 
+ setPage :: MonadIO io
+         => WindowInfo
+@@ -525,7 +527,7 @@ loadPixbuf :: FilePath -> IO (Maybe Pixbuf)
+ loadPixbuf filename = do
+   iconName <- getDataFileName $ "data/" ++ filename
+   C.catch (fmap Just (pixbufNewFromFile iconName))
+-          (\(GError _ _ msg) -> warn msg >> return Nothing)
++          (\(GError _ _ msg) -> warn (T.unpack msg) >> return Nothing)
+ 
+ openDialogue :: Window -> B ()
+ openDialogue window = embedIO $ \r -> do
+diff --git a/Bustle/UI/Canvas.hs b/Bustle/UI/Canvas.hs
+index 46c1582..5a28761 100644
+--- a/Bustle/UI/Canvas.hs
++++ b/Bustle/UI/Canvas.hs
+@@ -1,3 +1,4 @@
++{-# LANGUAGE OverloadedStrings #-}
+ {-
+ Bustle.UI.Canvas: displays diagrams
+ Copyright © 2008–2012 Collabora Ltd.
+@@ -58,7 +59,7 @@ canvasNew :: Eq a
+           -> (Maybe a -> IO ())
+           -> IO (Canvas a)
+ canvasNew builder showBounds selectionChangedCb = do
+-    layout <- builderGetObject builder castToLayout "diagramLayout"
++    layout <- builderGetObject builder castToLayout ("diagramLayout" :: String)
+     idRef <- newIORef Nothing
+     shapesRef <- newIORef []
+     widthRef <- newIORef 0
+diff --git a/Bustle/UI/DetailsView.hs b/Bustle/UI/DetailsView.hs
+index 35e80d6..d1b9d96 100644
+--- a/Bustle/UI/DetailsView.hs
++++ b/Bustle/UI/DetailsView.hs
+@@ -55,7 +55,7 @@ addValue :: Table
+          -> Int
+          -> IO Label
+ addValue table row = do
+-    label <- labelNew Nothing
++    label <- labelNew (Nothing :: Maybe String)
+     miscSetAlignment label 0 0
+     labelSetEllipsize label EllipsizeStart
+     labelSetSelectable label True
+@@ -77,7 +77,7 @@ detailsViewNew = do
+                 , tableColumnSpacing := 6
+                 ]
+ 
+-    title <- labelNew Nothing
++    title <- labelNew (Nothing :: Maybe String)
+     miscSetAlignment title 0 0
+     tableAttach table title 0 2 0 1 [Fill] [Fill] 0 0
+ 
+diff --git a/Bustle/UI/FilterDialog.hs b/Bustle/UI/FilterDialog.hs
+index 9560507..152931e 100644
+--- a/Bustle/UI/FilterDialog.hs
++++ b/Bustle/UI/FilterDialog.hs
+@@ -99,7 +99,7 @@ runFilterDialog parent names currentlyHidden = do
+     nameStore <- makeStore names currentlyHidden
+     sw <- makeView nameStore
+ 
+-    instructions <- labelNew Nothing
++    instructions <- labelNew (Nothing :: Maybe String)
+     widgetSetSizeRequest instructions 600 (-1)
+     labelSetMarkup instructions
+         (__ "Unticking a service hides its column in the diagram, \
+diff --git a/Bustle/UI/Recorder.hs b/Bustle/UI/Recorder.hs
+index 1e98a68..085eea2 100644
+--- a/Bustle/UI/Recorder.hs
++++ b/Bustle/UI/Recorder.hs
+@@ -27,6 +27,7 @@ import Control.Monad (when, liftM)
+ import Control.Concurrent.MVar
+ import qualified Data.Map as Map
+ import Data.Monoid
++import qualified Data.Text as T
+ import Control.Monad.State (runStateT)
+ import Text.Printf
+ 
+@@ -77,8 +78,7 @@ processBatch pendingRef n label incoming = do
+                 -- message from the user's perspective.
+                 i <- takeMVar n
+                 let j = i + (length pending)
+-                labelSetMarkup label $
+-                    printf (__ "Logged <b>%u</b> messages…") j
++                labelSetMarkup label $ (printf (__ "Logged <b>%u</b> messages…") j :: String)
+                 putMVar n j
+ 
+                 incoming rr'
+@@ -97,8 +97,8 @@ recorderRun filename mwindow incoming finished = C.handle newFailed $ do
+     maybe (return ()) (windowSetTransientFor dialog) mwindow
+     dialog `set` [ windowModal := True ]
+ 
+-    label <- labelNew Nothing
+-    labelSetMarkup label $ printf (__ "Logged <b>%u</b> messages…") (0 :: Int)
++    label <- labelNew (Nothing :: Maybe String)
++    labelSetMarkup label $ (printf (__ "Logged <b>%u</b> messages…") (0 :: Int) :: String)
+     loaderStateRef <- newMVar Map.empty
+     pendingRef <- newMVar []
+     let updateLabel µs body = do
+@@ -142,7 +142,7 @@ recorderRun filename mwindow incoming finished = C.handle newFailed $ do
+     widgetShowAll dialog
+   where
+     newFailed (GError _ _ message) = do
+-        displayError mwindow message Nothing
++        displayError mwindow (T.unpack message) Nothing
+ 
+ recorderChooseFile :: FilePath
+                    -> Maybe Window
+diff --git a/bustle.cabal b/bustle.cabal
+index 4ac107c..2d1f907 100644
+--- a/bustle.cabal
++++ b/bustle.cabal
+@@ -106,10 +106,10 @@ Executable bustle
+                , directory
+                , filepath
+                , glib
+-               , gtk >= 0.12.4
++               , gtk >= 0.13
+                , hgettext >= 0.1.5
+                , mtl
+-               , pango
++               , pango >= 0.13
+                , parsec
+                , pcap
+                , process
+@@ -136,7 +136,7 @@ Executable test-monitor
+                , dbus
+                , directory
+                , filepath
+-               , gtk > 0.12
++               , gtk >= 0.13
+                , glib
+                , hgettext
+                , mtl
diff --git a/dev-util/bustle/metadata.xml b/dev-util/bustle/metadata.xml
new file mode 100644
index 000000000000..ff21ef6ead63
--- /dev/null
+++ b/dev-util/bustle/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>haskell@gentoo.org</email>
+		<name>Gentoo Haskell</name>
+	</maintainer>
+	<longdescription>
+		Draw pretty sequence diagrams of D-Bus traffic
+	</longdescription>
+	<use>
+		<flag name="interactivetests">Build interactive test programs</flag>
+		<flag name="threaded">Build with support for multithreaded execution.</flag>
+	</use>
+</pkgmetadata>