net-im/qutim: fix USE=otr dependencies

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

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>

diff --git a/net-im/qutim/qutim-0.3.2.ebuild b/net-im/qutim/qutim-0.3.2.ebuild
index 44cbf173a5ab470439e1c222c1535108cb70ed56..0b181f6a00f31d73c3138ae84f8bb422ebf6aad8 100644 (file)
--- 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 855b5e09053b73e82d0bd60fb59851c048cf5255..e6b81d259acf2714c434c16c84877b71f4b0649f 100644 (file)
--- 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] ) )