Update xvba dependency to use bundled vaapi in x11-drivers/ati-drivers. See bug #534710

(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key )

6 files changed, 35 insertions, 15 deletions

diff --git a/x11-libs/libva/ChangeLog b/x11-libs/libva/ChangeLog
index 0cccf681b4de..c8008d896262 100644
--- a/x11-libs/libva/ChangeLog
+++ b/x11-libs/libva/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/libva
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/ChangeLog,v 1.65 2015/01/05 13:18:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/ChangeLog,v 1.66 2015/01/06 19:33:30 mrueg Exp $
+
+  06 Jan 2015; Manuel Rüger <mrueg@gentoo.org> libva-1.3.1.ebuild,
+  libva-1.4.0.ebuild, libva-1.4.1.ebuild, libva-1.5.0.ebuild, libva-9999.ebuild:
+  Update xvba dependency to use bundled vaapi in x11-drivers/ati-drivers. See
+  bug #534710
 
 *libva-1.5.0 (05 Jan 2015)
 
diff --git a/x11-libs/libva/libva-1.3.1.ebuild b/x11-libs/libva/libva-1.3.1.ebuild
index 16b1a66b4e8e..1fd5da36f3be 100644
--- a/x11-libs/libva/libva-1.3.1.ebuild
+++ b/x11-libs/libva/libva-1.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.3.1.ebuild,v 1.3 2014/07/15 15:47:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.3.1.ebuild,v 1.4 2015/01/06 19:33:30 mrueg Exp $
 
 EAPI=5
 
@@ -52,7 +52,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
 	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_fglrx? ( >=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
+	video_cards_fglrx? (
+		|| ( >=x11-drivers/ati-drivers-14.12-r3[${MULTILIB_USEDEP}]
+			>=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
+		)
 	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
 	"
 
diff --git a/x11-libs/libva/libva-1.4.0.ebuild b/x11-libs/libva/libva-1.4.0.ebuild
index f35041e982be..19db7979ba70 100644
--- a/x11-libs/libva/libva-1.4.0.ebuild
+++ b/x11-libs/libva/libva-1.4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.4.0.ebuild,v 1.1 2014/10/24 07:00:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.4.0.ebuild,v 1.2 2015/01/06 19:33:30 mrueg Exp $
 
 EAPI=5
 
@@ -52,7 +52,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
 	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_fglrx? ( >=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
+	video_cards_fglrx? (
+		|| ( >=x11-drivers/ati-drivers-14.12-r3[${MULTILIB_USEDEP}]
+			>=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
+		)
 	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
 	"
 
diff --git a/x11-libs/libva/libva-1.4.1.ebuild b/x11-libs/libva/libva-1.4.1.ebuild
index 81d92fa0f497..9f9da150cadf 100644
--- a/x11-libs/libva/libva-1.4.1.ebuild
+++ b/x11-libs/libva/libva-1.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.4.1.ebuild,v 1.1 2014/10/27 11:03:15 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.4.1.ebuild,v 1.2 2015/01/06 19:33:30 mrueg Exp $
 
 EAPI=5
 
@@ -52,7 +52,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
 	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_fglrx? ( >=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
+	video_cards_fglrx? (
+		|| ( >=x11-drivers/ati-drivers-14.12-r3[${MULTILIB_USEDEP}]
+			>=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
+		)
 	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
 	"
 
diff --git a/x11-libs/libva/libva-1.5.0.ebuild b/x11-libs/libva/libva-1.5.0.ebuild
index dadc11c3ad67..d9fb1a7b280b 100644
--- a/x11-libs/libva/libva-1.5.0.ebuild
+++ b/x11-libs/libva/libva-1.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.5.0.ebuild,v 1.1 2015/01/05 13:18:48 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.5.0.ebuild,v 1.2 2015/01/06 19:33:30 mrueg Exp $
 
 EAPI=5
 
@@ -52,7 +52,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
 	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_fglrx? ( >=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
+	video_cards_fglrx? (
+		|| ( >=x11-drivers/ati-drivers-14.12-r3[${MULTILIB_USEDEP}]
+			>=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
+		)
 	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
 	"
 
diff --git a/x11-libs/libva/libva-9999.ebuild b/x11-libs/libva/libva-9999.ebuild
index db7ca0fd6e63..8b52b39328a7 100644
--- a/x11-libs/libva/libva-9999.ebuild
+++ b/x11-libs/libva/libva-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-9999.ebuild,v 1.22 2014/11/03 10:25:21 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-9999.ebuild,v 1.23 2015/01/06 19:33:30 mrueg Exp $
 
 EAPI=5
 
@@ -52,7 +52,10 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
 	vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
-	video_cards_fglrx? ( >=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
+	video_cards_fglrx? (
+		|| ( >=x11-drivers/ati-drivers-14.12-r3[${MULTILIB_USEDEP}]
+			>=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
+		)
 	video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
 	"