Translated Category fields cause protocols not appearing, bug 206877. Thanks to Jorge Manuel B. S. Vicetto.

(Portage version: 2.1.4)

4 files changed, 17 insertions, 3 deletions

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index 45096bdeb7e7..ce4f6b6f3e86 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.128 2008/01/18 00:14:03 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.129 2008/01/23 01:17:24 ingmar Exp $
+
+*kopete-4.0.0-r1 (23 Jan 2008)
+
+  23 Jan 2008; Ingmar Vanhassel <ingmar@gentoo.org> kopete-3.5.8.ebuild,
+  -kopete-4.0.0.ebuild, +kopete-4.0.0-r1.ebuild:
+  Translated Category fields cause protocols not appearing, bug 206877.
+  Thanks to Jorge Manuel B. S. Vicetto.
 
 *kopete-4.0.0 (18 Jan 2008)
 
diff --git a/kde-base/kopete/files/digest-kopete-4.0.0 b/kde-base/kopete/files/digest-kopete-4.0.0-r1
index d00c395e3461..d00c395e3461 100644
--- a/kde-base/kopete/files/digest-kopete-4.0.0
+++ b/kde-base/kopete/files/digest-kopete-4.0.0-r1
diff --git a/kde-base/kopete/kopete-3.5.8.ebuild b/kde-base/kopete/kopete-3.5.8.ebuild
index ffd71ca8016a..45acad63cb0e 100644
--- a/kde-base/kopete/kopete-3.5.8.ebuild
+++ b/kde-base/kopete/kopete-3.5.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.8.ebuild,v 1.3 2008/01/13 17:49:47 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.8.ebuild,v 1.4 2008/01/23 01:17:24 ingmar Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -105,6 +105,9 @@ src_unpack() {
 }
 
 src_compile() {
+	# Use system QCA library
+	sed -e "/SUBDIRS/s/[[:space:]]qca//" -i "${S}"/kopete/protocols/jabber/libiris/Makefile.am
+
 	# External libgadu support - doesn't work, kopete requires a specific development snapshot of libgadu.
 	# Maybe we can enable it in the future.
 	local myconf="$(use_enable jingle)
diff --git a/kde-base/kopete/kopete-4.0.0.ebuild b/kde-base/kopete/kopete-4.0.0-r1.ebuild
index c7595e58506c..abe5cdfb6d8a 100644
--- a/kde-base/kopete/kopete-4.0.0.ebuild
+++ b/kde-base/kopete/kopete-4.0.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.0.0.ebuild,v 1.1 2008/01/18 00:14:03 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.0.0-r1.ebuild,v 1.1 2008/01/23 01:17:24 ingmar Exp $
 
 EAPI="1"
 
@@ -44,6 +44,10 @@ DEPEND="${RDEPEND}
 	x11-proto/scrnsaverproto"
 
 src_compile() {
+	# Translated protocol causing bug 206877.
+	sed -e '/X-KDE-PluginInfo-Category\[.*/d' \
+		-i "${S}"/kopete/protocols/*/kopete_*.desktop || die "Sed failed."
+
 	# Xmms isn't in portage, thus forcefully disabled.
 	#	$(cmake-utils_use_with messenger)
 	mycmakeargs="${mycmakeargs}