proxy for maintainer, fix bug 525004, 506322, 489508, 499996

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xAABEFD55

9 files changed, 96 insertions, 115 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 561bb608e128..c6e02d1bae20 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,26 @@
 # 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.918 2014/11/15 11:56:20 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.919 2014/11/16 14:37:22 dlan Exp $
+
+  16 Nov 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,
+  metadata.xml:
+  proxy for maintainer, fix bug 525004, 506322, 489508, 499996
+  5) Add missing qtx11extras dependency for Qt5.
+  Fixes 525004 and unreported issue that VLC opens separate window for movie
+  when Qt5 X11 Extras are not found by configure script.
+  Although it is possible to use Qt5 with Wayland instead of X11, it is not
+  well supported by VLC, yet (WiP). Ebuild does not support wayland output, yet.
+  4) Removed workaround for avcodec use flag disabled.
+  It is not needed anymore starting with version 2.2
+  3) Corrected bugfix for bug 506322 - ebuild for version 2.1.5 was improperly fixed.
+  2) Drop support for Qt5 in VLC 2.1.x branch.
+  Fixes bug 489508. qt5 use flag was buggy, and this configuration was not very well
+  supported by upstream. Since Qt5 is still masked in portage tree, there is
+  a big chance that first VLC 2.2.x release will be before Qt5 is unmasked.
+  1) Disable fstack-check on x86 (enabled on hardened configurations by default)
+  because of registers shortage.
+  Fixes bug 499996 reported by Bertrand Jacquin and patch submitted by Anthony Basile.
 
   15 Nov 2014; Markos Chandras <hwoarang@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,
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 73bed4f26ae7..985ae2a47c90 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -9,31 +9,29 @@ 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 14186 SHA256 d665a18ea7839d150add81d30bbdb6f35c067d4acf0effb5d0c2448a45575964 SHA512 ee83d84655e7566adfa6a30aa9d05695a2635c4aafe2dc861e0ef6cd8cfd8bf11478862d853c3a1bf58e0d1e8f78d0cdac5c3617d4ed12443554adc1dce69b92 WHIRLPOOL eeb43ee5b23dd224cfe93c131b871818570f8a12bc6527ec355eeeec835f6f4fd818191ffae6920d9ecfe272614d30a0654638b96ef8ef7ee2be79d9baff575e
-EBUILD vlc-2.1.4.ebuild 14552 SHA256 2a0b47a4d7149f4c5a51a500f2c0a3192f020139f3c72667b9392e7eca358870 SHA512 a6f3873abd613b440039d79dd06e0a1b680eda52aa224190311641a88a3795945a8459894df4363c76d191e1d01ea0e1592045f643ce08bcc5ea25dd534bc586 WHIRLPOOL 44a0477d55af16cbdf1cf1067493c57b59c19c592a89182062feb8f4848c85e76006e353bcc19f37ce840a138eb2eb13629133589b48cd023cc25d31edd13e55
-EBUILD vlc-2.1.5.ebuild 14643 SHA256 d08af1c66a9292ede1f6cab27edc0a2ee78b664c5b9b0709bb574f0b1eac3fb7 SHA512 6b14ee3ae20cba55380457abbead9fb4676234dbc6cc4ff77147c9a84a796f77f81db5eb23ac3c50e9cd1f3476ae512449e1dc44e0acb8791602eb4d560172fe WHIRLPOOL e299efc29fea4c7762cb2472cfd8883e696be8e1dc62e4b302247d031b8109ce5f56ee0f51ad75be60f0b311ac76eb955e9343a3f34d45f4ce0bc31e1fff320b
-EBUILD vlc-2.1.9999.ebuild 14567 SHA256 a80182a4f1bb91bb160cbc79fa81864c2a701816271295f58232a318bf104d20 SHA512 54553f9be4aab488e8f95038f28ba08b3edb12c1c9d8657ce7c7e0bf6b520c619bfd8e19deb6e42e6301bd1471a59841f4c6d91a0c4ff1f6c44cce049206bfe9 WHIRLPOOL 7e5e5f653e3698dc98f35dd234c38c3bf8a96fbb47391da7c28a5ea0566b5e0ab0c65dc4a4d09395e6954eaf260f670e6ba9125474685bbd3c05324b5727107f
-EBUILD vlc-2.2.9999.ebuild 14645 SHA256 4ac2dd29532d01061f7d672ef054391833418e1ba5ed81e02835f77db8cdfeef SHA512 c62eb18e948568fcb505a1063daab5145764c2362e67f6578bdad958076c6b16bf57595c833b444667278082e731cc4357c3a57339875d4cf435f14e87d02fbb WHIRLPOOL 013dae71e2313823f0f4d426fe51918c522143ec9456182a2b11037f5ce88e1dad4b60c122f53d2dd9c3474d554a4e0d2d7d51fcff1399a2fc4993417d99df00
-EBUILD vlc-9999.ebuild 14637 SHA256 4d2b4507e7baa74d6bfacb73b5493de833b7d924a45e6b016f85854b15ebc59f SHA512 f9e03b7eb645cda676db5e19661543b091a2fd3823c75c2e8581e5f4960ca18810084bb39c32511a48520b70cd7f43bf120882c5691027986d92680d12acf1ed WHIRLPOOL 3c898e2e0a83b1695c351f220c33751b1e29ccc6118d533442941762b7c1029c787c8d2cb73977f95d7cd5ad5a674ee48eaec68781720f469f7916b8136305bb
-MISC ChangeLog 30465 SHA256 5044ffb9e948405818bde2f7210fc5db949b558a6d128bb856270c2b30561f07 SHA512 7873e3bf027486fce80d73a38beec21a716f077aae107d8ef4949663a3c79a439fda9a3cf8848fa03f879a5c2a3afcc657d1b7d07b57b4f006219f8f5ff80bc0 WHIRLPOOL dfb93c6292b65e4079623087bef49246eadc95d1e099f7d83eb4d59ee6b1eb07bd01ceb1c1d0f2a6de1a74a2fcbc4569b7d25ed4ff1cf16225c51ee15136a1a6
+EBUILD vlc-2.1.2.ebuild 14017 SHA256 a1477043c8cc9e038f5abea4cdd3ae510436ba5ee220cd38b24a45b255073e7f SHA512 59e58af1957958dca10d65537ccc6e5823f66307ca4aae2f807cff2339d6aa81f10a251fffa0e01251b5c33f18e5e17f7c5fc39e46a9d0c136e47bdc256b99ae WHIRLPOOL 63d00017d61f61359617cc33e30fdc05b257b3e3eed067996dbfa72a9d3549206b3dd3c8cfa94bbc631ec4f1e8a87bb0aebb1488b60c4b3bf15c4ee644256f99
+EBUILD vlc-2.1.4.ebuild 14383 SHA256 87754cabd5a4b9205212193f0c9aea907ba5b8b7e838c67c241f47be554681c4 SHA512 264691bc60a58587d5206a774142085bbb46b6d195a4b16a51aaf08125ca8793ca6ec38e1e149845c336a9f2b530c819f654cdb246876d5668d42f0c3a4f1c6c WHIRLPOOL 44558c86b1a9992df59b0a73a8aa5c3c98b39d9cfd3c5885b609d34be59dff3365b39787cb8090f0152ea881cb60c31f72913abc5a0f8c86f19d242f12bbec71
+EBUILD vlc-2.1.5.ebuild 14474 SHA256 04e2442288a8ec13db3de42948848a39c1be84f2a882a2dff9ed2b1c27e13a73 SHA512 0ccee123cf7e611f1e86417016380acb2243063ef64b69b1a6c0fb205d8f512e79b5222d77dfd42fab4158c738c11170f9bdad86ed1f8443155ae866ef330efa WHIRLPOOL 3b687a05534c5a04d5a5ad06f85124f4b711ab7dc7d40a5e75f968872ab4dd4cf20d037272e530120acfd8d3f0fe21dc2f882ff5bc72c01f9013354f6f566c4a
+EBUILD vlc-2.1.9999.ebuild 14398 SHA256 3cc0cbac18c70477d99c1cb5febe20c61edf73f9e5776a451128241bad636b1e SHA512 b9ba825186418cfa1e9a965d02955c5293f24a6c782bf2519228f4f938c82220603b68d967d10b3820d1121b0dccc769efa8496201df48bcaa36b1f792b71851 WHIRLPOOL 4c6be746c7c13ec6e2589754c98b494ba55b5e54d691cac3871ca197bb87c59605b9e71ed02be87048c9648b93037b215e1acd8ea9249c146e7c49e766433c95
+EBUILD vlc-2.2.9999.ebuild 14637 SHA256 9f89372bb459037dd7e4abc477345f5593810aac3bacd5b1cd66a17368ed0917 SHA512 6e391f447be1633e091029d7f9a956b60d4e6ea7f3d9ab0e10cb13c23e064f0c04b3cb9e76ee1fe2b455daea6927b08608b19e5f6b6fa24fe12b18dbe4124868 WHIRLPOOL 25ca8066e4d0d52a323c5a4d188d521a64444d65f21947e7d3a84020cfeb1b3e9309a8ee2932e8734e6e26b726b56ea989256f676249fea7917f8aafc7b96c49
+EBUILD vlc-9999.ebuild 14629 SHA256 7bacfbeaa4915af5237484e44a5ec4bef9e6f60e1fc4fee633295bf1253c042e SHA512 273a5d052cfb47a7384d7db9e7f846e476cd27388030dc4df91e5f0e4c3c81e5a08c73c4c45f32119c192a684c85b97eb6fbac928391828211da3db1905d216c WHIRLPOOL 58220325a2f24401aa2451e5a454dc05f67a0c4a629bd47c98194df1b1bbc30c0dc07d3b0b981ae4286387b3f131e68c00597d6d4447e993927d41c53daa1017
+MISC ChangeLog 31719 SHA256 145fb3d14c5ad647d37aa3afb11b2312f822bb5c23e07caa74f2d006314e73ac SHA512 66f1adf097780aa075cd1b195e73182a79d665e6305115fa4de97cc4295022305e72e9aacf4c7cb79b7bac9ebfa0a4c5810f0d2fc6069ec1c038b51368d7ce59 WHIRLPOOL acf31d87cb393290a6f5b554f69347aa39037a31192e03c5dec8683531685019e29a5d948f19ef3412e63b18ed382a9a7f7fdff0a809df5a0156e84938b1c6da
 MISC ChangeLog-2011 113818 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2 SHA512 9b1060fc57d0a8912a38c269b7ec140287c883798f6f3528f0f2d43b5772817f31e0addf4f88f139b82cda4e094d2f9a30e3b9d1933022b81b974436ed158d9d WHIRLPOOL bfe449ace05bac74b195d82eb2b3648b2240f92dabf6446f6ba93ca51b7ecd999ab5b9247dfd1f1a7cdab8d309684ffcd1c829773a471d862c19814a18db7ffe
