diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2015-07-14 08:51:10 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2015-07-14 08:51:10 +0000 |
| commit | 6763b33dbafd2b94665891a982cd88f6fbc9379c (patch) | |
| tree | 93050af42c9491d2e671d16052e2c4fea1809c04 /x11-libs | |
| parent | bump libva dep, bug #554206 by Priit Laes (diff) | |
| download | gentoo-2-6763b33dbafd2b94665891a982cd88f6fbc9379c.tar.gz gentoo-2-6763b33dbafd2b94665891a982cd88f6fbc9379c.tar.bz2 gentoo-2-6763b33dbafd2b94665891a982cd88f6fbc9379c.zip | |
fix regression overwriting REQUIRED_USE, bug #554398
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Diffstat (limited to 'x11-libs')
| -rw-r--r-- | x11-libs/libva/ChangeLog | 6 | ||||
| -rw-r--r-- | x11-libs/libva/libva-1.6.0.ebuild | 6 | ||||
| -rw-r--r-- | x11-libs/libva/libva-9999.ebuild | 6 |
3 files changed, 11 insertions, 7 deletions
diff --git a/x11-libs/libva/ChangeLog b/x11-libs/libva/ChangeLog index 22d6c0bf8f07..a14c59a3a7be 100644 --- a/x11-libs/libva/ChangeLog +++ b/x11-libs/libva/ChangeLog @@ -1,6 +1,10 @@ # 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.70 2015/07/06 14:38:15 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/ChangeLog,v 1.71 2015/07/14 08:51:10 aballier Exp $ + + 14 Jul 2015; Alexis Ballier <aballier@gentoo.org> libva-1.6.0.ebuild, + libva-9999.ebuild: + fix regression overwriting REQUIRED_USE, bug #554398 *libva-1.6.0 (06 Jul 2015) diff --git a/x11-libs/libva/libva-1.6.0.ebuild b/x11-libs/libva/libva-1.6.0.ebuild index c8f442d006a7..4f4a3b7e0195 100644 --- a/x11-libs/libva/libva-1.6.0.ebuild +++ b/x11-libs/libva/libva-1.6.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.6.0.ebuild,v 1.1 2015/07/06 14:38:15 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-1.6.0.ebuild,v 1.2 2015/07/14 08:51:10 aballier Exp $ EAPI=5 @@ -31,7 +31,6 @@ else KEYWORDS="" fi IUSE="+drm egl opengl vdpau wayland X" -REQUIRED_USE="|| ( drm wayland X )" VIDEO_CARDS="dummy nvidia intel fglrx nouveau" for x in ${VIDEO_CARDS}; do @@ -60,7 +59,8 @@ PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] ) " -REQUIRED_USE="opengl? ( X )" +REQUIRED_USE="|| ( drm wayland X ) + opengl? ( X )" DOCS=( NEWS ) diff --git a/x11-libs/libva/libva-9999.ebuild b/x11-libs/libva/libva-9999.ebuild index a86979b8d931..31cb912551b2 100644 --- a/x11-libs/libva/libva-9999.ebuild +++ b/x11-libs/libva/libva-9999.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-9999.ebuild,v 1.24 2015/07/06 14:38:15 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva/libva-9999.ebuild,v 1.25 2015/07/14 08:51:10 aballier Exp $ EAPI=5 @@ -31,7 +31,6 @@ else KEYWORDS="" fi IUSE="+drm egl opengl vdpau wayland X" -REQUIRED_USE="|| ( drm wayland X )" VIDEO_CARDS="dummy nvidia intel fglrx nouveau" for x in ${VIDEO_CARDS}; do @@ -60,7 +59,8 @@ PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] ) " -REQUIRED_USE="opengl? ( X )" +REQUIRED_USE="|| ( drm wayland X ) + opengl? ( X )" DOCS=( NEWS ) |