[gentoo-commits] gentoo-x86 commit in eclass: gnome2.eclass

["Nirbheek Chauhan (nirbheek)" <nirbheek@gentoo.org>]

nirbheek    11/08/14 03:46:33

  Modified:             gnome2.eclass
  Log:
  For ebuilds with USE=static-libs, remove .la files conditionally for GNOME2_LA_PUNT

Revision  Changes    Path
1.99                 eclass/gnome2.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.99&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?rev=1.99&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/gnome2.eclass?r1=1.98&r2=1.99

Index: gnome2.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- gnome2.eclass	15 Jul 2011 17:31:37 -0000	1.98
+++ gnome2.eclass	14 Aug 2011 03:46:33 -0000	1.99
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.98 2011/07/15 17:31:37 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/gnome2.eclass,v 1.99 2011/08/14 03:46:33 nirbheek Exp $
 
 # @ECLASS: gnome2.eclass
 # @MAINTAINER:
@@ -175,7 +175,9 @@
 	# Delete all .la files
 	if [[ "${GNOME2_LA_PUNT}" != "no" ]]; then
 		ebegin "Removing .la files"
-		find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
+		if ! { has static-libs ${IUSE//+} && use static-libs; }; then
+			find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
+		fi
 		eend
 	fi
 }