commit:     7a8eff91a4aa2be536aa975235f67cb8d764ff49
Author:     Sven Wegener <swegener <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  8 06:54:19 2017 +0000
Commit:     Sven Wegener <swegener <AT> gentoo <DOT> org>
CommitDate: Sat Jul  8 06:55:31 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a8eff91

sci-electronics/pulseview: Remove q4 support

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sci-electronics/pulseview/pulseview-0.4.0.ebuild | 20 ++++++--------------
 sci-electronics/pulseview/pulseview-9999.ebuild  | 20 ++++++--------------
 2 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/sci-electronics/pulseview/pulseview-0.4.0.ebuild 
b/sci-electronics/pulseview/pulseview-0.4.0.ebuild
index c408727be2a..e7a4a92ef4c 100644
--- a/sci-electronics/pulseview/pulseview-0.4.0.ebuild
+++ b/sci-electronics/pulseview/pulseview-0.4.0.ebuild
@@ -20,25 +20,18 @@ HOMEPAGE="http://sigrok.org/wiki/PulseView";
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="+decode qt4 qt5 static"
-REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} ) ^^ ( qt4 qt5 )"
+IUSE="+decode static"
+REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
        >=dev-libs/boost-1.55:=
        >=dev-libs/glib-2.28.0:2
        >=dev-cpp/glibmm-2.28.0:2
        >=sci-libs/libsigrok-0.5.0[cxx]
-       qt4? (
-               >=dev-qt/qtcore-4.5:4
-               >=dev-qt/qtgui-4.5:4
-               >=dev-qt/qtsvg-4.5:4
-       )
-       qt5? (
-               dev-qt/qtcore:5
-               dev-qt/qtgui:5
-               dev-qt/qtwidgets:5
-               dev-qt/qtsvg:5
-       )
+       dev-qt/qtcore:5
+       dev-qt/qtgui:5
+       dev-qt/qtwidgets:5
+       dev-qt/qtsvg:5
        decode? (
                >=sci-libs/libsigrokdecode-0.5.0[${PYTHON_USEDEP}]
                ${PYTHON_DEPS}
@@ -53,7 +46,6 @@ src_configure() {
                -DDISABLE_WERROR=TRUE
                -DENABLE_DECODE=$(usex decode)
                -DSTATIC_PKGDEPS_LIBS=$(usex static)
-               -DFORCE_QT4=$(usex qt4)
        )
        cmake-utils_src_configure
 }

diff --git a/sci-electronics/pulseview/pulseview-9999.ebuild 
b/sci-electronics/pulseview/pulseview-9999.ebuild
index c408727be2a..e7a4a92ef4c 100644
--- a/sci-electronics/pulseview/pulseview-9999.ebuild
+++ b/sci-electronics/pulseview/pulseview-9999.ebuild
@@ -20,25 +20,18 @@ HOMEPAGE="http://sigrok.org/wiki/PulseView";
 
 LICENSE="GPL-3"
 SLOT="0"
-IUSE="+decode qt4 qt5 static"
-REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} ) ^^ ( qt4 qt5 )"
+IUSE="+decode static"
+REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
        >=dev-libs/boost-1.55:=
        >=dev-libs/glib-2.28.0:2
        >=dev-cpp/glibmm-2.28.0:2
        >=sci-libs/libsigrok-0.5.0[cxx]
-       qt4? (
-               >=dev-qt/qtcore-4.5:4
-               >=dev-qt/qtgui-4.5:4
-               >=dev-qt/qtsvg-4.5:4
-       )
-       qt5? (
-               dev-qt/qtcore:5
-               dev-qt/qtgui:5
-               dev-qt/qtwidgets:5
-               dev-qt/qtsvg:5
-       )
+       dev-qt/qtcore:5
+       dev-qt/qtgui:5
+       dev-qt/qtwidgets:5
+       dev-qt/qtsvg:5
        decode? (
                >=sci-libs/libsigrokdecode-0.5.0[${PYTHON_USEDEP}]
                ${PYTHON_DEPS}
@@ -53,7 +46,6 @@ src_configure() {
                -DDISABLE_WERROR=TRUE
                -DENABLE_DECODE=$(usex decode)
                -DSTATIC_PKGDEPS_LIBS=$(usex static)
-               -DFORCE_QT4=$(usex qt4)
        )
        cmake-utils_src_configure
 }

Reply via email to