gentoo resync : 25.11.2020

3 files changed, 24 insertions, 126 deletions

diff --git a/kde-apps/dolphin/Manifest b/kde-apps/dolphin/Manifest
index c622eb1878e6..c6e0a2d80f83 100644
--- a/kde-apps/dolphin/Manifest
+++ b/kde-apps/dolphin/Manifest
@@ -1,5 +1,3 @@
-DIST dolphin-20.04.3.tar.xz 4798732 BLAKE2B 080fbe7c2a5156623f6558caaa980aa9202e0e0a21330d7b1bc7800d790daa60a6c4c90a9d5806a9330b0d29908bf1ef755d0900560613e137cdd1e80b28fdac SHA512 fc4ad5ff645387d7a058cff42db00d55db8b0cb7793cdc3adbbaff2e8465c469a5ad6040625bfde564e18c25c16ae3962d6eb7ac9618e0ae8783a2fe030fc5ca
-DIST dolphin-20.08.1.tar.xz 5091048 BLAKE2B d0c25f1598f3a87fa8738b18560e42041dd157cb20d7e2426f18d7bc8a45bd0f532858336152c33d98033c19bc16d0fabb6234112acfa3a20aa14c549820b7c0 SHA512 fcc0797691c5b365cf0d7ad7f227feb88e3047bb8aa9547c71baf2e765f07abba4588eee39bde1b0b4f77a7b5297916144ef9a323eb604eba7cd2ae0b4b3a71e
-EBUILD dolphin-20.04.3.ebuild 2911 BLAKE2B ad92970a4c937ce2480333d56b4ac90f2104b47a209d542d84eb511d9801422efa0468ee375530dd986d592227d1eeaa021e0fed79a9378460719f695de90025 SHA512 ddb228662b73f51ad71df5b1127b58b9aab11aa9635a8ed56604f1497920e86fa3af521886020f42308ceda5416064caad9b29469bc38e8b23cd9aca2c5c4c11
-EBUILD dolphin-20.08.1.ebuild 2963 BLAKE2B bef991ef718867a7978e99e67fd24e16e11c3c9e1686338192b63feddf2a0c80b0929b439a86c17c57b6d1884565b65495c33ebcf50aa4ef19c001a7849a4702 SHA512 3356277ac8de10d7a4252f139a8af6e143956c30e6da47e33149b89e69a7e2ba2329147bf395e2ce972afa58757a9338821d0a223fd5a3a8ec36252136c6a82e
+DIST dolphin-20.08.3.tar.xz 5094964 BLAKE2B 368eca6e1972361bdb02bb3b1d3b449074d7d48af7bb88df60447ac9a7c88e8562fcac185c96596c57520df3efb87859cd21ad19e3b8515ec4ce40ebc7d2b3a5 SHA512 6fb1533597d886a7a032b68dbe2d9d05c0b856c006ba06d08eeda5ae267530f528fa4c4b7a8e2caf1cb074284a27d01a223922b606fde238984588a7df3abe6c
+EBUILD dolphin-20.08.3.ebuild 3065 BLAKE2B d935f22318e5aa0dfdc22ba1f6dc9b6c9a79bd8e19509c75e918c7ee6855e8fabc55351d5e8bb0e01f349d305c448cafbee77fb6aaceef4e7afdd1c25892af39 SHA512 e78165d126936b7b1e324e3cbdc57f6af5632d27f3c9ed6be3a742d60a71c1edcf2949c78fa4ecf50c8661b841ac8a80fc80bd754e1c1a8d35cdb4b2e3afd3c3
 MISC metadata.xml 361 BLAKE2B 1974fb2be150af6e3276e6c55b54b4659fcdd781b58228b60bea6ceb605f0a5b412d5b6451231b47fd67856ecf9486dd30e3d440b6e9a35d1566fc09de9a5cd9 SHA512 2fea432f0da8502acb0e2bc467e6c010a54612c2850de6abf422304e8d260a5417f7361f66c6a697ae9e138d3b6714e3d8121ae4904e24804abc188758576176
