gentoo resync : 14.07.2018

7 files changed, 0 insertions, 465 deletions

diff --git a/dev-util/bustle/Manifest b/dev-util/bustle/Manifest
deleted file mode 100644
index 64e92f336960..000000000000
--- a/dev-util/bustle/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX bustle-0.4.2-restrict-gtk2hs-deps-to-gtkplus2.patch 1780 BLAKE2B 3dabdb99730f9581bd44d5c5ff9930aa57887e830db3226a37f9ba788e46b17e64ceb35f75476872936cc07c42cbda2241fd03a2d3fbb1ab5c3d2a59ece99811 SHA512 b5765864998fb4a65632657630faf499a7ece40e51c396e0055c574f524fef998f226f2bfca00b15b26ee20066ff4fef6627e6d0a94ff3cc9a5bb1b43b493588
-AUX bustle-0.4.7-gtk-0.13.patch 6428 BLAKE2B 20eea89172dbd4ef029ec598be9556721d8a5503aaf6cf1cefa3003e166dd12e1d1be3e41152ba530a49bf8bdd746495797887bb4c3ba9c91df965b3cd54c529 SHA512 49103d8b1019be025f52c2999dbbe34232a0133797a3e4ccc1e82e8ce61da71953c5b9084cdefc6f7cbba19c78032de1fcbd146f695abd07497ce867e5b03aff
-DIST bustle-0.4.0-tests.tar.gz 8340 BLAKE2B 0c0cf10a87c1fea6100828139e9781ff867e6b67490df99f403a7dc6d9665c3973e37c9e8e408549937750b262ff30aadf36658aec56f2f043f1381ac437dbd5 SHA512 c7685496f3a84c1615752ae9aad22202bfe703147441581abe599a5e5055cdef54f27b4e0d01603b23a83a4b42b0595b5538c5b4d65a522a9e76b8d187ae54b1
-DIST bustle-0.4.2.tar.gz 95707 BLAKE2B 12d8c08c7a3f71684831bc27c027db33902cc727d216801448e67ed18b717796038390ee7c63f2faea6e26ad677e618c51f9ad1353d3f54bd334d49fff621b7c SHA512 8a6c1860cb655fc9bd7d42d130d87416c74b988b81749ec8cc1c25cacd3dd4516f59f5cb5954b473c3f6ac32b11853e9bc8881708962144067a0325845dd8562
-DIST bustle-0.4.7.tar.gz 114231 BLAKE2B b783f4363171cab96463519806d18113012da3bdb9040a2394f5ad9cc1c7cfab7030b99ee71f1a5bd4bcd6906ef53f2fbc1eb8c504f3b4a526a9d55e27f2f6ab SHA512 c9b93ffda797a87342f5ba506db3c892bff8084fa0ec5897d676bef5e8367507970ae3e09555cda9b4de0c7b175dc396f2ccfb394d224e64225c0e7ded2164fd
-DIST bustle-0.5.4.tar.gz 122720 BLAKE2B b5a2315919644ab5c7712f9e9bde1bdea226b4e8898981f7150558bde648a5c7965be6ad8484c09727665292e5fe3f0cb545544dbb27f2a2553e513910289620 SHA512 56eaeef831fb5929d57a008ae71d8409048ce5d12eaada98830ef742baf3479264203465d77591cb338374096eac2dc2b68b44f075b2761f16df63fad54b91fd
-EBUILD bustle-0.4.2-r1.ebuild 1563 BLAKE2B e225038658a36654938d25c6c09be6fb6cb8c2136561cff5865457c2387601e3a37e10b8ed0d80240c5d0842d55fbd892536b840f4810e1da15db47904e9ffb7 SHA512 0d714abbcde8f37318a9c61e85857951d28003c9c5e44ee208cb4f9684f04f9f967e7e8e328d02ec87b6cc6853bc01035f996803931dde51c4914770ed83ad23
-EBUILD bustle-0.4.7-r1.ebuild 1504 BLAKE2B 464a45371475c7ca265bb830b27e086b5a7da3ce3a675707a003d8fe02fadebb5d6aaaf9e431e590bcf0f16a6f7a943fc8d6e57d4a329a88b6599201fb56e68c SHA512 8cff7f0958a3438316d612185c0691037cbf0ef086889476595d9605ae8ed15f6cb8f7b08fc0320aea0ea4c9c5fd8f42950aa13969e9e0069beda9f6cd55ff0b
-EBUILD bustle-0.5.4.ebuild 1625 BLAKE2B b1eb6a7c42524b750391aca4ddcfbcd88afbcf556fefb712c2716dcf98b58d677c0f73d7ca7853b38b1ad4e77a4ca825e01b1cbb5dc7098868969ca8232a5580 SHA512 08b4f1faffbdf9e7a9706b9228da978013f61914efc0889f64d5d2943f64c944d82df34636c9ef3d9b4b6e0019e3908723d418336c9a30f2471a63285baa8a7e
-MISC metadata.xml 502 BLAKE2B 3ab482910acd7936501b8c519d2da5c286d493a04afc6d5302989ca5662a4f166d84142489789cd5f5ea4071b5a5e54bc9d0586e6e6fe273f3f2f6f4c44149b8 SHA512 834e9820081006344e30580673ccb789750d1af67807f908b21fc5fe0cf1b8554b32b446aa592c52a1dd26e4d36f2f91c3cff569b8c4797ded9c5c6ea1bfa65d
diff --git a/dev-util/bustle/bustle-0.4.2-r1.ebuild b/dev-util/bustle/bustle-0.4.2-r1.ebuild
deleted file mode 100644
index d04c99c8998a..000000000000
--- a/dev-util/bustle/bustle-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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
deleted file mode 100644
index 3f1b1336bc15..000000000000
--- a/dev-util/bustle/bustle-0.4.7-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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
deleted file mode 100644
index f397b7fa6968..000000000000
--- a/dev-util/bustle/bustle-0.5.4.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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
deleted file mode 100644
index 74ab26ff8fcd..000000000000
--- a/dev-util/bustle/files/bustle-0.4.2-restrict-gtk2hs-deps-to-gtkplus2.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- 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
deleted file mode 100644
index f2691521c4bd..000000000000
--- a/dev-util/bustle/files/bustle-0.4.7-gtk-0.13.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-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
deleted file mode 100644
index ff21ef6ead63..000000000000
--- a/dev-util/bustle/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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>