From 5f984067d33911e6a47d768ce5571118864e2618 Mon Sep 17 00:00:00 2001 From: Sergey Popov Date: Tue, 13 Jun 2017 19:00:59 +0300 Subject: net-p2p/retroshare-0.6.9999: drop Qt4 support Suggested-by: Andreas Sturmlechner 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(-) (limited to 'net-p2p') diff --git a/net-p2p/retroshare/retroshare-0.6.9999.ebuild b/net-p2p/retroshare/retroshare-0.6.9999.ebuild index 56cb00f8a623..e5cfb2b92f65 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 } -- cgit v1.2.3-18-g5258