gentoo resync : 21.05.2019

9 files changed, 11 insertions, 104 deletions

diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index e7b8a6c7bb5a..8a54a11c39f3 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index bc9d212bfc7c..72a99a01d7ba 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,6 +1,3 @@
-AUX kdiff3-0.9.98_p20170219-cli-args.patch 3620 BLAKE2B c85c377a8c5898a15233f5f4a1260dbd24c50f53869e673979c9d5ac42c2729a7cad39d066e0f4b6ae2f31687aa246c9420f1803c003168eb8e9b3bd7d43ed1b SHA512 5231791c4147a6e54d784fbb39d0088dedd22d15c77c91e293bccb42046417bb32d6354a5032f5da1daa60b3ef9a46800932092b0891c58bdbc0dd9592be7a41
-DIST kdiff3-0.9.98_p20170219.tar.xz 798588 BLAKE2B 6b9604f0f5cececa586fc2fadb7da1bdf060c114d1f644d95ace5d898eb3c62e3addc5c53a6b2e7b959411742b1f13b07bf05667dc32f793fa5faf16f52c4927 SHA512 847410bb6eb9ba19f4dab2d2a8c46c78a6c3c90a578df22bedad8d471902c8bf393c91d77050b68ad0f4e4a4cc1f7898ef11b66c1ddcb34e182506a43932df64
-DIST kdiff3-1.8.tar.xz 897716 BLAKE2B bd5ec9ad0db639905d88429204ffca88450957f052712e45168f2d4bae808f38e7fc543bcb4ff53632c018c44929364e0314ec681f3475b517d8482b9ae5cbb5 SHA512 f4d791f593eb75a4a5dbd567af31f01be0a372a4058e50e8ab34b29409cc162cab022f33c1db5527f04ae9e8f35d6b485ca7789c4cd955d745887c3439172940
-EBUILD kdiff3-0.9.98_p20170219-r1.ebuild 914 BLAKE2B 2575524af4656ebad0ca450a2ebf7039a3bd76128b14a6e9b0e9e08707ba79b4a7b328a9026ab5ebb5ac589f8539e750ce12a3a302d23e61334ba793618396ab SHA512 65821bcbcdec147a55c9b989cde2c45ea68bbf947436c890aaf3b3affc4dc0f293183f5036ac81b12e5d41e9e86cb6815edac3aff235eebaa5afa4ca93007d0c
-EBUILD kdiff3-1.8.ebuild 860 BLAKE2B 9c54a0e866d30f890710800b5d6778213fab6b2d323667e04d0be782260bdf4afd631d4946900e3871d1405209be00357232bb810c047e7af866882e3eff3e87 SHA512 4d8f87b38683d19f42323f8fa6db11c0ae6c8639ce2c7705ecc397569620865f66d920d21ecef12e77aa733aa0599911eec2c37a25189e671e6c3713ab1b5db9
+DIST kdiff3-1.8.1.tar.xz 897692 BLAKE2B cdc6020afcd6527d23bfbaf79d09840f3bb43949f1a195d51d9f2d9339d659047abbdebf1740954af9bb01d872dfda4d9113e8a23361f5d891108fc1ddb92e49 SHA512 09cddac0f3adffa91f1986dfb50982deb1c6a31c232215da8a2a396d7525b4d28ef6d3febdcd4ba89cf9f6371a7b34441ef4e10aa0e3468fadf95fb7f78d7720
+EBUILD kdiff3-1.8.1.ebuild 858 BLAKE2B 173e3604e8a1687f0eb7f781e805087b51c1a2ad65a3dcbef9cec3a946a235713a4c12db7c0305d886719da0f12119c719af74297a8d548a8cb5c62588dfbf14 SHA512 2c5ba21287fb4c766d0ab0582b09db4386e95f99a93d72cfaea889706a3aa593c526f97b90ce0d3be5f3c2932556b48655112698b3ec11cfecc46654555dcdda
 MISC metadata.xml 362 BLAKE2B 45686f239bfb936fe11982d8bd2b51380cdfef94c11e5a6fb224c030154bda8b27190052b1705e010fd22305dd2830b8f8b385b47fc647f7c80b2ec01a1f579a SHA512 1fb8f10c3632c0007e65be57dbeb2492ad0e90a79f0403ce4a350a6ea0e1764dd1ee5038b0381049a6715bab2d7c38fc83c0b8f338ea7958bb34df499f355100
