[gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/

[Sergey Popov]

commit:     5f984067d33911e6a47d768ce5571118864e2618
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 13 16:00:59 2017 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> 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 <asturm <AT> 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
 }