[gentoo-commits] proj/kde:master commit in: kde-base/kopete/

[gentoo-commits] proj/kde:master commit in: kde-base/kopete/

[Jonathan Callen]

commit:     c2be8723c9d6484f77f25ca006fb7b6da080fcde
Author:     abcd <abcd <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 19 00:24:56 2011 +0000
Commit:     Jonathan Callen <abcd <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 00:24:56 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c2be8723

[kde-base/kopete] Add dep on jasper for yahoo

(Portage version: 2.2.0_alpha23_p5/git/Linux i686, signed Manifest commit with key 229E5838)

---
 kde-base/kopete/kopete-9999.ebuild |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/kde-base/kopete/kopete-9999.ebuild b/kde-base/kopete/kopete-9999.ebuild
index 8ae1224..46c536f 100644
--- a/kde-base/kopete/kopete-9999.ebuild
+++ b/kde-base/kopete/kopete-9999.ebuild
@@ -52,7 +52,7 @@ PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex
 #   telepathy: net-libs/decibel
 #   testbed: NO DEPS
 #	winpopup: NO DEPS (we're adding samba as RDEPEND so it works)
-#	yahoo: NO DEPS
+#	yahoo: media-libs/jasper
 #	zeroconf (bonjour): NO DEPS
 PROTOCOLS="gadu groupwise +jabber jingle meanwhile msn oscar qq skype
 sms testbed winpopup yahoo zeroconf"
@@ -84,6 +84,7 @@ COMMONDEPEND="
 	msn? ( >=net-libs/libmsn-4.1 )
 	otr? ( >=net-libs/libotr-3.2.0 )
 	statistics? ( dev-db/sqlite:3 )
+	yahoo? ( media-libs/jasper )
 	webpresence? (
 		dev-libs/libxml2
 		dev-libs/libxslt

[gentoo-commits] proj/kde:master commit in: kde-base/kopete/

[Andreas K. Huettel]

commit:     eb4f67b8b49668fb72dddcde6394870850aa3fef
Author:     Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sat Mar  5 15:33:42 2011 +0000
Commit:     Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar  5 15:33:55 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=eb4f67b8

[kde-base/kopete] Added missing dependency of yahoo protocol on media-libs/jasper, bug 357537

(Portage version: 2.1.9.42/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

---
 kde-base/kopete/kopete-4.6.9999.ebuild |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/kde-base/kopete/kopete-4.6.9999.ebuild b/kde-base/kopete/kopete-4.6.9999.ebuild
index 8ae1224..c50ff6b 100644
--- a/kde-base/kopete/kopete-4.6.9999.ebuild
+++ b/kde-base/kopete/kopete-4.6.9999.ebuild
@@ -52,7 +52,7 @@ PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex
 #   telepathy: net-libs/decibel
 #   testbed: NO DEPS
 #	winpopup: NO DEPS (we're adding samba as RDEPEND so it works)
-#	yahoo: NO DEPS
+#	yahoo: media-libs/jasper
 #	zeroconf (bonjour): NO DEPS
 PROTOCOLS="gadu groupwise +jabber jingle meanwhile msn oscar qq skype
 sms testbed winpopup yahoo zeroconf"
@@ -89,6 +89,7 @@ COMMONDEPEND="
 		dev-libs/libxslt
 	)
 	v4l2? ( media-libs/libv4l )
+	yahoo? ( media-libs/jasper )
 "
 RDEPEND="${COMMONDEPEND}
 	latex? (

[gentoo-commits] proj/kde:master commit in: kde-base/kopete/

[Maciej Mrozowski]

commit:     1e20354521fd30a948fa2e949d1d9fc42510190a
Author:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  5 17:31:45 2011 +0000
Commit:     Maciej Mrozowski <reavertm <AT> gentoo <DOT> org>
CommitDate: Sat Mar  5 17:31:45 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=1e203545

[kde-base/kopete] Sort deps

---
 kde-base/kopete/kopete-4.6.9999.ebuild |    2 +-
 kde-base/kopete/kopete-9999.ebuild     |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-base/kopete/kopete-4.6.9999.ebuild b/kde-base/kopete/kopete-4.6.9999.ebuild
index c50ff6b..139b073 100644
--- a/kde-base/kopete/kopete-4.6.9999.ebuild
+++ b/kde-base/kopete/kopete-4.6.9999.ebuild
@@ -84,11 +84,11 @@ COMMONDEPEND="
 	msn? ( >=net-libs/libmsn-4.1 )
 	otr? ( >=net-libs/libotr-3.2.0 )
 	statistics? ( dev-db/sqlite:3 )
+	v4l2? ( media-libs/libv4l )
 	webpresence? (
 		dev-libs/libxml2
 		dev-libs/libxslt
 	)
-	v4l2? ( media-libs/libv4l )
 	yahoo? ( media-libs/jasper )
 "
 RDEPEND="${COMMONDEPEND}

diff --git a/kde-base/kopete/kopete-9999.ebuild b/kde-base/kopete/kopete-9999.ebuild
index 46c536f..139b073 100644
--- a/kde-base/kopete/kopete-9999.ebuild
+++ b/kde-base/kopete/kopete-9999.ebuild
@@ -84,12 +84,12 @@ COMMONDEPEND="
 	msn? ( >=net-libs/libmsn-4.1 )
 	otr? ( >=net-libs/libotr-3.2.0 )
 	statistics? ( dev-db/sqlite:3 )
-	yahoo? ( media-libs/jasper )
+	v4l2? ( media-libs/libv4l )
 	webpresence? (
 		dev-libs/libxml2
 		dev-libs/libxslt
 	)
-	v4l2? ( media-libs/libv4l )
+	yahoo? ( media-libs/jasper )
 "
 RDEPEND="${COMMONDEPEND}
 	latex? (

[gentoo-commits] proj/kde:master commit in: kde-base/kopete/

[Tomas Chvatal]

commit:     39b0c2a48704c022ccd56e0972f61e3340d20894
Author:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
AuthorDate: Thu Apr  7 08:59:05 2011 +0000
Commit:     Tomas Chvatal <scarabeus <AT> gentoo <DOT> org>
CommitDate: Thu Apr  7 08:59:05 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=39b0c2a4

[kopete] Rename jabber useflag to xmpp.

---
 kde-base/kopete/kopete-4.6.9999.ebuild |   22 +++++++++++-----------
 kde-base/kopete/kopete-9999.ebuild     |   22 +++++++++++-----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/kde-base/kopete/kopete-4.6.9999.ebuild b/kde-base/kopete/kopete-4.6.9999.ebuild
index 139b073..ca6e345 100644
--- a/kde-base/kopete/kopete-4.6.9999.ebuild
+++ b/kde-base/kopete/kopete-4.6.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.6.2.ebuild,v 1.1 2011/04/06 14:19:17 scarabeus Exp $
 
 EAPI=3
 
@@ -43,7 +43,7 @@ PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex
 #	gadu: net-libs/libgadu @since 4.3
 #	groupwise: app-crypt/qca:2
 #	irc: NO DEPS, probably will fail so inform user about it
-#	jabber: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK
+#	xmpp: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK
 #	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
 #	meanwhile: net-libs/meanwhile
 #	msn: libmsn == this is wlm plugin, we disable msn one
@@ -54,8 +54,8 @@ PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex
 #	winpopup: NO DEPS (we're adding samba as RDEPEND so it works)
 #	yahoo: media-libs/jasper
 #	zeroconf (bonjour): NO DEPS
-PROTOCOLS="gadu groupwise +jabber jingle meanwhile msn oscar qq skype
-sms testbed winpopup yahoo zeroconf"
+PROTOCOLS="gadu groupwise jingle meanwhile msn oscar qq skype
+sms testbed winpopup +xmpp yahoo zeroconf"
 
 # disabled protocols
 #   telepathy: net-libs/decibel
@@ -71,10 +71,6 @@ COMMONDEPEND="
 	!aqua? ( x11-libs/libXScrnSaver )
 	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
 	groupwise? ( app-crypt/qca:2 )
-	jabber? (
-		app-crypt/qca:2
-		net-dns/libidn
-	)
 	jingle? (
 		>=media-libs/mediastreamer-2.3.0
 		media-libs/speex
@@ -89,6 +85,10 @@ COMMONDEPEND="
 		dev-libs/libxml2
 		dev-libs/libxslt
 	)
+	xmpp? (
+		app-crypt/qca:2
+		net-dns/libidn
+	)
 	yahoo? ( media-libs/jasper )
 "
 RDEPEND="${COMMONDEPEND}
@@ -130,6 +130,7 @@ src_configure() {
 		case ${x/+/} in
 			msn) x2=Libmsn ;;
 			zeroconf) x2=bonjour ;;
+			xmpp) x2=jabber ;;
 			*) x2='' ;;
 		esac
 		mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2}))
