Fixed buld breakage against ghc-7.4 (bug #428226 by Chris Reffett)

Package-Manager: portage-2.2.0_alpha120_p4/cvs/Linux x86_64

4 files changed, 111 insertions, 7 deletions

diff --git a/dev-util/bustle/ChangeLog b/dev-util/bustle/ChangeLog
index 01028c84c9af..2dbba7af9483 100644
--- a/dev-util/bustle/ChangeLog
+++ b/dev-util/bustle/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/bustle
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/bustle/ChangeLog,v 1.8 2012/03/10 16:04:21 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bustle/ChangeLog,v 1.9 2012/07/28 14:02:24 slyfox Exp $
+
+  28 Jul 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/bustle-0.2.3-ghc-7.4.patch, bustle-0.2.3.ebuild:
+  Fixed buld breakage against ghc-7.4 (bug #428226 by Chris Reffett)
 
   10 Mar 2012; Sergei Trofimovich <slyfox@gentoo.org>
   +files/bustle-0.4.0-ghc-7.4.patch, bustle-0.4.0.ebuild:
@@ -40,4 +44,3 @@
   +bustle-0.2.3.ebuild, +metadata.xml:
   Initial version. Draw pretty sequence diagrams of D-Bus traffic. Ebuild
   provided by Dennis Schridde bug #353906.
-
diff --git a/dev-util/bustle/Manifest b/dev-util/bustle/Manifest
index 438f352ed70a..535b0ccaf5f4 100644
--- a/dev-util/bustle/Manifest
+++ b/dev-util/bustle/Manifest
@@ -1,9 +1,20 @@
+-----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.4.0-ghc-7.4.patch 1343 SHA256 658e19353f171a27fdd7aba37cdf14899da9c1fcf6e9a4eda15452f468661071 SHA512 f78b0042375241c948fb8389db956f93ca33188ba5fb2b40e10505caa023a97028b372d9f89d83290f86efde65fb0ed894d7cdc7e11032b128dd6a0b88e358c6 WHIRLPOOL 1ac0ef7060a5d24cfdc188ebc0447d70a3e91d5c4d8a5c12ced423652da0435fb5b1ebc135e4481cf1998207dcdf5f75f24848222c4dde4a6bdca24d2338a265
 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
-EBUILD bustle-0.2.3.ebuild 1355 SHA256 d5b810a3d9c61ba82189b863e0bd8d92f002b606f21a976d82867869b7ba0d04 SHA512 fb824ba1b46e27bc81cdbd995a9a3e49047c4f5fd11f89fb356afd1f8bd8506851f2c409563a4b191463e775a46874e44c6759b191117df702ed71f574523a51 WHIRLPOOL 46b4426381c5597a801bc4f0152382a44580557ab0ae8f395e606db4819d4adfed7678f50beeb3af59075c834a76eb680ed393904243bb3adb62c08db03fb08d
+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
-MISC ChangeLog 1638 SHA256 9835398c2b62465073ac362afcd663e03d6fc63425af7e9fedce4c1c8406e965 SHA512 8aacc2d76e659dd1afa54c402616fbbe0bc3dc7b67312826062b17618dc2ef38d4d57fb236d2557dae60f1b88b33d6b88d3d3c1935aa4fa8b41b3c62bff545e4 WHIRLPOOL 1c30810d59091bf9d7d0927490643204f8a0a08a582115bf03a68384da0c2bc6d4ba156e15f22388ae6aa80f396d3fe6f8cd1db6f23914b9a76c029e55eb75f4
+MISC ChangeLog 1819 SHA256 f15925b8d929966f4d47c7ccca1058bfa424cfd84c6b405a4da2a3583932d8e5 SHA512 f60ef25028b779a56160f7497ba5c162c32c310c52a1c5d3476abc668886bc9c1be5ea26d033326bf2ec2f5f83fe030fe66a45671127448a19fee8dfe5c4139f WHIRLPOOL ad257cdd518922d462b6cc9d7bc101b6c2f8ef46c02e43a9d7d3e854f40fcc5735385bcf6c7537619f616cb31fc5e7feb5e324bbadb81cebf933b40b2c6f409a
 MISC metadata.xml 314 SHA256 2a36dc7de9fdc3b983bc20185c7091d00937b33fc4b71b4e86d4c5def6eebadc SHA512 cd6c3a7d1ba97797fab5cf6dd797c1f5317c17cd878873b941a3e0ebf9ccca056b4c440d940fb011bb62b4002911df5bbd7ff7cb74a02cddd0fc6c38bb3b0276 WHIRLPOOL f229b7f8afe393103347463fc7332a49db6212e04e49ab446fb5e90b85fb68e9ef2c91b8b2e62d807eedbeb317f6e8a7f5ee51f9454c2e212b1d0a9a0d2d3a0f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlAT8kkACgkQcaHudmEf86pOeQCffXixv6Oca82beGXokUp5X2Gs
+v9YAnRbuCxr6DpYhCucssMwlTKp/d9xH
+=5KGy
+-----END PGP SIGNATURE-----
diff --git a/dev-util/bustle/bustle-0.2.3.ebuild b/dev-util/bustle/bustle-0.2.3.ebuild
index 9fd8dc5b8e64..3ae6e882cd52 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-2011 Gentoo Foundation
+# Copyright 1999-2012 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.4 2011/06/21 11:02:06 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bustle/bustle-0.2.3.ebuild,v 1.5 2012/07/28 14:02:24 slyfox Exp $
 
 # ebuild generated by hackport 0.2.13
 
@@ -18,7 +18,8 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-PATCHES=("${FILESDIR}/0001-bustle-dbus-monitor-fix-linking-order-libs-go-after-.patch")
+PATCHES=("${FILESDIR}/0001-bustle-dbus-monitor-fix-linking-order-libs-go-after-.patch"
+	"${FILESDIR}"/${P}-ghc-7.4.patch)
 
 RDEPEND="sys-apps/dbus
 		x11-libs/cairo
diff --git a/dev-util/bustle/files/bustle-0.2.3-ghc-7.4.patch b/dev-util/bustle/files/bustle-0.2.3-ghc-7.4.patch
new file mode 100644
index 000000000000..3c4544e32b7e
--- /dev/null
+++ b/dev-util/bustle/files/bustle-0.2.3-ghc-7.4.patch
@@ -0,0 +1,89 @@
+Starting with ghc-7.4 base and haskell98 are incompatible:
+
+ Ambiguous module name `Prelude':
+  it was found in multiple packages: base haskell98-2.0.0.1
+
+Gentoo-bug: https://bugs.gentoo.org/428226
+Reported-by:  Chris Reffett
+diff --git a/Bustle/Noninteractive.hs b/Bustle/Noninteractive.hs
+index 2aa1e05..4a4d9b0 100644
+--- a/Bustle/Noninteractive.hs
++++ b/Bustle/Noninteractive.hs
+@@ -3,7 +3,8 @@ where
+ 
+ import Prelude hiding (log)
+ 
+-import System
++import System.Environment (getArgs)
++import System.Exit (exitFailure)
+ import System.IO (hPutStrLn, stderr)
+ 
+ import Bustle.Parser (readLog)
+diff --git a/Bustle/Stats.hs b/Bustle/Stats.hs
+index da374a5..939cafd 100644
+--- a/Bustle/Stats.hs
++++ b/Bustle/Stats.hs
+@@ -36,7 +36,7 @@ frequencies = reverse
+     where alt Nothing  = Just 1
+           alt (Just n) = Just (n + 1)
+ 
+-mean :: Fractional a => [a] -> a
++mean :: (Eq a, Fractional a) => [a] -> a
+ mean = acc 0 0
+    where acc 0 _ [] = error "mean of empty list"
+          acc n t [] = t / n
+diff --git a/bustle-dot.hs b/bustle-dot.hs
+index aa7c45e..77d6f18 100644
+--- a/bustle-dot.hs
++++ b/bustle-dot.hs
+@@ -3,7 +3,9 @@ import Prelude hiding (log)
+ import Control.Monad
+ import Data.List
+ import Data.Maybe
+-import System
++import System.IO
++import System.Environment
++import System.Exit
+ 
+ import Bustle.Parser (readLog)
+ import Bustle.Types
+diff --git a/bustle.cabal b/bustle.cabal
+index 7ad7412..0a49ca1 100644
+--- a/bustle.cabal
++++ b/bustle.cabal
+@@ -27,11 +27,11 @@ Executable bustle
+   if flag(PostCabalizedGtk2HS)
+     -- Since gtk2hs 0.11, pango is a separate package, and its module names
+     -- have changed.
+-    Build-Depends:  haskell98, mtl, base >= 4 && < 5, containers, parsec,
++    Build-Depends:  mtl, base >= 4 && < 5, containers, parsec,
+                     filepath, process,
+                     gtk > 0.11, glade, pango, glib, cairo
+   else
+-    Build-Depends:  haskell98, mtl, base >= 4 && < 5, containers, parsec,
++    Build-Depends:  mtl, base >= 4 && < 5, containers, parsec,
+                     filepath, process,
+                     gtk > 0.10 && < 0.11, glade, pango, glib, cairo
+ 
+@@ -39,18 +39,18 @@ Executable bustle-count
+   Main-is:        bustle-count.hs
+   Other-modules:  Bustle.Parser, Bustle.Stats, Bustle.Types,
+                   Bustle.Noninteractive
+-  Build-Depends:  haskell98, base >= 4 && < 5, containers, parsec
++  Build-Depends:  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:  haskell98, base >= 4 && < 5, containers, parsec
++  Build-Depends:  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:  haskell98, base >= 4 && < 5, containers, parsec
++  Build-Depends:  base >= 4 && < 5, containers, parsec
+   Ghc-options:    -Wall -fno-warn-unused-imports -fno-warn-unused-do-bind