From: Chí-Thanh Christopher Nguyễn Date: Mon, 4 Jul 2016 17:37:06 +0000 (+0200) Subject: media-libs/libepoxy: fix mulitlib dependencies X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=831e64cedcd599fcf164ff92ac936c8e896c011c;p=gentoo.git media-libs/libepoxy: fix mulitlib dependencies Bug: https://bugs.gentoo.org/show_bug.cgi?id=541088 Package-Manager: portage-2.2.28 --- diff --git a/media-libs/libepoxy/libepoxy-1.3.1.ebuild b/media-libs/libepoxy/libepoxy-1.3.1.ebuild index 7fc3ebf11398..bfb543c8f9d6 100644 --- a/media-libs/libepoxy/libepoxy-1.3.1.ebuild +++ b/media-libs/libepoxy/libepoxy-1.3.1.ebuild @@ -19,7 +19,7 @@ inherit autotools-multilib ${GIT_ECLASS} python-any-r1 DESCRIPTION="Epoxy is a library for handling OpenGL function pointer management for you" HOMEPAGE="https://github.com/anholt/libepoxy" if [[ ${PV} = 9999* ]]; then - KEYWORDS="alpha arm hppa ppc64" + KEYWORDS="" SRC_URI="" else KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc x86" @@ -29,12 +29,12 @@ fi LICENSE="MIT" SLOT="0" IUSE="test" -RESTICT="test" # FIXME: tests fail when run from portage. +RESTRICT="test" # FIXME: tests fail when run from portage. DEPEND="${PYTHON_DEPS} - media-libs/mesa[egl] + media-libs/mesa[egl,${MULTILIB_USEDEP}] x11-misc/util-macros - x11-libs/libX11" + x11-libs/libX11[${MULTILIB_USEDEP}]" RDEPEND="" src_unpack() { diff --git a/media-libs/libepoxy/libepoxy-9999.ebuild b/media-libs/libepoxy/libepoxy-9999.ebuild index 98ef5b031cde..5d12655576be 100644 --- a/media-libs/libepoxy/libepoxy-9999.ebuild +++ b/media-libs/libepoxy/libepoxy-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -29,12 +29,12 @@ fi LICENSE="MIT" SLOT="0" IUSE="" -RESTICT="test" # FIXME: tests fail when run from portage. +RESTRICT="test" # FIXME: tests fail when run from portage. DEPEND="${PYTHON_DEPS} - media-libs/mesa[egl] + media-libs/mesa[egl,${MULTILIB_USEDEP}] x11-misc/util-macros - x11-libs/libX11" + x11-libs/libX11[${MULTILIB_USEDEP}]" RDEPEND="" src_unpack() {