Instead of || die, force networkmanager enabled if wicd is disabled.
authorSamuli Suominen <ssuominen@gentoo.org>
Fri, 26 Feb 2010 19:30:11 +0000 (19:30 +0000)
committerSamuli Suominen <ssuominen@gentoo.org>
Fri, 26 Feb 2010 19:30:11 +0000 (19:30 +0000)
Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

kde-misc/knetworkmanager/ChangeLog
kde-misc/knetworkmanager/Manifest
kde-misc/knetworkmanager/knetworkmanager-4.4.0_p20100225.ebuild

index f59a549252e1d9770a4f714420a232e4881a4a5a..6431efb3b2fe0c236d1a2e508ed091e84837ee38 100644 (file)
@@ -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)
 
index 914766eec3510beaa2654b42865dc83c2bff1778..a1bc74c75c6ccda538faa35ee7f8c907ff45f060 100644 (file)
@@ -1,14 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST knetworkmanager-4.4.0_p20100225.tar.bz2 507222 RMD160 72be0d003acead262563e8aa66d86f24267cccfe SHA1 91e40a0e7919dabc2ee1a0e17408980039322ab9 SHA256 fbb79e3ba919506fb544ce85cd7bd6e0b09784b0530296413a18bca6c4058702
-EBUILD knetworkmanager-4.4.0_p20100225.ebuild 1294 RMD160 7b95cd58915a19c037540deece794bc1545c3bc6 SHA1 4695145783e7b6a68ba93834f459f941566c2dbb SHA256 fe4ef0d5fbe5c348efb5036d80f85c2cb7f50ebba5a893da7554458fdabb00f3
-MISC ChangeLog 419 RMD160 0b00bdb82d84130671804c01041e95950741debd SHA1 1970ea4808500dbd32704acece7349ceda495ab3 SHA256 008f88b1becfc8965ab1935194b3e93c311144fb100126871c1169caa49990e5
+EBUILD knetworkmanager-4.4.0_p20100225.ebuild 1120 RMD160 22ef86ad56ef7c476356384a5fcbc48912bab20e SHA1 df378d5d205831a837385e8631f52aeefaadddc4 SHA256 305c6d4918a6750193e4d2366a3fc62d1855e39ec1286fd42a2546c5e890c6f4
+MISC ChangeLog 584 RMD160 a05869d9c04f02c105f76fdd2d5f72fec7842aa0 SHA1 dd8d5fef813d7290f28471f1eb87fc7205639d08 SHA256 d84e87eee362579f950788406449acd8ca14420cba5ce9ba741442e1503c6c79
 MISC metadata.xml 301 RMD160 3e2112d23805982b5fc816bc6fef1f71b4415a2b SHA1 9bb446718c9b5a238a218ee744b0fea754b68ef1 SHA256 a24dfda69e4b52de8c2d46c361a6855da37e98afbd0c6f13e34149c7c0e01ce1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuIHa4ACgkQjDdoMVfcAHg6lQCaA3OpoQW4HgPcI8uZkQBGBFZW
-+6YAniMtE21IndFMFaQpk6Rq/jamT07p
-=NyRm
------END PGP SIGNATURE-----
index 203b67696a328569363e1a7da9367701fbe15700..d316466615c281e85fc3066b7fc92097ac620fd1 100644 (file)
@@ -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