diff --git a/kde-apps/dolphin/dolphin-20.04.3.ebuild b/kde-apps/dolphin/dolphin-20.04.3.ebuild
deleted file mode 100644
index 2f316fcb1f78..000000000000
--- a/kde-apps/dolphin/dolphin-20.04.3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="forceoptional"
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.14.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Plasma filemanager focusing on usability"
-HOMEPAGE="https://kde.org/applications/system/org.kde.dolphin
-https://userbase.kde.org/Dolphin"
-
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE="activities semantic-desktop"
-
-DEPEND="
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${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/kinit-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	media-libs/phonon[qt5(+)]
-	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-	semantic-desktop? (
-		>=kde-apps/baloo-widgets-${PVCUT}:5
-		>=kde-frameworks/baloo-${KFMIN}:5
-		>=kde-frameworks/kfilemetadata-${KFMIN}:5
-	)
-"
-RDEPEND="${DEPEND}
-	>=kde-apps/kio-extras-${PVCUT}:5
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-		$(cmake_use_find_package semantic-desktop KF5BalooWidgets)
-		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		has_version "kde-apps/ark:${SLOT}" || \
-			elog "For compress/extract and other actions install kde-apps/ark:${SLOT}"
-
-		has_version "kde-apps/kleopatra:${SLOT}" || \
-			elog "For crypto actions install kde-apps/kleopatra:${SLOT}"
-
-		has_version "kde-apps/ffmpegthumbs:${SLOT}" || \
-			elog "For video file thumbnails install kde-apps/ffmpegthumbs:${SLOT}"
-
-		has_version "kde-apps/thumbnailers:${SLOT}" || \
-			elog "For graphics file thumbnails install kde-apps/thumbnailers:${SLOT}"
-
-		has_version "kde-frameworks/purpose:${SLOT}" || \
-			elog "For 'Share' context menu actions install kde-frameworks/purpose:${SLOT}"
-	fi
-}
diff --git a/kde-apps/dolphin/dolphin-20.08.1.ebuild b/kde-apps/dolphin/dolphin-20.08.3.ebuild
index fca3debdfbcf..05f04613e4bd 100644
--- a/kde-apps/dolphin/dolphin-20.08.1.ebuild
+++ b/kde-apps/dolphin/dolphin-20.08.3.ebuild
@@ -6,18 +6,17 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.72.0
-QTMIN=5.14.2
+KFMIN=5.74.0
+QTMIN=5.15.1
 VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
+inherit ecm kde.org optfeature
 
 DESCRIPTION="Plasma filemanager focusing on usability"
-HOMEPAGE="https://kde.org/applications/system/org.kde.dolphin
-https://userbase.kde.org/Dolphin"
+HOMEPAGE="https://apps.kde.org/en/dolphin https://userbase.kde.org/Dolphin"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="activities semantic-desktop"
 
 DEPEND="
@@ -62,8 +61,6 @@ RDEPEND="${DEPEND}
 	>=kde-apps/kio-extras-${PVCUT}:5
 "
 
-RESTRICT+=" test"
-
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON
@@ -72,27 +69,27 @@ src_configure() {
 		$(cmake_use_find_package semantic-desktop KF5BalooWidgets)
 		$(cmake_use_find_package semantic-desktop KF5FileMetaData)
 	)
-
 	ecm_src_configure
 }
 
-pkg_postinst() {
-	ecm_pkg_postinst
+src_test() {
+	local myctestargs=(
+		# servicemenuinstaller requires ruby, no thanks
+		# dolphinmainwindowtest, kitemlistcontrollertest, kfileitemlistviewtest, kfileitemmodeltest hang forever
+		# placesitemmodeltest requires DBus
+		-E "(servicemenuinstaller|dolphinmainwindowtest|kfileitemlistviewtest|kfileitemmodeltest|kitemlistcontrollertest|placesitemmodeltest)"
+	)
+	ecm_src_test
+}
 
+pkg_postinst() {
 	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		has_version "kde-apps/ark:${SLOT}" || \
-			elog "For compress/extract and other actions install kde-apps/ark:${SLOT}"
-
-		has_version "kde-apps/kleopatra:${SLOT}" || \
-			elog "For crypto actions install kde-apps/kleopatra:${SLOT}"
-
-		has_version "kde-apps/ffmpegthumbs:${SLOT}" || \
-			elog "For video file thumbnails install kde-apps/ffmpegthumbs:${SLOT}"
-
-		has_version "kde-apps/thumbnailers:${SLOT}" || \
-			elog "For graphics file thumbnails install kde-apps/thumbnailers:${SLOT}"
-
-		has_version "kde-frameworks/purpose:${SLOT}" || \
-			elog "For 'Share' context menu actions install kde-frameworks/purpose:${SLOT}"
+		elog "Optional dependencies:"
+		optfeature "compress/extract and other actions" kde-apps/ark:${SLOT}
+		optfeature "crypto actions" kde-apps/kleopatra:${SLOT}
+		optfeature "video file thumbnails" kde-apps/ffmpegthumbs:${SLOT}
+		optfeature "graphics file thumbnails" kde-apps/thumbnailers:${SLOT}
+		optfeature "'Share' context menu actions" kde-frameworks/purpose:${SLOT}
 	fi
+	ecm_pkg_postinst
 }