Remove constraint on opengl useflag, bug 499188

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

3 files changed, 22 insertions, 19 deletions

diff --git a/media-libs/opencv/ChangeLog b/media-libs/opencv/ChangeLog
index 79360b9c028d..1231d681c782 100644
--- a/media-libs/opencv/ChangeLog
+++ b/media-libs/opencv/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/opencv
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.106 2014/01/24 23:57:27 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/ChangeLog,v 1.107 2014/01/25 11:01:29 dilfridge Exp $
+
+  25 Jan 2014; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.4.8.ebuild:
+  Remove constraint on opengl useflag, bug 499188
 
   24 Jan 2014; Andreas K. Huettel <dilfridge@gentoo.org> opencv-2.4.8.ebuild:
   Only enable Qt4 so far, bug 483648
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 991ced11e827..fb7f74d93122 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -11,25 +11,25 @@ DIST opencv-2.4.7.tar.gz 85587316 SHA256 c48d6c735bfa40c76cadcc0106051e095d8b492
 DIST opencv-2.4.8.zip 91302285 SHA256 f1ea29de0707939f6e09ae7a78dd271c032cac69a9ba6c6f7eb29fd4f83b9a68 SHA512 a451f4cc2fc7f31a5dba2997c57f3964d8239949dedb62e83b3fb2c68c2533786750906823137fa126a20d28d841aafc3a49b82c6358a6e6bc7d223e66598237 WHIRLPOOL 5881682746b30601421874bf6acb13bd0354b607f2e4da8abaa6077a59c8015c60bfbe888da077eaa7413c5fd8816b50616cee2eeb7dfcd884afff4df8c22561
 EBUILD opencv-2.4.5.ebuild 5174 SHA256 9947ef216eb778c4db530afa7c0c73ecfaf007d4195f652c552038e4d1afac92 SHA512 95b2cc6cf749046e66c783d3a13e0b098e4044c9741a9cd336c189bfcc454f2d1a554c33df3c0e71111e16601cb1cafe5db3f37839abc118a68d2755d296c916 WHIRLPOOL e9e9e2aec05fcaabacd7e973094591eac839e8cfd42a18bfd2567c047f33006a18191dd313e2e3244ee8e2cf6aa087701cd640d9caaf43c81e74a71f2a08e52e
 EBUILD opencv-2.4.7.ebuild 5339 SHA256 c35ac60d24b7f77692f3a0e3ca264a8bc17b188d4813ffc61807a450650b5866 SHA512 d73cd41bc1e96ba3581a9016f6f4b40451704b03cb04e88028f8f01083cfc71e60dee41c3130273bb27084fc5a6a5a9616403405ad0336fa10a0dbea8d0fca73 WHIRLPOOL fd85656fe42e0a130a8cfb3b2cc61afacb5989b12dcba33ed957af5791c77f427e443af0bdc353bdd5abc3c2098eb6b4775906cc9f2075364c8fde16608250ba
-EBUILD opencv-2.4.8.ebuild 5817 SHA256 badd52e7de29704caa7b37e50a83aa9e356b5119d03420c775fb53daa47752ae SHA512 f09a3efb5df942f657471e95e91a526805dd3acb03d84eae6ef4b6d0212eef0cab2b287ac6c0a2020afad3a314461f46fc1e274f35bf721ea2d94d2c3b49ba87 WHIRLPOOL d9ac1d683cd2f47c0bda59f544adb88cd4141d26b83846651e04285ffb777dce49ea116f2ac7624f048f2725d3467dbe4a11a73481321b15eefe1ea6c6aa3b62
-MISC ChangeLog 18143 SHA256 05708a9a8efd5c46f3df46e4b5f2dddc38a4e6948585ffca55793bb02db4277d SHA512 d8a4deeb50f394112aa7e8597d784af71ec3228b8187194a6fb68048e834e1559bac57b425cd321e089ed918ce4791924dd18c48d93b04be6b5bf249bbdfc1e2 WHIRLPOOL 9dba76590ff62ec820b7e11543f1612b62950f1438d4269e28484187a60e3b0e71004ee334389e530d44d9aee4959e81486ffde0b9a2981b10a606c300961ef4
+EBUILD opencv-2.4.8.ebuild 5818 SHA256 190da86183dc78feb6ad3f3f779e18b5dfd13fc1b44970e62f0af399108a2cba SHA512 6452194524bd7598654ada564c99c5e7afe6c95abd4b65efc2468a89e4d95cb84fba7f7b6ff118f97bb7c0f3be5e671cd45d231370502dad4157b40d0030adc5 WHIRLPOOL 7e5c8d5306e3a343589c17ab589514a3ad31eef4da2e15af830562e74a4ef500ab1a26d2013fb36d14772526ee11c6258d8c1ef4f3900fafa66d1f0e24bbce15
+MISC ChangeLog 18272 SHA256 6e3638e31c18084b34977a9db1b5e4406fc59b6b8136cd09d7a1fa66dfa3985f SHA512 6b1db5ec616e03d55bb3da64be90c492493fc2d4308b9b02df08097c45d340e628ebb8cb4ba5f41a49a3f25b3f3392f73b8ce70b80b25a907f6da72b2e044c7a WHIRLPOOL 48576b4256a89af7a270fbd12cb3681bd5926aef8511d982ecdf7642030dd09ef179d71abe32c730a90dcb94d2098dc58b4cce7187cd2bd3e9183f63f6c8c55e
 MISC metadata.xml 1058 SHA256 a8c4be7d80245b258f435bee2afaab35dd8665bdaea986b389527c80d25f8b68 SHA512 d3dde0afab2a1b6960d47838ffd7af97311df04ebfff091ef200ce93268e5efc3c28e4c35e848c8faac0a95b92e63b8cc2b51e72e3df8709c1951a6ba346974b WHIRLPOOL eeae49e5972bf997954d69f29bc6f058c7c8eeed2a7f1791517e9344f28e32e60e76c3fee9ecca06f48548882e0b8ccabe10ce0b3bc7ca1cc40662a6f411a0a1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJS4v5FXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJS45npXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcWm8P/RDFQbzQFzVpr3JBEsrs2xeY
