Remove kdeenablefinal patch. Build feature is gone.

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

5 files changed, 21 insertions, 86 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/Manifest b/kde-base/akregator/Manifest
index 61d02630ef64..e762fa3ff4c0 100644
--- a/kde-base/akregator/Manifest
+++ b/kde-base/akregator/Manifest
@@ -1,25 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-AUX akregator-4.4.10-enablefinal.patch 1780 RMD160 d2dbe7bb8ae1fd91dafc88fdfdc05e08edf2dadd SHA1 fdf34f3ae201413a4ee6c4bf8d8a1fb31e7fd8e9 SHA256 7e97f2dc23d647d1d01813ae3133e04ea4d1adef03a3e3c2bcf819c42500d448
 AUX akregator-4.4.11.1-revert.patch 1245 RMD160 75b9ebbae785830943082ed93151326ec62bdfbb SHA1 8c900626702e1503d76f899e1d3ba15a70753a8d SHA256 84b0b2f7abe04fe397a817a5cc52546fda797756691a311639672916a5b164b0
 DIST kdepim-4.4.11.1.tar.bz2 8964708 RMD160 51394b9dcb3aecc4f108e87de37c21e3af820ee1 SHA1 49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2 SHA256 a2fa237a3d880cc55a6c94450b93a7918bb0d5e3943eb7a759c8789de1ed41bf
 DIST kdepim-4.7.3.tar.bz2 16180232 RMD160 a6f838813adda7bd32c732bbe1c70a8df72bd233 SHA1 b540de51ba5b9995ce3b7c05cfb09112423d8569 SHA256 e86d8b64eb9a3be8c83edb7b125d414db06b6e031ee8987c82479ac33d09a0a6
 DIST kdepim-4.7.4.tar.bz2 16182345 RMD160 a36035cce2e25bc0cbddb50e4c9d5fdd661a2f26 SHA1 233f6c413eeedd4af7cf15106a2af7b8f29977bf SHA256 17a5e185e1199436864400d930f60979265cf0cd775b37a2e7b5a1a267c76868
-EBUILD akregator-4.4.11.1-r1.ebuild 653 RMD160 fc48a7163caee3c4218b3a31fcd85b51d44989f5 SHA1 e882a8498fb9b68d967f2eb70804d5619fd9360a SHA256 99da0f82ed049d006f07e8509395fdeec875643dba0b29173eb97b1cc135bdc8
-EBUILD akregator-4.4.11.1.ebuild 612 RMD160 85a7560d3e7565e90ec65ace6659105b0cda9c25 SHA1 8ea8bef2eb3a8c107a4946eed64daee65da1bac4 SHA256 b447a206c3396c3a49e0e9df1df8cb9fd739f2dc6f4ce7522ce8c14540c3f607
+EBUILD akregator-4.4.11.1-r1.ebuild 605 RMD160 d13c7f2c37a843887200f23ecc33633fc710b0fa SHA1 a7d144885e88dd4ae7e8235da873719252abfd37 SHA256 b71ef002f00146cf052dd2c6b9ed1c7dd3d7f5eb6048cd27407120f4da838ed1
+EBUILD akregator-4.4.11.1.ebuild 549 RMD160 3a2c6a2fa6bb2085d0dc967fe83a9203d69b125f SHA1 1c7e167fa96dd8cd22d2f85286fb068fc37ed361 SHA256 16b587eb774e0e2f0a5cf64255a392e97a75d50b3b23e631daf3c4728bb2895f
 EBUILD akregator-4.7.3.ebuild 552 RMD160 c5fbc93f3d708ce9c9e1f0443c7de8a544a669b9 SHA1 652deee0528dcf3542819cfbeda10968f873ac12 SHA256 075473a3e2918b13f611428ca5aed01c7f30d7e36941491bcb379fa8656292ed
 EBUILD akregator-4.7.4.ebuild 547 RMD160 f134a3837df56a16bd5c5a72404e4554bb5f3e58 SHA1 9ce0780456132d55d91c411b27e8eba3ff186809 SHA256 4aae7443f8934fedcba05e9445bec395d99323e16e4af1055ff7703c4184dd36
-MISC ChangeLog 26637 RMD160 c053acdb7e1e248431653ce58689dc259be3db63 SHA1 941f34135e76364d135a16d4660743bd094197ef SHA256 888721019a28f3733081d81af9727a4abe75d0b5e480a3869657030dcfe9b422
+MISC ChangeLog 26845 RMD160 fc5945e94fb52aa8a8c2396d9d6f63a11a2e5fe9 SHA1 56b35a6f4f5b1204bfa048297d613ae8051a1302 SHA256 c0d1b88331ffe0b25d35308c7dbe0457c88c12c22a141bcc43483e2960e34a20
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPFI+zAAoJEOTDgjZ80txdxf4H/jSx81aKtZI8o78V/FNf9XFK
-HopO2lOOrEhE70+U0h7ZYAsUN1C0/KieVPhz7cevly5PTfoLAyaQf2lV7vzpac//
-O8a0NvbuE4sYQFxKX+xf1brVf2r4jxy/3wIWoZsAtuUYttOFzkYaXKHfg5Df1Xgb
-rDYAOq+Qw8e8DOqb2Dhb7rapapUUS02C3wRJJ+x+PF32bzCJgMPNF1NsEby5QNQ2
-dIQ6UJ0O0Qn1zBpd2dy3Q+wSrzwfosjQNLllP9y/w+H0kz9vtrxstC/VMe8CNqbe
-SPgPj7Hh1c+LCl5f3g+9xqihDyS24uSdEoeRoTG8MUEjhkrUeb+aW23jpLqWHtk=
-=gOBG
+iQEcBAEBCgAGBQJPFWLTAAoJEO+t9ga+3I3akbQIALVrTBb10sFILzM8TWYZafoA
+U0khbIWuW9awFI27rjAq7WvunW3PGPZvecGXTCdjj3nLnuDNvnwZK7e70oAgYn7w
+FNoLoE0NUxfbY+FWrXCxNzZdMrzzuZsj8F4ACdu3dQdslFhBBdmK9ffOU00oEWQy
+pH/n7uTzfbvE5mYjz/il1+ypnvi3MRXE8OArq+QrmKPTVoe71Q/9iCx43YNxIZyv
+9fHLAln5wovfjGuT5v1Nclb4T/m/+2WVvqgA+Xd02bBU+ic/p750PqWWLkg3YoN4
+wmuHlCTxkB0ZHWRNIt78QBdaLcYz4/mZwLauOjmipSf27ddtFtX6v6sAyy9yz1U=
+=M8jp
 -----END PGP SIGNATURE-----
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"