Gentoo Archives: gentoo-commits

From: Michael Palimaka <kensington@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: x11-themes/bespin/
Date: Tue, 25 Feb 2014 17:40:26
Message-Id: 1393350000.b88d40e5de761b2114e52056bb992aa2f6e4ff25.kensington@gentoo
1 commit: b88d40e5de761b2114e52056bb992aa2f6e4ff25
2 Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 25 17:40:00 2014 +0000
4 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 25 17:40:00 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b88d40e5
7
8 [x11-themes/bespin] Fix build with USE="-kde" wrt bug #484204.
9
10 Package-Manager: portage-2.2.7
11
12 ---
13 x11-themes/bespin/bespin-9999.ebuild | 38 +++++++++++++++++++++++++++---------
14 1 file changed, 29 insertions(+), 9 deletions(-)
15
16 diff --git a/x11-themes/bespin/bespin-9999.ebuild b/x11-themes/bespin/bespin-9999.ebuild
17 index 845139a..3910735 100644
18 --- a/x11-themes/bespin/bespin-9999.ebuild
19 +++ b/x11-themes/bespin/bespin-9999.ebuild
20 @@ -6,7 +6,7 @@ EAPI=5
21 KDE_REQUIRED="optional"
22 KDE_SCM="svn"
23
24 -inherit kde4-base
25 +inherit kde4-base qmake-utils
26
27 if [[ $PV != *9999 ]]; then
28 REV="1669"
29 @@ -38,12 +38,32 @@ DEPEND="
30 "
31
32 src_configure() {
33 - mycmakeargs=(
34 - $(cmake-utils_use_enable kde KDE)
35 - $(cmake-utils_use_enable windeco KWIN)
36 - $(cmake-utils_use_enable plasma XBAR)
37 - -DENABLE_ARGB=ON
38 - )
39 -
40 - kde4-base_src_configure
41 + if use kde ; then
42 + local mycmakeargs=(
43 + $(cmake-utils_use_enable kde KDE)
44 + $(cmake-utils_use_enable windeco KWIN)
45 + $(cmake-utils_use_enable plasma XBAR)
46 + -DENABLE_ARGB=ON
47 + )
48 +
49 + kde4-base_src_configure
50 + else
51 + eqmake4
52 + fi
53 +}
54 +
55 +src_compile() {
56 + if use kde ; then
57 + kde4-base_src_compile
58 + else
59 + default
60 + fi
61 +}
62 +
63 +src_install() {
64 + if use kde ; then
65 + kde4-base_src_install
66 + else
67 + emake INSTALL_ROOT="${D}" install
68 + fi
69 }