Remove some old versions

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

8 files changed, 12 insertions, 502 deletions

diff --git a/net-misc/wicd/ChangeLog b/net-misc/wicd/ChangeLog
index 95ed87aebb95..6d38b78d40b7 100644
--- a/net-misc/wicd/ChangeLog
+++ b/net-misc/wicd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/wicd
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.108 2012/01/29 12:23:34 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.109 2012/01/30 14:59:36 tomka Exp $
+
+  30 Jan 2012; Thomas Kahle <tomka@gentoo.org> -wicd-1.7.1_beta2-r3.ebuild,
+  -wicd-1.7.1_beta2-r6.ebuild, -wicd-1.7.1_beta2-r7.ebuild,
+  -wicd-1.7.1_pre20111210.ebuild, -files/wicd-1.7.1_beta2-urwid-1.0.patch,
+  -files/fix-ad-hoc-networking.patch:
+  Remove some old versions
 
   29 Jan 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   wicd-1.7.1_pre20120127.ebuild:
diff --git a/net-misc/wicd/Manifest b/net-misc/wicd/Manifest
index 204dab4027bb..06cd4e30c513 100644
--- a/net-misc/wicd/Manifest
+++ b/net-misc/wicd/Manifest
@@ -1,10 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 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-1.7.1_pre20111210-fix-config-reading.patch 392 RMD160 0faf4dce918ab921cbfa1f9d51a88bbbcfb0a87c SHA1 cd964628f71c972ab1c6ca34946f4a3a30e0b255 SHA256 437b282881bda8146145a30d85848615da039ebf43fa18f89d62da944502fdc3
 AUX wicd-1.7.1_pre20111210-wpa-psk-hex-template.patch 920 RMD160 422aefe7be91d5f28ec2458a43ec546c198732cb SHA1 df6fbf1a68fbf0e4707d40377afddbbb769502c1 SHA256 b721a8b90c97330d12787608108dd8f1db99742c596a786d4fcfa1f3abb19be6
 AUX wicd-init-sve-start.patch 317 RMD160 e08a391b31c6d48e67ad51bcd8fb08457bbc0ebc SHA1 149775d7ef4deffc4e66f73fa47276ca194c92cb SHA256 20d7ada99465da5b50d03e5ef117226910bc20288278f6f788be3fbff05716db
@@ -16,19 +14,15 @@ DIST wicd-1.7.1b2.tar.bz2 509990 RMD160 587e922271d017eb67499f64c2502b02def44f9d
 DIST wicd-mac4lin-icons.tar.xz 53136 RMD160 a5b26fda9bbabf48ddeff634f87cbcedeb3e99a4 SHA1 1a5ddf37b48a84f2a3dfc14eb2a8f01fd90b8b12 SHA256 4c48c769c71f962415e3bd3573557e9288351afb867347f9a6f652883ae31011
 EBUILD wicd-1.7.0-r1.ebuild 3072 RMD160 cee75c0a4ce24c2ca347e9c5f2587effa5d19b35 SHA1 3897fe2d505472d72f6defeba2e4f26179c1c1a1 SHA256 0b7525576cf858a83c995ecc4d45695a1d16f8efc50001073d17088e7ac40697
 EBUILD wicd-1.7.0.ebuild 2868 RMD160 98708bc1168ac9ddbc5ba5eee597caadabbeffa4 SHA1 eff48c68649747f1690003fbdd76b9f1fa7f4faa SHA256 5b42776831a158c860f91357c9006b6e75c22d3fcbd2e44219cd085c3bc74cf9
-EBUILD wicd-1.7.1_beta2-r3.ebuild 3189 RMD160 43882aa0a12763d365b129f0b41d60183a84a150 SHA1 13254c65cba4103a45ca03f7ae0f36e4aab18ea3 SHA256 f7ad63ec02f69ebbc563c500c9487b9e80d926a1a55147466f4482870140ab78
 EBUILD wicd-1.7.1_beta2-r4.ebuild 3421 RMD160 d891106aac02d2ee7d522d282228f303a5ded42d SHA1 a9357a7e76c6aeddccfc734dfe2e1d8b815997a3 SHA256 4c96591a81bb214784bee57204a536c686d7994455caa2661d0037b847a2e6e8
-EBUILD wicd-1.7.1_beta2-r6.ebuild 3708 RMD160 ba67bba58b735fbe9e94c647daa7e1c5fcb1dcd0 SHA1 1e4e02b5fe5c9afe70193ec8abc115aa188b105f SHA256 992380f2c2eda1626ad776775789cb5d26339f0c13f8b7f23ed76d9d4d7d06bd
-EBUILD wicd-1.7.1_beta2-r7.ebuild 3828 RMD160 b25508635ea8126dc4342a83c3882143e4d852a3 SHA1 a76487ba54593685086aa41501a378c938ceb8a9 SHA256 9fb851ad613e00933d0ab40c45660e534b5ed5cc84df97b6c6be1bc4d080320b
 EBUILD wicd-1.7.1_pre20111210-r1.ebuild 3714 RMD160 e11be388d8c8c300ffc1740efeba12fd0e9ff69a SHA1 abf0899be4e3eab94381f2842464047168ef19cd SHA256 8092308754ce33f32dad9a13dd86465870f079d72edd26d5495685f4d3e5bb7e
