Removed old versions. Limit urwid dep on 1.6.2.2 (bug #295033). Version bump to 1.7.0_alpha1 which has major tray changes and many minor changes including an ability to not install the gtk UI (bug #293538)

(Portage version: 2.1.7.4/cvs/Linux x86_64)

5 files changed, 30 insertions, 66 deletions

diff --git a/net-misc/wicd/ChangeLog b/net-misc/wicd/ChangeLog
index ee173b612087..f1feff82abf6 100644
--- a/net-misc/wicd/ChangeLog
+++ b/net-misc/wicd/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-misc/wicd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.58 2009/11/30 06:40:51 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.59 2009/12/01 01:31:04 darkside Exp $
+
+*wicd-1.7.0_alpha1 (01 Dec 2009)
+
+  01 Dec 2009; Jeremy Olexa <darkside@gentoo.org> -wicd-1.5.9-r1.ebuild,
+  -wicd-1.6.2.ebuild, wicd-1.6.2.2.ebuild, +wicd-1.7.0_alpha1.ebuild,
+  metadata.xml:
+  Removed old versions. Limit urwid dep on 1.6.2.2 (bug #295033). Version
+  bump to 1.7.0_alpha1 which has major tray changes and many minor changes
+  including an ability to not install the gtk UI (bug #293538)
 
   30 Nov 2009; Joseph Jezak <josejx@gentoo.org> wicd-1.6.2.2.ebuild:
   Marked ppc/ppc64 stable.
diff --git a/net-misc/wicd/metadata.xml b/net-misc/wicd/metadata.xml
index 73c273b15633..5248712a80d9 100644
--- a/net-misc/wicd/metadata.xml
+++ b/net-misc/wicd/metadata.xml
@@ -6,6 +6,8 @@
   <email>darkside@gentoo.org</email>
 </maintainer>
 <use>
+	<flag name='gtk'>Installs a gtk UI. This is enabled by default because it is
+		intended behavior. Requires <pkg>dev-python/pygtk</pkg></flag>
 	<flag name='ioctl'>Installs additional python libraries to use as a backend.
 	This will improve speed but is experimental.</flag>
 	<flag name='ncurses'>Installs a ncurses UI</flag>
diff --git a/net-misc/wicd/wicd-1.5.9-r1.ebuild b/net-misc/wicd/wicd-1.5.9-r1.ebuild
deleted file mode 100644
index 88223d60f7c3..000000000000
--- a/net-misc/wicd/wicd-1.5.9-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.5.9-r1.ebuild,v 1.3 2009/02/25 16:26:02 dertobi123 Exp $
-
-inherit distutils eutils
-
-DESCRIPTION="A lightweight wired and wireless network manager for Linux"
-HOMEPAGE="http://wicd.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-python/dbus-python
-	dev-python/pygtk
-	|| (
-		net-misc/dhcpcd
-		net-misc/dhcp
-		net-misc/pump
-	)
-	net-wireless/wireless-tools
-	net-wireless/wpa_supplicant
-	|| (
-		sys-apps/net-tools
-		sys-apps/ethtool
-	)
-	|| ( x11-misc/ktsuss x11-libs/gksu kde-base/kdesu )
-	>=sys-power/pm-utils-1.1.1"
-
-src_compile() {
-	${python} ./setup.py configure --no-install-init --no-install-docs --resume=/usr/share/wicd/scripts/ --suspend=/usr/share/wicd/scripts/ --verbose
-	distutils_src_compile
-}
-
-src_install() {
-	DOCS="CHANGES"
-	distutils_src_install
-	newinitd "${FILESDIR}/wicd-init.d" wicd || die "newinitd failed"
-	keepdir /var/lib/wicd/configurations || die "keepdir failed, critical for this app"
-}
-
-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\")"
-}
diff --git a/net-misc/wicd/wicd-1.6.2.2.ebuild b/net-misc/wicd/wicd-1.6.2.2.ebuild
index eac2aa613ee6..98db389ab69e 100644
--- a/net-misc/wicd/wicd-1.6.2.2.ebuild
+++ b/net-misc/wicd/wicd-1.6.2.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.6.2.2.ebuild,v 1.4 2009/11/30 06:40:51 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.6.2.2.ebuild,v 1.5 2009/12/01 01:31:04 darkside Exp $
 
 EAPI="2"
 
@@ -40,7 +40,7 @@ RDEPEND="
 	)
 	ioctl? ( dev-python/python-iwscan dev-python/python-wpactrl )
 	libnotify? ( dev-python/notify-python )
-	ncurses? ( >=dev-python/urwid-0.9.8.4 )
+	ncurses? ( <dev-python/urwid-0.9.9 )
 	pm-utils? ( >=sys-power/pm-utils-1.1.1 )
 	"
 
diff --git a/net-misc/wicd/wicd-1.6.2.ebuild b/net-misc/wicd/wicd-1.7.0_alpha1.ebuild
index c42281e468c3..e1eb97863122 100644
--- a/net-misc/wicd/wicd-1.6.2.ebuild
+++ b/net-misc/wicd/wicd-1.7.0_alpha1.ebuild
@@ -1,24 +1,28 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.6.2.ebuild,v 1.5 2009/11/08 06:27:47 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.0_alpha1.ebuild,v 1.1 2009/12/01 01:31:04 darkside Exp $
 
-EAPI="2"
+EAPI=2
 
-inherit distutils eutils
+MY_P=${P/_alpha/a}
+inherit distutils
 
 DESCRIPTION="A lightweight wired and wireless network manager for Linux"
 HOMEPAGE="http://wicd.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+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="ioctl libnotify ncurses +pm-utils"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+gtk ioctl libnotify ncurses +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
-	dev-python/pygtk
+	gtk? ( dev-python/pygtk )
 	|| (
 		net-misc/dhcpcd
 		net-misc/dhcp
@@ -37,12 +41,15 @@ RDEPEND="
 	)
 	ioctl? ( dev-python/python-iwscan dev-python/python-wpactrl )
 	libnotify? ( dev-python/notify-python )
-	ncurses? ( >=dev-python/urwid-0.9.8.4 )
+	ncurses? ( dev-python/urwid )
 	pm-utils? ( >=sys-power/pm-utils-1.1.1 )
 	"
 
+S="${WORKDIR}/${MY_P}"
+
 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"
@@ -51,7 +58,7 @@ src_compile() {
 }
 
 src_install() {
-	DOCS="CHANGES"
+	DOCS="CHANGES NEWS AUTHORS README"
 	distutils_src_install
 	keepdir /var/lib/wicd/configurations \
 		|| die "keepdir failed, critical for this app"