Don't try to reference USE flag that doesn't exist.

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

5 files changed, 27 insertions, 28 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 7a90a5ac10e5..d5da665d9d03 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.921 2014/12/15 05:50:48 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.922 2014/12/18 13:36:50 kensington Exp $
+
+  18 Dec 2014; Michael Palimaka <kensington@gentoo.org> vlc-2.1.2.ebuild,
+  vlc-2.1.4.ebuild, vlc-2.1.5.ebuild:
+  Don't try to reference USE flag that doesn't exist.
 
   15 Dec 2014; Yixun Lan <dlan@gentoo.org> vlc-2.1.2.ebuild, vlc-2.1.4.ebuild,
   vlc-2.1.5.ebuild, vlc-2.1.9999.ebuild, vlc-2.2.9999.ebuild, vlc-9999.ebuild:
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 3d94df49bf8c..4cc379a6ed17 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -9,29 +9,30 @@ AUX vlc-9999-libva-1.2.1-compat.patch 291 SHA256 54eb34b32afe6876fa40abac2cb9709
 DIST vlc-2.1.2.tar.xz 19609868 SHA256 219b812be1bc2eba40faa86419d0aa2c479a7380af8af216e8bfa22eb6fc8ec4 SHA512 24ea51befb30ec2e4f796866bf086d36e809cb97bf04203a4637518c91a3035fa38a8e778aaf6fb3481db49d19236ae88bcbf31e1e4f7ae79b9d7bcc3cf037af WHIRLPOOL 7e4576370ea4a0d74d29b936f7c554c4fa22ca6b5d9260ce76d0e2bddf50826a2472c77746de61c81bd4601bead49f85c5c76a2f7ca309601c7a684c7091d09a
 DIST vlc-2.1.4.tar.xz 19560884 SHA256 3e566c7525478167e18cc53dc75d621e4af91eb40aabb6231e47db25d682d5d3 SHA512 da09744d0da1742a89747a34f749b83a30b18ddfc84ed9ee1a59a1c16cfa4ce0e7d4ddd66e9dfd13d5309b7ff66f72a7d3b2c3837ec740a193656ce6f8b04845 WHIRLPOOL 4929a66f4f1afc44726bb2d88e2e5e9b770811f57d21ee2258ccf84d7f5997c29b5b07bbb41cfc165b78339e4b070eadd5be958059f68d8f6e57b565eb977396
 DIST vlc-2.1.5.tar.xz 19574208 SHA256 6f6566ab6cd90d381395b7f0e401060b044cd3843e50ceb252b558a88e5d1f72 SHA512 37c6b82b4e89f4a14ed391cc677d9325a032e04bcc51a3e0d7d2ccf9e17a7a0deb90d9129e9dc3baf05a1ea9dae9c05e3177ab17a31098aafa6a2cb23388fa32 WHIRLPOOL c13098f922c7b24f3c718e88807a7dcb656af21bcf2be63d2ec7401583680658bd371e3935ba22537857861e0b1b0c4f0e693c87ed20999c679b4a04cddf7008
