* [gentoo-commits] repo/gentoo:master commit in: net-misc/wicd/files/, net-misc/wicd/
@ 2015-09-03 11:09 Thomas Kahle
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Kahle @ 2015-09-03 11:09 UTC (permalink / raw
To: gentoo-commits
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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/wicd/files/, net-misc/wicd/
@ 2015-09-06 13:41 Thomas Kahle
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Kahle @ 2015-09-06 13:41 UTC (permalink / raw
To: gentoo-commits
commit: 2f872cdb1ed7e0491e7f8ba1f144887b7d783810
Author: Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 6 13:39:19 2015 +0000
Commit: Thomas Kahle <tomka <AT> gentoo <DOT> org>
CommitDate: Sun Sep 6 13:39:19 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f872cdb
net-misc/wicd: Remove old
Package-Manager: portage-2.2.20.1
net-misc/wicd/Manifest | 1 -
net-misc/wicd/files/wicd-1.7.1-provide-net.patch | 11 --
net-misc/wicd/files/wicd-1.7.1_beta2-init.patch | 11 --
...cd-1.7.1_pre20111210-wpa-psk-hex-template.patch | 30 -----
.../wicd/files/wicd-1.7.2.4-fix-dbus-error.patch | 16 ---
.../wicd/files/wicd-1.7.2.4-second-urwid.patch | 43 -------
net-misc/wicd/files/wicd-1.7.2.4-urwid.patch | 66 ----------
net-misc/wicd/wicd-1.7.2.4-r3.ebuild | 142 ---------------------
net-misc/wicd/wicd-1.7.3-r1.ebuild | 142 ---------------------
9 files changed, 462 deletions(-)
diff --git a/net-misc/wicd/Manifest b/net-misc/wicd/Manifest
index 290c9f1..11e0f0e 100644
--- a/net-misc/wicd/Manifest
+++ b/net-misc/wicd/Manifest
@@ -1,4 +1,3 @@
DIST Icone-Wicd-Lucid.tar.gz 9015 SHA256 6e4e3483c6cff7398e6871dd3e4360e361e5c6e64007e8e1240fd1c259ac707e SHA512 0df0dbdf05b462264dca2dd9955454a82f688b0fbfa7c2ad70a424df57eb27b35561d37819fc88b5746cff8a54de5b7b43ec325d2f98a4a1a30e4d500e86d2f8 WHIRLPOOL 336f363092c9bac7523047b6052a856a699820147967820418c6ac1ca528c472d371c6c211c505c325b5eb001812042c01425b05e1dfdf2d4a528f96686c530a
-DIST wicd-1.7.2.4.tar.gz 439297 SHA256 dcfdfb5dbbb49dbb9b205fddf064d6b1a4e88f66f1cf40d12fb7fe0e0c7cdc97 SHA512 6dd8d4726c5f9c943d90305b7ed70573b42b5dae00de443209d9f526778e91ac01aabffa14447c47374b4d9986133aacfcc970735d1b5befa232da44d3190d7c WHIRLPOOL 59885a22dbf350e73a55fdbf7ea1c9b93a339edae116beb1c22c271762d90488ecdeb7952a4efc8241d362b5bafcaccf88053c4d5c41468cba0cd524cf2a5756
DIST wicd-1.7.3.tar.gz 542341 SHA256 91e38857b1651d242ed7e3b3e3fd8b076b4d06a23eedb033310fae510ece8401 SHA512 3ff3f42cd228327641b584bf85ef785a7d490fa5a57d1aa695f9b4860dae086c240a60321832a0aeee2dfb23de70da1a9f6abce4f1b6ecab58455304407fd536 WHIRLPOOL 69a9042e77f78f6d0dabc73e0569023d5a6747b82e3c944aad51a74681765b1b439beef1a578fcba4f048dbba6cbeabe0aca54ea62076d7dacdcbc4100ef2025
DIST wicd-mac4lin-icons.tar.xz 53136 SHA256 4c48c769c71f962415e3bd3573557e9288351afb867347f9a6f652883ae31011
diff --git a/net-misc/wicd/files/wicd-1.7.1-provide-net.patch b/net-misc/wicd/files/wicd-1.7.1-provide-net.patch
deleted file mode 100644
index f325bcb..0000000
--- a/net-misc/wicd/files/wicd-1.7.1-provide-net.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -U 3 -dHrN wicd-1.7.1.orig/in/init=gentoo=wicd.in wicd-1.7.1/in/init=gentoo=wicd.in
---- wicd-1.7.1.orig/in/init=gentoo=wicd.in 2012-02-27 21:49:36.422873826 +0100
-+++ wicd-1.7.1/in/init=gentoo=wicd.in 2012-02-27 21:50:26.957127714 +0100
-@@ -10,6 +10,7 @@
- depend() {
- need dbus
- after hald
-+ provide net
- }
-
- start() {
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
deleted file mode 100644
index 6a736f9..0000000
--- a/net-misc/wicd/files/wicd-1.7.1_beta2-init.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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_pre20111210-wpa-psk-hex-template.patch b/net-misc/wicd/files/wicd-1.7.1_pre20111210-wpa-psk-hex-template.patch
deleted file mode 100644
index 6736cb7..0000000
--- a/net-misc/wicd/files/wicd-1.7.1_pre20111210-wpa-psk-hex-template.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -U 3 -dHrN wicd.org/encryption/templates/active wicd/encryption/templates/active
---- wicd.org/encryption/templates/active 2011-12-05 16:22:49.584224158 +0100
-+++ wicd/encryption/templates/active 2011-12-05 16:16:10.736172566 +0100
-@@ -1,6 +1,7 @@
- wpa
- wpa-peap
- wpa-psk
-+wpa-psk-hex
- wpa2-leap
- wpa2-peap
- wep-hex
-diff -U 3 -dHrN wicd.org/encryption/templates/wpa-psk-hex wicd/encryption/templates/wpa-psk-hex
---- wicd.org/encryption/templates/wpa-psk-hex 1970-01-01 01:00:00.000000000 +0100
-+++ wicd/encryption/templates/wpa-psk-hex 2011-12-05 16:16:43.428012863 +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/wicd-1.7.2.4-fix-dbus-error.patch b/net-misc/wicd/files/wicd-1.7.2.4-fix-dbus-error.patch
deleted file mode 100644
index 2fddc9a..0000000
--- a/net-misc/wicd/files/wicd-1.7.2.4-fix-dbus-error.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-=== 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/files/wicd-1.7.2.4-second-urwid.patch b/net-misc/wicd/files/wicd-1.7.2.4-second-urwid.patch
deleted file mode 100644
index 9a0bae6..0000000
--- a/net-misc/wicd/files/wicd-1.7.2.4-second-urwid.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-=== modified file 'curses/curses_misc.py'
---- curses/curses_misc.py 2012-11-15 09:26:21 +0000
-+++ curses/curses_misc.py 2012-11-16 09:22:47 +0000
-@@ -352,7 +352,7 @@
- if urwid.VERSION < (1, 1, 0):
- self.focus = focus
- else:
-- self.focus_position = focus
-+ self._w.focus_position = focus
-
- self.callback = callback
- self.user_args = user_args
-@@ -368,7 +368,10 @@
- if urwid.VERSION < (1, 1, 0):
- self.focus = index
- else:
-- self.focus_position = index
-+ try:
-+ self._w.focus_position = index
-+ except IndexError:
-+ pass
-
- # API changed between urwid 0.9.8.4 and 0.9.9
- try:
-@@ -386,7 +389,7 @@
- if urwid.VERSION < (1, 1, 0):
- index = self.focus
- else:
-- index = self.focus_position
-+ index = self._w.focus_position
-
- self.cbox = DynWrap(SelText([self.list[index]+self.DOWN_ARROW]),
- attrs=self.attrs,focus_attr=self.focus_attr)
-@@ -434,7 +437,7 @@
- if urwid.VERSION < (1, 1, 0):
- return None, self.focus
- else:
-- return None, self.focus_position
-+ return None, self._w.focus_position
-
- def get_sensitive(self):
- return self.cbox.get_sensitive()
-
diff --git a/net-misc/wicd/files/wicd-1.7.2.4-urwid.patch b/net-misc/wicd/files/wicd-1.7.2.4-urwid.patch
deleted file mode 100644
index 63eba2e..0000000
--- a/net-misc/wicd/files/wicd-1.7.2.4-urwid.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-=== modified file 'curses/curses_misc.py'
---- curses/curses_misc.py 2012-05-06 15:16:15 +0000
-+++ curses/curses_misc.py 2012-11-15 09:26:21 +0000
-@@ -349,7 +349,10 @@
- # We need this to pick our keypresses
- self.use_enter = use_enter
-
-- self.focus = focus
-+ if urwid.VERSION < (1, 1, 0):
-+ self.focus = focus
-+ else:
-+ self.focus_position = focus
-
- self.callback = callback
- self.user_args = user_args
-@@ -362,7 +365,11 @@
- self.list = list
-
- def set_focus(self,index):
-- self.focus = index
-+ if urwid.VERSION < (1, 1, 0):
-+ self.focus = index
-+ else:
-+ self.focus_position = index
-+
- # API changed between urwid 0.9.8.4 and 0.9.9
- try:
- self.cbox.set_w(SelText(self.list[index]+self.DOWN_ARROW))
-@@ -376,16 +383,21 @@
- def build_combobox(self,parent,ui,row):
- str,trash = self.label.get_text()
-
-- self.cbox = DynWrap(SelText([self.list[self.focus]+self.DOWN_ARROW]),
-+ if urwid.VERSION < (1, 1, 0):
-+ index = self.focus
-+ else:
-+ index = self.focus_position
-+
-+ self.cbox = DynWrap(SelText([self.list[index]+self.DOWN_ARROW]),
- attrs=self.attrs,focus_attr=self.focus_attr)
- if str != '':
- w = urwid.Columns([('fixed',len(str),self.label),self.cbox],
- dividechars=1)
-- self.overlay = self.ComboSpace(self.list,parent,ui,self.focus,
-+ self.overlay = self.ComboSpace(self.list,parent,ui,index,
- pos=(len(str)+1,row))
- else:
- w = urwid.Columns([self.cbox])
-- self.overlay = self.ComboSpace(self.list,parent,ui,self.focus,
-+ self.overlay = self.ComboSpace(self.list,parent,ui,index,
- pos=(0,row))
-
- self._w = w
-@@ -419,7 +431,10 @@
- if self.overlay:
- return self.overlay._listbox.get_focus()
- else:
-- return None,self.focus
-+ if urwid.VERSION < (1, 1, 0):
-+ return None, self.focus
-+ else:
-+ return None, self.focus_position
-
- def get_sensitive(self):
- return self.cbox.get_sensitive()
-
diff --git a/net-misc/wicd/wicd-1.7.2.4-r3.ebuild b/net-misc/wicd/wicd-1.7.2.4-r3.ebuild
deleted file mode 100644
index c9aca7b..0000000
--- a/net-misc/wicd/wicd-1.7.2.4-r3.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# 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"
-
-DEPEND="nls? ( dev-python/Babel )"
-RDEPEND="${PYTHON_DEPS}
- dev-python/dbus-python[${PYTHON_USEDEP}]
- X? (
- gtk? ( dev-python/pygtk )
- || (
- 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 dev-python/python-wpactrl )
- libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
- ncurses? (
- dev-python/urwid
- dev-python/pygobject:2[${PYTHON_USEDEP}]
- )
- pm-utils? ( sys-power/pm-utils )
- "
-
-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
-
- # Fix bug 441966 (urwid-1.1.0 compatibility)
- epatch "${FILESDIR}"/${P}-urwid.patch
- epatch "${FILESDIR}"/${P}-second-urwid.patch
- 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
- # The Categories entry in the .desktop files is outdated
- epatch "${FILESDIR}"/${P}-fix-desktop-categories.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"
- # 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"
- python_export_best
- "${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
-}
diff --git a/net-misc/wicd/wicd-1.7.3-r1.ebuild b/net-misc/wicd/wicd-1.7.3-r1.ebuild
deleted file mode 100644
index a5f9503..0000000
--- a/net-misc/wicd/wicd-1.7.3-r1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# 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
- # 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
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/wicd/files/, net-misc/wicd/
@ 2016-03-11 8:58 Thomas Kahle
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Kahle @ 2016-03-11 8:58 UTC (permalink / raw
To: gentoo-commits
commit: bc853eb20935198d1aaf0c16850e5fd5c9fbb6a4
Author: Thomas Kahle <tomka <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 11 08:58:05 2016 +0000
Commit: Thomas Kahle <tomka <AT> gentoo <DOT> org>
CommitDate: Fri Mar 11 08:58:25 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc853eb2
net-misc/wicd: Bump to EAPI-6
Thanks to Lars Wendler for providing the patch.
Package-Manager: portage-2.2.26
.../wicd/files/wicd-1.7.3-bitrate-property.patch | 4 +-
net-misc/wicd/files/wicd-1.7.3-urwid-1.3.0.patch | 4 +-
net-misc/wicd/wicd-1.7.4-r1.ebuild | 148 +++++++++++++++++++++
3 files changed, 152 insertions(+), 4 deletions(-)
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
index 6ac3902..855a293 100644
--- a/net-misc/wicd/files/wicd-1.7.3-bitrate-property.patch
+++ b/net-misc/wicd/files/wicd-1.7.3-bitrate-property.patch
@@ -1,5 +1,5 @@
---- curses/netentry_curses.py 2015-02-15 18:29:05.000000000 +0100
-+++ curses/netentry_curses.py 2015-02-15 18:31:24.000000000 +0100
+--- a/curses/netentry_curses.py
++++ b/curses/netentry_curses.py
@@ -538,11 +538,12 @@
self.bitrates = wireless.GetAvailableBitrates()
self.bitrates.append('auto')
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
index a028059..d7f73dc 100644
--- 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
@@ -1,5 +1,5 @@
---- curses/wicd-curses.py 2015-01-27 22:35:25.414781192 -0300
-+++ cursesb/wicd-curses.py 2015-01-28 01:13:48.078904587 -0300
+--- a/curses/wicd-curses.py
++++ b/curses/wicd-curses.py
@@ -1153,9 +1153,10 @@
if not ui._started:
return False
diff --git a/net-misc/wicd/wicd-1.7.4-r1.ebuild b/net-misc/wicd/wicd-1.7.4-r1.ebuild
new file mode 100644
index 0000000..6b413b0
--- /dev/null
+++ b/net-misc/wicd/wicd-1.7.4-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses?,xml"
+
+inherit eutils distutils-r1 linux-info readme.gentoo-r1 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 )
+ "
+PATCHES=(
+ "${FILESDIR}"/${PN}-init-sve-start.patch
+ # The Categories entry in the .desktop files is outdated
+ "${FILESDIR}"/${PN}-1.7.2.4-fix-desktop-categories.patch
+ # Upstream bug https://bugs.launchpad.net/wicd/+bug/1412413
+ # Creates files -> give -p
+ "${FILESDIR}"/${PN}-1.7.3-add-missing-gnome-shell-extension.patch
+ # If LANG is undefined, build can fail (bug 537202)
+ "${FILESDIR}"/${PN}-1.7.3-undefined-LANG.patch
+ # Fix urwid compat again
+ "${FILESDIR}"/${PN}-1.7.3-urwid-1.3.0.patch
+ # Another compatibility patch from launchpad bug 1075399
+ "${FILESDIR}"/${PN}-1.7.3-bitrate-property.patch
+)
+
+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
+
+ default
+
+ # 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_create_doc
+}
+
+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
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-03-11 8:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-09-03 11:09 [gentoo-commits] repo/gentoo:master commit in: net-misc/wicd/files/, net-misc/wicd/ Thomas Kahle
-- strict thread matches above, loose matches on Subject: below --
2015-09-06 13:41 Thomas Kahle
2016-03-11 8:58 Thomas Kahle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox