kwin-4.8 needs at least some opengl to build, bug 402029

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

4 files changed, 33 insertions, 33 deletions

diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index 78c75df6a50e..bc6a624d4bde 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.265 2012/03/06 23:35:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.266 2012/03/07 17:14:06 dilfridge Exp $
+
+  07 Mar 2012; Andreas K. Huettel <dilfridge@gentoo.org> kwin-4.8.0.ebuild,
+  kwin-4.8.1.ebuild:
+  kwin-4.8 needs at least some opengl to build, bug 402029
 
 *kwin-4.8.1 (06 Mar 2012)
 
diff --git a/kde-base/kwin/Manifest b/kde-base/kwin/Manifest
index b594c3d345a3..30973ac09b89 100644
--- a/kde-base/kwin/Manifest
+++ b/kde-base/kwin/Manifest
@@ -6,24 +6,24 @@ DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210
 DIST kde-workspace-4.8.0.tar.bz2 35364809 RMD160 05481e904d1ab00f6fbca54f37cf444ad7c513f3 SHA1 4c471b159315b084c65196b0c93c34981a9105c5 SHA256 116b9655984c1e6544a3b011960122c2ba821c0c21dced27518e8604ff04bbee
 DIST kde-workspace-4.8.1.tar.xz 33575180 RMD160 e10ff44ca7281bb89b87441d10c68aa2234db9c0 SHA1 675df4befd736e770e3029af8d38800c9018e888 SHA256 d8d15fb8ea47f4424ba97f252a79fb486794848dbe58417d2137ab466deff4b3
 EBUILD kwin-4.7.4.ebuild 1690 RMD160 34a673573cbc95bd67e6961e3c81c05487559240 SHA1 ba826eb65ae48e5fb46df6794d5a2d9b6a96cf44 SHA256 505b58989145d9614e1448e61518dbf4b65a958e4fff9bbe1f2f5fcd54d77630
-EBUILD kwin-4.8.0.ebuild 1819 RMD160 940520613e74be34f408b8e3ccda0bb8aa584399 SHA1 faaee0fcdd6f7262acd3b37f5396f50529646c84 SHA256 5d9f36d935203584ab8fb54ee6db5c0537772662b1545e3a28cc2649ce3cfcb4
-EBUILD kwin-4.8.1.ebuild 1824 RMD160 edec25d9621c0bb4445fdf73fb2c828d06703ae2 SHA1 c25667384d1e1eefd6c3265495a6c987d93f8a08 SHA256 2ebe986fc885d0cf0080e4f4dfb620300909f57594c4293f34f32a7046540f57
-MISC ChangeLog 32585 RMD160 55a9a9941b7d5fa2a12dd0c88a553c183d4de9a0 SHA1 1559476c975d0500baf1348eae8732f276983615 SHA256 c99c028ee20a8c16fd80ffdf35289c887bc059d225ae2f33e4f9ea45836402d7
+EBUILD kwin-4.8.0.ebuild 1733 RMD160 aa6e5158b6ae9bc1c27385418b34dbd77675a629 SHA1 e16513afa3fe8afa0f2339314918cdd5ccd0ab83 SHA256 9e623ad5100f2a3fbadf6eab4db763d67db3d76db6016b2cb7f26fe5e08b5523
+EBUILD kwin-4.8.1.ebuild 1733 RMD160 07f807b65f13f2bfe98008b0d093f1d930c41ec1 SHA1 2fb7744b6f774dc4aad15251ba7143d956e9cfa5 SHA256 864590532df82af8fe4cbc410e9f3a95274d2ee96d61e9d846c523ea54f391d1
+MISC ChangeLog 32742 RMD160 bc452765396336f8b6aefac9c9e939ac9a6f5d77 SHA1 35b2723ed4db3ca05795c69dec6c539034cb222e SHA256 00e43d81e9bad584071cf378d8f7d2e24c79913b8bc5f27fa8ad235257d0102a
 MISC metadata.xml 229 RMD160 24787dda60325ca5ed6c320b09effa57d9b2f45b SHA1 98698ac5e37a3ed20414deb0de4eb70da74a2add SHA256 1cd96488355a3e48a2b0b12f09ad8e3ea923e199b4fcbf175590cd317b033af7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJPVp/EAAoJEEb+UGWnxTyHejcP/RqenHsoAg83zDlPu2flmL6m
