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 35C5B139085 for ; Fri, 6 Jan 2017 21:51:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 67A7FE0CC1; Fri, 6 Jan 2017 21:51:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 3F5A8E0CC1 for ; Fri, 6 Jan 2017 21:51:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 1E54734165F for ; Fri, 6 Jan 2017 21:51:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 44D2924C5 for ; Fri, 6 Jan 2017 21:51:50 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1483739451.14f2ab0158367ccebb091bb7a023c367cec45e48.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-php/twig/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-php/twig/twig-1.29.0.ebuild X-VCS-Directories: dev-php/twig/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: 14f2ab0158367ccebb091bb7a023c367cec45e48 X-VCS-Branch: master Date: Fri, 6 Jan 2017 21:51:50 +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: df57cb2b-b5b9-41da-80c2-472dea531b4b X-Archives-Hash: a4e581a1693d46e260c837253994fa50 commit: 14f2ab0158367ccebb091bb7a023c367cec45e48 Author: Michael Orlitzky gentoo org> AuthorDate: Fri Jan 6 21:50:11 2017 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Fri Jan 6 21:50:51 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14f2ab01 dev-php/twig: don't run eclass phases when USE="extension" is unset. If the user does not wish to build the C extension, there is no need to run the php-ext-source-r3 eclass phases. Doing so can lead to a build failure because those eclass phases use DEPENDencies that are only required conditionally on USE=extension. Gentoo-Bug: 604874 Package-Manager: portage-2.3.0 dev-php/twig/twig-1.29.0.ebuild | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dev-php/twig/twig-1.29.0.ebuild b/dev-php/twig/twig-1.29.0.ebuild index 0cfa0e1..679424c 100644 --- a/dev-php/twig/twig-1.29.0.ebuild +++ b/dev-php/twig/twig-1.29.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -25,22 +25,26 @@ IUSE="doc extension test" DEPEND="test? ( dev-php/phpunit )" src_prepare(){ - # We need to call eapply_user ourselves, just in case the user's + # We need to call eapply_user ourselves, because it may be skipped + # if either the "extension" USE flag is not set, or if the user's # PHP_TARGETS is essentially empty (does not contain "php5-6"). In - # that case the eclass src_prepare does nothing. + # the latter case, the eclass src_prepare does nothing. eapply_user - php-ext-source-r3_src_prepare + use extension && php-ext-source-r3_src_prepare } src_install(){ - php-ext-source-r3_src_install + use extension && php-ext-source-r3_src_install cd "${S}" || die # The autoloader requires the 'T' in "Twig" capitalized. insinto "/usr/share/php/${MY_PN}" doins -r lib/"${MY_PN}"/* + # The eclass src_install calls einstalldocs, so we may install a few + # files twice. Doing so should be harmless. dodoc README.rst CHANGELOG + # This installs the reStructuredText source documents. There's got # to be some way to turn them into HTML using Sphinx, but upstream # doesn't provide for it.