summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2013-08-04 13:28:08 +0000
committerJeroen Roovers <jer@gentoo.org>2013-08-04 13:28:08 +0000
commit12eca6e9ce24be26c4c043cc03c1c31b3a81f74a (patch)
treedf21af3c554617edf67cca235ab3d44d8722fc50 /net-analyzer
parentUpgrade to IUSE ocaml with shift of findlib behind IUSE ocaml and consequent ... (diff)
downloadgentoo-2-12eca6e9ce24be26c4c043cc03c1c31b3a81f74a.tar.gz
gentoo-2-12eca6e9ce24be26c4c043cc03c1c31b3a81f74a.tar.bz2
gentoo-2-12eca6e9ce24be26c4c043cc03c1c31b3a81f74a.zip
Remove dev-libs/atk dependency by Nikoli (bug #479618). Add x11-libs/gdk-pixbuf dependency.
(Portage version: 2.2.0_alpha192/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'net-analyzer')
-rw-r--r--net-analyzer/wireshark/ChangeLog7
-rw-r--r--net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild4
-rw-r--r--net-analyzer/wireshark/wireshark-1.10.1.ebuild4
3 files changed, 10 insertions, 5 deletions
diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index c8f17c1fb864..279d3f2426cb 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-analyzer/wireshark
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.534 2013/08/04 11:59:38 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.535 2013/08/04 13:28:08 jer Exp $
+
+ 04 Aug 2013; Jeroen Roovers <jer@gentoo.org> wireshark-1.10.1.ebuild,
+ wireshark-1.10.1-r1.ebuild:
+ Remove dev-libs/atk dependency by Nikoli (bug #479618). Add
+ x11-libs/gdk-pixbuf dependency.
04 Aug 2013; Sergey Popov <pinkbyte@gentoo.org> wireshark-1.10.1-r1.ebuild:
Restore ability to build wireshark GUI-less, wrt bug #479692. Thanks to
diff --git a/net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild b/net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild
index f0b85d0eb32e..4bec8db456a8 100644
--- a/net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild,v 1.3 2013/08/04 11:59:38 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.1-r1.ebuild,v 1.4 2013/08/04 13:28:08 jer Exp $
EAPI=5
inherit autotools eutils fcaps user
@@ -23,7 +23,7 @@ REQUIRED_USE="
"
GTK_COMMON_DEPEND="
- dev-libs/atk
+ x11-libs/gdk-pixbuf
x11-libs/pango
x11-misc/xdg-utils
"
diff --git a/net-analyzer/wireshark/wireshark-1.10.1.ebuild b/net-analyzer/wireshark/wireshark-1.10.1.ebuild
index 5c8dd60398af..48e70b2daa05 100644
--- a/net-analyzer/wireshark/wireshark-1.10.1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.10.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.1.ebuild,v 1.10 2013/08/01 13:02:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.1.ebuild,v 1.11 2013/08/04 13:28:08 jer Exp $
EAPI=5
inherit autotools eutils fcaps flag-o-matic user
@@ -31,7 +31,7 @@ RDEPEND="
geoip? ( dev-libs/geoip )
gtk? (
>=x11-libs/gtk+-2.4.0:2
- dev-libs/atk
+ x11-libs/gdk-pixbuf
x11-libs/pango
x11-misc/xdg-utils
)