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

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xBD3A97A3

diff --git a/app-emulation/virt-manager/ChangeLog b/app-emulation/virt-manager/ChangeLog
index 7326a1df3b4a81c2735b02a9155c20e915d2e938..7ada3eff0a965b4ae5d24bf5f6257971f265bf38 100644 (file)
--- 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/Manifest b/app-emulation/virt-manager/Manifest
index c41d389de7dbea6af6d969fb621cd6be9eec358c..705bbcc9b09545ca79015221fa3d2ea426fe9858 100644 (file)
--- a/app-emulation/virt-manager/Manifest
+++ b/app-emulation/virt-manager/Manifest
@@ -1,30 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX virt-manager-1.1.0-optional_avahi.patch 696 SHA256 2ffaad3233cc5a37d1c498f8c4509f1dda6120366dea732bf3702e931ed856b7 SHA512 7a53f093e738ae870e1b7973339cae2f99f574f2f100a85078894d495f0eb6385fe3642c39ec4a3645abb05ccb567800d2079ce95de5202e1055e8e1471a05d8 WHIRLPOOL 27cd479da1296b5e9e2b492b12225a9831f7bd998d215d094a3b85196b5be25e7583a89db5b6e61d240182c988a15135f2a7cd8d40ca6dbf08655976698d7eb5
 DIST virt-manager-0.10.0-1cd29748.tar.xz 11716 SHA256 a9293c2fcadd230cdfb13977c7c5520c0f74e38cebd199e8de2cce68e5b0efd3 SHA512 87312537a05a99c7df4c3fcf47bc4820a3e8b6c59bd39adf7aa803383bc3f69aa615dcada71b82b51bb92c83daaa7cb528279dcb9b6f36247d6e24665376a086 WHIRLPOOL e86c0dc6ae774c047bb130ecef618a4583ac76bb265b08c45d41ee1d8e10a128a6a3a1bf7e02827f70201b7ec973e7e95756cc4f11aece7d6bda87e0085bfa0d
 DIST virt-manager-0.10.0.tar.gz 2548256 SHA256 59bd8f316917228885261a1ecbeb9aadbb0b0e02cdf5fc974c78113c5814346d SHA512 13eaed3645ccee79da6a972e02bb182b5bd24981ff55b6322b8aaf2689fab520f22f1e729bb5f5287d66526252a31a531c6595ee27489a52fb4829ae18cf8204 WHIRLPOOL e3e34506171217c63e5e5337157f75006554afb156a430f2ee7f11e354d0c490adc371174b342efb4cc90ab0686d2c74f42b4d52c55c0a9221868670980fdbb3
 DIST virt-manager-1.0.1.tar.gz 2472879 SHA256 08e3740ae07292bc3f68160a43897fccb90d7bc14ffb133c8ad685c9d44444d8 SHA512 a7ef49b5f985998a5dd0dc27c1f42131c2df7f8c4b54d2e11843a25783ae05912445f01a1e4b00d4d8a38e8135d35d5863273b6f68dd253bc1159a85b0df6652 WHIRLPOOL cdf9a3f3e53ae101797cd3a129401b160293919dc1f09542370baf34c8197fe61c20b900f6b9f81a35b9c188a4c30856cf5393d23a2028f6cfc757b6ca3ef68b
 DIST virt-manager-1.1.0.tar.gz 2509440 SHA256 ab0906cb15a132f1893f89ac4ca211c6c2c9c2d1860fbc285edbf9451c0f7941 SHA512 8c3aa56e13f1ec4a67e353b15b4f61bdc067300dbc459790b04e5f5258bf526694ec712a9f74d7af48ddd271081d48ae98d576f4bc5ed139e046620a9aa64e2d WHIRLPOOL aaffdf75b313c88a10648503bf552357139aff2a1624da1b17cac3975fec21ad6c3ccce00999ef8f4f1f4731aabf5ae2c07e70e453785caefe932c3b0deab456
 EBUILD virt-manager-0.10.0-r2.ebuild 2519 SHA256 0631da54326ec89f8aa17b2fda6a005a8ea5cca7c79739c660a7d177b7838652 SHA512 4f4d6bf9954bf8437ec435d57857271edbdea7213b4c02ffa48edeb500cb4fdd8898eb0f7dce2ba03c262736a31ca588a3386f68c5ebef8974bf9de3151e9e96 WHIRLPOOL 47722772ebfd3dae474681e95efca05e1d1e43757a518ead625eb715f2be653b8fe8a8f40e663864c8817ea8530e38aaaef662f236febe762b4c70abf68ce75a
 EBUILD virt-manager-1.0.1.ebuild 2438 SHA256 17b5e0e259e32d2a2d63788b6a7c56ddd4012b11c3b1a00f4005ab2e7ea50b59 SHA512 4e47a64e47f3ba6d67de740c2e59aae26d76d58ab51b7e2a35ead0b56a8fb368bb871dac013442afb9a32228575c22a60d25a1b178ae92201f0d867247f5905f WHIRLPOOL 580073257258771388ae39e505c9a27de896a7a94a199a4464b6116b44743397229621e172625d4d63bbd53d95c51d36ad2104fae073b8991d76c2511f607a89
