gentoo resync : 02.08.2019

3 files changed, 2 insertions, 83 deletions

diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest
index eccbefa9bed0..63361cc8ccf9 100644
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@@ -1,5 +1,3 @@
-DIST ark-18.12.3.tar.xz 2580024 BLAKE2B a705da9af77ff8fdebbdb2fa3a58fa2a33ccba8a297b6def20ee855b8c5f05ecc90a4f14dc29aae632f8f9dfcb996ea01660ddfd49edce942e042a89b8d51dc1 SHA512 0dc232b004134c048bb516aa43e478545b4052fba9321a6166a3bb4e05638288802f578cea51340c8416257f10e1bcbd55740a8945ae5f95cee6864f107d633f
 DIST ark-19.04.3.tar.xz 2579920 BLAKE2B a8637d4f564fe20aa28035e5c1a09ca8c6803bf6acb9fc82074a8219368f1ff9b45dd88dc1439823e73eb627d2f13269b4cd776480d991c1499e8de1510de14c SHA512 dc41f8daea7c63f93725cd1dada978fde68c7e7c659840014fe3ccc32a8e9e7013f495590cd5344d68001cbba81f527ec368829b4ff1577f71d5de268cd0b459
-EBUILD ark-18.12.3.ebuild 2058 BLAKE2B 2aeafdafafbde3b1a4787c77df5e3c8dee256edb9890ad41bf342844725d21a7fa089d4cc63fad6ce9bd0030e2cb9cb9a7725a254516898ef0ab8938997a69f6 SHA512 1b1e5d710789713021a545a661fc05c8f3cf8c8033fc31ca78f2c6722d68d6f63e7be1b24cc6ed4341a935debbb4a1312043b3b98ee8d5ff86d8888a0bda098f
-EBUILD ark-19.04.3.ebuild 2056 BLAKE2B 92f61a8188e5b799170c4f90d7510b4773d8cbe49ad8593261a55ba8fff0b032065cd7c6dd34ff74da692f06982ae1fc552e9358556244ce79e3928f0db0b55a SHA512 00af0a51d5dc2f4f702667e0ab8ba207381c61d7c6a151b282ff31fd9b734b3178c5c830362df70207f5f6c14461ce07ec39a87ca67c9c8959a8498e13d6c299
+EBUILD ark-19.04.3.ebuild 2053 BLAKE2B fa67c344a54d10b27966d28e22c15f8ddb880ce5d66f7f9e9610b21cff13494b240ad0c38ceba1b421a3121d940e3e8e387acf8e657ebbacf28fbe23734197f8 SHA512 ec15d18c060f1321fc08994c631e7de8bc7ab5aa482eb9fca716c9ee35a8c8bd33bba86d5771599de9f0f51b5c2f2c0606d2cf4a37fa65ef2a9d94b734087ae0
 MISC metadata.xml 348 BLAKE2B 89cd42a24774f85082d025bc18402e0d4a36e07ab62155b67474a14c7294de3875d078167521f6cc4496f97f311de9264ff8c41e78477101a80d0ae2a034dcaf SHA512 447d60adfaec4e52c25d7a61a281b8b044c9a786a0600b8a8260a150f6842047f45b981aabb75e56255d05a918370113f6d2552fec1b88f661141453e003c472
diff --git a/kde-apps/ark/ark-18.12.3.ebuild b/kde-apps/ark/ark-18.12.3.ebuild
deleted file mode 100644
index 0980761f7a6d..000000000000
--- a/kde-apps/ark/ark-18.12.3.ebuild
+++ /dev/null
@@ -1,79 +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://www.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/ark-19.04.3.ebuild b/kde-apps/ark/ark-19.04.3.ebuild
index bba063801ed4..b9224f70aa01 100644
--- a/kde-apps/ark/ark-19.04.3.ebuild
+++ b/kde-apps/ark/ark-19.04.3.ebuild
@@ -11,7 +11,7 @@ inherit kde5
 DESCRIPTION="KDE Archiving tool"
 HOMEPAGE="https://kde.org/applications/utilities/ark
 https://utils.kde.org/projects/ark/"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="bzip2 lzma zip"
 
 BDEPEND="