gentoo resync : 09.03.2018

5 files changed, 3 insertions, 111 deletions

diff --git a/kde-apps/akregator/Manifest b/kde-apps/akregator/Manifest
index b36152e60bde..20cf283fe86b 100644
--- a/kde-apps/akregator/Manifest
+++ b/kde-apps/akregator/Manifest
@@ -1,9 +1,6 @@
 AUX akregator-17.12.2-crashfix.patch 383 BLAKE2B c50546f9897bdccf1bddc00e51d6068282fa4eb04a9ea81f8ef8f566158a013c01ff3607504af2a6bcd1f026415fe8f6274b2268b608caf0a48c8d98b51833ea SHA512 df344cde73e4dd1813214bc3dcd4624661bdd53f2174d8dffb5fd222c10133d83f678f0cac68c84dea21dc09888a8f120cd23b3c6d1f34e320b5af51fa0e3dd1
-AUX akregator-17.12.2-feedlist-corruption.patch 475 BLAKE2B ad57eea2e690f1bf93a47cbd1503e0f40434f8dc22c3e2b63ec9d9758878dc458b6fafb8934c4d3138d5a1229c42aa5d6df8cc0aa7ceaac74429b07918f8f0f9 SHA512 80d6a86eb93bc827f854d2ba9aac666d0a3e1a990df2018e8387da65204ff6edce280b670d4858504da77c642c006c4b9f36898bf8d0b640048f27fa93cad4d9
-AUX akregator-17.12.2-slotSaveFeedList-not-twice.patch 643 BLAKE2B b3eace1fdec71ec42d4a7b4852a6bc6ca7253dac0467794f04fd3f9b2ddc79d6c6849dfed633efe424cfadf48c4085082ba0d98b88a47f04811582ce142046d4 SHA512 97139b83884a6bac61e0df68b4ebd612c8dcd4eab8eebb006c0aebaf539fd531b1b4d9483a5f501bed757fb6d8971d810d06309329d98d0c50e8e91d68d394f4
 DIST akregator-17.08.3.tar.xz 2248228 BLAKE2B a0542cc6a29f14af066507a64a1b5f70c8b95345bf2245d124c7e1b55c39e67e81d87e1b929a96ceb41947fb98cfa14fb3b0bc2654ead5f5516245fa7949fb78 SHA512 1415eea92cd26d6aa39e373d4177b09739479cb8f168f16ffaede7abf47c5a3b5a2e349bb583428ee210a44736cc4d27dde60fab69edf56e0621062512169ca5
-DIST akregator-17.12.2.tar.xz 2252928 BLAKE2B 6a0c2f5f9cc6b38c47b860fee9db7bb80614a24b45521502a5e380700c0e15e70bf9c408a4aac4f7cd9826bd06c8372f9d4bf27ce48fe95b84d8e7f61380a86e SHA512 29ce5481566eba58d78a8fa9ce7c0c048d74a7bf316efa78d72f2b873a5616d62d0c1fc8ae82380848aa44a8408b6483174d963fd599894d3796d078189cefc0
+DIST akregator-17.12.3.tar.xz 2251784 BLAKE2B b5adb96501b6226817b6aa29a55f47f34d0dc85bacf68d4b971e9c2688a12c9f5ba24b274a5f154ceb2549a3558359cf97fbff176a2af9ac2abb4e6abdee5f89 SHA512 dc047fdedfba0f45b9822378352ae57e8b1ddef6712e669868be65f6820da46ec601483e1ff6b509b84fde236faea2a8fb4317bfd88cbd641e2d7af034a8452b
 EBUILD akregator-17.08.3.ebuild 1510 BLAKE2B 8e9d46795002a181292daecae419209482ea2b8bf1a6aa512acdc8b0c8123de6620fa56e33e98096271ef8b237a0135ea94083761ea5ab0e734f646ecd7c56be SHA512 12851a81aad27b10ec955597b38252f12637e28b75979d20823658adec4c463145cec01f2c300e5417fa27038924228e8d8bb680b4b65ba38c0029a3bc019a80
