[gentoo-commits] repo/gentoo:master commit in: app-arch/zstd/

["David Seifert" <soap@gentoo.org>]

commit:     0aac30462244120dbebf37848ebe8c303cf6aad2
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 25 00:08:14 2016 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Oct 25 00:08:39 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0aac3046

app-arch/zstd: Fix ebuild

* Replace EROOT in src_* functions
* Call einstalldocs to install basic docs
* Use proper || die's for removing static libraries
* Pass CC and AR to make commands

Package-Manager: portage-2.3.2

 app-arch/zstd/zstd-1.1.0.ebuild | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/app-arch/zstd/zstd-1.1.0.ebuild b/app-arch/zstd/zstd-1.1.0.ebuild
index bcfe360..4e42b4f 100644
--- a/app-arch/zstd/zstd-1.1.0.ebuild
+++ b/app-arch/zstd/zstd-1.1.0.ebuild
@@ -4,6 +4,8 @@
 
 EAPI=6
 
+inherit toolchain-funcs
+
 DESCRIPTION="zstd fast compression library"
 HOMEPAGE="http://facebook.github.io/zstd/"
 SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -16,15 +18,27 @@ IUSE="static-libs"
 PATCHES=( "${FILESDIR}/${P}-fix_build_system.patch" )
 
 src_compile() {
-	emake PREFIX="${EROOT}usr" LIBDIR="${EROOT}usr/$(get_libdir)" zstd
-	cd lib &&
-		emake PREFIX="${EROOT}usr" LIBDIR="${EROOT}usr/$(get_libdir)" libzstd
+	emake \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" zstd
+
+	emake -C lib \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" libzstd
 }
 
 src_install() {
-	emake DESTDIR="${D}" \
-		PREFIX="${EROOT}usr" LIBDIR="${EROOT}usr/$(get_libdir)" install
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" install
+	einstalldocs
 
-	! use static-libs &&
-		rm -f $ "${ED}usr/$(get_libdir)/libzstd.a"
+	if ! use static-libs; then
+		rm "${ED%/}"/usr/$(get_libdir)/libzstd.a || die
+	fi
 }