[gentoo-commits] dev/mgorny:master commit in: sys-devel/gcc/

[Michał Górny]

commit:     5baaebf94e47dacbcdd80890a736ab5139694a08
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Dec  2 22:42:36 2014 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Dec  2 22:42:36 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=dev/mgorny.git;a=commit;h=5baaebf9

sys-devel/gcc: Replace old toolchain.eclass variable references.

Package-Manager: portage-2.2.14

---
 sys-devel/gcc/gcc-4.9.2-r100.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-devel/gcc/gcc-4.9.2-r100.ebuild 
b/sys-devel/gcc/gcc-4.9.2-r100.ebuild
index 6f6d359..a552b15 100644
--- a/sys-devel/gcc/gcc-4.9.2-r100.ebuild
+++ b/sys-devel/gcc/gcc-4.9.2-r100.ebuild
@@ -195,7 +195,7 @@ src_configure() {
        LIBPATH=${PREFIX}/lib/gcc/${CTARGET}/${PV}
        INCPATH=${LIBPATH}/include
        DATAPATH=${PREFIX}/share/gcc-data/${CTARGET}/${PV}
-       STDCXX_INCDIR=${LIBPATH}/include/g++-v${GCC_BRANCH_VER%%.*}
+       STDCXX_INCDIR=${LIBPATH}/include/g++-v${PV%%.*}
 
        local langs=( c )
        use cxx && langs+=( c++ )
@@ -469,7 +469,7 @@ create_gcc_symlinks() {
 strip_gcc_executables() {
        # TODO: find out how to avoid prepstrip
        env RESTRICT="" CHOST="${CHOST}" prepstrip "${D}${BINPATH}"
-       env RESTRICT="" CHOST="${CHOST}" prepstrip 
"${D}${PREFIX}/libexec/gcc/${CTARGET}/${GCC_CONFIG_VER}"
+       env RESTRICT="" CHOST="${CHOST}" prepstrip 
"${D}${PREFIX}/libexec/gcc/${CTARGET}/${PV}"
        env RESTRICT="" CHOST="${CTARGET}" prepstrip "${D}${LIBPATH}"
 }
 
@@ -580,8 +580,8 @@ src_install() {
        export QA_WX_LOAD="usr/lib*/go/*/*.gox"
 
        # Disable RANDMMAP so PCH works. #301299
-       pax-mark -r "${D}${PREFIX}/libexec/gcc/${CTARGET}/${GCC_CONFIG_VER}/cc1"
-       pax-mark -r 
"${D}${PREFIX}/libexec/gcc/${CTARGET}/${GCC_CONFIG_VER}/cc1plus"
+       pax-mark -r "${D}${PREFIX}/libexec/gcc/${CTARGET}/${PV}/cc1"
+       pax-mark -r "${D}${PREFIX}/libexec/gcc/${CTARGET}/${PV}/cc1plus"
 
        prune_libtool_files