diff --git a/kde-misc/kdiff3/files/kdiff3-0.9.98_p20170219-cli-args.patch b/kde-misc/kdiff3/files/kdiff3-0.9.98_p20170219-cli-args.patch
deleted file mode 100644
index 3312b504e58a..000000000000
--- a/kde-misc/kdiff3/files/kdiff3-0.9.98_p20170219-cli-args.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-commit b849851d3317903a8ab7c040966921384d9e6508
-Author: Peter Urbanec <git.user@urbanec.net>
-Date:   Thu May 11 16:09:12 2017 +1000
-
-    Implement most of the missing command line options
-    
-    A number of command line options were missing, which caused kdiff3 from
-    failing to work properly when used as the mergetool in git. In particular,
-    git relies on the -L group of options and without those it would fail.
-    
-    Signed-off-by: Peter Urbanec <git.user@urbanec.net>
-
-diff --git a/src/main.cpp b/src/main.cpp
-index 3549c92..fed486d 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -67,24 +67,23 @@ int main(int argc, char *argv[])
-     parser.addOption(QCommandLineOption(QStringList()<<QStringLiteral("b")<<QStringLiteral("base"),i18n("Explicit base file. For compatibility with certain tools."),QStringLiteral("file")));
-     parser.addOption(QCommandLineOption(QStringList()<<QStringLiteral("o")<<QStringLiteral("out")<<QStringLiteral("output"),i18n("Output file. Implies -m."),QStringLiteral("file")));
-     parser.addOption(QCommandLineOption(QStringLiteral("auto"),i18n("No GUI if all conflicts are auto-solvable. Needs -o file.")));
-+    parser.addOption(QCommandLineOption(QStringLiteral("qall"),i18n("Don't solve conflicts automatically.")));
-+    parser.addOption(QCommandLineOption(QStringLiteral("L1"),i18n("Visible name replacement for input file 1 (base)."),QStringLiteral("alias1")));
-+    parser.addOption(QCommandLineOption(QStringLiteral("L2"),i18n("Visible name replacement for input file 2."),QStringLiteral("alias2")));
-+    parser.addOption(QCommandLineOption(QStringLiteral("L3"),i18n("Visible name replacement for input file 3."),QStringLiteral("alias3")));
-+    parser.addOption(QCommandLineOption(QStringList()<<QStringLiteral("L")<<QStringLiteral("fname"),i18n("Alternative visible name replacement. Supply this once for every input."),QStringLiteral("alias")));
-+    parser.addOption(QCommandLineOption(QStringLiteral("cs"),i18n("Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\""),QStringLiteral("string")));
-+    parser.addOption(QCommandLineOption(QStringLiteral("confighelp"),i18n("Show list of config settings and current values.")));
-     parser.addPositionalArgument(QStringLiteral("file1"), i18n("File1 to open (base, if not specified via --base)."));
-     parser.addPositionalArgument(QStringLiteral("file2"), i18n("File2 to open."));
-     parser.addPositionalArgument(QStringLiteral("file3"), i18n("File3 to open (optional)."));
- 
--    aboutData.setupCommandLine(&parser);
--    parser.process(app);
--    aboutData.processCommandLine(&parser);
--
- // TODO KF5
--//    options.add( "qall",        ki18n("Don't solve conflicts automatically.") );
--//    options.add( "L1 alias1",   ki18n("Visible name replacement for input file 1 (base).") );
--//    options.add( "L2 alias2",   ki18n("Visible name replacement for input file 2.") );
--//    options.add( "L3 alias3",   ki18n("Visible name replacement for input file 3.") );
--//    options.add( "L" ).add( "fname alias", ki18n("Alternative visible name replacement. Supply this once for every input.") );
--//    options.add( "cs string",   ki18n("Override a config setting. Use once for every setting. E.g.: --cs \"AutoAdvance=1\"") );
--//    options.add( "confighelp",  ki18n("Show list of config settings and current values.") );
- //    options.add( "config file", ki18n("Use a different config file.") );
- 
-+    aboutData.setupCommandLine(&parser);
-+    parser.process(app);
-+    aboutData.processCommandLine(&parser);
- 
-     KDiff3Shell *p = new KDiff3Shell(&parser);
-     p->show();
diff --git a/kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild b/kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild
deleted file mode 100644
index 3e8593f0cfef..000000000000
--- a/kde-misc/kdiff3/kdiff3-0.9.98_p20170219-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Frontend to diff3 based on Qt/KF5"
-HOMEPAGE="http://kdiff3.sourceforge.net/
-https://cgit.kde.org/scratch/thomasfischer/kdiff3.git/log/?h=kf5"
-SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	$(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 kparts)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtwidgets)
-"
-RDEPEND="${DEPEND}
-	!kde-misc/kdiff3:4
-	sys-apps/diffutils
-"
-
-PATCHES=( "${FILESDIR}/${P}-cli-args.patch" )
diff --git a/kde-misc/kdiff3/kdiff3-1.8.ebuild b/kde-misc/kdiff3/kdiff3-1.8.1.ebuild
index 85263eb39dbe..f78a6bf8684b 100644
--- a/kde-misc/kdiff3/kdiff3-1.8.ebuild
+++ b/kde-misc/kdiff3/kdiff3-1.8.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://userbase.kde.org/KDiff3"
 SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
