Bump to snapshot of 1.7.1 beta 3 to fix accumulated bugs like bug 391397.

  Added Systemd file (bug 393505)

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

4 files changed, 161 insertions, 6 deletions

diff --git a/net-misc/wicd/ChangeLog b/net-misc/wicd/ChangeLog
index 3e37a4e7c70c..2322837b92fa 100644
--- a/net-misc/wicd/ChangeLog
+++ b/net-misc/wicd/ChangeLog
@@ -1,6 +1,14 @@
 # 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.99 2011/12/07 13:28:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.100 2011/12/10 17:34:01 tomka Exp $
+
+*wicd-1.7.1_pre20111210 (10 Dec 2011)
+
+  10 Dec 2011; Thomas Kahle <tomka@gentoo.org> +wicd-1.7.1_pre20111210.ebuild,
+  +files/wicd-1.7.1_pre20111210-wpa-psk-hex-template.patch:
+  Bump to snapshot of 1.7.1 beta 3 to fix accumulated bugs like bug 391397.
+
+  Added Systemd file (bug 393505)
 
   07 Dec 2011; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Whitespace.
diff --git a/net-misc/wicd/Manifest b/net-misc/wicd/Manifest
index 9c0568cf4fe0..0618acd2a9fd 100644
--- a/net-misc/wicd/Manifest
+++ b/net-misc/wicd/Manifest
@@ -1,13 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+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
 AUX wicd-1.7.1_beta2-urwid-1.0.patch 895 RMD160 13aec910e261d4f5574a9aebc365570b03089fe5 SHA1 db2b6a4811a9413ca4d8137bd387fdfdee4e718a SHA256 2988afdd35f7d9d0d374ce523a9c4ed193e25e70fd6eb2e9a05ec8b520e952ff
+AUX wicd-1.7.1_pre20111210-wpa-psk-hex-template.patch 920 RMD160 422aefe7be91d5f28ec2458a43ec546c198732cb SHA1 df6fbf1a68fbf0e4707d40377afddbbb769502c1 SHA256 b721a8b90c97330d12787608108dd8f1db99742c596a786d4fcfa1f3abb19be6
 AUX wicd-init-sve-start.patch 317 RMD160 e08a391b31c6d48e67ad51bcd8fb08457bbc0ebc SHA1 149775d7ef4deffc4e66f73fa47276ca194c92cb SHA256 20d7ada99465da5b50d03e5ef117226910bc20288278f6f788be3fbff05716db
 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.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
@@ -15,12 +17,13 @@ EBUILD wicd-1.7.1_beta2-r3.ebuild 3189 RMD160 43882aa0a12763d365b129f0b41d60183a
 EBUILD wicd-1.7.1_beta2-r4.ebuild 3421 RMD160 d891106aac02d2ee7d522d282228f303a5ded42d SHA1 a9357a7e76c6aeddccfc734dfe2e1d8b815997a3 SHA256 4c96591a81bb214784bee57204a536c686d7994455caa2661d0037b847a2e6e8
 EBUILD wicd-1.7.1_beta2-r6.ebuild 3708 RMD160 ba67bba58b735fbe9e94c647daa7e1c5fcb1dcd0 SHA1 1e4e02b5fe5c9afe70193ec8abc115aa188b105f SHA256 992380f2c2eda1626ad776775789cb5d26339f0c13f8b7f23ed76d9d4d7d06bd
 EBUILD wicd-1.7.1_beta2-r7.ebuild 3828 RMD160 b25508635ea8126dc4342a83c3882143e4d852a3 SHA1 a76487ba54593685086aa41501a378c938ceb8a9 SHA256 9fb851ad613e00933d0ab40c45660e534b5ed5cc84df97b6c6be1bc4d080320b
