Fix python implementation deps and urwid-1.3.0 compat (523030, 541936)

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x565C32BC

4 files changed, 172 insertions, 19 deletions

diff --git a/net-misc/wicd/ChangeLog b/net-misc/wicd/ChangeLog
index 56bf29d65b10..4b5934d0944f 100644
--- a/net-misc/wicd/ChangeLog
+++ b/net-misc/wicd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/wicd
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.158 2015/06/04 19:05:22 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.159 2015/08/06 08:08:55 tomka Exp $
+
+*wicd-1.7.3-r1 (06 Aug 2015)
+
+  06 Aug 2015; Thomas Kahle <tomka@gentoo.org>
+  +files/wicd-1.7.3-urwid-1.3.0.patch, +wicd-1.7.3-r1.ebuild:
+  Fix python implementation deps and urwid-1.3.0 compat (523030, 541936)
 
   04 Jun 2015; Michael Palimaka <kensington@gentoo.org> wicd-1.7.2.4-r3.ebuild,
   wicd-1.7.3.ebuild:
diff --git a/net-misc/wicd/Manifest b/net-misc/wicd/Manifest
index 560495866684..43ce5d7af92a 100644
--- a/net-misc/wicd/Manifest
+++ b/net-misc/wicd/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+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
@@ -11,6 +11,7 @@ AUX wicd-1.7.2.4-second-urwid.patch 1378 SHA256 3eed2084f5631bdeb4a27ce1f729aa4b
 AUX wicd-1.7.2.4-urwid.patch 2281 SHA256 6770f31f3a701fcdb019562ec63e53653463aca471d0d907227f6608d671cdf2 SHA512 0376d1f5fc3d9cd857fafa30024b6e754d202bbebc0c7fd498b77fd4c34d70cacd4c2b1cf6f5bd4be0ef6f6e2617feceab3e5b734e91ab2efe6c69f1a6a14508 WHIRLPOOL 1ebdf2f3c1362aa70fbed202c9d5afdc42ca12e1876c39184c2d52e681207a531b0bfd28c3131e3eaca158cc4277f61e7b2369a7414b1405189200b11d8d026a
 AUX wicd-1.7.3-add-missing-gnome-shell-extension.patch 1695 SHA256 9e94c652e2a85d8a2bdff41b9a2d7c28dd9f552fb0bdc88cff61e2b9b4336deb SHA512 4a08360d192f040983e782a81f8a57b8407726531551f512f5ea8537c18c3abf8934a1c597e73945637e15c96ba0f26cfc63525d00981a7ab6897ef0ab4ed2e5 WHIRLPOOL 6fa2c1bd6d7397dfc28e354019eba31ff77a6f1716c0b4a0f9490528dd85ce673c32dfd2c94c157384298716bf3839af4b7505339cfd0586e8f3668d25829eea
 AUX wicd-1.7.3-undefined-LANG.patch 946 SHA256 747f5a0b87460148af67c37cb63c563dd0ec68b362a1853836515f4ccfed182e SHA512 c2d197d41a84975bb3caf44de9b05b741b6702c38079ecc917632f9eedcf2be71373416154013690620511f2e9e99fb0d88cee0b22292fe007795cde664e63e5 WHIRLPOOL 0b36b1d1cf4de2ec375f70e8bfbf7d453eb5104bd3aa1b0e4e2ade6b9e211f1d0759cdd7b78a356ce5ef2d8a4cf5017a2529e8f274b41408597d45315e171085