-EBUILD vlc-2.1.2.ebuild 14305 SHA256 a933a9e87fb450e1e7db0b16a29d962f1bd6ef63e775ab989422cdaee322f734 SHA512 d6b8f3da3e4b0421e554c8216b3bc2486a91227501b0cd048f70a15e49d54132c5778fe2963976d40b517fc09d9ec62e7fc51c74b76b7ade0a5d79c45801eefe WHIRLPOOL 11e374cf1f5b4b6e50de5de963f555c808d98d8ee2f31494422837d5690667a018024a471c7c4d9fc1c13be0b25c84353e220f3e39afb6913e71d57d92b9bd5e
-EBUILD vlc-2.1.4.ebuild 14671 SHA256 df58df978e490a1aecc6d3222a1802ee8ee6667ab6479cf52fc81dd8123bfd8b SHA512 4b7e0d2d003caf8bdf914f53eb7b24a1de73a70b8faf84cbe285d98ad54980a9f4acd3c5e8ae9322ec96420d5456e8e71c8c005888b898e757febe2e74347421 WHIRLPOOL b72f0b5652cc363e60460f688079e50c7abdf687e08516cf9e7789c6f85b3005beb1078cd75a22e6e6486d59d8e179f2ccd34b3e98d9551a9fcb26a13e16dbfa
-EBUILD vlc-2.1.5.ebuild 14762 SHA256 6ac6e3317c8826c24394fb1ce750f14675cc147144331f1dc1b7e1afa4e31c35 SHA512 ce0a2e8883adea41aaad4d16486f723ff509e4c8b812825758ce6fd2f67632383ddaf0d106f0e407a2224b9ce4b64db75b068a1b41b91d0046d08f9fa9bcbc92 WHIRLPOOL 6261162b6276cc3e6bedf0a4d8ed02bf9897a957f22a6d23a86b8c9f17ca8eaf12ecc2b25f6f17beae57b36e3c666cd67c84ea100a9eec8cf20eca71599442e7
+EBUILD vlc-2.1.2.ebuild 14268 SHA256 5115c8ab7d11efe4888e5e82bbf30b947e9f522c6844ba1e2655ce1d6ffef601 SHA512 76605bd8e638aea825660e4524de460b7e8d8d4620870a657e9c420596a11d40738c8597a0799b5cbbb306fcd08fa2ddb49c5fe6fcde6eba75112205120fce80 WHIRLPOOL 6633da016d78d1854dc0d83698cd322237eb7e61b7ea70caeadfa3fbc35eec2dcc2218a06f058feea1b7f98fd11d1579d6cad294e71be0b5a3d26627f60f3a92
+EBUILD vlc-2.1.4.ebuild 14634 SHA256 4282c317b9249cf5df28be4d5c4761dfa327248b0fe45329d56074bea5619614 SHA512 b94abc464901a11fd8e5530a5a5e2be25e65f2199f0961ab506ab6281ce03c0558f0f4b4ace6e81accaf8e3b346e18126fa77517e6dfe8ebe81c89f5b7aca780 WHIRLPOOL 0c940e6b46eb70567f910c4017f07bca7d3d48b557c1759eb7c68824b0d7ce915369ab2824c520d1df05d4d906e4290de847a4b40558b91f90c1025ef8b2ac44
+EBUILD vlc-2.1.5.ebuild 14725 SHA256 81ef391e7b7587d31c3108c33b2cb51d175d66efc27c017896c1a1f5250be641 SHA512 bf988d705975c1a671bfa7483a0f894ec3015fd7684600e37a984f7c31bd12089e6fef1ccb97bdde4535435047fbebcad507146d6162889b940b7c5b03f0c721 WHIRLPOOL 8dbccd0bc5d2ed5cc1843081b58fc4d6bd12645a8984e05b8e85f4f994ad9e4ca7062b61299d342bbff98162c4b513ee6aeeae843c080684e260b092397ae815
 EBUILD vlc-2.1.9999.ebuild 14674 SHA256 3ce6695993bde672273a4fa3b4690797c63a4c2cdc47c0729a22c4a629a3b1a3 SHA512 404e5e1356ecfe911577689939d48c53e4ab770bd7eb1a71a18763b321652c2c011c37c15af0e6117e8f27bedf707cd07373f5ef9803594edff51e6775a1c4a7 WHIRLPOOL 2b94f553ce7c9b78c07514abff97cc620752ba1ad8aec26237e8063fb543eb4c1fea00482a32259840c06abae4c8538e74ab3aa5176677c898c04ae534b4d138
 EBUILD vlc-2.2.9999.ebuild 14908 SHA256 5734d38108fac9940b8b0f356216c2d96230bfe1daeb972c7b6ba472562b01ba SHA512 8e7e6b0664f5e4e5c8c2cc28696212eb5e48dd927305dc84f9511d057925b9fe043a3ab85b9e99deb2e440af9cc8644cac9b65b09476ca383f34bcdaf18b776b WHIRLPOOL b6f480d04418ad4e563f44a59bd6266b0620bbd93167fded32fa346166220fcc97eeb68f70810da02eea2d6a3dd3c14655e7e59faed52df2aed1f01c20798c31
 EBUILD vlc-9999.ebuild 14900 SHA256 594bf0891e886092c20a6f923dd548b96c9015f32e7c00f2fca0b3e704ebc610 SHA512 b4a99acf6d492efc9132eb540cb455e4ade07e9e29005de9a4309465c8bb0931e3891215f224b1634626a4cd802bd3cfb7e8286751759eb5b0c34ed0d8295151 WHIRLPOOL 404de31144e692c67802c05d48281cc55674b4d4fcbc2bf04df84badee24884c286142ceaeeefc87d494d5a367d93e45c527b3e06737408c7dac15a44d3b13cd
