gentoo resync : 25.11.2020

3 files changed, 12 insertions, 125 deletions

diff --git a/kde-apps/gwenview/Manifest b/kde-apps/gwenview/Manifest
index aaf8e6ccf704..bedb41a615ff 100644
--- a/kde-apps/gwenview/Manifest
+++ b/kde-apps/gwenview/Manifest
@@ -1,5 +1,3 @@
-DIST gwenview-20.04.3.tar.xz 5629044 BLAKE2B 3895b5a4b3a858784470a0d72e473c651047f9b6f808b89192556d12fd80d798703d33a3409f3fbc2b35771b1ad1dc5f840f4935ca25c4f66b7130dd3a2bbf45 SHA512 c670111e75938028713ea77695bbe6fdd8e76d0dea74acc0cff3a20dd5a7ee4c956ef79b67c7ac8e99bb07b9895c16fcf985580d91442005451c6439f19726f1
-DIST gwenview-20.08.1.tar.xz 6741100 BLAKE2B 891781856c31c7e2d981265e5341badc9f408aa4dab95a051db71b7fbd8a06fa077670eaf96b73b60086bd9070f4a989f9d39cde6ad6513ce3b1f7e884b7f465 SHA512 76382f3edb228667c85766049a4dad469496ef15364fbfec5b9c570cec0a7c6c083edd1832ccf82f8f7ed3c6d4819811cc2e784200db1a0298b9bc01ce606cb3
-EBUILD gwenview-20.04.3.ebuild 2976 BLAKE2B ae5058e337745110905424f3c0240e117f37e6cf02207ea7d64cfc4ad68d20c08f50e21e78f92933d568753154ff587c72f3a0af1d29a1e0050ca0e004cfb85c SHA512 e0e22ddf6610758ffb25b49f6f21d1234b538807c838e1da09b64c0971058e785753dbd4890dd2caee9dc35e30a11187bc12871152543ba7603b8fbe442ed06f
-EBUILD gwenview-20.08.1.ebuild 2997 BLAKE2B 3d1fe3d5ffba056cff6fbedc81665921efddcda0a66ce5dc9718d0b29fbd02b98d760acd0121e58d247ac5bead2b53a5218880b21ff17b7439a38f67ce6a794a SHA512 be7aebcfee7afc593305527c8c7d074bca99cc7944b4f00eb1098177b494187e5443daa4467fa6633eb1a57cdfb4b5d1e0779cc80f6f878780990e96f38d49a7
+DIST gwenview-20.08.3.tar.xz 6742928 BLAKE2B 1494d58e65993cfd3cd40311818c7ec414a9e9b5052d241e043b9425e5bb6de64578bd1f8e0e6b9708680fdd73dcf8c42cc2aab909c0f8efb653a9ad4e3732ad SHA512 a636250900f7b0ac96a4b847571acbc13854d7a0977fbec3d57a0291f2dfd88b1b1eae5048f3f507ef62db48152de0ce1bce1d113aba53353067650ce51c50f7
+EBUILD gwenview-20.08.3.ebuild 2964 BLAKE2B 2c54f0c5d6285ef8abec94794b19452b4e648d3436917d24614c275d7b3eb999591bdc90533ea696fd5f2d99c42ded7de8c88acb87cef3b3610bb331f1a67dc8 SHA512 16e9fef0148e1b4e2ed4f7f19881f33084862ab69e3323b4cfba1c481d82262d94290d58e32a18e66f459bc79bb832d6ed7d4de9110166a6bc0e6ddc94ccd307
 MISC metadata.xml 708 BLAKE2B cde335a32954748c28475a1620aac2e6733490fd8e6126f8963c6b5b0b6e8e87065dbab17e1723945e8f5646815acdf9fdfbf89c4dc57639663567fdcab0b5c9 SHA512 b8fffc87db328df9c5dafb6d72b954ce052678810375278adb390c832bec11f419000fcdd08bd73b9dbcc3e475b7e7b927663c9886b6eb92b7caca7e311015e6
