version bump

(Portage version: 2.2_rc16/cvs/Linux 2.6.28-rc6-wl-dirty x86_64)

4 files changed, 14 insertions, 97 deletions

diff --git a/net-misc/wicd/ChangeLog b/net-misc/wicd/ChangeLog
index 28a9e1f9a15d..d71eae45d8b5 100644
--- a/net-misc/wicd/ChangeLog
+++ b/net-misc/wicd/ChangeLog
@@ -1,6 +1,15 @@
 # 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.20 2008/12/01 13:35:56 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.21 2008/12/04 14:10:23 darkside Exp $
+
+*wicd-1.5.6 (04 Dec 2008)
+
+  04 Dec 2008; Jeremy Olexa <darkside@gentoo.org>
+  -files/wicd-1.5.3-wicd-client-manpage.patch, -wicd-1.5.3-r2.ebuild,
+  -wicd-1.5.5.ebuild, +wicd-1.5.6.ebuild:
+  Version bump, from CHANGES file:
+  1.5.6
+   * Wicd will now start if the logging directory is present, but the log isn't
 
 *wicd-1.5.5 (01 Dec 2008)
 
diff --git a/net-misc/wicd/files/wicd-1.5.3-wicd-client-manpage.patch b/net-misc/wicd/files/wicd-1.5.3-wicd-client-manpage.patch
deleted file mode 100644
index 767d6201c737..000000000000
--- a/net-misc/wicd/files/wicd-1.5.3-wicd-client-manpage.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: setup.py
-===================================================================
---- setup.py	(revision 488)
-+++ setup.py	(working copy)
-@@ -311,6 +311,7 @@
-     if not wpath.no_install_init:
-         data.append(( wpath.init, [ wpath.initfile ]))
-     if not wpath.no_install_man:
-+        data.append(( wpath.mandir + 'man1/', [ 'man/wicd-client.1' ]))
-         data.append(( wpath.mandir + 'man8/', [ 'man/wicd.8' ]))
-         data.append(( wpath.mandir + 'man5/', [ 'man/wicd-manager-settings.conf.5' ]))
-         data.append(( wpath.mandir + 'man5/', [ 'man/wicd-wired-settings.conf.5' ]))
-Index: in/man=wicd-client.1.in
-===================================================================
---- in/man=wicd-client.1.in	(revision 0)
-+++ in/man=wicd-client.1.in	(revision 0)
-@@ -0,0 +1,15 @@
-+.TH WICD-CLIENT "1" "September 2008" "wicd-client " "User Commands"
-+.SH NAME
-+wicd-client \- manual page for wicd-client 
-+.SH DESCRIPTION
-+wireless (and wired) connection daemon front\-end.
-+.SS "Arguments:"
-+.TP
-+\fB\-n\fR      \fB\-\-no\-tray\fR
-+Run wicd without the tray icon.
-+.TP
-+\fB\-h\fR      \fB\-\-help\fR
-+Print this help information.
-+.TP
-+\fB\-a\fR      \fB\-\-no\-animate\fR
-+Run the tray without network traffic tray animations.
diff --git a/net-misc/wicd/wicd-1.5.3-r2.ebuild b/net-misc/wicd/wicd-1.5.3-r2.ebuild
deleted file mode 100644
index 47e4d37c8e31..000000000000
--- a/net-misc/wicd/wicd-1.5.3-r2.ebuild
+++ /dev/null
@@ -1,62 +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.3-r2.ebuild,v 1.3 2008/11/18 03:14:23 darkside 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/dhcp
-		net-misc/dhcpcd
-		net-misc/pump
-	)
-	net-wireless/wireless-tools
-	net-wireless/wpa_supplicant
-	|| (
-		sys-apps/ethtool
-		sys-apps/net-tools
-	)
-	|| ( x11-misc/ktsuss x11-libs/gksu kde-base/kdesu )"
-
-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
-
-}
-
-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"
-}
-
-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.5.ebuild b/net-misc/wicd/wicd-1.5.6.ebuild
index e3d4cf212b57..971861fd35ba 100644
--- a/net-misc/wicd/wicd-1.5.5.ebuild
+++ b/net-misc/wicd/wicd-1.5.6.ebuild
@@ -1,12 +1,14 @@
 # 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.5.ebuild,v 1.1 2008/12/01 13:35:56 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.5.6.ebuild,v 1.1 2008/12/04 14:10:23 darkside Exp $
 
 inherit distutils eutils
 
+MY_P=${P/-/_}
+
 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="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"