-EBUILD wicd-1.7.1_pre20111210.ebuild 3971 RMD160 35d6fb270846bfef47e97f0112ba1c00ddfe2a6f SHA1 8d608a0e34afed50fd37d56316439c4838248389 SHA256 699ad3d6cd9f5642f46d822fa36dbb57432f77018092b78291861f6f3dc13686
 EBUILD wicd-1.7.1_pre20120127.ebuild 3905 RMD160 1ac112ce18b89fc63fc5185995ce88a8e5bc1ec4 SHA1 6aa5de9703b76a30b503a18d380cb7a0ded86ac6 SHA256 c10e0250180a10d8e9d85dc0ccda42a044772c8ee18412c424fceec50fc9ca3e
-MISC ChangeLog 19053 RMD160 86e99f4bfbe6dc6b69da4f971f926d7ad67ceac5 SHA1 323e5c0342a4a3b6241e7d464ca6b1473f394917 SHA256 5841240522f92f9856893c8b3d151186bd826757b7bb533d3221bcc0ae97c9f6
+MISC ChangeLog 19325 RMD160 b4aacdf59cb576f0b1556ff48a5fe02be17058e7 SHA1 268c50990a5cab0a5f4adeb078fd7c1e70b9abd9 SHA256 cb6394a4e73c1f91d4e58f081790ee30a8f5d9fe6ea7155f6a43c07fa083c60f
 MISC metadata.xml 842 RMD160 04d4114ca290134bef4bab332c3e7afb90afcbd6 SHA1 4ed5fc502368f1810635f5cee33c14356447a1c1 SHA256 6358cacc45392ebb7a97e49d8a7f2ced8d041ff48fa57d3cc4d8c8dfe2f6cf23
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEAREKAAYFAk8lOkwACgkQuUQtlDBCeQLu3wCfQA23U+wYfpcpzRa/HoNc48Gj
-ZzoAmQE7AEqv8yh/Z/YChKkvhRTE26XO
-=P5hB
+iF4EAREIAAYFAk8msF4ACgkQodBTJSDyo67UMwD/ZWO1/k8p4iZkU0yNfp8/5wWe
+FCWgvTamd2n1I2AhYkMA/AuFqcpgf6hLPLw76Z+rWZjbSeIkiisnf/BgCG7j/Obh
+=jWwY
 -----END PGP SIGNATURE-----
diff --git a/net-misc/wicd/files/fix-ad-hoc-networking.patch b/net-misc/wicd/files/fix-ad-hoc-networking.patch
deleted file mode 100644
index 344e51a6cb8c..000000000000
--- a/net-misc/wicd/files/fix-ad-hoc-networking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-urwid-1.0.patch b/net-misc/wicd/files/wicd-1.7.1_beta2-urwid-1.0.patch
deleted file mode 100644
index b1b5abc02795..000000000000
--- a/net-misc/wicd/files/wicd-1.7.1_beta2-urwid-1.0.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- /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.1_beta2-r3.ebuild b/net-misc/wicd/wicd-1.7.1_beta2-r3.ebuild
deleted file mode 100644
index 87aeaf2253bc..000000000000
--- a/net-misc/wicd/wicd-1.7.1_beta2-r3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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.7 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.*"
-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-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-0.9.9.1
-		<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
-	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/conf.d/rc"
-	elog "(For example, RC_PLUG_SERVICES=\"!net.eth0 !net.wlan0\")"
-	# 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
-}
diff --git a/net-misc/wicd/wicd-1.7.1_beta2-r6.ebuild b/net-misc/wicd/wicd-1.7.1_beta2-r6.ebuild
deleted file mode 100644
index 507ab93003b7..000000000000
--- a/net-misc/wicd/wicd-1.7.1_beta2-r6.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# 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.4 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"
-
-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-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-0.9.9.1
-		<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
-	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
-}
diff --git a/net-misc/wicd/wicd-1.7.1_beta2-r7.ebuild b/net-misc/wicd/wicd-1.7.1_beta2-r7.ebuild
deleted file mode 100644
index 2d83d1067b6b..000000000000
--- a/net-misc/wicd/wicd-1.7.1_beta2-r7.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# 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.4 2011/11/22 19:32:58 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-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-1.60_p201111202031570500
-		>=sys-apps/net-tools-1.60_p201111202031570500[old-output]
-		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
-}
-
-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
-}
diff --git a/net-misc/wicd/wicd-1.7.1_pre20111210.ebuild b/net-misc/wicd/wicd-1.7.1_pre20111210.ebuild
deleted file mode 100644
index 71504de86da9..000000000000
--- a/net-misc/wicd/wicd-1.7.1_pre20111210.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# 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_pre20111210.ebuild,v 1.4 2011/12/30 09:42:08 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 systemd
-
-MY_PV="${PN}-1.7.1"
-S="${WORKDIR}/${MY_PV}"
-
-DESCRIPTION="A lightweight wired and wireless network manager for Linux"
-HOMEPAGE="http://wicd.sourceforge.net/"
-SRC_URI="http://dev.gentoo.org/~tomka/files/${P}.tar.gz"
-
-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-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
-		dev-python/pygobject:2
-	)
-	pm-utils? ( >=sys-power/pm-utils-1.1.1 )
-	"
-DOCS="CHANGES NEWS AUTHORS README"
-
-src_prepare() {
-	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}"/${P}-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
-	systemd_dounit "${S}/other/wicd.service"
-}
-
-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
-	ewarn "If you upgrade from earlier versions, then be sure to check"
-	ewarn "your connection settings.  New versions parse old settings"
-	ewarn "differently, so your DHCP hostname and passphrase could appear"
-	ewarn "enclosed in ['square brackets in quotes']. In this case just"
-	ewarn "remove the offending brackets and quotes."
-}