From fed428ca9f0daa92a61d8d6a8875cb4a1e84cbf0 Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Tue, 3 Mar 2020 15:03:41 -0500 Subject: [PATCH] dev-lang/php: Use relative symlinks; whitespace Signed-off-by: Brian Evans --- 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 96047b4e6677..e032d1b3af00 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 1726c6222789..75ec441d1c32 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 3701941e2440..f2c76031d7de 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 -- 2.26.2