-MISC ChangeLog 17616 RMD160 c8e7dafaa473b39aa425440b90901245db61f96c SHA1 cb2ea24eccfdb56d42fef6f500248c325df22dad SHA256 6c301f8bffdac72340a5c5a995dc019b3f5b0ddf32104870967f9a2a33f86541
+EBUILD wicd-1.7.1_pre20111210.ebuild 3642 RMD160 3d48eb28c7478f6b13627b25628b219253f9cdef SHA1 3df1878c2fee1a8badd1ef45b473bb4e91f9e77f SHA256 b21b75dff090935a883e06c298c251f724f58f6ee595b77e214fe59827754745
+MISC ChangeLog 17909 RMD160 5e679e6791a2eb6d197133f0495210487262a83a SHA1 b069b6e0cae1a7b0bf539b11977331531a28acd1 SHA256 770a4707781f6739d8bde77caa6e3b1d47a57bb2f65f176d691b5e9fb782c469
 MISC metadata.xml 772 RMD160 cd1d29b51de28c4501e022e6942d9fe0fe9f762c SHA1 a8a5175a252ea52293b05ebef2f1bc3c9e1e72a7 SHA256 4695ac9cbb5686a32f8a673bb86c47f8d13507fe86baab8838034085c7e06e2c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk7fahEACgkQVWmRsqeSphO4vACfXY3nuUItB9i8AtQJNJYrw1Vt
-jDsAnAwKVfIhzAWycQZvIkaNWHXfHyVB
-=E6xM
+iF4EAREIAAYFAk7jmA8ACgkQodBTJSDyo65XTAD+PBX8CMTnZPsrmZC941cMTrgK
+9Z+RTYZGbMuDwDsQco8A/iEn6EVv+bitk0ITSMIzoUTbgKL3z9MwsjSsWcokaKtD
+=NnVn
 -----END PGP SIGNATURE-----
diff --git a/net-misc/wicd/files/wicd-1.7.1_pre20111210-wpa-psk-hex-template.patch b/net-misc/wicd/files/wicd-1.7.1_pre20111210-wpa-psk-hex-template.patch
new file mode 100644
index 000000000000..6736cb7b8d1b
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.1_pre20111210-wpa-psk-hex-template.patch
@@ -0,0 +1,30 @@
+diff -U 3 -dHrN wicd.org/encryption/templates/active wicd/encryption/templates/active
+--- wicd.org/encryption/templates/active	2011-12-05 16:22:49.584224158 +0100
++++ wicd/encryption/templates/active	2011-12-05 16:16:10.736172566 +0100
+@@ -1,6 +1,7 @@
+ wpa
+ wpa-peap
+ wpa-psk
++wpa-psk-hex
+ wpa2-leap
+ wpa2-peap
+ wep-hex
+diff -U 3 -dHrN wicd.org/encryption/templates/wpa-psk-hex wicd/encryption/templates/wpa-psk-hex
+--- wicd.org/encryption/templates/wpa-psk-hex	1970-01-01 01:00:00.000000000 +0100
++++ wicd/encryption/templates/wpa-psk-hex	2011-12-05 16:16:43.428012863 +0100
+@@ -0,0 +1,15 @@
++name = WPA 1/2 (Preshared Hex Key)
++author = Thomas Kahle
++version = 1
++require apsk *Preshared_Key
++-----
++ctrl_interface=/var/run/wpa_supplicant
++network={
++       ssid="$_ESSID"
++       scan_ssid=$_SCAN
++       proto=WPA RSN
++       key_mgmt=WPA-PSK
++       pairwise=CCMP TKIP
++       group=CCMP TKIP
++       psk=$_APSK
++}
diff --git a/net-misc/wicd/wicd-1.7.1_pre20111210.ebuild b/net-misc/wicd/wicd-1.7.1_pre20111210.ebuild
new file mode 100644
index 000000000000..900e6523e28d
--- /dev/null
+++ b/net-misc/wicd/wicd-1.7.1_pre20111210.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2011 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_pre20111210.ebuild,v 1.1 2011/12/10 17:34:01 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/${PF}.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}"/${P}-wpa-psk-hex-template.patch
+	# get rid of opts variable to fix bug 381885
+	sed -i "/opts/d" "in/init=gentoo=wicd.in"
+	# 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
+}