-MISC metadata.xml 6536 SHA256 34086f7818a8410cc8ac5c82b0abb17dae2cf3c3bdaf37ca86d3ec42325131ce SHA512 369c7251e51b8a7c2ffca0c50aa6ce08f7c84fa7745bd21ff0a931d4cc4f0afd6cb2a4650bf93843bca3cb2bf5290afb56bff4d7f740ce7fd4c6fa46313683c5 WHIRLPOOL ec27a8490288788a066702a294a742cd2afba6b1983e695d46b8ff4d37882bc636d9109b1af73ce8d4310213959f2fe90d7912ce9ae9dee60540767ce8350a42
+MISC metadata.xml 6631 SHA256 794618daefe26a9011090f4473e1c8c37108ae75ad564277e843ff47b1683db5 SHA512 66677f2f402331a07c8201af53499cea35d75f643f1c93e2876fc24fd139792feb091edc219d4d9b20e47dfbaf01123bb3504a8c01c7c721659e53b074566ab2 WHIRLPOOL 80ba56a97a30b2b4583161a6d3d64cda194f5a93d9eb08f3485a0f247c6071bac558fff3562592b0d9dec4a15796b0abffbee0c49ae3d834162f7fb657aa2533
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUZz9mXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88Kf4QAICW2VYTMqw5dbjDojnnbE4b
-m/SCsqLVn2IQvVnSOMOMrB0iI2Hot5uVJwsH6iuaorksU9A5ISo1cfAG9/hnTxfk
-8YP7nY2b4ZfxFWsJAcurtatDsvBeV57F3zO0JCeyhsWm7Mg+p6w9gyKp9J+CEVQi
-8LmDulBztSDVQxxG9cwti36ZP9PP0r7WdHPaYVx2uaOauSzQF3y9C6Ba923ozifR
-7+9deUhVPCsXKKJTo7HgOaFKuP12iYrY5AhCyKNREiRkJrhQx6bhaaGotiUFxxoR
-UrHf3o03Udu/47GH950FCw1oKP4hU/aJtes0+3gqPRdeO90hzS5KGLdMC+CkBhX8
-sLEX0INynck9vEIOV5+s/oMV1+KaqpFxzY4A4Z4mhDjW4ku6/X+TQT5il+j3Bi03
-ool9b7loSz2fB22uY9jNweeleDGSJp+bg4l1xs7BmfGDMMtJSqxrEDakZ4mYtoUc
-tUB7v3HvyzmFxUhm8qc4+pv3vMMSxKK5pgToMNXCxhbsRHDCyK++jyRnq0LwHPSk
-DWLjkv+U1RHLONPeVL/DzciMSG+IA1dIuU6YAtjEz5sryRf9RSVOUMdZwGSqbBeC
-8oAvbQyj4IwpRG2pXciELOfTjodLrnCPe5uEl4J4JFuJ6KojAQ2iDw0bieZgN7Tk
-bDHCAUewYtaSN4/r1i8v
-=txe8
+iQIcBAEBCAAGBQJUaLa/AAoJEJIMDbyqvv1VhmoP/AnD1E8Tkkwfo6jekSTVr1RT
+0UiBJP5ScPbtX6yk+kYUZ2+wGE95btzRSUxJ9poem0kBUhmlvvbRAKxgLclK+aSS
+jGEFE7M0HmDR5PdTOvL3wOc9KsAaAU6+Y33Mk7f2sbYFV6+N0S3RUtMcLgEArTEf
+pdXeivHgbddr8Ybm/ax3uCiMtV4taQ/nnd3aqurW1iS95AByfnK5u7zns0sY8w2C
+PZJyv5G55i+rXrwfUIeHQwmJWCLLSd+WDycS1X4SCkygzW99WvQPJKkmDccbjMTn
+IWSa01iDCZjYhg8iTkifPUtqMkTbnqHcv5WnWD3cv7+EUGxjXnGJYmyRsC/Kacgf
+4v/q11FeyscxEpxsu2AssorvJ7Ou6dv/j2C+omSFwPGXC+JwEmFbTGwqeO/HAATC
+NAWIU4uvs+0hLPH9LA/oQgwonDeBdbXaU6y2cGP36nY5VRDzJ0iDomqu7Z6RVuj6
+a5DH0uFBY4ES/o5kUrliFUHPoEyiO6C2qnkUzSfr7jWfywynBDUqDyE/3HUwOnpg
+9P4PfpN/QsYLBxuUqzaIJEy7PNcifsQdAcwRVt/3msQi1ZqaAyBu1FEq+TD04fPW
+77wJ9qAYgIAugghCyPMBZke2rJpzjbrSIEfTQkDNrNfb841YzpZtqElaxFZseLeH
+c0AQkXVqFYIyLyivhP9S
+=QRrB
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index 2ff1f511fc5f..9a1910bb9470 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -51,7 +51,8 @@
 		<flag name="opus">Support opus decoding via libopus.</flag>
 		<flag name="postproc">Enables image post-processing via libpostproc (part of FFmpeg).</flag>
 		<flag name="projectm">Enables the projectM visualization plugin.</flag>
