gentoo resync : 17.10.2017

4 files changed, 0 insertions, 249 deletions

diff --git a/kde-frameworks/kio/Manifest b/kde-frameworks/kio/Manifest
index 9c0f71f046b0..03f0289acb25 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -1,11 +1,7 @@
 AUX kio-5.37.0-tests.patch 1399 SHA256 80b9e50c877228c1d0f4f448f30901a4afaf87e27175f4ccddb8b46b6f35b37d SHA512 a894886d400719ef8b11e83454be55406e2cd677da8cdbfd822e5155945198f54c4b2aed8c92b702fa7c8f858020c5e7c481719317513735c9538f0da5963221 WHIRLPOOL 373d27a387e51d0b4f5b99f9ed57d4e6e7b8be67fb9734b6b6153e63e5296ee4b789425d32b26681616dd5505baf1691bf3a9cf5e58ef521c23d295078f3666d
-AUX kio-5.38.0-kioexec.patch 3477 SHA256 9f1a8340403f6464892c92b5fe08aa4f09347693042726e072ea6b2d02a73c29 SHA512 541022aa531aebfbf7dcaed8599dfc1c41fe1a2b0d8a8328a3f14f651fcb6791d13bc4b273a597711a83233fd30750c6311526c9e902337e3d1c3b49ab5e855b WHIRLPOOL 9e24afc1b68f02131ff1106758cc9a0e8b3e89bf0ef812430da29bebaff5611c7c8a1d934d575afa770a034035ceb65dd5a0abe259f925a9f4dfe17998a2e04b
 DIST kio-5.37.0.tar.xz 3084204 SHA256 49448ebcfe182805f8f9cd40c1e2c8e686578cc2e7fa3688204d5ca4e182ac5b SHA512 42b2cbf6cbc414a0b69fdb36984d13574b1aee033170761dc55835cace44abead82f387f8afb35d8a82ee93a1909854ef43cff29d45c5881c4b13ca8862d2a64 WHIRLPOOL 649b16ebf5708d410d826a70726a9fdfd3668e00784246e7cb4d193b1951525e821046121886580bc16004280170277ac0344d1ee18afb91722e095118b1ccd6
-DIST kio-5.38.0.tar.xz 3086436 SHA256 f43ab29c0ab51c78bd323e57fa6bba4aedf2d26d70df973b7ef7c80c9fc81597 SHA512 7a35c20d220308f329ba496cabc71f4be44debab09591c3301533ddc348a88bb928f5220ede8500f70fd6f8b50a77ae99877f4ca9544be149e3eb1b7ed785611 WHIRLPOOL ede2c160e5216dba084f3b475744c780b22095032d60e463f9891f85f6ba98df337b6af82426f46d8c1c47857726e79925172a903ea1de033138d3cb4a40925a
 DIST kio-5.39.0.tar.xz 3093732 SHA256 96cbea5aba34b4e1b0df5ecfb4aaf65ff324341fb00f99796146536557232f24 SHA512 18e87ba62610c1aa1a3281642cda627407ff0c0cc5eedbd990bb58721271442a3aad7db58b3d808ce977400ca3dd9d64792feb64f5746c54e2d3ee8ad2820d8e WHIRLPOOL 3c2f2e3c76d64f687e3ebdbafa8b0feee9be3fbcc45d7952b509af041b6b404a2eefec1583122a9a17459bbfcd996e17c16031c7790a28a3db2462e498db381f
 EBUILD kio-5.37.0.ebuild 1948 SHA256 30b44f31ba80d84a49e1246d618d9ee2061da567b9033cd73bba712383d0771b SHA512 214a136ca904777793d39ad7d88ac9e60df3a253dcb76aea6782b27a4caee9f9581e64d1ddc9793887152661b875092efe09587199e24171bbdf6259f762416c WHIRLPOOL d7c12619348fcc1e5f5ffcc2fee92fa62c8abc67bd23d1f5678f947b5c63466cb53aa5245689448b9f73734d5f68fba580520aacb166e49d00c9c5a9cab935e0
