Enable qt4 by default on the 2.0 ebuilds that didn't have it as the default; fixes bug #473614, reported by Pacho Ramos.

Package-Manager: portage-HEAD/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

6 files changed, 26 insertions, 21 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 31e710e31803..1b94f0d0d5ea 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # 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.887 2014/02/22 13:49:03 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.888 2014/02/22 13:56:10 tomwij Exp $
+
+  22 Feb 2014; Tom Wijsman <TomWij@gentoo.org> vlc-2.0.8.ebuild,
+  vlc-2.0.8a.ebuild, vlc-2.0.9.ebuild, vlc-2.0.9999.ebuild, vlc-9999.ebuild:
+  Enable qt4 by default on the 2.0 ebuilds that didn't have it as the default;
+  fixes bug #473614, reported by Pacho Ramos.
 
   22 Feb 2014; Tom Wijsman <TomWij@gentoo.org> metadata.xml:
   Clarify USE flag upnp; fixes bug #447252, reported by mgorny.
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 6263909bc7af..f17b67c664b3 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -21,26 +21,26 @@ DIST vlc-2.1.2.tar.xz 19609868 SHA256 219b812be1bc2eba40faa86419d0aa2c479a7380af
 DIST vlc-patches-101.tar.bz2 3011 SHA256 abd3af99b9c2fa76b67a2e9c72e2d81982f1bca93cb5e3b2f33d29de9e395dae SHA512 f059f3c47b571dd5a28d979abdcb3a8c2ebef13845cd4102d877b1786ef4b3ba15cc22873de0fd84fcc7a4413f582064f12edf40627e9f030fd8e6fa03d67c66 WHIRLPOOL eb2f184c99db6d174d22e4231003d93171f5081f917f10ecf6bc927ff96983aa21756d15063909cb6f8ad77f0db0b978fdf2eb2fba3320f19c6bc26e17b04ba7
 EBUILD vlc-2.0.5.ebuild 10987 SHA256 2ddb988ec22362714158e80434c52ba3c935b19df43f86ae1b443f6d33815748 SHA512 040b5179359675643183db8d61300da7d21f69177b02cf923f7ee7d017c0d43396b568758fc96b2cc64a0072bf9dc9881de8548b94f2d7f0aaddbf436c9d7048 WHIRLPOOL ae21c19ea6c26d92783e7021200cd2ad365e061e4d92b91a515ae63a37829da6483dad120055be6cca2564f02d5f9f75f44467367e79f2bdd738b11eae164b37
 EBUILD vlc-2.0.7.ebuild 11044 SHA256 019fbafca7950e8f915c5b6be020feb66602b742693e48ebe6826802cf457664 SHA512 81941d3bb0689e581cc1c1c0762fea81e8f3e4f4e23dafb577eb8018287949d2236026ca704a88b92b64e22ea8c6c23bdeb9e1f9b5fb95d792b71d400a146ede WHIRLPOOL 6d5daac39b05420ad0de68e8fa649989ed78ddc76c3fa01ca4d71cce89719b6e4127cf321c61b966c8877b21c71393910b718011704d00d237faafcd4465ac23
-EBUILD vlc-2.0.8.ebuild 13208 SHA256 1d33007180f762d57f954e9b3098cbceec69eb1b43b3e006808654d2be2c80c8 SHA512 eac54db56da958ab38ec92142ac2d8ca734952a046e3ddaa60268781f52e0449c4e4b3a29cebcec6233920cc1687d018d62ec6dcc56584e6a79ac9c8461d60a3 WHIRLPOOL 85c7b9a46761ab3c540fdd990ca2760c0ecdb8b04c8262a5b0b72de3aef9f8e80414c04b8a58a254ccc20413990c77feecd59a9b9c20260e506390a56a00ae89
-EBUILD vlc-2.0.8a.ebuild 13209 SHA256 9286961f2c99d7fbcc9b3184526fe544d44f2f6aec0aae3338b20ff269d79a1e SHA512 38b9a51009f416c055c90d74e9b882ab76497cd6a9a9b18a0c37be7ddbb9eb60e9c97d2a583f3de3fedd7bf363187132cf28694a17f8841491c23a79d50c5757 WHIRLPOOL f95de9c415822a021dc9a0ee967d0c0a33a8446ced9140d5dcf330fc6fe541386ef4bbf3f3fa6126b894cf1d3b0d131c37f33d2f0fa574d10cee3745aaf7cee8
-EBUILD vlc-2.0.9.ebuild 13208 SHA256 1dd5747e204db5847dc7830bd51f4175aec5f8c66a3e09eac35b53be70f23aa5 SHA512 173b0b4a40ee0ed921a0e7a16061e0a2af017071c2959a858b6ce24b29c7ae6e4c309b8f3140a5487accb7a3e59928978b49b2ea448ed6c3e8b81db3d032a982 WHIRLPOOL 902e7bf51ddbcd935febf1b397635a16e01b9058ac74a15a173450535df59ad4dd101c65f37fefc44b986ed16b48030306d73725bc73732435b4dd2dd38de42f
-EBUILD vlc-2.0.9999.ebuild 13231 SHA256 bc4b91f39a35e7fc0c39ed787ea58b1b115e9c948f1491a2eef4fad14c902544 SHA512 75451545dfe8180c088968eaca198fc02a77796407195d855228c0f83b6230c0a65acf95eaf0824ab095a0e21059c2a35a7ddd0fe52de4196092fde6f438bec7 WHIRLPOOL 578db9b9c7b23a00ce80e9ae2fdea5d6a98e111cc5f1c1dc0442920466e0be835ca7ed5e0f9a5fbdbc6adce4498308246fed2501ee9f7956a4c837894854077c
+EBUILD vlc-2.0.8.ebuild 13209 SHA256 5fe73ed47c599ee7fc6d83434dce80556baf43bd55481251ca26e72e49a946e9 SHA512 2d77110dd4a8608b0a83d2b60192e0ff2b997d7f9688b7e842824f5600b66420bfa32a7937947812e0c113976a540afd9ce951a15ace20667c912710b9b0fd86 WHIRLPOOL 087951e75650f9f423850082edc6f80dba44753a8921c618088e0bfd517157e7bc2d4489166a9922d668f42174393cd5606127f83aad73fa6e1622b3c640b16e
+EBUILD vlc-2.0.8a.ebuild 13210 SHA256 6edfa4ac0438db36ec0cdb369f026cd64ee5ade0a63ec6f21aaf85d38a816edd SHA512 efb1a2e46fde0e852cdb4122b11f58048d43dabc17c5b64615a72aff45a676095795894b79fb5023d8ed54554659f6e21a105a5b87f22d5b1193763e54e34b47 WHIRLPOOL e4b856505d84566aa25fc52c47e3331b2a0971284f981f3824f031f1c9765d6461d9141aac57628484f10c073f9c519f71dcb1edbb6c5a85fd86240d00889832
+EBUILD vlc-2.0.9.ebuild 13209 SHA256 b46e528cc6c5508e941882564d899abd0f507d6d06bdcef56a078d6672cd860e SHA512 c112a49520daabf79746491577d2a9bfa63043fd3f6bb165718083f4a57448503bed5406dc2e6270e12cb21845681a41e5acc4ea7e83f8d84e4a430c8eb72de8 WHIRLPOOL 69128c01d9d2e2cd37030a96c0bfcbfa7fe882197a74921586634f6397c8c0b8ac5bb3a6cc6ebb91cb25eb7b8ccd9762ac4bb0c915ce2f867708b2c48b016f99
+EBUILD vlc-2.0.9999.ebuild 13232 SHA256 50bc024a596b66123f42a1247fbd91e8f0ca010c9aff7b56e1c48d0d7acbfef0 SHA512 3408225b9e2a321befcbc5edf9740d68b19843dd648acc26debb8d3a180d8d51b5326aa550634c72ac962cff7df58985838b27b39d7f4231298c5bd5ccefc37e WHIRLPOOL a1e84e11f38c6a5c1c29f998c180e64e14fb605da02777025f5ff7b3a33eef61549de1e38910663283df520e10bd4da08d249956edf352a5f0ec35cd991fa587
 EBUILD vlc-2.1.0.ebuild 14129 SHA256 0f091492a2721738e566d24ca40e40c9b1026c560127a18c9ea570f50fdf35bf SHA512 faa08dd0562c93c72541b3c178ef08e67b8f26a37fb139805fc86227e1fe0580d420b296781d41f032edb883a279b236398836bf8b5aef2ba7897672101615f0 WHIRLPOOL 86ef5e4d6f385bb51a629e6de095b68a780f79ca1c697c42caa412987b0acdc170f4916941db57b970c8277229d6727f17068022b172dca55262d4a555c55c21
 EBUILD vlc-2.1.1.ebuild 14107 SHA256 3ab60dfe7c56425349fe0700fe178542fb4bd4e3f891c7d38f752e7049021ae4 SHA512 64dba17667e999824157d5c139d28f2b0f00ce9ef06c955e786beafa6b4e9ac5d87a551f24dfbdb13484262cfe3d22225b7fa81cf4020807498e141606dd06bf WHIRLPOOL 7797391668bad21ad29ac83b1aa3430d1330c7f47b5a4c08c57a2e8a39c76f8c7f4449867b747a61abe0f7e452a32dcc688aa56b10da34fa2f88c88455c9c8ed
 EBUILD vlc-2.1.2.ebuild 14107 SHA256 b1b4b34b73c086d31db8086a4ef8eff97599ae2a7176c3353ff43eef8f2d1b7b SHA512 9cae76d1a288f924ddf89079059c922ff34b1b9f86c487d17150b5e6be7a1faed0a8a0a54198878911968a8dbd00408bbb379882cfc8f17771bfa75f846f10dc WHIRLPOOL b7130ef09bc50195485ac4b1162f7ec37fcbf9cd9cdccb5988ab33173d1f9c871f9d47123434ec2d44be3450f12e16e120d778e1d257b950ab1411e2ee55782f
 EBUILD vlc-2.1.9999.ebuild 14582 SHA256 c58a18b4e6747353dab95b5b0c846571fcb0f95843da0d1e3cc66371e44265af SHA512 0bce7d13e050b4021b9dc802562269c9f57d58cfebd422560f9a18b53af426c55c91c95d7a5ea452060dc49844e68617dca1df2936545430e62ccc14624faef0 WHIRLPOOL 070f049b8927f5c2f22b179aa103f10ff1b22a745a5f3d0d1a3915ecbeca9de795fe562486444601a9a51f2482f585db9f2575b035cd3991a39b653edb7de1bc
 EBUILD vlc-9999.ebuild 14790 SHA256 c6f5a41c2e58a327b4dfb061eae7ee9af79a6f72cdda263ad7d91810d60d82d7 SHA512 fe0e4d6837a4520ab8dd96ccc1dce6cb52368610de7be94e935796129dbb412fac4892328eddcfd92475d19e971899daf58f9b92b3fd9c85a4a45d5a09413977 WHIRLPOOL 4433ec5542be244d86ccdaad08f16431b1e708e9bb70d7cf82c119d7b815ade91d1e8fc8ea4e3954c6983d32b88aca98c762c170a55e9b526921c6956f9645e7
