media-libs/mesa: Don't depend on libdrm[video_cards_intel] for i965
authorMatt Turner <mattst88@gentoo.org>
Wed, 19 Jul 2017 00:14:13 +0000 (17:14 -0700)
committerMatt Turner <mattst88@gentoo.org>
Wed, 19 Jul 2017 00:14:13 +0000 (17:14 -0700)
Dependence is gone upstream since upstream commit 7dd20bc3ee8f

media-libs/mesa/mesa-9999.ebuild

index d9599efc3ac6b3b0b1bf87bdbc806ea850ef2a75..423878abdde3feb611716b0e49166f447912cd08 100644 (file)
@@ -32,9 +32,8 @@ LICENSE="MIT"
 SLOT="0"
 RESTRICT="!bindist? ( bindist )"
 
-INTEL_CARDS="i915 i965 intel"
 RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno imx nouveau vc4 vivante vmware"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 vivante vmware"
 for card in ${VIDEO_CARDS}; do
        IUSE_VIDEO_CARDS+=" video_cards_${card}"
 done
@@ -125,13 +124,12 @@ RDEPEND="
        )
        xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
        ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
-       RDEPEND="${RDEPEND}
-               video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
-       "
-done
 
+       video_cards_intel? (
+               !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+       )
+       video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+"
 for card in ${RADEON_CARDS}; do
        RDEPEND="${RDEPEND}
                video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )