Fix up deps to be more proper on net-misc/wicd

(Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo x86_64)

3 files changed, 17 insertions, 52 deletions

diff --git a/net-misc/wicd/ChangeLog b/net-misc/wicd/ChangeLog
index a3b3ecf45099..9d60502feb8d 100644
--- a/net-misc/wicd/ChangeLog
+++ b/net-misc/wicd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/wicd
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.12 2008/09/29 22:07:21 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.13 2008/10/09 05:21:54 darkside Exp $
+
+*wicd-1.5.3-r2 (09 Oct 2008)
+
+  09 Oct 2008; Jeremy Olexa <darkside@gentoo.org> -wicd-1.5.1.ebuild,
+  -wicd-1.5.3-r1.ebuild, +wicd-1.5.3-r2.ebuild:
+  Fix deps, I was not including a graphical su program in the rdeps so one
+  could not bring up the scripts dialog. Fix this by depending on ktsuss,
+  gksu, or kdesu. Also, need to depend on python, obvious. Remove old version
 
 *wicd-1.5.3-r1 (29 Sep 2008)
 
diff --git a/net-misc/wicd/wicd-1.5.1.ebuild b/net-misc/wicd/wicd-1.5.1.ebuild
deleted file mode 100644
index 8c81ea3bb96d..000000000000
--- a/net-misc/wicd/wicd-1.5.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.5.1.ebuild,v 1.1 2008/08/04 16:16:37 darkside Exp $
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/dbus-python
-	dev-python/pygtk
-	|| (
-		net-misc/dhcp
-		net-misc/dhcpcd
-		net-misc/pump
-	)
-	net-wireless/wireless-tools
-	net-wireless/wpa_supplicant
-	|| (
-		sys-apps/ethtool
-		sys-apps/net-tools
-	)"
-
-src_compile() {
-	${python} ./setup.py configure --no-install-init --resume=/usr/share/wicd/scripts/ --suspend=/usr/share/wicd/scripts/ --verbose
-	distutils_src_compile
-}
-
-src_install() {
-	distutils_src_install
-	newinitd "${FILESDIR}/wicd-init.d" wicd || die "newinitd failed"
-}
-
-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.5.3-r1.ebuild b/net-misc/wicd/wicd-1.5.3-r2.ebuild
index 5961b99ae2ce..c977bc895ab2 100644
--- a/net-misc/wicd/wicd-1.5.3-r1.ebuild
+++ b/net-misc/wicd/wicd-1.5.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.5.3-r1.ebuild,v 1.1 2008/09/29 22:07:21 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.5.3-r2.ebuild,v 1.1 2008/10/09 05:21:54 darkside Exp $
 
 inherit distutils eutils
 
@@ -13,6 +13,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
+DEPEND="dev-lang/python"
 RDEPEND="dev-python/dbus-python
 	dev-python/pygtk
 	|| (
@@ -25,12 +26,17 @@ RDEPEND="dev-python/dbus-python
 	|| (
 		sys-apps/ethtool
 		sys-apps/net-tools
-	)"
+	)
+	|| ( x11-misc/ktsuss x11-libs/gksu kde-base/kdesu )
+	${DEPEND}"
 
 src_unpack() {
 	distutils_src_unpack
 	# patch to install new man page - submitted upstream
 	epatch "${FILESDIR}/${P}-wicd-client-manpage.patch"
+	
+	# discussing with upstream
+	sed -i 's/gksu/gksudo/' wicd/{misc,gui}.py
 
 }