-EBUILD akregator-17.12.2-r2.ebuild 1587 BLAKE2B 629867fa48184fba6521b44c656354001c80d0888be04f6af883aa16104ec25167ad65f4b70a668a36d14ac4d8014298f13fa5bd8d7f68a5ac18c808a87568b7 SHA512 a6c6e8d86714056cd79c25cee6295e0c95ab3bc706e4508964c793ba03256e44d4f54689853496dd505c6343fa45b04e17535e4ff6e50666083fd96ec9b205b4
-EBUILD akregator-17.12.2.ebuild 1534 BLAKE2B efd7e37b21b7c31c6c253d1c9926d25ec97a0846265241bed056eb6843a5ff0ced18a3a6235706405d849b3beb6d2b59a7d2f79680844e9e013847153b145102 SHA512 4fb26ba97cfbdcb96f8de565f8cf0606ad1dd820af6d87ee72289cdb3254d56b846560f344c0b7266f61bc13288b0449337fc59ac41cec7c1d5b5a56bfe09474
+EBUILD akregator-17.12.3.ebuild 1496 BLAKE2B 279651b4549fa9d2565b38e7a611139fade8e73f5b4ae7eb35aa4fec13ebe51b5511f7f1c1cb88002d1dddc714f3333de7d0ae017dc7becb5960143353fc208f SHA512 cca7160091fa046dbe3dfbc852ac87c0983f4689a2b2fe01be599426797d627089bd970015998916b9618755ce4eb2118a7a7cd74d429701afecc2cb6c3416dd
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/akregator/akregator-17.12.2-r2.ebuild b/kde-apps/akregator/akregator-17.12.2-r2.ebuild
deleted file mode 100644
index bc2dc79176ca..000000000000
--- a/kde-apps/akregator/akregator-17.12.2-r2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-inherit kde5
-
-DESCRIPTION="News feed aggregator"
-HOMEPAGE="https://www.kde.org/applications/internet/akregator"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_kdeapps_dep grantleetheme)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_kdeapps_dep syndication)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebengine)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/grantlee:5
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-crashfix.patch"
-	"${FILESDIR}/${P}-feedlist-corruption.patch"
-	"${FILESDIR}/${P}-slotSaveFeedList-not-twice.patch"
-)
diff --git a/kde-apps/akregator/akregator-17.12.2.ebuild b/kde-apps/akregator/akregator-17.12.3.ebuild
index a9886e67a926..9d2cb6d441c0 100644
--- a/kde-apps/akregator/akregator-17.12.2.ebuild
+++ b/kde-apps/akregator/akregator-17.12.3.ebuild
@@ -54,7 +54,4 @@ RDEPEND="${COMMON_DEPEND}
 	!kde-apps/kdepim-l10n
 "
 
-PATCHES=(
-	"${FILESDIR}/${P}-crashfix.patch"
-	"${FILESDIR}/${P}-feedlist-corruption.patch"
-)
+PATCHES=( "${FILESDIR}/${PN}-17.12.2-crashfix.patch" )
diff --git a/kde-apps/akregator/files/akregator-17.12.2-feedlist-corruption.patch b/kde-apps/akregator/files/akregator-17.12.2-feedlist-corruption.patch
deleted file mode 100644
index eefd844460a3..000000000000
--- a/kde-apps/akregator/files/akregator-17.12.2-feedlist-corruption.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/akregator_part.cpp b/src/akregator_part.cpp
-index 94a4e00..3d2d778 100644
---- a/src/akregator_part.cpp
-+++ b/src/akregator_part.cpp
-@@ -514,6 +514,11 @@ void Part::slotSaveFeedList()
-     if (!m_standardListLoaded) {
-         return;
-     }
-+
-+    QSharedPointer<FeedList> f_list = m_mainWidget->allFeedsList();
-+    if (f_list.isNull()) {
-+	return;
-+    }
- 
-     // the first time we overwrite the feed list, we create a backup
-     if (!m_backedUpList) {
-
diff --git a/kde-apps/akregator/files/akregator-17.12.2-slotSaveFeedList-not-twice.patch b/kde-apps/akregator/files/akregator-17.12.2-slotSaveFeedList-not-twice.patch
deleted file mode 100644
index c504e90cb5d9..000000000000
--- a/kde-apps/akregator/files/akregator-17.12.2-slotSaveFeedList-not-twice.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 6dcc0769f61e38580b70a5c29db0d9920f263c6e Mon Sep 17 00:00:00 2001
-From: Laurent Montel <montel@kde.org>
-Date: Tue, 13 Feb 2018 07:28:44 +0100
-Subject: Don't call it twice
-
----
- src/akregator_part.cpp | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/akregator_part.cpp b/src/akregator_part.cpp
-index 94a4e00..2073dce 100644
---- a/src/akregator_part.cpp
-+++ b/src/akregator_part.cpp
-@@ -324,7 +324,6 @@ void Part::slotOnShutdown()
-     m_autosaveTimer->stop();
-     if (m_mainWidget) {
-         saveSettings();
--        slotSaveFeedList();
-         m_mainWidget->slotOnShutdown();
-     }
-     //delete m_mainWidget;
--- 
-cgit v0.11.2
-