gentoo resync : 25.11.2020

3 files changed, 8 insertions, 134 deletions

diff --git a/kde-apps/k3b/Manifest b/kde-apps/k3b/Manifest
index 00b7e30b83bd..42c0c39a76c4 100644
--- a/kde-apps/k3b/Manifest
+++ b/kde-apps/k3b/Manifest
@@ -1,5 +1,3 @@
-DIST k3b-20.04.3.tar.xz 10509884 BLAKE2B 9bc05efbc06e9909e36fd23e56aef95182f3db9a82b2ca9c5404b5fa839eb71a411a92492591ff7b5d0875a296d71ee02a4008c61051da6b893628801f096a48 SHA512 ba45206ba25df77356b1afefe3b601cebc26610d87068af5c3d4939b407de8f08890ca7ed8b0e0059f0bd98adc9786b00bec3f0ec142488b686d0663c3cc65b2
-DIST k3b-20.08.1.tar.xz 10681496 BLAKE2B f4692418f8085ab4b76d3defc8ed5e1e3f888ac4f4606523d9fa7d5c63085e095d1ce92fedeb0b797dac3260fd328b0a4998b09c63fbdc9a2709234539f95059 SHA512 b0d6e6e5372916963a0e6c405792c55c4bb70e56564aaad65e7c2e79177d651f9edc84d6813900b18acaf657429909453a5ac1b47f4624c1751ecc56ded52b93
-EBUILD k3b-20.04.3.ebuild 3516 BLAKE2B 4a44aecc98dc130822dc4ecacea193564eadf3e20b458960c8308bf4bfed739563fa413a4e1b7b251c1ee0b80e7cac9709e63fa9dbd6589895e27f2cbf62f29b SHA512 686205a2b13c228de85b73acb7109c4a123421a5d7756fb96de56039bf006054c54011e25d5ae73d1be66edfcd60396cbdd455b55ae909fe73cc1236d4bf45f6
-EBUILD k3b-20.08.1.ebuild 3519 BLAKE2B c8670add053124e6ac4a4fc5b7bebe238d35e857458ecb4d83e0186bc109dbb37677b61a73735f8ff33ddf62639392c54141db5c382a28167b5a6e7cbc517340 SHA512 12e3f2c27149753f7a57a887bf6c6088db7f90f510ba4a20d975814beb231c7f9ec10c23afb4d18b2014a358856f3dd1b1bfa1c67d490de17af651456717a395
+DIST k3b-20.08.3.tar.xz 10684548 BLAKE2B bfb9a06fd5b9c023fe7a9c1c93fd2f473941906870f8face596617cf5bc2e26e258cc6adbe9fb7a99da0ed5bd9f09273168408133c8d6142bd42dc4779e2fa32 SHA512 0d068f10d8dd287a33ca672e780673b7f6a92c2071ea9ec22176ea4a9a210e205eb1b605ee23edca4d2e7eaefbe2dead04ef8b8ee29b690f38185e3caae14ba8
+EBUILD k3b-20.08.3.ebuild 3438 BLAKE2B a3dadf1a955dc72e7c50d3f7b203bd4da5dda48a0acd7f8a5d214a63157df00dba5e8a530c35f0547c4695a1f920db669acfeb4f51756080acc9d45286f51f22 SHA512 1e17cf400baeba16e7a5350fae39ce5ff9d137062f6a08ae151a8d3452c907a8feb772820dd0196d9391c2713081866cd48db56c5fca2ae5ef9d0947523007db
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/k3b/k3b-20.08.1.ebuild b/kde-apps/k3b/k3b-20.08.1.ebuild
deleted file mode 100644
index 34c518f9fd03..000000000000
--- a/kde-apps/k3b/k3b-20.08.1.ebuild
+++ /dev/null
@@ -1,122 +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="Full-featured burning and ripping application based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/multimedia/org.kde.k3b
-https://userbase.kde.org/K3b"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis webkit"
-
-REQUIRED_USE="
-	flac? ( taglib )
-	mp3? ( encode taglib )
-	sox? ( encode taglib )
-"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-apps/libkcddb-${PVCUT}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kfilemetadata-${KFMIN}:5[taglib?]
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/knotifyconfig-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	media-libs/libsamplerate
-	dvd? ( media-libs/libdvdread:= )
-	ffmpeg? ( media-video/ffmpeg:0= )
-	flac? ( >=media-libs/flac-1.2[cxx] )
-	mp3? ( media-sound/lame )
-	mad? ( media-libs/libmad )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	sndfile? ( media-libs/libsndfile )
-	taglib? ( >=media-libs/taglib-1.5 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
-"
-RDEPEND="${DEPEND}
-	app-cdr/cdrdao
-	dev-libs/libburn
-	media-sound/cdparanoia
-	virtual/cdrtools
-	dvd? (
-		>=app-cdr/dvd+rw-tools-7
-		encode? ( media-video/transcode[dvd] )
-	)
-	sox? ( media-sound/sox )
-	vcd? ( media-video/vcdimager )
-"
-
-DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt )
-
-src_configure() {
-	local mycmakeargs=(
-		-DK3B_BUILD_API_DOCS=OFF
-		-DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
-		-DK3B_ENABLE_HAL_SUPPORT=OFF
-		-DK3B_ENABLE_MUSICBRAINZ=OFF
-		-DK3B_DEBUG=$(usex debug)
-		-DK3B_ENABLE_DVD_RIPPING=$(usex dvd)
-		-DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=$(usex encode)
-		-DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg)
-		-DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac)
-		-DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex mp3)
-		-DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad)
-		-DK3B_BUILD_MUSE_DECODER_PLUGIN=$(usex musepack)
-		-DK3B_BUILD_SNDFILE_DECODER_PLUGIN=$(usex sndfile)
-		-DK3B_BUILD_SOX_ENCODER_PLUGIN=$(usex sox)
-		-DK3B_ENABLE_TAGLIB=$(usex taglib)
-		-DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis)
-		-DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis)
-		$(cmake_use_find_package webkit Qt5WebKitWidgets)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	echo
-	elog "If you get warnings on start-up, uncheck the \"Check system"
-	elog "configuration\" option in the \"Misc\" settings window."
-	echo
-
-	local group=cdrom
-	use kernel_linux || group=operator
-	elog "Make sure you have proper read/write permissions on optical device(s)."
-	elog "Usually, it is sufficient to be in the ${group} group."
-	echo
-}
diff --git a/kde-apps/k3b/k3b-20.04.3.ebuild b/kde-apps/k3b/k3b-20.08.3.ebuild
index 721a6a49616f..7187e896a880 100644
--- a/kde-apps/k3b/k3b-20.04.3.ebuild
+++ b/kde-apps/k3b/k3b-20.08.3.ebuild
@@ -6,18 +6,17 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.14.2
+KFMIN=5.74.0
+QTMIN=5.15.1
 inherit ecm kde.org
 
 DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks"
