From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id F00C1138B38 for ; Wed, 5 Feb 2014 14:07:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 62B3EE0BF2; Wed, 5 Feb 2014 14:07:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 02A0AE0BF2 for ; Wed, 5 Feb 2014 14:07:31 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2507933F92B for ; Wed, 5 Feb 2014 14:07:31 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 1285E18278 for ; Wed, 5 Feb 2014 14:07:27 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1391608577.396842cb7a8d6ae8c046a28e1f819005db6e8284.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: eclass/ X-VCS-Repository: proj/kde X-VCS-Files: eclass/cmake-utils.eclass X-VCS-Directories: eclass/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 396842cb7a8d6ae8c046a28e1f819005db6e8284 X-VCS-Branch: master Date: Wed, 5 Feb 2014 14:07:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 01311fcf-e3e8-4723-88ff-4625b5c95b19 X-Archives-Hash: 6cdaf6dcfc480dd03017331c972ef4c8 commit: 396842cb7a8d6ae8c046a28e1f819005db6e8284 Author: Michael Palimaka gentoo org> AuthorDate: Wed Feb 5 13:55:58 2014 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Wed Feb 5 13:56:17 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=396842cb [eclass] Tidy src_prepare. --- eclass/cmake-utils.eclass | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/eclass/cmake-utils.eclass b/eclass/cmake-utils.eclass index 0a62e9b..e74ce50 100644 --- a/eclass/cmake-utils.eclass +++ b/eclass/cmake-utils.eclass @@ -372,16 +372,15 @@ _modify-cmakelists() { enable_cmake-utils_src_prepare() { debug-print-function ${FUNCNAME} "$@" - debug-print "$FUNCNAME: PATCHES=$PATCHES" + pushd "${S}" > /dev/null - pushd "${S}" > /dev/null - [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" + debug-print "$FUNCNAME: PATCHES=$PATCHES" + [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" debug-print "$FUNCNAME: applying user patches" - epatch_user - - popd > /dev/null + epatch_user + popd > /dev/null } # @VARIABLE: mycmakeargs