diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-02-26 19:30:11 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-02-26 19:30:11 +0000 |
| commit | 382ca95d51a28176a955f930f078aaf26a4df1ed (patch) | |
| tree | b3cde72d170505edeaa0c0f6dd83069001ff1016 /kde-misc | |
| parent | Delete calls to python_version(). (diff) | |
| download | gentoo-2-382ca95d51a28176a955f930f078aaf26a4df1ed.tar.gz gentoo-2-382ca95d51a28176a955f930f078aaf26a4df1ed.tar.bz2 gentoo-2-382ca95d51a28176a955f930f078aaf26a4df1ed.zip | |
Instead of || die, force networkmanager enabled if wicd is disabled.
(Portage version: 2.2_rc63/cvs/Linux x86_64)
Diffstat (limited to 'kde-misc')
| -rw-r--r-- | kde-misc/knetworkmanager/ChangeLog | 6 | ||||
| -rw-r--r-- | kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20100225.ebuild | 14 |
2 files changed, 7 insertions, 13 deletions
diff --git a/kde-misc/knetworkmanager/ChangeLog b/kde-misc/knetworkmanager/ChangeLog index f59a549252e1..6431efb3b2fe 100644 --- a/kde-misc/knetworkmanager/ChangeLog +++ b/kde-misc/knetworkmanager/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for kde-misc/knetworkmanager # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/knetworkmanager/ChangeLog,v 1.12 2010/02/26 19:14:01 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-misc/knetworkmanager/ChangeLog,v 1.13 2010/02/26 19:30:11 ssuominen Exp $ + + 26 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> + knetworkmanager-4.4.0_p20100225.ebuild: + Instead of die, force networkmanager enabled if wicd is disabled. *knetworkmanager-4.4.0_p20100225 (26 Feb 2010) diff --git a/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20100225.ebuild b/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20100225.ebuild index 203b67696a32..d316466615c2 100644 --- a/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20100225.ebuild +++ b/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20100225.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20100225.ebuild,v 1.1 2010/02/26 19:14:01 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20100225.ebuild,v 1.2 2010/02/26 19:30:11 ssuominen Exp $ EAPI="2" @@ -20,22 +20,12 @@ IUSE="consolekit debug +networkmanager wicd" DEPEND=" !kde-misc/networkmanager-applet >=kde-base/solid-${KDE_MINIMAL}[networkmanager?,wicd?] + !wicd? ( >=kde-base/solid-${KDE_MINIMAL}[networkmanager] ) >=net-misc/networkmanager-0.7 consolekit? ( sys-auth/consolekit ) " RDEPEND="${DEPEND}" -pkg_setup() { - if ! use networkmanager && ! use wicd; then - eerror "You need to pick up one of the backend implementations" - eerror " * networkmanager" - eerror " * wicd" - die "No backend selected" - fi - - kde4-base_pkg_setup -} - src_prepare() { kde4-base_src_prepare |