1 |
ingmar 08/02/18 16:28:23 |
2 |
|
3 |
Modified: marble-4.0.1.ebuild ChangeLog |
4 |
Log: |
5 |
Addded a kde USE-flag to compile without KDE. |
6 |
(Portage version: 2.1.4.4) |
7 |
|
8 |
Revision Changes Path |
9 |
1.2 kde-base/marble/marble-4.0.1.ebuild |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/marble/marble-4.0.1.ebuild?rev=1.2&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/marble/marble-4.0.1.ebuild?rev=1.2&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/marble/marble-4.0.1.ebuild?r1=1.1&r2=1.2 |
14 |
|
15 |
Index: marble-4.0.1.ebuild |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.0.1.ebuild,v |
18 |
retrieving revision 1.1 |
19 |
retrieving revision 1.2 |
20 |
diff -u -r1.1 -r1.2 |
21 |
--- marble-4.0.1.ebuild 7 Feb 2008 00:10:58 -0000 1.1 |
22 |
+++ marble-4.0.1.ebuild 18 Feb 2008 16:28:22 -0000 1.2 |
23 |
@@ -1,10 +1,11 @@ |
24 |
# Copyright 1999-2008 Gentoo Foundation |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.0.1.ebuild,v 1.1 2008/02/07 00:10:58 philantrop Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/marble-4.0.1.ebuild,v 1.2 2008/02/18 16:28:22 ingmar Exp $ |
28 |
|
29 |
EAPI="1" |
30 |
- |
31 |
+NEED_KDE="none" |
32 |
KMNAME=kdeedu |
33 |
+SLOT="kde-4" # Goes in the ebuild because of NEED_KDE=none |
34 |
inherit kde4-meta |
35 |
|
36 |
DESCRIPTION="KDE: generic geographical map widget" |
37 |
@@ -13,11 +14,13 @@ |
38 |
|
39 |
# FIXME: undefined reference when building tests. RESTRICTed for now. |
40 |
RESTRICT="test" |
41 |
-# FIXME: marble can install without kdelibs. there should be USE=kde for this.. |
42 |
|
43 |
-COMMONDEPEND="gps? ( sci-geosciences/gpsd )" |
44 |
-DEPEND="${DEPEND} ${COMMONDEPEND}" |
45 |
-RDEPEND="${RDEPEND} ${COMMONDEPEND}" |
46 |
+COMMONDEPEND=" |
47 |
+ gps? ( sci-geosciences/gpsd ) |
48 |
+ kde? ( >=kde-base/kdelibs-${PV}:${SLOT} |
49 |
+ >=kde-base/kdepimlibs-${PV}:${SLOT} )" |
50 |
+DEPEND="${COMMONDEPEND}" |
51 |
+RDEPEND="${COMMONDEPEND}" |
52 |
|
53 |
src_compile() { |
54 |
epatch "${FILESDIR}/${PN}-4.0.0-fix-tests.patch" |
55 |
@@ -32,6 +35,10 @@ |
56 |
marble/Findlibgps.cmake || die "sed to disable gpsd failed." |
57 |
fi |
58 |
|
59 |
+ if ! use kde; then |
60 |
+ mycmakeargs="${mycmakeargs} -DQTONLY:BOOL=ON" |
61 |
+ fi |
62 |
+ |
63 |
kde4-meta_src_compile |
64 |
} |
65 |
|
66 |
|
67 |
|
68 |
|
69 |
1.5 kde-base/marble/ChangeLog |
70 |
|
71 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/marble/ChangeLog?rev=1.5&view=markup |
72 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/marble/ChangeLog?rev=1.5&content-type=text/plain |
73 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/marble/ChangeLog?r1=1.4&r2=1.5 |
74 |
|
75 |
Index: ChangeLog |
76 |
=================================================================== |
77 |
RCS file: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v |
78 |
retrieving revision 1.4 |
79 |
retrieving revision 1.5 |
80 |
diff -u -r1.4 -r1.5 |
81 |
--- ChangeLog 17 Feb 2008 02:33:09 -0000 1.4 |
82 |
+++ ChangeLog 18 Feb 2008 16:28:22 -0000 1.5 |
83 |
@@ -1,6 +1,9 @@ |
84 |
# ChangeLog for kde-base/marble |
85 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
86 |
-# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.4 2008/02/17 02:33:09 ingmar Exp $ |
87 |
+# $Header: /var/cvsroot/gentoo-x86/kde-base/marble/ChangeLog,v 1.5 2008/02/18 16:28:22 ingmar Exp $ |
88 |
+ |
89 |
+ 18 Feb 2008; Ingmar Vanhassel <ingmar@g.o> marble-4.0.1.ebuild: |
90 |
+ Addded a kde USE-flag to compile without KDE. |
91 |
|
92 |
16 Feb 2008; Ingmar Vanhassel <ingmar@g.o> -marble-4.0.0.ebuild: |
93 |
Spring cleaning |
94 |
|
95 |
|
96 |
|
97 |
-- |
98 |
gentoo-commits@l.g.o mailing list |