| 1 |
commit: 691a95a7ccbfd2f95346f9e16ec0cd12080dc2d6 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 26 10:30:01 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 26 10:30:01 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=691a95a7 |
| 7 |
|
| 8 |
Revert "dev-util/qbs: [QA] Put 'test?' USE conditional in DEPEND" |
| 9 |
|
| 10 |
This reverts commit 694438813f1588b11244fb6f9bb95641c78d4453. |
| 11 |
|
| 12 |
dev-util/qbs/qbs-1.4.5.ebuild | 8 +++----- |
| 13 |
dev-util/qbs/qbs-1.7.0.ebuild | 8 +++----- |
| 14 |
dev-util/qbs/qbs-1.8.0.ebuild | 6 ++---- |
| 15 |
3 files changed, 8 insertions(+), 14 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-util/qbs/qbs-1.4.5.ebuild b/dev-util/qbs/qbs-1.4.5.ebuild |
| 18 |
index f852245f8e5..48554c80581 100644 |
| 19 |
--- a/dev-util/qbs/qbs-1.4.5.ebuild |
| 20 |
+++ b/dev-util/qbs/qbs-1.4.5.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2017 Gentoo Foundation |
| 23 |
+# Copyright 1999-2016 Gentoo Foundation |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI=6 |
| 27 |
@@ -23,16 +23,14 @@ RDEPEND=" |
| 28 |
dev-qt/qtscript:5 |
| 29 |
dev-qt/qtwidgets:5 |
| 30 |
dev-qt/qtxml:5 |
| 31 |
+ test? ( dev-qt/qttest:5 ) |
| 32 |
" |
| 33 |
DEPEND="${RDEPEND} |
| 34 |
doc? ( |
| 35 |
dev-qt/qdoc:5 |
| 36 |
dev-qt/qthelp:5 |
| 37 |
) |
| 38 |
- test? ( |
| 39 |
- dev-qt/qtdeclarative:5 |
| 40 |
- dev-qt/qttest:5 |
| 41 |
- ) |
| 42 |
+ test? ( dev-qt/qtdeclarative:5 ) |
| 43 |
" |
| 44 |
|
| 45 |
S=${WORKDIR}/${MY_P} |
| 46 |
|
| 47 |
diff --git a/dev-util/qbs/qbs-1.7.0.ebuild b/dev-util/qbs/qbs-1.7.0.ebuild |
| 48 |
index 2213f1d68f9..5f4b6e25c99 100644 |
| 49 |
--- a/dev-util/qbs/qbs-1.7.0.ebuild |
| 50 |
+++ b/dev-util/qbs/qbs-1.7.0.ebuild |
| 51 |
@@ -1,4 +1,4 @@ |
| 52 |
-# Copyright 1999-2017 Gentoo Foundation |
| 53 |
+# Copyright 1999-2016 Gentoo Foundation |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
|
| 56 |
EAPI=6 |
| 57 |
@@ -24,16 +24,14 @@ RDEPEND=" |
| 58 |
dev-qt/qtscript:5 |
| 59 |
dev-qt/qtwidgets:5 |
| 60 |
dev-qt/qtxml:5 |
| 61 |
+ test? ( dev-qt/qttest:5 ) |
| 62 |
" |
| 63 |
DEPEND="${RDEPEND} |
| 64 |
doc? ( |
| 65 |
dev-qt/qdoc:5 |
| 66 |
dev-qt/qthelp:5 |
| 67 |
) |
| 68 |
- test? ( |
| 69 |
- dev-qt/qtdeclarative:5 |
| 70 |
- dev-qt/qttest:5 |
| 71 |
- ) |
| 72 |
+ test? ( dev-qt/qtdeclarative:5 ) |
| 73 |
" |
| 74 |
|
| 75 |
S=${WORKDIR}/${MY_P} |
| 76 |
|
| 77 |
diff --git a/dev-util/qbs/qbs-1.8.0.ebuild b/dev-util/qbs/qbs-1.8.0.ebuild |
| 78 |
index ea9c1209572..34a26df32fd 100644 |
| 79 |
--- a/dev-util/qbs/qbs-1.8.0.ebuild |
| 80 |
+++ b/dev-util/qbs/qbs-1.8.0.ebuild |
| 81 |
@@ -22,16 +22,14 @@ RDEPEND=" |
| 82 |
dev-qt/qtscript:5 |
| 83 |
dev-qt/qtwidgets:5 |
| 84 |
dev-qt/qtxml:5 |
| 85 |
+ test? ( dev-qt/qttest:5 ) |
| 86 |
" |
| 87 |
DEPEND="${RDEPEND} |
| 88 |
doc? ( |
| 89 |
dev-qt/qdoc:5 |
| 90 |
dev-qt/qthelp:5 |
| 91 |
) |
| 92 |
- test? ( |
| 93 |
- dev-qt/qtdeclarative:5 |
| 94 |
- dev-qt/qttest:5 |
| 95 |
- ) |
| 96 |
+ test? ( dev-qt/qtdeclarative:5 ) |
| 97 |
" |
| 98 |
|
| 99 |
src_prepare() { |
Archives