-		<flag name="qt4" restrict="&gt;=media-video/vlc-0.9">Builds a <pkg>x11-libs/qt</pkg> based frontend, a graphical interface.</flag>
+		<flag name="qt4" restrict="&gt;=media-video/vlc-0.9">Builds a Qt4 based frontend, a graphical interface.</flag>
+		<flag name="qt5" restrict="&gt;=media-video/vlc-2.2">Builds a Qt5 based frontend, a graphical interface.</flag>
 		<flag name="rdp">Enables freerdp for RDP/Remote Desktop client support</flag>
 		<flag name="rtsp">Enables real audio and RTSP modules.</flag>
 		<flag name="run-as-root">Allows vlc to start for root. Don't enable this unless you have a very specific (e.g. embedded) need for it!</flag>
diff --git a/media-video/vlc/vlc-2.1.2.ebuild b/media-video/vlc/vlc-2.1.2.ebuild
index 031f80d2ebcd..72b0ce01b065 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.15 2014/11/15 11:56:20 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.2.ebuild,v 1.16 2014/11/16 14:37:22 dlan 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 opencv opengl optimisememory opus
-	png +postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba
+	png +postproc projectm pulseaudio +qt4 rdp rtsp run-as-root samba
 	schroedinger sdl sdl-image sftp shout sid skins speex sse svg +swscale
 	taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau
 	vlm vorbis wma-fixed +X x264 +xcb xml xv zvbi"
