[gentoo-commits] repo/gentoo:master commit in: sys-libs/tapi/

[Fabian Groffen]

commit:     353da60003022823a64948adc2662bf75e91679a
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 29 20:30:29 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Dec 29 20:30:29 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=353da600

sys-libs/tapi: simplify by using S

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 sys-libs/tapi/tapi-2.0.0.ebuild | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/sys-libs/tapi/tapi-2.0.0.ebuild b/sys-libs/tapi/tapi-2.0.0.ebuild
index 586bd1d95c2..a789277cf7a 100644
--- a/sys-libs/tapi/tapi-2.0.0.ebuild
+++ b/sys-libs/tapi/tapi-2.0.0.ebuild
@@ -61,10 +61,7 @@ CLANG_S="${WORKDIR}"/${CLANG_P}.src
 
 APPLE_LLVM_S="${WORKDIR}/${APPLE_LLVM_P}"/src
 
-TAPI_S="${WORKDIR}"/${TAPI_P}
-
-# to avoid ebuild dying
-S=${WORKDIR}
+S="${WORKDIR}"/${TAPI_P}
 
 TAPI_BUILD="${WORKDIR}"/${P}_build
 
@@ -88,7 +85,7 @@ src_prepare() {
        CMAKE_USE_DIR="${PWD}" \
                cmake-utils_src_prepare
 
-       cd "${TAPI_S}" || die
+       cd "${S}" || die
        eapply "${FILESDIR}"/${PN}-2.0.0-standalone.patch
        CMAKE_USE_DIR="${PWD}" \
                cmake-utils_src_prepare
@@ -147,7 +144,7 @@ src_configure() {
                -DOBJCMETADATA_LIBRARY_DIRS="${OBJCMD_ROOT}"/lib
        )
 
-       cd "${TAPI_S}" || die
+       cd "${S}" || die
        BUILD_DIR="${TAPI_BUILD}/" \
                CMAKE_USE_DIR="${PWD}" \
                cmake-utils_src_configure
@@ -170,7 +167,7 @@ src_compile() {
                ${CMAKE_MAKEFILE_GENERATOR} install
 
        # finally build tapi
-       cd "${TAPI_S}" || die
+       cd "${S}" || die
        BUILD_DIR="${TAPI_BUILD}" \
                CMAKE_USE_DIR="${PWD}" \
                cmake-utils_src_compile