reset configure options to cater to either qt4 or qt5, fixes bug #548360 by Toralf Förster

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

1 files changed, 9 insertions, 7 deletions

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 1ecc1df8b804..f1615d3eba8b 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -18,17 +18,19 @@ DIST vlc-2.2.1.tar.xz 20940288 SHA256 543d9d7e378ec0fa1ee2e7f7f5acf8c456c7d0ecc3
 EBUILD vlc-2.1.2.ebuild 14601 SHA256 f93dfb4630cec9dc04885ee1818f9a81a0531a3c32931c8df1607b282181fd02 SHA512 f8dc44fa4d70b70c85bf1b4f5cad484deb62ead0612163b67ce5f7a74fbc8c24bddaebb98033032c0e67c18e0ea3edba1fd6f2760336453196bf47f765126a1d WHIRLPOOL d9b75b87254e9381c6ae19b60cc8bae60d587da5f4beff7d489124cdea3ac7d1fd2e2fb6d0446e90bb0e081ed75f1a751beda50285dea933c5d929fbfa0db638
 EBUILD vlc-2.1.5-r1.ebuild 15387 SHA256 97a50e19ac49cb4c9dcc6853fdceec04e4f00c1f856dbbcef1763852cd7c94ab SHA512 421f017215367523e62cac6ad89931449f76a78d439fb89b44e9a4088d6a199baddb4ffcef0726bcc94968540407ec993a9e560c53f38f1d547152cd17b4b3cf WHIRLPOOL cce9190e813c6b34fe8fde31061d98e526eeb61e06522978c3401b03b92095143e2d201c95e098dd03f61c7ac12d7fdc8e5a2d437e1861c9293a756fad427245
 EBUILD vlc-2.1.9999.ebuild 15308 SHA256 9ad081efa162ae762eaaef79510ce450ec12460fb11c864d25542828c387d925 SHA512 83864352df405eb3872a8fc3d546c91114e5fc7cbb74ed767d94ce4299787dde8fe8ee97c26fef1597809b524e7ce7a49dfd95774e3424e87ab64f122144de8b WHIRLPOOL c52b17f248cf34e86a4a469662d674ea8b223386a152488747b75a67bf8b0d1e0c6e4a8dfefab4aa7be5c804608a73be0eba539009d13ad31bc286efa0635620
-EBUILD vlc-2.2.0.ebuild 15613 SHA256 06fed5454ee945f42ab9d9910ef98451488b6dd323175e16905fb83d09527559 SHA512 cbc967874e33877beca35cae1c438a813a5cddd3df92cc148dc56f49898f568bdf66a4064c09b9a45997740f2606a0d22851b072ef77a35de081b6718abc3faf WHIRLPOOL 86e36a6f7d1e9bcea79ecc668d1447a117482aaadbcfa8fe1d4b3d01253c3b8dc54295c9b46c79f05bbcd0bb9edfd4e2dee42b7bc8a2b80c8fa26fd85042698b
-EBUILD vlc-2.2.1.ebuild 15714 SHA256 f12d5254ee941b46c1eb04b45d7326d88755d84f68ef75046d9571fb114aabf7 SHA512 720e59297f85f6e45dd53c809de6af3bd0748197c50ab3cf7b64762c66169ec213deb87829d29da43ae6c3f1b8d018bd46d8704a79745936e4fd776656eae57b WHIRLPOOL a93a752e33d849cb118e350d133d4cf157a052a7dd6bdbda3e3ac826737b2816820c0912510ac100ae5bf29717257cd30708e0d70ba66974625438d0071f2dd2
+EBUILD vlc-2.2.0.ebuild 15651 SHA256 6f56ea2be0152a9507d4968f4ce538f915580af8287e8fcd447eef5784fa0aa6 SHA512 6e840a2008a7c601bae78dfb8a1d1eba68c9631b0fd7fd35e1140c01ce5b721c0a3ea42fee1deb754be650d980d8438addf4a3e592d15ea98107a6d039c7c0c1 WHIRLPOOL 65e0ac1a5e97be4b9ef985a4c384f8c7fb4b1fa90ff9e82b401c63355838ff51fbfc4c17412a65044a1f48900f6346355aade8a021b03fea1f99dfca3c4d2e08
+EBUILD vlc-2.2.1.ebuild 15756 SHA256 5e52ebcba18d410367229d62e58a2224d964ae345928608a0536d905918dc234 SHA512 7024eb048badee27d904dbaf7c678f3cabe6787f2ccca1714cc85f8723f791b4c16053ef9d81a6aef4c9d39b3a5972e9f77a72d7983be4bff8f90d2ea6475dd1 WHIRLPOOL 387b4323478161061bd30ff458f3a1c640d377eb95aeac630209656f5033c039977b26a5756883c887158cc5db3c7eb225b49ac66675c0af75a9c0b58b691ac8
 EBUILD vlc-2.2.9999.ebuild 15475 SHA256 1819c60eb7a378567b678e9194230b2cca81aba549bdf5814dce0a1e05ea2508 SHA512 70c6238990524d3fd48cf225a111986290d645dc3090e149cb7054d122a58145604a24d3416fcfae97a40c625576a1037c4bdd18770074aeed58361f2fb7917f WHIRLPOOL e020950f2eb6c697aeff184bacb5ff253895fe45d44dfc4b4db0ee476db5ba9b4193a566c6dbbe95da8ddadb215396375bb06f2161689383a873048c807c3505
 EBUILD vlc-9999.ebuild 15466 SHA256 675ca38986346580a583ae7708301f3e48ea5a18b63a5bb80d0208206e824294 SHA512 3d5b80d600ef2333568cda6beafedb3ec305dc9f2dfd5f8d352198c1b8738beb9d56739c8543389030a72942bb06cebbd9b61204d081b0aeb5e2bd7db5828434 WHIRLPOOL 683ef982dd4039c40b050f6f7bd1751a57a3325424d9278c3364a83af426b1f3c1f0944850822602a8d0dc5848987cfb82746a7f0516f0c15a4ea5a805ac5240