@@ -119,7 +119,6 @@ RDEPEND="
 		projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
 		pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0 )
 		qt4? ( >=dev-qt/qtgui-4.6.0:4 >=dev-qt/qtcore-4.6.0:4 )
-		qt5? ( >=dev-qt/qtgui-5.1.0:5 >=dev-qt/qtcore-5.1.0:5 dev-qt/qtwidgets:5 )
 		rdp? ( net-misc/freerdp:0= )
 		samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4.0.0:0[client] ) )
 		schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
@@ -174,10 +173,9 @@ REQUIRED_USE="
 	libcaca? ( X )
 	libtar? ( skins )
 	libtiger? ( kate )
-	qt4? ( X !qt5 )
-	qt5? ( X !qt4 )
+	qt4? ( X )
 	sdl? ( X )
-	skins? ( truetype X ^^ ( qt4 qt5 ) )
+	skins? ( truetype X qt4 )
 	vaapi? ( avcodec X )
 	vlm? ( encode )
 	xv? ( xcb )
@@ -202,12 +200,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	# Support for Qt5.
-	if use qt5 ; then
-		export UIC="/usr/lib64/qt5/bin/uic"
-		export MOC="/usr/lib64/qt5/bin/moc"
-	fi
-
 	# Remove unnecessary warnings about unimplemented pragmas on gcc for now.
 	# Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc.
 	#
