Gentoo Archives: gentoo-commits

From: "Andreas HAttel (dilfridge)" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in kde-base/baloo: ChangeLog metadata.xml baloo-4.13.0.ebuild
Date: Sun, 04 May 2014 01:17:09
Message-Id: 20140504011706.220872004C@flycatcher.gentoo.org
1 dilfridge 14/05/04 01:17:06
2
3 Modified: ChangeLog metadata.xml baloo-4.13.0.ebuild
4 Log:
5 Use alternate configuration module by default
6
7 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)
8
9 Revision Changes Path
10 1.6 kde-base/baloo/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/baloo/ChangeLog?rev=1.6&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/baloo/ChangeLog?rev=1.6&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/baloo/ChangeLog?r1=1.5&r2=1.6
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/kde-base/baloo/ChangeLog,v
19 retrieving revision 1.5
20 retrieving revision 1.6
21 diff -u -r1.5 -r1.6
22 --- ChangeLog 3 May 2014 14:17:11 -0000 1.5
23 +++ ChangeLog 4 May 2014 01:17:05 -0000 1.6
24 @@ -1,6 +1,10 @@
25 # ChangeLog for kde-base/baloo
26 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/kde-base/baloo/ChangeLog,v 1.5 2014/05/03 14:17:11 maekke Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/kde-base/baloo/ChangeLog,v 1.6 2014/05/04 01:17:05 dilfridge Exp $
29 +
30 + 04 May 2014; Andreas K. Huettel <dilfridge@g.o> baloo-4.13.0.ebuild,
31 + +files/baloo-4.13.0-nokcm.patch, metadata.xml:
32 + Use alternate configuration module by default
33
34 03 May 2014; Markus Meier <maekke@g.o> baloo-4.13.0.ebuild:
35 add ~arm, bug #507896
36
37
38
39 1.2 kde-base/baloo/metadata.xml
40
41 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/baloo/metadata.xml?rev=1.2&view=markup
42 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/baloo/metadata.xml?rev=1.2&content-type=text/plain
43 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/baloo/metadata.xml?r1=1.1&r2=1.2
44
45 Index: metadata.xml
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/kde-base/baloo/metadata.xml,v
48 retrieving revision 1.1
49 retrieving revision 1.2
50 diff -u -r1.1 -r1.2
51 --- metadata.xml 16 Apr 2014 18:26:24 -0000 1.1
52 +++ metadata.xml 4 May 2014 01:17:05 -0000 1.2
53 @@ -2,4 +2,7 @@
54 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
55 <pkgmetadata>
56 <herd>kde</herd>
57 + <use>
58 + <flag name="alternatekcm">Use the alternate Systemsettings module by Lindsay Mathieson for better configurability</flag>
59 + </use>
60 </pkgmetadata>
61
62
63
64 1.6 kde-base/baloo/baloo-4.13.0.ebuild
65
66 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/baloo/baloo-4.13.0.ebuild?rev=1.6&view=markup
67 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/baloo/baloo-4.13.0.ebuild?rev=1.6&content-type=text/plain
68 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/baloo/baloo-4.13.0.ebuild?r1=1.5&r2=1.6
69
70 Index: baloo-4.13.0.ebuild
71 ===================================================================
72 RCS file: /var/cvsroot/gentoo-x86/kde-base/baloo/baloo-4.13.0.ebuild,v
73 retrieving revision 1.5
74 retrieving revision 1.6
75 diff -u -r1.5 -r1.6
76 --- baloo-4.13.0.ebuild 3 May 2014 14:17:11 -0000 1.5
77 +++ baloo-4.13.0.ebuild 4 May 2014 01:17:05 -0000 1.6
78 @@ -1,6 +1,6 @@
79 # Copyright 1999-2014 Gentoo Foundation
80 # Distributed under the terms of the GNU General Public License v2
81 -# $Header: /var/cvsroot/gentoo-x86/kde-base/baloo/baloo-4.13.0.ebuild,v 1.5 2014/05/03 14:17:11 maekke Exp $
82 +# $Header: /var/cvsroot/gentoo-x86/kde-base/baloo/baloo-4.13.0.ebuild,v 1.6 2014/05/04 01:17:05 dilfridge Exp $
83
84 EAPI=5
85
86 @@ -8,7 +8,7 @@
87
88 DESCRIPTION="Next generation of the Nepomuk project"
89 KEYWORDS=" ~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
90 -IUSE="debug"
91 +IUSE="debug +alternatekcm"
92
93 DEPEND="
94 $(add_kdebase_dep kdepimlibs)
95 @@ -18,6 +18,14 @@
96 sys-apps/attr
97 !<kde-base/nepomuk-4.12.50
98 "
99 -RDEPEND="${DEPEND}"
100 +RDEPEND="
101 + ${DEPEND}
102 + alternatekcm? ( kde-misc/baloo-kcmadv )
103 +"
104
105 RESTRICT="test"
106 +
107 +src_prepare() {
108 + kde4-base_src_prepare
109 + use alternatekcm && epatch "${FILESDIR}/${P}-nokcm.patch"
110 +}