From 44f3a9dd5c3d6529b5b169e4cd3881f76bef1dca Mon Sep 17 00:00:00 2001
From: Alexander Golubev <fatzer2@gmail.com>
Date: Mon, 25 Apr 2016 10:08:15 +0300
Subject: net-im/qutim: fix USE=otr dependencies

Closes: https://github.com/gentoo/gentoo/pull/1342

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
---
 net-im/qutim/qutim-0.3.2.ebuild    | 16 +++++++++-------
 net-im/qutim/qutim-0.3.3_p1.ebuild |  7 ++-----
 2 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'net-im')

diff --git a/net-im/qutim/qutim-0.3.2.ebuild b/net-im/qutim/qutim-0.3.2.ebuild
index 44cbf173a5ab..0b181f6a00f3 100644
--- a/net-im/qutim/qutim-0.3.2.ebuild
+++ b/net-im/qutim/qutim-0.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -22,7 +22,8 @@ IUSE="doc +sound tools"
 IUSE="$IUSE telepathy irc xmpp jingle mrim oscar purple vkontakte"
 # plugins
 IUSE="$IUSE antiboss aspell ayatana awn crypt dbus debug -espionage histman hunspell
-	kde mobility otr plugman phonon purple qml sdl +ssl +xscreensaver webkit"
+	kde mobility plugman phonon purple qml sdl +ssl +xscreensaver webkit"
+# NOTE: otr support was removed due to remove of net-libs/libotr-3.x
 
 REQUIRED_USE="
 	oscar? ( ssl )
@@ -63,10 +64,6 @@ CDEPEND="
 		dev-qt/qt-mobility[multimedia,feedback]
 		>=dev-qt/qtbearer-${QT_PV}
 	)
-	otr? (
-		>=net-libs/libotr-3.2.0
-		<net-libs/libotr-4.0.0
-	)
 	phonon? (
 		kde? ( media-libs/phonon[qt4] )
 		!kde? ( || ( >=dev-qt/qtphonon-${QT_PV} media-libs/phonon[qt4] ) )
@@ -82,6 +79,11 @@ CDEPEND="
 	xscreensaver? ( x11-libs/libXScrnSaver )
 	webkit? ( >=dev-qt/qtwebkit-${QT_PV} )
 "
+#	otr? (
+#		>=net-libs/libotr-3.2.0
+#		<net-libs/libotr-4.0.0
+#	)
+
 DEPEND="${CDEPEND}
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )
@@ -157,7 +159,7 @@ src_configure() {
 		$(cmake-utils_use  debug       LOGGER            )
 		$(cmake-utils_use  mobility    MOBILITY          )
 		$(cmake-utils_use  dbus        NOWPLAYING        )
-		$(cmake-utils_use  otr         OFFTHERECORD      )
+		# $(cmake-utils_use  otr         OFFTHERECORD      )
 		$(cmake-utils_use  qml         QMLCHAT           )
 		$(cmake-utils_use  sdl         SDLSOUND          )
 		$(cmake-utils_use_enable espionage               )
diff --git a/net-im/qutim/qutim-0.3.3_p1.ebuild b/net-im/qutim/qutim-0.3.3_p1.ebuild
index 855b5e09053b..e6b81d259acf 100644
--- a/net-im/qutim/qutim-0.3.3_p1.ebuild
+++ b/net-im/qutim/qutim-0.3.3_p1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -64,10 +64,7 @@ CDEPEND="
 		dev-qt/qt-mobility[multimedia,feedback]
 		>=dev-qt/qtbearer-${QT_PV}
 	)
-	otr? (
-		>=net-libs/libotr-3.2.0
-		<net-libs/libotr-4.0.0
-	)
+	otr? ( >=net-libs/libotr-4.0.0 )
 	phonon? (
 		kde? ( media-libs/phonon[qt4] )
 		!kde? ( || ( >=dev-qt/qtphonon-${QT_PV} media-libs/phonon[qt4] ) )
-- 
cgit v1.2.3-65-gdbad