finalise config option for qt in src_configure, fixes bug #549212

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 20 insertions, 20 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 109b96735279..aeb53e5a71c0 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/vlc
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.957 2015/05/08 09:19:25 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.958 2015/05/12 06:33:07 idella4 Exp $
+
+  12 May 2015; Ian Delaney <idella4@gentoo.org> vlc-2.2.0.ebuild,
+  vlc-2.2.1.ebuild:
+  finalise config option for qt in src_configure, fixes bug #549212
 
   08 May 2015; Agostino Sarubbo <ago@gentoo.org> -vlc-2.1.2.ebuild:
   Drop 2.1.2 and on behalf of the alpha team, we are dropping the support on vlc
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 75995e615bfd..51019ec50e65 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -16,27 +16,19 @@ DIST vlc-2.2.0.tar.xz 20861760 SHA256 5e0a27e248c47da723a696420aca3a4dd15cc3ed8c
 DIST vlc-2.2.1.tar.xz 20940288 SHA256 543d9d7e378ec0fa1ee2e7f7f5acf8c456c7d0ecc32037171523197ef3cf1fcb SHA512 91cd33ac61ebe376c24b3cc0d1dc52d7765fdccbd17e75abbbbf38f52b400e0269dc48f34ed558bff7ec1dd52c4f27098012709a3eb9fe7e8aad1069516de5de WHIRLPOOL 5c889fc5c0137f022b0b3408a5252668a1a946ed45677bb97bbbf0ec14c9411c24e8d1587e987391596774aaf7f1e4592c55b0c0f76742e84296bbfffb08e885
 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 15651 SHA256 6f56ea2be0152a9507d4968f4ce538f915580af8287e8fcd447eef5784fa0aa6 SHA512 6e840a2008a7c601bae78dfb8a1d1eba68c9631b0fd7fd35e1140c01ce5b721c0a3ea42fee1deb754be650d980d8438addf4a3e592d15ea98107a6d039c7c0c1 WHIRLPOOL 65e0ac1a5e97be4b9ef985a4c384f8c7fb4b1fa90ff9e82b401c63355838ff51fbfc4c17412a65044a1f48900f6346355aade8a021b03fea1f99dfca3c4d2e08
-EBUILD vlc-2.2.1.ebuild 15756 SHA256 5e52ebcba18d410367229d62e58a2224d964ae345928608a0536d905918dc234 SHA512 7024eb048badee27d904dbaf7c678f3cabe6787f2ccca1714cc85f8723f791b4c16053ef9d81a6aef4c9d39b3a5972e9f77a72d7983be4bff8f90d2ea6475dd1 WHIRLPOOL 387b4323478161061bd30ff458f3a1c640d377eb95aeac630209656f5033c039977b26a5756883c887158cc5db3c7eb225b49ac66675c0af75a9c0b58b691ac8
+EBUILD vlc-2.2.0.ebuild 15711 SHA256 0cf0868e40b1830dda8795e7b465ae3de4393f19792574331b5db5c20752232f SHA512 22cbca83ec8d3f6bfa823b985515d9cba1fd08602f1943fac80072220dd16966e11e745bff4f203c573e34c3a30e3c2d73d09b5ab1aaf216894e5021ab306555 WHIRLPOOL 1183df842c27c96348367094be9b9efdce88bff3fb695bcef6f87f6699389d6742f924744fc9819b9166225ec8d2fe4e6bd71eb89e29818e8a039e265f2ba1cb
+EBUILD vlc-2.2.1.ebuild 15816 SHA256 16a3c8c9415cd2d61e6a6c11f3e03d52e4b546ec0803aed906bba8c36e59d527 SHA512 a1e46322b3cc71d83684d72b6bccdbb49e41494c67fc891d281ba3c3664c445a54ea79c70cf9980fb5b5612280c322ba85039268f893ba2f06bccc58e89cfa3d WHIRLPOOL 85f7fcedaf67550751c53471d21bc159a7cbdbfdd0fad6100808bb1513fd3d4be21950fd05dd7b481f099205e231230c15b6e57596e20a1860c721b32f34c4e2
 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 38390 SHA256 6bdedd20faebb50d566a56a1ca83ab2e2622d71d76dec810a1573921830fc0e5 SHA512 43197ca3c5ff37af4445f2c830bd394ffee8a3f534972353caea27f616560fdc877691efa74d82f8e89d9b782d03dd4dda944a8a53cf9188301605e15967d0be WHIRLPOOL dea5910776184dea971f05e1ddd7c69bf9bb806cfe3484dbf90b6ecc7edc514ea4606a0ff15d55de09bd2d9036a07e03321ee62948bdea2de2a148b5e564854a
