According to mgraesslin on #kde-devel, libXcomposite is now a hard dependency. Bug 379519.

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

5 files changed, 27 insertions, 96 deletions

diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index 7f67b857479f..b3d9c21fb09d 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.238 2011/08/15 20:35:49 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.239 2011/08/17 20:49:44 dilfridge Exp $
+
+  17 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kwin-4.7.0.ebuild,
+  kwin-4.7.0-r1.ebuild, -files/kwin-4.7.0-xcomposite_cmake_automagic.patch:
+  According to mgraesslin on #kde-devel, libXcomposite is now a hard dependency. 
+  Remove use-flag, nothing else depends on it. "Fixes" bug 379519.
 
   15 Aug 2011; Markus Meier <maekke@gentoo.org> kwin-4.6.5.ebuild:
   x86 stable, bug #377465
diff --git a/kde-base/kwin/Manifest b/kde-base/kwin/Manifest
index 0a0c1d0911c7..1d5566a8f09d 100644
--- a/kde-base/kwin/Manifest
+++ b/kde-base/kwin/Manifest
@@ -1,23 +1,31 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX kwin-4.4.2-xinerama_cmake_automagic.patch 923 RMD160 45519a7e51001e6f16cf4bc13f7ef99eeaff793a SHA1 22102eaa95aa07bce19262842fcda69e0bc751f0 SHA256 c1f605148ba9ea606924c934a3b79bb7b415346a3fbe2e7c1732cc6956a44157
 AUX kwin-4.6.3-desktopnames.patch 1110 RMD160 627e919a4836973b0c45512101ebb6d7160a084f SHA1 a5dda38663f4c9bf30a5fc27063158d83a6514af SHA256 7883a5e98075b7366a38c7003a7620b7283f13e2c226c20301e4c8c0a06f06ad
-AUX kwin-4.7.0-xcomposite_cmake_automagic.patch 812 RMD160 aa8c3da2127c5e2ca9e8146321d87d194897eb5d SHA1 58848db2ac7a6484ef842c8494699fa42dead7cb SHA256 cd417576701e45ca7f5906c8fab860b2d7b97b4dd3a7d4f099fd51b3087ba6c4
 AUX kwin-fix-opengl.patch 2039 RMD160 4a0d9a0134083ed87277581e77dd63b4386553fe SHA1 9b6bfca1dded2f878a989e83425faa1c2174adee SHA256 079df31ea30250bae85e693c83d7d67a6d5cf637e6baf13cd421caee7934271a
 DIST kde-workspace-4.7.0.tar.bz2 20049430 RMD160 20520845b336d9485bb2149191ad9f5e6a90824d SHA1 cbc61a20013c746f424681020c29480c6249fd10 SHA256 7e30d1a493b2b8981790a255edf0003bab19bf4dc3e77c37694da495a33a3468
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
 EBUILD kwin-4.6.3-r1.ebuild 1774 RMD160 9407c2e5ab194ad6231f0482b14e616a2e7f4a7b SHA1 4d2720f72d3e14500c8e116f62312e9a721391db SHA256 b06642d5fc28e99122f77c20a691c7ac544df78ecd8a75c7167a094e01a141c0
 EBUILD kwin-4.6.5.ebuild 1730 RMD160 65bd55c13d3a82dc04f04ecd9fbf3a7b49f63f2c SHA1 3c42496cd8811dcbffc8b57f2ececee8a5f4122f SHA256 f30d0c21eca9b8ae6186ea0741d59a269d38762e916c1c956223c5728c868072
-EBUILD kwin-4.7.0-r1.ebuild 1738 RMD160 31473fecbea64cae10b4aa6351f30c70eac3d778 SHA1 48eeed7acce816b6416a2089f09e91dff16743d4 SHA256 57c60aef0ffe3705821eee9c69e9947af12a5b841b52ba180a7b4cb924abba75
-EBUILD kwin-4.7.0.ebuild 1619 RMD160 76045ff039d2022d006fb2868f8d81e3c3df3b66 SHA1 c8b0f6adcfb27a34327d32dd963f9d0f8809ea1d SHA256 81cfffa9ff38fe739359123b87f5b72f9f78a19bef3bd3f91c6d70fe880ebff2
-MISC ChangeLog 28893 RMD160 9d7c83a3686e17d9763c185c06ec771c864f602f SHA1 0a1ceb60649f4004e35008f62025eedda1be26bc SHA256 4c4e6bbbcbb8be1ef0cbfd2f4990dca9bf8f1fa61caeb7ad0eb6b94aed2bfb1f
+EBUILD kwin-4.7.0-r1.ebuild 1609 RMD160 c9473ca41c856b0f42b7e9f07ebb2e4316b03532 SHA1 e9a6cfe51aa6c8bdc4da14f923cc51e5995e4851 SHA256 d34983166fe9dd5a8de33a769e0d58023740a24e59de861b6bf81a433dd096e5
+MISC ChangeLog 29199 RMD160 2d1d9ab1e59370aa84f5fec604ea05c8d463ca92 SHA1 56679b5aed6a6bf5f8fcfb911141a64c71f6df27 SHA256 5785feeca27aa7796034432593af9bf8341f52f4b349118fea44d35539f97b09
 MISC metadata.xml 229 RMD160 24787dda60325ca5ed6c320b09effa57d9b2f45b SHA1 98698ac5e37a3ed20414deb0de4eb70da74a2add SHA256 1cd96488355a3e48a2b0b12f09ad8e3ea923e199b4fcbf175590cd317b033af7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEUEARECAAYFAk5Jg1QACgkQkKaRLQcq0GLWjwCYy93+QuDZW/+/yD1XFzbG/nWX
