[gentoo-commits] proj/gnome:gnome-next commit in: eclass/

["Alexandre Restovtsev" <tetromino@gmail.com>]

commit:     4796989ee09cce6627c53a3dcff657974625d88e
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:05:27 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4796989e

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=static-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}" != "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 failed"
+		fi
 		eend
 	fi
 }