@@ -153,10 +154,9 @@ pkg_postinst() {
 	#fi
 
 	if ! use ssl; then
-		if use jabber || use msn; then # || use irc; then
+		if use xmpp || use msn; then # || use irc; then
 			echo
-			#elog "In order to use ssl in jabber, msn and irc you'll need to"
-			elog "In order to use ssl in jabber and msn you'll need to"
+			elog "In order to use ssl in xmpp and msn you'll need to"
 			elog "install app-crypt/qca-ossl package."
 			echo
 		fi

diff --git a/kde-base/kopete/kopete-9999.ebuild b/kde-base/kopete/kopete-9999.ebuild
index 139b073..ca6e345 100644
--- a/kde-base/kopete/kopete-9999.ebuild
+++ b/kde-base/kopete/kopete-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.6.2.ebuild,v 1.1 2011/04/06 14:19:17 scarabeus Exp $
 
 EAPI=3
 
@@ -43,7 +43,7 @@ PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex
 #	gadu: net-libs/libgadu @since 4.3
 #	groupwise: app-crypt/qca:2
 #	irc: NO DEPS, probably will fail so inform user about it
-#	jabber: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK
+#	xmpp: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK
 #	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
 #	meanwhile: net-libs/meanwhile
 #	msn: libmsn == this is wlm plugin, we disable msn one
@@ -54,8 +54,8 @@ PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex
 #	winpopup: NO DEPS (we're adding samba as RDEPEND so it works)
 #	yahoo: media-libs/jasper
 #	zeroconf (bonjour): NO DEPS
-PROTOCOLS="gadu groupwise +jabber jingle meanwhile msn oscar qq skype
-sms testbed winpopup yahoo zeroconf"
+PROTOCOLS="gadu groupwise jingle meanwhile msn oscar qq skype
+sms testbed winpopup +xmpp yahoo zeroconf"
 
 # disabled protocols
 #   telepathy: net-libs/decibel
@@ -71,10 +71,6 @@ COMMONDEPEND="
 	!aqua? ( x11-libs/libXScrnSaver )
 	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
 	groupwise? ( app-crypt/qca:2 )
-	jabber? (
-		app-crypt/qca:2
-		net-dns/libidn
-	)
 	jingle? (
 		>=media-libs/mediastreamer-2.3.0
 		media-libs/speex
@@ -89,6 +85,10 @@ COMMONDEPEND="
 		dev-libs/libxml2
 		dev-libs/libxslt
 	)
+	xmpp? (
+		app-crypt/qca:2
+		net-dns/libidn
+	)
 	yahoo? ( media-libs/jasper )
 "
 RDEPEND="${COMMONDEPEND}
@@ -130,6 +130,7 @@ src_configure() {
 		case ${x/+/} in
 			msn) x2=Libmsn ;;
 			zeroconf) x2=bonjour ;;
+			xmpp) x2=jabber ;;
 			*) x2='' ;;
 		esac
 		mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2}))
@@ -153,10 +154,9 @@ pkg_postinst() {
 	#fi
 
 	if ! use ssl; then
-		if use jabber || use msn; then # || use irc; then
+		if use xmpp || use msn; then # || use irc; then
 			echo
-			#elog "In order to use ssl in jabber, msn and irc you'll need to"
-			elog "In order to use ssl in jabber and msn you'll need to"
+			elog "In order to use ssl in xmpp and msn you'll need to"
 			elog "install app-crypt/qca-ossl package."
 			echo
 		fi

[gentoo-commits] proj/kde:master commit in: kde-base/kopete/

[Jorge Manuel B. S. Vicetto]

commit:     a2783fcaf0f2c7790f58be8df122f339f38aaadb
Author:     Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu May 26 18:55:47 2011 +0000
Commit:     Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu May 26 18:55:47 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a2783fca

[kde-base/kopete] 4.6.80 version bump.
jabber -> xmpp in metadata.xml.

(Portage version: 2.2.0_alpha35/git/Linux x86_64, signed Manifest commit with key BB0E6E98)

---
 kde-base/kopete/kopete-4.6.80.ebuild |  164 ++++++++++++++++++++++++++++++++++
 kde-base/kopete/metadata.xml         |    2 +-
 2 files changed, 165 insertions(+), 1 deletions(-)

diff --git a/kde-base/kopete/kopete-4.6.80.ebuild b/kde-base/kopete/kopete-4.6.80.ebuild
new file mode 100644
index 0000000..83b657f
--- /dev/null
+++ b/kde-base/kopete/kopete-4.6.80.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-4.6.2.ebuild,v 1.1 2011/04/06 14:19:17 scarabeus Exp $
+
+EAPI="4"
+
+KDE_HANDBOOK="optional"
+KMNAME="kdenetwork"
+inherit kde4-meta
+
+DESCRIPTION="KDE multi-protocol IM client"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug ssl v4l2"
+
+# tests hang, last checked for 4.2.96
+RESTRICT=test
+
+# Available plugins
+#
+#	addbookmarks: NO DEPS
+#	alias: NO DEPS (disabled upstream)
+#	autoreplace: NO DEPS
+#	contactnotes: NO DEPS
+#	highlight: NO DEPS
+#	history: NO DEPS
+#	latex: virtual/latex as RDEPEND
+#	nowlistening: NO DEPS
+#	otr: libotr
+#	pipes: NO DEPS
+#	privacy: NO DEPS
+#	statistics: dev-db/sqlite:3
+#	texteffect: NO DEPS
+#	translator: NO DEPS
+#	urlpicpreview: NO DEPS
+#	webpresence: libxml2 libxslt
+# NOTE: By default we enable all plugins that don't have any dependencies
+PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex
++nowlistening otr +pipes +privacy +statistics +texteffect +translator
++urlpicpreview webpresence"
+
+# Available protocols
+#
+#	gadu: net-libs/libgadu @since 4.3
+#	groupwise: app-crypt/qca:2
+#	irc: NO DEPS, probably will fail so inform user about it
+#	xmpp: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK
+#	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
+#	meanwhile: net-libs/meanwhile
+#	msn: libmsn == this is wlm plugin, we disable msn one
+#	oscar: NO DEPS
+#	qq: NO DEPS
+#   telepathy: net-libs/decibel
+#   testbed: NO DEPS
+#	winpopup: NO DEPS (we're adding samba as RDEPEND so it works)
+#	yahoo: media-libs/jasper
+#	zeroconf (bonjour): NO DEPS
+PROTOCOLS="gadu groupwise jingle meanwhile msn oscar qq skype
+sms testbed winpopup +xmpp yahoo zeroconf"
+
+# disabled protocols
+#   telepathy: net-libs/decibel
+#   irc: NO DEPS
+
+IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
+
+COMMONDEPEND="
+	dev-libs/libpcre
+	$(add_kdebase_dep kdepimlibs)
+	media-libs/qimageblitz
+	>=x11-libs/qt-gui-4.4.0:4[mng]
+	!aqua? ( x11-libs/libXScrnSaver )
+	gadu? ( >=net-libs/libgadu-1.8.0[threads] )
+	groupwise? ( app-crypt/qca:2 )
+	jingle? (
+		>=media-libs/mediastreamer-2.3.0
+		media-libs/speex
+		net-libs/ortp
+	)
+	meanwhile? ( net-libs/meanwhile )
+	msn? ( >=net-libs/libmsn-4.1 )
+	otr? ( >=net-libs/libotr-3.2.0 )
+	statistics? ( dev-db/sqlite:3 )
+	v4l2? ( media-libs/libv4l )
+	webpresence? (
+		dev-libs/libxml2
+		dev-libs/libxslt
+	)
+	xmpp? (
+		app-crypt/qca:2
+		net-dns/libidn
+	)
+	yahoo? ( media-libs/jasper )
+"
+RDEPEND="${COMMONDEPEND}
+	latex? (
+		|| (
+			media-gfx/imagemagick
+			media-gfx/graphicsmagick[imagemagick]
+		)
+		virtual/latex-base
+	)
+	sms? ( app-mobilephone/smssend )
+	ssl? ( app-crypt/qca-ossl )
+	winpopup? ( net-fs/samba )
+"
+#	telepathy? ( net-libs/decibel )"
+DEPEND="${COMMONDEPEND}
+	!aqua? ( x11-proto/scrnsaverproto )
+"
+
+src_prepare() {
+	sed -e "s:lib/mozilla:$(get_libdir)/mozilla:" \
+		-i kopete/protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed"
+
+	kde4-meta_src_prepare
+}
+
+src_configure() {
+	local x x2
+	# Handle common stuff
+	mycmakeargs=(
+		$(cmake-utils_use_with jingle GOOGLETALK)
+		$(cmake-utils_use_with jingle LiboRTP)
+		$(cmake-utils_use_with jingle Mediastreamer)
+		$(cmake-utils_use_with jingle Speex)
+		$(cmake-utils_use_disable v4l2 VIDEOSUPPORT)
+	)
+	# enable protocols
+	for x in ${PROTOCOLS}; do
+		case ${x/+/} in
+			msn) x2=Libmsn ;;
+			zeroconf) x2=bonjour ;;
+			xmpp) x2=jabber ;;
+			*) x2='' ;;
+		esac
+		mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2}))
+	done
+
+	# enable plugins
+	for x in ${PLUGINS}; do
+		mycmakeargs+=($(cmake-utils_use_with ${x/+/}))
+	done
+
+	kde4-meta_src_configure
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	#if use telepathy; then
+	#	elog "To use kopete telepathy plugins, you need to start gabble first:"
+	#	elog "GABBLE_PERSIST=1 telepathy-gabble &"
+	#	elog "export TELEPATHY_DATA_PATH='${EPREFIX}/usr/share/telepathy/managers/'"
+	#fi
+
+	if ! use ssl; then
+		if use xmpp || use msn; then # || use irc; then
+			echo
+			elog "In order to use ssl in xmpp and msn you'll need to"
+			elog "install app-crypt/qca-ossl package."
+			echo
+		fi
+	fi
+}

