commit: fed428ca9f0daa92a61d8d6a8875cb4a1e84cbf0
Author: Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 3 20:03:41 2020 +0000
Commit: Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Tue Mar 3 20:03:41 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fed428ca
dev-lang/php: Use relative symlinks; whitespace
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>
dev-lang/php/php-7.2.28-r1.ebuild | 12 ++++++------
dev-lang/php/php-7.3.15-r1.ebuild | 12 ++++++------
dev-lang/php/php-7.4.3-r1.ebuild | 4 ++--
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/dev-lang/php/php-7.2.28-r1.ebuild
b/dev-lang/php/php-7.2.28-r1.ebuild
index 96047b4e667..e032d1b3af0 100644
--- a/dev-lang/php/php-7.2.28-r1.ebuild
+++ b/dev-lang/php/php-7.2.28-r1.ebuild
@@ -557,11 +557,11 @@ src_install() {
case "$sapi" in
cli)
source="sapi/cli/php"
- # Install the "phar" archive
utility.
- if use phar ; then
- emake
INSTALL_ROOT="${D}" install-pharcmd
- dosym
"${dest}/bin/phar" "/usr/bin/phar${SLOT}"
- fi
+ # Install the "phar" archive
utility.
+ if use phar ; then
+ emake
INSTALL_ROOT="${D}" install-pharcmd
+ dosym
"..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+ fi
;;
cgi)
source="sapi/cgi/php-cgi"
@@ -585,7 +585,7 @@ src_install() {
else
dobin "${source}"
local name="$(basename ${source})"
- dosym "${dest}/bin/${name}"
"/usr/bin/${name}${SLOT}"
+ dosym "..${dest#/usr}/bin/${name}"
"/usr/bin/${name}${SLOT}"
fi
fi
diff --git a/dev-lang/php/php-7.3.15-r1.ebuild
b/dev-lang/php/php-7.3.15-r1.ebuild
index 1726c622278..75ec441d1c3 100644
--- a/dev-lang/php/php-7.3.15-r1.ebuild
+++ b/dev-lang/php/php-7.3.15-r1.ebuild
@@ -558,11 +558,11 @@ src_install() {
case "$sapi" in
cli)
source="sapi/cli/php"
- # Install the "phar" archive
utility.
- if use phar ; then
- emake
INSTALL_ROOT="${D}" install-pharcmd
- dosym
"${dest}/bin/phar" "/usr/bin/phar${SLOT}"
- fi
+ # Install the "phar" archive
utility.
+ if use phar ; then
+ emake
INSTALL_ROOT="${D}" install-pharcmd
+ dosym
"..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
+ fi
;;
cgi)
source="sapi/cgi/php-cgi"
@@ -586,7 +586,7 @@ src_install() {
else
dobin "${source}"
local name="$(basename ${source})"
- dosym "${dest}/bin/${name}"
"/usr/bin/${name}${SLOT}"
+ dosym "..${dest#/usr}/bin/${name}"
"/usr/bin/${name}${SLOT}"
fi
fi
diff --git a/dev-lang/php/php-7.4.3-r1.ebuild b/dev-lang/php/php-7.4.3-r1.ebuild
index 3701941e244..f2c76031d7d 100644
--- a/dev-lang/php/php-7.4.3-r1.ebuild
+++ b/dev-lang/php/php-7.4.3-r1.ebuild
@@ -551,7 +551,7 @@ src_install() {
# Install the "phar" archive
utility.
if use phar ; then
emake
INSTALL_ROOT="${D}" install-pharcmd
- dosym
"${dest}/bin/phar" "/usr/bin/phar${SLOT}"
+ dosym
"..${dest#/usr}/bin/phar" "/usr/bin/phar${SLOT}"
fi
;;
cgi)
@@ -576,7 +576,7 @@ src_install() {
else
dobin "${source}"
local name="$(basename ${source})"
- dosym "${dest}/bin/${name}"
"/usr/bin/${name}${SLOT}"
+ dosym "..${dest#/usr}/bin/${name}"
"/usr/bin/${name}${SLOT}"
fi
fi
