Add check for Qt 3 built with opengl support, needed for webcam support.

Package-Manager: portage-2.1.1_pre1-r2

6 files changed, 68 insertions, 37 deletions

diff --git a/kde-base/kopete/ChangeLog b/kde-base/kopete/ChangeLog
index 7848fdf2436f..8581fd671f82 100644
--- a/kde-base/kopete/ChangeLog
+++ b/kde-base/kopete/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kopete
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.66 2006/06/22 12:48:38 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/ChangeLog,v 1.67 2006/06/27 08:26:13 flameeyes Exp $
+
+  27 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> kopete-3.5.2.ebuild,
+  kopete-3.5.3.ebuild, kopete-3.5.3-r1.ebuild:
+  Add check for Qt 3 built with opengl support, needed for webcam support.
 
   22 Jun 2006; Diego Pettenò <flameeyes@gentoo.org> kopete-3.4.3.ebuild:
   Move myconf population in src_compile rather than global scope.
diff --git a/kde-base/kopete/Manifest b/kde-base/kopete/Manifest
index 85b752e00054..b13a5cdac5f4 100644
--- a/kde-base/kopete/Manifest
+++ b/kde-base/kopete/Manifest
@@ -21,22 +21,22 @@ EBUILD kopete-3.4.3.ebuild 1105 RMD160 8a49c052c517b7e2436b61841eaa91e473cec7e1
 MD5 08fa57a049669518f970542b3d8f4cc5 kopete-3.4.3.ebuild 1105
 RMD160 8a49c052c517b7e2436b61841eaa91e473cec7e1 kopete-3.4.3.ebuild 1105
 SHA256 e1a37ff71e2be9707dbac4d2000927b0c99e04539b94afc3d390996a689a0727 kopete-3.4.3.ebuild 1105
