From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SMHZy-0007O1-Dh for garchives@archives.gentoo.org; Mon, 23 Apr 2012 11:37:15 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 298C4E0964; Mon, 23 Apr 2012 11:37:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DF714E0964 for ; Mon, 23 Apr 2012 11:37:00 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F0E6D1B4022 for ; Mon, 23 Apr 2012 11:36:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id ACD31E5402 for ; Mon, 23 Apr 2012 11:36:58 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1335180994.0e8f725fcf4ddde600aada9d4dba250f66a685fc.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/kwin/, kde-base/kwin/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/kwin/files/kwin-4.4.2-xinerama_cmake_automagic.patch kde-base/kwin/kwin-4.8.49.9999.ebuild kde-base/kwin/kwin-9999.ebuild X-VCS-Directories: kde-base/kwin/ kde-base/kwin/files/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: 0e8f725fcf4ddde600aada9d4dba250f66a685fc X-VCS-Branch: master Date: Mon, 23 Apr 2012 11:36:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 45d67bb7-c02f-4546-bb1d-4f6f9a02e867 X-Archives-Hash: 337b2dc40552da9a1b3ca6d36fc9f749 commit: 0e8f725fcf4ddde600aada9d4dba250f66a685fc Author: Michael Palimaka astralcloak net> AuthorDate: Mon Apr 23 11:35:04 2012 +0000 Commit: Michael Palimaka astralcloak net> CommitDate: Mon Apr 23 11:36:34 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3D0e8f725f [kde-base/kwin] Remove xinerama use flag and patch since the library is n= ot used directly. (Portage version: 2.1.10.56/git/Linux x86_64, unsigned Manifest commit) --- .../kwin-4.4.2-xinerama_cmake_automagic.patch | 18 --------------= ---- kde-base/kwin/kwin-4.8.49.9999.ebuild | 9 +-------- kde-base/kwin/kwin-9999.ebuild | 9 +-------- 3 files changed, 2 insertions(+), 34 deletions(-) diff --git a/kde-base/kwin/files/kwin-4.4.2-xinerama_cmake_automagic.patc= h b/kde-base/kwin/files/kwin-4.4.2-xinerama_cmake_automagic.patch deleted file mode 100644 index 5596f41..0000000 --- a/kde-base/kwin/files/kwin-4.4.2-xinerama_cmake_automagic.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -r -u kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake kdebase-wo= rkspace-4.4.2/ConfigureChecks.cmake ---- kdebase-workspace-4.4.2-orig/ConfigureChecks.cmake 2009-11-21 10:44:= 36.000000000 +0100 -+++ kdebase-workspace-4.4.2/ConfigureChecks.cmake 2010-04-02 00:04:32.00= 0000000 +0200 -@@ -71,7 +71,14 @@ - 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 -+ -+if(NOT WITH_X11_Xinerama) -+ set(X11_Xinerama_FOUND FALSE) -+ MESSAGE(STATUS "Disabling Xinerama as requested on commandline.") -+endif(NOT WITH_X11_Xinerama) -+ - macro_bool_to_01(X11_Xinerama_FOUND HAVE_XINERAMA) -+ - macro_bool_to_01(X11_Xrandr_FOUND HAVE_XRANDR) # kwin - macro_bool_to_01(X11_Xrender_FOUND HAVE_XRENDER) # kcontrol/style, kick= er - macro_bool_to_01(X11_xf86misc_FOUND HAVE_XF86MISC) # kdesktop and kcont= rol/lock diff --git a/kde-base/kwin/kwin-4.8.49.9999.ebuild b/kde-base/kwin/kwin-4= .8.49.9999.ebuild index d377847..4702ad0 100644 --- a/kde-base/kwin/kwin-4.8.49.9999.ebuild +++ b/kde-base/kwin/kwin-4.8.49.9999.ebuild @@ -10,7 +10,7 @@ inherit kde4-meta =20 DESCRIPTION=3D"KDE window manager" KEYWORDS=3D"" -IUSE=3D"debug gles opengl xinerama" +IUSE=3D"debug gles opengl" =20 COMMONDEPEND=3D" $(add_kdebase_dep kactivities) @@ -28,7 +28,6 @@ COMMONDEPEND=3D" || ( ( >=3Dmedia-libs/mesa-7.10[egl(+),gles] =3Dmedia-libs/mesa-7.12[egl(+),gles2] ) ) - xinerama? ( x11-libs/libXinerama ) " DEPEND=3D"${COMMONDEPEND} x11-proto/compositeproto @@ -36,7 +35,6 @@ DEPEND=3D"${COMMONDEPEND} x11-proto/fixesproto x11-proto/randrproto x11-proto/renderproto - xinerama? ( x11-proto/xineramaproto ) " RDEPEND=3D"${COMMONDEPEND} x11-apps/scripts @@ -48,10 +46,6 @@ KMEXTRACTONLY=3D" libs/oxygen/ " =20 -PATCHES=3D( - "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" -) - # you need one of these REQUIRED_USE=3D"!opengl? ( gles ) !gles? ( opengl )" =20 @@ -63,7 +57,6 @@ src_configure() { $(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) -DWITH_X11_Xcomposite=3DON ) =20 diff --git a/kde-base/kwin/kwin-9999.ebuild b/kde-base/kwin/kwin-9999.ebu= ild index d377847..4702ad0 100644 --- a/kde-base/kwin/kwin-9999.ebuild +++ b/kde-base/kwin/kwin-9999.ebuild @@ -10,7 +10,7 @@ inherit kde4-meta =20 DESCRIPTION=3D"KDE window manager" KEYWORDS=3D"" -IUSE=3D"debug gles opengl xinerama" +IUSE=3D"debug gles opengl" =20 COMMONDEPEND=3D" $(add_kdebase_dep kactivities) @@ -28,7 +28,6 @@ COMMONDEPEND=3D" || ( ( >=3Dmedia-libs/mesa-7.10[egl(+),gles] =3Dmedia-libs/mesa-7.12[egl(+),gles2] ) ) - xinerama? ( x11-libs/libXinerama ) " DEPEND=3D"${COMMONDEPEND} x11-proto/compositeproto @@ -36,7 +35,6 @@ DEPEND=3D"${COMMONDEPEND} x11-proto/fixesproto x11-proto/randrproto x11-proto/renderproto - xinerama? ( x11-proto/xineramaproto ) " RDEPEND=3D"${COMMONDEPEND} x11-apps/scripts @@ -48,10 +46,6 @@ KMEXTRACTONLY=3D" libs/oxygen/ " =20 -PATCHES=3D( - "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" -) - # you need one of these REQUIRED_USE=3D"!opengl? ( gles ) !gles? ( opengl )" =20 @@ -63,7 +57,6 @@ src_configure() { $(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) -DWITH_X11_Xcomposite=3DON ) =20