-r1 bump to fix bug 416579

Package-Manager: portage-2.1.10.62/cvs/Linux x86_64

4 files changed, 165 insertions, 5 deletions

diff --git a/net-misc/wicd/ChangeLog b/net-misc/wicd/ChangeLog
index f5b816a86e4c..f0bb0aab2ffb 100644
--- a/net-misc/wicd/ChangeLog
+++ b/net-misc/wicd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/wicd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.121 2012/05/17 10:23:29 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.122 2012/05/21 07:23:52 tomka Exp $
+
+*wicd-1.7.2.4-r1 (21 May 2012)
+
+  21 May 2012; Thomas Kahle <tomka@gentoo.org>
+  +files/wicd-1.7.2.4-fix-dbus-error.patch, +wicd-1.7.2.4-r1.ebuild:
+  -r1 bump to fix bug 416579
 
 *wicd-1.7.2.4 (17 May 2012)
 
diff --git a/net-misc/wicd/Manifest b/net-misc/wicd/Manifest
index 380e18a25636..f0a641ea4a81 100644
--- a/net-misc/wicd/Manifest
+++ b/net-misc/wicd/Manifest
@@ -6,6 +6,7 @@ AUX wicd-1.7.1-provide-net.patch 327 RMD160 6eac2871820541d9fcdc22b0e1cccb2f6443
 AUX wicd-1.7.1_beta2-init.patch 409 RMD160 58abdf5debc49517977dd5b691c6fe24cd8303c6 SHA1 4c24f4bb924035e109e905789a7669d6e7b0e7ed SHA256 473146793cc9cf8b2b780c1ce13f27138662f9942b53e5a7e293634196fbebcf
 AUX wicd-1.7.1_pre20111210-fix-config-reading.patch 392 RMD160 0faf4dce918ab921cbfa1f9d51a88bbbcfb0a87c SHA1 cd964628f71c972ab1c6ca34946f4a3a30e0b255 SHA256 437b282881bda8146145a30d85848615da039ebf43fa18f89d62da944502fdc3
 AUX wicd-1.7.1_pre20111210-wpa-psk-hex-template.patch 920 RMD160 422aefe7be91d5f28ec2458a43ec546c198732cb SHA1 df6fbf1a68fbf0e4707d40377afddbbb769502c1 SHA256 b721a8b90c97330d12787608108dd8f1db99742c596a786d4fcfa1f3abb19be6
+AUX wicd-1.7.2.4-fix-dbus-error.patch 582 RMD160 bb8ed565ec962360336b5383e47c0654c3132eed SHA1 76ac6a23973c0d780bd7626daef858b3bd419550 SHA256 665c86a6412fd8178ef3ef1552180d4d6ec86f2c625cb6640816b5952e6b1192
 AUX wicd-init-sve-start.patch 317 RMD160 e08a391b31c6d48e67ad51bcd8fb08457bbc0ebc SHA1 149775d7ef4deffc4e66f73fa47276ca194c92cb SHA256 20d7ada99465da5b50d03e5ef117226910bc20288278f6f788be3fbff05716db
 AUX wicd-init.d 434 RMD160 408065ff312ab595022f777853c15031bab17dcf SHA1 87426d2958c9e4bfff9b8ea48d5857d9e67aa191 SHA256 5546deda3d5fa8f6ee1125922f1217182b24d68a22f5a1212509bb13bf0156e2
 DIST Icone-Wicd-Lucid.tar.gz 9015 RMD160 b28de907ac557c7308b3cc5e094e3a31e1cf5ecb SHA1 36140c9d3319ad25978360a38533d800706dd54b SHA256 6e4e3483c6cff7398e6871dd3e4360e361e5c6e64007e8e1240fd1c259ac707e
@@ -30,13 +31,14 @@ EBUILD wicd-1.7.1_pre20120127-r1.ebuild 3912 RMD160 f5a233e6eae04519672e2d722266
 EBUILD wicd-1.7.1_pre20120127.ebuild 3900 RMD160 08f507ec8f7520d1bb38c293d7dc5e2d55c5fb77 SHA1 efbbe0415a4f727c1e3e7756e7144ead35a590b1 SHA256 3836d308f70d0decfb60a8bde4cbb4840e6c198cc1100d005f7636e9feb3bc33
 EBUILD wicd-1.7.2.1.ebuild 4469 RMD160 162b41074d2938ea63e85a43b6b83bcdff2c28b6 SHA1 92dc4373397c03ae69d5e8aa5a91f80714ae2298 SHA256 a114df7389fc3100dc9230c78ae80890b5f485a488f6b1a37b17a0690128c311
 EBUILD wicd-1.7.2.3.ebuild 4470 RMD160 62d5cb8c9e18e31fee2171c5817bc41db3b28499 SHA1 4eb887b6f6a75815f23b99eebb8f51d7f4f56777 SHA256 184c603489838d058482bf98e7dcf0302b413cdb58e7a3a96395fd64908833c9