-EBUILD kopete-3.5.2.ebuild 1489 RMD160 e92f3eb1d2a2331fe08e7f77990e97b004fc0f83 SHA1 c6f3af6d747f2275827ab15c77dfbab370abf996 SHA256 a9e46bc626735130ad32ecd51b8feeec10ff26b1cc5a5a356f895b9b32fff692
-MD5 e74ceab791405d6f2a287a75e11ee134 kopete-3.5.2.ebuild 1489
-RMD160 e92f3eb1d2a2331fe08e7f77990e97b004fc0f83 kopete-3.5.2.ebuild 1489
-SHA256 a9e46bc626735130ad32ecd51b8feeec10ff26b1cc5a5a356f895b9b32fff692 kopete-3.5.2.ebuild 1489
-EBUILD kopete-3.5.3-r1.ebuild 1572 RMD160 33ffbb108136c96be94e0e80759f3edbee87a851 SHA1 b4a7aff42a77f9e6316526efca9186cae0528b91 SHA256 b436781368eb1bf6a059573d79d0cfc5c442d7d74217376aa2f791050f2ff269
-MD5 1e748afb009f4d6740eaaa2d1efb5fe1 kopete-3.5.3-r1.ebuild 1572
-RMD160 33ffbb108136c96be94e0e80759f3edbee87a851 kopete-3.5.3-r1.ebuild 1572
-SHA256 b436781368eb1bf6a059573d79d0cfc5c442d7d74217376aa2f791050f2ff269 kopete-3.5.3-r1.ebuild 1572
-EBUILD kopete-3.5.3.ebuild 1499 RMD160 f638ee6292e1fbda6399eda9b0e56039ed7de245 SHA1 35c9ba03eef9610766fc744ffd992c26cd41daff SHA256 197ca5177d98ed302805e387881ac4af3d9c05cc9926099a25865ed5ad58244c
-MD5 55fee7684d9498c95e63a210dfdc1ae0 kopete-3.5.3.ebuild 1499
-RMD160 f638ee6292e1fbda6399eda9b0e56039ed7de245 kopete-3.5.3.ebuild 1499
-SHA256 197ca5177d98ed302805e387881ac4af3d9c05cc9926099a25865ed5ad58244c kopete-3.5.3.ebuild 1499
-MISC ChangeLog 8986 RMD160 75815f7562b91b068157ac9b7f882ffbaba77c68 SHA1 f1226c4b349daae11ed4f7543af3a766eda9eb05 SHA256 3e3d9b4362622f5078bb9d81486a7db1f4a3baaab09c7f2a34ecce8eae7b4712
-MD5 74baf97d2ff62a760e7e86ff77e04bfc ChangeLog 8986
-RMD160 75815f7562b91b068157ac9b7f882ffbaba77c68 ChangeLog 8986
-SHA256 3e3d9b4362622f5078bb9d81486a7db1f4a3baaab09c7f2a34ecce8eae7b4712 ChangeLog 8986
+EBUILD kopete-3.5.2.ebuild 1858 RMD160 2d4105c1ff4c0694ff903d9576ebd6c50465211c SHA1 07e1eaf9923ed45ea66129c8d566c956ca28342c SHA256 8d1440e103f8b6bf22d8ee50812d26da988e6d4be8c6b611cc05ae5830956446
+MD5 879fedf1ad93d3454b981f049a5ff3ef kopete-3.5.2.ebuild 1858
+RMD160 2d4105c1ff4c0694ff903d9576ebd6c50465211c kopete-3.5.2.ebuild 1858
+SHA256 8d1440e103f8b6bf22d8ee50812d26da988e6d4be8c6b611cc05ae5830956446 kopete-3.5.2.ebuild 1858
+EBUILD kopete-3.5.3-r1.ebuild 1940 RMD160 10b69c98db799b1c36531eb7ec9a35a07120226d SHA1 b4bfe41e9c1a428bd10aea40f1fc1ffe246263e2 SHA256 5303aebf3f69e0fdb234e45681350bd52a90dc296830fd7a220887f09d329889
+MD5 d4504a7270bdd58bb7fe22818cba265e kopete-3.5.3-r1.ebuild 1940
+RMD160 10b69c98db799b1c36531eb7ec9a35a07120226d kopete-3.5.3-r1.ebuild 1940
+SHA256 5303aebf3f69e0fdb234e45681350bd52a90dc296830fd7a220887f09d329889 kopete-3.5.3-r1.ebuild 1940
+EBUILD kopete-3.5.3.ebuild 1863 RMD160 0c57cfc12821ee657e54393d2e66461416f508d4 SHA1 ab971a134f5efe7acb8af8c1feb86ac9ca32746f SHA256 14c6daaefaf3f254f6a83b62d8bc53c871cfeda3fb3dd5eb127d2c782572a319
+MD5 70f31acfdaf101c37fa05188813a5101 kopete-3.5.3.ebuild 1863
+RMD160 0c57cfc12821ee657e54393d2e66461416f508d4 kopete-3.5.3.ebuild 1863
+SHA256 14c6daaefaf3f254f6a83b62d8bc53c871cfeda3fb3dd5eb127d2c782572a319 kopete-3.5.3.ebuild 1863
+MISC ChangeLog 9183 RMD160 e82d32e78c306f9a39051924a1f04617ca931d86 SHA1 53961211c16bdfbd8c46a82276519ff0330dc45f SHA256 587f7d3a5645b51c5de417058f8e0ee8d8365c01d355448bbc95279e9d9158a9
+MD5 dc1e9192865cd8ab577cbbc682560e0d ChangeLog 9183
+RMD160 e82d32e78c306f9a39051924a1f04617ca931d86 ChangeLog 9183
+SHA256 587f7d3a5645b51c5de417058f8e0ee8d8365c01d355448bbc95279e9d9158a9 ChangeLog 9183
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -56,7 +56,7 @@ SHA256 6b69107cd0da9f5855f2ce1f8ca41066fc27fdeb33b56d00f35902079be1bb64 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEmpGtAiZjviIA2XgRAieBAKCM/GhBK3hxeEMaFwk7FidGRq401gCfXtZ6
-8FuFegeSTSGOZa9zXMUsv6E=
-=D9jK
+iD8DBQFEoOuuAiZjviIA2XgRAmfvAJ9BWJKAp3Pha6+tGIpdye7PxksT9gCbBatE
+Ey5vRBJLu6SBXgDrZLaOPT8=
+=6dxI
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kopete/kopete-3.5.2.ebuild b/kde-base/kopete/kopete-3.5.2.ebuild
index a994e3b37019..231b6cf8a026 100644
--- a/kde-base/kopete/kopete-3.5.2.ebuild
+++ b/kde-base/kopete/kopete-3.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.2.ebuild,v 1.9 2006/06/01 09:44:52 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.2.ebuild,v 1.10 2006/06/27 08:26:13 flameeyes Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -11,7 +11,7 @@ DESCRIPTION="KDE multi-protocol IM client"
 HOMEPAGE="http://kopete.kde.org/"
 
 KEYWORDS="alpha amd64 ~ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="sametime ssl xmms"
+IUSE="sametime ssl xmms kernel_linux"
 
 # The kernel_linux? ( ) conditional dependencies are for webcams, not supported
 # on other kernels AFAIK
