commit: 48ab49eb60eea5749329917c04f8f3a1d51a7dd7
Author: Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 3 11:09:09 2015 +0000
Commit: Thomas Kahle <tomka <AT> gentoo <DOT> org>
CommitDate: Thu Sep 3 11:09:22 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48ab49eb
net-misc/wicd: one more urwid compat patch from launchpad
Package-Manager: portage-2.2.20.1
.../wicd/files/wicd-1.7.3-bitrate-property.patch | 19 +++
net-misc/wicd/wicd-1.7.3-r2.ebuild | 144 +++++++++++++++++++++
2 files changed, 163 insertions(+)
diff --git a/net-misc/wicd/files/wicd-1.7.3-bitrate-property.patch
b/net-misc/wicd/files/wicd-1.7.3-bitrate-property.patch
new file mode 100644
index 0000000..6ac3902
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.3-bitrate-property.patch
@@ -0,0 +1,19 @@
+--- curses/netentry_curses.py 2015-02-15 18:29:05.000000000 +0100
++++ curses/netentry_curses.py 2015-02-15 18:31:24.000000000 +0100
+@@ -538,11 +538,12 @@
+ self.bitrates = wireless.GetAvailableBitrates()
+ self.bitrates.append('auto')
+ self.bitrate_combo.set_list(self.bitrates)
+- self.bitrate_combo.set_focus(
+- self.bitrates.index(
+- wireless.GetWirelessProperty(networkID, 'bitrate')
++ if wireless.GetWirelessProperty(networkID, 'bitrate'):
++ self.bitrate_combo.set_focus(
++ self.bitrates.index(
++ wireless.GetWirelessProperty(networkID, 'bitrate')
++ )
+ )
+- )
+ self.allow_lower_bitrates_chkbox.set_state(
+ to_bool(self.format_entry(networkID, 'allow_lower_bitrates'))
+ )
diff --git a/net-misc/wicd/wicd-1.7.3-r2.ebuild
b/net-misc/wicd/wicd-1.7.3-r2.ebuild
new file mode 100644
index 0000000..8c58d1f
--- /dev/null
+++ b/net-misc/wicd/wicd-1.7.3-r2.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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="https://launchpad.net/wicd/1.7/${PV}/+download/${P}.tar.gz
+ mac4lin? (
https://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
+ # Another compatibility patch from launchpad bug 1075399
+ epatch "${FILESDIR}"/${P}-bitrate-property.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
+}