+EBUILD wicd-1.7.2.4-r1.ebuild 4576 RMD160 574b2ef3f97758c14ef680feff400fd681d866e9 SHA1 a82f94af99908724abd530477f401491f2d03742 SHA256 3da6310590cc4d99e81599bc0ad21c19bb222fa80970483a72ef8b521a336db2
 EBUILD wicd-1.7.2.4.ebuild 4470 RMD160 b7f1e81cbb27ff11654eb95c0f5da6f553b657d6 SHA1 591b4d8b3ff89f91381942d69bb35d21223085bc SHA256 cae1d435c66cdcf34fedde49f56d9a535358800dbfc46f61bfec8fe00ce51db5
-MISC ChangeLog 20931 RMD160 7168b15200f4500ce14dde7b9c9bb3c80fe749fd SHA1 879501b8358835283fdf9dce9e62222d6f0de486 SHA256 2cab86e539985ddf2b53ad7d650696ce902a4616a6e459dd07bc67c5562a4c96
+MISC ChangeLog 21109 RMD160 d76d59b9fddcaf47a593afc463077338e8e86653 SHA1 085541e09337afa7065009021c3ed50375233f74 SHA256 5e44eca2ccd676175472044d63e023a8849d2a8b530b5054cc198a0e7d44ed8d
 MISC metadata.xml 915 RMD160 28228e703502435eb74c398892ec1246024db558 SHA1 68f981a5787f875a72eec0dc48cbdf918b4a06ea SHA256 43ad2b234c323c6727348b18991283a8c6d4f6cdf4f80c35f417646defeba339
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk+00aoACgkQid6yGVZcMrwcIAEAszvJXriBhengMzWv+EmzKacd
-A53h0N7dVhKHO1D2dUkA/2TIuBoX/i6HMqSp5NvaSfY5Qf8KaAkzk3dZ+wWs+VyU
-=poRG
+iF4EAREIAAYFAk+57ZQACgkQid6yGVZcMrwOHwEAvfRIngwiDJgeGphX11dWFgME
+y9nRf7d2iHVb557hiMsA/iLWF9o2LPlKOupNoDLqSYdIm890U3YtWrskhb+ElPbh
+=89v4
 -----END PGP SIGNATURE-----
