| 1 |
commit: b17f87cace43d8c50e3b0594f7fda738dc6ee1cf |
| 2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 20 17:21:29 2020 +0000 |
| 4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 20 17:34:03 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b17f87ca |
| 7 |
|
| 8 |
dev-lang/php: address RedundantDodir warnings |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
| 11 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-lang/php/php-7.2.26.ebuild | 1 - |
| 14 |
dev-lang/php/php-7.2.27.ebuild | 1 - |
| 15 |
dev-lang/php/php-7.2.28.ebuild | 1 - |
| 16 |
dev-lang/php/php-7.3.13.ebuild | 3 +-- |
| 17 |
dev-lang/php/php-7.3.14.ebuild | 1 - |
| 18 |
dev-lang/php/php-7.3.15.ebuild | 1 - |
| 19 |
dev-lang/php/php-7.4.1.ebuild | 3 +-- |
| 20 |
dev-lang/php/php-7.4.2.ebuild | 1 - |
| 21 |
dev-lang/php/php-7.4.3.ebuild | 1 - |
| 22 |
9 files changed, 2 insertions(+), 11 deletions(-) |
| 23 |
|
| 24 |
diff --git a/dev-lang/php/php-7.2.26.ebuild b/dev-lang/php/php-7.2.26.ebuild |
| 25 |
index db454dfb972..52361ca04b9 100644 |
| 26 |
--- a/dev-lang/php/php-7.2.26.ebuild |
| 27 |
+++ b/dev-lang/php/php-7.2.26.ebuild |
| 28 |
@@ -181,7 +181,6 @@ php_install_ini() { |
| 29 |
# Set the include path to point to where we want to find PEAR packages |
| 30 |
sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die |
| 31 |
|
| 32 |
- dodir "${PHP_INI_DIR#${EPREFIX}}" |
| 33 |
insinto "${PHP_INI_DIR#${EPREFIX}}" |
| 34 |
newins "${phpinisrc}" php.ini |
| 35 |
|
| 36 |
|
| 37 |
diff --git a/dev-lang/php/php-7.2.27.ebuild b/dev-lang/php/php-7.2.27.ebuild |
| 38 |
index 52352ff4c93..db36a046d76 100644 |
| 39 |
--- a/dev-lang/php/php-7.2.27.ebuild |
| 40 |
+++ b/dev-lang/php/php-7.2.27.ebuild |
| 41 |
@@ -181,7 +181,6 @@ php_install_ini() { |
| 42 |
# Set the include path to point to where we want to find PEAR packages |
| 43 |
sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die |
| 44 |
|
| 45 |
- dodir "${PHP_INI_DIR#${EPREFIX}}" |
| 46 |
insinto "${PHP_INI_DIR#${EPREFIX}}" |
| 47 |
newins "${phpinisrc}" php.ini |
| 48 |
|
| 49 |
|
| 50 |
diff --git a/dev-lang/php/php-7.2.28.ebuild b/dev-lang/php/php-7.2.28.ebuild |
| 51 |
index 74e2b26c74b..8ef1aaf89d6 100644 |
| 52 |
--- a/dev-lang/php/php-7.2.28.ebuild |
| 53 |
+++ b/dev-lang/php/php-7.2.28.ebuild |
| 54 |
@@ -181,7 +181,6 @@ php_install_ini() { |
| 55 |
# Set the include path to point to where we want to find PEAR packages |
| 56 |
sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die |
| 57 |
|
| 58 |
- dodir "${PHP_INI_DIR#${EPREFIX}}" |
| 59 |
insinto "${PHP_INI_DIR#${EPREFIX}}" |
| 60 |
newins "${phpinisrc}" php.ini |
| 61 |
|
| 62 |
|
| 63 |
diff --git a/dev-lang/php/php-7.3.13.ebuild b/dev-lang/php/php-7.3.13.ebuild |
| 64 |
index 79917af499c..1af2767e310 100644 |
| 65 |
--- a/dev-lang/php/php-7.3.13.ebuild |
| 66 |
+++ b/dev-lang/php/php-7.3.13.ebuild |
| 67 |
@@ -1,4 +1,4 @@ |
| 68 |
-# Copyright 1999-2019 Gentoo Authors |
| 69 |
+# Copyright 1999-2020 Gentoo Authors |
| 70 |
# Distributed under the terms of the GNU General Public License v2 |
| 71 |
|
| 72 |
EAPI="7" |
| 73 |
@@ -182,7 +182,6 @@ php_install_ini() { |
| 74 |
# Set the include path to point to where we want to find PEAR packages |
| 75 |
sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die |
| 76 |
|
| 77 |
- dodir "${PHP_INI_DIR#${EPREFIX}}" |
| 78 |
insinto "${PHP_INI_DIR#${EPREFIX}}" |
| 79 |
newins "${phpinisrc}" php.ini |
| 80 |
|
| 81 |
|
| 82 |
diff --git a/dev-lang/php/php-7.3.14.ebuild b/dev-lang/php/php-7.3.14.ebuild |
| 83 |
index 7c1e337cb47..ebe16ceac61 100644 |
| 84 |
--- a/dev-lang/php/php-7.3.14.ebuild |
| 85 |
+++ b/dev-lang/php/php-7.3.14.ebuild |
| 86 |
@@ -182,7 +182,6 @@ php_install_ini() { |
| 87 |
# Set the include path to point to where we want to find PEAR packages |
| 88 |
sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die |
| 89 |
|
| 90 |
- dodir "${PHP_INI_DIR#${EPREFIX}}" |
| 91 |
insinto "${PHP_INI_DIR#${EPREFIX}}" |
| 92 |
newins "${phpinisrc}" php.ini |
| 93 |
|
| 94 |
|
| 95 |
diff --git a/dev-lang/php/php-7.3.15.ebuild b/dev-lang/php/php-7.3.15.ebuild |
| 96 |
index a1e861500b5..7f7a3842dcb 100644 |
| 97 |
--- a/dev-lang/php/php-7.3.15.ebuild |
| 98 |
+++ b/dev-lang/php/php-7.3.15.ebuild |
| 99 |
@@ -182,7 +182,6 @@ php_install_ini() { |
| 100 |
# Set the include path to point to where we want to find PEAR packages |
| 101 |
sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die |
| 102 |
|
| 103 |
- dodir "${PHP_INI_DIR#${EPREFIX}}" |
| 104 |
insinto "${PHP_INI_DIR#${EPREFIX}}" |
| 105 |
newins "${phpinisrc}" php.ini |
| 106 |
|
| 107 |
|
| 108 |
diff --git a/dev-lang/php/php-7.4.1.ebuild b/dev-lang/php/php-7.4.1.ebuild |
| 109 |
index e40c1d79c01..3190c578515 100644 |
| 110 |
--- a/dev-lang/php/php-7.4.1.ebuild |
| 111 |
+++ b/dev-lang/php/php-7.4.1.ebuild |
| 112 |
@@ -1,4 +1,4 @@ |
| 113 |
-# Copyright 1999-2019 Gentoo Authors |
| 114 |
+# Copyright 1999-2020 Gentoo Authors |
| 115 |
# Distributed under the terms of the GNU General Public License v2 |
| 116 |
|
| 117 |
EAPI="7" |
| 118 |
@@ -172,7 +172,6 @@ php_install_ini() { |
| 119 |
# Set the include path to point to where we want to find PEAR packages |
| 120 |
sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die |
| 121 |
|
| 122 |
- dodir "${PHP_INI_DIR#${EPREFIX}}" |
| 123 |
insinto "${PHP_INI_DIR#${EPREFIX}}" |
| 124 |
newins "${phpinisrc}" php.ini |
| 125 |
|
| 126 |
|
| 127 |
diff --git a/dev-lang/php/php-7.4.2.ebuild b/dev-lang/php/php-7.4.2.ebuild |
| 128 |
index 4123e985061..4e6b9a03391 100644 |
| 129 |
--- a/dev-lang/php/php-7.4.2.ebuild |
| 130 |
+++ b/dev-lang/php/php-7.4.2.ebuild |
| 131 |
@@ -172,7 +172,6 @@ php_install_ini() { |
| 132 |
# Set the include path to point to where we want to find PEAR packages |
| 133 |
sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die |
| 134 |
|
| 135 |
- dodir "${PHP_INI_DIR#${EPREFIX}}" |
| 136 |
insinto "${PHP_INI_DIR#${EPREFIX}}" |
| 137 |
newins "${phpinisrc}" php.ini |
| 138 |
|
| 139 |
|
| 140 |
diff --git a/dev-lang/php/php-7.4.3.ebuild b/dev-lang/php/php-7.4.3.ebuild |
| 141 |
index 4123e985061..4e6b9a03391 100644 |
| 142 |
--- a/dev-lang/php/php-7.4.3.ebuild |
| 143 |
+++ b/dev-lang/php/php-7.4.3.ebuild |
| 144 |
@@ -172,7 +172,6 @@ php_install_ini() { |
| 145 |
# Set the include path to point to where we want to find PEAR packages |
| 146 |
sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" || die |
| 147 |
|
| 148 |
- dodir "${PHP_INI_DIR#${EPREFIX}}" |
| 149 |
insinto "${PHP_INI_DIR#${EPREFIX}}" |
| 150 |
newins "${phpinisrc}" php.ini |
Archives