[gentoo-commits] repo/gentoo:master commit in: net-im/gajim/

["Pacho Ramos" <pacho@gentoo.org>]

commit:     6296b967e606742025d81b042b9cf00b5abb5bfd
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Oct  2 11:40:20 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Oct  2 12:37:00 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6296b967

net-im/gajim: Use zeroconf instead of avahi USE flag (#477620)

Package-Manager: portage-2.3.1

 net-im/gajim/gajim-0.16.5-r1.ebuild | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/net-im/gajim/gajim-0.16.5-r1.ebuild b/net-im/gajim/gajim-0.16.5-r1.ebuild
index 5e99346..f70600d 100644
--- a/net-im/gajim/gajim-0.16.5-r1.ebuild
+++ b/net-im/gajim/gajim-0.16.5-r1.ebuild
@@ -23,13 +23,14 @@ SRC_URI="
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE="avahi crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml"
+IUSE="crypt dbus gnome gnome-keyring kde idle jingle libnotify networkmanager nls spell +srv test X xhtml zeroconf"
 
 REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	libnotify? ( dbus )
-	avahi? ( dbus )
-	gnome? ( gnome-keyring )"
+	gnome? ( gnome-keyring )
+	zeroconf? ( dbus )
+"
 
 COMMON_DEPEND="
 	${PYTHON_DEPS}
@@ -51,7 +52,7 @@ RDEPEND="${COMMON_DEPEND}
 		dev-python/dbus-python[${PYTHON_USEDEP}]
 		dev-libs/dbus-glib
 		libnotify? ( dev-python/notify-python[${PYTHON_USEDEP}] )
-		avahi? ( net-dns/avahi[dbus,gtk,python,${PYTHON_USEDEP}] )
+		zeroconf? ( net-dns/avahi[dbus,gtk,python,${PYTHON_USEDEP}] )
 		)
 	gnome? (
 		dev-python/libgnome-python[${PYTHON_USEDEP}]
@@ -63,7 +64,7 @@ RDEPEND="${COMMON_DEPEND}
 	kde? ( kde-apps/kwalletmanager )
 	networkmanager? (
 			dev-python/dbus-python[${PYTHON_USEDEP}]
-			net-misc/networkmanager
+			net-misc/networkmanager:=
 		)
 	spell? ( app-text/gtkspell:2 )
 	srv? (