Fix kdeenablefinal build, bug 350355

(Portage version: 2.1.9.42/cvs/Linux x86_64)

3 files changed, 74 insertions, 2 deletions

diff --git a/kde-base/akregator/ChangeLog b/kde-base/akregator/ChangeLog
index 722f6dfc2ca8..7c88d271e299 100644
--- a/kde-base/akregator/ChangeLog
+++ b/kde-base/akregator/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/akregator
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/ChangeLog,v 1.179 2011/02/13 19:58:05 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/ChangeLog,v 1.180 2011/03/08 22:27:36 dilfridge Exp $
+
+  08 Mar 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  akregator-4.4.10.ebuild, +files/akregator-4.4.10-enablefinal.patch:
+  Fix kdeenablefinal build, bug 350355
 
   13 Feb 2011; Tomáš Chvátal <scarabeus@gentoo.org> -akregator-4.4.6.ebuild,
   -akregator-4.4.7.ebuild, -akregator-4.4.8.ebuild:
diff --git a/kde-base/akregator/akregator-4.4.10.ebuild b/kde-base/akregator/akregator-4.4.10.ebuild
index 63964f6f24ea..88a41d1f6506 100644
--- a/kde-base/akregator/akregator-4.4.10.ebuild
+++ b/kde-base/akregator/akregator-4.4.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/akregator-4.4.10.ebuild,v 1.2 2011/01/28 05:20:43 tampakrap Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/akregator/akregator-4.4.10.ebuild,v 1.3 2011/03/08 22:27:36 dilfridge Exp $
 
 EAPI="3"
 
@@ -17,4 +17,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}"-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
new file mode 100644
index 000000000000..de134168c5c2
--- /dev/null
+++ b/kde-base/akregator/files/akregator-4.4.10-enablefinal.patch
@@ -0,0 +1,66 @@
+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"