-MISC ChangeLog 32196 SHA256 5c61c5f97b6542bb81d5d44c54ca1441fa46d5206a34f3a7d2ec34d9af192de5 SHA512 cf5204b61a4be1588d08286135fe91933349070ac9aeecb5edf813672c7a4471278ccd1defc1b3b98e1c0c4c47c731a574d1f7005529e3c16b49810eacba5812 WHIRLPOOL 918533beed9bd75013ec85cb83fb32470803ec7fb788eca3bbfb6ac206f79c2c01aec1d898e0bf7b220d2484487c2bd49085dd19d385fb76e738179013e38490
+MISC ChangeLog 32369 SHA256 db0314b61aab611c24a09370c74bae3b4de1e7627fe5634d021c69dc87bd65bf SHA512 960b3fa28fc9544bf673b5a25d1e5daedf423e9bc0f1f8035788ec5691403ac634bebc01dee0c8ad27b247884ec3924e45d1f764fb0f989b58b19a3309217bc1 WHIRLPOOL 6a18cc5a45a6be69eef057a57185be86cb1fd6b53b06d98be5f538c9472e1ec5269204a8677130033cbfa5e6a5ad46a9fe5ed12c5d43583ec64c53a76f2e5b6f
 MISC ChangeLog-2011 113818 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2 SHA512 9b1060fc57d0a8912a38c269b7ec140287c883798f6f3528f0f2d43b5772817f31e0addf4f88f139b82cda4e094d2f9a30e3b9d1933022b81b974436ed158d9d WHIRLPOOL bfe449ace05bac74b195d82eb2b3648b2240f92dabf6446f6ba93ca51b7ecd999ab5b9247dfd1f1a7cdab8d309684ffcd1c829773a471d862c19814a18db7ffe
 MISC metadata.xml 6542 SHA256 e0e3e42a1d4154a172ab9b484a53e51765a47334f4380b3dd9319140e48e29f5 SHA512 986b6088cf654051271249ac3779473410be06e97aee45a69842e33af3b63dbbdb4c475b7c35e6cbbdf8f7589bd0bf4f0bc520f295274332ceb0d8a3ec3dd6fe WHIRLPOOL f58561b53d63f5ead7142a7297ae17176b0889c3f8d30d4b300b3747a5891c8ed6b6b5b3df056add768eb7cac81196cc8ca5b9fdf737ff2dab48b3487b31bf26
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJUjnbZAAoJEJIMDbyqvv1VclUQAL/Qihowk989GUBCHf/WGuVl
-DD8ZGr7z4DTy4wOlZFFztz182BVSynBdidNHkKLXJDuvXp2u03F6YukegR1qLR9S
-AHC6NBzu13AxfNcX9TzNONxPbXgJWByxZd95I9asInttkLk1Z5PxfRzECqkD42Zm
-HYUGGsNNHJ+Nt+IW/g7xQIrYu6KrfJ7SrDXgyreqzWevVkZ6rKfKw4+2wkQ17ebb
-1OHzI/UbzcGm5RdmsUy8JBMB99phfwTBuZqr4FOjTbVUUzYCgHN/4s+YYJU9VEWx
-TUnXFEyXFyfPbHcHpxlcDO53JVMBOr0iTEdSkwZcGGeUyRU2bMthgimhkmJd745Y
-OyFwOhtAOLstuPEH4oI03Ec3Cdoegi2HatgWislZZxsUwvR0K+/UblPxP6RLchXz
-2ukacITIQWRiIRzhoMktw+kBPXzgIDYqtU6TavpWP7flVIeJye9n8gSELQCWjYGo
-FGbTPZVeMQPEhnRo3b2RcT5bROdcyMjMsgDwsyxUYt8MMgqzRVhIBo9Z0AUFrWcD
-J0WN09bEtniPiI7hPr40nwa5fZvk7gi/7sLGd/nL0JI4giRmFx5P7+3oIKKuzpRX
-MNChaT6tpe0mCYeyN8NxAYIOxLlDzMj29HKeIZgnA3ECP2AhkzccGDbVyz05VUwb
-2W4qlhApaY/y7lVSwgYg
-=TnYG
+iQJiBAEBCABMBQJUkti2RRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7LNFD/0cviJFv8QTeh12iVO2aajqQBrzfsuRc/QRMgxzcKvWe2WtnoIwLfiatS1W
+5W030hL9kmqmDOG2vz2dzuic7ldKe6MdZ25/M+xWT4blbhsAwS9ErHTgmwP/uUt+
+dwIrjwFDgcIfnyCGQHURpW/RS/jYXtw68zfz1lInxXH2Qohe4trbKokO090HoXwd
+pfA/3Qk6Zno/BTW3a/GbyhYBIEQxSmL6Xi7Qa1PsfBFaUfMcZ0eYi9TsRfMMIdVI
+6VcxXQS9Qukx536h0j4Jo/OOzs6pbjsDbrHxbxI4J/lsI13g2BnLAOc3rRo/VwaW
+GFt65WpJnGZ2d1VcU29mi5cODz0/mRzOmbccYFIsscJnmpndoaoectXfdShQ0eXb
+GosRyyfYg5JyBNikE9TINX+W7p4qdioRAwyeMBjQc73pgzELTve4cTbPcgWHyH+V
+IgZ9gUU3QbXeo5y2NQ8uZ73TJ6DE1UvBi7Z+PdnSRpRmkzXRaEttTHN86x8PVsMu
+8Po0Pek3RpVs1rh1MH+5ipy0R2N/VC2cYo7I2X9zVMKrKaz761W6XzMXlSmxGjzr
+uzLS35Xvk6u6ofvtnTSPMOySPsf0+ohxYxoc5CJ5224Jj5lcvZ0XJ5KAugZaKR0C
++Hk457WNAW2sDHu63tZWItKBXasunpecL7Otc8kpgSE6A+NWxw==
+=9di4
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-2.1.2.ebuild b/media-video/vlc/vlc-2.1.2.ebuild
index bed46887facf..ba0fea2ef758 100644
--- a/media-video/vlc/vlc-2.1.2.ebuild
+++ b/media-video/vlc/vlc-2.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.2.ebuild,v 1.17 2014/12/15 05:50:48 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.2.ebuild,v 1.18 2014/12/18 13:36:50 kensington Exp $
 
 EAPI="5"
 
