From 4cc0bda33f39d9aaee5ff1817c1280701098c84c Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Thu, 14 Apr 2022 11:09:18 -0400 Subject: [PATCH] dev-php/snuffleupagus: Revbump to fix QA warning and wrong locations Signed-off-by: Brian Evans --- ...1.ebuild => snuffleupagus-0.7.1-r1.ebuild} | 29 ++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-) rename dev-php/snuffleupagus/{snuffleupagus-0.7.1.ebuild => snuffleupagus-0.7.1-r1.ebuild} (67%) 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 13decdb51061f..d18383730d41f 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 }