| 1 |
commit: c9cee44806524bc43f4c7740b3653e7ecadf24ef |
| 2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 26 13:09:41 2017 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 26 13:09:57 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9cee448 |
| 7 |
|
| 8 |
net-im/qtox: fix build failure when dev-qt/qttest:5 is not present |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/628574 |
| 11 |
Package-Manager: Portage-2.3.8, Repoman-2.3.3 |
| 12 |
|
| 13 |
net-im/qtox/qtox-1.11.0.ebuild | 13 ++++++++++++- |
| 14 |
net-im/qtox/qtox-9999.ebuild | 13 ++++++++++++- |
| 15 |
2 files changed, 24 insertions(+), 2 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-im/qtox/qtox-1.11.0.ebuild b/net-im/qtox/qtox-1.11.0.ebuild |
| 18 |
index 2e8bb695264..8921fd9330e 100644 |
| 19 |
--- a/net-im/qtox/qtox-1.11.0.ebuild |
| 20 |
+++ b/net-im/qtox/qtox-1.11.0.ebuild |
| 21 |
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/qTox/qTox/releases/download/v${PV}/v${PV}.tar.lz -> |
| 22 |
LICENSE="GPL-3+" |
| 23 |
SLOT="0" |
| 24 |
KEYWORDS="~amd64 ~x86" |
| 25 |
-IUSE="gtk X" |
| 26 |
+IUSE="gtk test X" |
| 27 |
|
| 28 |
S="${WORKDIR}" |
| 29 |
|
| 30 |
@@ -45,8 +45,19 @@ DEPEND="${RDEPEND} |
| 31 |
$(unpacker_src_uri_depends) |
| 32 |
dev-qt/linguist-tools:5 |
| 33 |
virtual/pkgconfig |
| 34 |
+ test? ( dev-qt/qttest:5 ) |
| 35 |
" |
| 36 |
|
| 37 |
+src_prepare() { |
| 38 |
+ cmake-utils_src_prepare |
| 39 |
+ |
| 40 |
+ # bug 628574 |
| 41 |
+ if ! use test; then |
| 42 |
+ sed -i CMakeLists.txt -e "/include(Testing)/s/^/#/" || die |
| 43 |
+ sed -i cmake/Dependencies.cmake -e "/find_package(Qt5Test/s/^/#/" || die |
| 44 |
+ fi |
| 45 |
+} |
| 46 |
+ |
| 47 |
src_configure() { |
| 48 |
local mycmakeargs=( |
| 49 |
-DENABLE_STATUSNOTIFIER=$(usex gtk) |
| 50 |
|
| 51 |
diff --git a/net-im/qtox/qtox-9999.ebuild b/net-im/qtox/qtox-9999.ebuild |
| 52 |
index dd9f1a5c502..21c7d9d197c 100644 |
| 53 |
--- a/net-im/qtox/qtox-9999.ebuild |
| 54 |
+++ b/net-im/qtox/qtox-9999.ebuild |
| 55 |
@@ -13,7 +13,7 @@ EGIT_REPO_URI="https://github.com/qTox/qTox.git" |
| 56 |
LICENSE="GPL-3+" |
| 57 |
SLOT="0" |
| 58 |
KEYWORDS="" |
| 59 |
-IUSE="gtk X" |
| 60 |
+IUSE="gtk test X" |
| 61 |
|
| 62 |
RDEPEND=" |
| 63 |
dev-db/sqlcipher |
| 64 |
@@ -43,8 +43,19 @@ RDEPEND=" |
| 65 |
DEPEND="${RDEPEND} |
| 66 |
dev-qt/linguist-tools:5 |
| 67 |
virtual/pkgconfig |
| 68 |
+ test? ( dev-qt/qttest:5 ) |
| 69 |
" |
| 70 |
|
| 71 |
+src_prepare() { |
| 72 |
+ cmake-utils_src_prepare |
| 73 |
+ |
| 74 |
+ # bug 628574 |
| 75 |
+ if ! use test; then |
| 76 |
+ sed -i CMakeLists.txt -e "/include(Testing)/s/^/#/" || die |
| 77 |
+ sed -i cmake/Dependencies.cmake -e "/find_package(Qt5Test/s/^/#/" || die |
| 78 |
+ fi |
| 79 |
+} |
| 80 |
+ |
| 81 |
src_configure() { |
| 82 |
local mycmakeargs=( |
| 83 |
-DENABLE_STATUSNOTIFIER=$(usex gtk) |
Archives