+AUX wicd-1.7.3-urwid-1.3.0.patch 546 SHA256 aef51b3ec6765a0a47c8c32b606f40e31c574dfad5060ddf6149fb68954e5992 SHA512 48183d805b096c4a1857990d1d9a709544406ee93607f96d4eaf46e4f7729a73e0178251f1168aa516c38bba727821c70a9104de84ca5b4288f91219dfeed2e9 WHIRLPOOL 1d3daa8665362a469799d4f27da26549844e513cfb9bf65902a9879ea33c8fea4d0072406ad6e0e7b40b207082b7c8275ca3831cf8d2e03cc21ee27fe05c2fa6
 AUX wicd-init-sve-start.patch 317 SHA256 20d7ada99465da5b50d03e5ef117226910bc20288278f6f788be3fbff05716db SHA512 d62db40a156aa9e7b97b23b3ebceded77bcae18ae513c39b8e4ef8733c30429059a83f932c83b3cf0b90fd0aeeeadc6249a71498c569630df057037acf43f3fc WHIRLPOOL 7df520e4e3291e032d031763f43596e97b66bdcf8418f0a328b885e3ee7051807b7023fa0663e2f42010bc3b71e4d7852e954a5b8e00e2805f4487f409a0da31
 AUX wicd-init.d 434 SHA256 5546deda3d5fa8f6ee1125922f1217182b24d68a22f5a1212509bb13bf0156e2 SHA512 1c774c8243901378307ab588dcddf31d861360cf35ed7f89edca1767008c6f7a21db92067186ab141966c2c11105d39aac196945f950d355fe45ad1c27111628 WHIRLPOOL cee886c76f77f80162c5f5ad5beaf77e43f38e7c40fdae88ca28b59f50fd2c8db8422357e96d74a53b22602e5250237833a8c4158321dc8c7e1c0844058971cb
 DIST Icone-Wicd-Lucid.tar.gz 9015 SHA256 6e4e3483c6cff7398e6871dd3e4360e361e5c6e64007e8e1240fd1c259ac707e SHA512 0df0dbdf05b462264dca2dd9955454a82f688b0fbfa7c2ad70a424df57eb27b35561d37819fc88b5746cff8a54de5b7b43ec325d2f98a4a1a30e4d500e86d2f8 WHIRLPOOL 336f363092c9bac7523047b6052a856a699820147967820418c6ac1ca528c472d371c6c211c505c325b5eb001812042c01425b05e1dfdf2d4a528f96686c530a
@@ -18,25 +19,14 @@ DIST wicd-1.7.2.4.tar.gz 439297 SHA256 dcfdfb5dbbb49dbb9b205fddf064d6b1a4e88f66f
 DIST wicd-1.7.3.tar.gz 542341 SHA256 91e38857b1651d242ed7e3b3e3fd8b076b4d06a23eedb033310fae510ece8401 SHA512 3ff3f42cd228327641b584bf85ef785a7d490fa5a57d1aa695f9b4860dae086c240a60321832a0aeee2dfb23de70da1a9f6abce4f1b6ecab58455304407fd536 WHIRLPOOL 69a9042e77f78f6d0dabc73e0569023d5a6747b82e3c944aad51a74681765b1b439beef1a578fcba4f048dbba6cbeabe0aca54ea62076d7dacdcbc4100ef2025
 DIST wicd-mac4lin-icons.tar.xz 53136 SHA256 4c48c769c71f962415e3bd3573557e9288351afb867347f9a6f652883ae31011
 EBUILD wicd-1.7.2.4-r3.ebuild 4796 SHA256 afedbbaac9a5db98439c8d64133fd2a83fface12cba314a992d08c970bb9780e SHA512 a1b16dd3fbd1c854866d6f67e6e2e56f4a67591106cc00bafec6add9b455f2142cb58a27f903141d339460d051d049aa5023db59bab4b9fa8a54c5c65f9b1545 WHIRLPOOL 5293e720ca55ce171ec8dc8b8493a65a9e52c43c982f6a131eb82e1402db2cad54693c2a14fb127bf52329b2185d129f9456a3fdf0f0593efdab71d3d652a395
+EBUILD wicd-1.7.3-r1.ebuild 4839 SHA256 a3535671d0b5079cdc97bd62c2f964aafc32617f38150b634be3f7c3db49d64e SHA512 38fc7f218a2da2d77191a64008a9c729a2599c3f5695d87bd5900f71dc7a9f43d8a3bbd5ee9c016b0b22230c8d940184de20434aed85bf4dfb42eca9e0378657 WHIRLPOOL 07fe71a66395bb434cfcee68bfe58fe87ab575b325e0e74f52fbbc932267e2f73ac48bd048fd43af58465cd628b10a65dd05ee9cde781c95e1300a11eba4829b
 EBUILD wicd-1.7.3.ebuild 4672 SHA256 981115cabaf17ea3bfd7689257752dd511a0fb66337f417232c195bb229be769 SHA512 f910e7a8ecfc0dbe4578b13b024c3bfada44402ee860ae31a7e09581be6e8dd5387bf41a0a07fc21b4ff45d422f2fdf862c8f059a60cb7b6aaa5ac065ab81daa WHIRLPOOL 5d2a61268a5785062194cf9b82d6f4a3aee5ae02203ec43f4c36d04ba329c3fe156a6189b5d34b0887b27da6f4e5e787b55172a0cbfb71876b75dd6f39feab83
