| 1 |
commit: 7a8eff91a4aa2be536aa975235f67cb8d764ff49 |
| 2 |
Author: Sven Wegener <swegener <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 8 06:54:19 2017 +0000 |
| 4 |
Commit: Sven Wegener <swegener <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 8 06:55:31 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a8eff91 |
| 7 |
|
| 8 |
sci-electronics/pulseview: Remove q4 support |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 11 |
|
| 12 |
sci-electronics/pulseview/pulseview-0.4.0.ebuild | 20 ++++++-------------- |
| 13 |
sci-electronics/pulseview/pulseview-9999.ebuild | 20 ++++++-------------- |
| 14 |
2 files changed, 12 insertions(+), 28 deletions(-) |
| 15 |
|
| 16 |
diff --git a/sci-electronics/pulseview/pulseview-0.4.0.ebuild b/sci-electronics/pulseview/pulseview-0.4.0.ebuild |
| 17 |
index c408727be2a..e7a4a92ef4c 100644 |
| 18 |
--- a/sci-electronics/pulseview/pulseview-0.4.0.ebuild |
| 19 |
+++ b/sci-electronics/pulseview/pulseview-0.4.0.ebuild |
| 20 |
@@ -20,25 +20,18 @@ HOMEPAGE="http://sigrok.org/wiki/PulseView" |
| 21 |
|
| 22 |
LICENSE="GPL-3" |
| 23 |
SLOT="0" |
| 24 |
-IUSE="+decode qt4 qt5 static" |
| 25 |
-REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} ) ^^ ( qt4 qt5 )" |
| 26 |
+IUSE="+decode static" |
| 27 |
+REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} )" |
| 28 |
|
| 29 |
RDEPEND=" |
| 30 |
>=dev-libs/boost-1.55:= |
| 31 |
>=dev-libs/glib-2.28.0:2 |
| 32 |
>=dev-cpp/glibmm-2.28.0:2 |
| 33 |
>=sci-libs/libsigrok-0.5.0[cxx] |
| 34 |
- qt4? ( |
| 35 |
- >=dev-qt/qtcore-4.5:4 |
| 36 |
- >=dev-qt/qtgui-4.5:4 |
| 37 |
- >=dev-qt/qtsvg-4.5:4 |
| 38 |
- ) |
| 39 |
- qt5? ( |
| 40 |
- dev-qt/qtcore:5 |
| 41 |
- dev-qt/qtgui:5 |
| 42 |
- dev-qt/qtwidgets:5 |
| 43 |
- dev-qt/qtsvg:5 |
| 44 |
- ) |
| 45 |
+ dev-qt/qtcore:5 |
| 46 |
+ dev-qt/qtgui:5 |
| 47 |
+ dev-qt/qtwidgets:5 |
| 48 |
+ dev-qt/qtsvg:5 |
| 49 |
decode? ( |
| 50 |
>=sci-libs/libsigrokdecode-0.5.0[${PYTHON_USEDEP}] |
| 51 |
${PYTHON_DEPS} |
| 52 |
@@ -53,7 +46,6 @@ src_configure() { |
| 53 |
-DDISABLE_WERROR=TRUE |
| 54 |
-DENABLE_DECODE=$(usex decode) |
| 55 |
-DSTATIC_PKGDEPS_LIBS=$(usex static) |
| 56 |
- -DFORCE_QT4=$(usex qt4) |
| 57 |
) |
| 58 |
cmake-utils_src_configure |
| 59 |
} |
| 60 |
|
| 61 |
diff --git a/sci-electronics/pulseview/pulseview-9999.ebuild b/sci-electronics/pulseview/pulseview-9999.ebuild |
| 62 |
index c408727be2a..e7a4a92ef4c 100644 |
| 63 |
--- a/sci-electronics/pulseview/pulseview-9999.ebuild |
| 64 |
+++ b/sci-electronics/pulseview/pulseview-9999.ebuild |
| 65 |
@@ -20,25 +20,18 @@ HOMEPAGE="http://sigrok.org/wiki/PulseView" |
| 66 |
|
| 67 |
LICENSE="GPL-3" |
| 68 |
SLOT="0" |
| 69 |
-IUSE="+decode qt4 qt5 static" |
| 70 |
-REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} ) ^^ ( qt4 qt5 )" |
| 71 |
+IUSE="+decode static" |
| 72 |
+REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} )" |
| 73 |
|
| 74 |
RDEPEND=" |
| 75 |
>=dev-libs/boost-1.55:= |
| 76 |
>=dev-libs/glib-2.28.0:2 |
| 77 |
>=dev-cpp/glibmm-2.28.0:2 |
| 78 |
>=sci-libs/libsigrok-0.5.0[cxx] |
| 79 |
- qt4? ( |
| 80 |
- >=dev-qt/qtcore-4.5:4 |
| 81 |
- >=dev-qt/qtgui-4.5:4 |
| 82 |
- >=dev-qt/qtsvg-4.5:4 |
| 83 |
- ) |
| 84 |
- qt5? ( |
| 85 |
- dev-qt/qtcore:5 |
| 86 |
- dev-qt/qtgui:5 |
| 87 |
- dev-qt/qtwidgets:5 |
| 88 |
- dev-qt/qtsvg:5 |
| 89 |
- ) |
| 90 |
+ dev-qt/qtcore:5 |
| 91 |
+ dev-qt/qtgui:5 |
| 92 |
+ dev-qt/qtwidgets:5 |
| 93 |
+ dev-qt/qtsvg:5 |
| 94 |
decode? ( |
| 95 |
>=sci-libs/libsigrokdecode-0.5.0[${PYTHON_USEDEP}] |
| 96 |
${PYTHON_DEPS} |
| 97 |
@@ -53,7 +46,6 @@ src_configure() { |
| 98 |
-DDISABLE_WERROR=TRUE |
| 99 |
-DENABLE_DECODE=$(usex decode) |
| 100 |
-DSTATIC_PKGDEPS_LIBS=$(usex static) |
| 101 |
- -DFORCE_QT4=$(usex qt4) |
| 102 |
) |
| 103 |
cmake-utils_src_configure |
| 104 |
} |
Archives