Permalink
Browse files

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

… sync with portage
  • Loading branch information...
1 parent 4fd2c01 commit 5faffa7527aa54dff697f2fc85cd5b4662febcce @markwright markwright committed Apr 3, 2013
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $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
@@ -19,20 +19,21 @@ 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
x11-libs/pango
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"
@@ -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: $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/bustle/bustle-0.4.0.ebuild,v 1.4 2012/03/10 16:04:21 slyfox 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
@@ -7,7 +7,7 @@ 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/"
@@ -42,16 +42,7 @@ DEPEND="${RDEPEND}
dev-haskell/text
>=dev-lang/ghc-6.10.4"
-src_prepare() {
- sed -e 's@, cairo@, cairo >= 0.12 \&\& < 0.13@g' \
- -e 's@, glib@, glib >= 0.12 \&\& < 0.13@g' \
- -e 's@, gtk >= 0.12.3$@, gtk >= 0.12.3 \&\& < 0.13@' \
- -e 's@, gtk > 0.12$@, gtk >= 0.12 \&\& < 0.13@' \
- -e 's@, gtk$@, gtk >= 0.12 \&\& < 0.13@' \
- -e 's@, pango@, pango >= 0.12 \&\& < 0.13@g' \
- -i "${S}/${PN}.cabal" \
- || die "Could not change deps for gtk+2 in ${S}/${PN}.cabal"
-}
+PATCHES=("${FILESDIR}"/${P}-restrict-gtk2hs-deps-to-gtkplus2.patch)
src_compile() {
# compile haskell part
@@ -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
@@ -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
@@ -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

0 comments on commit 5faffa7

Please sign in to comment.