5 files changed, 88 insertions, 140 deletions
diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest
index 42f47e3962eb..1b4070d7c8b7 100644
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@@ -1,6 +1,5 @@
-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
 DIST ark-19.08.3.tar.xz 2585196 BLAKE2B 2f3ad8052ad5ead34d30d5fff41c076e387740ac77c80791a8f600d9158c254592916a92e8e181b98adee916baee2f58c3d668bfdd1d9d1be7a36f7b8d61c07c SHA512 2bbbce37e5f892840517688eb4ce78770514eb5c780d34ae3c33c4b4e60cd153ebc190e4613411d5e01f01a78b6a74bad86c79b9efe8a156250c18033a3271cf
-EBUILD ark-19.04.3.ebuild 2106 BLAKE2B 1f92d8915daee4085e8ff75538cc46190f42956caa41e65a074ad9787640eff4e51dd9b090eb068f95918f452afb9e7e349ad68087b263231de2282bd526c351 SHA512 7e4d239835e923c5daf90585d4cee2b107367faa16eea50de1894de66bd956efcbe72f0932eefd77dbba43eb579fd40ff57cc1cea18cc8065e7d2d18b18058a6
-EBUILD ark-19.08.3.ebuild 2252 BLAKE2B 768e7e5d365dd72f0b823ce2e5af066205d816f8e1de26579dc42de88397693ed982ec0772a00ce84e5cf69be41ed1926d37670c1173234ac07db9c2ccc07581 SHA512 2ece7258b5e9b4f7758866c5d184174a6d0ea3758b7c10b66dc9a3319e8d0e3bc2c389f8b09cf3330e87966297848c52089310e563c9dfde22ccf6db84b9e924
+DIST ark-19.12.0.tar.xz 2588820 BLAKE2B 6b01d392eec688ecce957d6407bdde335d16d62e2ec456ef5c3f4e8e00887bf8811de98d637b77ef06796539f13cf34319c225f65824cbd867bc757335260860 SHA512 ac4f0379cc7927bada4416a5569c96ace173ec1b85e46e95682f46e254da094d9cfc6049ba8f49c6dcd6bc0d3ee6e08a00150f9f6088ff2325bd1a1179d7184f
+EBUILD ark-19.08.3.ebuild 2249 BLAKE2B 450fe0836890c9b05b67992ba79785811edcb5d05a2180468dd7f71b5d1fd1284d7912df31d1bd18f5aa804675e6bee60ee596b51c19895ba3f5a4b698f89167 SHA512 f14246ca859eb5c52b3e1ffb427270cfbdc6caa72a8e59ede7e54bfc42cd83057497c5e6d7d6b2cbb221930a10cd34d46bce024253657cd65d34f8dc15028096
+EBUILD ark-19.12.0.ebuild 2243 BLAKE2B b4ba7f8f5770de6e4025d9a79300ab0fcb61ff8937deffb8d2c56046de50f2b6329bc6b78fe25359a7c7433475ee57373f80e9b9d36dd73509f3bc9b0e3b7d5b SHA512 bce3d7b60eb6546f64003a75533a91cf614b0a382e0d036fdabac9d3aab1a1dba4bd1bebf3d8c1bd0d64498c389affe02493f165e8deec43def52e12e1bf19f3
 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
deleted file mode 100644
index 1369e67045f6..000000000000
--- a/kde-apps/ark/ark-19.04.3.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# 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)
-"
-
-PATCHES=( "${FILESDIR}/${P}-missing-header.patch" )
-
-# 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/ark-19.08.3.ebuild b/kde-apps/ark/ark-19.08.3.ebuild
index 5de4f8e9843e..fa158209aa3e 100644
--- a/kde-apps/ark/ark-19.08.3.ebuild
+++ b/kde-apps/ark/ark-19.08.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://kde.org/applications/utilities/ark
 https://utils.kde.org/projects/ark/"
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="bzip2 lzma zip"
 
 BDEPEND="
diff --git a/kde-apps/ark/ark-19.12.0.ebuild b/kde-apps/ark/ark-19.12.0.ebuild
new file mode 100644
index 000000000000..1c677a7ea9e3
--- /dev/null
+++ b/kde-apps/ark/ark-19.12.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="optional"
+KFMIN=5.63.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE Archiving tool"
+HOMEPAGE="https://kde.org/applications/utilities/org.kde.ark
+https://utils.kde.org/projects/ark/"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="bzip2 lzma zip"
+
+BDEPEND="
+	sys-devel/gettext
+"
+RDEPEND="
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kpty-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	app-arch/libarchive:=[bzip2?,lzma?,zlib]
+	sys-libs/zlib
+	zip? ( >=dev-libs/libzip-1.2.0:= )
+"
+DEPEND="${RDEPEND}
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+"
+
+# bug #560548, last checked with 16.04.1
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package bzip2 BZip2)
+		$(cmake_use_find_package lzma LibLZMA)
+		$(cmake_use_find_package zip LibZip)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_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
deleted file mode 100644
index a0b16e93a4f2..000000000000
--- a/kde-apps/ark/files/ark-19.04.3-missing-header.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-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