-EBUILD kio-5.38.0-r1.ebuild 1942 SHA256 d94969ff3ef50d994cc499bdb444cf493870917c932f4f2825769e0f1403ae7b SHA512 8461d141fe9700d039e8ab6d5ec8f83668e16e4bcf14530e93ebb217240e39e20df9db798354c8565b88dc82279c4eda806b6f4eebc9845bfadc2bcdc6b3535d WHIRLPOOL a36addf8ce324782c839cf33bf76507047a69c0ca91d30c375219b98c372976cf7573b52b1b08b492b398dfe1b280f5fb91babf168e2bcb78e8936bf856ead4d
-EBUILD kio-5.38.0.ebuild 1896 SHA256 0b63d98e1b6445bdd73276dd01816256bde3deda3b354cb0c1002cf906119c4a SHA512 594849f0a48a4c6f3b8cb3255e9dca8f9e1fd4e798125a026f101d05a8779d5782aec991e68a1fa6447f758e5b63c15a8677458b48c8d666e8a1c3ccc161355c WHIRLPOOL 636837fdec548575f4752f0b3f9c2a946d207b64e68227ceb91c7caf0b490c6f7cbdc11dd02d897d5c150118798243bc90c3906a933affeafef28d7a25270699
 EBUILD kio-5.39.0.ebuild 1896 SHA256 0b63d98e1b6445bdd73276dd01816256bde3deda3b354cb0c1002cf906119c4a SHA512 594849f0a48a4c6f3b8cb3255e9dca8f9e1fd4e798125a026f101d05a8779d5782aec991e68a1fa6447f758e5b63c15a8677458b48c8d666e8a1c3ccc161355c WHIRLPOOL 636837fdec548575f4752f0b3f9c2a946d207b64e68227ceb91c7caf0b490c6f7cbdc11dd02d897d5c150118798243bc90c3906a933affeafef28d7a25270699
 MISC ChangeLog 9546 SHA256 9e17967bd3565b198168d6dc021f277520a13ded7350b2dd5a73ee6fd79efa7f SHA512 0b58325a8275e41361a01a7d6a1103ddee403b132a8e4b913e0ca64c95cbe5e031a97814ceed61938a060bad7a827df65bc979b96eb2215543e20b4d894fa34d WHIRLPOOL 45126966e1717a335cf2d9ca0619dc8e6768b9d13e2464c6ffb332fa533edfd6b333e0750934ceb4a68e5b4df344df1bfc7ba2e003ce446d839531fec0e97acd
 MISC ChangeLog-2015 2347 SHA256 b66a1e5fa0700a2221f65c2867d57fed1bb029f534bec846640e9c302f316d9f SHA512 08b698d93c23584f1608bc51a7099278b149239ae0e5213063435587be29ca6e91e4584a9b08c1be4cc878fc561ca679267343a41374382d44ba6c9b29c3fa41 WHIRLPOOL 7992ab13bbb1831b3ed32cb5fe50d27bd3738ec8af3e94b9bb5441740c41d087f1f13a1ae3b1ec05f77e11aa21012b313713e0f933fe5a39c9b2cb6b65b2257f
