Check for sys-auth/consolekit instead of sys-auth/pambase[consolekit] since the pam module is not required with display managers.

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 25 insertions, 7 deletions

diff --git a/net-misc/wicd/ChangeLog b/net-misc/wicd/ChangeLog
index c9abe2bf6bb4..43c79511d28d 100644
--- a/net-misc/wicd/ChangeLog
+++ b/net-misc/wicd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/wicd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.137 2013/01/20 09:39:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.138 2013/03/14 03:08:15 ssuominen Exp $
+
+  14 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> wicd-1.7.2.4-r2.ebuild:
+  Check for sys-auth/consolekit instead of sys-auth/pambase[consolekit] since
+  the pam module is not required with display managers.
 
   20 Jan 2013; Agostino Sarubbo <ago@gentoo.org> wicd-1.7.2.4-r2.ebuild:
   Stable for X86, wrt bug #441966
diff --git a/net-misc/wicd/Manifest b/net-misc/wicd/Manifest
index 54d7a86d873d..e6a9e7b7d919 100644
--- a/net-misc/wicd/Manifest
+++ b/net-misc/wicd/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX add-wpa-psk-hex-template.patch 980 SHA256 d5e45971adb2cd8649c81ce3a4edfb4bda954981767ff8a95374b062b460fca7 SHA512 ef6666158ee059a24ef41b6151978acffcd347c36f7c818567579595f9a22c4703ffbcb15f5cc37fd4c26802eadbe1575de0d3752829bc753ba0ec6abc5b95d1 WHIRLPOOL 70109df7c72d328673f67bf8086ecd11eb89dcc61cc65c7aea3ce0e6fe7b0e737dbf038e9934e9773fa4c5449f99b2d752eb3ad79200b4f099a3c970af65f4c5
 AUX wicd-1.7.1-provide-net.patch 327 SHA256 9da2b1ccbc1c363466048bb1adf91612dd68b988bca96daad79ae1f81a89e09b SHA512 7f1d9d70513a367db7b296608d9864bfc105d44204e051c4c1456e5e7dc995b1c73399e8fd5fdd6499538568dcca2b1b6af928519461abd92734d1b16d3406e8 WHIRLPOOL 9314947dcf5fbf17164b5201c7cb8a78de86143c8c4f455b31dcf16141e6f401786dedce1ebdeabac202cba9e2ded8e33edb3ca32214be425f03fb2d60c27e72
 AUX wicd-1.7.1_beta2-init.patch 409 SHA256 473146793cc9cf8b2b780c1ce13f27138662f9942b53e5a7e293634196fbebcf SHA512 1257e3d07b152b17394960d35fac196ed74e2314da8c7e25959f2a10498f4ba39673929963b75a7170ac7070f061501f3a404b07a891e6c108c5386a3711cedb WHIRLPOOL a075bbc33344a23ee088a5b7bdfc76d25f2335deac4d20d1df9a859728ea3fc60e25deb55d29e5084caeffa99f74f6ead79363dc96cfa45aaa29fe98f5386284
@@ -11,6 +14,17 @@ AUX wicd-init.d 434 SHA256 5546deda3d5fa8f6ee1125922f1217182b24d68a22f5a1212509b
 DIST Icone-Wicd-Lucid.tar.gz 9015 SHA256 6e4e3483c6cff7398e6871dd3e4360e361e5c6e64007e8e1240fd1c259ac707e SHA512 0df0dbdf05b462264dca2dd9955454a82f688b0fbfa7c2ad70a424df57eb27b35561d37819fc88b5746cff8a54de5b7b43ec325d2f98a4a1a30e4d500e86d2f8 WHIRLPOOL 336f363092c9bac7523047b6052a856a699820147967820418c6ac1ca528c472d371c6c211c505c325b5eb001812042c01425b05e1dfdf2d4a528f96686c530a
 DIST wicd-1.7.2.4.tar.gz 439297 SHA256 dcfdfb5dbbb49dbb9b205fddf064d6b1a4e88f66f1cf40d12fb7fe0e0c7cdc97 SHA512 6dd8d4726c5f9c943d90305b7ed70573b42b5dae00de443209d9f526778e91ac01aabffa14447c47374b4d9986133aacfcc970735d1b5befa232da44d3190d7c WHIRLPOOL 59885a22dbf350e73a55fdbf7ea1c9b93a339edae116beb1c22c271762d90488ecdeb7952a4efc8241d362b5bafcaccf88053c4d5c41468cba0cd524cf2a5756
 DIST wicd-mac4lin-icons.tar.xz 53136 SHA256 4c48c769c71f962415e3bd3573557e9288351afb867347f9a6f652883ae31011
