[kde-base/kopete-4.4.4-r1] Replaced bonjour with zeroconf use flag. Fixes bug 322563...

Dropped kopete-4.4.4.
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index d83576aacb0fac77b4f6642509168b4cb4fbef13..a3e5f56911e26f3b4bc49bf8434a2f3f6ea3bd87 100644 (file)
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.250 2010/06/06 14:42:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.251 2010/06/06 18:08:42 jmbsvicetto Exp $
+
+*kopete-4.4.4-r1 (06 Jun 2010)
+
+  06 Jun 2010; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  +kopete-4.4.4-r1.ebuild, metadata.xml:
+  [kde-base/kopete-4.4.4-r1] Replaced bonjour with zeroconf use flag. Fixes
+  bug 322563 and applies again the fix for bug 307105.
+  Dropped kopete-4.4.4.
 
   06 Jun 2010; Tomáš Chvátal <scarabeus@gentoo.org> -kopete-4.4.2.ebuild,
   -kopete-4.4.2-r1.ebuild, -kopete-4.4.3.ebuild, +kopete-4.4.4.ebuild,

diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index 698e1f4eb630f1565a59fb6696dcdd24dea2164b..8404a99c3277395f2dcf1ecb4fef4efd570053be 100644 (file)
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -4,6 +4,6 @@ DIST kdenetwork-4.3.5.tar.bz2 7384719 RMD160 fc631b631957ba49084c2b006d8cef35f2e
 DIST kdenetwork-4.4.4.tar.bz2 8321292 RMD160 ad4a8ef9ba6baf1e3c161f3df9cae314e3381f00 SHA1 1706b009d723897cbc9ad9b0c1743873e8e79362 SHA256 fafadfab55affcb837557f09aa504a17350eeb06ad7a17275371549e4a7e588d
 EBUILD kopete-4.3.3.ebuild 3386 RMD160 b022acaf31d0edffa610216f7c3e4ef6602ee35f SHA1 17839f5e74ce802fa6cb791b51152e12cad01293 SHA256 9f4424b6b230d45c6137bdbcf3468031fbc36dedec882663e0b830bdae6bc3ab
 EBUILD kopete-4.3.5.ebuild 3400 RMD160 576d23e558587b3ae94504e7b0146f8410a56961 SHA1 3e1daaf41a6cdff06b9dea71408ffce557ad8faa SHA256 7a2d542cbeefe9ad16bf66296007f743eb7c2f2f96536a6a5e12b10a61a5701b
-EBUILD kopete-4.4.4.ebuild 4094 RMD160 a17d8569227029ecadb39405d776396ac761479f SHA1 e6dc8d01f45d9d5fb2ce00819f23eacebbc15a05 SHA256 6bbae422a716f42427a3bd7c0807a26b781a32cb99c19c1250191826efe7787a
-MISC ChangeLog 36578 RMD160 89c246469a5e71546371cfab3a7f4286b0285c93 SHA1 f68430fa43485ef24686df0a232cdf909846f677 SHA256 2fb1c18bc17478385b7da644386d1d0b36a51e58db75ddbee2b06a0ba080feb9
-MISC metadata.xml 2600 RMD160 d3cd011d4e3c7a07dd3ee470f2bb08f7b4fb1d4e SHA1 5a6721f369b59d210afda0240ade1d1146df6722 SHA256 dc1594e67c15880f7432cf5b4aff6b914f229c5d2733e6c5bfd075ae94faf20f
+EBUILD kopete-4.4.4-r1.ebuild 4161 RMD160 08c5362c08947cde391f776f17a274f5bcb34d9e SHA1 879a7f2fcce535ab302ef317db3c483de917a7a4 SHA256 2ec7c1a200a00ffe009486b3b0d77497f0206caaa0d9d023de517c4639a5cc3c
+MISC ChangeLog 36876 RMD160 72910a62f89a3a931d03b2547351439291b83382 SHA1 ac09d1afaffac2a5c4df8930bc3ffa16c13190df SHA256 c490b1abcbb969f9de044893dbbe56d3fa767a5a9927f4268a154c10d6cedff5
+MISC metadata.xml 2684 RMD160 186a6c47ff4a52d5ed5b19417758f4707a502301 SHA1 22fb5bcb995b84b1a4013de11eb03eba826fc308 SHA256 341f5a52c56524d1cec99eda9dd62a1ff939fdc952e2d27ce1870130b79282e3

diff --git a/kde-base/kopete/kopete-4.4.4.ebuild b/kde-base/kopete/kopete-4.4.4-r1.ebuild
similarity index 92%
rename from kde-base/kopete/kopete-4.4.4.ebuild
rename to kde-base/kopete/kopete-4.4.4-r1.ebuild
index 4c55272bcbc4ad551faf2b50dada13a47183d0d9..7e6508e180a0081bbc0f4777db11698857d641ae 100644 (file)
--- a/kde-base/kopete/kopete-4.4.4.ebuild
+++ b/kde-base/kopete/kopete-4.4.4-r1.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/kde-base/kopete/kopete-4.4.4.ebuild,v 1.1 2010/06/06 14:42:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.4.4-r1.ebuild,v 1.1 2010/06/06 18:08:42 jmbsvicetto Exp $
 
 EAPI="3"
 
@@ -39,7 +39,6 @@ PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex
 
 # Available protocols
 #
-#      bonjour: NO DEPS
 #      gadu: net-libs/libgadu @since 4.3
 #      groupwise: app-crypt/qca:2
 #      irc: NO DEPS, probably will fail so inform user about it
@@ -53,8 +52,9 @@ PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex
 #   testbed: NO DEPS
 #      winpopup: NO DEPS
 #      yahoo: NO DEPS
-PROTOCOLS="bonjour gadu groupwise +jabber jingle meanwhile msn oscar qq
-skype sms testbed winpopup yahoo"
+#      zeroconf (bonjour): NO DEPS
+PROTOCOLS="gadu groupwise +jabber jingle meanwhile msn oscar qq skype
+sms testbed winpopup yahoo zeroconf"
 
 # disabled protocols
 #   telepathy: net-libs/decibel
@@ -121,6 +121,7 @@ src_configure() {
        # enable protocols
        for x in ${PROTOCOLS}; do
                [[ ${x/+/} = msn ]] && x2=Libmsn || x2=""
+               [[ ${x/+/} = zeroconf ]] && x2=bonjour || x2=""
                mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2}))
        done
 

diff --git a/kde-base/kopete/metadata.xml b/kde-base/kopete/metadata.xml
index b2c6eb169963c5015d70672cab946c932a256deb..f63d5abc811cb9047907691fac7061bbef0e0cd5 100644 (file)
--- a/kde-base/kopete/metadata.xml
+++ b/kde-base/kopete/metadata.xml
@@ -37,6 +37,7 @@
        <flag name="testbed">Enable the testbed protocol.</flag>
        <flag name="winpopup">Enable pop-up messages sending on windows. (same as good old "net send" messages ;])</flag>
        <flag name="yahoo">Enable yahoo protocol support.</flag>
+       <flag name="zeroconf">Enable Link-Local Messaging via the bonjour protocol.</flag>
 </use>
 <herd>kde</herd>
 </pkgmetadata>