diff --git a/kde-frameworks/kio/files/kio-5.38.0-kioexec.patch b/kde-frameworks/kio/files/kio-5.38.0-kioexec.patch
deleted file mode 100644
index 1cf2a1bfb834..000000000000
--- a/kde-frameworks/kio/files/kio-5.38.0-kioexec.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From c76c1486ec79e8a16329207e9b293eed1244adfb Mon Sep 17 00:00:00 2001
-From: Jonathan Marten <jjm@keelhaul.me.uk>
-Date: Mon, 25 Sep 2017 08:56:04 +0100
-Subject: kioexec: Watch the file when it has finished copying
-
-To eliminate a spurious "The file has changed, do you want to upload
-it?" dialogue.
-
-BUG:384500
-
-Differential Revision: https://phabricator.kde.org/D7841
----
- src/kioexec/main.cpp | 49 +++++++++++++++++++++++++++----------------------
- 1 file changed, 27 insertions(+), 22 deletions(-)
-
-diff --git a/src/kioexec/main.cpp b/src/kioexec/main.cpp
-index 6b0ec1d..615dfbf 100644
---- a/src/kioexec/main.cpp
-+++ b/src/kioexec/main.cpp
-@@ -118,11 +118,6 @@ KIOExec::KIOExec(const QStringList &args, bool tempFiles, const QString &suggest
-                 KIO::Job *job = KIO::file_copy(url, dest);
-                 jobList.append(job);
- 
--                // Tell kioexecd to watch the file for changes.
--                OrgKdeKIOExecdInterface kioexecd(QStringLiteral("org.kde.kioexecd"), QStringLiteral("/modules/kioexecd"), QDBusConnection::sessionBus());
--                kioexecd.watch(file.path, file.url.toString());
--                mUseDaemon = !kioexecd.lastError().isValid();
--
-                 connect(job, &KJob::result, this, &KIOExec::slotResult);
-             }
-         }
-@@ -141,25 +136,35 @@ KIOExec::KIOExec(const QStringList &args, bool tempFiles, const QString &suggest
- 
- void KIOExec::slotResult(KJob *job)
- {
--    if (job && job->error()) {
--        // That error dialog would be queued, i.e. not immediate...
--        //job->showErrorDialog();
--        if ((job->error() != KIO::ERR_USER_CANCELED))
--            KMessageBox::error(nullptr, job->errorString());
--
--        QString path = static_cast<KIO::FileCopyJob*>(job)->destUrl().path();
--
--        QList<FileInfo>::Iterator it = fileList.begin();
--        for (; it != fileList.end(); ++it) {
--            if (it->path == path) {
--                break;
-+    if (job) {
-+        KIO::FileCopyJob *copyJob = static_cast<KIO::FileCopyJob *>(job);
-+        const QString path = copyJob->destUrl().path();
-+
-+        if (job->error()) {
-+            // That error dialog would be queued, i.e. not immediate...
-+            //job->showErrorDialog();
-+            if ((job->error() != KIO::ERR_USER_CANCELED))
-+                KMessageBox::error(nullptr, job->errorString());
-+
-+            auto it = std::find_if(fileList.begin(), fileList.end(),
-+                                   [&path](const FileInfo &i) { return (i.path == path); });
-+            if (it != fileList.end()) {
-+                fileList.erase(it);
-+            } else {
-+                qDebug() <<  path << " not found in list";
-             }
-         }
--
--        if (it != fileList.end()) {
--            fileList.erase(it);
--        } else {
--            qDebug() <<  path << " not found in list";
-+        else
-+        {
-+            // Tell kioexecd to watch the file for changes.
-+            const QString dest = copyJob->srcUrl().toString();
-+            qDebug() << "Telling kioexecd to watch path" << path << "dest" << dest;
-+            OrgKdeKIOExecdInterface kioexecd(QStringLiteral("org.kde.kioexecd"), QStringLiteral("/modules/kioexecd"), QDBusConnection::sessionBus());
-+            kioexecd.watch(path, dest);
-+            mUseDaemon = !kioexecd.lastError().isValid();
-+            if (!mUseDaemon) {
-+                qDebug() << "Not using kioexecd";
-+            }
-         }
-     }
- 
--- 
-cgit v0.11.2
-
diff --git a/kde-frameworks/kio/kio-5.38.0-r1.ebuild b/kde-frameworks/kio/kio-5.38.0-r1.ebuild
deleted file mode 100644
index d20326004dfc..000000000000
--- a/kde-frameworks/kio/kio-5.38.0-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing transparent file and data management"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="acl +handbook kerberos +kwallet X"
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork 'ssl')
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/libxml2
-	dev-libs/libxslt
-	acl? (
-		sys-apps/attr
-		virtual/acl
-	)
-	kerberos? ( virtual/krb5 )
-	kwallet? ( $(add_frameworks_dep kwallet) )
-	X? ( $(add_qt_dep qtx11extras) )
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtconcurrent)
-	handbook? ( $(add_frameworks_dep kdoctools) )
-	test? ( sys-libs/zlib )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXrender
-		x11-proto/xproto
-	)
-"
-PDEPEND="
-	$(add_frameworks_dep kded)
-"
-
-# tests hang
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${P}-kioexec.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package acl ACL)
-		$(cmake-utils_use_find_package handbook KF5DocTools)
-		$(cmake-utils_use_find_package kerberos GSSAPI)
-		$(cmake-utils_use_find_package kwallet KF5Wallet)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kio/kio-5.38.0.ebuild b/kde-frameworks/kio/kio-5.38.0.ebuild
deleted file mode 100644
index 4c595b88b638..000000000000
--- a/kde-frameworks/kio/kio-5.38.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing transparent file and data management"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="acl +handbook kerberos +kwallet X"
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork 'ssl')
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/libxml2
-	dev-libs/libxslt
-	acl? (
-		sys-apps/attr
-		virtual/acl
-	)
-	kerberos? ( virtual/krb5 )
-	kwallet? ( $(add_frameworks_dep kwallet) )
-	X? ( $(add_qt_dep qtx11extras) )
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtconcurrent)
-	handbook? ( $(add_frameworks_dep kdoctools) )
-	test? ( sys-libs/zlib )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXrender
-		x11-proto/xproto
-	)
-"
-PDEPEND="
-	$(add_frameworks_dep kded)
-"
-
-# tests hang
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package acl ACL)
-		$(cmake-utils_use_find_package handbook KF5DocTools)
-		$(cmake-utils_use_find_package kerberos GSSAPI)
-		$(cmake-utils_use_find_package kwallet KF5Wallet)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}