[kde-base/systemsettings] Remove unused xinerama use flag and patch.

(Portage version: 2.1.10.57/git/Linux x86_64, unsigned Manifest commit)

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 5596f415d84..00000000000
--- a/kde-base/systemsettings/files/systemsettings-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-workspace-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.000000000 +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, kicker
- macro_bool_to_01(X11_xf86misc_FOUND HAVE_XF86MISC) # kdesktop and kcontrol/lock
diff --git a/kde-base/systemsettings/systemsettings-4.8.3.ebuild b/kde-base/systemsettings/systemsettings-4.8.3.ebuild
index 9ebd70aa225..6548761c67e 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="test"
 inherit kde4-meta
 
 DESCRIPTION="System settings utility"
-IUSE="debug gtk +usb xinerama"
+IUSE="debug gtk +usb"
 KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 COMMONDEPEND="
@@ -28,12 +28,10 @@ COMMONDEPEND="
 	x11-libs/libXtst
 	opengl? ( virtual/opengl )
 	usb? ( =virtual/libusb-0* )
-	xinerama? ( x11-libs/libXinerama )
 "
 DEPEND="${COMMONDEPEND}
 	x11-proto/kbproto
 	x11-proto/xextproto
-	xinerama? ( x11-proto/xineramaproto )
 "
 RDEPEND="${COMMONDEPEND}
 	sys-libs/timezone-data
@@ -58,10 +56,6 @@ KMEXTRACTONLY="
 
 add_blocker kdeaccessibility-colorschemes '<4.6.50'
 
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
-)
-
 src_unpack() {
 	if use handbook; then
 		KMEXTRA+="
@@ -90,7 +84,6 @@ src_configure() {
 		-DWITH_GLIB2=ON -DWITH_GObject=ON
 		$(cmake-utils_use_with opengl OpenGL)
 		$(cmake-utils_use_with usb)
-		$(cmake-utils_use_with xinerama X11_Xinerama)
 	)
 
 	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 d7c9582aaad..9400782863d 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="test"
 inherit kde4-meta
 
 DESCRIPTION="System settings utility"
-IUSE="debug gtk +usb xinerama"
+IUSE="debug gtk +usb"
 KEYWORDS=""
 
 COMMONDEPEND="
@@ -28,12 +28,10 @@ COMMONDEPEND="
 	x11-libs/libXtst
 	opengl? ( virtual/opengl )
 	usb? ( =virtual/libusb-0* )
-	xinerama? ( x11-libs/libXinerama )
 "
 DEPEND="${COMMONDEPEND}
 	x11-proto/kbproto
 	x11-proto/xextproto
-	xinerama? ( x11-proto/xineramaproto )
 "
 RDEPEND="${COMMONDEPEND}
 	sys-libs/timezone-data
@@ -58,10 +56,6 @@ KMEXTRACTONLY="
 
 add_blocker kdeaccessibility-colorschemes '<4.6.50'
 
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
-)
-
 src_unpack() {
 	if use handbook; then
 		KMEXTRA+="
@@ -90,7 +84,6 @@ src_configure() {
 		-DWITH_GLIB2=ON -DWITH_GObject=ON
 		$(cmake-utils_use_with opengl OpenGL)
 		$(cmake-utils_use_with usb)
-		$(cmake-utils_use_with xinerama X11_Xinerama)
 	)
 
 	kde4-meta_src_configure
diff --git a/kde-base/systemsettings/systemsettings-9999.ebuild b/kde-base/systemsettings/systemsettings-9999.ebuild
index d7c9582aaad..9400782863d 100644
--- a/kde-base/systemsettings/systemsettings-9999.ebuild
+++ b/kde-base/systemsettings/systemsettings-9999.ebuild
@@ -11,7 +11,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde4-meta
 
 DESCRIPTION="System settings utility"
-IUSE="debug gtk +usb xinerama"
+IUSE="debug gtk +usb"
 KEYWORDS=""
 
 COMMONDEPEND="
@@ -28,12 +28,10 @@ COMMONDEPEND="
 	x11-libs/libXtst
 	opengl? ( virtual/opengl )
 	usb? ( =virtual/libusb-0* )
-	xinerama? ( x11-libs/libXinerama )
 "
 DEPEND="${COMMONDEPEND}
 	x11-proto/kbproto
 	x11-proto/xextproto
-	xinerama? ( x11-proto/xineramaproto )
 "
 RDEPEND="${COMMONDEPEND}
 	sys-libs/timezone-data
@@ -58,10 +56,6 @@ KMEXTRACTONLY="
 
 add_blocker kdeaccessibility-colorschemes '<4.6.50'
 
-PATCHES=(
-	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
-)
-
 src_unpack() {
 	if use handbook; then
 		KMEXTRA+="
@@ -90,7 +84,6 @@ src_configure() {
 		-DWITH_GLIB2=ON -DWITH_GObject=ON
 		$(cmake-utils_use_with opengl OpenGL)
 		$(cmake-utils_use_with usb)
-		$(cmake-utils_use_with xinerama X11_Xinerama)
 	)
 
 	kde4-meta_src_configure