summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Kahle <tomka@gentoo.org>2015-09-06 15:39:19 +0200
committerThomas Kahle <tomka@gentoo.org>2015-09-06 15:39:19 +0200
commit2f872cdb1ed7e0491e7f8ba1f144887b7d783810 (patch)
treea54a831b5e3de995fa815f3f958fd95feee7ba42 /net-misc/wicd/files
parentapp-arch/star: ppc stable wrt bug #556030 (diff)
downloadgentoo-2f872cdb1ed7e0491e7f8ba1f144887b7d783810.tar.gz
gentoo-2f872cdb1ed7e0491e7f8ba1f144887b7d783810.tar.bz2
gentoo-2f872cdb1ed7e0491e7f8ba1f144887b7d783810.zip
net-misc/wicd: Remove old
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'net-misc/wicd/files')
-rw-r--r--net-misc/wicd/files/wicd-1.7.1-provide-net.patch11
-rw-r--r--net-misc/wicd/files/wicd-1.7.1_beta2-init.patch11
-rw-r--r--net-misc/wicd/files/wicd-1.7.1_pre20111210-wpa-psk-hex-template.patch30
-rw-r--r--net-misc/wicd/files/wicd-1.7.2.4-fix-dbus-error.patch16
-rw-r--r--net-misc/wicd/files/wicd-1.7.2.4-second-urwid.patch43
-rw-r--r--net-misc/wicd/files/wicd-1.7.2.4-urwid.patch66
6 files changed, 0 insertions, 177 deletions
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 f325bcbaa89d..000000000000
--- 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 6a736f9e2cdd..000000000000
--- 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 6736cb7b8d1b..000000000000
--- 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 2fddc9a2e55f..000000000000
--- 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 9a0bae6c9625..000000000000
--- 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 63eba2ed48b6..000000000000
--- 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()
-