@@ -43,6 +43,15 @@ DEPEND="${BOTH_DEPEND}
 			x11-proto/scrnsaverproto
 		) virtual/x11 )"
 
+pkg_setup() {
+	if use kernel_linux && ! built_with_use =x11-libs/qt-3* opengl; then
+		eerror "To support Video4Linux webcams in this package is required to have"
+		eerror "=x11-libs/qt-3* compiled with OpenGL support."
+		eerror "Please reemerge =x11-libs/qt-3* with USE=\"opengl\"."
+		die "Please reemerge =x11-libs/qt-3* with USE=\"opengl\"."
+	fi
+}
+
 src_compile() {
 	# External libgadu support - doesn't work, kopete requires a specific development snapshot of libgadu.
 	# Maybe we can enable it in the future.
diff --git a/kde-base/kopete/kopete-3.5.3-r1.ebuild b/kde-base/kopete/kopete-3.5.3-r1.ebuild
index e1cf22142713..d06d98d01eb3 100644
--- a/kde-base/kopete/kopete-3.5.3-r1.ebuild
+++ b/kde-base/kopete/kopete-3.5.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.3-r1.ebuild,v 1.1 2006/06/15 00:00:01 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.3-r1.ebuild,v 1.2 2006/06/27 08:26:13 flameeyes Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -14,7 +14,7 @@ DESCRIPTION="KDE multi-protocol IM client"
 HOMEPAGE="http://kopete.kde.org/"
 
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="sametime ssl xmms"
+IUSE="sametime ssl xmms kernel_linux"
 
 # The kernel_linux? ( ) conditional dependencies are for webcams, not supported
 # on other kernels AFAIK
@@ -46,6 +46,15 @@ DEPEND="${BOTH_DEPEND}
 			x11-proto/scrnsaverproto
 		) virtual/x11 )"
 
+pkg_setup() {
+	if use kernel_linux && ! built_with_use =x11-libs/qt-3* opengl; then
+		eerror "To support Video4Linux webcams in this package is required to have"
+		eerror "=x11-libs/qt-3* compiled with OpenGL support."
+		eerror "Please reemerge =x11-libs/qt-3* with USE=\"opengl\"."
+		die "Please reemerge =x11-libs/qt-3* with USE=\"opengl\"."
+	fi
+}
+
 src_compile() {
 	# External libgadu support - doesn't work, kopete requires a specific development snapshot of libgadu.
 	# Maybe we can enable it in the future.
diff --git a/kde-base/kopete/kopete-3.5.3.ebuild b/kde-base/kopete/kopete-3.5.3.ebuild
index 41af165d9b6e..7dc446e0a9f0 100644
--- a/kde-base/kopete/kopete-3.5.3.ebuild
+++ b/kde-base/kopete/kopete-3.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.3.ebuild,v 1.1 2006/06/01 19:26:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kopete/kopete-3.5.3.ebuild,v 1.2 2006/06/27 08:26:13 flameeyes Exp $
 
 KMNAME=kdenetwork
 MAXKDEVER=$PV
@@ -11,7 +11,7 @@ DESCRIPTION="KDE multi-protocol IM client"
 HOMEPAGE="http://kopete.kde.org/"
 
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="sametime ssl xmms"
+IUSE="sametime ssl xmms kernel_linux"
 
 # The kernel_linux? ( ) conditional dependencies are for webcams, not supported
 # on other kernels AFAIK
@@ -43,6 +43,15 @@ DEPEND="${BOTH_DEPEND}
 			x11-proto/scrnsaverproto
 		) virtual/x11 )"
 
