| 1 |
commit: fed428ca9f0daa92a61d8d6a8875cb4a1e84cbf0 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Mar 3 20:03:41 2020 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Mar 3 20:03:41 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fed428ca |
| 7 |
|
| 8 |
dev-lang/php: Use relative symlinks; whitespace |
| 9 |
|
| 10 |
Signed-off-by: Brian Evans <grknight <AT> gentoo.org> |
| 11 |
|
| 12 |
dev-lang/php/php-7.2.28-r1.ebuild | 12 ++++++------ |
| 13 |
dev-lang/php/php-7.3.15-r1.ebuild | 12 ++++++------ |
| 14 |
dev-lang/php/php-7.4.3-r1.ebuild | 4 ++-- |
| 15 |
3 files changed, 14 insertions(+), 14 deletions(-) |
| 16 |
|
| 17 |
diff --git a/dev-lang/php/php-7.2.28-r1.ebuild b/dev-lang/php/php-7.2.28-r1.ebuild |
| 18 |
index 96047b4e667..e032d1b3af0 100644 |
| 19 |
--- a/dev-lang/php/php-7.2.28-r1.ebuild |
| 20 |
+++ b/dev-lang/php/php-7.2.28-r1.ebuild |
| 21 |
@@ -557,11 +557,11 @@ src_install() { |
| 22 |
case "$sapi" in |
| 23 |
cli) |
| 24 |
source="sapi/cli/php" |
| 25 |
- # Install the "phar" archive utility. |
| 26 |
- if use phar ; then |
| 27 |
- emake INSTALL_ROOT="${D}" install-pharcmd |
| 28 |
- dosym "${dest}/bin/phar" "/usr/bin/phar${SLOT}" |
| 29 |
- fi |
| 30 |
+ # Install the "phar" archive utility. |
| 31 |
+ if use phar ; then |
| 32 |
+ emake INSTALL_ROOT="${D}" install-pharcmd |
| 33 |
+ dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}" |
| 34 |
+ fi |
| 35 |
;; |
| 36 |
cgi) |
| 37 |
source="sapi/cgi/php-cgi" |
| 38 |
@@ -585,7 +585,7 @@ src_install() { |
| 39 |
else |
| 40 |
dobin "${source}" |
| 41 |
local name="$(basename ${source})" |
| 42 |
- dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}" |
| 43 |
+ dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}" |
| 44 |
fi |
| 45 |
fi |
| 46 |
|
| 47 |
|
| 48 |
diff --git a/dev-lang/php/php-7.3.15-r1.ebuild b/dev-lang/php/php-7.3.15-r1.ebuild |
| 49 |
index 1726c622278..75ec441d1c3 100644 |
| 50 |
--- a/dev-lang/php/php-7.3.15-r1.ebuild |
| 51 |
+++ b/dev-lang/php/php-7.3.15-r1.ebuild |
| 52 |
@@ -558,11 +558,11 @@ src_install() { |
| 53 |
case "$sapi" in |
| 54 |
cli) |
| 55 |
source="sapi/cli/php" |
| 56 |
- # Install the "phar" archive utility. |
| 57 |
- if use phar ; then |
| 58 |
- emake INSTALL_ROOT="${D}" install-pharcmd |
| 59 |
- dosym "${dest}/bin/phar" "/usr/bin/phar${SLOT}" |
| 60 |
- fi |
| 61 |
+ # Install the "phar" archive utility. |
| 62 |
+ if use phar ; then |
| 63 |
+ emake INSTALL_ROOT="${D}" install-pharcmd |
| 64 |
+ dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}" |
| 65 |
+ fi |
| 66 |
;; |
| 67 |
cgi) |
| 68 |
source="sapi/cgi/php-cgi" |
| 69 |
@@ -586,7 +586,7 @@ src_install() { |
| 70 |
else |
| 71 |
dobin "${source}" |
| 72 |
local name="$(basename ${source})" |
| 73 |
- dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}" |
| 74 |
+ dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}" |
| 75 |
fi |
| 76 |
fi |
| 77 |
|
| 78 |
|
| 79 |
diff --git a/dev-lang/php/php-7.4.3-r1.ebuild b/dev-lang/php/php-7.4.3-r1.ebuild |
| 80 |
index 3701941e244..f2c76031d7d 100644 |
| 81 |
--- a/dev-lang/php/php-7.4.3-r1.ebuild |
| 82 |
+++ b/dev-lang/php/php-7.4.3-r1.ebuild |
| 83 |
@@ -551,7 +551,7 @@ src_install() { |
| 84 |
# Install the "phar" archive utility. |
| 85 |
if use phar ; then |
| 86 |
emake INSTALL_ROOT="${D}" install-pharcmd |
| 87 |
- dosym "${dest}/bin/phar" "/usr/bin/phar${SLOT}" |
| 88 |
+ dosym "..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}" |
| 89 |
fi |
| 90 |
;; |
| 91 |
cgi) |
| 92 |
@@ -576,7 +576,7 @@ src_install() { |
| 93 |
else |
| 94 |
dobin "${source}" |
| 95 |
local name="$(basename ${source})" |
| 96 |
- dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}" |
| 97 |
+ dosym "..${dest#/usr}/bin/${name}" "/usr/bin/${name}${SLOT}" |
| 98 |
fi |
| 99 |
fi |
Archives