gentoo resync : 18.08.2019

4 files changed, 139 insertions, 1 deletions

diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest
index 63361cc8ccf9..1861bbbd852c 100644
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@@ -1,3 +1,6 @@
+AUX ark-19.04.3-missing-header.patch 1692 BLAKE2B 5295e673fb206614d446f02e76904ad82494c3ceef14b373151272c87fef2b3db0ccb30cad1136784de3d00e63371b8a65230bb29763e22b215fd42e61e76a2d SHA512 a3a14f7868ce53aae81d6383c8f66430d58b33a0e80857c6b7f8b5566def77ce4dfdd69406e72a7a1caa7f10c38b6f5cc80f9d8fcde571ea29c215827a0174e6
 DIST ark-19.04.3.tar.xz 2579920 BLAKE2B a8637d4f564fe20aa28035e5c1a09ca8c6803bf6acb9fc82074a8219368f1ff9b45dd88dc1439823e73eb627d2f13269b4cd776480d991c1499e8de1510de14c SHA512 dc41f8daea7c63f93725cd1dada978fde68c7e7c659840014fe3ccc32a8e9e7013f495590cd5344d68001cbba81f527ec368829b4ff1577f71d5de268cd0b459
-EBUILD ark-19.04.3.ebuild 2053 BLAKE2B fa67c344a54d10b27966d28e22c15f8ddb880ce5d66f7f9e9610b21cff13494b240ad0c38ceba1b421a3121d940e3e8e387acf8e657ebbacf28fbe23734197f8 SHA512 ec15d18c060f1321fc08994c631e7de8bc7ab5aa482eb9fca716c9ee35a8c8bd33bba86d5771599de9f0f51b5c2f2c0606d2cf4a37fa65ef2a9d94b734087ae0
+DIST ark-19.08.0.tar.xz 2584376 BLAKE2B d123812b3bc0c9a8215fc9cdfafcd4933265f337a18cb85d9837f14396effa2402bb6c114c9e5318086dbc199fcd9a86a01e2e8ef84d10ffce0bb0efd2fe7af2 SHA512 3a594d951e9f8c128e67fa6caa508f67b5831cc553b683acab9ec60254318f4ac2fc30e70a27d93d98f7eddc217fc377dcef7d9f5780728a0ab15843b0400e2e
+EBUILD ark-19.04.3.ebuild 2106 BLAKE2B 1f92d8915daee4085e8ff75538cc46190f42956caa41e65a074ad9787640eff4e51dd9b090eb068f95918f452afb9e7e349ad68087b263231de2282bd526c351 SHA512 7e4d239835e923c5daf90585d4cee2b107367faa16eea50de1894de66bd956efcbe72f0932eefd77dbba43eb579fd40ff57cc1cea18cc8065e7d2d18b18058a6
+EBUILD ark-19.08.0.ebuild 2056 BLAKE2B 92f61a8188e5b799170c4f90d7510b4773d8cbe49ad8593261a55ba8fff0b032065cd7c6dd34ff74da692f06982ae1fc552e9358556244ce79e3928f0db0b55a SHA512 00af0a51d5dc2f4f702667e0ab8ba207381c61d7c6a151b282ff31fd9b734b3178c5c830362df70207f5f6c14461ce07ec39a87ca67c9c8959a8498e13d6c299
 MISC metadata.xml 348 BLAKE2B 89cd42a24774f85082d025bc18402e0d4a36e07ab62155b67474a14c7294de3875d078167521f6cc4496f97f311de9264ff8c41e78477101a80d0ae2a034dcaf SHA512 447d60adfaec4e52c25d7a61a281b8b044c9a786a0600b8a8260a150f6842047f45b981aabb75e56255d05a918370113f6d2552fec1b88f661141453e003c472
diff --git a/kde-apps/ark/ark-19.04.3.ebuild b/kde-apps/ark/ark-19.04.3.ebuild
index b9224f70aa01..1369e67045f6 100644
--- a/kde-apps/ark/ark-19.04.3.ebuild
+++ b/kde-apps/ark/ark-19.04.3.ebuild
@@ -46,6 +46,8 @@ DEPEND="${RDEPEND}
 	$(add_qt_dep qtconcurrent)
 "
 
+PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
+
 # bug #560548, last checked with 16.04.1
 RESTRICT+=" test"
 
diff --git a/kde-apps/ark/ark-19.08.0.ebuild b/kde-apps/ark/ark-19.08.0.ebuild
new file mode 100644
index 000000000000..bba063801ed4
--- /dev/null
+++ b/kde-apps/ark/ark-19.08.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="optional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KDE Archiving tool"
+HOMEPAGE="https://kde.org/applications/utilities/ark
+https://utils.kde.org/projects/ark/"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="bzip2 lzma zip"
+
+BDEPEND="
+	sys-devel/gettext
+"
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpty)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	app-arch/libarchive:=[bzip2?,lzma?,zlib]
+	sys-libs/zlib
+	zip? ( >=dev-libs/libzip-1.2.0:= )
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep qtconcurrent)
+"
+
+# bug #560548, last checked with 16.04.1
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package bzip2 BZip2)
+		$(cmake-utils_use_find_package lzma LibLZMA)
+		$(cmake-utils_use_find_package zip LibZip)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		if ! has_version app-arch/rar; then
+			elog "For creating/extracting rar archives, installing app-arch/rar is required."
+			if ! has_version app-arch/unar && ! has_version app-arch/unrar; then
+				elog "Alternatively, for only extracting rar archives, install app-arch/unar (free) or app-arch/unrar (non-free)."
+			fi
+		fi
+
+		has_version app-arch/p7zip || \
+			elog "For handling 7-Zip archives, install app-arch/p7zip."
+
+		has_version app-arch/lrzip || \
+			elog "For handling lrz archives, install app-arch/lrzip."
+	fi
+}
diff --git a/kde-apps/ark/files/ark-19.04.3-missing-header.patch b/kde-apps/ark/files/ark-19.04.3-missing-header.patch
new file mode 100644
index 000000000000..a0b16e93a4f2
--- /dev/null
+++ b/kde-apps/ark/files/ark-19.04.3-missing-header.patch
@@ -0,0 +1,54 @@
+From dfad7a3f389c3b852f45563854df123ac6facdec Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Mon, 15 Jul 2019 00:09:18 +0200
+Subject: Add missing QVector include
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Summary:
+My build was failing with
+```
+In file included from /home/nico/kde/src/ark/kerfuffle/pluginmanager.cpp:28:
+/home/nico/kde/src/ark/kerfuffle/pluginmanager.h:138:22: error: field ‘m_plugins’ has incomplete type ‘QVector<Kerfuffle::Plugin*>’
+     QVector<Plugin*> m_plugins;
+                      ^~~~~~~~~
+In file included from /usr/include/qt/QtCore/qglobal.h:1204,
+                 from /usr/include/qt/QtCore/qnamespace.h:43,
+                 from /usr/include/qt/QtCore/qobjectdefs.h:48,
+                 from /usr/include/qt/QtCore/qobject.h:46,
+                 from /usr/include/qt/QtCore/QObject:1,
+                 from /home/nico/kde/src/ark/kerfuffle/plugin.h:33,
+                 from /home/nico/kde/src/ark/kerfuffle/pluginmanager.h:31,
+                 from /home/nico/kde/src/ark/kerfuffle/pluginmanager.cpp:28
+```
+
+Test Plan: Builds. Can open a file
+
+Reviewers: #ark, elvisangelaccio
+
+Reviewed By: #ark, elvisangelaccio
+
+Subscribers: kde-utils-devel, #ark
+
+Tags: #ark
+
+Differential Revision: https://phabricator.kde.org/D22461
+---
+ kerfuffle/pluginmanager.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/kerfuffle/pluginmanager.h b/kerfuffle/pluginmanager.h
+index 75a971b..8b9ad69 100644
+--- a/kerfuffle/pluginmanager.h
++++ b/kerfuffle/pluginmanager.h
+@@ -31,6 +31,7 @@
+ #include "plugin.h"
+ 
+ #include <QMimeType>
++#include <QVector>
+ 
+ namespace Kerfuffle
+ {
+-- 
+cgit v1.1