Remove kdeenablefinal patch. Build feature is gone.

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

4 files changed, 10 insertions, 74 deletions

diff --git a/kde-base/akregator/ChangeLog b/kde-base/akregator/ChangeLog
index 38f9d2b9dca6..c48875696c2b 100644
--- a/kde-base/akregator/ChangeLog
+++ b/kde-base/akregator/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/akregator
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/ChangeLog,v 1.207 2012/01/16 20:59:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/ChangeLog,v 1.208 2012/01/17 12:01:08 johu Exp $
+
+  17 Jan 2012; Johannes Huber <johu@gentoo.org>
+  -files/akregator-4.4.10-enablefinal.patch, akregator-4.4.11.1-r1.ebuild,
+  akregator-4.4.11.1.ebuild:
+  Remove kdeenablefinal patch. Build feature is gone.
 
   16 Jan 2012; Agostino Sarubbo <ago@gentoo.org> akregator-4.7.4.ebuild:
   Stable for amd64, wrt bug #396359
diff --git a/kde-base/akregator/akregator-4.4.11.1-r1.ebuild b/kde-base/akregator/akregator-4.4.11.1-r1.ebuild
index 4156f58c02cc..58b7c9cf2849 100644
--- a/kde-base/akregator/akregator-4.4.11.1-r1.ebuild
+++ b/kde-base/akregator/akregator-4.4.11.1-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/akregator/akregator-4.4.11.1-r1.ebuild,v 1.5 2011/06/01 19:35:20 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/akregator-4.4.11.1-r1.ebuild,v 1.6 2012/01/17 12:01:08 johu Exp $
 
 EAPI=4
 
@@ -19,7 +19,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/${PN}"-4.4.10-enablefinal.patch
 	"${FILESDIR}/${PN}"-4.4.11.1-revert.patch
 )
 
diff --git a/kde-base/akregator/akregator-4.4.11.1.ebuild b/kde-base/akregator/akregator-4.4.11.1.ebuild
index 439962d184a0..90873233ac03 100644
--- a/kde-base/akregator/akregator-4.4.11.1.ebuild
+++ b/kde-base/akregator/akregator-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/akregator/akregator-4.4.11.1.ebuild,v 1.2 2011/04/22 12:12:51 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/akregator-4.4.11.1.ebuild,v 1.3 2012/01/17 12:01:08 johu Exp $
 
 EAPI=4
 
@@ -18,6 +18,4 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/${PN}"-4.4.10-enablefinal.patch )
-
 KMLOADLIBS="libkdepim"
diff --git a/kde-base/akregator/files/akregator-4.4.10-enablefinal.patch b/kde-base/akregator/files/akregator-4.4.10-enablefinal.patch
deleted file mode 100644
index de134168c5c2..000000000000
--- a/kde-base/akregator/files/akregator-4.4.10-enablefinal.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -ru orig/kdepim-4.4.9/akregator/src/deletesubscriptioncommand.cpp kdepim-4.4.9/akregator/src/deletesubscriptioncommand.cpp
---- orig/kdepim-4.4.9/akregator/src/deletesubscriptioncommand.cpp
-+++ kdepim-4.4.9/akregator/src/deletesubscriptioncommand.cpp
-@@ -66,7 +66,7 @@
-             return true;
-         }
-
--        virtual bool visitFeed(Feed* node)
-+        virtual bool visitFeed(Akregator::Feed* node)
-         {
-             QString msg;
-             if (node->title().isEmpty())
-diff -ru orig/kdepim-4.4.9/akregator/src/editsubscriptioncommand.cpp kdepim-4.4.9/akregator/src/editsubscriptioncommand.cpp
---- orig/kdepim-4.4.9/akregator/src/editsubscriptioncommand.cpp
-+++ kdepim-4.4.9/akregator/src/editsubscriptioncommand.cpp
-@@ -51,7 +51,7 @@
-         return true;
-     }
- 
--    bool visitFeed(Feed* node)
-+    bool visitFeed(Akregator::Feed* node)
-     {
-         QPointer<FeedPropertiesDialog> dlg = new FeedPropertiesDialog( m_widget );
-         dlg->setFeed(node);
-diff -ru orig/kdepim-4.4.9/akregator/src/feed.cpp kdepim-4.4.9/akregator/src/feed.cpp
---- orig/kdepim-4.4.9/akregator/src/feed.cpp
-+++ kdepim-4.4.9/akregator/src/feed.cpp
-@@ -61,9 +61,10 @@
- #include <memory>
-
- using Syndication::ItemPtr;
--using namespace Akregator;
- using namespace boost;
-
-+namespace Akregator {
-+
- class Feed::Private
- {
-         Feed* const q;
-@@ -883,5 +884,7 @@
-     }
- }
-
-+}
-+
- #include "feed.moc"
-
-diff -ru orig/kdepim-4.4.9/akregator/src/folder.cpp kdepim-4.4.9/akregator/src/folder.cpp
---- orig/kdepim-4.4.9/akregator/src/folder.cpp
-+++ kdepim-4.4.9/akregator/src/folder.cpp
-@@ -37,7 +37,7 @@
-
- #include <cassert>
-
--using namespace Akregator;
-+namespace Akregator {
-
- class Folder::FolderPrivate
- {
-@@ -454,4 +454,6 @@
-     return nodeList;
- }
-
-+}
-+
- #include "folder.moc"