diff --git a/kde-apps/gwenview/gwenview-20.08.1.ebuild b/kde-apps/gwenview/gwenview-20.08.1.ebuild
deleted file mode 100644
index ce79ad7a87da..000000000000
--- a/kde-apps/gwenview/gwenview-20.08.1.ebuild
+++ /dev/null
@@ -1,111 +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.72.0
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Image viewer by KDE"
-HOMEPAGE="https://kde.org/applications/graphics/org.kde.gwenview
-https://userbase.kde.org/Gwenview"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="activities fits kipi +mpris raw semantic-desktop share X"
-
-# requires running environment
-RESTRICT+=" test"
-
-COMMON_DEPEND="
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtopengl-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	media-gfx/exiv2:=
-	media-libs/lcms:2
-	media-libs/libpng:0=
-	>=media-libs/phonon-4.11.0
-	media-libs/tiff
-	virtual/jpeg:0
-	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-	fits? ( sci-libs/cfitsio )
-	kipi? ( >=kde-apps/libkipi-${PVCUT}:5= )
-	mpris? ( >=dev-qt/qtdbus-${QTMIN}:5 )
-	raw? ( >=kde-apps/libkdcraw-${PVCUT}:5 )
-	semantic-desktop? (
-		>=kde-frameworks/baloo-${KFMIN}:5
-		>=kde-frameworks/kfilemetadata-${KFMIN}:5
-	)
-	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-	X? (
-		>=dev-qt/qtx11extras-${QTMIN}:5
-		x11-libs/libX11
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-"
-RDEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtimageformats-${QTMIN}:5
-	>=kde-frameworks/kimageformats-${KFMIN}:5
-	kipi? ( >=kde-apps/kipi-plugins-${PVCUT}:5 )
-"
-
-src_prepare() {
-	ecm_src_prepare
-	if ! use mpris; then
-		# FIXME: upstream a better solution
-		sed -e "/set(HAVE_QTDBUS/s/\${Qt5DBus_FOUND}/0/" -i CMakeLists.txt || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package fits CFitsio)
-		$(cmake_use_find_package kipi KF5Kipi)
-		$(cmake_use_find_package raw KF5KDcraw)
-		$(cmake_use_find_package share KF5Purpose)
-		$(cmake_use_find_package X X11)
-	)
-
-	if use semantic-desktop; then
-		mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=Baloo )
-	else
-		mycmakeargs+=( -DGWENVIEW_SEMANTICINFO_BACKEND=None )
-	fi
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version kde-apps/svgpart:${SLOT} ; then
-		elog "For SVG support, install kde-apps/svgpart:${SLOT}"
-	fi
-}
diff --git a/kde-apps/gwenview/gwenview-20.04.3.ebuild b/kde-apps/gwenview/gwenview-20.08.3.ebuild
index 309fc2c14d70..af70d29510ee 100644
--- a/kde-apps/gwenview/gwenview-20.04.3.ebuild
+++ b/kde-apps/gwenview/gwenview-20.08.3.ebuild
@@ -6,13 +6,12 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.14.2
-inherit ecm kde.org
+KFMIN=5.74.0
+QTMIN=5.15.1
+inherit ecm kde.org optfeature
 
 DESCRIPTION="Image viewer by KDE"
-HOMEPAGE="https://kde.org/applications/graphics/org.kde.gwenview
-https://userbase.kde.org/Gwenview"
+HOMEPAGE="https://apps.kde.org/en/gwenview https://userbase.kde.org/Gwenview"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2 )"
 SLOT="5"
@@ -47,7 +46,8 @@ COMMON_DEPEND="
 	media-gfx/exiv2:=
 	media-libs/lcms:2
 	media-libs/libpng:0=
-	media-libs/phonon[qt5(+)]
+	>=media-libs/phonon-4.11.0
+	media-libs/tiff
 	virtual/jpeg:0
 	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
 	fits? ( sci-libs/cfitsio )
@@ -102,9 +102,9 @@ src_configure() {
 }
 
 pkg_postinst() {
-	ecm_pkg_postinst
-
-	if [[ -z "${REPLACING_VERSIONS}" ]] && ! has_version kde-apps/svgpart:${SLOT} ; then
-		elog "For SVG support, install kde-apps/svgpart:${SLOT}"
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		elog "Optional dependencies:"
+		optfeature "SVG support" kde-apps/svgpart:${SLOT}
 	fi
+	ecm_pkg_postinst
 }