[gentoo-commits] dev/anarchy:master commit in: net-misc/wicd/files/, net-misc/wicd/

[Jory Pratt]

commit:     e497b74c1ac94d1fef773a6d9aa29e7b08863f24
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 31 17:12:00 2011 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 17:12:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/anarchy.git;a=commit;h=e497b74c

modified icon package now avaliable via mac4lin useflag

---
 net-misc/wicd/Manifest                             |    9 ++
 net-misc/wicd/files/add-wpa-psk-hex-template.patch |   29 +++++
 net-misc/wicd/files/fix-ad-hoc-networking.patch    |   11 ++
 net-misc/wicd/files/wicd-1.7.1_beta2-init.patch    |   11 ++
 .../wicd/files/wicd-1.7.1_beta2-urwid-1.0.patch    |   20 +++
 net-misc/wicd/files/wicd-init-sve-start.patch      |   10 ++
 net-misc/wicd/metadata.xml                         |   22 ++++
 net-misc/wicd/wicd-1.7.1_beta2-r7.ebuild           |  122 ++++++++++++++++++++
 8 files changed, 234 insertions(+), 0 deletions(-)

diff --git a/net-misc/wicd/Manifest b/net-misc/wicd/Manifest
new file mode 100644
index 0000000..0fd80db
--- /dev/null
+++ b/net-misc/wicd/Manifest
@@ -0,0 +1,9 @@
+AUX add-wpa-psk-hex-template.patch 980 RMD160 9071bc60a01d2637df92309e183c11286c790f49 SHA1 febafc67f6501af227964e7a8af8d45ab0b6a0e4 SHA256 d5e45971adb2cd8649c81ce3a4edfb4bda954981767ff8a95374b062b460fca7
+AUX fix-ad-hoc-networking.patch 729 RMD160 4e2a7b36eade357aa7fcd83b8d37e4ec9052212e SHA1 60b69e24e06f10e6d8dce99c6f89c33db79d644a SHA256 1e476d6fe340bc652c747e544b8795f5f01d5c899986fe179ba370a167a441f4
+AUX wicd-1.7.1_beta2-init.patch 409 RMD160 58abdf5debc49517977dd5b691c6fe24cd8303c6 SHA1 4c24f4bb924035e109e905789a7669d6e7b0e7ed SHA256 473146793cc9cf8b2b780c1ce13f27138662f9942b53e5a7e293634196fbebcf
+AUX wicd-1.7.1_beta2-urwid-1.0.patch 895 RMD160 13aec910e261d4f5574a9aebc365570b03089fe5 SHA1 db2b6a4811a9413ca4d8137bd387fdfdee4e718a SHA256 2988afdd35f7d9d0d374ce523a9c4ed193e25e70fd6eb2e9a05ec8b520e952ff
+AUX wicd-init-sve-start.patch 317 RMD160 e08a391b31c6d48e67ad51bcd8fb08457bbc0ebc SHA1 149775d7ef4deffc4e66f73fa47276ca194c92cb SHA256 20d7ada99465da5b50d03e5ef117226910bc20288278f6f788be3fbff05716db
+DIST wicd-1.7.1b2.tar.bz2 509990 RMD160 587e922271d017eb67499f64c2502b02def44f9d SHA1 2e3d2346f1607f7f63bb00bf7fef41bc5a419726 SHA256 810d51b3eec10be39b399f8baa0b2ef36ed7bb14606f9e0844bea11b8532ea8d
+DIST wicd-mac4lin-icons.tar.bz2 125113 RMD160 b6c88fd0f9ac8bd4694efeb23eab0df582636376 SHA1 3ece6bfdd58bfee5de107d0d6ef5dc474e3c4e53 SHA256 73ece7db5bb080659ae4c18d6078ec3fffd0eae5abf22a71e595b69a0e11f13c
+EBUILD wicd-1.7.1_beta2-r7.ebuild 3978 RMD160 cf58f1d3291a5b5bf4ba5bdbd968249839c97d03 SHA1 5e0d30be9b4d2aec6a86d4da0a1786e1dafc8c1e SHA256 8fdc54446d2c3fca64f375d68a411a7e5c16076536915a349cc7bb9843a2ff32
+MISC metadata.xml 859 RMD160 1809a78002a3e58a0b5283a03de02d129a1e57f9 SHA1 6e366622688eda2ea1bbf75f6358a2b25e550459 SHA256 674f4e5d3063fa47f953341f0cb39d4abe65538510c5b29a0255896903fd1653

diff --git a/net-misc/wicd/files/add-wpa-psk-hex-template.patch b/net-misc/wicd/files/add-wpa-psk-hex-template.patch
new file mode 100644
index 0000000..21daaf3
--- /dev/null
+++ b/net-misc/wicd/files/add-wpa-psk-hex-template.patch
@@ -0,0 +1,29 @@
+diff -U 3 -dHrN wicd-1.7.1b2/encryption/templates/active wicd-1.7.1b2.new/encryption/templates/active
+--- wicd-1.7.1b2/encryption/templates/active	2010-10-29 16:36:55.000000000 +0100
++++ wicd-1.7.1b2.new/encryption/templates/active	2011-09-13 19:58:54.000000000 +0100
+@@ -1,5 +1,6 @@
+ wpa
+ wpa-psk
++wpa-psk-hex
+ wep-hex
+ wep-passphrase
+ wep-shared
+diff -U 3 -dHrN wicd-1.7.1b2/encryption/templates/wpa-psk-hex wicd-1.7.1b2.new/encryption/templates/wpa-psk-hex
+--- wicd-1.7.1b2/encryption/templates/wpa-psk-hex	1970-01-01 01:00:00.000000000 +0100
++++ wicd-1.7.1b2.new/encryption/templates/wpa-psk-hex	2011-09-13 19:59:11.000000000 +0100
+@@ -0,0 +1,15 @@
++name = WPA 1/2 (Preshared Hex Key)
++author = Thomas Kahle
++version = 1
++require apsk *Preshared_Key
++-----
++ctrl_interface=/var/run/wpa_supplicant
++network={
++       ssid="$_ESSID"
++       scan_ssid=$_SCAN
++       proto=WPA RSN
++       key_mgmt=WPA-PSK
++       pairwise=CCMP TKIP
++       group=CCMP TKIP
++       psk=$_APSK
++}