diff --git a/kde-misc/kio-gdrive/Manifest b/kde-misc/kio-gdrive/Manifest
index a06f9bbc9259..a13b56d5996e 100644
--- a/kde-misc/kio-gdrive/Manifest
+++ b/kde-misc/kio-gdrive/Manifest
@@ -1,3 +1,3 @@
-DIST kio-gdrive-1.2.5.tar.xz 45784 BLAKE2B 13ab7370f27694b1e9423ef9975ec17361893196f65369339ac2adc844ee7ce015ea8814eb1cf3abce50f3513ea97a612cd1f9fbe2d84f875e6245acfeda5fe0 SHA512 4aea167f756b8cd24a429ea46a73353fc7cc76fa844f4317e6a90b696165f110913a56334a75e0b5e522a892ea31d085d56928e4abf0286c4caadcdc7cfe41d3
-EBUILD kio-gdrive-1.2.5.ebuild 1050 BLAKE2B be7f2206ff25b3bf88c0053144140f22e738eefee1bb86ea2ed0b49750ad717c368caaea2a86a5735d7ba27afc28aa8774f8e48fcb862b0f96b7f82b749e262b SHA512 00ba2e3fd2898a822a5f940c019950b868314b804451855464321a8bd6bf64785249fe87f06fab2311d2756f4eb66324feed46528124a3a0462c825297540111
+DIST kio-gdrive-1.2.6.tar.xz 46464 BLAKE2B 266245d0e640627ff98e33719d668b6e0b310ca17dd87106906ac9fe41294ce5722965c40695d1068e6d6e04c8746b79fecc8bf510c5e2f6e24d17871eb00fa1 SHA512 10a1d7a18d2fed5864543951a512a758eaed8f31bcd7130257bf7d3e66e88d477e3349d9337ee0c5f3437eaa7b93d020f51ff063b940387137d872f6e5fca3f0
+EBUILD kio-gdrive-1.2.6.ebuild 1059 BLAKE2B f3f25464d9b9e5981a0627d70386658acda2dcbc50f740e4278e6efc565d1af61e309eed381861a3ad3da825835aaec924693d3df292de935cc6adfa42840387 SHA512 17a55066e692bd50c8b5511b8a02b3fa97fd5a6de42f3309f109799caf04b755972f26e250f38f71581542eefe922f9629427543d0dd9db31bca16187726e3ed
 MISC metadata.xml 402 BLAKE2B 80f60bca3fa59b7e22727709066453e1002c786c2eda688aa437f86fd99d73aa4b8c35a22571d3f774c55d16b1a4267fb0242253fd38a45890701755cca72afa SHA512 2c94ff5a07cb0a89d93cf798ee2b9a9f163f448e9d6d3185c06d58b42c1a9ef480adfafd540a021d4f9ebab6bb78e979c74e9a83867abff13f66b2b35eaafd21
diff --git a/kde-misc/kio-gdrive/kio-gdrive-1.2.5.ebuild b/kde-misc/kio-gdrive/kio-gdrive-1.2.6.ebuild
index 48b418390bb6..fcd6cec88d40 100644
--- a/kde-misc/kio-gdrive/kio-gdrive-1.2.5.ebuild
+++ b/kde-misc/kio-gdrive/kio-gdrive-1.2.6.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="optional"
@@ -30,11 +30,11 @@ COMMON_DEPEND="
 DEPEND="${COMMON_DEPEND}
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtnetwork)
-	dev-util/intltool
 "
 RDEPEND="${COMMON_DEPEND}
 	kaccounts? ( $(add_kdeapps_dep kaccounts-providers) )
 "
+BDEPEND="dev-util/intltool"
 
 DOCS=( README.md )
 
diff --git a/kde-misc/kshutdown/Manifest b/kde-misc/kshutdown/Manifest
index e6c49266b3f6..adf7897bea22 100644
--- a/kde-misc/kshutdown/Manifest
+++ b/kde-misc/kshutdown/Manifest
@@ -1,5 +1,5 @@
 DIST kshutdown-source-4.2.zip 463140 BLAKE2B b398a004e91ebfa7651eed7bfffeccfc1cb332868ff3bbcea50ccd40088084ff1079d73ee2c922c8e882c0d39e1c6bc2741d0b416b5a2742eb5c6686b03f29a5 SHA512 00d4a5c1c8efdac0d86009bc0218a673435ca315f3b4fa949af414bf525ff65088f26edb0ed0d9fd2209ea81d58619efcffa5091d49bd2b841ddd4749b05a21f
-DIST kshutdown-source-4.99-beta.zip 455309 BLAKE2B 90a1eed9a8435c695f04bdf00facf48be63dc60e2f80169e91076fe6fac1c8d58502778fc7af7228786d594da1d9e00832251c80f6517abd6c0efc80383be9ba SHA512 4314fd91a262096a740d094244bee173777b87e05b10a14a2b0c54839bfb346fb1b585217c86bce851442dfcbc1557451540d3821a80b2fa89742b4713282793
+DIST kshutdown-source-5.0.zip 454848 BLAKE2B 481cafbf5bd3831088ec9168b6eb82e342106b9b570279b6b8ca1db1f2df8c5640b3942f76032559396b504903b18fe106eb940e81822472a63f235e1a004644 SHA512 7a3920315db142f150227e624fa4a765966ec8367a08686214cb072d94a62d24f3a22fbef8fc84411d385be935102cf85df1b001b2922399455cc320c1e0f0db
 EBUILD kshutdown-4.2.ebuild 1111 BLAKE2B 464b8451249ee35b987d175c5fca37b446084c789f1af1d6338d1988af70660f2660427838a35881f876b22cd893d5565f79da386828a2ca2771509be2b97c31 SHA512 b4e900b61414ead4f471c0a682bef779dd8fd061f296de3ed57180db777dd01bc772780eff45c34af74205ed02788c4cb91c276e6a4069a8ca337d746e50c328
-EBUILD kshutdown-4.99_beta.ebuild 1087 BLAKE2B 33c6712775e63f677bb8b218bcf01c59e2b88cda506fa473d55f224a536ad6dd22b5f147e93a10a30c2bc9ad4c3d04fa3e326ef7ecf7d74ee0416570083951a3 SHA512 80536137273b307bc8c9505b1aeab578016521b6d36dff6a92918d4bc85b55fb13c97865a95c8463a29f316a06687dfb92ea854fe37a581dfc6ea384f3e4c86f
+EBUILD kshutdown-5.0.ebuild 1058 BLAKE2B 9b7a7e3ed7bf3cb790d1e44bfc32eb4e469146c5b7ad20c65ac28b329539b167eddd7f106dc5d2e6db955e6650c1258f75cd6ddca5abde6fd61071e822d7a1af SHA512 be42bd278ae5241a3dd38828aa12814f507afae0087a5b2177978c7febbfdc0ef3f346924be6bed360ac82ddfe320861621050a5bbaa77fd96a81a5a6b80381a
 MISC metadata.xml 328 BLAKE2B 7fca7d8d10232412fe198ba6c48e27ff6e1f45574255cd0b386f05264822a8bfe84a77f12b5104682d2188f51c230baf6cc6180b50249634cb5bc7bcc0cfa946 SHA512 b26f71d9d8119e82c3f395850e2309f97edc6c7fbb201387ff0bd03c7241b3262218dd5baea6a438b649ee3c13d4061531b0234471c3d8b4b8349e658d5bd775
diff --git a/kde-misc/kshutdown/kshutdown-4.99_beta.ebuild b/kde-misc/kshutdown/kshutdown-5.0.ebuild
index 87f43f1e7257..252085d32a67 100644
--- a/kde-misc/kshutdown/kshutdown-4.99_beta.ebuild
+++ b/kde-misc/kshutdown/kshutdown-5.0.ebuild
@@ -9,7 +9,7 @@ inherit kde5
 
 DESCRIPTION="Shutdown manager for desktop environments like KDE Plasma"
 HOMEPAGE="https://kshutdown.sourceforge.io"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-source-${PV/_/-}.zip"
+SRC_URI="mirror://sourceforge/${PN}/${PN}-source-${PV}.zip"
 
 LICENSE="GPL-2+"
 KEYWORDS="~amd64 ~x86"
@@ -42,8 +42,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${P/_/-}"
-
 src_configure() {
 	local mycmakeargs=(
 		-DKS_PURE_QT=$(usex !kde)