-EBUILD virt-manager-1.1.0.ebuild 2433 SHA256 54a760ac246f40edb3299bb8b5f6ac113428f03a71096f7528911480a18b74d6 SHA512 b9f2e1e4f7f8cc374e98b89b5d849ca9720b29d7a13147f157099e366c88b90439d19b533488ed1f8faaf3e35e0c7f02bcfb52e8b747de6c08420ab739797eb1 WHIRLPOOL db6b3687a4f0f66370d03bfa5179ed69649564123ccc034f4ecdc5cd649ffee64886690f3cbd4ff1f4000f3c20be0362088f7237bcc67f4662a8a8739617d83a
-EBUILD virt-manager-9999.ebuild 2438 SHA256 4ad656c3cd5eb58265ee0a5fa7f68fff3d7f180dfbca9f4b741eb7a7f8813c4c SHA512 cf63436b867a9cb9f81bf1e6fa2075aa43eb96330de5703dde5eb0e0e4fea3a41a855c0498097d2d29f25a1542b9d72839a7c521e4b4eee8df58375c6094055b WHIRLPOOL b7f788429148d5a25025b148d30afc3c003267d289d12ccfbb0864f435acd4cee9172ec65a2e0e4f716a0d47bc90043b85c80c697f0693e5bd126a8f81decf71
-MISC ChangeLog 21316 SHA256 3627b020f39fdf849545c600bdd14d5cf720fdec711ef2ee9c281ed998d7be6c SHA512 fd18825675af3a591186a833600ce715dd33172296365031288dfac9c7642e16f21341789c68ec3b1534a7789fab7e2b4f14cc04decfa96d6e018cc08a5ce205 WHIRLPOOL 8c3c4ccbbd127f1e6a29f2b8274b6935e6551369e4c925d717afce871758ec70116b0ebf7987c8ef95e0c64bd6524d9faa4f71c1f6a358673c04c572e1e61948
+EBUILD virt-manager-1.1.0-r1.ebuild 2535 SHA256 74e09d716b126968b30e1d7b93d299571d2950ed6dd69eeda2c5c315c2659be4 SHA512 5f010ae511ad222a17ec79cf5529713e5225f56a6aef67dfa0e3fd2f91ee998f596fae31c4adb4ba130cad70ddbe338d05af86b4db4ec26f7cf5c92d5f30bccf WHIRLPOOL c43a38ca125ee8c28e10e9f66021099f664745a3e7ab8a1ba5680dea4e56738a50f41ef6c4efe3194700ff6e614534d98ac55a1273e31e464a0028e8981bfffd
+EBUILD virt-manager-1.1.0.ebuild 2436 SHA256 4dad4dff061d7a1d566f766a02e10e76d164d9b90cbb7cdf3c919883f3c47267 SHA512 c5370c911693bd64575527f18eb8cb91d02bd09e9a28df10844f612b778f1e0caef586e4a7def727686e4e9f2b7d0b83f052ef77633d488059f832d76a5889e1 WHIRLPOOL 62ea1cda8f0b9e057ebbf8362f153f0ff57ebd4c5e01622554a71fedf8c424a711c24835dd8fead9a42b6429a7d322f7a0429af2897d3eecc7b48f952ce1c736
+EBUILD virt-manager-9999.ebuild 2532 SHA256 9efdc600089b9228680b555e0d1333ef49f7ecb24486f1bdf0e6b76abac0dba4 SHA512 0f23b6fb212a4f89c2f7acc4d565e77513cdfbff85864c17a3a5537de8fb46cb8313eaf6d3e07f883194fdd72f4d141f6a7c777d021d6fb5d63bb04a5bf48451 WHIRLPOOL 029151571c05d3e82d1609f549acd88befd5d8faa73fe87339233a938f3700e96a4d78d88cc228d5777afd564a6d2b0163975e7b93a7935d7ff23fddac9b3507
+MISC ChangeLog 21615 SHA256 ddb81b7b8d6bcb4fb17b82824fb930b548ed2a889c0e9079b440c9714eec52e1 SHA512 95ff2aa3db3dbbf17d51c88d4cdd2234f00a9a7f63a61952ceb41a1721f8c308ab98c25d9ec75fc03247d892d5664b109e4b8bf40699191bc45609098c9b8b75 WHIRLPOOL 59925f8a5ad08e69719cb681918cf7c594b8c36f8858fd2c5ae9ed2d3fa34de9c47a45e0eedef49beefae8999e05aff65a6d95348cfe4fa08426da9831d1d17b
 MISC metadata.xml 554 SHA256 4598a2e6e2c9ba1a53497623750b9779912372b9278f410fdd5b480c3cf4a59c SHA512 97aac2a38fb2923c334ec3d4b3410471f9d5b9b7435b92d93804107726cc5576f086226757337e6da1fa021533bc453a5aca3620b54599f3a8242f3f26a30f8c WHIRLPOOL 951f7ddd5a876cd75406c5ecf574089ed0eebc66d004713e64d7befc81efdb8bdea21acf77282af979cd3e15919e1790e1a4036d7550645b5c8ff5a5e57a59fc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQIcBAEBCAAGBQJUn9bKAAoJELp701BxlEWfPv4QAJz3Nm/r/E9Xy0I4CAwqSJWk
