1 |
kensington 14/02/06 17:07:56 |
2 |
|
3 |
Modified: ChangeLog kde4-meta.eclass |
4 |
Log: |
5 |
Disable more bogus dependency checks wrt bug #494680. |
6 |
|
7 |
Revision Changes Path |
8 |
1.1138 eclass/ChangeLog |
9 |
|
10 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1138&view=markup |
11 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1138&content-type=text/plain |
12 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1137&r2=1.1138 |
13 |
|
14 |
Index: ChangeLog |
15 |
=================================================================== |
16 |
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v |
17 |
retrieving revision 1.1137 |
18 |
retrieving revision 1.1138 |
19 |
diff -u -r1.1137 -r1.1138 |
20 |
--- ChangeLog 5 Feb 2014 06:18:29 -0000 1.1137 |
21 |
+++ ChangeLog 6 Feb 2014 17:07:56 -0000 1.1138 |
22 |
@@ -1,6 +1,9 @@ |
23 |
# ChangeLog for eclass directory |
24 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
25 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1137 2014/02/05 06:18:29 dirtyepic Exp $ |
26 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1138 2014/02/06 17:07:56 kensington Exp $ |
27 |
+ |
28 |
+ 06 Feb 2014; Michael Palimaka <kensington@g.o> kde4-meta.eclass: |
29 |
+ Disable more bogus dependency checks wrt bug #494680. |
30 |
|
31 |
05 Feb 2014; Ryan Hill <dirtyepic@g.o> tests/toolchain.sh, |
32 |
toolchain.eclass: |
33 |
|
34 |
|
35 |
|
36 |
1.75 eclass/kde4-meta.eclass |
37 |
|
38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.75&view=markup |
39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?rev=1.75&content-type=text/plain |
40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/kde4-meta.eclass?r1=1.74&r2=1.75 |
41 |
|
42 |
Index: kde4-meta.eclass |
43 |
=================================================================== |
44 |
RCS file: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v |
45 |
retrieving revision 1.74 |
46 |
retrieving revision 1.75 |
47 |
diff -u -r1.74 -r1.75 |
48 |
--- kde4-meta.eclass 21 Aug 2013 19:08:18 -0000 1.74 |
49 |
+++ kde4-meta.eclass 6 Feb 2014 17:07:56 -0000 1.75 |
50 |
@@ -1,6 +1,6 @@ |
51 |
-# Copyright 1999-2013 Gentoo Foundation |
52 |
+# Copyright 1999-2014 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
-# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.74 2013/08/21 19:08:18 kensington Exp $ |
55 |
+# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.75 2014/02/06 17:07:56 kensington Exp $ |
56 |
# |
57 |
# @ECLASS: kde4-meta.eclass |
58 |
# @MAINTAINER: |
59 |
@@ -517,7 +517,7 @@ |
60 |
;; |
61 |
kdepim) |
62 |
# Disable hardcoded checks |
63 |
- sed -r -e '/find_package\(KdepimLibs/s/REQUIRED//' \ |
64 |
+ sed -r -e 's/TYPE REQUIRED/TYPE OPTIONAL/' -e '/find_package\(KdepimLibs/s/REQUIRED//' \ |
65 |
-e '/find_package\((KdepimLibs|Boost|QGpgme|Akonadi|ZLIB|Strigi|SharedDesktopOntologies|Soprano|Nepomuk)/{/macro_optional_/!s/find/macro_optional_&/}' \ |
66 |
-e '/macro_log_feature\((Boost|QGPGME|Akonadi|ZLIB|STRIGI|SHAREDDESKTOPONTOLOGIES|Soprano|Nepomuk)_FOUND/s/ TRUE / FALSE /' \ |
67 |
-e 's/if[[:space:]]*([[:space:]]*BUILD_.*)[[:space:]]*/if(1) # &/' \ |