-MISC ChangeLog 26179 SHA256 de1988d69d05efdb7659335e628bb003bde82ffd1cb903be9586cddbd37356c2 SHA512 077f44df4764372962d989902bef36ec89cb67ab8dd1cf3d4e2e484a624d91938419c05e0c009aedb6f57b5aa6a846cc99fbb035b0a0d28748e4d0b5eac09dc1 WHIRLPOOL edd6ef0fb345f1bd6a9b36f1803e721e04d6d6f2acca89ba07575c3b7f9b5bc1887665bb9bb6d6e1d02a8356b2dc53929a1c38ab88092482448b95dd43e6f4eb
+MISC ChangeLog 26387 SHA256 a7f737451ae142fbf394d86d0ea0b45aa0569a783ab741b0fb625949d82dd6a8 SHA512 9116e57c3808bf057848c154f8d7db97c2d4d8a5cb550755b7c153cddcf00172624cb2144dd97507d8477634b60593b9888e50457c5c5d9b2d7e8be1ea440b80 WHIRLPOOL 665ea3e24b5e4ff25340bde9e96babea90437a320cb9d593bb7996b0b8796556c4c55ca087a297b16815d387f22d41cc0685b4acf8a93a777184cc17750244bc
 MISC metadata.xml 976 SHA256 79ceb489ca1930b68699287f4ebb0b39474b8dc6c395cc9041a07102030dded4 SHA512 0e6882c1c6e7aa6abd423510054373866c9797ca3c7f945c6dbb6c24f7f9c68c71d4d8c0a4c8ac3cc2ea310e5e12c7b1edcac18b16cce7118c7fdbd042456879 WHIRLPOOL 703ee6a557a8d94fcb2fb9d18afa249b8105d9cb1ebb604d6975ed51617eaebcfd0b298aad3d1851fbdfddd1f0f9b3fa1d0e1a7f2a83f36d399f6d6cb14f60a2
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVfxUlXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiUYoP/RjW9P+9dLkaL9O78NEflpQg
-KWRQVZ9BUCCGk8Ft8gGrzmqcPNg+ely7E0GhzJ7WkQGBoQDqJfmBP+vG3Cuwmx3K
-guJjOB0600ybsxzYp9pWlzfh4QLhWE+kEYZ65rbp5XwgqheDI15mzECbevpOSAJk
-N9Cdap3U/wZ5P9+nRiFQLdRvnS4JeW/iRQ9CWiAfMHqhuIcBIO6URxTQoqWmkbjr
-MnqFaiLvmBSQiVNxiRT39ZhSpCi0OSC4tCc14surknA5O50GNcJyuml5grTCEVGv
-h99bvja8sHs54rW9eRLu4S734ET0JeQikC7BP+7ol2WUmTnrecwXjtzOqsCB8Yup
-a6EOTpXkKt8j7ZzpGFEkVBpjY/8NVk97gifNElqzeINKGqx7UBX2AqJQP3A1aMoH
-zhBHWahXIyYqhegY7ux8nEh0HEMO+kR3KuaxVYEl9eWh0bLbwGCtgmBKkCbRd0/V
-yjLnIm1c8I7ZO6qPnlTMT/YTw9B4mGA7gVhWoEM+ppoj+FcVZrMVfsynCO5bFQFl
-FgPJziM9N27NIezJIY8x46N15xYsUskNoyyuTzqzgEiig6lq2J9Joy5QzYMjNeI/
-ImrAs2UHqMe6kryIbPn8/JRY+ik3R4otpyN3iA7w/tms5K5kuZydSNRMnYP993EI
-ZSU04On0KsLc5NJaHycD
-=c/NV
+iF4EAREIAAYFAlXDFhsACgkQid6yGVZcMrxM+wD8C08DD9GhuVQ7/DO6VshZXEuD
+PGIjRqKKkuMmwIZI6GUA/RSazbtMgEoO7PeCUt0PTgWNQ0+1kBO6iMIQ+CPThvAA
+=AaFY
 -----END PGP SIGNATURE-----