diff --git a/kde-base/kopete/metadata.xml b/kde-base/kopete/metadata.xml
index e87a15c..39c4661 100644
--- a/kde-base/kopete/metadata.xml
+++ b/kde-base/kopete/metadata.xml
@@ -24,7 +24,6 @@
 	<!-- uncomment this when enabled in ebuild
 	<flag name="irc">Enable the IRC protocol handler.</flag>
 	-->
-	<flag name="jabber">Enable XMPP protocol handler (this is also gmail).</flag>
 	<flag name="meanwhile">Enable the Sametime protocol handler.</flag>
 	<flag name="msn">Enable "Windows live messenger" protocol support.</flag>
 	<flag name="qq">enable support for the Chinese network protocol.</flag>
@@ -34,6 +33,7 @@
 	-->
 	<flag name="sms">Enable SMS sendinge functionality.</flag>
 	<flag name="testbed">Enable the testbed protocol.</flag>
+	<flag name="xmpp">Enable XMPP protocol handler (this is also gmail).</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>

[gentoo-commits] proj/kde:master commit in: kde-base/kopete/

[Andreas Hüttel]

commit:     4618c1d957a22d4a8f5afd61819bccd3b036a96a
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  1 16:11:49 2011 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Nov  1 16:11:49 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=4618c1d9

[kde-base/kopete] v4l2 becomes v4l

(Portage version: 2.1.10.32/git/Linux x86_64, signed Manifest commit with key 7887F787)

---
 kde-base/kopete/kopete-4.7.3.ebuild       |    6 +++---
 kde-base/kopete/kopete-4.7.49.9999.ebuild |    6 +++---
 kde-base/kopete/kopete-9999.ebuild        |    6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/kde-base/kopete/kopete-4.7.3.ebuild b/kde-base/kopete/kopete-4.7.3.ebuild
index f675764..58d1c7d 100644
--- a/kde-base/kopete/kopete-4.7.3.ebuild
+++ b/kde-base/kopete/kopete-4.7.3.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE multi-protocol IM client"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug ssl v4l2"
+IUSE="debug ssl v4l"
 
 # tests hang, last checked for 4.2.96
 RESTRICT=test
@@ -80,7 +80,7 @@ COMMONDEPEND="
 	msn? ( >=net-libs/libmsn-4.1 )
 	otr? ( >=net-libs/libotr-3.2.0 )
 	statistics? ( dev-db/sqlite:3 )