-MISC ChangeLog 23199 SHA256 8024ad124c0514b5b86656526681339a0de77a6cff925aca8b120725c4e5ee1f SHA512 69c60fbbc64e97f092d67fc5cba2f7e17184b5511ec3fe7060bde700baa6d92b66149bf3e579ac39b90bec614754e768e214fc757ecac2ab3355274b1225f5c0 WHIRLPOOL f1e96a0b6f6f40b814fb7c631ea4d8b614dc98c18be5f757db6d44a271704817f9c0862ab261bec723d74efabd7a7072254c7b0d0bcd95e39bf7c9369668e617
+MISC ChangeLog 23467 SHA256 75344e37baf00f0924a8c8a2d62412c0b15bded22e4bf25c8530034b9b2ebd82 SHA512 04cb2a562b02dbda04a30ff6dc0dd06f4771956df70e43a793578499fa7e2a4dd72c254390099b620485f4547c6d9ce89ed88080145078f377ca15b923b6daa9 WHIRLPOOL 43f3cb0cdf05ab69f60fedd66af5c79277945b56f3dfc3896cd6c0b587861a83383ca4c5ca2950693fa30dd17f51594ff13abdb8bd1134d204d7a40593238ac1
 MISC ChangeLog-2011 113818 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2 SHA512 9b1060fc57d0a8912a38c269b7ec140287c883798f6f3528f0f2d43b5772817f31e0addf4f88f139b82cda4e094d2f9a30e3b9d1933022b81b974436ed158d9d WHIRLPOOL bfe449ace05bac74b195d82eb2b3648b2240f92dabf6446f6ba93ca51b7ecd999ab5b9247dfd1f1a7cdab8d309684ffcd1c829773a471d862c19814a18db7ffe
 MISC metadata.xml 7006 SHA256 8f444fc5e7a4d89f17bf4064c8850d8c9010446674b7c908ce9422970af65d31 SHA512 20e0b12ea0a0661214fdb68bd29917ecf9d3bbc4c15102b4938e0a29b8aaff07f724206b2428b2977ccf74a87688cf6419959ffd9e6d3ff0811c6930e1bd5a47 WHIRLPOOL 9b5cbe17579eb83d905c48ecb440803f15b87264185f738e012f40841835793630961ff3e1cc54103b4e3b0a493c706898e36215937787302144b323121b4791
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTCKrGAAoJEJWyH81tNOV9FigIALxvVgkiEHXsu9gUrPpwV3JK
-PldNSL9GozrnKqxCI2mL6+U77KwLmreNeBJXViWo+Nfr6sksPMeXPC7FLqYDsdJ0
-uXexjUKP88qFvQzlqm99Z/aj/xZcJ8VREHGzxk180kLtN0AZgOPtMGf7Ist05OOB
-5qjZJHXhbYnfGmxxlKM1DtarKA4avarNAPebTjVuYiOJKBJZgydfa1ASUAywMN9O
-2a9SA83VRIrZMmWmxMlczkZkgYu8QnmQfZ4YKIDsGVqagYAF2FMbs/AbC+YRj+GR
-PzwauVmqnKWFirjYd2tBL47YCfjAP2pITG6NmdcjWyF/IiD3hw7X/QerCJ4N23k=
-=RH3I
+iQEcBAEBCAAGBQJTCKxyAAoJEJWyH81tNOV9P6EH/3VDXq+xFzlkK3bgJCvjyFbQ
+mygQaZhjqIdB4S5lQs6irv5AKPWAjNgG1/28h9wejCG6paSEaoDW1es6laoMtRhd
+KgMhDAdboW5F7i4RBF6ZmaieuUDkFQHaHYLyLoyf5npSnyI3QAfHxTuy6rL4gDQm
+P3NgdeJLYhczNYAUUaX+KCEqqZTwG6c8npkYWuAD3GLE9zQwkm5l4wJutUk3l+0v
+QCN64tyQ923SzwKfwAgh6cB87+LS6emw0eN7NeuwF9tEIrDXNJREySI95zQdWDKz
+n4ke35CsQIgHO6o55d7GfBe1Uxx5LjzuKUCE4vVB2/9lI6mf/7t2IND8vRLTDqA=
+=yyJS
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-2.0.8.ebuild b/media-video/vlc/vlc-2.0.8.ebuild
index 9b4320ac7948..af71d14f485a 100644
--- a/media-video/vlc/vlc-2.0.8.ebuild
+++ b/media-video/vlc/vlc-2.0.8.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.0.8.ebuild,v 1.6 2014/01/30 18:13:24 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.8.ebuild,v 1.7 2014/02/22 13:56:10 tomwij Exp $
 
 EAPI="5"
 