-HOMEPAGE="https://kde.org/applications/multimedia/org.kde.k3b
-https://userbase.kde.org/K3b"
+HOMEPAGE="https://apps.kde.org/en/k3b https://userbase.kde.org/K3b"
 
 LICENSE="GPL-2 FDL-1.2"
 SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis webkit"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
+IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis"
 
 REQUIRED_USE="
 	flac? ( taglib )
@@ -64,7 +63,6 @@ DEPEND="
 		media-libs/libogg
 		media-libs/libvorbis
 	)
-	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
 "
 RDEPEND="${DEPEND}
 	app-cdr/cdrdao
@@ -87,6 +85,7 @@ src_configure() {
 		-DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
 		-DK3B_ENABLE_HAL_SUPPORT=OFF
 		-DK3B_ENABLE_MUSICBRAINZ=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
 		-DK3B_DEBUG=$(usex debug)
 		-DK3B_ENABLE_DVD_RIPPING=$(usex dvd)
 		-DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=$(usex encode)
@@ -100,7 +99,6 @@ src_configure() {
 		-DK3B_ENABLE_TAGLIB=$(usex taglib)
 		-DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis)
 		-DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis)
-		$(cmake_use_find_package webkit Qt5WebKitWidgets)
 	)
 
 	ecm_src_configure