-momQyGMRkK2y9FLjgHoLbpoxysFgiNlXG5UY3gxDCFVO1cd6Ryn2dQYa1/o0GjRo
-s2n7NZMhKQHW2RYrr85gCZO+YJrXP4w7PAb8/vMPASwDnOfxkhEDEZIIdn5x4/30
-wucvhtMlO7v+TdIs/xXqdlwbbRDbI8nkCnn7LD7pGXTz53zk3mNjneF0RKueA3aI
-BJAQmvvL0xYBqJGNl6n8JV5/H5Pm8O1YOtg1hOsSsa8dHMyD/92JQ567jzGKI/Qo
-pZMzlWSRn2K+PPjDYtX8LIXElwvB5smg4JxErTba+1KGp7nWPpNg3Z2xT8YMcz8B
-Cu4qZAORw+96faTu0Bc3rgIn0HY3U6x3vEnP8CFFR0aNgohyQaaiWPOgCkNFSacD
-WQFkY2KR6oI1PyWaO+gufn9v404zKds0dTDIk+FseFuTQqTdNjc1Nm9buwzShACD
-LFA3uEGGSywr6ZEbNqJypwx+M7xSdpMjd72uQClYXBGgJsuKlupgTtx3NpErnP+s
-nULmqU84XH3Z05U2iS6tCweoj66IzY3hXlaHnRPY6MZ1qIMT8IN2CnMkZwA2Djyq
-xr1IAUTdjv6La6ZN/ZvhOyYEmXg5rViRP042lWZ2F8TplNkEt/70gr8JEQ2Dnk7n
-5tBlyclGKvQdWgKaAFKM
-=zv1u
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcO9QP/j5Sr17pONEghCL+0Is11rWe
+61yaNWw3x2auhCnfg9YSQUplBHOKHBkQHNbWBDwDn4P/uwQTlfSPTqovI6Df/dhb
+b7skWzrPCPIOf4Qs6s2qDbZ3HHRsaZab+nYmXE0e/fJwhBWhAqebdh3IEwUFW7fp
+kTp1AghAnGH6KeH+s6rRDQnUZmi5uFGiAqNciw1cZT1M+V/rCAStA/mB5JiigY00
+Eeeoi/WpT7Tte/thSYdjmM9nqvybAZzSQuoG/JuIXnJolMRrGfH8jnm8zdGaqpNU
+w8maR8s2Ht0w3SVCDq7B64q/NkDzoOe0smrDa9d+Ss4z7W4EwyqNPavgvqjdcd7d
+Lt83ZeXIjkQUc8W3BBacZFXky+s/UfBJ0moPeQ7r0iW22mFNUejVQUcx01ZBC04l
+o4XT/r49lvzPsR4LDGnFjBc7GrBO26s7NbaKho69ClVeOlUaVh9NniOggRu/je0q
+5c9mL3RxU8uETiPGL4EoQy5UAR8htlRjIO0/7BAEp9q9ZSxqRwy3PJs2DuUPsF0w
+gDlu7Von5K/fn/gwjsGW9iBKiJQZXUfQe9A+PnOagWjOloiT4JOUTQX69AzONDR9
+rY8RBTYYaWkR9COZhLmEjvC97ohRsKZKJPaYVp1vcyKBMewiDEvusM2TI6J4arh0
+f/9KPNGXcxeFsauBXWI5
+=LWtT
 -----END PGP SIGNATURE-----
diff --git a/media-libs/opencv/opencv-2.4.8.ebuild b/media-libs/opencv/opencv-2.4.8.ebuild
index 49fad38473f4..81bb706b2874 100644
--- a/media-libs/opencv/opencv-2.4.8.ebuild
+++ b/media-libs/opencv/opencv-2.4.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.8.ebuild,v 1.2 2014/01/24 23:57:27 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/opencv/opencv-2.4.8.ebuild,v 1.3 2014/01/25 11:01:29 dilfridge Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_{6,7} )
@@ -17,13 +17,13 @@ SLOT="0/2.4"
 KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux"
 IUSE="cuda doc +eigen examples ffmpeg gstreamer gtk ieee1394 ipp jpeg jpeg2k opencl openexr opengl openmp pch png +python qt4 testprograms threads tiff v4l xine"
 REQUIRED_USE="
-	opengl? ( || ( gtk qt4 ) )
 	python? ( ${PYTHON_REQUIRED_USE} )
 "
 
 # The following logic is intrinsic in the build system, but we do not enforce
 # it on the useflags since this just blocks emerging pointlessly:
 #	gtk? ( !qt4 )
+#	opengl? ( || ( gtk qt4 ) )
 #	openmp? ( !threads )
 
 RDEPEND="