x11-libs/qwt: Make sure at least one qt version is selected, #538108

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

3 files changed, 23 insertions, 18 deletions

diff --git a/x11-libs/qwt/ChangeLog b/x11-libs/qwt/ChangeLog
index 87483a7c2b7d..d137bd7f14ac 100644
--- a/x11-libs/qwt/ChangeLog
+++ b/x11-libs/qwt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/qwt
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.138 2015/01/28 13:31:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/ChangeLog,v 1.139 2015/01/29 11:46:47 jlec Exp $
+
+  29 Jan 2015; Justin Lecher <jlec@gentoo.org> qwt-6.1.2-r1.ebuild:
+  Make sure at least one qt version is selected, #538108
 
 *qwt-6.1.2-r1 (28 Jan 2015)
 
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
index 7429000d0963..a6601cace9f0 100644
--- a/x11-libs/qwt/Manifest
+++ b/x11-libs/qwt/Manifest
@@ -13,26 +13,26 @@ EBUILD qwt-5.2.3-r2.ebuild 2725 SHA256 aa01e7b17a086a6e37788d1c7863d6ea9915936da
 EBUILD qwt-6.0.0.ebuild 2278 SHA256 ade33991445f88cbf715a62dc9bc6acd93d0b8f0d4e52561a39a2cf82a001d68 SHA512 3359a28784a8a6f2818728043ff531ea82ee88873c106a7cffc24f5e45b77cff1a8dc1e993f11172f3ab46a4858f302804eaff7a1e1421da8526d49ad91b0964 WHIRLPOOL 79c763fb7434194bdbf1f11b6a61bbbddd60652558475a9ecbe96d9e867caeaa95309c0026d486d7e5aa3e78f2b86e1f1ef7469565e539c183446d79b516dca9
 EBUILD qwt-6.1.0.ebuild 3132 SHA256 9e00e0e13515f4020b6916619e3418f20a37df4c25e9ea4904b5ae7c932f0085 SHA512 23070b70188b2c51689ae37f7e5b117e36512882bb9ae5fd9e9677c9e7e34de6bbcb2bee99682e90591da694657e77cdbd4f53d01361f000fae347205b6ec247 WHIRLPOOL af3dac9017e1f494b4b380aee4998df03baec70f9e798937ae1a2903ef1ddde2c564d0aaada2573db3361aa61d6c0f50f336ebeca529ec14be109a24fd0b0609
 EBUILD qwt-6.1.1.ebuild 3183 SHA256 619b1936c8fe43a2f3b6389ec16bdb9523ae932b99becc6cb3b54431778a88d5 SHA512 49576b220ec6995e5377b39c41ed47e93b7552a394ff741a1f249386e1267417d47d4f9eb8721b1c055ab70ce8cf89d42a7f99d2c13e0ba87f008f541cc5c314 WHIRLPOOL 41c7aa8d83122ac8bb5e7ac87adad543f7c38e74d33af7a6ad81bd22863dd2d609ed1b821daabc7298bb9554322909d403cdfc231ad2b15f26603c60f5a5fded
-EBUILD qwt-6.1.2-r1.ebuild 4972 SHA256 0cf4ef2205ec1131b392cf005cd73d4e92b32ce5358e8438db2e58405e6f63e6 SHA512 db23dd398f54dccb170670e1728d814b1ec4854b5a5ceb2ca561da5ac95d3ce5c95964335b82749509236fc363713527c9efb448386238a7d8d1ad6f2d0960e6 WHIRLPOOL 8f9aba3eaf3cd3ec75df8872336fdcec97133c1a9bb08683e5ce4decdce75269a6fc08698f4667229e1457a89735987c0e2ebc274a7238ec1811933b4295db16
+EBUILD qwt-6.1.2-r1.ebuild 5003 SHA256 f88cc2120d6ff5610763b914b1856879abc1ad37e0cbec7bb7e42c14d1d5d616 SHA512 89a2f2ea23227413952e80ad15b100e61729471541e6efd7b4ce7405d1611cbf1987383f60e3a624ce8fd09b24b60e56e266a9efee05f55a139e9e023924c687 WHIRLPOOL 39ad3491dcf45280af2d2cf1218342de0e8961b2ca854bd5dd44d0b022a825afe141f074053d7428fcfd1a9c000dd7d8eac84399b44574f96dca434db60e45ac
 EBUILD qwt-6.1.2.ebuild 3477 SHA256 960fd31f5275563042ac494f4b08f42b210f63a03a31e59fcd5eff29321b5dc6 SHA512 cc01d9fa7f657caa4dd7a1ec53252cbedbd5f5295d9de66acb3fb3ce9e74164288cb174f85802f2a25caa2dbb1c8040d719d9452780e9e825bc1593793c4fe13 WHIRLPOOL ef0a4a430b01de0e1676c58d9f33d86ea46af3bd0d878b20f78498834d8c032cdf283cef91e4d22a49f3999d7d3c4481249ef8ab9302618ca41187d927cd8123
