Bump urwid dep in -r7, restrict urwid in all other versions (Bug 384761)

(Portage version: 2.1.10.20/cvs/Linux i686)

8 files changed, 157 insertions, 6 deletions

diff --git a/net-misc/wicd/ChangeLog b/net-misc/wicd/ChangeLog
index 9c1c734cbbf9..14e8a073176d 100644
--- a/net-misc/wicd/ChangeLog
+++ b/net-misc/wicd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/wicd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.94 2011/09/13 19:25:14 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.95 2011/10/01 16:18:28 tomka Exp $
+
+*wicd-1.7.1_beta2-r7 (01 Oct 2011)
+
+  01 Oct 2011; Thomas Kahle <tomka@gentoo.org> wicd-1.7.0.ebuild,
+  wicd-1.7.0-r1.ebuild, wicd-1.7.1_beta2-r3.ebuild, wicd-1.7.1_beta2-r4.ebuild,
+  wicd-1.7.1_beta2-r6.ebuild, +wicd-1.7.1_beta2-r7.ebuild,
+  +files/wicd-1.7.1_beta2-urwid-1.0.patch:
+  Bump urwid dep in -r7, restrict urwid in all other versions (Bug 384761)
 
 *wicd-1.7.1_beta2-r6 (13 Sep 2011)
 
