gentoo Easter resync : 12.04.2020

4 files changed, 4 insertions, 134 deletions

diff --git a/kde-apps/k3b/Manifest b/kde-apps/k3b/Manifest
index db13f48323cd..cd4a195e03e3 100644
--- a/kde-apps/k3b/Manifest
+++ b/kde-apps/k3b/Manifest
@@ -1,5 +1,3 @@
-DIST k3b-19.08.3.tar.xz 10500940 BLAKE2B 8184e6790a312e66f76d3112084e7ec8cf16b67ee3deb2d1fe88df76680d573b26310544c9c747168708494fca0e0c88db9b3ee8f05d66470622a0c42a491e87 SHA512 6a98100a43ba7b18e7333e4782fc070b6faae480c03a788d80d0051b2a72e8e89eb501ef7ffc1f1fa46b18141a6f53407079778b6c51709282cc43530863cf84
-DIST k3b-19.12.2.tar.xz 10515656 BLAKE2B 18a7f5a9b2e494dca928651bc68036e3ea776cc50bddca86113cb99837f1600221f7aeb00cc7d68b315649a65f026524f9938fed6a69d7306a3f28388a3a412c SHA512 bcc5d8a08a00d8b8383c2b5e352e5761e1da1b897500f665e182f0f8622c280fc7549267cd347b15d43d42cb42354eaab7eecc0a35b35767bbe6709a07d4644a
-EBUILD k3b-19.08.3.ebuild 3557 BLAKE2B b80d43255ee74315780430e9a440360197359e1330ef77d9bc237374ee53d2d60b8c7441b41ef97d9ce9a4d441628d3e89d2d1528229a546d10780c150ed37c1 SHA512 b51c4c4c97998520a582de3afcfdd087ace36e984eaec4362f9abc825c8d2ba71e79fe27ee6146aac22d92e0661ccd9980099c9f0963749830d34791d28b8f98
-EBUILD k3b-19.12.2.ebuild 3573 BLAKE2B 862af61a34839ec131d2104d5c78b99a5e326c1a5f086e981f72dcb16bbf503f2cdc47054057fb377f65a14e5c2b0ae3bd698669b1e6fa34567ac72e06547e99 SHA512 0b24e73f10229595b0499b42fcb8d66b7859cf928a88246f1a4d00d14f1d4521db6d6fc3755a1a05c463d664dd522e19c396764c07ae9dbbf580a68f4dfb2c37
-MISC metadata.xml 334 BLAKE2B 0af18188f4b2d7ffa34ad43e06154f943c5da262588331287f89c34f737b435ecf6ac092424057440c9de9ccef1228d0d3c0978d457b5bbf5bdfeaefc464863e SHA512 16203cd75177004bb4844f67659dc7370c12e216871272ff8f781ed11172e72271b15f347ad6d59354ef077ebab1fad2bc150f3e2388f370b660b2d2adcb0faa
+DIST k3b-19.12.3.tar.xz 10518156 BLAKE2B d80b53a23183b1f33aa2cc78f1a60a10210dd017862c244a5f792b68d5f40f00a5fd0906d2468b0f23541a2fc9c498ae877d2def7eac93df5c6f86319a97659b SHA512 732526da1f8ad735d221bd8412e26462ad0a4a8a8bca6a2588d31d58f4345b8dac49b9c07fd464c95ca65f4e901df0bbb1ab404956f5c06c8216a1c6f07bc8d8
+EBUILD k3b-19.12.3.ebuild 3570 BLAKE2B 643c31fa289ed37db77ea68c65007aec2bed86492a8920b671066c4227ff7a89be8875d165267262a2d0cc62c6e091ad92bc61ca5532f5e31ee94fafcecbc9f0 SHA512 7003ec03db0f1e75f7430c299429010aedc4a4f0e23c5fbb3984645d3106d5609bbdd56ac449309e81a23228917724228c525fb4171dea460a93849c151c089b
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/k3b/k3b-19.08.3.ebuild b/kde-apps/k3b/k3b-19.08.3.ebuild
deleted file mode 100644
index 7f12742964b4..000000000000
--- a/kde-apps/k3b/k3b-19.08.3.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2019 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.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks"
-HOMEPAGE="https://userbase.kde.org/K3b"
-
-LICENSE="GPL-2 FDL-1.2"
-SLOT="5"
-KEYWORDS="amd64 arm64 x86"
-IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit"
-
-REQUIRED_USE="
-	flac? ( taglib )
-	mp3? ( encode taglib )
-	sox? ( encode taglib )
-"
-
-DEPEND="
-	>=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
-	>=kde-apps/libkcddb-${PVCUT}:5
-	>=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
-	media-libs/libsamplerate
-	dvd? ( media-libs/libdvdread:= )
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( 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] )
-	)
-	emovix? ( media-video/emovix )
-	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-19.12.2.ebuild b/kde-apps/k3b/k3b-19.12.3.ebuild
index 133fad51c62f..154711497a70 100644
--- a/kde-apps/k3b/k3b-19.12.2.ebuild
+++ b/kde-apps/k3b/k3b-19.12.3.ebuild
@@ -16,7 +16,7 @@ https://userbase.kde.org/K3b"
 
 LICENSE="GPL-2 FDL-1.2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="dvd encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit"
 
 REQUIRED_USE="
diff --git a/kde-apps/k3b/metadata.xml b/kde-apps/k3b/metadata.xml
index cc7344ef5c21..2fdbf33d963d 100644
--- a/kde-apps/k3b/metadata.xml
+++ b/kde-apps/k3b/metadata.xml
@@ -5,7 +5,4 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
-	<use>
-		<flag name="emovix">Enable burning support for eMoviX images</flag>
-	</use>
 </pkgmetadata>