1 |
commit: dfd94b6797cbdc2b6bdfae1c74444b2ad03714a1 |
2 |
Author: Chris Reffett <creffett <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 1 20:22:25 2013 +0000 |
4 |
Commit: Chris Reffett <geekboy72 <AT> gmail <DOT> com> |
5 |
CommitDate: Tue Jan 1 20:22:25 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=dfd94b67 |
7 |
|
8 |
[kde-misc/publictransport] Add proper cmake configuration to handle macro_optional dependencies. |
9 |
|
10 |
Package-Manager: portage-2.2.0_alpha149 |
11 |
|
12 |
--- |
13 |
kde-misc/publictransport/metadata.xml | 4 ++++ |
14 |
.../publictransport-0.11_alpha2.ebuild | 10 ++++++---- |
15 |
2 files changed, 10 insertions(+), 4 deletions(-) |
16 |
|
17 |
diff --git a/kde-misc/publictransport/metadata.xml b/kde-misc/publictransport/metadata.xml |
18 |
index 721dd1c..255654c 100644 |
19 |
--- a/kde-misc/publictransport/metadata.xml |
20 |
+++ b/kde-misc/publictransport/metadata.xml |
21 |
@@ -2,5 +2,9 @@ |
22 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
23 |
<pkgmetadata> |
24 |
<herd>kde</herd> |
25 |
+ <use> |
26 |
+ <flag name="marble">Build marble support to show transit stops on a map</flag> |
27 |
+ <flag name="protobuf">Enable GTFS-realtime support</flag> |
28 |
+ </use> |
29 |
</pkgmetadata> |
30 |
|
31 |
|
32 |
diff --git a/kde-misc/publictransport/publictransport-0.11_alpha2.ebuild b/kde-misc/publictransport/publictransport-0.11_alpha2.ebuild |
33 |
index e101847..d1401d0 100644 |
34 |
--- a/kde-misc/publictransport/publictransport-0.11_alpha2.ebuild |
35 |
+++ b/kde-misc/publictransport/publictransport-0.11_alpha2.ebuild |
36 |
@@ -1,4 +1,4 @@ |
37 |
-# Copyright 1999-2012 Gentoo Foundation |
38 |
+# Copyright 1999-2013 Gentoo Foundation |
39 |
# Distributed under the terms of the GNU General Public License v2 |
40 |
# $Header: $ |
41 |
|
42 |
@@ -13,12 +13,12 @@ SRC_URI="http://dev.gentoo.org/~creffett/distfiles/${P}.tar.xz" |
43 |
LICENSE="GPL-2" |
44 |
SLOT="4" |
45 |
KEYWORDS="~amd64 ~x86" |
46 |
-IUSE="debug gps test" |
47 |
+IUSE="debug gps protobuf marble test" |
48 |
|
49 |
DEPEND=" |
50 |
- $(add_kdebase_dep marble) |
51 |
$(add_kdebase_dep plasma-workspace) |
52 |
- dev-libs/protobuf |
53 |
+ marble? ( $(add_kdebase_dep marble) ) |
54 |
+ protobuf? ( dev-libs/protobuf ) |
55 |
" |
56 |
RDEPEND="${DEPEND}" |
57 |
|
58 |
@@ -28,6 +28,8 @@ src_configure() { |
59 |
local mycmakeargs=( |
60 |
-DINSTALL_APPLET_FLIGHTS=ON -DINSTALL_APPLET_GRAPHICALTIMETABLE=ON |
61 |
$(cmake-utils_use gps INSTALL_ENGINE_OPENSTREETMAP) |
62 |
+ $(cmake-utils_use_with marble) |
63 |
+ $(cmake-utils_use_with protobuf ProtocolBuffers) |
64 |
$(cmake-utils_use test BUILD_TESTS) |
65 |
) |
66 |
kde4-base_src_configure |