From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B2E13138206 for ; Mon, 25 Apr 2016 08:00:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 45B1DE0845; Mon, 25 Apr 2016 08:00:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 938A1E0848 for ; Mon, 25 Apr 2016 08:00:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 495DD340B1D for ; Mon, 25 Apr 2016 07:59:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1795C256 for ; Mon, 25 Apr 2016 07:59:56 +0000 (UTC) From: "Patrice Clement" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrice Clement" Message-ID: <1461570326.44f3a9dd5c3d6529b5b169e4cd3881f76bef1dca.monsieurp@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/qutim/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/qutim/qutim-0.3.2.ebuild net-im/qutim/qutim-0.3.3_p1.ebuild X-VCS-Directories: net-im/qutim/ X-VCS-Committer: monsieurp X-VCS-Committer-Name: Patrice Clement X-VCS-Revision: 44f3a9dd5c3d6529b5b169e4cd3881f76bef1dca X-VCS-Branch: master Date: Mon, 25 Apr 2016 07:59:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: ab7a481a-96d7-4c1f-848f-87644703c1ee X-Archives-Hash: 6ee95ce5da473fe12840955ef08d1cdf commit: 44f3a9dd5c3d6529b5b169e4cd3881f76bef1dca Author: Alexander Golubev gmail com> AuthorDate: Mon Apr 25 07:08:15 2016 +0000 Commit: Patrice Clement gentoo org> CommitDate: Mon Apr 25 07:45:26 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44f3a9dd net-im/qutim: fix USE=otr dependencies Closes: https://github.com/gentoo/gentoo/pull/1342 Signed-off-by: Patrice Clement 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(-) diff --git a/net-im/qutim/qutim-0.3.2.ebuild b/net-im/qutim/qutim-0.3.2.ebuild index 44cbf17..0b181f6 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 - =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 +# =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] ) )