Remove kdeenablefinal patch. Build feature is gone.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

11 files changed, 25 insertions, 95 deletions

diff --git a/kde-base/knode/ChangeLog b/kde-base/knode/ChangeLog
index 0046693f876d..1ba7df748a46 100644
--- a/kde-base/knode/ChangeLog
+++ b/kde-base/knode/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/knode
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/ChangeLog,v 1.197 2012/01/16 22:57:08 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/ChangeLog,v 1.198 2012/01/17 11:56:06 johu Exp $
+
+  17 Jan 2012; Johannes Huber <johu@gentoo.org>
+  -files/knode-4.4.10-enablefinal.patch, knode-4.4.11.1.ebuild:
+  Remove kdeenablefinal patch. Build feature is gone.
 
   16 Jan 2012; Agostino Sarubbo <ago@gentoo.org> knode-4.7.4.ebuild:
   Stable for amd64, wrt bug #396359
diff --git a/kde-base/knode/files/knode-4.4.10-enablefinal.patch b/kde-base/knode/files/knode-4.4.10-enablefinal.patch
deleted file mode 100644
index 8d140abcaedd..000000000000
--- a/kde-base/knode/files/knode-4.4.10-enablefinal.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdepim-4.4.9/libkdepim/addressesdialog.h.orig	2011-01-02 10:25:59.941000270 +0100
-+++ kdepim-4.4.9/libkdepim/addressesdialog.h	2011-01-02 10:25:59.941000270 +0100
-@@ -37,7 +37,7 @@
- #include <QStringList>
- #include <QTreeWidget>
- 
--class AddressPickerUI : public QWidget, public Ui::AddressPickerUI
-+class AddressPickerUI : public QWidget, public ::Ui::AddressPickerUI
- {
- public:
-   AddressPickerUI( QWidget *parent ) : QWidget( parent ) {
diff --git a/kde-base/knode/knode-4.4.11.1.ebuild b/kde-base/knode/knode-4.4.11.1.ebuild
index 961aa39180c5..9dd897f97780 100644
--- a/kde-base/knode/knode-4.4.11.1.ebuild
+++ b/kde-base/knode/knode-4.4.11.1.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/knode/knode-4.4.11.1.ebuild,v 1.5 2011/06/01 19:41:49 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/knode/knode-4.4.11.1.ebuild,v 1.6 2012/01/17 11:56:06 johu Exp $
 
 EAPI=4
 
@@ -27,8 +27,6 @@ KMEXTRACTONLY="
 
 KMLOADLIBS="libkdepim"
 
-PATCHES=( "${FILESDIR}/${PN}"-4.4.10-enablefinal.patch )
-
 src_unpack() {
 	if use handbook; then
 		KMEXTRA="
diff --git a/kde-base/lokalize/ChangeLog b/kde-base/lokalize/ChangeLog
index 265de8107f6f..38f5d6aa604e 100644
--- a/kde-base/lokalize/ChangeLog
+++ b/kde-base/lokalize/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/lokalize
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/ChangeLog,v 1.95 2012/01/16 23:38:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/ChangeLog,v 1.96 2012/01/17 11:52:30 johu Exp $
+
+  17 Jan 2012; Johannes Huber <johu@gentoo.org>
+  -files/lokalize-4.6.1-enablefinal.patch, lokalize-4.6.3.ebuild:
+  Remove kdeenablefinal patch. Build feature is gone.
 
   16 Jan 2012; Agostino Sarubbo <ago@gentoo.org> lokalize-4.7.4.ebuild:
   Stable for amd64, wrt bug #396359
diff --git a/kde-base/lokalize/files/lokalize-4.6.1-enablefinal.patch b/kde-base/lokalize/files/lokalize-4.6.1-enablefinal.patch
deleted file mode 100644
index 31034f9e634b..000000000000
--- a/kde-base/lokalize/files/lokalize-4.6.1-enablefinal.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- kdesdk-4.5.4/lokalize/src/project/projectmodel.cpp.orig	2010-12-26 18:42:44.132000006 +0100
-+++ kdesdk-4.5.4/lokalize/src/project/projectmodel.cpp	2010-12-26 18:42:44.132000006 +0100
-@@ -1233,21 +1233,6 @@
- {
- }
- 
--static void initDb(QSqlDatabase& db)
--{
--    QSqlQuery queryMain(db);
--    queryMain.exec("PRAGMA encoding = \"UTF-8\"");
--    queryMain.exec("CREATE TABLE IF NOT EXISTS metainfo ("
--                   "filepath INTEGER PRIMARY KEY ON CONFLICT REPLACE, "// AUTOINCREMENT,"
--                   //"filepath TEXT UNIQUE ON CONFLICT REPLACE, "
--                   "metainfo BLOB, "//XLIFF markup info, see catalog/catalogstring.h catalog/xliff/*
--                   "changedate INTEGER"
--                   ")");
--
--    //queryMain.exec("CREATE INDEX IF NOT EXISTS filepath_index ON metainfo ("filepath)");
--}
--
--
- static KFileMetaInfo cachedMetaInfo(const KFileItem& file)
- {
-     QString dbName="metainfocache";
-@@ -1257,7 +1242,16 @@
-         db.setDatabaseName(KStandardDirs::locateLocal("appdata", dbName+".sqlite"));
-         if (KDE_ISUNLIKELY( !db.open() ))
-             return KFileMetaInfo(file.url());
--        initDb(db);
-+        QSqlQuery queryMain(db);
-+        queryMain.exec("PRAGMA encoding = \"UTF-8\"");
-+        queryMain.exec("CREATE TABLE IF NOT EXISTS metainfo ("
-+                       "filepath INTEGER PRIMARY KEY ON CONFLICT REPLACE, "// AUTOINCREMENT,"
-+                       //"filepath TEXT UNIQUE ON CONFLICT REPLACE, "
-+                       "metainfo BLOB, "//XLIFF markup info, see catalog/catalogstring.h catalog/xliff/*
-+                       "changedate INTEGER"
-+                       ")");
-+
-+        //queryMain.exec("CREATE INDEX IF NOT EXISTS filepath_index ON metainfo ("filepath)");
-     }
-     QSqlDatabase db=QSqlDatabase::database(dbName);
-     if (!db.isOpen())
diff --git a/kde-base/lokalize/lokalize-4.6.3.ebuild b/kde-base/lokalize/lokalize-4.6.3.ebuild
index eeee8060471a..023371027e0e 100644
--- a/kde-base/lokalize/lokalize-4.6.3.ebuild
+++ b/kde-base/lokalize/lokalize-4.6.3.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/lokalize/lokalize-4.6.3.ebuild,v 1.4 2011/06/26 01:54:35 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/lokalize/lokalize-4.6.3.ebuild,v 1.5 2012/01/17 11:52:30 johu Exp $
 
 EAPI=3
 
@@ -24,8 +24,6 @@ RDEPEND="${DEPEND}
 	$(add_kdebase_dep pykde4)
 "
 
-PATCHES=( "${FILESDIR}/${PN}"-4.6.1-enablefinal.patch )
-
 pkg_setup() {
 	kde4-meta_pkg_setup
 	python_set_active_version 2
diff --git a/kde-base/nsplugins/ChangeLog b/kde-base/nsplugins/ChangeLog
index 0cf0e19b2d7f..6d48cc48eca6 100644
--- a/kde-base/nsplugins/ChangeLog
+++ b/kde-base/nsplugins/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/nsplugins
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/ChangeLog,v 1.222 2012/01/16 23:41:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/ChangeLog,v 1.223 2012/01/17 11:48:28 johu Exp $
+
+  17 Jan 2012; Johannes Huber <johu@gentoo.org>
+  -files/nsplugins-4.6.1-enablefinal.patch, nsplugins-4.6.3.ebuild,
+  nsplugins-4.7.3.ebuild, nsplugins-4.7.4.ebuild:
+  Remove kdeenablefinal patch. Build feature is gone.
 
   16 Jan 2012; Agostino Sarubbo <ago@gentoo.org> nsplugins-4.7.4.ebuild:
   Stable for amd64, wrt bug #396359
diff --git a/kde-base/nsplugins/files/nsplugins-4.6.1-enablefinal.patch b/kde-base/nsplugins/files/nsplugins-4.6.1-enablefinal.patch
deleted file mode 100644
index e955cc0af14a..000000000000
--- a/kde-base/nsplugins/files/nsplugins-4.6.1-enablefinal.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- nsplugins/viewer/scripting.h.orig	2010-12-26 01:50:16.704000278 +0100
-+++ nsplugins/viewer/scripting.h	2010-12-26 01:57:20.581000171 +0100
-@@ -20,6 +20,9 @@
- 
- */
- 
-+#ifndef VIEWER_SCRIPTING_H
-+#define VIEWER_SCRIPTING_H
-+
- #include "nsplugin.h"
- #include "sdk/npruntime.h"
- #include <kparts/browserextension.h>
-@@ -93,5 +96,6 @@
- 
- } // namespace kdeNsPluginViewer
- 
--// kate: indent-width 4; replace-tabs on; tab-width 4; space-indent on;
-+#endif
- 
-+// kate: indent-width 4; replace-tabs on; tab-width 4; space-indent on;
diff --git a/kde-base/nsplugins/nsplugins-4.6.3.ebuild b/kde-base/nsplugins/nsplugins-4.6.3.ebuild
index 9ff64bf15761..c81d203e7582 100644
--- a/kde-base/nsplugins/nsplugins-4.6.3.ebuild
+++ b/kde-base/nsplugins/nsplugins-4.6.3.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/nsplugins/nsplugins-4.6.3.ebuild,v 1.4 2011/06/26 01:54:27 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/nsplugins-4.6.3.ebuild,v 1.5 2012/01/17 11:48:28 johu Exp $
 
 EAPI=4
 
@@ -21,5 +21,3 @@ RDEPEND="${DEPEND}
 KMEXTRACTONLY="
 	konqueror/settings/
 "
-
-PATCHES=( "${FILESDIR}/${PN}"-4.6.1-enablefinal.patch )
diff --git a/kde-base/nsplugins/nsplugins-4.7.3.ebuild b/kde-base/nsplugins/nsplugins-4.7.3.ebuild
index 33f0539da67a..ec902c076bd7 100644
--- a/kde-base/nsplugins/nsplugins-4.7.3.ebuild
+++ b/kde-base/nsplugins/nsplugins-4.7.3.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/nsplugins/nsplugins-4.7.3.ebuild,v 1.3 2011/12/07 22:13:36 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/nsplugins-4.7.3.ebuild,v 1.4 2012/01/17 11:48:28 johu Exp $
 
 EAPI=4
 
@@ -21,5 +21,3 @@ RDEPEND="${DEPEND}
 KMEXTRACTONLY="
 	konqueror/settings/
 "
-
-PATCHES=( "${FILESDIR}/${PN}"-4.6.1-enablefinal.patch )
diff --git a/kde-base/nsplugins/nsplugins-4.7.4.ebuild b/kde-base/nsplugins/nsplugins-4.7.4.ebuild
index 0f2c0a98a875..ab2ac3d35e84 100644
--- a/kde-base/nsplugins/nsplugins-4.7.4.ebuild
+++ b/kde-base/nsplugins/nsplugins-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/nsplugins/nsplugins-4.7.4.ebuild,v 1.3 2012/01/16 23:41:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/nsplugins/nsplugins-4.7.4.ebuild,v 1.4 2012/01/17 11:48:28 johu Exp $
 
 EAPI=4
 
@@ -21,5 +21,3 @@ RDEPEND="${DEPEND}
 KMEXTRACTONLY="
 	konqueror/settings/
 "
-
-PATCHES=( "${FILESDIR}/${PN}"-4.6.1-enablefinal.patch )