commit: 7f40b6c262bfe5c8b3ca608a8e8ed71f7055bdcc
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 18 17:46:18 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jun 18 18:08:17 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f40b6c2
media-libs/mesa: Use virtual/libelf
media-libs/mesa/mesa-10.3.7-r1.ebuild | 17 ++++-------------
media-libs/mesa/mesa-11.0.6.ebuild | 15 +++------------
media-libs/mesa/mesa-11.0.9.ebuild | 15 +++------------
media-libs/mesa/mesa-11.1.3.ebuild | 15 +++------------
media-libs/mesa/mesa-11.1.4.ebuild | 15 +++------------
media-libs/mesa/mesa-11.2.1.ebuild | 15 +++------------
media-libs/mesa/mesa-11.2.2.ebuild | 15 +++------------
media-libs/mesa/mesa-7.10.3.ebuild | 2 +-
media-libs/mesa/mesa-9999.ebuild | 15 +++------------
9 files changed, 26 insertions(+), 98 deletions(-)
diff --git a/media-libs/mesa/mesa-10.3.7-r1.ebuild
b/media-libs/mesa/mesa-10.3.7-r1.ebuild
index 9ca7868..5f83757 100644
--- a/media-libs/mesa/mesa-10.3.7-r1.ebuild
+++ b/media-libs/mesa/mesa-10.3.7-r1.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$
@@ -101,19 +101,10 @@ RDEPEND="
>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
llvm? (
- video_cards_radeonsi? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- video_cards_r600? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
+ video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
+ video_cards_r600? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
!video_cards_r600? (
- video_cards_radeon? ( || (
-
>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-
>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
+ video_cards_radeon? (
virtual/libelf:0=[${MULTILIB_USEDEP}] )
)
>=sys-devel/llvm-3.3-r3:=[${MULTILIB_USEDEP}]
<sys-devel/llvm-3.6
diff --git a/media-libs/mesa/mesa-11.0.6.ebuild
b/media-libs/mesa/mesa-11.0.6.ebuild
index 5a849b1..0ac1269 100644
--- a/media-libs/mesa/mesa-11.0.6.ebuild
+++ b/media-libs/mesa/mesa-11.0.6.ebuild
@@ -97,15 +97,9 @@ RDEPEND="
>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
llvm? ( !kernel_FreeBSD? (
- video_cards_radeonsi? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
+ video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
!video_cards_r600? (
- video_cards_radeon? ( || (
-
>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-
>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
+ video_cards_radeon? (
virtual/libelf:0=[${MULTILIB_USEDEP}] )
) )
>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
<sys-devel/llvm-3.8
@@ -113,10 +107,7 @@ RDEPEND="
opencl? (
app-eselect/eselect-opencl
dev-libs/libclc
- !kernel_FreeBSD? ( || (
-
>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-
>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
+ !kernel_FreeBSD? (
virtual/libelf:0=[${MULTILIB_USEDEP}] )
)
openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
vaapi? ( >=x11-libs/libva-0.35.0:=[${MULTILIB_USEDEP}] )
diff --git a/media-libs/mesa/mesa-11.0.9.ebuild
b/media-libs/mesa/mesa-11.0.9.ebuild
index f07599c..4e8394e 100644
--- a/media-libs/mesa/mesa-11.0.9.ebuild
+++ b/media-libs/mesa/mesa-11.0.9.ebuild
@@ -95,15 +95,9 @@ RDEPEND="
>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
llvm? ( !kernel_FreeBSD? (
- video_cards_radeonsi? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
+ video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
!video_cards_r600? (
- video_cards_radeon? ( || (
-
>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-
>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
+ video_cards_radeon? (
virtual/libelf:0=[${MULTILIB_USEDEP}] )
) )
>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
<sys-devel/llvm-3.8
@@ -111,10 +105,7 @@ RDEPEND="
opencl? (
app-eselect/eselect-opencl
dev-libs/libclc
- !kernel_FreeBSD? ( || (
-
>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-
>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
+ !kernel_FreeBSD? (
virtual/libelf:0=[${MULTILIB_USEDEP}] )
)
openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
vaapi? ( >=x11-libs/libva-0.35.0:=[${MULTILIB_USEDEP}] )
diff --git a/media-libs/mesa/mesa-11.1.3.ebuild
b/media-libs/mesa/mesa-11.1.3.ebuild
index c4a3cd7..93ba2c4 100644
--- a/media-libs/mesa/mesa-11.1.3.ebuild
+++ b/media-libs/mesa/mesa-11.1.3.ebuild
@@ -95,15 +95,9 @@ RDEPEND="
>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
llvm? ( !kernel_FreeBSD? (
- video_cards_radeonsi? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
+ video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
!video_cards_r600? (
- video_cards_radeon? ( || (
-
>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-
>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
+ video_cards_radeon? (
virtual/libelf:0=[${MULTILIB_USEDEP}] )
) )
>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
<sys-devel/llvm-3.8
@@ -111,10 +105,7 @@ RDEPEND="
opencl? (
app-eselect/eselect-opencl
dev-libs/libclc
- !kernel_FreeBSD? ( || (
-
>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-
>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
+ !kernel_FreeBSD? (
virtual/libelf:0=[${MULTILIB_USEDEP}] )
)
openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
vaapi? ( >=x11-libs/libva-1.6.0:=[${MULTILIB_USEDEP}] )
diff --git a/media-libs/mesa/mesa-11.1.4.ebuild
b/media-libs/mesa/mesa-11.1.4.ebuild
index c4a3cd7..93ba2c4 100644
--- a/media-libs/mesa/mesa-11.1.4.ebuild
+++ b/media-libs/mesa/mesa-11.1.4.ebuild
@@ -95,15 +95,9 @@ RDEPEND="
>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
llvm? ( !kernel_FreeBSD? (
- video_cards_radeonsi? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
+ video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
!video_cards_r600? (
- video_cards_radeon? ( || (
-
>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-
>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
+ video_cards_radeon? (
virtual/libelf:0=[${MULTILIB_USEDEP}] )
) )
>=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
<sys-devel/llvm-3.8
@@ -111,10 +105,7 @@ RDEPEND="
opencl? (
app-eselect/eselect-opencl
dev-libs/libclc
- !kernel_FreeBSD? ( || (
-
>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-
>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
+ !kernel_FreeBSD? (
virtual/libelf:0=[${MULTILIB_USEDEP}] )
)
openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
vaapi? ( >=x11-libs/libva-1.6.0:=[${MULTILIB_USEDEP}] )
diff --git a/media-libs/mesa/mesa-11.2.1.ebuild
b/media-libs/mesa/mesa-11.2.1.ebuild
index 4bc07f8..570b78e 100644
--- a/media-libs/mesa/mesa-11.2.1.ebuild
+++ b/media-libs/mesa/mesa-11.2.1.ebuild
@@ -95,25 +95,16 @@ RDEPEND="
>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
llvm? ( !kernel_FreeBSD? (
- video_cards_radeonsi? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
+ video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
!video_cards_r600? (
- video_cards_radeon? ( || (
-
>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-
>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
+ video_cards_radeon? (
virtual/libelf:0=[${MULTILIB_USEDEP}] )
) )
>=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
)
opencl? (
app-eselect/eselect-opencl
dev-libs/libclc
- !kernel_FreeBSD? ( || (
-
>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-
>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
+ !kernel_FreeBSD? (
virtual/libelf:0=[${MULTILIB_USEDEP}] )
)
openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
vaapi? ( >=x11-libs/libva-1.6.0:=[${MULTILIB_USEDEP}] )
diff --git a/media-libs/mesa/mesa-11.2.2.ebuild
b/media-libs/mesa/mesa-11.2.2.ebuild
index 4bc07f8..570b78e 100644
--- a/media-libs/mesa/mesa-11.2.2.ebuild
+++ b/media-libs/mesa/mesa-11.2.2.ebuild
@@ -95,25 +95,16 @@ RDEPEND="
>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
llvm? ( !kernel_FreeBSD? (
- video_cards_radeonsi? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
+ video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
!video_cards_r600? (
- video_cards_radeon? ( || (
-
>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-
>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
+ video_cards_radeon? (
virtual/libelf:0=[${MULTILIB_USEDEP}] )
) )
>=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
)
opencl? (
app-eselect/eselect-opencl
dev-libs/libclc
- !kernel_FreeBSD? ( || (
-
>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-
>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
+ !kernel_FreeBSD? (
virtual/libelf:0=[${MULTILIB_USEDEP}] )
)
openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
vaapi? ( >=x11-libs/libva-1.6.0:=[${MULTILIB_USEDEP}] )
diff --git a/media-libs/mesa/mesa-7.10.3.ebuild
b/media-libs/mesa/mesa-7.10.3.ebuild
index 40c7513..c896c15 100644
--- a/media-libs/mesa/mesa-7.10.3.ebuild
+++ b/media-libs/mesa/mesa-7.10.3.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$
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index bf3dbcc..22068d2 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -95,25 +95,16 @@ RDEPEND="
>=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
llvm? ( !kernel_FreeBSD? (
- video_cards_radeonsi? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
+ video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
!video_cards_r600? (
- video_cards_radeon? ( || (
-
>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-
>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
+ video_cards_radeon? (
virtual/libelf:0=[${MULTILIB_USEDEP}] )
) )
>=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
)
opencl? (
app-eselect/eselect-opencl
dev-libs/libclc
- !kernel_FreeBSD? ( || (
-
>=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
-
>=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
+ !kernel_FreeBSD? (
virtual/libelf:0=[${MULTILIB_USEDEP}] )
)
openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
vaapi? ( >=x11-libs/libva-1.6.0:=[${MULTILIB_USEDEP}] )
