Removed old beta revisions.

Package-Manager: portage-2.1.9.43/cvs/Linux i686

5 files changed, 17 insertions, 104 deletions

diff --git a/net-misc/wicd/ChangeLog b/net-misc/wicd/ChangeLog
index f6f0802de07b..1d8e7adc317b 100644
--- a/net-misc/wicd/ChangeLog
+++ b/net-misc/wicd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/wicd
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.80 2011/03/19 08:21:32 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.81 2011/03/19 08:23:54 tomka Exp $
+
+  19 Mar 2011; Thomas Kahle <tomka@gentoo.org> wicd-1.7.0.ebuild,
+  wicd-1.7.0-r1.ebuild, -wicd-1.7.1_beta2.ebuild:
+  Removed old beta revisions.
 
   19 Mar 2011; Thomas Kahle <tomka@gentoo.org> wicd-1.7.0.ebuild,
   wicd-1.7.0-r1.ebuild, wicd-1.7.1_beta2-r2.ebuild:
diff --git a/net-misc/wicd/Manifest b/net-misc/wicd/Manifest
index c3f475f3632f..4e590b1ac9ef 100644
--- a/net-misc/wicd/Manifest
+++ b/net-misc/wicd/Manifest
@@ -4,17 +4,16 @@ Hash: SHA1
 AUX wicd-init.d 434 RMD160 408065ff312ab595022f777853c15031bab17dcf SHA1 87426d2958c9e4bfff9b8ea48d5857d9e67aa191 SHA256 5546deda3d5fa8f6ee1125922f1217182b24d68a22f5a1212509bb13bf0156e2
 DIST wicd-1.7.0.tar.bz2 411166 RMD160 66893e4043ba7e96996d698f847c0ab3b350df6a SHA1 1cd087f53538b1f6e1cfad9735c87741e05698f6 SHA256 14c5692bf8a4c93c9ac083ce9ad677b0d9022b19f84e777854766b2a6f753b32
 DIST wicd-1.7.1b2.tar.bz2 509990 RMD160 587e922271d017eb67499f64c2502b02def44f9d SHA1 2e3d2346f1607f7f63bb00bf7fef41bc5a419726 SHA256 810d51b3eec10be39b399f8baa0b2ef36ed7bb14606f9e0844bea11b8532ea8d
-EBUILD wicd-1.7.0-r1.ebuild 3063 RMD160 584dd390dffe374a7c08c7e999cf9164d0986236 SHA1 91ab481b2441b7385d6e7e56cf817d27268dc783 SHA256 d05bfc626bd03167e21edee7ea42c33aaa6baf8cd9f8012cf2bdeff8ff83dc41
-EBUILD wicd-1.7.0.ebuild 2858 RMD160 23607db1ffa33dd4e924b3237a63f2ac20e7ef1e SHA1 350f74cfa307cd04d5bec9093a9ad4485dd02443 SHA256 bd75e55c43ace8480b680a69f4bf88cf4d048000c21b87fed682f9044e5863da
+EBUILD wicd-1.7.0-r1.ebuild 3061 RMD160 bb369b4759c77d5b053886be102865d1aee86a9a SHA1 99a13e4ea0d6491b673aa776e29b095d464edcd4 SHA256 c7f4ab73c526fc2306cfd66e6fbbc663284db3185157f13224d0b3e987832640
+EBUILD wicd-1.7.0.ebuild 2856 RMD160 7ec89bf25620c0d291489812b4455c1326e1e285 SHA1 6395677c5391a67a0c38009c9db6af0668bc68a3 SHA256 f49706e3dd3fed63a3ffd033ed3eaab351a16fe4df17b4bad991399b195f7d64
 EBUILD wicd-1.7.1_beta2-r1.ebuild 3086 RMD160 4af2d9c9f9385cd20f85e4cb8390bacfee7bf239 SHA1 35f49fc720fb9dbd3b3c61368730e7147a4df9bc SHA256 85743f684f80330dcd2fb60ff46e52b5fc83a8fa6cb0dcb78af93ef3cdaaa158
 EBUILD wicd-1.7.1_beta2-r2.ebuild 3144 RMD160 d44a75073a78bdc3e7ff38d504122f554ba848a0 SHA1 77f06530b3c583256e1d82fa1fcf1e5051a7c2fa SHA256 656ba1d735a37b3e27966e8889cbf307fb67543c1b4aba76e7e7a05132a8ce34
-EBUILD wicd-1.7.1_beta2.ebuild 2888 RMD160 1b73592c0fec25f4c59465b31c774fdb8dabddec SHA1 7a43b26a9cc1a9c7a36a828c442acb9f739c08b9 SHA256 12d53bdb228a6155b0272f1d6868b422b94c275fb271261f259b0904505ec383
-MISC ChangeLog 14314 RMD160 556bb359168f777fae9f6843602789cfcf1938d0 SHA1 b73c84ac33881590254ea4540a30830e8665790d SHA256 ac9cc5b3b02a47ba8309428d52e575dc3e455927b874cb80667f93c23fa10226
+MISC ChangeLog 14461 RMD160 c34741c288fb8dc52a4ab74933d68f71b4b11f91 SHA1 f29c2259eff70686e7961494a6865012b1d4fa56 SHA256 9b9b1f0dd95263729e2326e385fe14a27d26317bba6eb14baea30e0c3790e935
 MISC metadata.xml 795 RMD160 237424ffc88cb2020c18b063347a41b168fea63e SHA1 a5eab12eb1d22d54b713bd25bf8a6d216c38efe4 SHA256 370e0a1d289a2e54b68f6d9d78a92cdb17b115c1752f6cf8bcee1ea9b93b329e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2EaCcACgkQnZsgo/h8kNYj+wCffzSjveNppVhItk55TKoWPzj2
-foMAnRvrPjAYdZ83YQJyXWyMmzThb2bU
-=rj6X
+iEYEARECAAYFAk2EaLMACgkQnZsgo/h8kNYrbQCcC30vFhmBzhsBCNgkhw0dOcGs
+EScAnRAfJACeflRXMotyP+J0Y9OFz9jO
+=1ZeC
 -----END PGP SIGNATURE-----
diff --git a/net-misc/wicd/wicd-1.7.0-r1.ebuild b/net-misc/wicd/wicd-1.7.0-r1.ebuild
index 1442e8afc608..748d11b7cda4 100644
--- a/net-misc/wicd/wicd-1.7.0-r1.ebuild
+++ b/net-misc/wicd/wicd-1.7.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.0-r1.ebuild,v 1.2 2011/03/19 08:21:32 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.0-r1.ebuild,v 1.3 2011/03/19 08:23:54 tomka Exp $
 
 EAPI=3
 
@@ -48,8 +48,8 @@ RDEPEND="
 	!gtk? ( dev-python/pygobject )
 	ioctl? ( dev-python/python-iwscan dev-python/python-wpactrl )
 	libnotify? ( dev-python/notify-python )
-	ncurses? ( 
-		>=dev-python/urwid-0.9.9.1 
+	ncurses? (
+		>=dev-python/urwid-0.9.9.1
 		dev-python/pygobject
 	)
 	pm-utils? ( >=sys-power/pm-utils-1.1.1 )
diff --git a/net-misc/wicd/wicd-1.7.0.ebuild b/net-misc/wicd/wicd-1.7.0.ebuild
index a9f6443f313b..fc7ea95bb764 100644
--- a/net-misc/wicd/wicd-1.7.0.ebuild
+++ b/net-misc/wicd/wicd-1.7.0.ebuild
@@ -1,6 +1,6 @@
 # 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.0.ebuild,v 1.8 2011/03/19 08:21:32 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.0.ebuild,v 1.9 2011/03/19 08:23:54 tomka Exp $
 
 EAPI=2
 
@@ -43,8 +43,8 @@ RDEPEND="
 	!gtk? ( dev-python/pygobject )
 	ioctl? ( dev-python/python-iwscan dev-python/python-wpactrl )
 	libnotify? ( dev-python/notify-python )
-	ncurses? ( 
-		>=dev-python/urwid-0.9.9.1 
+	ncurses? (
+		>=dev-python/urwid-0.9.9.1
 		dev-python/pygobject
 		)
 	pm-utils? ( >=sys-power/pm-utils-1.1.1 )
diff --git a/net-misc/wicd/wicd-1.7.1_beta2.ebuild b/net-misc/wicd/wicd-1.7.1_beta2.ebuild
deleted file mode 100644
index 8142813078ec..000000000000
--- a/net-misc/wicd/wicd-1.7.1_beta2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2010 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.ebuild,v 1.1 2010/12/01 19:39:09 darkside Exp $
-
-EAPI=2
-
-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-misc/ktsuss
-			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 )
-	ioctl? ( dev-python/python-iwscan dev-python/python-wpactrl )
-	libnotify? ( dev-python/notify-python )
-	ncurses? ( >=dev-python/urwid-0.9.9.1 )
-	pm-utils? ( >=sys-power/pm-utils-1.1.1 )
-	"
-
-src_compile() {
-	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} ./setup.py configure --no-install-docs --resume=/usr/share/wicd/scripts/ --suspend=/usr/share/wicd/scripts/ --verbose ${myconf}
-	distutils_src_compile
-}
-
-src_install() {
-	DOCS="CHANGES NEWS AUTHORS README"
-	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
-}