Version bump (also fixes bug #533766 by Francesco Riosa which ports bustle to dev-haskell/gtk-0.13).

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 611FF3AA)

3 files changed, 252 insertions, 2 deletions

diff --git a/dev-util/bustle/ChangeLog b/dev-util/bustle/ChangeLog
index 46e2ade32180..198108bf15d9 100644
--- a/dev-util/bustle/ChangeLog
+++ b/dev-util/bustle/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/bustle
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bustle/ChangeLog,v 1.24 2014/02/02 11:14:03 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bustle/ChangeLog,v 1.25 2015/01/04 22:24:16 slyfox Exp $
+
+*bustle-0.4.7-r1 (04 Jan 2015)
+
+  04 Jan 2015; Sergei Trofimovich <slyfox@gentoo.org> +bustle-0.4.7-r1.ebuild,
+  +files/bustle-0.4.7-gtk-0.13.patch:
+  Version bump (also fixes bug #533766 by Francesco Riosa which ports bustle to
+  dev-haskell/gtk-0.13).
 
   02 Feb 2014; Agostino Sarubbo <ago@gentoo.org> bustle-0.4.2-r1.ebuild:
   Stable for sparc, wrt bug #488808
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..da689bcba005
--- /dev/null
+++ b/dev-util/bustle/bustle-0.4.7-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bustle/bustle-0.4.7-r1.ebuild,v 1.1 2015/01/04 22:24:16 slyfox Exp $
+
+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/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