commit:     b17f87cace43d8c50e3b0594f7fda738dc6ee1cf
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 20 17:21:29 2020 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Feb 20 17:34:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b17f87ca

dev-lang/php: address RedundantDodir warnings

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 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 db454dfb972..52361ca04b9 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 52352ff4c93..db36a046d76 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 74e2b26c74b..8ef1aaf89d6 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 79917af499c..1af2767e310 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 7c1e337cb47..ebe16ceac61 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 a1e861500b5..7f7a3842dcb 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 e40c1d79c01..3190c578515 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 4123e985061..4e6b9a03391 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 4123e985061..4e6b9a03391 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
 

Reply via email to