+pkg_setup() {
+	if use kernel_linux && ! built_with_use =x11-libs/qt-3* opengl; then
+		eerror "To support Video4Linux webcams in this package is required to have"
+		eerror "=x11-libs/qt-3* compiled with OpenGL support."
+		eerror "Please reemerge =x11-libs/qt-3* with USE=\"opengl\"."
+		die "Please reemerge =x11-libs/qt-3* with USE=\"opengl\"."
+	fi
+}
+
 src_compile() {
 	# External libgadu support - doesn't work, kopete requires a specific development snapshot of libgadu.
 	# Maybe we can enable it in the future.
diff --git a/kde-base/kxkb/Manifest b/kde-base/kxkb/Manifest
index b98fb643a591..2dc9db820d4c 100644
--- a/kde-base/kxkb/Manifest
+++ b/kde-base/kxkb/Manifest
@@ -9,18 +9,18 @@ EBUILD kxkb-3.4.3.ebuild 413 RMD160 da31dd3d589970711434f82dbed280624af4cd0f SHA
 MD5 ee4964ea3e910527405f4100e6e1a677 kxkb-3.4.3.ebuild 413
 RMD160 da31dd3d589970711434f82dbed280624af4cd0f kxkb-3.4.3.ebuild 413
 SHA256 9bd13cba1c6b38a88ef87265fe527f11f42f754fea444821cc5dcbd0ae509ca2 kxkb-3.4.3.ebuild 413
-EBUILD kxkb-3.5.2.ebuild 905 RMD160 9821cd8fd42a5f5a11a05d7c256c911a0552ec6b SHA1 d9323f9a4ef562c38090d5175f9026f80ca5820e SHA256 f0e53aeb732cee9206929e59e4031008283e35fd4605cb3c511d35422940f6b8
-MD5 ec26260744007e8088d00891cab5534a kxkb-3.5.2.ebuild 905
-RMD160 9821cd8fd42a5f5a11a05d7c256c911a0552ec6b kxkb-3.5.2.ebuild 905
-SHA256 f0e53aeb732cee9206929e59e4031008283e35fd4605cb3c511d35422940f6b8 kxkb-3.5.2.ebuild 905
+EBUILD kxkb-3.5.2.ebuild 1060 RMD160 1629e6f1478d76f92b44a664b633ebd921e6e880 SHA1 e2fdc58049a232d04d3b599192483c2cae2a126d SHA256 403619df61f3531a3780798931f3a2386f631af29478e344bad02be95b28761e
+MD5 2bf25b1caed8f391227371a2c01d7605 kxkb-3.5.2.ebuild 1060
+RMD160 1629e6f1478d76f92b44a664b633ebd921e6e880 kxkb-3.5.2.ebuild 1060
+SHA256 403619df61f3531a3780798931f3a2386f631af29478e344bad02be95b28761e kxkb-3.5.2.ebuild 1060
 EBUILD kxkb-3.5.3.ebuild 1066 RMD160 d2faa9ff84e411f046f59cb14125948198c50292 SHA1 4753a1c424d1a0b134097c5b9259255f58b495e2 SHA256 88ef4e1acf0988d76f457f55a1899010bb052a374680186b42c19129783f0b69
 MD5 d0034c5ad9ede3d0a09ab7dd81f3e392 kxkb-3.5.3.ebuild 1066
 RMD160 d2faa9ff84e411f046f59cb14125948198c50292 kxkb-3.5.3.ebuild 1066
 SHA256 88ef4e1acf0988d76f457f55a1899010bb052a374680186b42c19129783f0b69 kxkb-3.5.3.ebuild 1066
-MISC ChangeLog 7730 RMD160 207da0637b9857fd97b64f7dcf5060c6b529e3f9 SHA1 a84e1a0f408d4021ae5e91dcbdb8942e389afb45 SHA256 2bdca058785f555cf19a7a38dfb860878c6fbcd7b6f7a35adef5b532058b25ef
-MD5 bd67402f80f9553eec6ca50896bed67e ChangeLog 7730
-RMD160 207da0637b9857fd97b64f7dcf5060c6b529e3f9 ChangeLog 7730
-SHA256 2bdca058785f555cf19a7a38dfb860878c6fbcd7b6f7a35adef5b532058b25ef ChangeLog 7730
+MISC ChangeLog 7895 RMD160 ce07e82a379f408bcb07e039da3864acfb930db2 SHA1 d4aba79fac5c13dd2541ebbe91824e4b99ab77ba SHA256 b3704f0ae8d3afeb562b1eeb410bed94dcd2adf043bca3f0e5060189db7f6d15
+MD5 097156e3c3f38240cd5f05a441f8faaf ChangeLog 7895
+RMD160 ce07e82a379f408bcb07e039da3864acfb930db2 ChangeLog 7895
+SHA256 b3704f0ae8d3afeb562b1eeb410bed94dcd2adf043bca3f0e5060189db7f6d15 ChangeLog 7895
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -37,7 +37,7 @@ SHA256 3d411f328f154d83705712ff98823e5fac1601a2e982fa88bd6a40f55d47559e files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEn3E2AiZjviIA2XgRAphjAJ9vm1vk4Ev3m1Olnb4J+IFUfR0fSQCfbxfb
-rENsQ3EM6EekfvBNYw6nbFA=
-=3Nqo
+iD8DBQFEoOyCAiZjviIA2XgRAhpnAKDwbcdq4/7VPmNXat0GuHAnhiBpIwCfQrPf
+6f7MakYZFmEtNO9lwcRyKSI=
+=SnVp
 -----END PGP SIGNATURE-----