diff --git a/net-misc/wicd/files/fix-ad-hoc-networking.patch b/net-misc/wicd/files/fix-ad-hoc-networking.patch
new file mode 100644
index 0000000..344e51a
--- /dev/null
+++ b/net-misc/wicd/files/fix-ad-hoc-networking.patch
@@ -0,0 +1,11 @@
+--- wicd-1.7.0/wicd/wnettools.py	2010-01-15 12:49:11.000000000 +0800
++++ wicd-1.7.0.patched/wicd/wnettools.py	2010-12-12 03:50:31.000000000 +0800
+@@ -59,7 +59,7 @@ wpa2_pattern = re.compile('(WPA2)', _re_
+ 
+ #iwconfig-only regular expressions.
+ ip_pattern = re.compile(r'inet [Aa]d?dr[^.]*:([^.]*\.[^.]*\.[^.]*\.[0-9]*)', re.S)
+-bssid_pattern = re.compile('.*Access Point: (([0-9A-Z]{2}:){5}[0-9A-Z]{2})', _re_mode)
++bssid_pattern = re.compile('.*[(Access Point)|(Cell)]: (([0-9A-Z]{2}:){5}[0-9A-Z]{2})', _re_mode)
+ bitrate_pattern = re.compile('.*Bit Rate[=:](.*?/s)', _re_mode)
+ opmode_pattern = re.compile('.*Mode:(.*?) ', _re_mode)
+ authmethods_pattern = re.compile('.*Authentication capabilities :\n(.*?)Current', _re_mode)

diff --git a/net-misc/wicd/files/wicd-1.7.1_beta2-init.patch b/net-misc/wicd/files/wicd-1.7.1_beta2-init.patch
new file mode 100644
index 0000000..6a736f9
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.1_beta2-init.patch
@@ -0,0 +1,11 @@
+--- in/init=gentoo=wicd.in	2010-10-29 11:36:55.000000000 -0400
++++ in/init=gentoo=wicd.in.new	2011-03-28 09:40:27.245339002 -0400
+@@ -15,7 +15,7 @@
+ start() {
+ 	ebegin "Starting wicd daemon"
+ 	# fix Gentoo bug 296197
+-	sed -i 's/^\[\]$//' /etc/wicd/wired-settings.conf
++	[ -f /etc/wicd/wired-settings.conf ] && sed -i 's/^\[\]$//' /etc/wicd/wired-settings.conf
+ 	"${WICD_DAEMON}" >/dev/null 2>&1
+ 	eend $?
+ }

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 0000000..b1b5abc
--- /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/files/wicd-init-sve-start.patch b/net-misc/wicd/files/wicd-init-sve-start.patch
new file mode 100644
index 0000000..c631492
--- /dev/null
+++ b/net-misc/wicd/files/wicd-init-sve-start.patch
@@ -0,0 +1,10 @@
+diff -U 3 -dHrN wicd-1.7.1b2.old/in/init=gentoo=wicd.in wicd-1.7.1b2/in/init=gentoo=wicd.in
+--- wicd-1.7.1b2.old/in/init=gentoo=wicd.in	2011-05-07 20:52:13.000000000 +0200
++++ wicd-1.7.1b2/in/init=gentoo=wicd.in	2011-05-07 20:52:43.000000000 +0200
+@@ -35,5 +35,5 @@
+ 
+ restart() {
+ 	force_kill
+-	start
++	sve_start
+ }

diff --git a/net-misc/wicd/metadata.xml b/net-misc/wicd/metadata.xml
new file mode 100644
index 0000000..71524bb
--- /dev/null
+++ b/net-misc/wicd/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+  <email>tomka@g.o</email>
+  <name>Thomas Kahle</name>
+</maintainer>
+<maintainer>
+	<email>c1pher@g.o</email>
+	<name>Dane Smith</name>
+</maintainer>
+<use>
+	<flag name='gtk'>Installs a gtk UI. This is enabled by default because it is
+		intended behavior. Requires <pkg>dev-python/pygtk</pkg></flag>
+	<flag name='ioctl'>Installs additional python libraries to use as a backend.
+	This will improve speed but is experimental.</flag>
+	<flag name='ncurses'>Installs a ncurses UI</flag>
+	<flag name='pm-utils'>Installs the pm-utils hooks for suspend/resume and
+		requires <pkg>sys-power/pm-utils</pkg></flag>
+	<flag name='mac4lin'>Install icons that match mac4lin icons for system tray"</flag>
+</use>
+</pkgmetadata>

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 0000000..8ec1d25
--- /dev/null
+++ b/net-misc/wicd/wicd-1.7.1_beta2-r7.ebuild
@@ -0,0 +1,122 @@
+# 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.3 2011/10/27 21:04:41 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
+	mac4lin? ( http://dev.gentoo.org/~anarchy/dist/wicd-mac4lin-icons.tar.bz2 ) "
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="X +gtk ioctl libnotify mac4lin 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-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-1.0.0
+		dev-python/pygobject:2
+	)
+	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
+	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
+}
+
+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
+}