diff --git a/net-misc/wicd/files/wicd-1.7.1_beta2-urwid-1.0.patch b/net-misc/wicd/files/wicd-1.7.1_beta2-urwid-1.0.patch
new file mode 100644
index 000000000000..b1b5abc02795
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.1_beta2-urwid-1.0.patch
@@ -0,0 +1,20 @@
+--- /usr/share/wicd/curses/wicd-curses.py.old	2011-10-01 14:54:47.478406517 +0400
++++ /usr/share/wicd/curses/wicd-curses.py	2011-10-01 14:49:50.781273004 +0400
+@@ -241,7 +241,7 @@
+         # Don't stop because someone let go of the mouse on the frame
+         mouse_release = False
+         for k in keys:
+-            if urwid.is_mouse_event(k) and k[0] == "mouse release":
++            if urwid.util.is_mouse_event(k) and k[0] == "mouse release":
+                 mouse_release = True
+                 break
+         if mouse_release :
+@@ -882,7 +882,7 @@
+                                                 data[4], False)
+             
+         for k in keys:
+-            if urwid.is_mouse_event(k):
++            if urwid.util.is_mouse_event(k):
+                 event, button, col, row = k
+                 self.frame.mouse_event( self.size,
+                         event, button, col, row,
diff --git a/net-misc/wicd/wicd-1.7.0-r1.ebuild b/net-misc/wicd/wicd-1.7.0-r1.ebuild
index 748d11b7cda4..903e7e25caf6 100644
--- a/net-misc/wicd/wicd-1.7.0-r1.ebuild
+++ b/net-misc/wicd/wicd-1.7.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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-r1.ebuild,v 1.3 2011/03/19 08:23:54 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.0-r1.ebuild,v 1.4 2011/10/01 16:18:28 tomka Exp $
 
 EAPI=3
 
@@ -50,6 +50,7 @@ RDEPEND="
 	libnotify? ( dev-python/notify-python )
 	ncurses? (
 		>=dev-python/urwid-0.9.9.1
+		<dev-python/urwid-1.0.0
 		dev-python/pygobject
 	)
 	pm-utils? ( >=sys-power/pm-utils-1.1.1 )
diff --git a/net-misc/wicd/wicd-1.7.0.ebuild b/net-misc/wicd/wicd-1.7.0.ebuild
index ae4b0912f595..3218147400e2 100644
--- a/net-misc/wicd/wicd-1.7.0.ebuild
+++ b/net-misc/wicd/wicd-1.7.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.10 2011/04/10 21:42:27 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.0.ebuild,v 1.11 2011/10/01 16:18:28 tomka Exp $
 
 EAPI=3
 
@@ -45,6 +45,7 @@ RDEPEND="
 	libnotify? ( dev-python/notify-python )
 	ncurses? (
 		>=dev-python/urwid-0.9.9.1
+		<dev-python/urwid-1.0.0
 		dev-python/pygobject
 		)
 	pm-utils? ( >=sys-power/pm-utils-1.1.1 )
diff --git a/net-misc/wicd/wicd-1.7.1_beta2-r3.ebuild b/net-misc/wicd/wicd-1.7.1_beta2-r3.ebuild
index be3382490339..d4b103a03bc4 100644
--- a/net-misc/wicd/wicd-1.7.1_beta2-r3.ebuild
+++ b/net-misc/wicd/wicd-1.7.1_beta2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r3.ebuild,v 1.4 2011/05/29 10:55:34 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r3.ebuild,v 1.5 2011/10/01 16:18:28 tomka Exp $
 
 EAPI=3
 
@@ -54,6 +54,7 @@ RDEPEND="
 	libnotify? ( dev-python/notify-python )
 	ncurses? (
 		>=dev-python/urwid-0.9.9.1
+		<dev-python/urwid-1.0.0
 		dev-python/pygobject
 	)
 	pm-utils? ( >=sys-power/pm-utils-1.1.1 )
diff --git a/net-misc/wicd/wicd-1.7.1_beta2-r4.ebuild b/net-misc/wicd/wicd-1.7.1_beta2-r4.ebuild
index 76b9c8ece1f6..1221dd5f4d4a 100644
--- a/net-misc/wicd/wicd-1.7.1_beta2-r4.ebuild
+++ b/net-misc/wicd/wicd-1.7.1_beta2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r4.ebuild,v 1.6 2011/07/17 19:55:00 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r4.ebuild,v 1.7 2011/10/01 16:18:28 tomka Exp $
 
 EAPI=3
 
@@ -54,6 +54,7 @@ RDEPEND="
 	libnotify? ( dev-python/notify-python )
 	ncurses? (
 		>=dev-python/urwid-0.9.9.1
+		<dev-python/urwid-1.0.0
 		dev-python/pygobject
 	)
 	pm-utils? ( >=sys-power/pm-utils-1.1.1 )
diff --git a/net-misc/wicd/wicd-1.7.1_beta2-r6.ebuild b/net-misc/wicd/wicd-1.7.1_beta2-r6.ebuild
index 6e639d27a432..b86943e66d17 100644
--- a/net-misc/wicd/wicd-1.7.1_beta2-r6.ebuild
+++ b/net-misc/wicd/wicd-1.7.1_beta2-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r6.ebuild,v 1.1 2011/09/13 19:25:14 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r6.ebuild,v 1.2 2011/10/01 16:18:28 tomka Exp $
 
 EAPI=3
 
@@ -54,6 +54,7 @@ RDEPEND="
 	libnotify? ( dev-python/notify-python )
 	ncurses? (
 		>=dev-python/urwid-0.9.9.1
+		<dev-python/urwid-1.0.0
 		dev-python/pygobject
 	)
 	pm-utils? ( >=sys-power/pm-utils-1.1.1 )
diff --git a/net-misc/wicd/wicd-1.7.1_beta2-r7.ebuild b/net-misc/wicd/wicd-1.7.1_beta2-r7.ebuild
new file mode 100644
index 000000000000..1bd9b1ecc6bf
--- /dev/null
+++ b/net-misc/wicd/wicd-1.7.1_beta2-r7.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_beta2-r7.ebuild,v 1.1 2011/10/01 16:18:28 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
+
+MY_P=${P/_beta/b}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="A lightweight wired and wireless network manager for Linux"
+HOMEPAGE="http://wicd.sourceforge.net/"
+SRC_URI="http://downloads.wicd.net/src/testing/1.7.x/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="X +gtk ioctl libnotify ncurses nls +pm-utils"
+
+DEPEND=""
+# 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 )
+	ioctl? ( dev-python/python-iwscan dev-python/python-wpactrl )
+	libnotify? ( dev-python/notify-python )
+	ncurses? (
+		>=dev-python/urwid-1.0.0
+		dev-python/pygobject
+	)
+	pm-utils? ( >=sys-power/pm-utils-1.1.1 )
+	"
+DOCS="CHANGES NEWS AUTHORS README"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-init.patch
+	# Fix urwid calls
+	epatch "${FILESDIR}/${P}"-urwid-1.0.patch
+	epatch "${FILESDIR}"/${PN}-init-sve-start.patch
+	# Fix ad-hoc networking (bug 351337)
+	epatch "${FILESDIR}"/fix-ad-hoc-networking.patch
+	# Add a template for hex psk's and wpa (Bug 306423)
+	epatch "${FILESDIR}"/add-wpa-psk-hex-template.patch
+	# get rid of opts variable to fix bug 381885
+	sed -i "/opts/d" "in/init=gentoo=wicd.in"
+	# 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"
+	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
+}
+
+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
+}