@@ -260,6 +252,10 @@ src_configure() {
 	# Compatibility fix for Samba 4.
 	use samba && append-cppflags "-I/usr/include/samba-4.0"
 
+	# We need to disable -fstack-check if use >=gcc 4.8.0.
+	# See bug #499996
+	use x86 && append-cflags $(test-flags-CC -fno-stack-check)
+
 	# Needs libresid-builder from libsidplay:2 which is in another directory...
 	# FIXME!
 	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
@@ -272,11 +268,6 @@ src_configure() {
 				--with-default-monospace-font-family=Monospace"
 	fi
 
-	local qt_flag=""
-	if use qt4 || use qt5 ; then
-		qt_flag="--enable-qt"
-	fi
-
 	econf \
 		${myconf} \
 		--enable-vlc \
@@ -363,7 +354,7 @@ src_configure() {
 		$(use_enable postproc) \
 		$(use_enable projectm) \
 		$(use_enable pulseaudio pulse) \
-		${qt_flag} \
+		$(use_enable qt4 qt) \
 		$(use_enable rdp libfreerdp) \
 		$(use_enable rtsp realrtsp) \
 		$(use_enable run-as-root) \
diff --git a/media-video/vlc/vlc-2.1.4.ebuild b/media-video/vlc/vlc-2.1.4.ebuild
index 026ead1329f2..e02768936624 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.10 2014/11/15 11:56:20 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.4.ebuild,v 1.11 2014/11/16 14:37:22 dlan 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 opencv opengl optimisememory opus
-	png +postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba
+	png +postproc projectm pulseaudio +qt4 rdp rtsp run-as-root samba
 	schroedinger sdl sdl-image sftp shout sid skins speex sse svg +swscale
 	taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau
 	vlm vnc vorbis wma-fixed +X x264 +xcb xml xv zvbi"
@@ -119,7 +119,6 @@ RDEPEND="
 		projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
 		pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0 )
 		qt4? ( >=dev-qt/qtgui-4.6.0:4 >=dev-qt/qtcore-4.6.0:4 )
-		qt5? ( >=dev-qt/qtgui-5.1.0:5 >=dev-qt/qtcore-5.1.0:5 dev-qt/qtwidgets:5 )
 		rdp? ( net-misc/freerdp:0= )
 		samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4.0.0:0[client] ) )
 		schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
@@ -175,10 +174,9 @@ REQUIRED_USE="
 	libcaca? ( X )
 	libtar? ( skins )
 	libtiger? ( kate )
-	qt4? ( X !qt5 )
-	qt5? ( X !qt4 )
+	qt4? ( X )
 	sdl? ( X )
-	skins? ( truetype X ^^ ( qt4 qt5 ) )
+	skins? ( truetype X qt4 )
 	vaapi? ( avcodec X )
 	vlm? ( encode )
 	xv? ( xcb )