diff --git a/net-misc/wicd/files/wicd-1.7.3-urwid-1.3.0.patch b/net-misc/wicd/files/wicd-1.7.3-urwid-1.3.0.patch
new file mode 100644
index 000000000000..a028059f5615
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.3-urwid-1.3.0.patch
@@ -0,0 +1,15 @@
+--- curses/wicd-curses.py	2015-01-27 22:35:25.414781192 -0300
++++ cursesb/wicd-curses.py	2015-01-28 01:13:48.078904587 -0300
+@@ -1153,9 +1153,10 @@
+         if not ui._started:
+             return False
+ 
+-        input_data = ui.get_input_nonblocking()
++        ui.set_input_timeouts(max_wait=0)
++        input_data = ui.get_input()
+         # Resolve any "alarms" in the waiting
+-        self.handle_keys(input_data[1])
++        self.handle_keys(input_data)
+ 
+         # Update the screen
+         canvas = self.frame.render((self.size), True)
diff --git a/net-misc/wicd/wicd-1.7.3-r1.ebuild b/net-misc/wicd/wicd-1.7.3-r1.ebuild
new file mode 100644
index 000000000000..c0dfc8460919
--- /dev/null
+++ b/net-misc/wicd/wicd-1.7.3-r1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.3-r1.ebuild,v 1.1 2015/08/06 08:08:55 tomka Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses?,xml"
+
+inherit eutils distutils-r1 linux-info readme.gentoo systemd
+
+DESCRIPTION="A lightweight wired and wireless network manager for Linux"
+HOMEPAGE="https://launchpad.net/wicd"
+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 ~arm ~mips ~ppc ~ppc64 ~x86"
+IUSE="doc X ambiance +gtk ioctl libnotify mac4lin ncurses nls +pm-utils gnome-shell"
+
+DEPEND="nls? ( dev-python/Babel[${PYTHON_USEDEP}] )"
+RDEPEND="${PYTHON_DEPS}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	X? (
+		gtk? ( dev-python/pygtk[${PYTHON_USEDEP}] )
+		|| (
+			x11-misc/ktsuss
+			x11-libs/gksu
+			kde-apps/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[${PYTHON_USEDEP}] )
+	ioctl? ( dev-python/python-iwscan[${PYTHON_USEDEP}]
+			 dev-python/python-wpactrl[${PYTHON_USEDEP}] )
+	libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
+	ncurses? (
+		dev-python/urwid[${PYTHON_USEDEP}]
+		dev-python/pygobject:2[${PYTHON_USEDEP}]
+	)
+	pm-utils? ( sys-power/pm-utils )
+	gnome-shell? ( gnome-base/gnome-shell )
+	"
+
+src_prepare() {
+	CONFIG_CHECK="~CFG80211_WEXT"
+	local WARNING_CFG80211_WEXT="Wireless extensions have not been \
+	configured in your kernel.  Wicd will not work unless CFG80211_WEXT is set."
+	check_extra_config
+
+	epatch "${FILESDIR}"/${PN}-init-sve-start.patch
+	# The Categories entry in the .desktop files is outdated
+	epatch "${FILESDIR}"/${PN}-1.7.2.4-fix-desktop-categories.patch
+	# Upstream bug https://bugs.launchpad.net/wicd/+bug/1412413
+	# Creates files -> give -p
+	epatch -p1 "${FILESDIR}"/${P}-add-missing-gnome-shell-extension.patch
+	# If LANG is undefined, build can fail (bug 537202)
+	epatch "${FILESDIR}"/${P}-undefined-LANG.patch
+	# Fix urwid compat again
+	epatch "${FILESDIR}"/${P}-urwid-1.3.0.patch
+	# get rid of opts variable to fix bug 381885
+	sed -i "/opts/d" "in/init=gentoo=wicd.in" || die
+	# 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"
+	# Fix misc helper scripts:
+	sed -e "s:/usr/bin/env python:/usr/bin/env python2:" \
+		-i wicd/suspend.py wicd/autoconnect.py wicd/monitor.py
+	if use nls; then
+	  # Asturian is faulty with PyBabel
+	  # (https://bugs.launchpad.net/wicd/+bug/928589)
+	  rm po/ast.po
+	  # zh_CN fails with newer PyBabel (Aug 2013)
+	  rm po/zh_CN.po
+	else
+	  # nuke translations
+	  rm po/*.po
+	fi
+
+	DOC_CONTENTS="To start wicd at boot with openRC, add
+		/etc/init.d/wicd to a runlevel and: (1) Remove all net.*
+		initscripts (except for net.lo) from all runlevels (2) Add these
+		scripts to the RC_PLUG_SERVICES line in /etc/rc.conf (For
+		example, rc_hotplug=\"!net.eth* !net.wlan*\")"
+}
+
+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"
+	use gnome-shell || myconf="${myconf} --no-install-gnome-shell-extensions"
+	python_setup
+	"${EPYTHON}" ./setup.py configure --no-install-docs \
+		--resume=/usr/share/wicd/scripts/ \
+		--suspend=/usr/share/wicd/scripts/ \
+		--verbose ${myconf}
+}
+
+src_install() {
+	distutils-r1_src_install
+	keepdir /var/lib/wicd/configurations
+	keepdir /etc/wicd/scripts/{postconnect,disconnect,preconnect}
+	keepdir /var/log/wicd
+	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
+	readme.gentoo_src_install
+}
+
+pkg_postinst() {
+	# 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/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
+
+	readme.gentoo_print_elog
+}