diff options
| author |   Thomas Kahle <tomka@gentoo.org> | 2014-05-07 05:31:09 +0000 |
|---|---|---|
| committer | Thomas Kahle <tomka@gentoo.org> | 2014-05-07 05:31:09 +0000 |
| commit | a5ce096aee5d351891593b47cbe673019c35fb7b (patch) | |
| tree | 6b716da9e6748614f49e45eee4f3e44d0d6a02ab /net-misc | |
| parent | Whitespace (diff) | |
| download | gentoo-2-a5ce096aee5d351891593b47cbe673019c35fb7b.tar.gz gentoo-2-a5ce096aee5d351891593b47cbe673019c35fb7b.tar.bz2 gentoo-2-a5ce096aee5d351891593b47cbe673019c35fb7b.zip | |
fix wrong dep nesting (bug 509730)
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 565C32BC)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/wicd/ChangeLog | 6 | ||||
| -rw-r--r-- | net-misc/wicd/wicd-1.7.2.4-r2.ebuild | 8 | ||||
| -rw-r--r-- | net-misc/wicd/wicd-1.7.2.4-r3.ebuild | 6 |
3 files changed, 12 insertions, 8 deletions
diff --git a/net-misc/wicd/ChangeLog b/net-misc/wicd/ChangeLog index f6695144e190..38f9e4e05d20 100644 --- a/net-misc/wicd/ChangeLog +++ b/net-misc/wicd/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-misc/wicd # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.145 2014/04/26 08:26:53 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.146 2014/05/07 05:31:09 tomka Exp $ + + 07 May 2014; Thomas Kahle <tomka@gentoo.org> wicd-1.7.2.4-r2.ebuild, + wicd-1.7.2.4-r3.ebuild: + fix wrong dep nesting (bug 509730) 26 Apr 2014; Pacho Ramos <pacho@gentoo.org> wicd-1.7.2.4-r3.ebuild: Adapt to latest pygobject don't providing python2.6 support diff --git a/net-misc/wicd/wicd-1.7.2.4-r2.ebuild b/net-misc/wicd/wicd-1.7.2.4-r2.ebuild index 3334ca1de5a8..ff7f3331697c 100644 --- a/net-misc/wicd/wicd-1.7.2.4-r2.ebuild +++ b/net-misc/wicd/wicd-1.7.2.4-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.2.4-r2.ebuild,v 1.8 2013/03/14 03:08:15 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.2.4-r2.ebuild,v 1.9 2014/05/07 05:31:09 tomka Exp $ EAPI=3 @@ -29,13 +29,13 @@ DEPEND="nls? ( dev-python/Babel )" # first if none are installed. RDEPEND=" dev-python/dbus-python - X? ( gtk? ( dev-python/pygtk + X? ( + gtk? ( dev-python/pygtk ) || ( x11-misc/ktsuss x11-libs/gksu kde-base/kdesu ) - ) ) || ( net-misc/dhcpcd diff --git a/net-misc/wicd/wicd-1.7.2.4-r3.ebuild b/net-misc/wicd/wicd-1.7.2.4-r3.ebuild index ffd62c598bb4..99e0f77fd252 100644 --- a/net-misc/wicd/wicd-1.7.2.4-r3.ebuild +++ b/net-misc/wicd/wicd-1.7.2.4-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.2.4-r3.ebuild,v 1.6 2014/04/26 08:26:53 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.2.4-r3.ebuild,v 1.7 2014/05/07 05:31:09 tomka Exp $ EAPI=5 @@ -23,13 +23,13 @@ IUSE="doc X ambiance +gtk ioctl libnotify mac4lin ncurses nls +pm-utils" DEPEND="nls? ( dev-python/Babel )" RDEPEND="${PYTHON_DEPS} dev-python/dbus-python[${PYTHON_USEDEP}] - X? ( gtk? ( dev-python/pygtk + X? ( + gtk? ( dev-python/pygtk ) || ( x11-misc/ktsuss x11-libs/gksu kde-base/kdesu ) - ) ) || ( net-misc/dhcpcd |