-MISC ChangeLog 38045 SHA256 de44d9dd8651e892c95b48faac1ef3df838279a474f3516d2071993568250a9c SHA512 7c060a01c7ccf5380f65daf053d3dfc6e187e3c9506f335fe9435cfba8b5524f60eb5b7f1dee1ffefd4844c0e4048a031caf96c7886aa99ed59cac466da7d3dd WHIRLPOOL 5b1f9fad041c8c329772ab295f0240fbe4231ca0f576d727b83fa673818c2a920270ff94030554b0422943a4468cac1305d8a945c0424c661251dfdc27b119b9
+MISC ChangeLog 38232 SHA256 879ee0d83a3c3b48d41edaba1e579c6af0a793bafe7ca8b2016856d39bff2a27 SHA512 b61a14f72f971c86cabc22371104873aac2a27754aaad4b7d1a5e979ca0bc97f0881ccb5984ef6644e2f52de1cc2149e7989939c07fb31b18d9bf635646b3610 WHIRLPOOL ed758a47dd2418feaa786fdc33ea9d500d4d9a6ed754994285fe2403a0b4859de009665c73573751dd5ae3a2506766a5981f17dd03979b87df582aaa1f2603e1
 MISC ChangeLog-2011 113818 SHA256 34efd4743fdaa4b24df7042e0cff14ab00cc5fae0838bf489b2eea620654fcc2 SHA512 9b1060fc57d0a8912a38c269b7ec140287c883798f6f3528f0f2d43b5772817f31e0addf4f88f139b82cda4e094d2f9a30e3b9d1933022b81b974436ed158d9d WHIRLPOOL bfe449ace05bac74b195d82eb2b3648b2240f92dabf6446f6ba93ca51b7ecd999ab5b9247dfd1f1a7cdab8d309684ffcd1c829773a471d862c19814a18db7ffe
 MISC metadata.xml 6538 SHA256 cee37b9633b574305f8c07a19d7eee2d4362bd6de51822f98b7f150367ee5fe1 SHA512 29e8b36e5e4c89fdeb7cd3a9e9014a03855540d5b8246172febd4a5465cb50030187366c4d2c982115b08e0cd71e72e9dca7d49fd6ab8f263ad5b718df392345 WHIRLPOOL f15ca39b118e250412484a3be271f3eb2f476430e4957c77596cb11ca51752b80410e820adb559409dfd43fc631fc3262c87ac3f3ba2e4e8c53eb75c5a3baa8e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlVDy98ACgkQVWmRsqeSphM2YQCePOXxFhExXU/sD91tQREr42Y7
-AeEAnjbmJbIk+0VshfVllDa820KchLJH
-=YAb2
+iKYEAREIAGYFAlVEbrhfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldDdDQUM1OUY0ODkzMERBREU1NUQ1RjJBRkIy
+OEVDMjEzQjgwNzJCMEQACgkQso7CE7gHKw1S9ACeIEXlI3YqXdXodDP45CE+1GDD
+DfoAnRuchEDrVXn/BnY2CPCfYBIDCdbp
+=aSOi
 -----END PGP SIGNATURE-----