Version bump. add ~x86 kw. Remove old.

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

6 files changed, 16 insertions, 75 deletions

diff --git a/net-misc/wicd/ChangeLog b/net-misc/wicd/ChangeLog
index d6cabbf02309..2a4413f15981 100644
--- a/net-misc/wicd/ChangeLog
+++ b/net-misc/wicd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.2 2008/08/01 16:17:55 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.3 2008/08/03 02:52:19 darkside Exp $
+
+*wicd-1.5.0 (03 Aug 2008)
+
+  03 Aug 2008; Jeremy Olexa <darkside@gentoo.org> -files/wicd-1.4.2-init.d,
+  +files/wicd-1.5.0-init.d, -files/wicd-1.5.0_rc11-init.d,
+  -wicd-1.4.2.ebuild, -wicd-1.5.0_rc11.ebuild, +wicd-1.5.0.ebuild:
+  Version bump. add ~x86 kw. Remove old.
 
   01 Aug 2008; Jeremy Olexa <darkside@gentoo.org>
   +files/wicd-1.5.0_rc11-init.d, -files/wicd-1.5.0_rc5-init.d,
diff --git a/net-misc/wicd/Manifest b/net-misc/wicd/Manifest
index a6558b2d3495..c06228c527ef 100644
--- a/net-misc/wicd/Manifest
+++ b/net-misc/wicd/Manifest
@@ -1,8 +1,5 @@
-AUX wicd-1.4.2-init.d 434 RMD160 c221d8e1ceeec9577f06d256e7fee498b7d736d4 SHA1 d834f5edd20dbfa9df5d8655b2b1d3369a4d9179 SHA256 485a5bd84230996eac3f29569ab99edde336d5bf4f41be7fc570b1d68dd7b4a2
-AUX wicd-1.5.0_rc11-init.d 424 RMD160 f9c12319678d7af37856a8c48b4789c3ca2cfebd SHA1 74a8882f05c8ed23805a5577e795a07039c35908 SHA256 d61b5280440853ad32a683aded8d4f51c81907248fc0e1d75762cede3db63803
-DIST wicd-1.5.0rc11.tar.gz 178977 RMD160 8142e1ebd2981ffaaa6690d7a83c1d66b3a349a6 SHA1 e7b9b18f170ea0e92842100b79e527e8a4c7b157 SHA256 afd149a01eb0f7e538c5d37a47664083744db18f5e408e493b7c410192cb13f9
-DIST wicd_1.4.2-src.tar.bz2 144442 RMD160 1e379366670ea800e713ece537aa8d582fc17f1e SHA1 c791ef6b76ca5adebb1d515265abe3ed78447347 SHA256 8d64954bbf56bbc7597639d5472c7cdf7b1f73120b6453225f17a766c6c7794c
-EBUILD wicd-1.4.2.ebuild 962 RMD160 08ff2e28fd691ae80009835b8122f0838e4dd775 SHA1 9e99569a543a23c5cfd57dff90923632d17bb8d9 SHA256 7c4b466d018306cde6d061120a1f8b67fdc892e36258f2985b1d5cf4f5385f50
-EBUILD wicd-1.5.0_rc11.ebuild 1255 RMD160 857821063c07fd65509fd20639e3415403d451eb SHA1 50ba70e427dc3e7769302a97b2a7e788f113f6be SHA256 3678df6833059e149601128254d84e96421fa34f67252f704b0c9fa2f6bcc7d4
-MISC ChangeLog 1042 RMD160 594d3817e6cdeb7718bb71069fb08d50f118272f SHA1 5a75d91d0a3ce39ca770c96b3f9ca7ebb43d9571 SHA256 169f2206b5d6730b10cf1d90b90755fcc268d157b576d713cc62c0175ab8daf4
+AUX wicd-1.5.0-init.d 424 RMD160 f9c12319678d7af37856a8c48b4789c3ca2cfebd SHA1 74a8882f05c8ed23805a5577e795a07039c35908 SHA256 d61b5280440853ad32a683aded8d4f51c81907248fc0e1d75762cede3db63803
+DIST wicd-1.5.0.tar.gz 225408 RMD160 93c1887a2799a4ee30f65cb29e2aa239fcab66e6 SHA1 9a8ccc398f3c180b1f1507b03c10c22c35222bfc SHA256 9f9492959ff93cc3e24aee8e34427a4325e018a76514b703ff0f265413fceaf5
+EBUILD wicd-1.5.0.ebuild 1209 RMD160 57e9ed523a7bd88af3233bdf5cd9d199b8257e18 SHA1 77ee575d50d2d9ee5d90dfe188960ec2dae8d770 SHA256 1a51a715c0a35b7a013bb95da11bb3ad3be0c3686897dc7f1eafccc6781075bc
+MISC ChangeLog 1313 RMD160 71d40411e92953a952368acc38ec907b359f6aa7 SHA1 b180289cd7fc15f566a7ef4b63baccbcd2287759 SHA256 9ff266580c0a4a82fb6bf544e213169bd603b33baaab22de507645132ce3278d
 MISC metadata.xml 224 RMD160 ef4cc3054936a3572ec992bcceee2519eddcba46 SHA1 3b0afde57f521aa4f834fed82806e79be3530c3e SHA256 fc3ff3b3ec6fac6a93feff4a2692f42f8abd9e7b5741d81a272a820d40092b73