-IInNIGmNNWKMJEfospAR7LtZq7gRTa2bMkGz3QURiI1pTMl89r8ZZwMOqScNyfXq
-888jrU/VD/4gsNzctxkR/X829Tx/ClBvojfMHWAfT7gglrreBmcZeOZYnu2sutc5
-QR0SM6EG6Z3FKfhTq6PvUC/gCsPLGG/8WNAtKEceAtP72tx3QeaYmJlhkGG0JEBX
-l2O8uqNGOVPcvZFz88hje0e19qenlNE3SEEf3WeJ91zdOtyTD9s+4G8ml4hfgsyK
-pjGO3pK496b8GQs2PsDBZeco3sRYZIcAACA2xiSmTHGSNO3W0EeuWUT7TqmU1+rP
-53TkkcCTJ3zarcIYcdLA2xpYFvN8677WONZF4Mhv6Var7b6uNpemNI0jxkf/2IXl
-gc0cFbXAWFqUObRVNrWVNjTzdkboF19nx2HFKTAZVAygyJCDnRxEEmJ7i0m38hHw
-fyznfbkD9sHYPWbjWBNq698WipLprgT7SYdXm8cJidFsWOXPSHHaWI14ZaOXIrMl
-RryiWiJBX4pjjKaEuIX8synd3NopLZXhUVHc/FfyCDmaIQq/NM+0IkIiQAgwUMmo
-1b85V3svYmXYliHzQ0RsrVXbOgamjIPcULJukCZ8AV2mihOV36/Y58+TNoaCeIZV
-74DR3vuZU5IF0cg/k3q0
-=YydN
+iQIcBAEBCgAGBQJPV5eWAAoJEEb+UGWnxTyHsNUP/iVDBQtfpPa6dk+5OlkJvL+Q
+p24SSYY1bNGpkG4IImHUQ9Rgi4bemT7SNTVuY801qrPmExLmNyfrBJtg5vunZQkw
+bf44ur4pq55O+iMEx6UP2J4v3EnWn5/rmmGWXYQ4zpUYz6fO4KJ88PKkf9kq6wNN
+/G4ik6xb//zpSdR2SPUmLQA0jzGDk3dTanrjX8Q40g/TBvmrmvvQ0NedeVBCgGc/
+0RyXUfsHR0EOxAdi91/2G0ICAV6yBxPVo0W/VB1Lm6VOnDcoPVawUhFDeiGa6muG
+Q6MuZp1mKOHj4St7ZJw9AO5pWEXfXzXLsDKlaQ/pHUSMP6U1QrTleB0Gfb4fZw82
+UjT1CVH1w2G00E8MLXXwIAMGEcJAd0m2xdXE4C3okS3tZBPynPp03NgS9TLJ99/p
+/6WwaGBrAf/uC/OxSeGhwH1+3I8JRIoxDVRZJGES2e9LpK/RNLxpNWg/p070YPga
+MzZOegceKZ0wvj0I/pZgFlKR4zMER2F0p+c1rUI0qBen0yjzd7gQcoCKesPFr3Gy
+enTJI/2twYtYW70fmuAlrXzNiMkHsX3SRaz2zxfpF3yjEl56ciorBqPEdWS55MFa
+TohPIJSJGgN5JrZmOFXdDS+Bf8vWJfvDa+j5TbU+Vl4HoBVJHZ4/3vq65yf9hapP
+4L7mX7AIb2p7GdoMfICj
+=CyyC
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kwin/kwin-4.8.0.ebuild b/kde-base/kwin/kwin-4.8.0.ebuild
index 8379aaf85f3f..3b550d15735f 100644
--- a/kde-base/kwin/kwin-4.8.0.ebuild
+++ b/kde-base/kwin/kwin-4.8.0.ebuild
@@ -1,19 +1,20 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.8.0.ebuild,v 1.1 2012/01/25 18:17:07 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.8.0.ebuild,v 1.2 2012/03/07 17:14:06 dilfridge Exp $
 
 EAPI=4
 
 KMNAME="kde-workspace"
-OPENGL_REQUIRED="optional"
+OPENGL_REQUIRED="always"
 inherit kde4-meta
 
 DESCRIPTION="KDE window manager"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug gles xinerama"
+IUSE="debug gles opengl xinerama"
 
 COMMONDEPEND="
 	$(add_kdebase_dep kactivities)
+	$(add_kdebase_dep kdelibs opengl)
 	$(add_kdebase_dep kephal)
 	$(add_kdebase_dep libkworkspace)
 	$(add_kdebase_dep liboxygenstyle)
@@ -51,11 +52,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
 )
 
-# normally, you can use just gles or opengl or none
-#REQUIRED_USE="opengl? ( !gles ) gles? ( !opengl )"
-
-# right now, upstream requires opengl to always be enabled with gles
-REQUIRED_USE="gles? ( opengl )"
+# you need one of these
+REQUIRED_USE="!opengl? ( gles ) !gles? ( opengl )"
 
 src_configure() {
 	# FIXME Remove when activity API moved away from libkworkspace
diff --git a/kde-base/kwin/kwin-4.8.1.ebuild b/kde-base/kwin/kwin-4.8.1.ebuild
index c075676fcb71..66c776e5c900 100644
--- a/kde-base/kwin/kwin-4.8.1.ebuild
+++ b/kde-base/kwin/kwin-4.8.1.ebuild
@@ -1,19 +1,20 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.8.1.ebuild,v 1.1 2012/03/06 23:35:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.8.1.ebuild,v 1.2 2012/03/07 17:14:06 dilfridge Exp $
 
 EAPI=4
 
 KMNAME="kde-workspace"
-OPENGL_REQUIRED="optional"
+OPENGL_REQUIRED="always"
 inherit kde4-meta
 
 DESCRIPTION="KDE window manager"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug gles xinerama"
+IUSE="debug gles opengl xinerama"
 
 COMMONDEPEND="
 	$(add_kdebase_dep kactivities)
+	$(add_kdebase_dep kdelibs opengl)
 	$(add_kdebase_dep kephal)
 	$(add_kdebase_dep libkworkspace)
 	$(add_kdebase_dep liboxygenstyle)
@@ -51,11 +52,8 @@ PATCHES=(
 	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
 )
 
-# normally, you can use just gles or opengl or none
-#REQUIRED_USE="opengl? ( !gles ) gles? ( !opengl )"
-
-# right now, upstream requires opengl to always be enabled with gles
-REQUIRED_USE="gles? ( opengl )"
+# you need one of these
+REQUIRED_USE="!opengl? ( gles ) !gles? ( opengl )"
 
 src_configure() {
 	# FIXME Remove when activity API moved away from libkworkspace