bump to 1.7.3, remove old

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 565C32BC)

5 files changed, 100 insertions, 67 deletions

diff --git a/net-misc/wicd/ChangeLog b/net-misc/wicd/ChangeLog
index d184502184e6..b1be4219db7d 100644
--- a/net-misc/wicd/ChangeLog
+++ b/net-misc/wicd/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-misc/wicd
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.150 2014/08/02 18:18:19 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/ChangeLog,v 1.151 2015/01/19 12:32:36 tomka Exp $
+
+*wicd-1.7.3 (19 Jan 2015)
+
+  19 Jan 2015; Thomas Kahle <tomka@gentoo.org>
+  +files/wicd-1.7.3-add-missing-gnome-shell-extension.patch, +wicd-1.7.3.ebuild,
+  -files/wicd-1.7.1_pre20111210-fix-config-reading.patch,
+  -wicd-1.7.2.4-r2.ebuild, metadata.xml:
+  bump to 1.7.3, remove old
 
   02 Aug 2014; Agostino Sarubbo <ago@gentoo.org> wicd-1.7.2.4-r3.ebuild:
   Stable for ppc64, wrt bug #509752
diff --git a/net-misc/wicd/files/wicd-1.7.1_pre20111210-fix-config-reading.patch b/net-misc/wicd/files/wicd-1.7.1_pre20111210-fix-config-reading.patch
deleted file mode 100644
index 987113b8645b..000000000000
--- a/net-misc/wicd/files/wicd-1.7.1_pre20111210-fix-config-reading.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'wicd/configmanager.py'
---- wicd/configmanager.py	2011-12-08 17:56:03 +0000
-+++ wicd/configmanager.py	2011-12-11 19:41:57 +0000
-@@ -37,7 +37,7 @@
-     conf = open(path)
-     newconf = ''
-     for line in conf:
--        if '[' not in line or '=' not in line:
-+        if '[' in line or '=' in line:
-             newconf += line
-     conf.close()
-     conf = open(path, 'w')
-
diff --git a/net-misc/wicd/files/wicd-1.7.3-add-missing-gnome-shell-extension.patch b/net-misc/wicd/files/wicd-1.7.3-add-missing-gnome-shell-extension.patch
new file mode 100644
index 000000000000..9ea419eb4e71
--- /dev/null
+++ b/net-misc/wicd/files/wicd-1.7.3-add-missing-gnome-shell-extension.patch
@@ -0,0 +1,39 @@
+diff -U 3 -dHrN wicd-1.7.3.orig/gnome-shell/extension.js wicd-1.7.3/gnome-shell/extension.js
+--- wicd-1.7.3.orig/gnome-shell/extension.js	1970-01-01 01:00:00.000000000 +0100
++++ wicd-1.7.3/gnome-shell/extension.js	2015-01-19 14:12:12.962333228 +0100
+@@ -0,0 +1,29 @@
++/*
++ * Copyright © 2012, David Paleino <d.paleino@gmail.com>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License Version 2 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ */
++
++const StatusIconDispatcher = imports.ui.statusIconDispatcher;
++
++function init(metadata) {
++}
++
++function enable() {
++    StatusIconDispatcher.STANDARD_TRAY_ICON_IMPLEMENTATIONS['wicd-client.py'] = 'wicd-gtk';
++}
++
++function disable() {
++    StatusIconDispatcher.STANDARD_TRAY_ICON_IMPLEMENTATIONS['wicd-client.py'] = '';
++}
+diff -U 3 -dHrN wicd-1.7.3.orig/gnome-shell/metadata.json wicd-1.7.3/gnome-shell/metadata.json
+--- wicd-1.7.3.orig/gnome-shell/metadata.json	1970-01-01 01:00:00.000000000 +0100
++++ wicd-1.7.3/gnome-shell/metadata.json	2015-01-19 14:12:12.962333228 +0100
+@@ -0,0 +1 @@
++{"shell-version": ["3.4.2"], "uuid": "wicd@code.hanskalabs.net", "name": "WICD Network Manager", "description": "Show status of WICD"}
+\ No newline at end of file
diff --git a/net-misc/wicd/metadata.xml b/net-misc/wicd/metadata.xml
index 246f15a2252e..fca7c0953231 100644
--- a/net-misc/wicd/metadata.xml
+++ b/net-misc/wicd/metadata.xml
@@ -14,6 +14,7 @@
 	<flag name='mac4lin'>Change default icons to mac4lin icon set</flag>
 	<flag name='ncurses'>Installs a ncurses UI</flag>
 	<flag name='pm-utils'>Installs the pm-utils hooks for suspend/resume and
-		requires <pkg>sys-power/pm-utils</pkg></flag>
+	requires <pkg>sys-power/pm-utils</pkg></flag>
+	<flag name='gnome-shell'>Install gnome-shell extension</flag>
 </use>
 </pkgmetadata>
diff --git a/net-misc/wicd/wicd-1.7.2.4-r2.ebuild b/net-misc/wicd/wicd-1.7.3.ebuild
index ff7f3331697c..186ffc4d9804 100644
--- a/net-misc/wicd/wicd-1.7.2.4-r2.ebuild
+++ b/net-misc/wicd/wicd-1.7.3.ebuild
@@ -1,16 +1,13 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.2.4-r2.ebuild,v 1.9 2014/05/07 05:31:09 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wicd/wicd-1.7.3.ebuild,v 1.1 2015/01/19 12:32:36 tomka Exp $
 
