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

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo x86_64

4 files changed, 19 insertions, 56 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/Manifest b/net-misc/wicd/Manifest
index 37c6fdbac78b..3f0e4b32c341 100644
--- a/net-misc/wicd/Manifest
+++ b/net-misc/wicd/Manifest
@@ -1,11 +1,9 @@
 AUX wicd-1.5.2-docs.patch 2437 RMD160 250090065b3c3995f919450b2ac308ae19ad6168 SHA1 c06889c7d4bf82b7dbe121fe2b16f1cd16a591c6 SHA256 e34dfd5039eca9d4e8b7d93994d4cfaa470a05a4a87b5015356044cc51294f6d
 AUX wicd-1.5.3-wicd-client-manpage.patch 1244 RMD160 112716b1c403245d55be6d765d2d6d03f0c200f5 SHA1 9766b53e1b625b7e4fd0cb32c90ece6ced959c1c SHA256 9431d87ce28cec1be784936ba0360e6783d3ef107db6704a9778c55073efea4c
 AUX wicd-init.d 434 RMD160 408065ff312ab595022f777853c15031bab17dcf SHA1 87426d2958c9e4bfff9b8ea48d5857d9e67aa191 SHA256 5546deda3d5fa8f6ee1125922f1217182b24d68a22f5a1212509bb13bf0156e2
-DIST wicd-1.5.1.tar.gz 228262 RMD160 c4f4c10b3d8d6f6ca421c5be8db3df9495881027 SHA1 3cffd046a996cda341c43c86df22b3de3ff5aaf2 SHA256 378faa1e4081c4696517a0f3a5eec0777e65e0511a862034b95ea05464a76ef8
 DIST wicd-1.5.2.tar.gz 233932 RMD160 3a6210462bd68f44e2bd23896e4b06f00c6b1dc2 SHA1 966e77a606898da4cd7e9d385eff8df6ea9af543 SHA256 8c375e3db6f5594c25acf88c6011ff9fdc37213bebe87d107b3fd3f145e51706
 DIST wicd-1.5.3.tar.gz 237288 RMD160 bdcbc29e707c97b4747cc30291cfaf941466679a SHA1 9f76019c457ae7ef0cb4975523ccc290c1d0b01a SHA256 e9aad11b31b52a1c9c5a7b122c588e13b1970c185df07142c046441636377fb2
-EBUILD wicd-1.5.1.ebuild 1362 RMD160 06749fa218bf0c998cc78e9d4b54dbbf45fb7347 SHA1 3218dc592b154520071dc3241e598219c478e640 SHA256 049a51858dd4bd9282b810b862cfce042157d1bda5a9ae48336d8044b956e16b
 EBUILD wicd-1.5.2.ebuild 1604 RMD160 8256e5c9dc3f42aa76d3b53769929e9118210afc SHA1 10e37cd812da64d77cefe9441b4c3df9b439e296 SHA256 1f517762655757d66085d741f4da844b78b97bca62dd202869501d06236e4edf
-EBUILD wicd-1.5.3-r1.ebuild 1559 RMD160 ee4bf2c9dc5035b7dc3b005c8e73f2138909a2b2 SHA1 adeff3f9211698611b82fab328f197af4ce1c20e SHA256 5a80751237ec353a7d8142dbb3368af5e49b497217401a1155b956c62363c61b
-MISC ChangeLog 3293 RMD160 99a1ac8b231c9de3b5cf54572f670ffa57dfa60c SHA1 802b1f8e191d9f471fe1e1d0a5071c432f768eb3 SHA256 166d00b7e2573a07eefecf0c4b6f95d0e434e8ad610aceb5c00c3fa8df2b0cc6
+EBUILD wicd-1.5.3-r2.ebuild 1722 RMD160 76807345329201eb2ce5b9ca1fc82c1285842e4f SHA1 d8e3c5dcbea505d3bd086765317d34fc4b093ad2 SHA256 3139a40dfdf03854eef813c866c2da419d4d8b0e10dc317cf953ad421f110f22
+MISC ChangeLog 3669 RMD160 a6ab21061c3186853e1123449ac2b8010311eda3 SHA1 a4287c1833648d9533f3b92f2ef453ca7bbb9334 SHA256 aae531b1b52df9d8bfb27d1fb7c0338a0aced6d006638cfd896a5d2e48d96892
 MISC metadata.xml 224 RMD160 ef4cc3054936a3572ec992bcceee2519eddcba46 SHA1 3b0afde57f521aa4f834fed82806e79be3530c3e SHA256 fc3ff3b3ec6fac6a93feff4a2692f42f8abd9e7b5741d81a272a820d40092b73
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
 
 }