gentoo resync : 25.11.2020

3 files changed, 6 insertions, 71 deletions

diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest
index 03c469550adb..42cf9c6d641e 100644
--- a/media-sound/elisa/Manifest
+++ b/media-sound/elisa/Manifest
@@ -1,5 +1,3 @@
-DIST elisa-20.04.3.tar.xz 1409336 BLAKE2B a1432294cb46562145ecb6f41b07a8a1ae352abffd40253670ef17b79e27b221b2589bf14934a7ce4e0001f90e84a0889a1b0c4dd069101e2e614f1fc51a20cc SHA512 00afa92eaab736f5f38759a3076b9f579ee3f5fce84404042a73e11cdfe0e004b32a83f9e542ca6d0a962d66bcb3fcce9d12fc5dbdd8f937d9d4cea9321687b4
-DIST elisa-20.08.1.tar.xz 1634492 BLAKE2B 2ea1f8eb1c6e20d7b0e383fc660af2605a30f174110f0ece059d4c063e62811ae8c0ff89225429c00977633d29315e5bbb89e7207a2ca4c6c49fb450fdf25ab2 SHA512 a273fe799c701f1acad3966b382189aa69448ee5b0532ea7c47744f0a350c0125193a49d6a100efd448cfcbc878fb45c6fbc248d9135155fad5fac554b673c93
-EBUILD elisa-20.04.3.ebuild 1652 BLAKE2B a9a35dfbe3892ccf19a15195236fc0c26fecc770c5ad0ab9471506bcca11eeb696f6b8670d558b14901c6a01f4d4c054c6930d07f5e57d933479a33ec0acd42f SHA512 1dd4cf67f5fe799e5c60daa24a77510c3172f7e9779ea57d33d5045acbc2b3c6e7006bc850bb105d7e76d65f403c43619b1ca91f12ee2c83203108a62e2d1673
-EBUILD elisa-20.08.1.ebuild 1664 BLAKE2B 1cbb080fa448357801a6d6f8ba0ba3236673b6f2f2e198e21c2966b8080379b6b56f385c6b5bc4df0b1ea33ea0e5b809bd77c05714989bec79a14a43b5c79d46 SHA512 acf9ca4b313fdc6c48023acb8d615570ddaf2e626e4afa8aa9725c089115eb09e135fc42479bdcb57563812b6eba3ca4f062b47996a47433f67ee2bbfacd25c3
+DIST elisa-20.08.3.tar.xz 1635656 BLAKE2B 74b28f7acb8561918aa57f2aaa3a0fde9c041c5dded88fa4d134391288c7b545e058e347d42d3247586ee3a3451e3c072adc3b4367d3bf7fced37d2e33a17f66 SHA512 0ac2c8bb5e4a1df4259b10361acd4094ff32e00f340e4c2418483d8c8538fb439d8205f52af1ca3f31fbc7c129ac1f8e1e3edcbcb96e85f9c8cf270ec8ce081a
+EBUILD elisa-20.08.3.ebuild 1660 BLAKE2B 0f2f97fb2a63060c6b2de73204577be1a798be207188e261789a517e75054989ab25af613ed58c24b828b1035944a3a7494aac5c9bd2c35f9dd7279f21f2eb53 SHA512 a8b51c1155cfc602f3e69bbfe176ada35229bfe38c553f794a96946205405dabb428aeadaaea402acedb021b0ed546fbcc8c730a735da83d0cc34d202f636d0c
 MISC metadata.xml 424 BLAKE2B 2618fabbf4869a17ed7fcaabf1a852c5b5177c6bfb843e202899da344375abe23e4cfc98f1b283c93fbd4b1bcbf5f992fbf35897c805c2807322944de7bdd625 SHA512 914e0966bccdb1330e47e21132f53fc01d5ff74ed53a5c37c7167ddfb3ffa870d7a40f9bea46c91e95c1111aec9caec5f18ac51070708c187120882ab6d649ca
diff --git a/media-sound/elisa/elisa-20.04.3.ebuild b/media-sound/elisa/elisa-20.04.3.ebuild
deleted file mode 100644
index 08fe72fcd012..000000000000
--- a/media-sound/elisa/elisa-20.04.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-KDE_RELEASE_SERVICE="true"
-KFMIN=5.70.0
-QTMIN=5.14.2
-inherit ecm kde.org
-
-DESCRIPTION="Simple music player by KDE"
-HOMEPAGE="https://elisa.kde.org/ https://kde.org/applications/en/elisa"
-
-LICENSE="LGPL-3+"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="mpris semantic-desktop +vlc"
-
-BDEPEND="sys-devel/gettext"
-DEPEND="
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtmultimedia-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kfilemetadata-${KFMIN}:5[taglib]
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	mpris? (
-		>=dev-qt/qtdbus-${QTMIN}:5
-		>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	)
-	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
-	vlc? ( media-video/vlc:= )
-	!vlc? ( >=dev-qt/qtmultimedia-${QTMIN}:5[gstreamer] )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-"
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package mpris KF5DBusAddons)
-		$(cmake_use_find_package semantic-desktop KF5Baloo)
-		$(cmake_use_find_package vlc LIBVLC)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-sound/elisa/elisa-20.08.1.ebuild b/media-sound/elisa/elisa-20.08.3.ebuild
index 9eecd3942ffb..9d44e8467a23 100644
--- a/media-sound/elisa/elisa-20.08.1.ebuild
+++ b/media-sound/elisa/elisa-20.08.3.ebuild
@@ -6,16 +6,16 @@ EAPI=7
 ECM_HANDBOOK="optional"
 ECM_TEST="forceoptional"
 KDE_RELEASE_SERVICE="true"
-KFMIN=5.72.0
-QTMIN=5.14.2
+KFMIN=5.74.0
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Simple music player by KDE"
-HOMEPAGE="https://elisa.kde.org/ https://kde.org/applications/en/elisa"
+HOMEPAGE="https://elisa.kde.org/ https://apps.kde.org/en/elisa"
 
 LICENSE="LGPL-3+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE="mpris semantic-desktop +vlc"
 
 BDEPEND="sys-devel/gettext"