From cc1842ab777215040ec7f0b6643718624ff22db5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 11 Jan 2015 15:15:24 +0200 Subject: proper multilib ebuild for primus --- x11-misc/primus/primus-9999.ebuild | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/x11-misc/primus/primus-9999.ebuild b/x11-misc/primus/primus-9999.ebuild index 0df46970..595ae948 100644 --- a/x11-misc/primus/primus-9999.ebuild +++ b/x11-misc/primus/primus-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI=4 +EAPI=5 -inherit multilib git-2 +inherit multilib-build git-2 DESCRIPTION="Faster OpenGL offloading for Bumblebee" HOMEPAGE="https://github.com/amonakov/primus" @@ -14,32 +14,27 @@ EGIT_REPO_URI="git://github.com/amonakov/primus.git https://github.com/amonakov/ LICENSE="ISC" SLOT="0" KEYWORDS="" -IUSE="multilib" +IUSE="" RDEPEND="x11-misc/bumblebee[video_cards_nvidia] - multilib? ( app-emulation/emul-linux-x86-xlibs app-emulation/emul-linux-x86-baselibs )" +" DEPEND="virtual/opengl" src_compile() { export PRIMUS_libGLa='/usr/$$LIB/opengl/nvidia/lib/libGL.so.1' - emake LIBDIR=$(get_libdir) - if use multilib; then - local ABI=x86 - local CXXFLAGS="${CXXFLAGS} -m32" + mymake() { emake LIBDIR=$(get_libdir) - fi + } + multilib_parallel_foreach_abi mymake } src_install() { sed -i -e "s#^PRIMUS_libGL=.*#PRIMUS_libGL='/usr/\$LIB/primus'#" primusrun - sed -i -e "s/^# PRIMUS_libGL=/PRIMUS_libGL=/" primusrun dobin primusrun - insinto /usr/$(get_libdir)/primus - doins ${S}/$(get_libdir)/libGL.so.1 - if use multilib; then - local ABI=x86 + myinst() { insinto /usr/$(get_libdir)/primus doins ${S}/$(get_libdir)/libGL.so.1 - fi + } + multilib_foreach_abi myinst } -- cgit v1.2.3