From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RHzVK-0007xN-7U for garchives@archives.gentoo.org; Sun, 23 Oct 2011 14:58:26 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7159A21C04F; Sun, 23 Oct 2011 14:58:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 437D021C04F for ; Sun, 23 Oct 2011 14:58:14 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B7F531B400C for ; Sun, 23 Oct 2011 14:58:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id DCC4780052 for ; Sun, 23 Oct 2011 14:58:12 +0000 (UTC) From: "Jonathan Callen" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jonathan Callen" Message-ID: Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/kde4-meta.eclass X-VCS-Directories: eclass/ X-VCS-Committer: abcd X-VCS-Committer-Name: Jonathan Callen X-VCS-Revision: be3181cab0459f5d1f74c6e1ad2d2dffa37736e1 Date: Sun, 23 Oct 2011 14:58:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 78924e2e61bef34f34f6034de74bc9ce commit: be3181cab0459f5d1f74c6e1ad2d2dffa37736e1 Author: Jonathan Callen gentoo org> AuthorDate: Sun Oct 23 05:00:32 2011 +0000 Commit: Jonathan Callen gentoo org> CommitDate: Sun Oct 23 05:00:32 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3Dbe3181ca [kde4-meta.eclass] Fix build for kdepim packages in 4.8+ --- eclass/kde4-meta.eclass | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eclass/kde4-meta.eclass b/eclass/kde4-meta.eclass index b1567c2..942c066 100644 --- a/eclass/kde4-meta.eclass +++ b/eclass/kde4-meta.eclass @@ -584,13 +584,13 @@ kde4-meta_change_cmakelists() { sed -r -e '/find_package\(KdepimLibs/s/REQUIRED//' \ -e '/find_package\((KdepimLibs|Boost|QGpgme|Akonadi|ZLIB|Strigi|Shar= edDesktopOntologies|Soprano|Nepomuk)/{/macro_optional_/!s/find/macro_opti= onal_&/}' \ -e '/macro_log_feature\((Boost|QGPGME|Akonadi|ZLIB|STRIGI|SHAREDDESK= TOPONTOLOGIES|Soprano|Nepomuk)_FOUND/s/ TRUE / FALSE /' \ - -e '/if[[:space:]]*([[:space:]]*BUILD_.*)/s/^/#OVERRIDE /' \ - -e '/if[[:space:]]*([[:space:]]*[[:alnum:]]*_FOUND[[:space:]]*)/s/^/= #OVERRIDE /' \ + -e 's/if[[:space:]]*([[:space:]]*BUILD_.*)[[:space:]]*/if(1) # &/' \ + -e 's/if[[:space:]]*([[:space:]]*[[:alnum:]]*_FOUND[[:space:]]*)[[:s= pace:]]*$/if(1) # &/' \ -i CMakeLists.txt || die "failed to disable hardcoded checks" # Disable broken or redundant build logic if ( has kontact ${IUSE//+} && use kontact ) || [[ ${PN} =3D kontact = ]]; then - sed -e '/if[[:space:]]*([[:space:]]*BUILD_.*)/s/^/#OVERRIDE /' \ - -e '/if[[:space:]]*([[:space:]]*[[:alnum:]]*_FOUND[[:space:]]*)/s/^= /#OVERRIDE /' \ + sed -e 's/if[[:space:]]*([[:space:]]*BUILD_.*)[[:space:]]*$/if(1) # = &/' \ + -e 's/if[[:space:]]*([[:space:]]*[[:alnum:]]*_FOUND[[:space:]]*)[[:= space:]]*$/if(1) # &/' \ -i kontact/plugins/CMakeLists.txt || die 'failed to override build = logic' fi if [[ $(get_kde_version) < 4.5 ]]; then