From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9C372139694 for ; Sat, 11 Feb 2017 12:29:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5FC03E0D99; Sat, 11 Feb 2017 12:29:45 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3C277E0D99 for ; Sat, 11 Feb 2017 12:29:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 041A1341026 for ; Sat, 11 Feb 2017 12:29:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 447044417 for ; Sat, 11 Feb 2017 12:29:42 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1486816176.c84c8b8d0bccb14e20ed6d3336f0e6f80e7936a4.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/gnome2.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: c84c8b8d0bccb14e20ed6d3336f0e6f80e7936a4 X-VCS-Branch: master Date: Sat, 11 Feb 2017 12:29:42 +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: dae04d0e-b37f-410d-88b5-f66ee25feced X-Archives-Hash: ae45aca54658a519466d4c35aa5e9e0b commit: c84c8b8d0bccb14e20ed6d3336f0e6f80e7936a4 Author: Pacho Ramos gentoo org> AuthorDate: Sat Feb 11 12:28:44 2017 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Sat Feb 11 12:29:36 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c84c8b8d gnome2.eclass: we cannot rely on default phases involving emake because they don't allow to pass extra variables, bug #606826 eclass/gnome2.eclass | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass index bb538dd191..a18bd469a1 100644 --- a/eclass/gnome2.eclass +++ b/eclass/gnome2.eclass @@ -232,13 +232,10 @@ gnome2_src_configure() { # @FUNCTION: gnome2_src_compile # @DESCRIPTION: -# Only default src_compile for now +# Only default src_compile for now, but we cannot call "default" because it +# doesn't allow to set variables, bug #606826 gnome2_src_compile() { - if has ${EAPI:-0} 4 5; then - emake - else - default - fi + emake } # @FUNCTION: gnome2_src_install @@ -259,14 +256,15 @@ gnome2_src_install() { dodir "${sk_tmp_dir}" || die "dodir failed" emake DESTDIR="${D}" "scrollkeeper_localstate_dir=${ED}${sk_tmp_dir} " "$@" install || die "install failed" else - default + emake DESTDIR="${D}" "$@" install || die "install failed" fi unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL # Handle documentation as 'default' for eapi5, bug #373131 - # Since eapi6 this is handled by default on its own plus MAINTAINERS and HACKING - # files that are really common in gnome packages (bug #573390) + # Since eapi6 we also install MAINTAINERS and HACKING files as they are really common in gnome packages (bug #573390) + # Please remember we cannot rely on default_src_install because it + # doesn't allow to set variables, bug #606826 if has ${EAPI:-0} 4; then # Manual document installation if [[ -n "${DOCS}" ]]; then @@ -275,6 +273,7 @@ gnome2_src_install() { elif has ${EAPI:-0} 5; then einstalldocs else + einstalldocs local d for d in HACKING MAINTAINERS; do [[ -s "${d}" ]] && dodoc "${d}"