-ggCghIN58Q4BqocQmANdpuSec2hkNHo=
-=WX/2
+iQIcBAEBCgAGBQJOTCl3AAoJENwGBM22xffe30cP/iayC0IbfCXy2/M+Y4V95/Lx
+5ImYES4oXW3wyDs0HvFxz0jQbqKaeIzlup2D6YG5w8VMaSphDtz/fUx3TXdjIw03
+2utKTHDgmdqZoZX6F4pQwtTqlHkB0xP/aGm7WN5qWtYvItfv6Oolu2Nu9fbRoQSX
++rHABj01asAvP+NEdpKcrut1WkI6Dsptr5f0cnVJsIux6OrPiYOg2ytt392J7ihz
+rmbSKvYvW+VkqJrCJEyu6XI7PIU3rigVeONfmXDnIzsLJxV9T8GmsKePnoGH0xK2
+kvDquNbF9KwOn0hcnYKLvQR5bGuHToXEjGl9AQjXqU2AdUvzOjtShLRzbpvt9ZLb
+/lqyHl7h+GnikQb+h61q+ddA6s3PxdWXTRV/rT6ZyuVI7tE2bAEAWv4blTuvCjyq
+WVOs8BzhLcYrfyt6pu7B/mH9Z1cl71aCySjaiwjUhECE34tP9no6ryC79k+VQxw5
+USZXjM2MhIQ0u5299bpPZ1l2h1oDQoPTfQO3NVtQfYFbutQWZF741go6wiGqNrfx
+BQ6KnwBY/blSAPmZK/suZclESFN4VWwWX4nc+7pe0mRjCQR6ghNGR2ryH3yBGkBw
+fcN0563telxKjlWQMPJ6KLLCUewLJB2wKzpYgYy4pcnquIBo4U8T0aTx82m/2+1N
+mvIYWKqHa7JPryw4sn0A
+=bmfU
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kwin/files/kwin-4.7.0-xcomposite_cmake_automagic.patch b/kde-base/kwin/files/kwin-4.7.0-xcomposite_cmake_automagic.patch
deleted file mode 100644
index 726abe9a5962..000000000000
--- a/kde-base/kwin/files/kwin-4.7.0-xcomposite_cmake_automagic.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ruN kwin-4.7.0.orig/ConfigureChecks.cmake kwin-4.7.0/ConfigureChecks.cmake
---- kwin-4.7.0.orig/ConfigureChecks.cmake	2011-05-20 22:32:06.000000000 +0200
-+++ kwin-4.7.0/ConfigureChecks.cmake	2011-08-15 16:56:52.165002024 +0200
-@@ -67,6 +67,12 @@
- macro_bool_to_01(X11_XShm_FOUND HAVE_XSHM) # kwin, ksplash
- macro_bool_to_01(X11_XTest_FOUND HAVE_XTEST) # khotkeys, kxkb, kdm
- macro_bool_to_01(X11_Xcomposite_FOUND HAVE_XCOMPOSITE) # kicker, kwin
-+
-+if(NOT WITH_X11_Xcomposite)
-+  set(X11_Xcomposite_FOUND FALSE)
-+  MESSAGE(STATUS "Disabling Xcomposite as requested on commandline.")
-+endif(NOT WITH_X11_Xcomposite)
-+
- macro_bool_to_01(X11_Xcursor_FOUND HAVE_XCURSOR) # many uses
- macro_bool_to_01(X11_Xdamage_FOUND HAVE_XDAMAGE) # kwin
- macro_bool_to_01(X11_Xfixes_FOUND HAVE_XFIXES) # klipper, kicker, kwin
diff --git a/kde-base/kwin/kwin-4.7.0-r1.ebuild b/kde-base/kwin/kwin-4.7.0-r1.ebuild
index 1faf5af55ab6..e01c6625bab5 100644
--- a/kde-base/kwin/kwin-4.7.0-r1.ebuild
+++ b/kde-base/kwin/kwin-4.7.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.7.0-r1.ebuild,v 1.1 2011/08/15 15:03:04 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.7.0-r1.ebuild,v 1.2 2011/08/17 20:49:44 dilfridge Exp $
 
 EAPI=4
 
