Remove kdeenablefinal patch. Build feature is gone.

(Portage version: 2.2.0_alpha84/cvs/Linux x86_64)

4 files changed, 9 insertions, 36 deletions

diff --git a/kde-base/systemsettings/ChangeLog b/kde-base/systemsettings/ChangeLog
index a744807c5508..953e34d66f11 100644
--- a/kde-base/systemsettings/ChangeLog
+++ b/kde-base/systemsettings/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/systemsettings
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.130 2012/01/16 23:55:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/ChangeLog,v 1.131 2012/01/17 12:06:26 johu Exp $
+
+  17 Jan 2012; Johannes Huber <johu@gentoo.org>
+  -files/systemsettings-4.7.3-enablefinal.patch, systemsettings-4.7.3-r1.ebuild,
+  systemsettings-4.7.4.ebuild:
+  Remove kdeenablefinal patch. Build feature is gone.
 
   16 Jan 2012; Agostino Sarubbo <ago@gentoo.org> systemsettings-4.7.4.ebuild:
   Stable for amd64, wrt bug #396359
diff --git a/kde-base/systemsettings/files/systemsettings-4.7.3-enablefinal.patch b/kde-base/systemsettings/files/systemsettings-4.7.3-enablefinal.patch
deleted file mode 100644
index c57f1978e10d..000000000000
--- a/kde-base/systemsettings/files/systemsettings-4.7.3-enablefinal.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -U2 -rxi kde-workspace-4.7.3.orig/kcontrol/keyboard/keyboard_config.cpp kde-workspace-4.7.3/kcontrol/keyboard/keyboard_config.cpp
---- kde-workspace-4.7.3.orig/kcontrol/keyboard/keyboard_config.cpp	2011-05-20 22:32:06.000000000 +0200
-+++ kde-workspace-4.7.3/kcontrol/keyboard/keyboard_config.cpp	2011-12-25 12:46:50.529622540 +0100
-@@ -25,5 +25,5 @@
- 
- static const char* SWITCHING_POLICIES[] = {"Global", "Desktop", "WinClass", "Window", NULL };
--static const char* LIST_SEPARATOR = ",";
-+#define LIST_SEPARATOR ","
- //static const char* DEFAULT_LAYOUT = "us";
- static const char* DEFAULT_MODEL = "pc104";
-@@ -183,2 +183,4 @@
- 	return layouts.mid(layoutLoopCount, layouts.size());
- }
-+
-+#undef LIST_SEPARATOR
-diff -U2 -rxi kde-workspace-4.7.3.orig/kcontrol/keyboard/layout_memory_persister.cpp kde-workspace-4.7.3/kcontrol/keyboard/layout_memory_persister.cpp
---- kde-workspace-4.7.3.orig/kcontrol/keyboard/layout_memory_persister.cpp	2011-05-20 22:32:06.000000000 +0200
-+++ kde-workspace-4.7.3/kcontrol/keyboard/layout_memory_persister.cpp	2011-12-25 12:46:05.173189572 +0100
-@@ -42,5 +42,5 @@
- static const char* LAYOUTS_ATTRIBUTE = "layouts";
- 
--static const char* LIST_SEPARATOR = ",";
-+#define LIST_SEPARATOR ","
- 
- static const char* REL_SESSION_FILE_PATH = "/session/keyboard/layout_memory.xml";
-@@ -259,2 +259,4 @@
- 	return !windowMode;
- }
-+
-+#undef LIST_SEPARATOR
diff --git a/kde-base/systemsettings/systemsettings-4.7.3-r1.ebuild b/kde-base/systemsettings/systemsettings-4.7.3-r1.ebuild
index f655fbefec5b..034bd2de110c 100644
--- a/kde-base/systemsettings/systemsettings-4.7.3-r1.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.7.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.7.3-r1.ebuild,v 1.3 2011/12/25 13:44:59 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.7.3-r1.ebuild,v 1.4 2012/01/17 12:06:26 johu Exp $
 
 EAPI=4
 
@@ -60,7 +60,6 @@ add_blocker kdeaccessibility-colorschemes '<4.6.50'
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
 	"${FILESDIR}/${P}-fix-keyboard-layout-switch.patch"
-	"${FILESDIR}/${P}-enablefinal.patch"
 )
 
 src_unpack() {
diff --git a/kde-base/systemsettings/systemsettings-4.7.4.ebuild b/kde-base/systemsettings/systemsettings-4.7.4.ebuild
index e818e5697681..b9af1fe2e165 100644
--- a/kde-base/systemsettings/systemsettings-4.7.4.ebuild
+++ b/kde-base/systemsettings/systemsettings-4.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.7.4.ebuild,v 1.4 2012/01/16 23:55:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/systemsettings/systemsettings-4.7.4.ebuild,v 1.5 2012/01/17 12:06:26 johu Exp $
 
 EAPI=4
 
@@ -59,7 +59,6 @@ add_blocker kdeaccessibility-colorschemes '<4.6.50'
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
-	"${FILESDIR}/${PN}-4.7.3-enablefinal.patch"
 )
 
 src_unpack() {