diff --git a/net-misc/wicd/files/wicd-1.7.2.4-fix-dbus-error.patch b/net-misc/wicd/files/wicd-1.7.2.4-fix-dbus-error.patch
new file mode 100644
index 000000000000..2fddc9a2e55f
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.2.4-fix-dbus-error.patch
@@ -0,0 +1,16 @@
+=== modified file 'wicd/misc.py'
+--- wicd/misc.py	2012-04-30 19:20:47 +0000
++++ wicd/misc.py	2012-05-03 16:01:49 +0000
+@@ -430,7 +430,10 @@
+     """ Sanitize property names to be used in config-files. """
+     allowed = string.ascii_letters + '_' + string.digits
+     table = string.maketrans(allowed, ' ' * len(allowed))
+-    return s.translate(None, table)
++
++    # s is a dbus.String -- since we don't allow unicode property keys,
++    # make it simple.
++    return str(s).translate(None, table)
+ 
+ def sanitize_escaped(s):
+     """ Sanitize double-escaped unicode strings. """
+
diff --git a/net-misc/wicd/wicd-1.7.2.4-r1.ebuild b/net-misc/wicd/wicd-1.7.2.4-r1.ebuild
new file mode 100644
index 000000000000..5ee7269b3e1c
--- /dev/null
+++ b/net-misc/wicd/wicd-1.7.2.4-r1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2012 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-r1.ebuild,v 1.1 2012/05/21 07:23:52 tomka Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="ncurses? xml"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
+
+inherit eutils distutils systemd
+
+DESCRIPTION="A lightweight wired and wireless network manager for Linux"
+HOMEPAGE="http://wicd.sourceforge.net/"
+SRC_URI="http://launchpad.net/wicd/1.7/${PV}/+download/${P}.tar.gz
+	mac4lin? ( http://dev.gentoo.org/~anarchy/dist/wicd-mac4lin-icons.tar.xz )
+	ambiance? ( http://freetimesblog.altervista.org/blog/wp-content/uploads/downloads/2010/05/Icone-Wicd-Lucid.tar.gz )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="X ambiance +gtk ioctl libnotify mac4lin ncurses nls +pm-utils"
+
+DEPEND="nls? ( dev-python/Babel )"
+# Maybe virtual/dhcp would work, but there are enough problems with
+# net-misc/dhcp that I want net-misc/dhcpcd to be guarenteed to be considered
+# first if none are installed.
+RDEPEND="
+	dev-python/dbus-python
+	X? ( gtk? ( dev-python/pygtk
+		|| (
+			x11-misc/ktsuss
+			x11-libs/gksu
+			kde-base/kdesu
+			)
+		)
+	)
+	|| (
+		net-misc/dhcpcd
+		net-misc/dhcp
+		net-misc/pump
+	)
+	net-wireless/wireless-tools
+	net-wireless/wpa_supplicant
+	|| (
+		sys-apps/net-tools
+		sys-apps/ethtool
+	)
+	!gtk? ( dev-python/pygobject:2 )
+	ioctl? ( dev-python/python-iwscan dev-python/python-wpactrl )
+	libnotify? ( dev-python/notify-python )
+	ncurses? (
+		dev-python/urwid
+		dev-python/pygobject:2
+	)
+	pm-utils? ( >=sys-power/pm-utils-1.1.1 )
+	"
+DOCS="CHANGES NEWS AUTHORS README"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.7.1_beta2-init.patch
+	epatch "${FILESDIR}"/${PN}-init-sve-start.patch
+	# Add a template for hex psk's and wpa (Bug 306423)
+	epatch "${FILESDIR}"/${PN}-1.7.1_pre20111210-wpa-psk-hex-template.patch
+	# Fix bug 416579 (should be included in next release)
+	epatch "${FILESDIR}"/${P}-fix-dbus-error.patch
+	# get rid of opts variable to fix bug 381885
+	sed -i "/opts/d" "in/init=gentoo=wicd.in" || die
+	# Make init script provide net per bug 405775
+	epatch "${FILESDIR}"/${PN}-1.7.1-provide-net.patch
+	# Need to ensure that generated scripts use Python 2 at run time.
+	sed -e "s:self.python = '/usr/bin/python':self.python = '/usr/bin/python2':" \
+	  -i setup.py || die "sed failed"
+	if use nls; then
+	  # Asturian is faulty with PyBabel
+	  # (https://bugs.launchpad.net/wicd/+bug/928589)
+	  rm po/ast.po
+	else
+	  # nuke translations
+	  rm po/*.po
+	fi
+	python_copy_sources
+}
+
+src_configure() {
+	local myconf
+	use gtk || myconf="${myconf} --no-install-gtk"
+	use libnotify || myconf="${myconf} --no-use-notifications"
+	use ncurses || myconf="${myconf} --no-install-ncurses"
+	use pm-utils || myconf="${myconf} --no-install-pmutils"
+	configuration() {
+		$(PYTHON) ./setup.py configure --no-install-docs --resume=/usr/share/wicd/scripts/ --suspend=/usr/share/wicd/scripts/ --verbose ${myconf}
+	}
+	python_execute_function -s configuration
+}
+
+src_install() {
+	distutils_src_install
+	keepdir /var/lib/wicd/configurations \
+		|| die "keepdir failed, critical for this app"
+	keepdir /etc/wicd/scripts/{postconnect,disconnect,preconnect} \
+		|| 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
+	systemd_dounit "${S}/other/wicd.service"
+
+	if use mac4lin; then
+		rm -rf "${D}"/usr/share/pixmaps/wicd || die "Failed to remove old icons"
+		mv "${WORKDIR}"/wicd "${D}"/usr/share/pixmaps/
+	fi
+	if use ambiance; then
+		# Overwrite tray icons with ambiance icon
+		rm "${WORKDIR}/Icone Wicd Lucid"/signal*
+		cp "${WORKDIR}/Icone Wicd Lucid"/*.png "${D}"/usr/share/pixmaps/wicd/
+	fi
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+
+	elog "You may need to restart the dbus service after upgrading wicd."
+	echo
+	elog "To start wicd at boot, add /etc/init.d/wicd to a runlevel and:"
+	elog "- Remove all net.* initscripts (except for net.lo) from all runlevels"
+	elog "- Add these scripts to the RC_PLUG_SERVICES line in /etc/rc.conf"
+	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"
+	fi
+}