gentoo resync : 01.12.2017

5 files changed, 2 insertions, 106 deletions

diff --git a/kde-apps/libkleo/Manifest b/kde-apps/libkleo/Manifest
index 4c404e8c0c7c..405938f22940 100644
--- a/kde-apps/libkleo/Manifest
+++ b/kde-apps/libkleo/Manifest
@@ -1,8 +1,3 @@
-AUX libkleo-4.4.2017.04-gcc-6.3.patch 1575 BLAKE2B c2aef65309d81742396a5d51b3accc2d80e908c72b8c466a5de89afc9ae20c77b069a3f07d6a000b23753225ed9c169c65920ace9a39e1c83f04d401c3c8253c SHA512 3a9b362eacf51b57abbb3f89c60284bb9bd79d2c3bb211a62a2dac52b32f27288aec2189eecd60cd9b5d029047783514282fb29c027814df7c712ea2812adeb5
-DIST kdepim-4.4.2017.04.tar.xz 8964644 SHA256 943019fbf6e480761ccac4a1d54d71d5d38c88fd832e952cb03d73975f9a8535 SHA512 d00e288563975e38f1bf4d28ed4724a9e159fab8ca37a61039aea730d22cae0c7e9921e04423bbbe6a74ee19319c57f79139d3a2b5048985675f836fd5dc77ab WHIRLPOOL 1818df486e46f7345523360d05ab1d19b00906f1b51677010d0cd2f31ddd914c1e96c3a98837339882810f54b15fd4eb5063424863169decb68578100ae8049a
-DIST libkleo-17.04.3.tar.xz 290760 SHA256 78097d1b5332fd470474f2f1fa1170068a35fe962edc5ed0dbe74cd335c560ca SHA512 6d81d0474f890508a18486716ee3dc4e6e0d8ca7c4547a3ef85dc5f59a6f272975e4e33ff37997cfe1443dccf6bddd1c6b7e2ce269dfa443709bf0035c3859cc WHIRLPOOL 1efa1898db47ac83499981347a1110c937ae1a71b3727f595a5c32410847353eb95b3760309093606533334cefc1fa64b5f5d362b7078e12549f05edc42d068d
 DIST libkleo-17.08.3.tar.xz 291208 SHA256 67f90292be624073469d50374f7c2f71b300c787938a829098cfb683033bcedb SHA512 1b077fa9fdb56bd762cec5dfdf21a898de2a0ef24db79c0ae7ec9caa5f6af3a1d67e218a7b25fd879ef0d22a71448b888cdf6036da0ccdb041e1647520dbe11e WHIRLPOOL fc5e2d9183af8191190ab0070cb5fa20e25d5016ff5e764f1b48cf1a8edd2d31dfe1f1d9b1440667b44c63c330dc20cdc4c551ddea44a986162443b466a73f2f
-EBUILD libkleo-17.04.3.ebuild 736 BLAKE2B b5ecf7873521897059d6cf3cd9546dbbfb027734b25e1cb970a3fdc2a8c48060d1dc55fa885d339ef224c4f56cdb41fc58ca77bb3dd04bc94cd657855f72ad2d SHA512 7b0b83feedb065322d980a4e4e0ecd4a2c20043048a793e2de4ee7017f77b9b1998e8d04c5f23317bfef72890fbd4e621534fcc46eaf4b4511261598adb8284d
-EBUILD libkleo-17.08.3.ebuild 738 BLAKE2B 5629e2d0b5a333b655a5e904e354ddfeaa22f87396a01a9b63ad0ea005a87e5c0381668cad395a961ab1f59cbdfc8791a14029bd062bf414af6de50762cf0b6b SHA512 918f0a2947bd580cc325dd094b9c439cf826a339dfae1ddfc70dbcc16a8d52556a180cb25cd877a4196fded83214b658ecbfc2aae410b729804e61f20f92a34b
-EBUILD libkleo-4.4.2017.04.ebuild 586 BLAKE2B c52fbdebe02a3bfeff5455633314dd3e121b2a4da58b31f6bce0ced163c4567e2bf862a4b39491884f52c56d08374f948fd4a9a9aae179ef10bd84d01139746c SHA512 3044d0a8f521e833cff03a6d4acf52a53967bb7323bf02036d41bec07bd501627390bd082dc0274445c2fdbc266c4e5f48e280560e89b864e7d552189eb4aa12
+EBUILD libkleo-17.08.3.ebuild 736 BLAKE2B b5ecf7873521897059d6cf3cd9546dbbfb027734b25e1cb970a3fdc2a8c48060d1dc55fa885d339ef224c4f56cdb41fc58ca77bb3dd04bc94cd657855f72ad2d SHA512 7b0b83feedb065322d980a4e4e0ecd4a2c20043048a793e2de4ee7017f77b9b1998e8d04c5f23317bfef72890fbd4e621534fcc46eaf4b4511261598adb8284d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/libkleo/files/libkleo-4.4.2017.04-gcc-6.3.patch b/kde-apps/libkleo/files/libkleo-4.4.2017.04-gcc-6.3.patch
deleted file mode 100644
index 79023520d73d..000000000000
--- a/kde-apps/libkleo/files/libkleo-4.4.2017.04-gcc-6.3.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-commit 272601864851e4411421ffe7fce764e01b5b1bfa
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date:   Wed May 3 00:16:05 2017 +0200
-
-    libkleo: Fix build with GCC-6.3
-    
-    Thanks-to: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
-
-diff --git a/libkleo/backends/qgpgme/qgpgmekeylistjob.cpp b/libkleo/backends/qgpgme/qgpgmekeylistjob.cpp
-index 4d26eb8772..c9c4642c62 100644
---- a/libkleo/backends/qgpgme/qgpgmekeylistjob.cpp
-+++ b/libkleo/backends/qgpgme/qgpgmekeylistjob.cpp
-@@ -85,7 +85,7 @@ static QGpgMEKeyListJob::result_type list_keys( Context * ctx, QStringList pats,
-   if ( pats.size() < 2 ) {
-     std::vector<Key> keys;
-     const KeyListResult r = do_list_keys( ctx, pats, keys, secretOnly );
--    return make_tuple( r, keys, QString(), Error() );
-+    return boost::make_tuple( r, keys, QString(), Error() );
-   }
- 
-   // The communication channel between gpgme and gpgsm is limited in
-@@ -109,7 +109,7 @@ retry:
-       chunkSize /= 2;
-       if ( chunkSize < 1 )
-         // chunks smaller than one can't be -> return the error.
--        return make_tuple( this_result, keys, QString(), Error() );
-+        return boost::make_tuple( this_result, keys, QString(), Error() );
-       else
-         goto retry;
-     }
-@@ -119,7 +119,7 @@ retry:
-       break;
-     pats = pats.mid( chunkSize );
-   } while ( !pats.empty() );
--  return make_tuple( result, keys, QString(), Error() );
-+  return boost::make_tuple( result, keys, QString(), Error() );
- }
- 
- Error QGpgMEKeyListJob::start( const QStringList & patterns, bool secretOnly ) {
diff --git a/kde-apps/libkleo/libkleo-17.04.3.ebuild b/kde-apps/libkleo/libkleo-17.04.3.ebuild
deleted file mode 100644
index 2d25e4832ecb..000000000000
--- a/kde-apps/libkleo/libkleo-17.04.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Library for encryption handling"
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/gpgme-1.7.1[cxx,qt5]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-"
diff --git a/kde-apps/libkleo/libkleo-17.08.3.ebuild b/kde-apps/libkleo/libkleo-17.08.3.ebuild
index 1de7afaee0cd..2d25e4832ecb 100644
--- a/kde-apps/libkleo/libkleo-17.08.3.ebuild
+++ b/kde-apps/libkleo/libkleo-17.08.3.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="Library for encryption handling"
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 COMMON_DEPEND="
diff --git a/kde-apps/libkleo/libkleo-4.4.2017.04.ebuild b/kde-apps/libkleo/libkleo-4.4.2017.04.ebuild
deleted file mode 100644
index 54bbd999821b..000000000000
--- a/kde-apps/libkleo/libkleo-4.4.2017.04.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KMNAME="kdepim"
-QT3SUPPORT_REQUIRED="true"
-inherit kde4-meta
-
-DESCRIPTION="Library for encryption handling"
-HOMEPAGE="https://launchpad.net/~pali/+archive/ubuntu/kdepim-noakonadi"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="
-	$(add_kdeapps_dep kdepimlibs '' 4.14.10_p20160611)
-	app-crypt/gpgme
-"
-RDEPEND="${DEPEND}
-	!>kde-apps/kdepimlibs-4.14.11_pre20160211
-	app-crypt/gnupg
-"
-
-KMSAVELIBS="true"
-KMEXTRACTONLY="kleopatra/"
-
-PATCHES=( "${FILESDIR}/${P}-gcc-6.3.patch" )