qt4 renamed to qt configure switch, reflect that; there is now qt5 support that we will handle once it hits the tree

Package-Manager: portage-2.2.0_alpha116/cvs/Linux x86_64

3 files changed, 25 insertions, 21 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index f6fa05db7b74..156bbf6c072a 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.812 2012/06/30 20:12:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.813 2012/07/11 12:20:58 aballier Exp $
+
+  11 Jul 2012; Alexis Ballier <aballier@gentoo.org> vlc-9999.ebuild:
+  qt4 renamed to qt configure switch, reflect that; there is now qt5 support
+  that we will handle once it hits the tree
 
   30 Jun 2012; Alexis Ballier <aballier@gentoo.org> vlc-2.0.1.ebuild,
   vlc-2.0.2.ebuild, vlc-2.0.9999.ebuild, vlc-9999.ebuild:
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 0d6a7cb6622d..34f982257ad9 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,25 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST vlc-1.1.13.tar.bz2 26226587 RMD160 c5aa438a9085ddbf28e849df442b75475693290d SHA1 05bbc7ff427f3b919b29a45ce014caff9ba92648 SHA256 03edec44d463b9f5e7db56fd844c6d4ac79966638e1ac32dedcfb5847a9323c1
-DIST vlc-2.0.1.tar.xz 17210552 RMD160 9d932e1be72b65cf47057191d9e84deeedea282c SHA1 40d0ed360dd3fa7dc3ff4fbc9c319553ebb22538 SHA256 7f485725c17487a77d70844cbd9acf528360d65cd6ff79d206657920f4fcbf4b
-DIST vlc-2.0.2.tar.xz 18023928 RMD160 a8fbc91dfc01c8b90c7d693b6cbe4fa16207e822 SHA1 da597e781f855dff4cd278c137c0faf43b504c26 SHA256 111a83b19d09989c1743ed708897586e20f6cd37f27cc2fcac09c75a7221c62f
-DIST vlc-patches-101.tar.bz2 3011 RMD160 785ba728c04f025ca8377061e82c6c865d50a736 SHA1 e9be6b192bb3d69e4bd2387a9854543e0f8b3132 SHA256 abd3af99b9c2fa76b67a2e9c72e2d81982f1bca93cb5e3b2f33d29de9e395dae
-DIST vlc-patches-105.tar.bz2 4325 RMD160 1fc8f5edc1f136c7074a5a00aabec583aec1cc58 SHA1 9f70e4a7ac7749da58b0134f4de79227a6b66c69 SHA256 e28047c097de2b1daa26b32227f11bb06d09a060b93c6ae2fe564094373f0778
-DIST vlc-patches-108.tar.bz2 3189 RMD160 1788635a15e229fca1e40b6e8c7425915c963cf7 SHA1 0e1d6129add81b84fb3212c1c636dd4744e65d4f SHA256 18de61bb0e0d7b4d79b516096c44db4b083510c338b19802422c69f1431b9598
-DIST vlc-patches-109.tar.bz2 5292 RMD160 a94be4d080d135a29358e250c327d2c3281bbb62 SHA1 261db75fa8c0e5fe4d234887a2365ccaf0fafc0f SHA256 264423f9ec76004d1bbe9549e5c7f935e951ad22ca8377b77271981c92403b6e
-EBUILD vlc-1.1.13.ebuild 11793 RMD160 c302441e84e179a53c2042bc7b30450aa64ec4d0 SHA1 5e9d4256a8b48648d2234a22666bbad28b941a49 SHA256 a5f2ac401c0c7061a56f6335c0ca52b29737b9edd0aa8d67c5899974b335bc5d
-EBUILD vlc-2.0.1.ebuild 11078 RMD160 11e202a321dbf6eb07859b65c524372e20287ed8 SHA1 99ae8ce6cbe893609d85dc6851e4f85c52608c60 SHA256 6a32cb08f9fc0a879d2cd661da65c86984d0b8f4889e01c1cd750e70218df1cb
-EBUILD vlc-2.0.2.ebuild 11033 RMD160 076e7f3007e0a17cb062f9e85382251dbd16fb53 SHA1 a476149a26e0644287a99ed36c195fa7cfcff8ba SHA256 612079068a47bf6fa46a0905550fa3e540c270eb9bb2a6aea794483f805ea4d1
-EBUILD vlc-2.0.9999.ebuild 11037 RMD160 d26606d5f4de18aa69f6823baf24572ff2449f95 SHA1 3854724b6f40ed0b7b835a45d3dfdf2b834fa97e SHA256 ecb07bb64ebed290fcfa189a61c4d864663f9556b5d9584751753a08a8ea047e
-EBUILD vlc-9999.ebuild 10825 RMD160 cdd2d6dfad66b8eba227ee692196988dee9fad9e SHA1 c6a37b65abf6bbe758a3e1e3d4d4e9039907d508 SHA256 551f8e6ad611941ee7b4b29dcc9a7cc6ebd2a4daa1423459a1b3a0681473d163
-MISC ChangeLog 6587 RMD160 ad159d0868202b3eeca07f8231b4f3ef9f1e4463 SHA1 e4f55f3d18b955b77958d9674db0798674cc804b SHA256 659a9fb0a0c93d3cdfe1c1febac2a8469b78563a3d39e0b6f79e1b81e690262c
-MISC ChangeLog-2011 113818 RMD160 fbb86916aed66ae0a18a2b1f13d3c1dc9fdcaf7a SHA1 5e3dab004808f103ffae80563d33568e98f0d119 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2
-MISC metadata.xml 6481 RMD160 092eeb49fdd24ddd43a1a16c2f63fcd8293e0d36 SHA1 8048bb48c124ef8c4533fc00aec9b6a773289bc6 SHA256 b99038f79031a2050ce0ba658a45e87d1388066989b8410109587aacc81ba7f0
+DIST vlc-1.1.13.tar.bz2 26226587 SHA256 03edec44d463b9f5e7db56fd844c6d4ac79966638e1ac32dedcfb5847a9323c1
+DIST vlc-2.0.1.tar.xz 17210552 SHA256 7f485725c17487a77d70844cbd9acf528360d65cd6ff79d206657920f4fcbf4b SHA512 12d583daa1062ce78a3d842b978b78ae9c8805dedfcf0e8ae4ad1272984c1170e8a4f3ac0e6c8511cf016626a450cf9d763998d156e70460abba781d6599a6cd WHIRLPOOL 82aa1b036df008b25e36474e68daebfd2011d92add2eae42a105c24a1b4f8456d71d184cdd8f6939387c9f7c4b069f34d54c2ebea0ffdb08342051a880b49eae
+DIST vlc-2.0.2.tar.xz 18023928 SHA256 111a83b19d09989c1743ed708897586e20f6cd37f27cc2fcac09c75a7221c62f SHA512 a680632f669fd85edf8a4bd6ae57951c8bcc4fe1c5cac039b839b7409b2e432722057c588cae1a23eec41b1cce17edff97375da584bfcb3514da3ed528b72c3d WHIRLPOOL 410782ee9996ff1f0566d1b248649211a273dc1debe7cb071bdff966fcb62644b215039f2ab70137a34a326dfabfca88c46986e9d45d5a05b5f5b158a813c4f7
+DIST vlc-patches-101.tar.bz2 3011 SHA256 abd3af99b9c2fa76b67a2e9c72e2d81982f1bca93cb5e3b2f33d29de9e395dae SHA512 f059f3c47b571dd5a28d979abdcb3a8c2ebef13845cd4102d877b1786ef4b3ba15cc22873de0fd84fcc7a4413f582064f12edf40627e9f030fd8e6fa03d67c66 WHIRLPOOL eb2f184c99db6d174d22e4231003d93171f5081f917f10ecf6bc927ff96983aa21756d15063909cb6f8ad77f0db0b978fdf2eb2fba3320f19c6bc26e17b04ba7
+DIST vlc-patches-105.tar.bz2 4325 SHA256 e28047c097de2b1daa26b32227f11bb06d09a060b93c6ae2fe564094373f0778
+DIST vlc-patches-108.tar.bz2 3189 SHA256 18de61bb0e0d7b4d79b516096c44db4b083510c338b19802422c69f1431b9598 SHA512 b641967a4dfd89987c25adbf81636826dfa04dbaa963abcfa88537febb6b43794d6eefa805c5bfb04a8c9bd58c03149b1879c07b38dd661122830941cd4dbda1 WHIRLPOOL 59f4e0ff48ec567bfc62b4abd7604c004203d9d0826352cf729e68940faf0f2c2c8f2025b64b893c84beedddaa8453b86f7030c37bdbd619be3b2152c63d7e7b
+DIST vlc-patches-109.tar.bz2 5292 SHA256 264423f9ec76004d1bbe9549e5c7f935e951ad22ca8377b77271981c92403b6e SHA512 9b48d7290bf284fe27e802e7e720fb68bb4b4b38b1aa3dcd0e58bfc4096454b3caf79322ae33865d1c99ac050d14207052ed0748436540f4847cbc68babd5f82 WHIRLPOOL c493948158818779ced60d11f0a9d559c98f937f1137d78b99ca825fec1c94e80c455e2bb29e52d2dbe7eace8fe47bac3bcb373142eab3c1cadd190073e82f37
+EBUILD vlc-1.1.13.ebuild 11793 SHA256 a5f2ac401c0c7061a56f6335c0ca52b29737b9edd0aa8d67c5899974b335bc5d SHA512 0128139ac0a6509b0371ae659b38c737ce6ac6f406c2cd3304e950c636e8885c1cc54694124e5e8e84a729b9f73d6a60d2421dc29dfd948d0cb7c877deb31b31 WHIRLPOOL 3c8a4db6d91ec3ce7b2ccdc27bd6b9f72601373a55175f51e9c21839d07f6139ce3c492e2378d9eb2908b5d4e7b87bb8e62b42741871fb26cc5efeb74f9c5605
+EBUILD vlc-2.0.1.ebuild 11078 SHA256 6a32cb08f9fc0a879d2cd661da65c86984d0b8f4889e01c1cd750e70218df1cb SHA512 238641fe24f290d2282c03238b8ee37a0866876b49d6ced76227ac4858d4fb34cdb961140c72a090d373b45e0531067f66d7c4445a9c6216a525f25fcae6c26c WHIRLPOOL f08679be5544706fdcfa9fcd2f053185cadb11ed7044c20fe4fe798ead49b5cd8d0c025b0523a26fdebe581601272fefb5dee537e463a5d4db3e36b76febf84a
+EBUILD vlc-2.0.2.ebuild 11033 SHA256 612079068a47bf6fa46a0905550fa3e540c270eb9bb2a6aea794483f805ea4d1 SHA512 2b073ba058bb49ed0d0cca04dd276f7a5451857aaa2933350da4e87920118c2ccaefe22426b703e922d2ea46db888493c36aff6daa89bd8fbd5d07dd0334e506 WHIRLPOOL 25c795bec0835f140cb28c08dbc29a89cf7af2ff0b891cc8102d4246d1f07631a06ed58944728bc20d0c1c39f1b6f86278bb616a38de8a026c8463fe96a03adc
+EBUILD vlc-2.0.9999.ebuild 11037 SHA256 ecb07bb64ebed290fcfa189a61c4d864663f9556b5d9584751753a08a8ea047e SHA512 1b1d11386331417d71f34cf1be3d9fdb3c11e292e758d7ab714c4376b482534e137412bacb7196b085d6c0c2bb52147068d35b2dcf03e6179558f9a8630341ed WHIRLPOOL c863ec2a577b456b99597679121a08bfc31130c11df7fd7b3b1b8aadf723bc2a7d7a5c2f31f08020ca0bce3404f56c914248888ddff28715087912967408a221
+EBUILD vlc-9999.ebuild 10828 SHA256 58232ce36c3f696a9058b74ada7fef96cbb2e78afce6890d2401bdc983c2985b SHA512 9f92fe061e3092f785b3e8e8ba863f9c5fbdea8fd8dc0d1a23fe7713c2ecdb1d3fe1519a8594565608de9c76596752e2e5d72cc1e9d06c535d344f9ce3d8e15f WHIRLPOOL 4c55d8e7a309687d11f263ca937e4930c1c874195bf780b15098fdb7da9ba36f34e52805b51a90e796f006b7f764f5570dd4a2a1191a4894fb7bec20c06c41b2
+MISC ChangeLog 6778 SHA256 ff8b6e58b218a0a8c7ac0037402c176b1623fd8d814d5d5a435a0ee5d003e477 SHA512 bf6031e94aea52c214e7165b9b6d9f40357ef9047779b4fb06f08d5d9d7bea9df43bc1ed0b4a54b84baa21235b099b79e2bbb450fe1dbfad5cb5c6b14186d8a4 WHIRLPOOL 96f44ebb9f9f3f5aeccd9ecb12b89d5baf329dcb2f6064ae4b5576b9d83d722393c0c8e48a29a45f4ce3156e130a144119f3aafa4b70c0e90e11c77868979c6a
+MISC ChangeLog-2011 113818 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2 SHA512 9b1060fc57d0a8912a38c269b7ec140287c883798f6f3528f0f2d43b5772817f31e0addf4f88f139b82cda4e094d2f9a30e3b9d1933022b81b974436ed158d9d WHIRLPOOL bfe449ace05bac74b195d82eb2b3648b2240f92dabf6446f6ba93ca51b7ecd999ab5b9247dfd1f1a7cdab8d309684ffcd1c829773a471d862c19814a18db7ffe
+MISC metadata.xml 6481 SHA256 b99038f79031a2050ce0ba658a45e87d1388066989b8410109587aacc81ba7f0 SHA512 63a15dd1605f9e61b67fe740e4709bcfa8ecad31d548e15997dd8c3677a8d7d70f180b00d21761be32c5722591df5151a2f1f0e27d6c93b1414bbbe9d569295d WHIRLPOOL 730f52f29beaa5106881f89f14984776b59e15349ba62db6d8f8f65b5424bc31ee2006d728b5b2c2984d6b6b23b695a2ff8cdd8997528519feea23e18106e622
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/vXZwACgkQvFcC4BYPU0r2tACfWdZI/MVGsEmpGpPyum+EFtY7
-lacAni90w8o2fxYNt7IewRUCPpJ0LANy
-=IuVy
+iEYEARECAAYFAk/9b7AACgkQvFcC4BYPU0qNCgCeNcNn/EmH0DVYWS8ov0ymoZrT
+JgIAn0v3NBTXrXPrywj3NcGvHKCiCunu
+=Rx0K
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index ebc2ae93eb60..f195a1722d46 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.177 2012/06/30 20:12:06 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.178 2012/07/11 12:20:58 aballier Exp $
 
 EAPI="4"
 
@@ -278,7 +278,7 @@ src_configure() {
 		$(use_enable projectm) \
 		$(use_enable pulseaudio pulse) \
 		$(use_enable pvr) \
-		$(use_enable qt4) \
+		$(use_enable qt4 qt) \
 		$(use_enable rtsp realrtsp) \
 		$(use_enable run-as-root) \
 		$(use_enable samba smb) \