@@ -203,12 +201,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	# Support for Qt5.
-	if use qt5 ; then
-		export UIC="/usr/lib64/qt5/bin/uic"
-		export MOC="/usr/lib64/qt5/bin/moc"
-	fi
-
 	# Remove unnecessary warnings about unimplemented pragmas on gcc for now.
 	# Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc.
 	#
@@ -261,6 +253,10 @@ src_configure() {
 	# Compatibility fix for Samba 4.
 	use samba && append-cppflags "-I/usr/include/samba-4.0"
 
+	# We need to disable -fstack-check if use >=gcc 4.8.0.
+	# See bug #499996
+	use x86 && append-cflags $(test-flags-CC -fno-stack-check)
+
 	# Needs libresid-builder from libsidplay:2 which is in another directory...
 	# FIXME!
 	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
@@ -273,11 +269,6 @@ src_configure() {
 				--with-default-monospace-font-family=Monospace"
 	fi
 
-	local qt_flag=""
-	if use qt4 || use qt5 ; then
-		qt_flag="--enable-qt"
-	fi
-
 	econf \
 		${myconf} \
 		--enable-vlc \
@@ -366,7 +357,7 @@ src_configure() {
 		$(use_enable postproc) \
 		$(use_enable projectm) \
 		$(use_enable pulseaudio pulse) \
-		${qt_flag} \
+		$(use_enable qt4 qt) \
 		$(use_enable rdp libfreerdp) \
 		$(use_enable rtsp realrtsp) \
 		$(use_enable run-as-root) \
diff --git a/media-video/vlc/vlc-2.1.5.ebuild b/media-video/vlc/vlc-2.1.5.ebuild
index 694a3d421f01..ca01766d74c4 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.3 2014/11/15 11:56:20 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.5.ebuild,v 1.4 2014/11/16 14:37:22 dlan 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 opencv opengl optimisememory opus
-	png +postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba
+	png +postproc projectm pulseaudio +qt4 rdp rtsp run-as-root samba
 	schroedinger sdl sdl-image sftp shout sid skins speex sse svg +swscale
 	taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau
 	vlm vnc vorbis wma-fixed +X x264 +xcb xml xv zvbi"
@@ -119,7 +119,6 @@ RDEPEND="
 		projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
 		pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0 )
 		qt4? ( >=dev-qt/qtgui-4.6.0:4 >=dev-qt/qtcore-4.6.0:4 )
-		qt5? ( >=dev-qt/qtgui-5.1.0:5 >=dev-qt/qtcore-5.1.0:5 dev-qt/qtwidgets:5 )
 		rdp? ( net-misc/freerdp:0= )
 		samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4.0.0:0[client] ) )
 		schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
@@ -175,10 +174,9 @@ REQUIRED_USE="
 	libcaca? ( X )
 	libtar? ( skins )
 	libtiger? ( kate )
-	qt4? ( X !qt5 )
-	qt5? ( X !qt4 )
+	qt4? ( X )
 	sdl? ( X )
-	skins? ( truetype X ^^ ( qt4 qt5 ) )
+	skins? ( truetype X qt4 )
 	vaapi? ( avcodec X )
 	vlm? ( encode )
 	xv? ( xcb )
@@ -203,12 +201,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	# Support for Qt5.
-	if use qt5 ; then
-		export UIC="/usr/lib64/qt5/bin/uic"
-		export MOC="/usr/lib64/qt5/bin/moc"
-	fi
-
 	# Remove unnecessary warnings about unimplemented pragmas on gcc for now.
 	# Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc.
 	#
@@ -242,7 +234,9 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
 
 	# Disable avcodec checks when avcodec is not used.
-	sed -i 's/^#if LIBAVCODEC_VERSION_CHECK(.*)$/#if 0/' modules/codec/avcodec/fourcc.c || die
+	if ! use avcodec; then
+		sed -i 's/^#if LIBAVCODEC_VERSION_CHECK(.*)$/#if 0/' modules/codec/avcodec/fourcc.c || die
+	fi
 
 	# Don't use --started-from-file when not using dbus.
 	if ! use dbus ; then
