Bumped kopete-3.5.10 and kopete-3.5.9 to fix the USE="-meanwhile" compilation issue and improved handling of protocols.

Added missing use flags and allowed the optional compilation of all protocols.
(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 26 insertions, 9 deletions

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index 481083cb0af1..cfd50628fab1 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.185 2009/05/15 02:29:11 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.186 2009/05/17 17:00:49 jmbsvicetto Exp $
+
+*kopete-3.5.10-r2 (17 May 2009)
+*kopete-3.5.9-r2 (17 May 2009)
+
+  17 May 2009; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+  -kopete-3.5.9-r1.ebuild, +kopete-3.5.9-r2.ebuild,
+  -kopete-3.5.10-r1.ebuild, +kopete-3.5.10-r2.ebuild:
+  Bumped kopete-3.5.10 and kopete-3.5.9 to fix the USE="-meanwhile"
+  compilation issue and improved handling of protocols.
 
 *kopete-3.5.10-r1 (15 May 2009)
 *kopete-3.5.9-r1 (15 May 2009)
diff --git a/kde-base/kopete/kopete-3.5.10-r1.ebuild b/kde-base/kopete/kopete-3.5.10-r2.ebuild
index 8caf4aaa7177..bc81bdb454e3 100644
--- a/kde-base/kopete/kopete-3.5.10-r1.ebuild
+++ b/kde-base/kopete/kopete-3.5.10-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.10-r1.ebuild,v 1.1 2009/05/15 02:29:11 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.10-r2.ebuild,v 1.1 2009/05/17 17:00:49 jmbsvicetto Exp $
 
 KMNAME=kdenetwork
 EAPI="1"
@@ -14,7 +14,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="jingle ssl xscreensaver slp kernel_linux kdehiddenvisibility"
 PLUGINS="addbookmarks alias autoreplace connectionstatus contactnotes crypt highlight history latex netmeeting nowlistening
 	statistics texteffect translator webpresence"
-PROTOCOLS="groupwise irc sametime sms winpopup yahoo"
+PROTOCOLS="groupwise irc jabber oscar msn sametime sms winpopup yahoo"
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
 # Even more broken tests...
@@ -27,10 +27,12 @@ BOTH_DEPEND="
 	>=dev-libs/glib-2
 	dev-libs/libxml2
 	dev-libs/libxslt
-	net-dns/libidn
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXrender
+	jabber? (
+		net-dns/libidn
+	)
 	jingle? (
 		dev-libs/expat
 		>=media-libs/speex-1.1.6
@@ -106,7 +108,9 @@ src_unpack() {
 	kopete_disable protocol '\$(GADU)'
 	use groupwise || kopete_disable protocol groupwise
 	use irc || kopete_disable protocol irc
-	use sametime || kopete_disable protocol meanwhile
+	use jabber || kopete_disable protocol '\$(JABBER)'
+	use oscar || kopete_disable protocol oscar
+	use msn || kopete_disable protocol msn
 	use winpopup || kopete_disable protocol winpopup
 	use yahoo || kopete_disable protocol yahoo
 
diff --git a/kde-base/kopete/kopete-3.5.9-r1.ebuild b/kde-base/kopete/kopete-3.5.9-r2.ebuild
index 92f1fc080bd4..436884ce4bba 100644
--- a/kde-base/kopete/kopete-3.5.9-r1.ebuild
+++ b/kde-base/kopete/kopete-3.5.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.9-r1.ebuild,v 1.1 2009/05/15 02:29:11 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.9-r2.ebuild,v 1.1 2009/05/17 17:00:49 jmbsvicetto Exp $
 
 KMNAME=kdenetwork
 EAPI="1"
@@ -17,7 +17,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="jingle ssl xscreensaver slp kernel_linux kdehiddenvisibility"
 PLUGINS="addbookmarks alias autoreplace connectionstatus contactnotes crypt highlight history latex netmeeting nowlistening
 	statistics texteffect translator webpresence"
-PROTOCOLS="groupwise irc sametime sms winpopup yahoo"
+PROTOCOLS="groupwise irc jabber oscar msn sametime sms winpopup yahoo"
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
 # Even more broken tests...
@@ -30,10 +30,12 @@ BOTH_DEPEND="
 	>=dev-libs/glib-2
 	dev-libs/libxml2
 	dev-libs/libxslt
-	net-dns/libidn
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-libs/libXrender
+	jabber? (
+		net-dns/libidn
+	)
 	jingle? (
 		dev-libs/expat
 		>=media-libs/speex-1.1.6
@@ -110,7 +112,9 @@ src_unpack() {
 	kopete_disable protocol '\$(GADU)'
 	use groupwise || kopete_disable protocol groupwise
 	use irc || kopete_disable protocol irc
-	use sametime || kopete_disable protocol meanwhile
+	use jabber || kopete_disable protocol '\$(JABBER)'
+	use oscar || kopete_disable protocol oscar
+	use msn || kopete_disable protocol msn
 	use winpopup || kopete_disable protocol winpopup
 	use yahoo || kopete_disable protocol yahoo