-	v4l2? ( media-libs/libv4l )
+	v4l? ( media-libs/libv4l )
 	webpresence? (
 		dev-libs/libxml2
 		dev-libs/libxslt
@@ -123,7 +123,7 @@ src_configure() {
 		$(cmake-utils_use_with jingle LiboRTP)
 		$(cmake-utils_use_with jingle Mediastreamer)
 		$(cmake-utils_use_with jingle Speex)
-		$(cmake-utils_use_disable v4l2 VIDEOSUPPORT)
+		$(cmake-utils_use_disable v4l VIDEOSUPPORT)
 	)
 	# enable protocols
 	for x in ${PROTOCOLS}; do

diff --git a/kde-base/kopete/kopete-4.7.49.9999.ebuild b/kde-base/kopete/kopete-4.7.49.9999.ebuild
index a8c5651..fea8c0f 100644
--- a/kde-base/kopete/kopete-4.7.49.9999.ebuild
+++ b/kde-base/kopete/kopete-4.7.49.9999.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE multi-protocol IM client"
 KEYWORDS=""
-IUSE="debug ssl v4l2"
+IUSE="debug ssl v4l"
 
 # tests hang, last checked for 4.2.96
 RESTRICT=test
@@ -80,7 +80,7 @@ COMMONDEPEND="
 	msn? ( >=net-libs/libmsn-4.1 )
 	otr? ( >=net-libs/libotr-3.2.0 )
 	statistics? ( dev-db/sqlite:3 )
-	v4l2? ( media-libs/libv4l )
+	v4l? ( media-libs/libv4l )
 	webpresence? (
 		dev-libs/libxml2
 		dev-libs/libxslt
@@ -123,7 +123,7 @@ src_configure() {
 		$(cmake-utils_use_with jingle LiboRTP)
 		$(cmake-utils_use_with jingle Mediastreamer)
 		$(cmake-utils_use_with jingle Speex)
-		$(cmake-utils_use_disable v4l2 VIDEOSUPPORT)
+		$(cmake-utils_use_disable v4l VIDEOSUPPORT)
 	)
 	# enable protocols
 	for x in ${PROTOCOLS}; do

diff --git a/kde-base/kopete/kopete-9999.ebuild b/kde-base/kopete/kopete-9999.ebuild
index a8c5651..fea8c0f 100644
--- a/kde-base/kopete/kopete-9999.ebuild
+++ b/kde-base/kopete/kopete-9999.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta
 
 DESCRIPTION="KDE multi-protocol IM client"
 KEYWORDS=""
-IUSE="debug ssl v4l2"
+IUSE="debug ssl v4l"
 
 # tests hang, last checked for 4.2.96
 RESTRICT=test
@@ -80,7 +80,7 @@ COMMONDEPEND="
 	msn? ( >=net-libs/libmsn-4.1 )
 	otr? ( >=net-libs/libotr-3.2.0 )
 	statistics? ( dev-db/sqlite:3 )
-	v4l2? ( media-libs/libv4l )
+	v4l? ( media-libs/libv4l )
 	webpresence? (
 		dev-libs/libxml2
 		dev-libs/libxslt
@@ -123,7 +123,7 @@ src_configure() {
 		$(cmake-utils_use_with jingle LiboRTP)
 		$(cmake-utils_use_with jingle Mediastreamer)
 		$(cmake-utils_use_with jingle Speex)
-		$(cmake-utils_use_disable v4l2 VIDEOSUPPORT)
+		$(cmake-utils_use_disable v4l VIDEOSUPPORT)
 	)
 	# enable protocols
 	for x in ${PROTOCOLS}; do

[gentoo-commits] proj/kde:master commit in: kde-base/kopete/

[Michael Palimaka]

commit:     b885c7261e4974bc5612bfdd432b83cdb368dc1c
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed May 23 13:56:12 2012 +0000
Commit:     Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Wed May 23 13:56:12 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b885c726

[kde-base/kopete] Explicitly inherit multilib.

(Portage version: 2.1.10.62/git/Linux x86_64, unsigned Manifest commit)

---
 kde-base/kopete/kopete-4.8.49.9999.ebuild |    2 +-
 kde-base/kopete/kopete-9999.ebuild        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-base/kopete/kopete-4.8.49.9999.ebuild b/kde-base/kopete/kopete-4.8.49.9999.ebuild
index 9643372..a8a0a85 100644
--- a/kde-base/kopete/kopete-4.8.49.9999.ebuild
+++ b/kde-base/kopete/kopete-4.8.49.9999.ebuild
@@ -6,7 +6,7 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KMNAME="kdenetwork"
-inherit kde4-meta
+inherit kde4-meta multilib
 
 DESCRIPTION="KDE multi-protocol IM client"
 KEYWORDS=""

diff --git a/kde-base/kopete/kopete-9999.ebuild b/kde-base/kopete/kopete-9999.ebuild
index 9643372..a8a0a85 100644
--- a/kde-base/kopete/kopete-9999.ebuild
+++ b/kde-base/kopete/kopete-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=4
 
 KDE_HANDBOOK="optional"
 KMNAME="kdenetwork"
-inherit kde4-meta
+inherit kde4-meta multilib
 
 DESCRIPTION="KDE multi-protocol IM client"
 KEYWORDS=""

[gentoo-commits] proj/kde:master commit in: kde-base/kopete/

[Chris Reffett]

commit:     861a5903850d087ddb975ef67de0df3c222b58e0
Author:     Chris Reffett <geekboy72 <AT> gmail <DOT> com>
AuthorDate: Fri Oct 19 14:52:38 2012 +0000
Commit:     Chris Reffett <geekboy72 <AT> gmail <DOT> com>
CommitDate: Fri Oct 19 14:52:38 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=861a5903

[kde-base/kopete] Add dependency on <libotr-4.0.0 per bug 438880

---
 kde-base/kopete/kopete-4.9.49.9999.ebuild |    2 +-
 kde-base/kopete/kopete-9999.ebuild        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-base/kopete/kopete-4.9.49.9999.ebuild b/kde-base/kopete/kopete-4.9.49.9999.ebuild
index 4b214d2..1dc449b 100644
--- a/kde-base/kopete/kopete-4.9.49.9999.ebuild
+++ b/kde-base/kopete/kopete-4.9.49.9999.ebuild
@@ -79,7 +79,7 @@ COMMONDEPEND="
 	)
 	meanwhile? ( net-libs/meanwhile )
 	msn? ( >=net-libs/libmsn-4.1 )
-	otr? ( >=net-libs/libotr-3.2.0 )
+	otr? ( >=net-libs/libotr-3.2.0 <net-libs/libotr-4.0.0 )
 	statistics? ( dev-db/sqlite:3 )
 	v4l? ( media-libs/libv4l )
 	webpresence? (

diff --git a/kde-base/kopete/kopete-9999.ebuild b/kde-base/kopete/kopete-9999.ebuild
index 4b214d2..1dc449b 100644
--- a/kde-base/kopete/kopete-9999.ebuild
+++ b/kde-base/kopete/kopete-9999.ebuild
@@ -79,7 +79,7 @@ COMMONDEPEND="
 	)
 	meanwhile? ( net-libs/meanwhile )
 	msn? ( >=net-libs/libmsn-4.1 )
-	otr? ( >=net-libs/libotr-3.2.0 )
+	otr? ( >=net-libs/libotr-3.2.0 <net-libs/libotr-4.0.0 )
 	statistics? ( dev-db/sqlite:3 )
 	v4l? ( media-libs/libv4l )
 	webpresence? (

[gentoo-commits] proj/kde:master commit in: kde-base/kopete/

[Michael Palimaka]

commit:     e9a95e5982fa7cc46bac8a8a5b725acd01970ff3
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Mar  6 10:16:45 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Mar  6 10:16:45 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e9a95e59

[kde-base/kopete] Only display elog if package is not installed.

Package-Manager: portage-2.1.11.55

---
 kde-base/kopete/kopete-4.10.1.ebuild       |    8 ++++----
 kde-base/kopete/kopete-4.10.49.9999.ebuild |    8 ++++----
 kde-base/kopete/kopete-9999.ebuild         |    8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/kde-base/kopete/kopete-4.10.1.ebuild b/kde-base/kopete/kopete-4.10.1.ebuild
index 2be2c17..df1bc8d 100644
--- a/kde-base/kopete/kopete-4.10.1.ebuild
+++ b/kde-base/kopete/kopete-4.10.1.ebuild
@@ -156,10 +156,10 @@ pkg_postinst() {
 
 	if ! use ssl; then
 		if use xmpp || use msn; then # || use irc; then
-			echo
-			elog "In order to use ssl in xmpp and msn you'll need to"
-			elog "install app-crypt/qca-ossl package."
-			echo
+			if ! has_version app-crypt/qca-ossl ; then
+				elog "In order to use ssl in xmpp and msn you'll need to"
+				elog "install app-crypt/qca-ossl package."
+			fi
 		fi
 	fi
 }

diff --git a/kde-base/kopete/kopete-4.10.49.9999.ebuild b/kde-base/kopete/kopete-4.10.49.9999.ebuild
index 14467fb..c055c53 100644
--- a/kde-base/kopete/kopete-4.10.49.9999.ebuild
+++ b/kde-base/kopete/kopete-4.10.49.9999.ebuild
@@ -156,10 +156,10 @@ pkg_postinst() {
 
 	if ! use ssl; then
 		if use xmpp || use msn; then # || use irc; then
-			echo
-			elog "In order to use ssl in xmpp and msn you'll need to"
-			elog "install app-crypt/qca-ossl package."
-			echo
+			if ! has_version app-crypt/qca-ossl ; then
+				elog "In order to use ssl in xmpp and msn you'll need to"
+				elog "install app-crypt/qca-ossl package."
+			fi
 		fi
 	fi
 }

diff --git a/kde-base/kopete/kopete-9999.ebuild b/kde-base/kopete/kopete-9999.ebuild
index 14467fb..c055c53 100644
--- a/kde-base/kopete/kopete-9999.ebuild
+++ b/kde-base/kopete/kopete-9999.ebuild
@@ -156,10 +156,10 @@ pkg_postinst() {
 
 	if ! use ssl; then
 		if use xmpp || use msn; then # || use irc; then
-			echo
-			elog "In order to use ssl in xmpp and msn you'll need to"
-			elog "install app-crypt/qca-ossl package."
-			echo
+			if ! has_version app-crypt/qca-ossl ; then
+				elog "In order to use ssl in xmpp and msn you'll need to"
+				elog "install app-crypt/qca-ossl package."
+			fi
 		fi
 	fi
 }

[gentoo-commits] proj/kde:master commit in: kde-base/kopete/

[Chris Reffett]

commit:     936b34c4e0c0f0f1bc5e007ecc3128898f12e3b9
Author:     Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 18 18:44:51 2013 +0000
Commit:     Chris Reffett <geekboy72 <AT> gmail <DOT> com>
CommitDate: Thu Apr 18 18:44:51 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=936b34c4

[kde-base/kopete] Remove USE=qq wrt bug 464660.

Package-Manager: portage-2.2.0_alpha173

---
 kde-base/kopete/kopete-4.10.49.9999.ebuild |    4 ++--
 kde-base/kopete/kopete-9999.ebuild         |    4 ++--
 kde-base/kopete/metadata.xml               |    1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/kde-base/kopete/kopete-4.10.49.9999.ebuild b/kde-base/kopete/kopete-4.10.49.9999.ebuild
index c055c53..b5e780c 100644
--- a/kde-base/kopete/kopete-4.10.49.9999.ebuild
+++ b/kde-base/kopete/kopete-4.10.49.9999.ebuild
@@ -49,18 +49,18 @@ PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex
 #	meanwhile: net-libs/meanwhile
 #	msn: libmsn == this is wlm plugin, we disable msn one
 #	oscar: NO DEPS
-#	qq: NO DEPS
 #   telepathy: net-libs/decibel
 #   testbed: NO DEPS
 #	winpopup: NO DEPS (we're adding samba as RDEPEND so it works)
 #	yahoo: media-libs/jasper
 #	zeroconf (bonjour): NO DEPS
-PROTOCOLS="gadu groupwise jingle meanwhile msn oscar qq skype
+PROTOCOLS="gadu groupwise jingle meanwhile msn oscar skype
 sms testbed winpopup +xmpp yahoo zeroconf"
 
 # disabled protocols
 #   telepathy: net-libs/decibel
 #   irc: NO DEPS
+#	qq: NO DEPS
 
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 

diff --git a/kde-base/kopete/kopete-9999.ebuild b/kde-base/kopete/kopete-9999.ebuild
index c055c53..b5e780c 100644
--- a/kde-base/kopete/kopete-9999.ebuild
+++ b/kde-base/kopete/kopete-9999.ebuild
@@ -49,18 +49,18 @@ PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex
 #	meanwhile: net-libs/meanwhile
 #	msn: libmsn == this is wlm plugin, we disable msn one
 #	oscar: NO DEPS
-#	qq: NO DEPS
 #   telepathy: net-libs/decibel
 #   testbed: NO DEPS
 #	winpopup: NO DEPS (we're adding samba as RDEPEND so it works)
 #	yahoo: media-libs/jasper
 #	zeroconf (bonjour): NO DEPS
-PROTOCOLS="gadu groupwise jingle meanwhile msn oscar qq skype
+PROTOCOLS="gadu groupwise jingle meanwhile msn oscar skype
 sms testbed winpopup +xmpp yahoo zeroconf"
 
 # disabled protocols
 #   telepathy: net-libs/decibel
 #   irc: NO DEPS
+#	qq: NO DEPS
 
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 

diff --git a/kde-base/kopete/metadata.xml b/kde-base/kopete/metadata.xml
index 39c4661..f47a4d6 100644
--- a/kde-base/kopete/metadata.xml
+++ b/kde-base/kopete/metadata.xml
@@ -26,7 +26,6 @@
 	-->
 	<flag name="meanwhile">Enable the Sametime protocol handler.</flag>
 	<flag name="msn">Enable "Windows live messenger" protocol support.</flag>
-	<flag name="qq">enable support for the Chinese network protocol.</flag>
 	<flag name="skype">Enable Skype protocol handler (not fully functional yet).</flag>
 	<!-- uncomment this when enabled in ebuild
 	<flag name="telepathy">Enable support for the real-time communication framework telepathy.</flag>

[gentoo-commits] proj/kde:master commit in: kde-base/kopete/

[Chris Reffett]

commit:     09a03aa8cf0fa8c0067827f3af386940a2cb6d6d
Author:     Chris Reffett <creffett <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 18 19:16:41 2013 +0000
Commit:     Chris Reffett <geekboy72 <AT> gmail <DOT> com>
CommitDate: Thu Apr 18 19:16:41 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=09a03aa8

[kde-base/kopete] Actually disable QQ as well.

Package-Manager: portage-2.2.0_alpha173

---
 kde-base/kopete/kopete-4.10.49.9999.ebuild |    2 ++
 kde-base/kopete/kopete-9999.ebuild         |    2 ++
 2 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/kde-base/kopete/kopete-4.10.49.9999.ebuild b/kde-base/kopete/kopete-4.10.49.9999.ebuild
index b5e780c..2e9c52f 100644
--- a/kde-base/kopete/kopete-4.10.49.9999.ebuild
+++ b/kde-base/kopete/kopete-4.10.49.9999.ebuild
@@ -137,6 +137,8 @@ src_configure() {
 		mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2}))
 	done
 
+	mycmakeargs+="-DWITH_qq=OFF"
+
 	# enable plugins
 	for x in ${PLUGINS}; do
 		mycmakeargs+=($(cmake-utils_use_with ${x/+/}))

diff --git a/kde-base/kopete/kopete-9999.ebuild b/kde-base/kopete/kopete-9999.ebuild
index b5e780c..2e9c52f 100644
--- a/kde-base/kopete/kopete-9999.ebuild
+++ b/kde-base/kopete/kopete-9999.ebuild
@@ -137,6 +137,8 @@ src_configure() {
 		mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2}))
 	done
 
