supress an error message in case avahi is not installed, bug #532328

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key BD3A97A3)

5 files changed, 128 insertions, 6 deletions

diff --git a/app-emulation/virt-manager/ChangeLog b/app-emulation/virt-manager/ChangeLog
index 7326a1df3b4a..7ada3eff0a96 100644
--- a/app-emulation/virt-manager/ChangeLog
+++ b/app-emulation/virt-manager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emulation/virt-manager
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.115 2014/12/28 10:09:13 ago Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/ChangeLog,v 1.116 2015/01/01 10:36:02 tamiko Exp $
+
+*virt-manager-1.1.0-r1 (01 Jan 2015)
+
+  01 Jan 2015; Matthias Maier <tamiko@gentoo.org>
+  +files/virt-manager-1.1.0-optional_avahi.patch, +virt-manager-1.1.0-r1.ebuild,
+  virt-manager-1.1.0.ebuild, virt-manager-9999.ebuild:
+  supress an error message in case avahi is not installed, bug #532328
 
   28 Dec 2014; Agostino Sarubbo <ago@gentoo.org> virt-manager-1.1.0.ebuild:
   Stable for x86, wrt bug #532208
diff --git a/app-emulation/virt-manager/files/virt-manager-1.1.0-optional_avahi.patch b/app-emulation/virt-manager/files/virt-manager-1.1.0-optional_avahi.patch
new file mode 100644
index 000000000000..a480148d8c59
--- /dev/null
+++ b/app-emulation/virt-manager/files/virt-manager-1.1.0-optional_avahi.patch
@@ -0,0 +1,15 @@
+diff --git a/virtManager/connect.py b/virtManager/connect.py
+index f7f268e..c19c224 100644
+--- a/virtManager/connect.py
++++ b/virtManager/connect.py
+@@ -95,7 +95,10 @@ class vmmConnect(vmmGObjectUI):
+             self.avahiserver = Gio.DBusProxy.new_sync(self.dbus, 0, None,
+                                     "org.freedesktop.Avahi", "/",
+                                     "org.freedesktop.Avahi.Server", None)
++            self.avahiserver.GetVersionString()
++            logging.debug("self.avahiserver=%s", self.avahiserver)
+         except Exception, e:
++            self.avahiserver = None
+             logging.debug("Couldn't contact avahi: %s", str(e))
+ 
+         self.reset_state()
diff --git a/app-emulation/virt-manager/virt-manager-1.1.0-r1.ebuild b/app-emulation/virt-manager/virt-manager-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..fa5716400710
--- /dev/null
+++ b/app-emulation/virt-manager/virt-manager-1.1.0-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-1.1.0-r1.ebuild,v 1.1 2015/01/01 10:36:02 tamiko Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical tool for administering virtual machines"
+HOMEPAGE="http://virt-manager.org"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-2
+	SRC_URI=""
+	KEYWORDS=""
+	EGIT_REPO_URI="git://git.fedorahosted.org/virt-manager.git"
+else
+	SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="gnome-keyring gtk policykit sasl"
+
+RDEPEND="!app-emulation/virtinst
+	dev-python/libvirt-python[${PYTHON_USEDEP}]
+	>=app-emulation/libvirt-glib-0.0.9[introspection,python,${PYTHON_USEDEP}]
+	${PYTHON_DEPS}
+	dev-libs/libxml2[python,${PYTHON_USEDEP}]
+	dev-python/ipaddr[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/urlgrabber[${PYTHON_USEDEP}]
+	sys-libs/libosinfo[introspection]
+	gtk? (
+		x11-libs/gtk+:3[introspection]
+		gnome-base/dconf
+		>=net-libs/gtk-vnc-0.3.8[gtk3,introspection]
+		net-misc/spice-gtk[usbredir,gtk3,introspection,python,sasl?,${PYTHON_USEDEP}]
+		x11-libs/vte:2.90[introspection]
+		gnome-keyring? ( dev-python/gnome-keyring-python )
+		policykit? ( sys-auth/polkit[introspection] )
+		x11-themes/gnome-icon-theme
+	)"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	dev-util/intltool"
+
+DOCS=( README NEWS )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-optional_avahi.patch
+
+	distutils-r1_src_prepare
+}
+
+distutils-r1_python_compile() {
+	local defgraphics=
+
+	esetup.py configure \
+		--qemu-user=qemu \
+		--default-graphics=spice
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	python_fix_shebang \
+		"${ED}"/usr/share/virt-manager/virt-{clone,convert,image,install,manager}
+}
+
+pkg_preinst() {
+	if use gtk; then
+		gnome2_pkg_preinst
+
+		cd "${ED}"
+		export GNOME2_ECLASS_ICONS=$(find 'usr/share/virt-manager/icons' -maxdepth 1 -mindepth 1 -type d 2> /dev/null)
+	else
+		rm -rf "${ED}/usr/share/virt-manager/virtManager"
+		rm -f "${ED}/usr/share/virt-manager/virt-manager"
+		rm -rf "${ED}/usr/share/virt-manager/ui/"
+		rm -rf "${ED}/usr/share/virt-manager/icons/"
+		rm -rf "${ED}/usr/share/man/man1/virt-manager.1*"
+		rm -rf "${ED}/usr/share/icons/"
+		rm -rf "${ED}/usr/share/applications/virt-manager.desktop"
+		rm -rf "${ED}/usr/bin/virt-manager"
+	fi
+}
+
+pkg_postinst() {
+	use gtk && gnome2_pkg_postinst
+}
diff --git a/app-emulation/virt-manager/virt-manager-1.1.0.ebuild b/app-emulation/virt-manager/virt-manager-1.1.0.ebuild
index b0444b2538b4..56b806fe0f25 100644
--- a/app-emulation/virt-manager/virt-manager-1.1.0.ebuild
+++ b/app-emulation/virt-manager/virt-manager-1.1.0.ebuild
@@ -1,6 +1,6 @@
-# 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/app-emulation/virt-manager/virt-manager-1.1.0.ebuild,v 1.6 2014/12/28 10:09:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-1.1.0.ebuild,v 1.7 2015/01/01 10:36:02 tamiko Exp $
 
 EAPI=5
 
diff --git a/app-emulation/virt-manager/virt-manager-9999.ebuild b/app-emulation/virt-manager/virt-manager-9999.ebuild
index dc083aceff0e..ad0b32b1f68e 100644
--- a/app-emulation/virt-manager/virt-manager-9999.ebuild
+++ b/app-emulation/virt-manager/virt-manager-9999.ebuild
@@ -1,6 +1,6 @@
-# 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/app-emulation/virt-manager/virt-manager-9999.ebuild,v 1.25 2014/12/10 22:10:52 tamiko Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-manager/virt-manager-9999.ebuild,v 1.26 2015/01/01 10:36:02 tamiko Exp $
 
 EAPI=5
 
@@ -51,6 +51,12 @@ DEPEND="${RDEPEND}
 
 DOCS=( README NEWS )
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-optional_avahi.patch
+
+	distutils-r1_src_prepare
+}
+
 distutils-r1_python_compile() {
 	local defgraphics=