Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtdbus/
Date: Thu, 02 Mar 2017 09:52:34
Message-Id: 1488416759.c337a21c46bcf100bcec37876aff54d3663c2236.kensington@gentoo
1 commit: c337a21c46bcf100bcec37876aff54d3663c2236
2 Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 1 13:36:03 2017 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Thu Mar 2 01:05:59 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=c337a21c
7
8 dev-qt/qtdbus: Adjust the awful hack to make 'qtdbus' build.
9
10 For the live-builds, the files we want to remove will be under the
11 build directory, not the source directory. Without this change, the
12 files are not found.
13
14 Package-Manager: Portage-2.3.3, Repoman-2.3.1
15
16 dev-qt/qtdbus/qtdbus-5.8.9999.ebuild | 2 +-
17 dev-qt/qtdbus/qtdbus-5.9999.ebuild | 2 +-
18 2 files changed, 2 insertions(+), 2 deletions(-)
19
20 diff --git a/dev-qt/qtdbus/qtdbus-5.8.9999.ebuild b/dev-qt/qtdbus/qtdbus-5.8.9999.ebuild
21 index a740975e..d99d8d4e 100644
22 --- a/dev-qt/qtdbus/qtdbus-5.8.9999.ebuild
23 +++ b/dev-qt/qtdbus/qtdbus-5.8.9999.ebuild
24 @@ -53,7 +53,7 @@ src_compile() {
25 hack() {
26 emake
27 if [[ ${subdir} = "src/corelib" ]]; then
28 - rm "${S}"/lib/libQt5Core* || die
29 + rm "${QT5_BUILD_DIR}"/lib/libQt5Core* || die
30 fi
31 }
32 qt5_foreach_target_subdir hack
33
34 diff --git a/dev-qt/qtdbus/qtdbus-5.9999.ebuild b/dev-qt/qtdbus/qtdbus-5.9999.ebuild
35 index a740975e..d99d8d4e 100644
36 --- a/dev-qt/qtdbus/qtdbus-5.9999.ebuild
37 +++ b/dev-qt/qtdbus/qtdbus-5.9999.ebuild
38 @@ -53,7 +53,7 @@ src_compile() {
39 hack() {
40 emake
41 if [[ ${subdir} = "src/corelib" ]]; then
42 - rm "${S}"/lib/libQt5Core* || die
43 + rm "${QT5_BUILD_DIR}"/lib/libQt5Core* || die
44 fi
45 }
46 qt5_foreach_target_subdir hack