From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4C95A139695 for ; Tue, 13 Jun 2017 16:09:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 995B3E0C9A; Tue, 13 Jun 2017 16:09:29 +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 74F6AE0C9A for ; Tue, 13 Jun 2017 16:09:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 64E96341843 for ; Tue, 13 Jun 2017 16:09:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EFD4D746A for ; Tue, 13 Jun 2017 16:09:25 +0000 (UTC) From: "Sergey Popov" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sergey Popov" Message-ID: <1497369797.5f984067d33911e6a47d768ce5571118864e2618.pinkbyte@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-p2p/retroshare/retroshare-0.6.9999.ebuild X-VCS-Directories: net-p2p/retroshare/ X-VCS-Committer: pinkbyte X-VCS-Committer-Name: Sergey Popov X-VCS-Revision: 5f984067d33911e6a47d768ce5571118864e2618 X-VCS-Branch: master Date: Tue, 13 Jun 2017 16:09:25 +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: 3369ea9f-6d7b-4f6b-b41e-e4f44d57df1d X-Archives-Hash: c8ed22368e76f2ab734a9ee054d229e0 commit: 5f984067d33911e6a47d768ce5571118864e2618 Author: Sergey Popov gentoo org> AuthorDate: Tue Jun 13 16:00:59 2017 +0000 Commit: Sergey Popov gentoo org> CommitDate: Tue Jun 13 16:03:17 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f984067 net-p2p/retroshare-0.6.9999: drop Qt4 support Suggested-by: Andreas Sturmlechner gentoo.org> Gentoo-Bug: 621502 Package-Manager: Portage-2.3.6, Repoman-2.3.1 net-p2p/retroshare/retroshare-0.6.9999.ebuild | 52 +++++++++------------------ 1 file changed, 16 insertions(+), 36 deletions(-) diff --git a/net-p2p/retroshare/retroshare-0.6.9999.ebuild b/net-p2p/retroshare/retroshare-0.6.9999.ebuild index 56cb00f8a62..e5cfb2b92f6 100644 --- a/net-p2p/retroshare/retroshare-0.6.9999.ebuild +++ b/net-p2p/retroshare/retroshare-0.6.9999.ebuild @@ -14,11 +14,9 @@ LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1" SLOT="0" KEYWORDS="" -IUSE="cli feedreader +gui qt4 +qt5 voip" +IUSE="cli feedreader +gui voip" REQUIRED_USE=" || ( cli gui ) - gui? ( ^^ ( qt4 qt5 ) ) - cli? ( ^^ ( qt4 qt5 ) ) feedreader? ( gui ) voip? ( gui )" @@ -26,6 +24,12 @@ RDEPEND=" app-arch/bzip2 dev-db/sqlcipher dev-libs/openssl:0 + dev-qt/qtcore:5 + dev-qt/qtmultimedia:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtscript:5 + dev-qt/qtxml:5 gnome-base/libgnome-keyring net-libs/libmicrohttpd net-libs/libupnp:0 @@ -35,39 +39,16 @@ RDEPEND=" dev-libs/libxslt net-misc/curl ) - qt4? ( - gui? ( - dev-qt/designer:4 - dev-qt/qtgui:4 - x11-libs/libX11 - x11-libs/libXScrnSaver - ) - dev-qt/qtcore:4 - ) - qt5? ( - gui? ( - dev-qt/designer:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - x11-libs/libX11 - x11-libs/libXScrnSaver - ) - dev-qt/qtcore:5 - dev-qt/qtmultimedia:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtscript:5 - dev-qt/qtxml:5 + gui? ( + dev-qt/designer:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + x11-libs/libX11 + x11-libs/libXScrnSaver ) voip? ( - qt5? ( - media-libs/opencv[-qt4(-)] - ) - qt4? ( - media-libs/opencv - dev-qt/qt-mobility[multimedia] - ) + media-libs/opencv[-qt4(-)] media-libs/speex virtual/ffmpeg[encode] )" @@ -103,8 +84,7 @@ src_prepare() { src_configure() { for dir in ${rs_src_dirs} ; do pushd "${S}/${dir}" >/dev/null || die - use qt4 && eqmake4 - use qt5 && eqmake5 + eqmake5 popd >/dev/null || die done }