fix regression overwriting REQUIRED_USE, bug #554398

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 17 insertions, 13 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/Manifest b/x11-libs/libva/Manifest
index ef8a97725310..0bb1ac320ec8 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -14,14 +14,14 @@ EBUILD libva-1.4.0.ebuild 2449 SHA256 c133d62828dd0b76f613866b3fb890e58994a89886
 EBUILD libva-1.4.1.ebuild 2449 SHA256 2fdcd1d674ca6a339e2462fb9dc22637c0282982e31e7f04a71974b72d02a689 SHA512 8d76001c7eecdf20e50c54efde2911b5ec2b132abb9743680c4414b5c5401c4390164970b79f7493bedc5998360977b05831abea6c36342f83588b2534968ec4 WHIRLPOOL c9f241f1f5897a06f573835a48ea7a577012eb1e82a4f59f9055507e8b3f11c6b945b6c5cd0ba4704816288df110454cc6426189472e407b3b07fd2eae3f6078
 EBUILD libva-1.5.0.ebuild 2375 SHA256 2fabb3d411c1debf0b125e5dabb1948c991b101d4c8a748b5eb717d8faccec68 SHA512 3956c889e266075bc7d224823af6eccf35dd92c95f33f22427a41c81cd4e7236bfbd6c1fad597253393e2277426dda49ea0c5470a749661508d6eedd2a58593a WHIRLPOOL 9f44f1193e5bddc23a700700d4f3644bd3a1f8f35afb2f0ca07947cda08b1cdc1bbec0d8fb851704444ce457ec35e427fda6339fd1f5c9457811bae8a54fb587
 EBUILD libva-1.5.1.ebuild 2623 SHA256 2e97bd5feee1660909ad16cc6660b03c385d62ec2507f760e5e40d0dad8383ff SHA512 d3a07b22774ee8f08b41368ec3e6c51aa1c6cd3e648799375790b2954f678279a75ffc028f4053e719128b29332d695afae93e3b14c7b72b7a7976bd7b529d33 WHIRLPOOL 3aae2ce57e8faa8cd759634d464d7f392af4d6f0844904c4a2b87556d71e0e3cb7b50920273b69226223aa4741e7f21c2ac5b30f6d305bb8256c76100bb85ebb
-EBUILD libva-1.6.0.ebuild 2626 SHA256 22a918a3bf298b91c9600a4b04e039af9bb3b7d338d849c2e38805589ac24b1d SHA512 cf3395fc327cf3e96b611a9c8c70420ce57785b3d231d9eafd2246dcd04f50280a3336a1f69cb6b7d8a3d384709a1b054f77aebcaf809862e95836302e011476 WHIRLPOOL ef3eb477bb66c3ba97ac5991816ccdd71f2e66de3e9dda832a5db3ab9796f691c634ad7a7867c9baf3155d83a55f3d2bc2b6cf6736adf6bc6cb941fe7b7a8550
-EBUILD libva-9999.ebuild 2471 SHA256 856e9d327a77bfac785c36585a82e32b34e79a615ebf456f752464473b8bb74c SHA512 95c61b1361b1b5a4f80e5204102ec5f1a9b109a0fe2035e31616dce35b52889a8e1fabc714abb3793568abe40821f4e4d2fde201722f47d162f4cf8b0ad9d324 WHIRLPOOL 0a5e420a9fa1d0bbee35abf0e2f85e2378758cad63754dc459979cdc58b28fbed6a638f36858bd4f1ae28c381b1a170c4d1e21e3e8e4e199161d28bcbdcbf1b0
-MISC ChangeLog 11078 SHA256 8264e1b2c1e9962f10836bf3e4e08c4328e9fcc3482b3945a5ba09fc9d4c8bc5 SHA512 15317a8795178d875c76db39ab2f6c81a749e725e3c30763a0838069989607e4f68f02bb2b5a490b18b18cdc42164a0fdc827a006fc4f4346a1727748a7a739f WHIRLPOOL 485f71e4d51d800aa587311a97ee94faf344cb2c70078f46f8a56737ea8f355e2232ec76692423b216727f5f574aeb4402a715b6c05f17712dbdab47134dabae
+EBUILD libva-1.6.0.ebuild 2613 SHA256 8923b40ba5d2d540ec4f720e990e57c1c6beb82f0605d6374e988cd84ffc229a SHA512 67ed7ea90e27e95bb28c1639fb502c5f04e7e11ca8b9d61f3638e58b32f6b47b3da23f24cbf5b6ec2259371cad4c268e8b7fcc79e8c51df30e94f357874246aa WHIRLPOOL e1da8c46935db305efe50782da5b34b91e285ecfb9a348a0d95e347cdbf5a46f8cfa72be548f08042d5eb6a8575a307bcc2619c7483fb7b6310e2397e6539ab3
+EBUILD libva-9999.ebuild 2458 SHA256 c7429465d1cd9f8c2cb50af128b914d4c83384d1d23b0dbc06d224fa78e06248 SHA512 fa7803d7537a4c343d155099b59f7716dc6164a710c2a0923df8e6696a1454c5630a6b6174c989f7e3ca82cdefc6137a6349cefe655a89e256ca81405372aa23 WHIRLPOOL 30b2ed373bc77acbc4ead6e9bc79217e9649f0571c16fb87a1b493196509be85bbba4c2a4a2dc473346e8a8979ab5a210eaf38e1041bbee66628f066e1d15498
+MISC ChangeLog 11227 SHA256 b8e6b85d701cccb86db9104d314f66b1d01cb44a243b31dbd09e407bd047a082 SHA512 0ae86a052b5f6e5eb8f3656c9f1e0d4bd1a54d298c2bafea2e5866c102cc26fb21658c3d6296b582b16bcabde270a1db3f5b7ddeb6ee29455e39753a225bd167 WHIRLPOOL 3e6974258bbc41f1b87ee9296d6fd35cd665fec93c455e8176a5f47164527c29ff69dc958d3a87c8ee846463f557a9778a950e500b1c77d31a465eb99699d210
 MISC metadata.xml 360 SHA256 89b04f6b5df8b32ce52e950dd6861ab8b27c56ee9187b511b07d557d583d47b9 SHA512 ffbf3e513601bcd30a21371790c4379136de2193246881e8b01d19ffe837fa387ab0277ff8d3e0218157ca1c070a9eb74c0f22cb4be4b9620b41c54746b738d1 WHIRLPOOL 0592d5c21a3c6e73a1b8debab4bc8e2f1f9ca48fdc0e2a0459656de4befd71e763ac3d961936e936443f1a80beedf9b99c8061728b534085587a6136ec1b55fd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlWaktkACgkQvFcC4BYPU0r+3ACeIW35daVSbdjif9uPqkctJquC
-BucAmwV64akCt3W/Ag3QmVO4pyjC9TZK
-=h2Tp
+iEYEAREIAAYFAlWkzX8ACgkQvFcC4BYPU0r3yACdG6+NJ9jbBRLiCc3xeUU9w71N
++bQAoKGid+v6KtDjSg238AGTvc+/Fd+S
+=VpCG
 -----END PGP SIGNATURE-----
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 )