@@ -10,27 +10,27 @@ inherit kde4-meta
 
 DESCRIPTION="KDE window manager"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug gles +xcomposite xinerama"
+IUSE="debug gles xinerama"
 
 COMMONDEPEND="
 	$(add_kdebase_dep kephal)
 	$(add_kdebase_dep libkworkspace)
 	$(add_kdebase_dep liboxygenstyle)
+	x11-libs/libXcomposite
 	x11-libs/libXdamage
 	x11-libs/libXfixes
 	>=x11-libs/libXrandr-1.2.1
 	x11-libs/libXrender
 	opengl? ( >=media-libs/mesa-7.10 )
 	gles? ( >=media-libs/mesa-7.10[egl(+),gles] )
-	xcomposite? ( x11-libs/libXcomposite )
 	xinerama? ( x11-libs/libXinerama )
 "
 DEPEND="${COMMONDEPEND}
+	x11-proto/compositeproto
 	x11-proto/damageproto
 	x11-proto/fixesproto
 	x11-proto/randrproto
 	x11-proto/renderproto
-	xcomposite? ( x11-proto/compositeproto )
 	xinerama? ( x11-proto/xineramaproto )
 "
 RDEPEND="${COMMONDEPEND}
@@ -45,7 +45,6 @@ KMEXTRACTONLY="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
-	"${FILESDIR}/${PN}-4.7.0-xcomposite_cmake_automagic.patch"
 )
 
 # you can use just gles or opengl or none
@@ -60,7 +59,7 @@ src_configure() {
 		$(cmake-utils_use gles KWIN_BUILD_WITH_OPENGLES)
 		$(cmake-utils_use_with opengl OpenGL)
 		$(cmake-utils_use_with xinerama X11_Xinerama)
-		$(cmake-utils_use_with xcomposite X11_Xcomposite)
+		-DWITH_X11_Xcomposite=ON
 	)
 
 	kde4-meta_src_configure
diff --git a/kde-base/kwin/kwin-4.7.0.ebuild b/kde-base/kwin/kwin-4.7.0.ebuild
deleted file mode 100644
index 04b105ce9dd7..000000000000
--- a/kde-base/kwin/kwin-4.7.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.7.0.ebuild,v 1.1 2011/07/27 14:04:42 alexxy Exp $
-
-EAPI=4
-
-KMNAME="kde-workspace"
-OPENGL_REQUIRED="optional"
-inherit kde4-meta
-
-DESCRIPTION="KDE window manager"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug gles xcomposite xinerama"
-
-COMMONDEPEND="
-	$(add_kdebase_dep kephal)
-	$(add_kdebase_dep libkworkspace)
-	$(add_kdebase_dep liboxygenstyle)
-	x11-libs/libXdamage
-	x11-libs/libXfixes
-	>=x11-libs/libXrandr-1.2.1
-	x11-libs/libXrender
-	opengl? ( >=media-libs/mesa-7.10 )
-	gles? ( >=media-libs/mesa-7.10[egl(+),gles] )
-	xcomposite? ( x11-libs/libXcomposite )
-	xinerama? ( x11-libs/libXinerama )
-"
-DEPEND="${COMMONDEPEND}
-	x11-proto/damageproto
-	x11-proto/fixesproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	xcomposite? ( x11-proto/compositeproto )
-	xinerama? ( x11-proto/xineramaproto )
-"
-RDEPEND="${COMMONDEPEND}
-	x11-apps/scripts
-"
-
-KMEXTRACTONLY="
-	ksmserver/
-	libs/kephal/
-	libs/oxygen/
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
-)
-
-# you can use just gles or opengl or none
-REQUIRED_USE="opengl? ( !gles ) gles? ( !opengl )"
-
-src_configure() {
-	# FIXME Remove when activity API moved away from libkworkspace
-	append-cppflags "-I${EPREFIX}/usr/include/kworkspace"
-
-	mycmakeargs=(
-		$(cmake-utils_use_with gles OpenGLES)
-		$(cmake-utils_use gles KWIN_BUILD_WITH_OPENGLES)
-		$(cmake-utils_use_with opengl OpenGL)
-		$(cmake-utils_use_with xinerama X11_Xinerama)
-	)
-
-	kde4-meta_src_configure
-}