Enable qt4 by default. Ensure at least one variant is built wrt bug #542496.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

diff --git a/media-libs/qt-gstreamer/ChangeLog b/media-libs/qt-gstreamer/ChangeLog
index 362f0060c402a3a0af564a88588c158fee61d44b..7955a06030b92157267cf25cb5cd5c0d8b87d4fb 100644 (file)
--- a/media-libs/qt-gstreamer/ChangeLog
+++ b/media-libs/qt-gstreamer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/qt-gstreamer
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/qt-gstreamer/ChangeLog,v 1.22 2015/03/05 19:38:35 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/qt-gstreamer/ChangeLog,v 1.23 2015/03/09 11:09:27 kensington Exp $
+
+  09 Mar 2015; Michael Palimaka <kensington@gentoo.org>
+  qt-gstreamer-1.2.0-r1.ebuild:
+  Enable qt4 by default. Ensure at least one variant is built wrt bug #542496.
 
 *qt-gstreamer-1.2.0-r1 (05 Mar 2015)
 

diff --git a/media-libs/qt-gstreamer/Manifest b/media-libs/qt-gstreamer/Manifest
index 2775ad1fcf46e848238effdd5b2d87999403bdf3..c1231efbc62781846fda2da5fb9632c58e590158 100644 (file)
--- a/media-libs/qt-gstreamer/Manifest
+++ b/media-libs/qt-gstreamer/Manifest
@@ -2,24 +2,25 @@
 Hash: SHA256
 
 DIST qt-gstreamer-1.2.0.tar.xz 313632 SHA256 9f3b492b74cad9be918e4c4db96df48dab9c012f2ae5667f438b64a4d92e8fd4 SHA512 ae58c72765d590b84fa8709b45934ac464d7e00dba862783a2c4fe9d41afd09c6e5f95523cdf465fcfd2c6fa705335071b101912c42cd6c1fd15ae207b0864c7 WHIRLPOOL 2e8c5d70a384ee472dac265179c471369d64fb2deabe239c13cd4eb437358c97c316a486ae4292e8bdb3c823b521b656b665292392f0bb91d1c233869fb09789
-EBUILD qt-gstreamer-1.2.0-r1.ebuild 1625 SHA256 2f54c607e9a1142e0acbe9e6cd56271b96ed9e26dfe11b5fca58ef213aabc30b SHA512 f40442329ab4738aa59e933f6b9522ca994627be4bd8501f5d61f896271cd3063ca796a72b0633a3d15db399651fb69b0e871160e6b8a0347da1192904b00989 WHIRLPOOL 22680445d956d11b4870f0a60c12a544bfdeae389063d6387273f60479665b005a21340efd36204f781074ac36e67f236a1ec35f329c91393f3de8862262b616
+EBUILD qt-gstreamer-1.2.0-r1.ebuild 1663 SHA256 958616b56d4cfb8b6ed116a1306c2edcdecfa7766747a7c9a4d963bdc6034b73 SHA512 e84429ca415689541b90582c2ac094587e099726afee4515480c99dd79b3b836599e981a42f63c321fedaf34c24d3ca38f84b1c05847d99e749550b694b12897 WHIRLPOOL a1310d8e880480bd5028b124d18147d745c366a7d132d7b0f0c7f11b6a391ada1238899d7d0218873cf5073933d16405f4aa68bf8c767deb7166bd85ae31e22d
 EBUILD qt-gstreamer-1.2.0.ebuild 1226 SHA256 4c48acef72dcbad7c0a4083c052e1408f31c1924c5892413948a097271c4d759 SHA512 9d2d99f0df660e389e100112cfe0a57103b06118a11969e51e6b80f90e040cfabc14a09ddb33bc5ca21c83b288faa2e79286e823665bdecc747178484e796554 WHIRLPOOL a77561b76858d40d40a358171cc71a556266c6c5661690d804838c96ad764ae59b2891643c9741550f4583491fdaaf7362112fd0382521f16d591c7d87e3f991
