[gentoo-commits] repo/gentoo:master commit in: dev-cpp/waylandpp/

[Craig Andrews]

commit:     41b1bcdf315fb667b5cade38d0f3f7392f199cd2
Author:     Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  7 13:44:00 2017 +0000
Commit:     Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Thu Sep  7 13:44:16 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41b1bcdf

dev-cpp/waylandpp: -9999 use newly added LIBDIR option

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 dev-cpp/waylandpp/waylandpp-9999.ebuild | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/dev-cpp/waylandpp/waylandpp-9999.ebuild 
b/dev-cpp/waylandpp/waylandpp-9999.ebuild
index 4b36e9aea8e..1dd04bc09c5 100644
--- a/dev-cpp/waylandpp/waylandpp-9999.ebuild
+++ b/dev-cpp/waylandpp/waylandpp-9999.ebuild
@@ -31,20 +31,15 @@ DEPEND="${RDEPEND}
        )
        "
 
-src_prepare() {
-       default
-       sed -i -e "s:\$\${prefix}/lib:$\${prefix}/$(get_libdir):" -e 
"s:os.path.join(root, prefix, \"lib\":os.path.join(root, prefix, 
\"$(get_libdir)\":g" SConstruct || die
-}
-
 src_compile() {
-       CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" ROOT="${D%/}/" 
PREFIX="/usr" escons
+       CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" ROOT="${D%/}/" 
PREFIX="/usr" LIBDIR="$(get_libdir)" escons
        if use doc; then
                doxygen || die "error making docs"
        fi
 }
 
 src_install() {
-       CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" ROOT="${D%/}/" 
PREFIX="/usr" escons install
+       CC="$(tc-getCXX)" PKG_CONFIG="$(tc-getPKG_CONFIG)" ROOT="${D%/}/" 
PREFIX="/usr" LIBDIR="$(get_libdir)" escons install
        # fix multilib-strict QA failures
        if use doc; then
                doman doc/man/man3/*.3