@@ -250,9 +244,7 @@ src_prepare() {
 	fi
 
 	# Disable a bogus check
-	if ! use avcodec; then
-		sed -i "s:libavcodec < 56:libavcodec < 57:g" configure.ac || die
-	fi
+	sed -i "s:libavcodec < 56:libavcodec < 57:g" configure.ac || die
 
 	eautoreconf
 
@@ -264,6 +256,10 @@ src_configure() {
 	# Compatibility fix for Samba 4.
 	use samba && append-cppflags "-I/usr/include/samba-4.0"
 
+	# We need to disable -fstack-check if use >=gcc 4.8.0.
+	# See bug #499996
+	use x86 && append-cflags $(test-flags-CC -fno-stack-check)
+
 	# Needs libresid-builder from libsidplay:2 which is in another directory...
 	# FIXME!
 	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
@@ -276,11 +272,6 @@ src_configure() {
 				--with-default-monospace-font-family=Monospace"
 	fi
 
-	local qt_flag=""
-	if use qt4 || use qt5 ; then
-		qt_flag="--enable-qt"
-	fi
-
 	econf \
 		${myconf} \
 		--enable-vlc \
@@ -369,7 +360,7 @@ src_configure() {
 		$(use_enable postproc) \
 		$(use_enable projectm) \
 		$(use_enable pulseaudio pulse) \
-		${qt_flag} \
+		$(use_enable qt4 qt) \
 		$(use_enable rdp libfreerdp) \
 		$(use_enable rtsp realrtsp) \
 		$(use_enable run-as-root) \
diff --git a/media-video/vlc/vlc-2.1.9999.ebuild b/media-video/vlc/vlc-2.1.9999.ebuild
index 8b36a4d69f84..4b520921dfed 100644
--- a/media-video/vlc/vlc-2.1.9999.ebuild
+++ b/media-video/vlc/vlc-2.1.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.1.9999.ebuild,v 1.25 2014/11/15 11:56:20 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild,v 1.26 2014/11/16 14:37:22 dlan 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 opencv opengl optimisememory opus
-	png +postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba
+	png +postproc projectm pulseaudio +qt4 rdp rtsp run-as-root samba
 	schroedinger sdl sdl-image sftp shout sid skins speex sse svg +swscale
 	taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau
 	vlm vnc vorbis wma-fixed +X x264 +xcb xml xv zvbi"
@@ -119,7 +119,6 @@ RDEPEND="
 		projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
 		pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0 )
 		qt4? ( >=dev-qt/qtgui-4.6.0:4 >=dev-qt/qtcore-4.6.0:4 )
-		qt5? ( >=dev-qt/qtgui-5.1.0:5 >=dev-qt/qtcore-5.1.0:5 dev-qt/qtwidgets:5 )
 		rdp? ( net-misc/freerdp:0= )
 		samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4.0.0:0[client] ) )
 		schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
@@ -175,10 +174,9 @@ REQUIRED_USE="
 	libcaca? ( X )
 	libtar? ( skins )
 	libtiger? ( kate )
-	qt4? ( X !qt5 )
-	qt5? ( X !qt4 )
+	qt4? ( X )
 	sdl? ( X )
-	skins? ( truetype X ^^ ( qt4 qt5 ) )
+	skins? ( truetype X qt4 )
 	vaapi? ( avcodec X )
 	vlm? ( encode )
 	xv? ( xcb )
@@ -203,12 +201,6 @@ src_unpack() {
 }
 
 src_prepare() {
-	# Support for Qt5.
-	if use qt5 ; then
-		export UIC="/usr/lib64/qt5/bin/uic"
-		export MOC="/usr/lib64/qt5/bin/moc"
-	fi
-
 	# Remove unnecessary warnings about unimplemented pragmas on gcc for now.
 	# Need to recheck this with gcc 4.9 and every subsequent minor bump of gcc.
 	#
@@ -261,6 +253,10 @@ src_configure() {
 	# Compatibility fix for Samba 4.
 	use samba && append-cppflags "-I/usr/include/samba-4.0"
 
+	# We need to disable -fstack-check if use >=gcc 4.8.0.
+	# See bug #499996
+	use x86 && append-cflags $(test-flags-CC -fno-stack-check)
+
 	# Needs libresid-builder from libsidplay:2 which is in another directory...
 	# FIXME!
 	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
@@ -273,11 +269,6 @@ src_configure() {
 				--with-default-monospace-font-family=Monospace"
 	fi
 
-	local qt_flag=""
-	if use qt4 || use qt5 ; then
-		qt_flag="--enable-qt"
-	fi
-
 	econf \
 		${myconf} \
 		--enable-vlc \
@@ -366,7 +357,7 @@ src_configure() {
 		$(use_enable postproc) \
 		$(use_enable projectm) \
 		$(use_enable pulseaudio pulse) \
-		${qt_flag} \
+		$(use_enable qt4 qt) \
 		$(use_enable rdp libfreerdp) \
 		$(use_enable rtsp realrtsp) \
 		$(use_enable run-as-root) \
diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild
index 30a3d98a1431..af39d843b6a0 100644
--- a/media-video/vlc/vlc-2.2.9999.ebuild
+++ b/media-video/vlc/vlc-2.2.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.2.9999.ebuild,v 1.3 2014/11/15 11:56:20 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.9999.ebuild,v 1.4 2014/11/16 14:37:22 dlan Exp $
 
 EAPI="5"
 
@@ -116,7 +116,7 @@ RDEPEND="
 		projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
 		pulseaudio? ( >=media-sound/pulseaudio-1:0 )
 		qt4? ( >=dev-qt/qtgui-4.6:4 >=dev-qt/qtcore-4.6:4 )
-		qt5? ( >=dev-qt/qtgui-5.1:5 >=dev-qt/qtcore-5.1:5 dev-qt/qtwidgets:5 )
+		qt5? ( >=dev-qt/qtgui-5.1:5 >=dev-qt/qtcore-5.1:5 >=dev-qt/qtwidgets-5.1:5  >=dev-qt/qtx11extras-5.1:5 )
 		rdp? ( >=net-misc/freerdp-1.0.1:0= )
 		samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4:0[client] ) )
 		schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
@@ -246,11 +246,6 @@ src_prepare() {
 	# Fix up broken audio when skipping using a fixed reversed bisected commit.
 	epatch "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
 
-	# Disable avcodec checks when avcodec is not used.
-	if ! use avcodec; then
-		sed -i 's/^#if LIBAVCODEC_VERSION_CHECK(.*)$/#if 0/' modules/codec/avcodec/fourcc.c || die
-	fi
-
 	# Don't use --started-from-file when not using dbus.
 	if ! use dbus ; then
 		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
@@ -266,6 +261,10 @@ src_configure() {
 	# Compatibility fix for Samba 4.
 	use samba && append-cppflags "-I/usr/include/samba-4.0"
 
+	# We need to disable -fstack-check if use >=gcc 4.8.0.
+	# See bug #499996
+	use x86 && append-cflags $(test-flags-CC -fno-stack-check)
+
 	# Needs libresid-builder from libsidplay:2 which is in another directory...
 	# FIXME!
 	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index e528307b941a..273c8bfc5cc7 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-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-9999.ebuild,v 1.226 2014/11/15 11:56:20 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.227 2014/11/16 14:37:22 dlan Exp $
 
 EAPI="5"
 
@@ -116,7 +116,7 @@ RDEPEND="
 		projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
 		pulseaudio? ( >=media-sound/pulseaudio-1:0 )
 		qt4? ( >=dev-qt/qtgui-4.6:4 >=dev-qt/qtcore-4.6:4 )
-		qt5? ( >=dev-qt/qtgui-5.1:5 >=dev-qt/qtcore-5.1:5 dev-qt/qtwidgets:5 )
+		qt5? ( >=dev-qt/qtgui-5.1:5 >=dev-qt/qtcore-5.1:5 >=dev-qt/qtwidgets-5.1:5  >=dev-qt/qtx11extras-5.1:5 )
 		rdp? ( >=net-misc/freerdp-1.0.1:0= )
 		samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4:0[client] ) )
 		schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
@@ -246,11 +246,6 @@ src_prepare() {
 	# Fix up broken audio when skipping using a fixed reversed bisected commit.
 	epatch "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
 
-	# Disable avcodec checks when avcodec is not used.
-	if ! use avcodec; then
-		sed -i 's/^#if LIBAVCODEC_VERSION_CHECK(.*)$/#if 0/' modules/codec/avcodec/fourcc.c || die
-	fi
-
 	# Don't use --started-from-file when not using dbus.
 	if ! use dbus ; then
 		sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
@@ -266,6 +261,10 @@ src_configure() {
 	# Compatibility fix for Samba 4.
 	use samba && append-cppflags "-I/usr/include/samba-4.0"
 
+	# We need to disable -fstack-check if use >=gcc 4.8.0.
+	# See bug #499996
+	use x86 && append-cflags $(test-flags-CC -fno-stack-check)
+
 	# Needs libresid-builder from libsidplay:2 which is in another directory...
 	# FIXME!
 	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"