-MISC ChangeLog 3040 SHA256 89c3c5516f8cc37186b33539b733612f05305c15aafc355ee79d6a9e1a6fa78a SHA512 3372f4fe90565712309b7ab048c3b096552acab7ebbb54e67034071b196c2f7a510a1755e3b94059e7798f350b6d2032de46f4c2e1bcbd8adea43e549cca1659 WHIRLPOOL b57de0bb9666cc6c376add1c5477215057af44e62f02064fbff705d045565880dc9beb78d932ea38f1bee45be1dc950c985082c631b2823070cf84afc6891406
+MISC ChangeLog 3214 SHA256 f00000c0ed8af1c35be6c454c1efa240d70203d6369ddb40f5d9314e21ea4193 SHA512 8cd62a769e9ad5dcbc52de975be4b5958c1c081cd8ef94a55282d2ae1d35d80373fea2f35d3092eebaeba8b7486b9132f1c24b345c6ec8498a04b33a06ddb0e3 WHIRLPOOL 5f3cca2063200c6c58f50865056f4c0268bf87b87a41b2ba750ead2a91e6432dabbc3de95763db62dff6fbdf047aeca26059add9b9c245deb95f6890216a0116
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJU+LCyAAoJEGVpnaTzz9K9XFUP/0qtooWP2U6QZtQBTqAjVRuQ
-wby7E81bjlKCEr6amQx2Gh0wS+oudDPCQ7ZXJj/6WcwTtEZNEIUNlsPRQo3wvOT7
-JW5hRALqsjx7IFMPcbJ9MLpkNa9oIGH3MK6nChB+KDREAGI0Vg3uqgti2mw0VYZc
-05HhbXWgeuI7IInK0XLBvi37rC8gR7yyNH7ufjdyIiFDxDEugC6yqeCHHaQt977Q
-KH016LDCu0IfQQVC6/akp5/oeAdHBDcEuzcdmBrb3M+B/mJnF4c5gQQ/q6js6pQD
-iIgUxy6MTvR5lZTqco1WtsxgMLKVy5lvlK5thizo93Q0BfB1CSoBT8T8SSujp9en
-YjtzV/nNdXcDtm2PHeSZQIHY/h5X6QZ7kpAnRdeFsYrg4o+N/itDrrwwmqwDp3NJ
-2wpISKP1A5JkjBD5xDy16toO2rYsYlXz2YaXNBW5ezkGha1dzwAfDJ7Re3qlySKM
-kltd0sUCUuHa0NlT7ZtxkhxkW7JePvG5Q0JEnPtjg6mqddVHerrYaPztIynZEB1y
-Qnmtkl9trFOpqAgavMcVWJ6ObM64DcZpCx/1mEowqqQtUqBQlnQuOKP9+dl+gked
-tNIamOl5KMHxl6IY1Gr/at7yyFnLkB4AC939+Prdx/c13Dsr9xQvvaRHkIB5XGs3
-rcSAWrsLjMJ8Yfv2I4OB
-=Pjo7
+iQJiBAEBCABMBQJU/X9nRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
+7AfFD/9SGQ9iDzliWXVdDTNPhLr7/pWLQ6xkSk7cRvJJ8KuD85y/TQKQbI6+a1xb
+bXsIxQW1udYCx07uSeZesXj/BES4/b3n3qbMsnwJDxdOurRPPCFf5QnIU4Tm4gBP
+CLs6nnfQJDVJdS9BysQrQc6JmusuzEr/FYBamK/TeFp6F8gLwUMQpGpI//sQN1ce
+AxyLB4jEMt55305nCVzFgKhsrdHYSg7rUi9YKk1C6dGPTkyH2rxjnqQzjvf0YuHq
++M6cf79t12mI0OtGYKUAX19uwk2TKncm0Uk4n9PNVLqCyEthkNDOAwcNWMU4zdNX
+L5J7xUdSq4vKAmrtvpW+TBH6KpzSQlrOyxNQNWGBbGWXeUwts9RYJe5S2sU7CJS2
+Oa6Zbjosi0V+MbP9Dx6oNj7w/fUXvVuYYZP0Z0GyDlV2SD1SxzuSw8/eUHGa/FuZ
+YXzpQJ+fhsryaqBxixJXCS1ZoY10vK9+f0x62SHN+8nXSPqK4dRPDIja7kXNyQ7q
+6KWbhmJtVMJwCPV23zZOHPknQhd4NouFUBfBl4kqwO7Swy1UE0tEtXidnvLe9/Kr
+iwSd0t/4zEDFUJ52+IeTp2Ta1BT53LbtU7VlgZGkkvCA1yCEC/L0vwyKC90kT9jY
+z6MwEuXMu5Kde8AVdsWrHev7d8NiKyZSxG33SlBzylBeN0sydA==
+=N+O5
 -----END PGP SIGNATURE-----

diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild
index 12d3837c1e7dda6cee5569bb3129a57fc46be9bd..e9d060f6c9fd9cbc6e94ca5ac8c4e4079f3ee287 100644 (file)
--- a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild
+++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-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/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild,v 1.1 2015/03/05 19:38:35 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r1.ebuild,v 1.2 2015/03/09 11:09:27 kensington Exp $
 
 EAPI=5
 
@@ -20,7 +20,9 @@ HOMEPAGE="http://gstreamer.freedesktop.org/modules/qt-gstreamer.html"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="qt4 qt5 test"
+IUSE="+qt4 qt5 test"
+
+REQUIRED_USE="|| ( qt4 qt5 )"
 
 RDEPEND="
        dev-libs/glib:2