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

(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 618E971F)

8 files changed, 279 insertions, 23 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/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