diff --git a/net-misc/wicd/files/wicd-1.4.2-init.d b/net-misc/wicd/files/wicd-1.4.2-init.d
deleted file mode 100644
index 9c056045cb67..000000000000
--- a/net-misc/wicd/files/wicd-1.4.2-init.d
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-opts="start stop restart"
-
-WICD_DAEMON="/opt/wicd/daemon.py"
-
-depend() {
-	need dbus
-}
-
-start() {
-	ebegin "Starting wicd daemon"
-	start-stop-daemon --start --exec $WICD_DAEMON &>/dev/null
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping wicd daemon"
-	start-stop-daemon --stop --exec $WICD_DAEMON &>/dev/null
-	eend $?
-}
diff --git a/net-misc/wicd/files/wicd-1.5.0_rc11-init.d b/net-misc/wicd/files/wicd-1.5.0-init.d
index f4083beeb8db..f4083beeb8db 100644
--- a/net-misc/wicd/files/wicd-1.5.0_rc11-init.d
+++ b/net-misc/wicd/files/wicd-1.5.0-init.d
diff --git a/net-misc/wicd/wicd-1.4.2.ebuild b/net-misc/wicd/wicd-1.4.2.ebuild
deleted file mode 100644
index 5184975bdc9e..000000000000
--- a/net-misc/wicd/wicd-1.4.2.ebuild
+++ /dev/null
@@ -1,37 +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.4.2.ebuild,v 1.1 2008/07/31 18:08:54 darkside Exp $
-
-MY_P="${PN}_${PV}-src"
-DESCRIPTION="A lightweight wired and wireless network manager for Linux"
-HOMEPAGE="http://wicd.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="dev-python/dbus-python
-	dev-python/pygtk
-	net-misc/dhcp
-	net-wireless/wireless-tools
-	net-wireless/wpa_supplicant
-	sys-apps/ethtool"
-
-src_install() {
-	mv "${WORKDIR}"/* "${D}" || die "Copy failed"
-	newinitd "${FILESDIR}/${P}-init.d wicd"
-}
-
-pkg_postinst() {
-	elog "Make sure dbus is in the same runlevel"
-	elog "as the wicd initscript"
-	elog
-	elog "Start the WICD GUI using:"
-	elog "    /opt/wicd/gui.py"
-	elog
-	elog "Display the tray icon by running:"
-	elog "    /opt/wicd/tray.py"
-}
diff --git a/net-misc/wicd/wicd-1.5.0_rc11.ebuild b/net-misc/wicd/wicd-1.5.0.ebuild
index bcd255129cf2..0abb057756f6 100644
--- a/net-misc/wicd/wicd-1.5.0_rc11.ebuild
+++ b/net-misc/wicd/wicd-1.5.0.ebuild
@@ -1,17 +1,16 @@
 # 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.0_rc11.ebuild,v 1.2 2008/08/01 16:17:55 darkside Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.5.0.ebuild,v 1.1 2008/08/03 02:52:19 darkside Exp $
 
 inherit distutils
 
-MY_P="${P/_rc/rc}"
-DESCRIPTION="A lightwieght wired and wireless network manager for Linux"
+DESCRIPTION="A lightweight wired and wireless network manager for Linux"
 HOMEPAGE="http://wicd.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-python/dbus-python
@@ -28,8 +27,6 @@ RDEPEND="dev-python/dbus-python
 		sys-apps/net-tools
 	)"
 
-S="${WORKDIR}/${MY_P}"
-
 src_compile() {
 	${python} ./setup.py configure --no-install-init --resume=/usr/share/wicd/scripts/ --suspend=/usr/share/wicd/scripts/ --verbose
 	distutils_src_compile