@@ -49,7 +49,7 @@ IUSE="a52 aalib alsa altivec atmo +audioqueue avahi +avcodec
 	+macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext
 	+macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg
 	mtp musepack ncurses neon ogg omxil opengl optimisememory opus oss
-	png portaudio +postproc projectm pulseaudio pvr qt4 rtsp run-as-root samba
+	png portaudio +postproc projectm pulseaudio pvr +qt4 rtsp run-as-root samba
 	schroedinger sdl sdl-image sftp shine shout sid skins speex sqlite sse svg
 	+swscale switcher taglib theora tremor truetype twolame udev upnp vaapi v4l
 	vcdx visual vlm vorbis waveout wingdi wma-fixed +X x264 +xcb xml xosd xv
diff --git a/media-video/vlc/vlc-2.0.8a.ebuild b/media-video/vlc/vlc-2.0.8a.ebuild
index b4e8bae2d4a1..be8398c684bd 100644
--- a/media-video/vlc/vlc-2.0.8a.ebuild
+++ b/media-video/vlc/vlc-2.0.8a.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.0.8a.ebuild,v 1.6 2014/01/30 18:13:24 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.8a.ebuild,v 1.7 2014/02/22 13:56:10 tomwij Exp $
 
 EAPI="5"
 
@@ -49,7 +49,7 @@ IUSE="a52 aalib alsa altivec atmo +audioqueue avahi +avcodec
 	+macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext
 	+macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg
 	mtp musepack ncurses neon ogg omxil opengl optimisememory opus oss
