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

(Portage version: 2.1.10.11/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)

4 files changed, 23 insertions, 42 deletions

diff --git a/kde-base/kwin/Manifest b/kde-base/kwin/Manifest
index def85a6216c..d0fbbb179fc 100644
--- a/kde-base/kwin/Manifest
+++ b/kde-base/kwin/Manifest
@@ -2,25 +2,24 @@
 Hash: SHA512
 
 AUX kwin-4.4.2-xinerama_cmake_automagic.patch 923 RMD160 45519a7e51001e6f16cf4bc13f7ef99eeaff793a SHA1 22102eaa95aa07bce19262842fcda69e0bc751f0 SHA256 c1f605148ba9ea606924c934a3b79bb7b415346a3fbe2e7c1732cc6956a44157
-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
-EBUILD kwin-4.7.49.9999.ebuild 1587 RMD160 b15febe056846ea0fdf6d2da0a7addb8e843d33e SHA1 c1040dfdc944defd00bd4bb089bae6c795435e37 SHA256 c4465874b9c01335e7bd0cf20884783da676ef4bacd39e31cad5c1f653f1906d
-EBUILD kwin-9999.ebuild 1587 RMD160 b15febe056846ea0fdf6d2da0a7addb8e843d33e SHA1 c1040dfdc944defd00bd4bb089bae6c795435e37 SHA256 c4465874b9c01335e7bd0cf20884783da676ef4bacd39e31cad5c1f653f1906d
+EBUILD kwin-4.7.49.9999.ebuild 1458 RMD160 0ed7fcb01e8fdd4ae46bd917faf9ac58f34de148 SHA1 0b1f2ad0d5b814bfd911ec9f9ee72ce82b68b751 SHA256 4f929ecfcb12d929c1ba898bad5f08e270ee8b38916f374d9411383457d27f26
+EBUILD kwin-9999.ebuild 1458 RMD160 0ed7fcb01e8fdd4ae46bd917faf9ac58f34de148 SHA1 0b1f2ad0d5b814bfd911ec9f9ee72ce82b68b751 SHA256 4f929ecfcb12d929c1ba898bad5f08e270ee8b38916f374d9411383457d27f26
 MISC metadata.xml 229 RMD160 24787dda60325ca5ed6c320b09effa57d9b2f45b SHA1 98698ac5e37a3ed20414deb0de4eb70da74a2add SHA256 1cd96488355a3e48a2b0b12f09ad8e3ea923e199b4fcbf175590cd317b033af7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOSTXwAAoJEEb+UGWnxTyHDYcP/iFRE4g+Wwl4Auw5pAAF96R6
-YskIO+7zagL4Kc04GS5gv3yu99sV6ShEblAFVXy/E2uS+29QyNiBtfSzs029w/6F
-EDTX5QmSSA61H44dxE6uVFWApUwmizD3+S5ahTzp41396kOU/nFV/3QOsaJ226aX
-Kfgg48Ji8soOzS7vlTpln+E4rPovY0xICdAXFuaFBxuk5MlfJhPW64IVL6vd70+a
-2ReBRjVkt+qvjm0iQ8tBUkZVb+QxeIhBcQWjOjOrmh7QdnKWcWJ3H/r7LFbQbZs+
-cQ5FVXjFwvckU/dqBOUVZDENqcWYXlWAio+hGF2poLOOQ3ZrabgZxK8gIVIPvflg
-v9koMcMhy/ssOThPXdZ6agMupbDyCCEjZAbu/Yky76YxNmrfqnzgOAD+CU/9KPEB
-J94NMwUctSkphrdabDTZw01avVePIh2Tpbkirm/TRVWhoGjiOf6x/XWP6FlruYeY
-3GJFmFmJSbPpJaXyPFn1HSu3hzX5xlqK1qvtQ4F45ikty5lzVnMmkRuDtawOA4i6
-Dd5puBIynBZy9HmPD0U25Mej2S0Da20+vL5vyU6prA91qKTwaMnqirqzzynEVhtS
-RVRJpyjqiy9zKF+ggrW4VEjPdtoI5Cvai+TlMi5MKPgWgr8gzyTrIYhjE+wdNsws
-2/SBoQNviJhyKW9IXoYR
-=byD8
+iQIcBAEBCgAGBQJOTCpVAAoJENwGBM22xffeczMP/0xQccpQVv8xppELtihAVxMK
+JGnW/y6m4N+YOBimCLf4g1Y4qwWz9ZPJxsSRf2Mqf3itW5LN4mNgpREl/wikVDYR
+Ux88TJ7rfvwbdV5BNY7G7xIL/GcPmHveaP1gL+dHXrqUZdgAgaQd5RXtCs/ErTDl
+1B62n0T9LJXThWEPkem10m4QsaxVsAXt9r3lEBHgjXkzVb+thXM/Y+aldeF6orBm
+oMn2kGHT0QUWsYZmCew2CRnxfAHD3hIBd5ZVUdZIIcvEvkusg+FK4ahTSEcLwINr
+1FU0lvP3UA2F6RBS637w4+EaqKcHUKZfv4ZERzpbW/YTzgmPFnGOUYMdga+8RH+K
+Ia35bncJEIET/YB+pOK7TRbWvFo6YOa9lcAmp/kHGy5Vr9/Q/n5GeJ6cl3uyq7bE
+X7v3bCHGW4ZUI8jJNmZjQW4+5ItUT3uhVzVbUVNXvnuvQAZJHr3ntySxrqrfLqE/
+m24VHpEDwkwa8oiHEy9n9AngUFKBuZDd34t2SGgPW1u4D5AWMbiu3vR5l2FDdlsG
+3JkLw0L7d0tmeUazmTnG5UTHQV18v6xKpfpfMK63M4MrFiNPKwwpM/2hXLPFsMUP
+7O7Uj4ojJshcBfGv3CGHubyInaDQwPcw5CvGcM3C8Uo4o9I26h3FGHg8fGxYk5RL
+vFCz+W2zAAhwukWsONut
+=EHxt
 -----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 726abe9a596..00000000000
--- 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.49.9999.ebuild b/kde-base/kwin/kwin-4.7.49.9999.ebuild
index c7c8228ec41..1b47860a585 100644
--- a/kde-base/kwin/kwin-4.7.49.9999.ebuild
+++ b/kde-base/kwin/kwin-4.7.49.9999.ebuild
@@ -10,27 +10,27 @@ inherit kde4-meta
 
 DESCRIPTION="KDE window manager"
 KEYWORDS=""
-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-9999.ebuild b/kde-base/kwin/kwin-9999.ebuild
index c7c8228ec41..1b47860a585 100644
--- a/kde-base/kwin/kwin-9999.ebuild
+++ b/kde-base/kwin/kwin-9999.ebuild
@@ -10,27 +10,27 @@ inherit kde4-meta
 
 DESCRIPTION="KDE window manager"
 KEYWORDS=""
-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