+	mycmakeargs+="-DWITH_qq=OFF"
+
 	# enable plugins
 	for x in ${PLUGINS}; do
 		mycmakeargs+=($(cmake-utils_use_with ${x/+/}))

[gentoo-commits] proj/kde:master commit in: kde-base/kopete/

[Michael Palimaka]

commit:     5023f4c4ba399162734e56e827ac885a720c4940
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Mon May 13 10:57:37 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Mon May 13 10:57:37 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5023f4c4

[kde-base/kopete] Convert mycmakeargs addition to an array.

Package-Manager: portage-2.1.11.63

---
 kde-base/kopete/kopete-4.10.49.9999.ebuild |    2 +-
 kde-base/kopete/kopete-9999.ebuild         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-base/kopete/kopete-4.10.49.9999.ebuild b/kde-base/kopete/kopete-4.10.49.9999.ebuild
index 2e9c52f..18c304d 100644
--- a/kde-base/kopete/kopete-4.10.49.9999.ebuild
+++ b/kde-base/kopete/kopete-4.10.49.9999.ebuild
@@ -137,7 +137,7 @@ src_configure() {
 		mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2}))
 	done
 
-	mycmakeargs+="-DWITH_qq=OFF"
+	mycmakeargs+=( -DWITH_qq=OFF )
 
 	# enable plugins
 	for x in ${PLUGINS}; do

diff --git a/kde-base/kopete/kopete-9999.ebuild b/kde-base/kopete/kopete-9999.ebuild
index 2e9c52f..18c304d 100644
--- a/kde-base/kopete/kopete-9999.ebuild
+++ b/kde-base/kopete/kopete-9999.ebuild
@@ -137,7 +137,7 @@ src_configure() {
 		mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2}))
 	done
 
-	mycmakeargs+="-DWITH_qq=OFF"
+	mycmakeargs+=( -DWITH_qq=OFF )
 
 	# enable plugins
 	for x in ${PLUGINS}; do

[gentoo-commits] proj/kde:master commit in: kde-base/kopete/

[Johannes Huber]

commit:     5c59649407f2a63dc6e4def8147b40c8b55e3f62
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  6 19:58:21 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Jun  6 19:58:21 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5c596494

[kde-base/kopete] Moved to git by upstream.

Package-Manager: portage-2.2.0_alpha177

---
 kde-base/kopete/kopete-4.10.49.9999.ebuild | 19 ++++++++++++-------
 kde-base/kopete/kopete-9999.ebuild         | 12 +++++-------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/kde-base/kopete/kopete-4.10.49.9999.ebuild b/kde-base/kopete/kopete-4.10.49.9999.ebuild
index 18c304d..0274266 100644
--- a/kde-base/kopete/kopete-4.10.49.9999.ebuild
+++ b/kde-base/kopete/kopete-4.10.49.9999.ebuild
@@ -4,10 +4,15 @@
 
 EAPI=5
 
+if [[ $PV != *9999 ]]; then
+	KMNAME="kdenetwork"
+	KDE_ECLASS=meta
+else
+	KDE_ECLASS=base
+fi
+
 KDE_HANDBOOK="optional"