-	png portaudio +postproc projectm pulseaudio pvr qt4 rtsp run-as-root samba
+	png portaudio +postproc projectm pulseaudio pvr +qt4 rtsp run-as-root samba
 	schroedinger sdl sdl-image sftp shine shout sid skins speex sqlite sse svg
 	+swscale switcher taglib theora tremor truetype twolame udev upnp vaapi v4l
 	vcdx visual vlm vorbis waveout wingdi wma-fixed +X x264 +xcb xml xosd xv
diff --git a/media-video/vlc/vlc-2.0.9.ebuild b/media-video/vlc/vlc-2.0.9.ebuild
index 1722d19d465c..056c3f5bbcb1 100644
--- a/media-video/vlc/vlc-2.0.9.ebuild
+++ b/media-video/vlc/vlc-2.0.9.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.0.9.ebuild,v 1.6 2014/01/30 18:13:24 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9.ebuild,v 1.7 2014/02/22 13:56:10 tomwij Exp $
 
 EAPI="5"
 
@@ -49,7 +49,7 @@ IUSE="a52 aalib alsa altivec atmo +audioqueue avahi +avcodec
 	+macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext
 	+macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg
 	mtp musepack ncurses neon ogg omxil opengl optimisememory opus oss
-	png portaudio +postproc projectm pulseaudio pvr qt4 rtsp run-as-root samba
+	png portaudio +postproc projectm pulseaudio pvr +qt4 rtsp run-as-root samba
 	schroedinger sdl sdl-image sftp shine shout sid skins speex sqlite sse svg
 	+swscale switcher taglib theora tremor truetype twolame udev upnp vaapi v4l
 	vcdx visual vlm vorbis waveout wingdi wma-fixed +X x264 +xcb xml xosd xv
diff --git a/media-video/vlc/vlc-2.0.9999.ebuild b/media-video/vlc/vlc-2.0.9999.ebuild
index 88615c74286b..bc38337640b2 100644
--- a/media-video/vlc/vlc-2.0.9999.ebuild
+++ b/media-video/vlc/vlc-2.0.9999.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.0.9999.ebuild,v 1.34 2014/01/30 16:40:36 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9999.ebuild,v 1.35 2014/02/22 13:56:10 tomwij Exp $
 
 EAPI="5"
 
@@ -49,7 +49,7 @@ IUSE="a52 aalib alsa altivec atmo +audioqueue avahi +avcodec
 	+macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext
 	+macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg
 	mtp musepack ncurses neon ogg omxil opengl optimisememory opus oss
-	png portaudio +postproc projectm pulseaudio pvr qt4 rtsp run-as-root samba
+	png portaudio +postproc projectm pulseaudio pvr +qt4 rtsp run-as-root samba
 	schroedinger sdl sdl-image sftp shine shout sid skins speex sqlite sse svg
 	+swscale switcher taglib theora tremor truetype twolame udev upnp vaapi v4l
 	vcdx visual vlm vorbis waveout wingdi wma-fixed +X x264 +xcb xml xosd xv