bump to fix bug 401005

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

3 files changed, 124 insertions, 13 deletions

diff --git a/net-misc/wicd/ChangeLog b/net-misc/wicd/ChangeLog
index b4ee19a363e6..b6fcf06f3773 100644
--- a/net-misc/wicd/ChangeLog
+++ b/net-misc/wicd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/wicd
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.104 2011/12/30 09:43:31 tomka Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.105 2012/01/27 10:06:46 tomka Exp $
+
+*wicd-1.7.1_pre20120127 (27 Jan 2012)
+
+  27 Jan 2012; Thomas Kahle <tomka@gentoo.org> +wicd-1.7.1_pre20120127.ebuild:
+  bump to fix bug 401005
 
   30 Dec 2011; Thomas Kahle <tomka@gentoo.org> wicd-1.7.1_pre20111210-r1.ebuild:
   Fix einfo
diff --git a/net-misc/wicd/Manifest b/net-misc/wicd/Manifest
index 0e7c96303329..631aac2f67f0 100644
--- a/net-misc/wicd/Manifest
+++ b/net-misc/wicd/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX add-wpa-psk-hex-template.patch 980 RMD160 9071bc60a01d2637df92309e183c11286c790f49 SHA1 febafc67f6501af227964e7a8af8d45ab0b6a0e4 SHA256 d5e45971adb2cd8649c81ce3a4edfb4bda954981767ff8a95374b062b460fca7
 AUX fix-ad-hoc-networking.patch 729 RMD160 4e2a7b36eade357aa7fcd83b8d37e4ec9052212e SHA1 60b69e24e06f10e6d8dce99c6f89c33db79d644a SHA256 1e476d6fe340bc652c747e544b8795f5f01d5c899986fe179ba370a167a441f4
 AUX wicd-1.7.1_beta2-init.patch 409 RMD160 58abdf5debc49517977dd5b691c6fe24cd8303c6 SHA1 4c24f4bb924035e109e905789a7669d6e7b0e7ed SHA256 473146793cc9cf8b2b780c1ce13f27138662f9942b53e5a7e293634196fbebcf
@@ -11,6 +8,7 @@ AUX wicd-init-sve-start.patch 317 RMD160 e08a391b31c6d48e67ad51bcd8fb08457bbc0eb
 AUX wicd-init.d 434 RMD160 408065ff312ab595022f777853c15031bab17dcf SHA1 87426d2958c9e4bfff9b8ea48d5857d9e67aa191 SHA256 5546deda3d5fa8f6ee1125922f1217182b24d68a22f5a1212509bb13bf0156e2
 DIST wicd-1.7.0.tar.bz2 411166 RMD160 66893e4043ba7e96996d698f847c0ab3b350df6a SHA1 1cd087f53538b1f6e1cfad9735c87741e05698f6 SHA256 14c5692bf8a4c93c9ac083ce9ad677b0d9022b19f84e777854766b2a6f753b32
 DIST wicd-1.7.1_pre20111210.tar.gz 476203 RMD160 1fb4fc8775982b27bd006e13d4c895b4615fea8d SHA1 0f113b83987ef0c3229bc997ed99ab2ff8e5cabf SHA256 ae6cb59b39324d088b9aee76233e224dd168541bb089faa8b016c9d905a87734
+DIST wicd-1.7.1_pre20120127.tar.gz 449316 RMD160 1c48c9fed4a97a7c745cc9c3a38afb6957a1253d SHA1 840661cff444fb58ecbd5c387a8f884bc4844818 SHA256 ee9489aa0c06e36810dc84e43f9544141359904d8a82ca96721df80881339024
 DIST wicd-1.7.1b2.tar.bz2 509990 RMD160 587e922271d017eb67499f64c2502b02def44f9d SHA1 2e3d2346f1607f7f63bb00bf7fef41bc5a419726 SHA256 810d51b3eec10be39b399f8baa0b2ef36ed7bb14606f9e0844bea11b8532ea8d
 EBUILD wicd-1.7.0-r1.ebuild 3072 RMD160 cee75c0a4ce24c2ca347e9c5f2587effa5d19b35 SHA1 3897fe2d505472d72f6defeba2e4f26179c1c1a1 SHA256 0b7525576cf858a83c995ecc4d45695a1d16f8efc50001073d17088e7ac40697
 EBUILD wicd-1.7.0.ebuild 2868 RMD160 98708bc1168ac9ddbc5ba5eee597caadabbeffa4 SHA1 eff48c68649747f1690003fbdd76b9f1fa7f4faa SHA256 5b42776831a158c860f91357c9006b6e75c22d3fcbd2e44219cd085c3bc74cf9
@@ -20,12 +18,6 @@ EBUILD wicd-1.7.1_beta2-r6.ebuild 3708 RMD160 ba67bba58b735fbe9e94c647daa7e1c5fc
 EBUILD wicd-1.7.1_beta2-r7.ebuild 3828 RMD160 b25508635ea8126dc4342a83c3882143e4d852a3 SHA1 a76487ba54593685086aa41501a378c938ceb8a9 SHA256 9fb851ad613e00933d0ab40c45660e534b5ed5cc84df97b6c6be1bc4d080320b
 EBUILD wicd-1.7.1_pre20111210-r1.ebuild 3714 RMD160 e11be388d8c8c300ffc1740efeba12fd0e9ff69a SHA1 abf0899be4e3eab94381f2842464047168ef19cd SHA256 8092308754ce33f32dad9a13dd86465870f079d72edd26d5495685f4d3e5bb7e
 EBUILD wicd-1.7.1_pre20111210.ebuild 3971 RMD160 35d6fb270846bfef47e97f0112ba1c00ddfe2a6f SHA1 8d608a0e34afed50fd37d56316439c4838248389 SHA256 699ad3d6cd9f5642f46d822fa36dbb57432f77018092b78291861f6f3dc13686