@@ -251,8 +251,6 @@ src_prepare() {
 	# Setting QT_SELECT environment variable will enforce correct binaries.
 	if use qt4; then
 		export QT_SELECT=qt4
-	elif use qt5; then
-		export QT_SELECT=qt5
 	fi
 }
 
diff --git a/media-video/vlc/vlc-2.1.4.ebuild b/media-video/vlc/vlc-2.1.4.ebuild
index 4bd13b8a6905..63ca76cc95df 100644
--- a/media-video/vlc/vlc-2.1.4.ebuild
+++ b/media-video/vlc/vlc-2.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.4.ebuild,v 1.12 2014/12/15 05:50:48 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.4.ebuild,v 1.13 2014/12/18 13:36:50 kensington Exp $
 
 EAPI="5"
 
@@ -252,8 +252,6 @@ src_prepare() {
 	# Setting QT_SELECT environment variable will enforce correct binaries.
 	if use qt4; then
 		export QT_SELECT=qt4
-	elif use qt5; then
-		export QT_SELECT=qt5
 	fi
 }
 
diff --git a/media-video/vlc/vlc-2.1.5.ebuild b/media-video/vlc/vlc-2.1.5.ebuild
index c7dd0f7b8b19..a29c011841ee 100644
--- a/media-video/vlc/vlc-2.1.5.ebuild
+++ b/media-video/vlc/vlc-2.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.5.ebuild,v 1.5 2014/12/15 05:50:48 dlan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.5.ebuild,v 1.6 2014/12/18 13:36:50 kensington Exp $
 
 EAPI="5"
 
@@ -255,8 +255,6 @@ src_prepare() {
 	# Setting QT_SELECT environment variable will enforce correct binaries.
 	if use qt4; then
 		export QT_SELECT=qt4
-	elif use qt5; then
-		export QT_SELECT=qt5
 	fi
 }