-KMNAME="kdenetwork"
-KDE_SCM="svn"
-inherit kde4-meta multilib
+inherit kde4-${KDE_ECLASS} multilib
 
 DESCRIPTION="KDE multi-protocol IM client"
 KEYWORDS=""
@@ -111,9 +116,9 @@ DEPEND="${COMMONDEPEND}
 
 src_prepare() {
 	sed -e "s:lib/mozilla:$(get_libdir)/mozilla:" \
-		-i kopete/protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed"
+		-i protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed"
 
-	kde4-meta_src_prepare
+	kde4-${KDE_ECLASS}_src_prepare
 }
 
 src_configure() {
@@ -144,11 +149,11 @@ src_configure() {
 		mycmakeargs+=($(cmake-utils_use_with ${x/+/}))
 	done
 
-	kde4-meta_src_configure
+	kde4-${KDE_ECLASS}_src_configure
 }
 
 pkg_postinst() {
-	kde4-meta_pkg_postinst
+	kde4-${KDE_ECLASS}_pkg_postinst
 
 	#if use telepathy; then
 	#	elog "To use kopete telepathy plugins, you need to start gabble first:"

diff --git a/kde-base/kopete/kopete-9999.ebuild b/kde-base/kopete/kopete-9999.ebuild
index 18c304d..3024e3b 100644
--- a/kde-base/kopete/kopete-9999.ebuild
+++ b/kde-base/kopete/kopete-9999.ebuild
@@ -5,9 +5,7 @@
 EAPI=5
 
 KDE_HANDBOOK="optional"
-KMNAME="kdenetwork"
-KDE_SCM="svn"
-inherit kde4-meta multilib
+inherit kde4-base multilib
 
 DESCRIPTION="KDE multi-protocol IM client"
 KEYWORDS=""
@@ -111,9 +109,9 @@ DEPEND="${COMMONDEPEND}
 
 src_prepare() {
 	sed -e "s:lib/mozilla:$(get_libdir)/mozilla:" \
-		-i kopete/protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed"
+		-i protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed"
 
-	kde4-meta_src_prepare
+	kde4-base_src_prepare
 }
 
 src_configure() {
@@ -144,11 +142,11 @@ src_configure() {
 		mycmakeargs+=($(cmake-utils_use_with ${x/+/}))
 	done
 
-	kde4-meta_src_configure
+	kde4-base_src_configure
 }
 
 pkg_postinst() {
-	kde4-meta_pkg_postinst
+	kde4-base_pkg_postinst
 
 	#if use telepathy; then
 	#	elog "To use kopete telepathy plugins, you need to start gabble first:"

[gentoo-commits] proj/kde:master commit in: kde-base/kopete/

[Michael Palimaka]

commit:     e3838554cbe07c01e1169ae4ead1f6638ed7e5fb
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Jul  3 07:25:21 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul  3 07:25:21 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e3838554

[kde-base/kopete] Remove failing sed wrt bug #475572.

It hasn't been necessary for some time as upstream now respects LIB_SUFFIX.

Package-Manager: portage-2.1.12.11

---
 kde-base/kopete/kopete-4.10.49.9999.ebuild | 9 +--------
 kde-base/kopete/kopete-4.10.90.ebuild      | 9 +--------
 kde-base/kopete/kopete-9999.ebuild         | 9 +--------
 3 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/kde-base/kopete/kopete-4.10.49.9999.ebuild b/kde-base/kopete/kopete-4.10.49.9999.ebuild
index 0274266..801da8e 100644
--- a/kde-base/kopete/kopete-4.10.49.9999.ebuild
+++ b/kde-base/kopete/kopete-4.10.49.9999.ebuild
@@ -12,7 +12,7 @@ else
 fi
 
 KDE_HANDBOOK="optional"
-inherit kde4-${KDE_ECLASS} multilib
+inherit kde4-${KDE_ECLASS}
 
 DESCRIPTION="KDE multi-protocol IM client"
 KEYWORDS=""
@@ -114,13 +114,6 @@ DEPEND="${COMMONDEPEND}
 	!aqua? ( x11-proto/scrnsaverproto )
 "
 
-src_prepare() {
-	sed -e "s:lib/mozilla:$(get_libdir)/mozilla:" \
-		-i protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed"
-
-	kde4-${KDE_ECLASS}_src_prepare
-}
-
 src_configure() {
 	local x x2
 	# Handle common stuff

diff --git a/kde-base/kopete/kopete-4.10.90.ebuild b/kde-base/kopete/kopete-4.10.90.ebuild
index 06a1baa..e828f57 100644
--- a/kde-base/kopete/kopete-4.10.90.ebuild
+++ b/kde-base/kopete/kopete-4.10.90.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 KDE_HANDBOOK="optional"
-inherit kde4-base multilib
+inherit kde4-base
 
 DESCRIPTION="KDE multi-protocol IM client"
 KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
@@ -107,13 +107,6 @@ DEPEND="${COMMONDEPEND}
 	!aqua? ( x11-proto/scrnsaverproto )
 "
 
-src_prepare() {
-	sed -e "s:lib/mozilla:$(get_libdir)/mozilla:" \
-		-i protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed"
-
-	kde4-base_src_prepare
-}
-
 src_configure() {
 	local x x2
 	# Handle common stuff

diff --git a/kde-base/kopete/kopete-9999.ebuild b/kde-base/kopete/kopete-9999.ebuild
index 3024e3b..10a370a 100644
--- a/kde-base/kopete/kopete-9999.ebuild
+++ b/kde-base/kopete/kopete-9999.ebuild
@@ -5,7 +5,7 @@
 EAPI=5
 
 KDE_HANDBOOK="optional"
-inherit kde4-base multilib
+inherit kde4-base
 
 DESCRIPTION="KDE multi-protocol IM client"
 KEYWORDS=""
@@ -107,13 +107,6 @@ DEPEND="${COMMONDEPEND}
 	!aqua? ( x11-proto/scrnsaverproto )
 "
 
-src_prepare() {
-	sed -e "s:lib/mozilla:$(get_libdir)/mozilla:" \
-		-i protocols/skype/skypebuttons/CMakeLists.txt || die "sed failed"
-
-	kde4-base_src_prepare
-}
-
 src_configure() {
 	local x x2
 	# Handle common stuff

[gentoo-commits] proj/kde:master commit in: kde-base/kopete/

[Johannes Huber]

commit:     83a002fb12f5679835b7960ac35e5507bf8bab48
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 31 16:59:33 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jul 31 16:59:33 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=83a002fb

[kde-base/kopete] Update HOMEPAGE wrt bug #478860.

Package-Manager: portage-2.2.0_alpha191

---
 kde-base/kopete/kopete-4.10.97.ebuild      | 1 +
 kde-base/kopete/kopete-4.11.49.9999.ebuild | 1 +
 kde-base/kopete/kopete-9999.ebuild         | 1 +
 3 files changed, 3 insertions(+)

diff --git a/kde-base/kopete/kopete-4.10.97.ebuild b/kde-base/kopete/kopete-4.10.97.ebuild
index e828f57..a6e58e1 100644
--- a/kde-base/kopete/kopete-4.10.97.ebuild
+++ b/kde-base/kopete/kopete-4.10.97.ebuild
@@ -8,6 +8,7 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE multi-protocol IM client"
+HOMEPAGE="http://www.kde.org/applications/internet/kopete"
 KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug ssl v4l"
 

diff --git a/kde-base/kopete/kopete-4.11.49.9999.ebuild b/kde-base/kopete/kopete-4.11.49.9999.ebuild
index 10a370a..fbf1c09 100644
--- a/kde-base/kopete/kopete-4.11.49.9999.ebuild
+++ b/kde-base/kopete/kopete-4.11.49.9999.ebuild
@@ -8,6 +8,7 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE multi-protocol IM client"
+HOMEPAGE="http://www.kde.org/applications/internet/kopete"
 KEYWORDS=""
 IUSE="debug ssl v4l"
 

diff --git a/kde-base/kopete/kopete-9999.ebuild b/kde-base/kopete/kopete-9999.ebuild
index 10a370a..fbf1c09 100644
--- a/kde-base/kopete/kopete-9999.ebuild
+++ b/kde-base/kopete/kopete-9999.ebuild
@@ -8,6 +8,7 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE multi-protocol IM client"
+HOMEPAGE="http://www.kde.org/applications/internet/kopete"
 KEYWORDS=""
 IUSE="debug ssl v4l"
 

[gentoo-commits] proj/kde:master commit in: kde-base/kopete/

[Johannes Huber]

commit:     e7a26b6244e8d477ca26e82f6e9bc2a47e2e1901
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 31 17:11:43 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jul 31 17:12:13 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=e7a26b62

[kde-base/kopete] Add alternative HOMEPAGE.

Package-Manager: portage-2.2.0_alpha191

---
 kde-base/kopete/kopete-4.10.97.ebuild      | 2 +-
 kde-base/kopete/kopete-4.11.49.9999.ebuild | 2 +-
 kde-base/kopete/kopete-9999.ebuild         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde-base/kopete/kopete-4.10.97.ebuild b/kde-base/kopete/kopete-4.10.97.ebuild
index a6e58e1..2250975 100644
--- a/kde-base/kopete/kopete-4.10.97.ebuild
+++ b/kde-base/kopete/kopete-4.10.97.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE multi-protocol IM client"
-HOMEPAGE="http://www.kde.org/applications/internet/kopete"
+HOMEPAGE="http://kopete.kde.org http://www.kde.org/applications/internet/kopete"
 KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="debug ssl v4l"
 

diff --git a/kde-base/kopete/kopete-4.11.49.9999.ebuild b/kde-base/kopete/kopete-4.11.49.9999.ebuild
index fbf1c09..eb96a6a 100644
--- a/kde-base/kopete/kopete-4.11.49.9999.ebuild
+++ b/kde-base/kopete/kopete-4.11.49.9999.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE multi-protocol IM client"
-HOMEPAGE="http://www.kde.org/applications/internet/kopete"
+HOMEPAGE="http://kopete.kde.org http://www.kde.org/applications/internet/kopete"
 KEYWORDS=""
 IUSE="debug ssl v4l"
 

diff --git a/kde-base/kopete/kopete-9999.ebuild b/kde-base/kopete/kopete-9999.ebuild
index fbf1c09..eb96a6a 100644
--- a/kde-base/kopete/kopete-9999.ebuild
+++ b/kde-base/kopete/kopete-9999.ebuild
@@ -8,7 +8,7 @@ KDE_HANDBOOK="optional"
 inherit kde4-base
 
 DESCRIPTION="KDE multi-protocol IM client"
-HOMEPAGE="http://www.kde.org/applications/internet/kopete"
+HOMEPAGE="http://kopete.kde.org http://www.kde.org/applications/internet/kopete"
 KEYWORDS=""
 IUSE="debug ssl v4l"
 

[gentoo-commits] proj/kde:master commit in: kde-base/kopete/

[Michael Palimaka]

commit:     f3e60e36410ca84921040c237e2ec65643d75d1d
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 17 18:08:39 2013 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Sep 17 18:08:39 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f3e60e36

[kde-base/kopete] Raise libotr dependency due to changes by upstream.

Package-Manager: portage-2.2.6

---
 kde-base/kopete/kopete-9999.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kde-base/kopete/kopete-9999.ebuild b/kde-base/kopete/kopete-9999.ebuild
index eb96a6a..49ebd30 100644
--- a/kde-base/kopete/kopete-9999.ebuild
+++ b/kde-base/kopete/kopete-9999.ebuild
@@ -78,7 +78,7 @@ COMMONDEPEND="
 	)
 	meanwhile? ( net-libs/meanwhile )
 	msn? ( >=net-libs/libmsn-4.1 )
-	otr? ( >=net-libs/libotr-3.2.0 <net-libs/libotr-4.0.0 )
+	otr? ( >=net-libs/libotr-4.0.0 )
 	statistics? ( dev-db/sqlite:3 )
 	v4l? ( media-libs/libv4l )
 	webpresence? (

[gentoo-commits] proj/kde:master commit in: kde-base/kopete/

[Johannes Huber]

commit:     c6a5374a907c252e137f1fb23c14091840f3456d
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 11 18:44:43 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Oct 11 18:44:43 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c6a5374a

[kde-base/kopete] Use subslot for net-libs/ortp bug #487518.

Package-Manager: portage-2.2.7

---
 kde-base/kopete/kopete-4.11.49.9999.ebuild | 2 +-
 kde-base/kopete/kopete-9999.ebuild         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-base/kopete/kopete-4.11.49.9999.ebuild b/kde-base/kopete/kopete-4.11.49.9999.ebuild
index eb96a6a..1e00276 100644
--- a/kde-base/kopete/kopete-4.11.49.9999.ebuild
+++ b/kde-base/kopete/kopete-4.11.49.9999.ebuild
@@ -74,7 +74,7 @@ COMMONDEPEND="
 	jingle? (
 		>=media-libs/mediastreamer-2.3.0
 		media-libs/speex
-		net-libs/ortp
+		net-libs/ortp:=
 	)
 	meanwhile? ( net-libs/meanwhile )
 	msn? ( >=net-libs/libmsn-4.1 )

diff --git a/kde-base/kopete/kopete-9999.ebuild b/kde-base/kopete/kopete-9999.ebuild
index 49ebd30..f241312 100644
--- a/kde-base/kopete/kopete-9999.ebuild
+++ b/kde-base/kopete/kopete-9999.ebuild
@@ -74,7 +74,7 @@ COMMONDEPEND="
 	jingle? (
 		>=media-libs/mediastreamer-2.3.0
 		media-libs/speex
-		net-libs/ortp
+		net-libs/ortp:=
 	)
 	meanwhile? ( net-libs/meanwhile )
 	msn? ( >=net-libs/libmsn-4.1 )

[gentoo-commits] proj/kde:master commit in: kde-base/kopete/

[Johannes Huber]

commit:     18c475ae4ec5fc30ffb5ab30c3231a0a1bc138e1
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  1 11:10:01 2014 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue Apr  1 11:10:42 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=18c475ae

[kde-base/kopete] Add missing use depend, bug #505744

Package-Manager: portage-2.2.10

---
 kde-base/kopete/kopete-4.12.4.ebuild       | 1 +
 kde-base/kopete/kopete-4.12.49.9999.ebuild | 1 +
 kde-base/kopete/kopete-4.12.97.ebuild      | 1 +
 kde-base/kopete/kopete-4.13.49.9999.ebuild | 1 +
 kde-base/kopete/kopete-9999.ebuild         | 1 +
 5 files changed, 5 insertions(+)

diff --git a/kde-base/kopete/kopete-4.12.4.ebuild b/kde-base/kopete/kopete-4.12.4.ebuild
index 5545cb6..1bf1253 100644
--- a/kde-base/kopete/kopete-4.12.4.ebuild
+++ b/kde-base/kopete/kopete-4.12.4.ebuild
@@ -65,6 +65,7 @@ IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
 COMMONDEPEND="
 	dev-libs/libpcre
+	$(add_kdebase_dep kdelibs 'zeroconf?')
 	$(add_kdebase_dep kdepimlibs)
 	media-libs/qimageblitz
 	>=dev-qt/qtgui-4.4.0:4[mng]

diff --git a/kde-base/kopete/kopete-4.12.49.9999.ebuild b/kde-base/kopete/kopete-4.12.49.9999.ebuild
index dc8d899..123c4c9 100644
--- a/kde-base/kopete/kopete-4.12.49.9999.ebuild
+++ b/kde-base/kopete/kopete-4.12.49.9999.ebuild
@@ -65,6 +65,7 @@ IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
 COMMONDEPEND="
 	dev-libs/libpcre
+	$(add_kdebase_dep kdelibs 'zeroconf?')
 	$(add_kdebase_dep kdepimlibs)
 	media-libs/qimageblitz
 	>=dev-qt/qtgui-4.4.0:4[mng]

diff --git a/kde-base/kopete/kopete-4.12.97.ebuild b/kde-base/kopete/kopete-4.12.97.ebuild
index 1f748f2..77841a5 100644
--- a/kde-base/kopete/kopete-4.12.97.ebuild
+++ b/kde-base/kopete/kopete-4.12.97.ebuild
@@ -65,6 +65,7 @@ IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
 COMMONDEPEND="
 	dev-libs/libpcre
+	$(add_kdebase_dep kdelibs 'zeroconf?')
 	$(add_kdebase_dep kdepimlibs)
 	media-libs/qimageblitz
 	>=dev-qt/qtgui-4.4.0:4[mng]

diff --git a/kde-base/kopete/kopete-4.13.49.9999.ebuild b/kde-base/kopete/kopete-4.13.49.9999.ebuild
index dc8d899..123c4c9 100644
--- a/kde-base/kopete/kopete-4.13.49.9999.ebuild
+++ b/kde-base/kopete/kopete-4.13.49.9999.ebuild
@@ -65,6 +65,7 @@ IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
 COMMONDEPEND="
 	dev-libs/libpcre
+	$(add_kdebase_dep kdelibs 'zeroconf?')
 	$(add_kdebase_dep kdepimlibs)
 	media-libs/qimageblitz
 	>=dev-qt/qtgui-4.4.0:4[mng]

diff --git a/kde-base/kopete/kopete-9999.ebuild b/kde-base/kopete/kopete-9999.ebuild
index dc8d899..123c4c9 100644
--- a/kde-base/kopete/kopete-9999.ebuild
+++ b/kde-base/kopete/kopete-9999.ebuild
@@ -65,6 +65,7 @@ IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
 
 COMMONDEPEND="
 	dev-libs/libpcre
+	$(add_kdebase_dep kdelibs 'zeroconf?')
 	$(add_kdebase_dep kdepimlibs)
 	media-libs/qimageblitz
 	>=dev-qt/qtgui-4.4.0:4[mng]

[gentoo-commits] proj/kde:master commit in: kde-base/kopete/

[Michael Palimaka]

commit:     3d7ec936dff0c072b75acec951a9ecfa464620cf
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  3 09:07:42 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Sep  3 09:07:42 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3d7ec936

[kde-base/kopete] Remove MSN support due to that service shutting down.

Package-Manager: portage-2.2.10

---
 kde-base/kopete/kopete-4.14.49.9999.ebuild | 12 +++++-------
 kde-base/kopete/metadata.xml               |  1 -
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/kde-base/kopete/kopete-4.14.49.9999.ebuild b/kde-base/kopete/kopete-4.14.49.9999.ebuild
index 7cc4815..5db281a 100644
--- a/kde-base/kopete/kopete-4.14.49.9999.ebuild
+++ b/kde-base/kopete/kopete-4.14.49.9999.ebuild
@@ -46,19 +46,19 @@ PLUGINS="+addbookmarks +autoreplace +contactnotes +highlight +history latex
 #	xmpp: net-dns/libidn app-crypt/qca:2 ENABLED BY DEFAULT NETWORK
 #	jingle: media-libs/speex net-libs/ortp DISABLED BY UPSTREAM
 #	meanwhile: net-libs/meanwhile
-#	msn: libmsn == this is wlm plugin, we disable msn one
 #	oscar: NO DEPS
 #   telepathy: net-libs/decibel
 #   testbed: NO DEPS
 #	winpopup: NO DEPS (we're adding samba as RDEPEND so it works)
 #	yahoo: media-libs/jasper
 #	zeroconf (bonjour): NO DEPS
-PROTOCOLS="gadu groupwise jingle meanwhile msn oscar skype
+PROTOCOLS="gadu groupwise jingle meanwhile oscar skype
 sms testbed winpopup +xmpp yahoo zeroconf"
 
 # disabled protocols
 #   telepathy: net-libs/decibel
 #   irc: NO DEPS
+#   msn: net-libs/libmsn
 #	qq: NO DEPS
 
 IUSE="${IUSE} ${PLUGINS} ${PROTOCOLS}"
@@ -78,7 +78,6 @@ COMMONDEPEND="
 		net-libs/ortp:=
 	)
 	meanwhile? ( net-libs/meanwhile )
-	msn? ( >=net-libs/libmsn-4.1 )
 	otr? ( >=net-libs/libotr-4.0.0 )
 	statistics? ( dev-db/sqlite:3 )
 	v4l? ( media-libs/libv4l )
@@ -122,7 +121,6 @@ src_configure() {
 	# enable protocols
 	for x in ${PROTOCOLS}; do
 		case ${x/+/} in
-			msn) x2=Libmsn ;;
 			zeroconf) x2=bonjour ;;
 			xmpp) x2=jabber ;;
 			*) x2='' ;;
@@ -130,7 +128,7 @@ src_configure() {
 		mycmakeargs+=($(cmake-utils_use_with ${x/+/} ${x2}))
 	done
 
-	mycmakeargs+=( -DWITH_qq=OFF )
+	mycmakeargs+=( -DWITH_Libmsn=OFF -DWITH_qq=OFF )
 
 	# enable plugins
 	for x in ${PLUGINS}; do
@@ -150,9 +148,9 @@ pkg_postinst() {
 	#fi
 
 	if ! use ssl; then
-		if use xmpp || use msn; then # || use irc; then
+		if use xmpp ; then # || use irc; then
 			if ! has_version app-crypt/qca-ossl ; then
-				elog "In order to use ssl in xmpp and msn you'll need to"
+				elog "In order to use ssl in xmpp you'll need to"
 				elog "install app-crypt/qca-ossl package."
 			fi
 		fi

diff --git a/kde-base/kopete/metadata.xml b/kde-base/kopete/metadata.xml
index 0821cde..8523a4e 100644
--- a/kde-base/kopete/metadata.xml
+++ b/kde-base/kopete/metadata.xml
@@ -25,7 +25,6 @@
 		<flag name="irc">Enable the IRC protocol handler.</flag>
 		-->
 		<flag name="meanwhile">Enable the Sametime protocol handler.</flag>
-		<flag name="msn">Enable "Windows live messenger" protocol support.</flag>
 		<flag name="skype">Enable Skype protocol handler (not fully functional yet).</flag>
 		<!-- uncomment this when enabled in ebuild
 		<flag name="telepathy">Enable support for the real-time communication framework telepathy.</flag>

[gentoo-commits] proj/kde:master commit in: kde-base/kopete/

[Michael Palimaka]

commit:     ac9667e45fd03c9847c22f3a78293ee0e10321af
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 13 17:46:56 2014 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Sep 13 17:46:56 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ac9667e4

[kde-base/kopete] Pin app-crypt/qca-ossl to SLOT 2.

Package-Manager: portage-2.2.10

---
 kde-base/kopete/kopete-4.14.1.ebuild       | 2 +-
 kde-base/kopete/kopete-4.14.49.9999.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/kde-base/kopete/kopete-4.14.1.ebuild b/kde-base/kopete/kopete-4.14.1.ebuild
index 215f735..b61225f 100644
--- a/kde-base/kopete/kopete-4.14.1.ebuild
+++ b/kde-base/kopete/kopete-4.14.1.ebuild
@@ -100,7 +100,7 @@ RDEPEND="${COMMONDEPEND}
 		virtual/latex-base
 	)
 	sms? ( app-mobilephone/smssend )
-	ssl? ( app-crypt/qca-ossl )
+	ssl? ( app-crypt/qca-ossl:2 )
 	winpopup? ( net-fs/samba )
 "
 #	telepathy? ( net-libs/decibel )"

diff --git a/kde-base/kopete/kopete-4.14.49.9999.ebuild b/kde-base/kopete/kopete-4.14.49.9999.ebuild
index 5db281a..e9b69f1 100644
--- a/kde-base/kopete/kopete-4.14.49.9999.ebuild
+++ b/kde-base/kopete/kopete-4.14.49.9999.ebuild
@@ -100,7 +100,7 @@ RDEPEND="${COMMONDEPEND}
 		virtual/latex-base
 	)
 	sms? ( app-mobilephone/smssend )
-	ssl? ( app-crypt/qca-ossl )
+	ssl? ( app-crypt/qca-ossl:2 )
 	winpopup? ( net-fs/samba )
 "
 #	telepathy? ( net-libs/decibel )"