-MISC ChangeLog 18708 SHA256 cf46c9c3928f69f7c6285e9e52b9d8888fe3efa7ae8ba8ee9adae998cf3cd6dd SHA512 f86d15fbb0507d61dc5531dd2a10a29ec53eafb16c49b54099f32c07ddb07d4f1f6c1dcb17e7748475c37cad79eb91509f7b20621cccbdcd17db34508ab1123c WHIRLPOOL 13bbc7a93caef80a3cb838ed8ed1f9a609e0ee8af7eeea0a347557eb8ddade01580060854e5cb1ba9db636c9102e356222750f21d06df18005acc3fc2224467f
+MISC ChangeLog 18834 SHA256 edd32bb4f2de3369b28de533669bb6f39587c97f8304d27003dee14e45693f33 SHA512 6e5036920ea34adfeaa2d196c80e980b0a1d78781a084522664be69aa3e6623ba9707cd98dcc42970b6e240785d5d740a9f4db348bac126d11ca47a5998f92cf WHIRLPOOL 1a0e64b4f109182faca3d7508ce2afca5a291f1080944f5527cb8f71e9bbe5e717144aa0dff4ef98b38cdbd1f8c062edf9b4a81279b5f8257f544de0502cc299
 MISC metadata.xml 615 SHA256 143e1e3cfb374536ae429ca941b781a34060906c17144a72f95c6717c9f9dc91 SHA512 dce756ddd462905a17ff1504eb3615cf652e2da0dae7678689d5880940601a4ecce8dbc2808feb6de9061fbf602c8d8a19d0f17a3ea7e0ec4af38688a9a6d466 WHIRLPOOL e89713d285d300cd40c9691b3e36581d300fc7e5877d8c0c6e0013ea74e761354416e44a5137b2c234b20b2e6fa9e759e6127c9b182628679ce418d695b120de
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCgBmBQJUyOSmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJUyh2oXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
-OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir8u8P/3ERYHTxmwoyNAR19eY8voIA
-6m4yOSvLJL92ISycuI4cLMLgY3d02Td3+kgDduhcN7wcH4+d+HFcWyaP5+DHRL0L
-9qNW6ite32RInGReqrvwxs7L3H/+meHrF8mdbth/H/RdhSlfJHNQZ/st9at5lpjl
-tbAGzpe9+yuCZKtxTQUfJf7oYOTZ1Rce5Bqr7RCcuVNKt0ZahUAMfxMm5OgVkGiB
-ZSbnJ+aJXEP1kLw4nyeEE8Z3K4NzntZfeiVrkpPNfTXE8Ax4Gn1R0GLHTbxHxGi9
-oQCgYcwg4XOVTPtm2cBF8w/nuvXA4hKvuBuSwweexxXEkK7Q+pUyw+or4sJ+NDkC
-3p/mZ3HHCn4YidmKxipumqMLecae93VhYIn/O0RnveL+O6DkbbcdaHId+K1LVggG
-wCabbQsR/tkvkHfruRMnBBJBW47oyAMPAxgrxBEdrs1CIzp75V5dlgmLOfjrwMYj
-Xp60YE63nltsm9cIWOwvPkmADnCH/VMVEMABfGs8idF0AB7pyvfdiGp9nB00gCvn
-FApAKAm3Txthvaa6LcynoKPridkh1AHc5YfLNN7aTC/lRGjZXiJ61wVivcOCv4oe
-+ILd38czjw1pA+o0ydabKOqm5/y8ltOFpQFq/u3+p+Os8wTKbRUdJj8/ccq0ETGY
-HgPO2GJFljiYWa4n/a+1
-=RDiz
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir/uEP/1cpbvt6jeRoDOacNHu5nDJJ
+aGU3VjNyR8OZ8pGahlk7U2NRnMjRe4wN4sMoHqd8Z+d5cHK30l9kv/yk0f5kWkdU
+dqRmNHBRztjARnskGpEEjnrV/+3q4swVbEuuj38+E3AYiylORnui87FoDFJe+6Ye
+8d8eZ+U8Oa2ARnNRDeiw8pxxG+RmLZc0K+kvAsPBUwE6JVqFVx1tRDPy/QV+JX3a
+o8PLKt+l+gM2egpc+e3l51ZuLJbITgnTZctqomXh2NUSy/3h1KKao7tcs+g9ROL1
+vg8r5fLqTDJUeZE3TDkYet67h4raPaornhKcHQNpi3XBlsEO8cvOOMEBabJdWn0U
+NVEZaJ8B44uFM8mqnTUie3HZleZ99isn43GMsNhmaqoxdSjM9VagfvmtCQsjyy17
+lbH7EwVyi6BBgo6zzsRXth1H6Kny2fU5E8X8HzbESW/H48g3shwAuZ6pomAa06SL
+bZ+c5bQ9BYvTIFzKtEDxtpEq3S4HQ4AQNR6/NxxodbEHDJfzi/Xfg3RjNlB/UkD2
+rBTMTHeURRC1kt875ZdtwXpI7pEknm5MV0TUgzSXtMrwG1G7nl5+3UegA1lEGD1Y
+W3WNDJgK65Bma2U+n4ze8uZgpttSskYGu8sqRf7B+DVIse92/LHkGSwEZT3KWSgx
+JwQCJyAVGRE9+iSCaZcC
+=qCJS
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/qwt/qwt-6.1.2-r1.ebuild b/x11-libs/qwt/qwt-6.1.2-r1.ebuild
index 45987410569a..cc5b58dc0583 100644
--- a/x11-libs/qwt/qwt-6.1.2-r1.ebuild
+++ b/x11-libs/qwt/qwt-6.1.2-r1.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/x11-libs/qwt/qwt-6.1.2-r1.ebuild,v 1.1 2015/01/28 13:31:17 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/qwt/qwt-6.1.2-r1.ebuild,v 1.2 2015/01/29 11:46:47 jlec Exp $
 
 EAPI=5
 
@@ -17,6 +17,8 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x
 SLOT="6"
 IUSE="doc examples mathml opengl qt4 qt5 static-libs svg"
 
+REQUIRED_USE="|| ( qt4 qt5 )"
+
 DEPEND="
 	!<x11-libs/qwt-5.2.3
 	qt4? (