From b17f87cace43d8c50e3b0594f7fda738dc6ee1cf Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Thu, 20 Feb 2020 18:21:29 +0100 Subject: [PATCH] dev-lang/php: address RedundantDodir warnings Package-Manager: Portage-2.3.89, Repoman-2.3.20 Signed-off-by: Thomas Deutschmann --- dev-lang/php/php-7.2.26.ebuild | 1 - dev-lang/php/php-7.2.27.ebuild | 1 - dev-lang/php/php-7.2.28.ebuild | 1 - dev-lang/php/php-7.3.13.ebuild | 3 +-- dev-lang/php/php-7.3.14.ebuild | 1 - dev-lang/php/php-7.3.15.ebuild | 1 - dev-lang/php/php-7.4.1.ebuild | 3 +-- dev-lang/php/php-7.4.2.ebuild | 1 - dev-lang/php/php-7.4.3.ebuild | 1 - 9 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dev-lang/php/php-7.2.26.ebuild b/dev-lang/php/php-7.2.26.ebuild index db454dfb9726..52361ca04b9b 100644 --- a/dev-lang/php/php-7.2.26.ebuild +++ b/dev-lang/php/php-7.2.26.ebuild @@ -181,7 +181,6 @@ php_install_ini() { # Set the include path to point to where we want to find PEAR packages sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die - dodir "${PHP_INI_DIR#${EPREFIX}}" insinto "${PHP_INI_DIR#${EPREFIX}}" newins "${phpinisrc}" php.ini diff --git a/dev-lang/php/php-7.2.27.ebuild b/dev-lang/php/php-7.2.27.ebuild index 52352ff4c931..db36a046d76b 100644 --- a/dev-lang/php/php-7.2.27.ebuild +++ b/dev-lang/php/php-7.2.27.ebuild @@ -181,7 +181,6 @@ php_install_ini() { # Set the include path to point to where we want to find PEAR packages sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die - dodir "${PHP_INI_DIR#${EPREFIX}}" insinto "${PHP_INI_DIR#${EPREFIX}}" newins "${phpinisrc}" php.ini diff --git a/dev-lang/php/php-7.2.28.ebuild b/dev-lang/php/php-7.2.28.ebuild index 74e2b26c74b9..8ef1aaf89d67 100644 --- a/dev-lang/php/php-7.2.28.ebuild +++ b/dev-lang/php/php-7.2.28.ebuild @@ -181,7 +181,6 @@ php_install_ini() { # Set the include path to point to where we want to find PEAR packages sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die - dodir "${PHP_INI_DIR#${EPREFIX}}" insinto "${PHP_INI_DIR#${EPREFIX}}" newins "${phpinisrc}" php.ini diff --git a/dev-lang/php/php-7.3.13.ebuild b/dev-lang/php/php-7.3.13.ebuild index 79917af499c0..1af2767e3106 100644 --- a/dev-lang/php/php-7.3.13.ebuild +++ b/dev-lang/php/php-7.3.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -182,7 +182,6 @@ php_install_ini() { # Set the include path to point to where we want to find PEAR packages sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die - dodir "${PHP_INI_DIR#${EPREFIX}}" insinto "${PHP_INI_DIR#${EPREFIX}}" newins "${phpinisrc}" php.ini diff --git a/dev-lang/php/php-7.3.14.ebuild b/dev-lang/php/php-7.3.14.ebuild index 7c1e337cb47a..ebe16ceac61b 100644 --- a/dev-lang/php/php-7.3.14.ebuild +++ b/dev-lang/php/php-7.3.14.ebuild @@ -182,7 +182,6 @@ php_install_ini() { # Set the include path to point to where we want to find PEAR packages sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die - dodir "${PHP_INI_DIR#${EPREFIX}}" insinto "${PHP_INI_DIR#${EPREFIX}}" newins "${phpinisrc}" php.ini diff --git a/dev-lang/php/php-7.3.15.ebuild b/dev-lang/php/php-7.3.15.ebuild index a1e861500b56..7f7a3842dcbb 100644 --- a/dev-lang/php/php-7.3.15.ebuild +++ b/dev-lang/php/php-7.3.15.ebuild @@ -182,7 +182,6 @@ php_install_ini() { # Set the include path to point to where we want to find PEAR packages sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die - dodir "${PHP_INI_DIR#${EPREFIX}}" insinto "${PHP_INI_DIR#${EPREFIX}}" newins "${phpinisrc}" php.ini diff --git a/dev-lang/php/php-7.4.1.ebuild b/dev-lang/php/php-7.4.1.ebuild index e40c1d79c014..3190c5785155 100644 --- a/dev-lang/php/php-7.4.1.ebuild +++ b/dev-lang/php/php-7.4.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -172,7 +172,6 @@ php_install_ini() { # Set the include path to point to where we want to find PEAR packages sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die - dodir "${PHP_INI_DIR#${EPREFIX}}" insinto "${PHP_INI_DIR#${EPREFIX}}" newins "${phpinisrc}" php.ini diff --git a/dev-lang/php/php-7.4.2.ebuild b/dev-lang/php/php-7.4.2.ebuild index 4123e9850615..4e6b9a033911 100644 --- a/dev-lang/php/php-7.4.2.ebuild +++ b/dev-lang/php/php-7.4.2.ebuild @@ -172,7 +172,6 @@ php_install_ini() { # Set the include path to point to where we want to find PEAR packages sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die - dodir "${PHP_INI_DIR#${EPREFIX}}" insinto "${PHP_INI_DIR#${EPREFIX}}" newins "${phpinisrc}" php.ini diff --git a/dev-lang/php/php-7.4.3.ebuild b/dev-lang/php/php-7.4.3.ebuild index 4123e9850615..4e6b9a033911 100644 --- a/dev-lang/php/php-7.4.3.ebuild +++ b/dev-lang/php/php-7.4.3.ebuild @@ -172,7 +172,6 @@ php_install_ini() { # Set the include path to point to where we want to find PEAR packages sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die - dodir "${PHP_INI_DIR#${EPREFIX}}" insinto "${PHP_INI_DIR#${EPREFIX}}" newins "${phpinisrc}" php.ini -- 2.26.2