diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2014-02-06 17:07:56 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2014-02-06 17:07:56 +0000 |
| commit | a859650a6a2594e84f442f895b51ec579cd1c32a (patch) | |
| tree | 61a58932da1094984391438762f593225747fb7c /eclass | |
| parent | Initial import (diff) | |
| download | gentoo-2-a859650a6a2594e84f442f895b51ec579cd1c32a.tar.gz gentoo-2-a859650a6a2594e84f442f895b51ec579cd1c32a.tar.bz2 gentoo-2-a859650a6a2594e84f442f895b51ec579cd1c32a.zip | |
Disable more bogus dependency checks wrt bug #494680.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/kde4-meta.eclass | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 872bb320f7d9..c999f996bc84 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1137 2014/02/05 06:18:29 dirtyepic Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1138 2014/02/06 17:07:56 kensington Exp $ + + 06 Feb 2014; Michael Palimaka <kensington@gentoo.org> kde4-meta.eclass: + Disable more bogus dependency checks wrt bug #494680. 05 Feb 2014; Ryan Hill <dirtyepic@gentoo.org> tests/toolchain.sh, toolchain.eclass: diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index 2795ac82277b..f1c7564e5953 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -1,6 +1,6 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.74 2013/08/21 19:08:18 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/kde4-meta.eclass,v 1.75 2014/02/06 17:07:56 kensington Exp $ # # @ECLASS: kde4-meta.eclass # @MAINTAINER: @@ -517,7 +517,7 @@ kde4-meta_change_cmakelists() { ;; kdepim) # Disable hardcoded checks - sed -r -e '/find_package\(KdepimLibs/s/REQUIRED//' \ + sed -r -e 's/TYPE REQUIRED/TYPE OPTIONAL/' -e '/find_package\(KdepimLibs/s/REQUIRED//' \ -e '/find_package\((KdepimLibs|Boost|QGpgme|Akonadi|ZLIB|Strigi|SharedDesktopOntologies|Soprano|Nepomuk)/{/macro_optional_/!s/find/macro_optional_&/}' \ -e '/macro_log_feature\((Boost|QGPGME|Akonadi|ZLIB|STRIGI|SHAREDDESKTOPONTOLOGIES|Soprano|Nepomuk)_FOUND/s/ TRUE / FALSE /' \ -e 's/if[[:space:]]*([[:space:]]*BUILD_.*)[[:space:]]*/if(1) # &/' \ |