-/m6MGXfoeX7uNB+jUP/wHiarTQti6/0K0LLd2WoV4Lj4M3Jxvuwkoen9m/Ld/UHm
-HyGpYxT/2sQFwPTWCKdnbUpiMXliVnJTUAHEs3W5IsWopW5MeLLlgKIZOzOMLTeg
-k4lejlE6wqwFcxX7mfzrtzMXlm55TCmzbapePAwW/ObL1tQ04N78Z9Fx2Tr2ICKt
-fWwHSvN4FxBGLsXCjPP+Fqo4xCdjza7e8bJ7v4hiJbhVJQksMIY8c1kwNE8eUFMo
-ua3OU+EtTxmod0+YNmEfurwKMeZPXz0qVMjGPFrafkfWYBsbxXaCKQcpEWSGrtF5
-wweSPvAkd/SWxN7q9cR14YN0V5eW3ESJxU+ZBDESs+j1/MpKGTppav07YeDlwN8d
-AmVhsbsmkEE0dZDJ/UvZASZQIsqf7zMY+aOInXvYPkBJFyYj0FNdfhBEhrVYG17+
-M6hHpE300IlZwU2inmHR8jAL6s6FicvOD0wG1MMkdxjXi4bOxzx3+v7KJ0FcZwBs
-u/4sANq0uB+hVCK9VrU8MO0KU0Wc5E+ZkutAQoUcMGWCEB5hRm884MnpqFu6T8ps
-yQ64KQkHi55qsKEWLNmYAJbnws0BoyZXE+ojgWJEiXbwj433ofHtWjM3va3VWcRW
-AxjLaU42i5EDZ7LFI2fv
-=LXHU
+iQIcBAEBCAAGBQJUpSMTAAoJELhOzYlK7nn/bwQQAMSX6x96siwOL4JpnqRnyN1h
+d4rauaq99vJSNZA8ylef/nIXDosGdJrVJb5I6q0FfnihwKlsL/Y9izKDsncy7f+7
+J/W18DGP/k+8FNpBK6TWMEx9slYIRIKo4/FSmyl8QGJ5/XF9p8FCInLzR73vKMFv
+THcmufBlxc20W7sj1EsQEy4DLWdi+6DdpAqPXNUI6W55bSbdT1pMgRCXnNrcdG+c
+1acbWyHE7n6/N+9lvN1irSOKMSrSZQtx03LyZhMps839eisG84GsjoeQvkBgtZR9
+lSIGuAFyviVPOohwZBe1BVrOW/Uj6pwgF6FERPKAWB8Fg0G4YS4QsrTHmFxi9kXf
+WQ2iQyupITsQCNgjnRD72En11uG9erqSSPRqV2CEtEIcA1ima+tSViLFQS9Hxn31
+QuPSuYR6P2BEnxQU3KeDlS6SH3QKDHdyLAAWH0McoqReKThH3Mbhsd6Lqc8wMyDc
+wKXAxmmkx/JJzGtZQMdtSDJy8O20cSHV5usJz6T4hSD+T/+Vwl+MJndV7QwK6Jwg
+a+c1EUHexo7w3DHKb9y6SF9EwOSmcSQU9YdEckJPkllt8KsC7bbfwJKKayCIWZY5
+xW3NFZ2GokYryOY7OKcdFgGujaxk4KioNXRMjPiJ3FnJZK9mXnIzkZ5F45mUVUYf
+PECq+TbocYPGMHLxoX+y
+=+2R0
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..a480148
--- /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 (file)
index 0000000..fa57164
--- /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 b0444b2538b4da0e38b9908951f4b874c13f11a9..56b806fe0f25e043bdee36f42dad0cb6005e4632 100644 (file)
--- 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 dc083aceff0e018432cfbfca02c0b657805be26d..ad0b32b1f68ed6a26c2221d4e8d6041f194234fb 100644 (file)
--- 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=