[gentoo-commits] repo/gentoo:master commit in: sys-devel/gcc-apple/

[Fabian Groffen]

commit:     85352f772d456ba2c7234e5f3d0af49425857844
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  5 07:51:08 2018 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Jan  5 07:51:33 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85352f77

sys-devel/gcc-apple: use relative symlinks with dosym

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild
index bd1d1120995..12f3d99760d 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -138,6 +138,7 @@ src_prepare() {
 
 	local BRANDING_GCC_PKGVERSION="$(sed -n -e '/^#define VERSUFFIX/s/^[^"]*"\([^"]\+\)".*$/\1/p' "${S}"/gcc/version.c)"
 	BRANDING_GCC_PKGVERSION=${BRANDING_GCC_PKGVERSION/(/(Gentoo ${PVR}, }
+	# ) ) } # <- to help Vim highlight this correctly
 	einfo "patching gcc version: ${GCC_VERS}${BRANDING_GCC_PKGVERSION}"
 
 	sed -i -e "s~VERSUFFIX \"[^\"]*~VERSUFFIX \"${BRANDING_GCC_PKGVERSION}~" \
@@ -314,9 +315,9 @@ src_install() {
 			ln -sf ${CTARGET}-${x} ${x}
 
 			# Create version-ed symlinks
-			dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
+			dosym ../${BINPATH#${EPREFIX}/usr/}/${CTARGET}-${x} \
 				/usr/bin/${CTARGET}-${x}-${GCC_VERS}
-			dosym ${BINPATH#${EPREFIX}}/${CTARGET}-${x} \
+			dosym ../${BINPATH#${EPREFIX}/usr/}/${CTARGET}-${x} \
 				/usr/bin/${x}-${GCC_VERS}
 		fi