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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3D6AE15808B for ; Thu, 14 Apr 2022 15:10:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5B977E07FE; Thu, 14 Apr 2022 15:10:07 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F24B2E07FE for ; Thu, 14 Apr 2022 15:10:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3CC6A34112C for ; Thu, 14 Apr 2022 15:10:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5C0BF303 for ; Thu, 14 Apr 2022 15:10:00 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1649948958.4cc0bda33f39d9aaee5ff1817c1280701098c84c.grknight@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-php/snuffleupagus/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-php/snuffleupagus/snuffleupagus-0.7.1-r1.ebuild dev-php/snuffleupagus/snuffleupagus-0.7.1.ebuild X-VCS-Directories: dev-php/snuffleupagus/ X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 4cc0bda33f39d9aaee5ff1817c1280701098c84c X-VCS-Branch: master Date: Thu, 14 Apr 2022 15:10:00 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ea7715e7-333e-42e5-8540-45ed4d156875 X-Archives-Hash: 63b0ce12cb54ff314f09171d28f939c9 commit: 4cc0bda33f39d9aaee5ff1817c1280701098c84c Author: Brian Evans gentoo org> AuthorDate: Thu Apr 14 15:09:18 2022 +0000 Commit: Brian Evans gentoo org> CommitDate: Thu Apr 14 15:09:18 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cc0bda3 dev-php/snuffleupagus: Revbump to fix QA warning and wrong locations Signed-off-by: Brian Evans gentoo.org> ...-0.7.1.ebuild => snuffleupagus-0.7.1-r1.ebuild} | 29 ++++++++++++++++------ 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/dev-php/snuffleupagus/snuffleupagus-0.7.1.ebuild b/dev-php/snuffleupagus/snuffleupagus-0.7.1-r1.ebuild similarity index 67% rename from dev-php/snuffleupagus/snuffleupagus-0.7.1.ebuild rename to dev-php/snuffleupagus/snuffleupagus-0.7.1-r1.ebuild index 13decdb51061..d18383730d41 100644 --- a/dev-php/snuffleupagus/snuffleupagus-0.7.1.ebuild +++ b/dev-php/snuffleupagus/snuffleupagus-0.7.1-r1.ebuild @@ -33,6 +33,19 @@ src_prepare() { } src_install() { + addtoinifile() { + local inifile="${WORKDIR}/${1}" + local inidir="${inifile%/*}" + + mkdir -p "${inidir}" || die "failed to create INI directory ${inidir}" + + local my_added="${2}=${3}" + echo "${my_added}" >> "${inifile}" || die "failed to append to ${inifile}" + einfo "Added '${my_added}' to /${1}" + + insinto "/${1%/*}" + doins "${inifile}" + } einstalldocs local slot x cfgdir php-ext-source-r3_src_install @@ -41,13 +54,15 @@ src_install() { php_init_slot_env "${slot}" for x in ${PHP_EXT_SAPIS} ; do cfgdir="/etc/php/${x}-${slot}" - php-ext-source-r3_addtoinifile "${cfgdir}/ext/${PHP_INI_NAME}.ini" \ - "sp.configuration_file" "${cfgdir}/${PN}.rules" - insinto "${cfgdir}" - case ${PHP_CURRENTSLOT:0:1} in - 8) newins "${S}/config/default_php8.rules" "${PN}.rules" ;; - *) newins "${S}/config/default.rules" "${PN}.rules" ;; - esac + if [[ -f "${ED}${cfgdir}/ext/${PHP_INI_NAME}.ini" ]]; then + addtoinifile "${cfgdir#/}/ext/${PHP_INI_NAME}.ini" \ + "sp.configuration_file" "${cfgdir}/${PN}.rules" + insinto "${cfgdir}" + case ${PHP_CURRENTSLOT:0:1} in + 8) newins "${S}/config/default_php8.rules" "${PN}.rules" ;; + *) newins "${S}/config/default.rules" "${PN}.rules" ;; + esac + fi done done }