summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Crête <tester@gentoo.org>2010-03-01 14:49:26 +0000
committerOlivier Crête <tester@gentoo.org>2010-03-01 14:49:26 +0000
commitb7be20b5dfdfca181d78dece1ec9015aa77c3da0 (patch)
treeaa945ff9039a62d22526359d6d2cfd22c095961e /net-voip
parentRemove fe3d mask (diff)
downloadhistorical-b7be20b5dfdfca181d78dece1ec9015aa77c3da0.tar.gz
historical-b7be20b5dfdfca181d78dece1ec9015aa77c3da0.tar.bz2
historical-b7be20b5dfdfca181d78dece1ec9015aa77c3da0.zip
Replace USE=bonjour with USE=zeroconf to match rest of tree, bug #307103
Package-Manager: portage-2.1.7.16/cvs/Linux x86_64
Diffstat (limited to 'net-voip')
-rw-r--r--net-voip/telepathy-connection-managers/ChangeLog6
-rw-r--r--net-voip/telepathy-connection-managers/Manifest16
-rw-r--r--net-voip/telepathy-connection-managers/metadata.xml2
-rw-r--r--net-voip/telepathy-connection-managers/telepathy-connection-managers-1.ebuild6
4 files changed, 22 insertions, 8 deletions
diff --git a/net-voip/telepathy-connection-managers/ChangeLog b/net-voip/telepathy-connection-managers/ChangeLog
index 29feec6cc778..7bbadcc3a2e0 100644
--- a/net-voip/telepathy-connection-managers/ChangeLog
+++ b/net-voip/telepathy-connection-managers/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-voip/telepathy-connection-managers
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-connection-managers/ChangeLog,v 1.4 2010/02/19 19:29:58 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-connection-managers/ChangeLog,v 1.5 2010/03/01 14:49:26 tester Exp $
+
+ 01 Mar 2010; Olivier Crête <tester@gentoo.org>
+ telepathy-connection-managers-1.ebuild, metadata.xml:
+ Replace USE=bonjour with USE=zeroconf to match rest of tree, bug #307103
19 Feb 2010; Raúl Porcel <armin76@gentoo.org>
telepathy-connection-managers-1.ebuild:
diff --git a/net-voip/telepathy-connection-managers/Manifest b/net-voip/telepathy-connection-managers/Manifest
index 2d4916a58404..ecd909bf670a 100644
--- a/net-voip/telepathy-connection-managers/Manifest
+++ b/net-voip/telepathy-connection-managers/Manifest
@@ -1,3 +1,13 @@
-EBUILD telepathy-connection-managers-1.ebuild 923 RMD160 c9248b01ee62c35f825328a33ade1202a24b2a48 SHA1 4bb2d49cd05503daefc7578c968f729387186c22 SHA256 aa1152f10a95993c630896b4883b4ec99c7c45c50e9f5f86e569e1d15dd57e8e
-MISC ChangeLog 851 RMD160 c948b7c5d4515bef218bed511d1f01e0e6124681 SHA1 e4224d9e7655872c6acdacd51e3f0f91271bb309 SHA256 815b7e4305d288c96989494b6f52d6ccb16724fd321e9c36cf59245d5608c72c
-MISC metadata.xml 556 RMD160 eeefa113507c0a243857c804d9829dc522fc6787 SHA1 081a0a043600f21b27fd9b2b79911efe8a47763e SHA256 c49f5fdc4053c24690750d93f201358e763f7ff2706ec3d57f5247e8e6bdb3fc
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+EBUILD telepathy-connection-managers-1.ebuild 924 RMD160 c8a48e74a4ad9286758c75a9f5bda2a37eb21e48 SHA1 eeec68311de9575225a6470c604417e93abfd0a3 SHA256 71aa86f562705f96836855d3d6bbe05300e029eeb23b9f42646f608b03c37103
+MISC ChangeLog 1032 RMD160 02036ca0614ecb8ca585998c51a48f84d5025674 SHA1 8ff86201a8d05fc0265cdb65658e77fba0d42b05 SHA256 9cde2a6759ca8ca0a24bd539e4e70592bfa15e10360fe9a60e4ea5a082cbe670
+MISC metadata.xml 569 RMD160 878c7320fe1aa505cc6d66a32b187f7c2480e273 SHA1 6161ebca1c76e5f913254ce6126eaca1469b27b5 SHA256 d4a6641c4a57b59d12df0eca3cb9ce10edd7106e1e353fa4188da8d706fda68d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iEYEARECAAYFAkuL0/sACgkQmOfEJZHYOKetAgCgz1zU5EFxm9aqUEOEayOMetyp
+fzsAn0TAMmeTTUQP0MiSHrZ/O51hIy2y
+=b+Yu
+-----END PGP SIGNATURE-----
diff --git a/net-voip/telepathy-connection-managers/metadata.xml b/net-voip/telepathy-connection-managers/metadata.xml
index db7f7c7221dd..b5df8d391540 100644
--- a/net-voip/telepathy-connection-managers/metadata.xml
+++ b/net-voip/telepathy-connection-managers/metadata.xml
@@ -4,7 +4,7 @@
<herd>voip</herd>
<herd>net-im</herd>
<use>
- <flag name='bonjour'>Enable Link-Local Messaging via the bonjour protocol.</flag>
+ <flag name='zeroconf'>Enable Link-Local Messaging via the zeroconf or Bonjour protocol.</flag>
<flag name='sip'>Enable SIP/SIMPLE messaging and calling.</flag>
<flag name='irc'>Enable Internet Relay Chat (IRC) support.</flag>
<flag name='yahoo'>Enable Yahoo! messaging support.</flag>
diff --git a/net-voip/telepathy-connection-managers/telepathy-connection-managers-1.ebuild b/net-voip/telepathy-connection-managers/telepathy-connection-managers-1.ebuild
index 941399b1ec39..d8f70f84f024 100644
--- a/net-voip/telepathy-connection-managers/telepathy-connection-managers-1.ebuild
+++ b/net-voip/telepathy-connection-managers/telepathy-connection-managers-1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-connection-managers/telepathy-connection-managers-1.ebuild,v 1.4 2010/02/19 19:29:58 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-connection-managers/telepathy-connection-managers-1.ebuild,v 1.5 2010/03/01 14:49:26 tester Exp $
DESCRIPTION="Meta-package for Telepathy Connection Managers"
@@ -11,7 +11,7 @@ SLOT="0"
KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="msn irc yahoo icq jabber sip bonjour"
+IUSE="msn irc yahoo icq jabber sip zeroconf"
DEPEND=""
# These version support the 0.18.0 Telepathy specification
@@ -19,7 +19,7 @@ DEPEND=""
RDEPEND="msn? ( >=net-voip/telepathy-butterfly-0.5.0 )
jabber? ( >=net-voip/telepathy-gabble-0.8.0 )
sip? ( >=net-voip/telepathy-sofiasip-0.5.18 )
- bonjour? ( >=net-voip/telepathy-salut-0.3.10 )
+ zeroconf? ( >=net-voip/telepathy-salut-0.3.10 )
icq? ( >=net-voip/telepathy-haze-0.3.2 )
yahoo? ( >=net-voip/telepathy-haze-0.3.2 )
irc? ( >=net-irc/telepathy-idle-0.1.5 )"