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 1SPclF-0007hW-Dr for garchives@archives.gentoo.org; Wed, 02 May 2012 16:50:41 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 863C0E07C0; Wed, 2 May 2012 16:50:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 48EA5E07C0 for ; Wed, 2 May 2012 16:50:24 +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 4A18A1B4016 for ; Wed, 2 May 2012 16:50:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id BCBF9E5403 for ; Wed, 2 May 2012 16:42:32 +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: <1335976884.b89d72e69460a641b8f92a11fb1717c68cd02323.kensington@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-base/systemsettings/, kde-base/systemsettings/files/ X-VCS-Repository: proj/kde X-VCS-Files: kde-base/systemsettings/files/systemsettings-4.4.2-xinerama_cmake_automagic.patch kde-base/systemsettings/systemsettings-4.8.3.ebuild kde-base/systemsettings/systemsettings-4.8.49.9999.ebuild kde-base/systemsettings/systemsettings-9999.ebuild X-VCS-Directories: kde-base/systemsettings/ kde-base/systemsettings/files/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: b89d72e69460a641b8f92a11fb1717c68cd02323 X-VCS-Branch: master Date: Wed, 2 May 2012 16:42:32 +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: 10932662-ebe2-4347-96be-259ef274369d X-Archives-Hash: c41523694a4728ecb3d6784450daec89 commit: b89d72e69460a641b8f92a11fb1717c68cd02323 Author: Michael Palimaka astralcloak net> AuthorDate: Wed May 2 16:41:24 2012 +0000 Commit: Michael Palimaka astralcloak net> CommitDate: Wed May 2 16:41:24 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/kde.git;a=3Dc= ommit;h=3Db89d72e6 [kde-base/systemsettings] Remove unused xinerama use flag and patch. (Portage version: 2.1.10.57/git/Linux x86_64, unsigned Manifest commit) --- ...emsettings-4.4.2-xinerama_cmake_automagic.patch | 18 --------------= ---- .../systemsettings/systemsettings-4.8.3.ebuild | 9 +-------- .../systemsettings-4.8.49.9999.ebuild | 9 +-------- kde-base/systemsettings/systemsettings-9999.ebuild | 9 +-------- 4 files changed, 3 insertions(+), 42 deletions(-) diff --git a/kde-base/systemsettings/files/systemsettings-4.4.2-xinerama_= cmake_automagic.patch b/kde-base/systemsettings/files/systemsettings-4.4.= 2-xinerama_cmake_automagic.patch deleted file mode 100644 index 5596f41..0000000 --- a/kde-base/systemsettings/files/systemsettings-4.4.2-xinerama_cmake_a= utomagic.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/systemsettings/systemsettings-4.8.3.ebuild b/kde-ba= se/systemsettings/systemsettings-4.8.3.ebuild index 9ebd70a..6548761 100644 --- a/kde-base/systemsettings/systemsettings-4.8.3.ebuild +++ b/kde-base/systemsettings/systemsettings-4.8.3.ebuild @@ -11,7 +11,7 @@ VIRTUALX_REQUIRED=3D"test" inherit kde4-meta =20 DESCRIPTION=3D"System settings utility" -IUSE=3D"debug gtk +usb xinerama" +IUSE=3D"debug gtk +usb" KEYWORDS=3D"~amd64 ~arm ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" =20 COMMONDEPEND=3D" @@ -28,12 +28,10 @@ COMMONDEPEND=3D" x11-libs/libXtst opengl? ( virtual/opengl ) usb? ( =3Dvirtual/libusb-0* ) - xinerama? ( x11-libs/libXinerama ) " DEPEND=3D"${COMMONDEPEND} x11-proto/kbproto x11-proto/xextproto - xinerama? ( x11-proto/xineramaproto ) " RDEPEND=3D"${COMMONDEPEND} sys-libs/timezone-data @@ -58,10 +56,6 @@ KMEXTRACTONLY=3D" =20 add_blocker kdeaccessibility-colorschemes '<4.6.50' =20 -PATCHES=3D( - "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" -) - src_unpack() { if use handbook; then KMEXTRA+=3D" @@ -90,7 +84,6 @@ src_configure() { -DWITH_GLIB2=3DON -DWITH_GObject=3DON $(cmake-utils_use_with opengl OpenGL) $(cmake-utils_use_with usb) - $(cmake-utils_use_with xinerama X11_Xinerama) ) =20 kde4-meta_src_configure diff --git a/kde-base/systemsettings/systemsettings-4.8.49.9999.ebuild b/= kde-base/systemsettings/systemsettings-4.8.49.9999.ebuild index d7c9582..9400782 100644 --- a/kde-base/systemsettings/systemsettings-4.8.49.9999.ebuild +++ b/kde-base/systemsettings/systemsettings-4.8.49.9999.ebuild @@ -11,7 +11,7 @@ VIRTUALX_REQUIRED=3D"test" inherit kde4-meta =20 DESCRIPTION=3D"System settings utility" -IUSE=3D"debug gtk +usb xinerama" +IUSE=3D"debug gtk +usb" KEYWORDS=3D"" =20 COMMONDEPEND=3D" @@ -28,12 +28,10 @@ COMMONDEPEND=3D" x11-libs/libXtst opengl? ( virtual/opengl ) usb? ( =3Dvirtual/libusb-0* ) - xinerama? ( x11-libs/libXinerama ) " DEPEND=3D"${COMMONDEPEND} x11-proto/kbproto x11-proto/xextproto - xinerama? ( x11-proto/xineramaproto ) " RDEPEND=3D"${COMMONDEPEND} sys-libs/timezone-data @@ -58,10 +56,6 @@ KMEXTRACTONLY=3D" =20 add_blocker kdeaccessibility-colorschemes '<4.6.50' =20 -PATCHES=3D( - "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" -) - src_unpack() { if use handbook; then KMEXTRA+=3D" @@ -90,7 +84,6 @@ src_configure() { -DWITH_GLIB2=3DON -DWITH_GObject=3DON $(cmake-utils_use_with opengl OpenGL) $(cmake-utils_use_with usb) - $(cmake-utils_use_with xinerama X11_Xinerama) ) =20 kde4-meta_src_configure diff --git a/kde-base/systemsettings/systemsettings-9999.ebuild b/kde-bas= e/systemsettings/systemsettings-9999.ebuild index d7c9582..9400782 100644 --- a/kde-base/systemsettings/systemsettings-9999.ebuild +++ b/kde-base/systemsettings/systemsettings-9999.ebuild @@ -11,7 +11,7 @@ VIRTUALX_REQUIRED=3D"test" inherit kde4-meta =20 DESCRIPTION=3D"System settings utility" -IUSE=3D"debug gtk +usb xinerama" +IUSE=3D"debug gtk +usb" KEYWORDS=3D"" =20 COMMONDEPEND=3D" @@ -28,12 +28,10 @@ COMMONDEPEND=3D" x11-libs/libXtst opengl? ( virtual/opengl ) usb? ( =3Dvirtual/libusb-0* ) - xinerama? ( x11-libs/libXinerama ) " DEPEND=3D"${COMMONDEPEND} x11-proto/kbproto x11-proto/xextproto - xinerama? ( x11-proto/xineramaproto ) " RDEPEND=3D"${COMMONDEPEND} sys-libs/timezone-data @@ -58,10 +56,6 @@ KMEXTRACTONLY=3D" =20 add_blocker kdeaccessibility-colorschemes '<4.6.50' =20 -PATCHES=3D( - "${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch" -) - src_unpack() { if use handbook; then KMEXTRA+=3D" @@ -90,7 +84,6 @@ src_configure() { -DWITH_GLIB2=3DON -DWITH_GObject=3DON $(cmake-utils_use_with opengl OpenGL) $(cmake-utils_use_with usb) - $(cmake-utils_use_with xinerama X11_Xinerama) ) =20 kde4-meta_src_configure