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 DF4171381F3 for ; Sun, 18 Nov 2012 19:11:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6663221C120; Sun, 18 Nov 2012 19:11:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D3C8821C120 for ; Sun, 18 Nov 2012 19:11:16 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B7D4E33D8B8 for ; Sun, 18 Nov 2012 19:11:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 2474FE5436 for ; Sun, 18 Nov 2012 19:11:14 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1353265751.97566f0ec473e53ba998e94108ce3d6fde46a50c.eva@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: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 97566f0ec473e53ba998e94108ce3d6fde46a50c X-VCS-Branch: master Date: Sun, 18 Nov 2012 19:11:14 +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: ac256c2c-a99a-4b95-a411-aa32e2d11dfb X-Archives-Hash: f9c5e62880b6bb04142199aea47ba4aa commit: 97566f0ec473e53ba998e94108ce3d6fde46a50c Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sun Nov 18 19:09:07 2012 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sun Nov 18 19:09:11 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=97566f0e eclass/gnome2.eclass: sync with gentoo-x86 * Disable schemas compile if configure option exists. * Disable silent rules for EAPI<5 as discussed on mail alias. * Leave la files cleanup to prune_libtool_files for EAPI>4. --- eclass/gnome2.eclass | 40 ++++++++++++++++++++++++++++++++-------- 1 files changed, 32 insertions(+), 8 deletions(-) diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass index 95c11bf..d38dbc4 100644 --- a/eclass/gnome2.eclass +++ b/eclass/gnome2.eclass @@ -10,7 +10,7 @@ # Exports portage base functions used by ebuilds written for packages using the # GNOME framework. For additional functions, see gnome2-utils.eclass. -inherit fdo-mime libtool gnome.org gnome2-utils +inherit eutils fdo-mime libtool gnome.org gnome2-utils case "${EAPI:-0}" in 0|1) @@ -47,9 +47,13 @@ G2CONF=${G2CONF:-""} # @ECLASS-VARIABLE: GNOME2_LA_PUNT # @DESCRIPTION: -# Should we delete all the .la files? +# Should we delete ALL the .la files? # NOT to be used without due consideration. -GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-"no"} +if has ${EAPI:-0} 0 1 2 3 4; then + GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-"no"} +else + GNOME2_LA_PUNT=${GNOME2_LA_PUNT:-""} +fi # @ECLASS-VARIABLE: ELTCONF # @DEFAULT-UNSET @@ -161,6 +165,18 @@ gnome2_src_configure() { G2CONF="${G2CONF} --disable-scrollkeeper" fi + # Pass --disable-silent-rules when possible (not needed for eapi5), bug #429308 + if has ${EAPI:-0} 0 1 2 3 4; then + if grep -q "disable-silent-rules" configure; then + G2CONF="${G2CONF} --disable-silent-rules" + fi + fi + + # Pass --disable-schemas-install when possible + if grep -q "disable-schemas-install" configure; then + G2CONF="${G2CONF} --disable-schemas-install" + fi + # Avoid sandbox violations caused by gnome-vfs (bug #128289 and #345659) addwrite "$(unset HOME; echo ~)/.gnome2" @@ -216,12 +232,20 @@ gnome2_src_install() { rm -fr "${ED}/usr/share/applications/mimeinfo.cache" # Delete all .la files - if [[ "${GNOME2_LA_PUNT}" != "no" ]]; then - ebegin "Removing .la files" - if ! { has static-libs ${IUSE//+} && use static-libs; }; then - find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed" + if has ${EAPI:-0} 0 1 2 3 4; then + if [[ "${GNOME2_LA_PUNT}" != "no" ]]; then + ebegin "Removing .la files" + if ! { has static-libs ${IUSE//+} && use static-libs; }; then + find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed" + fi + eend fi - eend + else + case "${GNOME2_LA_PUNT}" in + yes) prune_libtool_files --modules;; + no) ;; + *) prune_libtool_files;; + esac fi }