-EBUILD wicd-1.7.2.4-r2.ebuild 4722 SHA256 2d29845643c969c99d80162d49ebbeb839a08cae7755c6e8f9581b79787c5915 SHA512 31b0d31f515b8fbb31dee051e133322db83b91facc8df737954e7683004268fc217e2a23b354512112b3bacd203e6f9a90c93e151f70e051d6882a936c05ba3c WHIRLPOOL 60e3a0c7bad47756fea21493c2be47025ada039c57018049b4ba293da272ee829019761f3eaf6a9a31233ac98d64328252c6720e4f6519d74106579a9bf96e42
-MISC ChangeLog 23325 SHA256 3c023c49b0e0ef89d0723bd6e7fbbcc668266531a7f574dcde5e5ff77df465e4 SHA512 0f6984cd97dcb6b467ed13ddcd0e9b406274ff4f10d70ded5de7a2ffbe97dc440f434888b5eeac9170f5c1cfb297e6a074199be39059164ac2fd297fe158d588 WHIRLPOOL f2556aaadc7397d5b4cf222d83d62fd15938894a0584244e84d0c6eecbceeb4e147e202bb32a5dd8f6f17351d47d99cd11f2ffd5d6c358b99290210bc577a849
+EBUILD wicd-1.7.2.4-r2.ebuild 4717 SHA256 cbc88379d72b1e1debb7aad05133ce3c647d78a9ef339b3f12ebabfdf10c7e5a SHA512 5fb8e4ffb954125a32bc0746bf5ddee0e0d98e2c5b981b323441e01e88af974669a72a57022824a2f4c961cdfc0b3ca73909ae96162bd2cebb671e6410e2b7c9 WHIRLPOOL 2b9e813f6b3b5b5d319d885bfbd596cf0a70ba584592a2d73df46457951d5f066506d9cf7988d3078be5d55e5470faec5aab7486d0bb7706207f5e063041813f
+MISC ChangeLog 23544 SHA256 b2cef4046151d7c2b16a1d513cfb762b682488e2be79d4cbeb59fdb68e95cd93 SHA512 02ac9feab61032be9067930afd47da316b34dc50a135061ca0ff6028a41abfa5d2775b5c9daff8c29e37d567bbe0f7add5cee23f642e5dad06cc1c51d8aeaf8a WHIRLPOOL 75470d19d2327e07e78faea37e2db3e51e5dbf3eb13c8ba25ee40eb2379b3ee6ee301246028772ee59f2c712dd4f85b6f88c5d1a0f4079371204799ef0cda7b3
 MISC metadata.xml 915 SHA256 43ad2b234c323c6727348b18991283a8c6d4f6cdf4f80c35f417646defeba339 SHA512 7f8fa4d48d105477dbb79be857081a1cd2a476e0b0b1029d7439ac11f50c91ea88b26a33aecd028690d49184745240d85564ca344c9ca107bf3a746faf775ec5 WHIRLPOOL 842faab9833f334d85da135eac2f5e5c9ad7b37ec6d2590c490a315002f9fda1a00d1b4e2ce7600bb09f03ad7dd224c296519279fde9b422a2a8e3d1afa88d7a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRQT8aAAoJEEdUh39IaPFN/k8H/3bK7TTmHOKW1NCELF729kOE
+2migY2m8r8o5y1rWXOU+PeqQZCULrPBNOuZIsuYJ9utXhF14WyOvLNG90eQevffu
+zXSd6g0KXvOGDsH/efY3f66G1jGYKWZUCYZjiVumdIJz99H991PJ72FA4tyBQMGa
+bQLvmF7SNlEjS5dkkx4FDZBQwtu2o9DnXp59/g4ujB73BVUTRtgCdEoMTsj56PSI
+Gph0A87FPjmTLvZYUaVbi7mzTqTPFjeX/RlbCcebRQfE5ysjx4CdQ7DUZ0bbPiqJ
+xYCiSrcmhmw5nIZlveSKDwS6n983BAT2dAlWAsTT2VNRr6sN0mugEWl0cCz0J+M=
+=9Pc0
+-----END PGP SIGNATURE-----
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 3c87e55aab1c..3334ca1de5a8 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
 # 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.7 2013/01/20 09:39:18 ago Exp $
+# $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 $
 
 EAPI=3
 
@@ -132,8 +132,8 @@ pkg_postinst() {
 	elog "(For example, rc_hotplug=\"!net.eth* !net.wlan*\")"
 	# Maintainer's note: the consolekit use flag short circuits a dbus rule and
 	# allows the connection. Else, you need to be in the group.
-	if ! has_version sys-auth/pambase[consolekit]; then
-			ewarn "Wicd-1.6 and newer requires your user to be in the 'users' group. If"
-			ewarn "you are not in that group, then modify /etc/dbus-1/system.d/wicd.conf"
+	if ! has_version sys-auth/consolekit; then
+		ewarn "Wicd-1.6 and newer requires your user to be in the 'users' group. If"
+		ewarn "you are not in that group, then modify /etc/dbus-1/system.d/wicd.conf"
 	fi
 }