-MISC ChangeLog 18549 RMD160 6036f5a9520321404532a744d3e00d29afc8606a SHA1 ac138f5cc64cf28873dd9bf345968ef2da79e2f1 SHA256 038df8c806e429ea031c6266262e266537ce52d15a0ffc1c03c806c54f361227
+EBUILD wicd-1.7.1_pre20120127.ebuild 3667 RMD160 757e9076a5ab2c7f00f3c964b7fb45817bec5605 SHA1 9b83f0affb0d04fe57a2c39f46e0057070a71eb9 SHA256 30a2f50ac00e18384b0714c9646c9be3347342dfd2c1768d269daee5759e24f4
+MISC ChangeLog 18693 RMD160 ece49b877fe52a335458d59951c39ff44589284f SHA1 082aeb12eebd3ab213fbf9125260494cb1269798 SHA256 edf1c9be00024e66f0043004c92fc6e3f05cd78f8c345f4bc1340c927e2a7778
 MISC metadata.xml 772 RMD160 cd1d29b51de28c4501e022e6942d9fe0fe9f762c SHA1 a8a5175a252ea52293b05ebef2f1bc3c9e1e72a7 SHA256 4695ac9cbb5686a32f8a673bb86c47f8d13507fe86baab8838034085c7e06e2c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iF4EAREIAAYFAk79h8gACgkQodBTJSDyo65VKQD+LhjncWvs/TFZjciUgsUXW8bs
-8xGUu6WhBAHYzZjIZf4A+wZKyMeySPcpY7YoZu1mpEnjJVJplrAlIUd1su6Mjc28
-=0qQy
------END PGP SIGNATURE-----
diff --git a/net-misc/wicd/wicd-1.7.1_pre20120127.ebuild b/net-misc/wicd/wicd-1.7.1_pre20120127.ebuild
new file mode 100644
index 000000000000..dab5f77bae1f
--- /dev/null
+++ b/net-misc/wicd/wicd-1.7.1_pre20120127.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.1_pre20120127.ebuild,v 1.1 2012/01/27 10:06:46 tomka Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="ncurses? xml"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
+
+inherit eutils distutils systemd
+
+MY_PV="${PN}-1.7.1"
+S="${WORKDIR}/${MY_PV}"
+
+DESCRIPTION="A lightweight wired and wireless network manager for Linux"
+HOMEPAGE="http://wicd.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~tomka/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="X +gtk ioctl libnotify ncurses nls +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
+	X? ( gtk? ( dev-python/pygtk
+		|| (
+			x11-libs/gksu
+			kde-base/kdesu
+			)
+		)
+	)
+	|| (
+		net-misc/dhcpcd
+		net-misc/dhcp
+		net-misc/pump
+	)
+	net-wireless/wireless-tools
+	net-wireless/wpa_supplicant
+	|| (
+		sys-apps/net-tools
+		sys-apps/ethtool
+	)
+	!gtk? ( dev-python/pygobject:2 )
+	ioctl? ( dev-python/python-iwscan dev-python/python-wpactrl )
+	libnotify? ( dev-python/notify-python )
+	ncurses? (
+		dev-python/urwid
+		dev-python/pygobject:2
+	)
+	pm-utils? ( >=sys-power/pm-utils-1.1.1 )
+	"
+DOCS="CHANGES NEWS AUTHORS README"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.7.1_beta2-init.patch
+	epatch "${FILESDIR}"/${PN}-init-sve-start.patch
+	# Add a template for hex psk's and wpa (Bug 306423)
+	epatch "${FILESDIR}"/${PN}-1.7.1_pre20111210-wpa-psk-hex-template.patch
+	# get rid of opts variable to fix bug 381885
+	sed -i "/opts/d" "in/init=gentoo=wicd.in" || die
+	# Need to ensure that generated scripts use Python 2 at run time.
+	sed -e "s:self.python = '/usr/bin/python':self.python = '/usr/bin/python2':" \
+	  -i setup.py || die "sed failed"
+	python_copy_sources
+}
+
+src_configure() {
+	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"
+	configuration() {
+		$(PYTHON) ./setup.py configure --no-install-docs --resume=/usr/share/wicd/scripts/ --suspend=/usr/share/wicd/scripts/ --verbose ${myconf}
+	}
+	python_execute_function -s configuration
+}
+
+src_install() {
+	distutils_src_install
+	keepdir /var/lib/wicd/configurations \
+		|| die "keepdir failed, critical for this app"
+	keepdir /etc/wicd/scripts/{postconnect,disconnect,preconnect} \
+		|| die "keepdir failed, critical for this app"
+	keepdir /var/log/wicd \
+		|| die "keepdir failed, critical for this app"
+	use nls || rm -rf "${D}"/usr/share/locale
+	systemd_dounit "${S}/other/wicd.service"
+}
+
+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/rc.conf"
+	elog "(For example, rc_hotplug=\"!net.eth* !net.wlan*\")"
+	# Maintainer's note: the consolekit use flag short circuits a dbus rule and
+	# allows the connection. Else, you need to be in the group.
+	if ! has_version sys-auth/pambase[consolekit]; then
+			ewarn "Wicd-1.6 and newer requires your user to be in the 'users' group. If"
+			ewarn "you are not in that group, then modify /etc/dbus-1/system.d/wicd.conf"
+	fi
+}