+MISC ChangeLog 38549 SHA256 d4f174641dc77723b190eb88235f4a9c74801de49a2c4a6fd1c4bc7a63b42564 SHA512 6bab34dd424271108b853c605058a9317f72a429837f85bfeae1716d42f4fe91ec2c627db91d6559d922db1af5f42ee7f84973a8c5ee22f122941190aac58a79 WHIRLPOOL e2973c805e04c16d3db4c2efd211c33a80af9220b4f193ec953b6905af2d39e53c86d44a2141bf7fe9275b47b5b8ddaf7dcfaec4ca8c8f3240a62a440ea26803
 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
 
-iQIcBAEBCAAGBQJVTH+dAAoJELp701BxlEWf1mgQAKe/dWU8hLdEB8UXHlIMubrp
-tl9lDn2FRXUBIpp45sDPK/utcwe4a5PIFrI8LYHYvSS+c99l/dEQC+vbHapQze58
-pZbXuUd7MjSfhURIQqHlcoHLWIoIfquVzgcx2Por3nZk7CxAecjHHlcGplxJ6WE8
-ItmSzNQLE4D19QT10YDbOveZxc3gRgtatmLljLfxbjO/NSxDAOkUgTKlVijGj8DF
-l2FkKbPe6SyP9ZtzXei5A2Y4om4h/iT2zYDLPNHMhCh8E8tFS70pjiCTO+rJZYoB
-LcJCMcNzcFZKwtmoH7oq8N8xjbL9vIGsrA/NJfvX4/bcoUi67qdP7FI9l380eF4g
-a2KXTtMvu99Bk9mxGcHGg6SgOxiuPcddRyJvzmznz7E3XJFqxzGDZgGwNkrw9IWy
-Eyv3bhL+tptXkwcINsfLFYApj2wPDrmoINqKgsE0rQxs+qEYCHhz+dE+/oIs+xl+
-esVbau8Mp20xFnsVR1BFskfNfG1Ycs+u/mDwZi+NWug2ZS3eJA27+AzQyRUUizfE
-K+ZjXPB2YdUoaDlHm8bNpNdHYGj1QhH695CqeJSVMO4CEQ2W7AmL/F7pBM0EM4hX
-gKSA4RuyCE6SkEKN/8XuxxxOPnIqcAywm1X2YRtBW5TE+dKxYZlrUDwDAiJSSrkr
-e+R5dzNjv3devpkwmWJF
-=DNXD
+iKYEAREIAGYFAlVRnrRfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldDdDQUM1OUY0ODkzMERBREU1NUQ1RjJBRkIy
+OEVDMjEzQjgwNzJCMEQACgkQso7CE7gHKw3kAgCgl8Qz4Qt+T2YoKwbAu61V58nn
+kNUAnjA7W11rhDWJ63pPqjO+lw1Iglip
+=mBCl
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/vlc-2.2.0.ebuild b/media-video/vlc/vlc-2.2.0.ebuild
index 0181526c4cc3..899aac87479a 100644
--- a/media-video/vlc/vlc-2.2.0.ebuild
+++ b/media-video/vlc/vlc-2.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.0.ebuild,v 1.12 2015/05/02 06:28:37 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.0.ebuild,v 1.13 2015/05/12 06:33:07 idella4 Exp $
 
 EAPI="5"
 
@@ -310,6 +310,8 @@ src_configure() {
 		qt_flag="--enable-qt=4"
 	elif use qt5 ; then
 		qt_flag="--enable-qt=5"
+	elif ! use qt4 && ! use qt5; then
+		qt_flag="--disable-qt"
 	fi
 
 	econf \
diff --git a/media-video/vlc/vlc-2.2.1.ebuild b/media-video/vlc/vlc-2.2.1.ebuild
index 7b55e00efe88..817859873af8 100644
--- a/media-video/vlc/vlc-2.2.1.ebuild
+++ b/media-video/vlc/vlc-2.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.1.ebuild,v 1.7 2015/05/02 06:28:37 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.2.1.ebuild,v 1.8 2015/05/12 06:33:07 idella4 Exp $
 
 EAPI="5"
 
@@ -313,6 +313,8 @@ src_configure() {
 		qt_flag="--enable-qt=4"
 	elif use qt5 ; then
 		qt_flag="--enable-qt=5"
+	elif ! use qt4 && ! use qt5; then
+		qt_flag="--disable-qt"
 	fi
 
 	econf \