-EAPI=3
+EAPI=5
 
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="ncurses? xml"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-DISTUTILS_USE_SEPARATE_SOURCE_DIRECTORIES="1"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ncurses?,xml"
 
-inherit eutils distutils systemd
+inherit eutils distutils-r1 linux-info readme.gentoo systemd
 
 DESCRIPTION="A lightweight wired and wireless network manager for Linux"
 HOMEPAGE="https://launchpad.net/wicd"
@@ -20,15 +17,12 @@ SRC_URI="http://launchpad.net/wicd/1.7/${PV}/+download/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~mips ppc ppc64 x86"
-IUSE="X ambiance +gtk ioctl libnotify mac4lin ncurses nls +pm-utils"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="doc X ambiance +gtk ioctl libnotify mac4lin ncurses nls +pm-utils gnome-shell"
 
 DEPEND="nls? ( dev-python/Babel )"
-# 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
+RDEPEND="${PYTHON_DEPS}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
 	X? (
 		gtk? ( dev-python/pygtk )
 		|| (
@@ -48,43 +42,53 @@ RDEPEND="
 		sys-apps/net-tools
 		sys-apps/ethtool
 	)
-	!gtk? ( dev-python/pygobject:2 )
+	!gtk? ( dev-python/pygobject:2[${PYTHON_USEDEP}] )
 	ioctl? ( dev-python/python-iwscan dev-python/python-wpactrl )
-	libnotify? ( dev-python/notify-python )
+	libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
 	ncurses? (
 		dev-python/urwid
-		dev-python/pygobject:2
+		dev-python/pygobject:2[${PYTHON_USEDEP}]
 	)
-	pm-utils? ( >=sys-power/pm-utils-1.1.1 )
+	pm-utils? ( sys-power/pm-utils )
+	gnome-shell? ( gnome-base/gnome-shell )
 	"
-DOCS="CHANGES NEWS AUTHORS README"
 
 src_prepare() {
-	# Fix bug 441966 (urwid-1.1.0 compatibility)
-	epatch "${FILESDIR}"/${P}-urwid.patch
-	epatch "${FILESDIR}"/${P}-second-urwid.patch
-	epatch "${FILESDIR}"/${PN}-1.7.1_beta2-init.patch
+	CONFIG_CHECK="~CFG80211_WEXT"
+	local WARNING_CFG80211_WEXT="Wireless extensions have not been \
+	configured in your kernel.  Wicd will not work unless CFG80211_WEXT is set."
+	check_extra_config
+
 	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
-	# Fix bug 416579 (should be included in next release)
-	epatch "${FILESDIR}"/${P}-fix-dbus-error.patch
+	# The Categories entry in the .desktop files is outdated
+	epatch "${FILESDIR}"/${PN}-1.7.2.4-fix-desktop-categories.patch
+	# Upstream bug https://bugs.launchpad.net/wicd/+bug/1412413
+	# Creates files -> give -p
+	epatch -p1 "${FILESDIR}"/${P}-add-missing-gnome-shell-extension.patch
 	# get rid of opts variable to fix bug 381885
 	sed -i "/opts/d" "in/init=gentoo=wicd.in" || die
-	# Make init script provide net per bug 405775
-	epatch "${FILESDIR}"/${PN}-1.7.1-provide-net.patch
 	# 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"
+	# Fix misc helper scripts:
+	sed -e "s:/usr/bin/env python:/usr/bin/env python2:" \
+		-i wicd/suspend.py wicd/autoconnect.py wicd/monitor.py
 	if use nls; then
 	  # Asturian is faulty with PyBabel
 	  # (https://bugs.launchpad.net/wicd/+bug/928589)
 	  rm po/ast.po
+	  # zh_CN fails with newer PyBabel (Aug 2013)
+	  rm po/zh_CN.po
 	else
 	  # nuke translations
 	  rm po/*.po
 	fi
-	python_copy_sources
+
+	DOC_CONTENTS="To start wicd at boot with openRC, add
+		/etc/init.d/wicd to a runlevel and: (1) Remove all net.*
+		initscripts (except for net.lo) from all runlevels (2) Add these
+		scripts to the RC_PLUG_SERVICES line in /etc/rc.conf (For
+		example, rc_hotplug=\"!net.eth* !net.wlan*\")"
 }
 
 src_configure() {
@@ -93,20 +97,19 @@ src_configure() {
 	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
+	use gnome-shell || myconf="${myconf} --no-install-gnome-shell-extensions"
+	python_export_best
+	"${EPYTHON}" ./setup.py configure --no-install-docs \
+		--resume=/usr/share/wicd/scripts/ \
+		--suspend=/usr/share/wicd/scripts/ \
+		--verbose ${myconf}
 }
 
 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"
+	distutils-r1_src_install
+	keepdir /var/lib/wicd/configurations
+	keepdir /etc/wicd/scripts/{postconnect,disconnect,preconnect}
+	keepdir /var/log/wicd
 	use nls || rm -rf "${D}"/usr/share/locale
 	systemd_dounit "${S}/other/wicd.service"
 
@@ -119,21 +122,16 @@ src_install() {
 		rm "${WORKDIR}/Icone Wicd Lucid"/signal*
 		cp "${WORKDIR}/Icone Wicd Lucid"/*.png "${D}"/usr/share/pixmaps/wicd/
 	fi
+	readme.gentoo_src_install
 }
 
 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/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
+
+	readme.gentoo_print_elog
 }