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 1Qv2BB-0004JF-8U for garchives@archives.gentoo.org; Sun, 21 Aug 2011 07:10:45 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 37F11E0823; Sun, 21 Aug 2011 07:10:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 088C8E0823 for ; Sun, 21 Aug 2011 07:10:27 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6A6B61B4050 for ; Sun, 21 Aug 2011 07:10:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 9FBFC80043 for ; Sun, 21 Aug 2011 07:10:26 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <4796989ee09cce6627c53a3dcff657974625d88e.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:gnome-next commit in: eclass/ X-VCS-Repository: proj/gnome X-VCS-Files: eclass/gnome2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 4796989ee09cce6627c53a3dcff657974625d88e Date: Sun, 21 Aug 2011 07:10:26 +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: 84ecc18f38c80bdbe173925d540004e4 commit: 4796989ee09cce6627c53a3dcff657974625d88e Author: Alexandre Rostovtsev gmail com> AuthorDate: Sun Aug 21 06:51:58 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Sun Aug 21 07:05:27 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D4796989e eclass/gnome2.eclass: sync with gx86 Add the following change from gx86: Revision 1.99 Sun Aug 14 03:46:33 2011 UTC by nirbheek For ebuilds with USE=3Dstatic-libs, remove .la files conditionally for GNOME2_LA_PUNT --- eclass/gnome2.eclass | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass index c655269..49a0556 100644 --- a/eclass/gnome2.eclass +++ b/eclass/gnome2.eclass @@ -196,7 +196,9 @@ gnome2_src_install() { # Delete all .la files if [[ "${GNOME2_LA_PUNT}" !=3D "no" ]]; then ebegin "Removing .la files" - find "${D}" -name '*.la' -exec rm -f {} + || die + if ! { has static-libs ${IUSE//+} && use static-libs; }; then + find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal fai= led" + fi eend fi }