1 |
commit: c43f6cb62d492c4f9a7d0e04abdc9d5d007a48be |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Feb 13 20:25:41 2018 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Feb 13 20:25:55 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c43f6cb6 |
7 |
|
8 |
sys-libs/gwenhywfar: Do not run configuration in src_prepare() (bug #647478 again). |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
sys-libs/gwenhywfar/gwenhywfar-4.19.0.ebuild | 12 +++--------- |
13 |
1 file changed, 3 insertions(+), 9 deletions(-) |
14 |
|
15 |
diff --git a/sys-libs/gwenhywfar/gwenhywfar-4.19.0.ebuild b/sys-libs/gwenhywfar/gwenhywfar-4.19.0.ebuild |
16 |
index 4c916a73918..6883b65fbc3 100644 |
17 |
--- a/sys-libs/gwenhywfar/gwenhywfar-4.19.0.ebuild |
18 |
+++ b/sys-libs/gwenhywfar/gwenhywfar-4.19.0.ebuild |
19 |
@@ -4,7 +4,7 @@ |
20 |
EAPI=6 |
21 |
|
22 |
MY_P="${P/_beta/beta}" |
23 |
-inherit autotools qmake-utils |
24 |
+inherit qmake-utils |
25 |
|
26 |
DESCRIPTION="A multi-platform helper library for other libraries" |
27 |
HOMEPAGE="https://www.aquamaniac.de/aqbanking/" |
28 |
@@ -66,16 +66,14 @@ RESTRICT="test" |
29 |
|
30 |
S="${WORKDIR}/${MY_P}" |
31 |
|
32 |
-src_prepare() { |
33 |
+src_configure() { |
34 |
disableQtModule() { |
35 |
local module |
36 |
for module in ${@}; do |
37 |
- sed -e "/qtHaveModule(${module})/s/^/#DONT/" -i m4/ax_have_qt.m4 || die |
38 |
+ sed -e "/qtHaveModule(${module})/s|^|#DONT|" -i configure || die |
39 |
done |
40 |
} |
41 |
|
42 |
- default |
43 |
- |
44 |
use designer || disableQtModule designer uitools |
45 |
use qml || disableQtModule qml qmltest |
46 |
use sensors || disableQtModule sensors |
47 |
@@ -83,10 +81,6 @@ src_prepare() { |
48 |
use test || disableQtModule testlib |
49 |
use webkit || disableQtModule webkit webkitwidgets |
50 |
|
51 |
- eautoreconf |
52 |
-} |
53 |
- |
54 |
-src_configure() { |
55 |
local guis=() |
56 |
use fox && guis+=( fox16 ) |
57 |
use gtk && guis+=( gtk2 ) |