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 <gentoo-commits+bounces-374391-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1Qv27A-0003bh-Vj
for garchives@archives.gentoo.org; Sun, 21 Aug 2011 07:06:37 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 2379421C046;
Sun, 21 Aug 2011 07:06:29 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id E680C21C046
for <gentoo-commits@lists.gentoo.org>; Sun, 21 Aug 2011 07:06:28 +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 5A42E1B4035
for <gentoo-commits@lists.gentoo.org>; Sun, 21 Aug 2011 07:06:28 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 5DDE380040
for <gentoo-commits@lists.gentoo.org>; Sun, 21 Aug 2011 07:06:27 +0000 (UTC)
From: "Alexandre Restovtsev" <tetromino@gmail.com>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" <tetromino@gmail.com>
Message-ID: <253814510e7a508e5fb44388334e13e472d065a8.tetromino@gentoo>
Subject: [gentoo-commits] proj/gnome:master 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: 253814510e7a508e5fb44388334e13e472d065a8
Date: Sun, 21 Aug 2011 07:06:27 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: 7d5e9580dac320c64a7fa6cbd7d0c420
commit: 253814510e7a508e5fb44388334e13e472d065a8
Author: Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sun Aug 21 06:51:58 2011 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sun Aug 21 07:06:09 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D=
commit;h=3D25381451
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
}