Stable on amd64 wrt bug #307257.Various QA fixes

Package-Manager: portage-2.2_rc65/cvs/Linux x86_64

diff --git a/net-misc/wicd/ChangeLog b/net-misc/wicd/ChangeLog
index 903df6dacb96cb456c3231aa2f9add6a82c0999b..29f85939c0ffb0f79101c93311fce468e8bb83a0 100644 (file)
--- a/net-misc/wicd/ChangeLog
+++ b/net-misc/wicd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-misc/wicd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.68 2010/03/02 10:39:59 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.69 2010/03/08 17:18:17 hwoarang Exp $
+
+  08 Mar 2010; Markos Chandras <hwoarang@gentoo.org> wicd-1.7.0.ebuild:
+  Stable on amd64 wrt bug #307257. Various QA fixes
 
   02 Mar 2010; Christian Faulhammer <fauli@gentoo.org> wicd-1.7.0.ebuild:
   stable x86, bug 307257

diff --git a/net-misc/wicd/Manifest b/net-misc/wicd/Manifest
index dfd68ec6dc5834efd4156012ef101216e023fb38..ba843ad7c9cb51761d31d700442f18eb2d4508e5 100644 (file)
--- a/net-misc/wicd/Manifest
+++ b/net-misc/wicd/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX wicd-init.d 434 RMD160 408065ff312ab595022f777853c15031bab17dcf SHA1 87426d2958c9e4bfff9b8ea48d5857d9e67aa191 SHA256 5546deda3d5fa8f6ee1125922f1217182b24d68a22f5a1212509bb13bf0156e2
 DIST wicd-1.6.2.2.tar.gz 464976 RMD160 38a5c84a6384c1e6563ecc51e478c633b7cc8a00 SHA1 97e66d550ebc483a699c8e87482f82c9185bc0c8 SHA256 2ca57c71a2415fa0d971dcecdb5541a1f93a80fc7756e46923d166591d97de23
 DIST wicd-1.7.0.tar.bz2 411166 RMD160 66893e4043ba7e96996d698f847c0ab3b350df6a SHA1 1cd087f53538b1f6e1cfad9735c87741e05698f6 SHA256 14c5692bf8a4c93c9ac083ce9ad677b0d9022b19f84e777854766b2a6f753b32
 EBUILD wicd-1.6.2.2.ebuild 2625 RMD160 3972dcb385154a71a56709fbf8d35172e47f0bf6 SHA1 e644a28841fa359cd2b6377e1a3860f9c42022be SHA256 f949ebf6a287ad91664e737a220724c8b437899d9b249cace8f8b028d17dca4a
-EBUILD wicd-1.7.0.ebuild 2867 RMD160 8470dda36485b3b7a2f79367ee2ff1cf3d142a30 SHA1 6187e753620263f4f03fa56d905aa436290806a2 SHA256 abe84d1b9bb96a33a1cc939070ca34058ab9c47683be8c10b9fc7f6bc57e8a68
-MISC ChangeLog 12795 RMD160 b118d1e568620d63229d7746f44e4ed5ac8690db SHA1 d0cc2cbf35f873db8e19b7c1d322f160cc50cb54 SHA256 a1e4494646170fb13320fcc289572f05cbd12513b5fa4637144ec7bcad1465bc
+EBUILD wicd-1.7.0.ebuild 2824 RMD160 99f5d0c1469fada25f1282c162a95a4a503c310c SHA1 ab8675c2997a90d60fa0420652b385cfe9cc9a5c SHA256 7315e0ddb9a574ac4a25e6c969cf6ff4ab163582dfd334e575468090ef677a49
+MISC ChangeLog 12923 RMD160 275d66677937e6d3452ce3013b41629c0647ae26 SHA1 2110a9ca5606adbfcf0b7b5682ba60f555e4222a SHA256 44880a83895e4492070d1c007959408835f0e202c0a08752c4290035607f7296
 MISC metadata.xml 684 RMD160 dc51b5c7f84f2c476614fe1b1f21346173c1e21d SHA1 4d50cc373bf17369ea360f34e76109a685443670 SHA256 a7fc7ee6f63766f3a2fb4a8d204a8fca80591dca0a2783d8094911b24587a866
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuM6wUACgkQNQqtfCuFneMJ+ACdG3ZBkTt1LvnRW4HkNhtTa4HE
-4Z4AniuhHZKOXB144bi/RALcVX0fjoec
-=3i90
------END PGP SIGNATURE-----

diff --git a/net-misc/wicd/wicd-1.7.0.ebuild b/net-misc/wicd/wicd-1.7.0.ebuild
index d9e5428ad822fbb8fe2aa377ad611dc35fb93412..66d12ec5bdb017a290fb51262fc20de97aaa310c 100644 (file)
--- a/net-misc/wicd/wicd-1.7.0.ebuild
+++ b/net-misc/wicd/wicd-1.7.0.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/net-misc/wicd/wicd-1.7.0.ebuild,v 1.4 2010/03/02 10:39:59 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.0.ebuild,v 1.5 2010/03/08 17:18:17 hwoarang Exp $
 
 EAPI=2
 
@@ -12,7 +12,7 @@ SRC_URI="http://downloads.wicd.net/src/stable/1.7.x/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="X +gtk ioctl libnotify ncurses nls +pm-utils"
 
 DEPEND=""
@@ -66,7 +66,7 @@ src_install() {
                || die "keepdir failed, critical for this app"
        keepdir /var/log/wicd \
                || die "keepdir failed, critical for this app"
-       use nls || rm -rf ${D}/usr/share/locale
+       use nls || rm -rf "${D}"/usr/share/locale
 }
 
 pkg_postinst() {
@@ -80,10 +80,8 @@ pkg_postinst() {
        elog "(For example, RC_PLUG_SERVICES=\"!net.eth0 !net.wlan0\")"
        # 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; then
-               if ! built_with_use sys-auth/pambase consolekit; then
+       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"
-               fi
        fi
 }