gentoo auto-resync : 06:07:2023 - 16:14:21

4 files changed, 157 insertions, 2 deletions

diff --git a/kde-apps/k3b/Manifest b/kde-apps/k3b/Manifest
index 3defa6134ebd..bcd61f3b86fd 100644
--- a/kde-apps/k3b/Manifest
+++ b/kde-apps/k3b/Manifest
@@ -1,5 +1,8 @@
+AUX k3b-23.04.2-disable-transcode.patch 1411 BLAKE2B d416de9a8d8a6516b8f3399f1e057e1fb5cf56936e6d657f774d326cf363f60d05abd3441d2a09964cbb3bc9706b613ca0175904cd98be077dd080101c07164a SHA512 c9b45a8fd3ff6fc88b159548350046b4e8cba62a4ed9dddbca7253bc24b9256d08f01123cbd52e74729b45505cba6cfa847f221eba65e85c4beb58b18323d507
 DIST k3b-22.12.3.tar.xz 10947736 BLAKE2B 0694d190b6c7c35af5dfc4569e3029706b6fe8f12e32613725377dbff02db066e7a95f9bc1d790f3066df1d8837a76e6f690af2a0f13f20f294a1bcc04a04588 SHA512 2cefeab0a1eee989c5b43981c04bdc1285d4f9eb4a75cc8a93b0f7e599cc686ffafda4637b76e63acd6d954d7f1d764b09ae1aec73f5abcfb78bcd06cf693aa0
 DIST k3b-23.04.2.tar.xz 10950220 BLAKE2B f4dd06561d18ea14b8d2845ff8fdd95a1cba17cb66907996b89ac1bd82dfd20e22fc76d32e34a7abe794d1ca2594de9bfaa3cb535dbf29ec62e8cafa4cb558b0 SHA512 a7568c463df187c71589c8c919eab5e31b6559ce026f8736f611cb7f4e09fbf14effbc0d0f2d148508ad6bc9932004f281884fdd25ef713ab8c7f37d197cc6fd
+DIST k3b-23.04.3.tar.xz 10951208 BLAKE2B f1361119e4c826ed31e6d9edee1d0c7c025ec7c9e3c04cde09174a84367cf604f3b98065939a06189ac99ee75b5375550396e02b44344ea7c71553abbcf4235f SHA512 de2d1eb7176226751658af688427cd2d2daf038d0dd5941769639a08ddf22064b062b3709f07e72d788c1f19cb15250d8d240ed0edb148e21dcdf4454fcbbcf6
 EBUILD k3b-22.12.3-r1.ebuild 3361 BLAKE2B d6be2e570a64793b345b4934b393743d5ebe047a14d11560b490beae75391bb08d056c5249f22ef2e6885f8218269f4ed792e647b16ee96d32240b148424a10f SHA512 e7b3adebfbe06a4efe9ed92f1f22d99596e488e34c1e38d7b120944d8caca8d2eb4e98906acd72f062ebb70751ff92c34417c2385ba64b579b2930070c771485
-EBUILD k3b-23.04.2.ebuild 3364 BLAKE2B 37df32b947c12af1fccc76017bd3e7330a6d85047f27a4be575aa7e06edee3c9643315be2c37bce792034fc8056fd4e85c8529352a7f655c191089808489cc93 SHA512 767e3df5efb3dc9d955317cc17ecfd4db7dbd51f20340aadd29238f6687ccf6068dbfa1caf3634b4c2f5c1ce971fe62e44f3b2e9eec6e31de0fff93c5314e1ee
+EBUILD k3b-23.04.2-r1.ebuild 3450 BLAKE2B 26bea7eb9e7d943175189e3883bee88a7a0519bcfa3e879db0e7c1743427134cff91fa10635412779bdfaf277ae689b642e178b1b4982593163f80ebc166cb4b SHA512 d62aa5cc5641e12231c9a6549358338bc81be4e4a4798e2162b8c85bbe615baa358fcb5124652b7a93e9f4378a618e14e963b39af51d8d5d1539312c8c4da0b0
+EBUILD k3b-23.04.3.ebuild 3450 BLAKE2B 26bea7eb9e7d943175189e3883bee88a7a0519bcfa3e879db0e7c1743427134cff91fa10635412779bdfaf277ae689b642e178b1b4982593163f80ebc166cb4b SHA512 d62aa5cc5641e12231c9a6549358338bc81be4e4a4798e2162b8c85bbe615baa358fcb5124652b7a93e9f4378a618e14e963b39af51d8d5d1539312c8c4da0b0
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/k3b/files/k3b-23.04.2-disable-transcode.patch b/kde-apps/k3b/files/k3b-23.04.2-disable-transcode.patch
new file mode 100644
index 000000000000..209c13cd4546
--- /dev/null
+++ b/kde-apps/k3b/files/k3b-23.04.2-disable-transcode.patch
@@ -0,0 +1,38 @@
+From cc1e0b76f080ed95c1f6e6d66ad806427f373909 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 6 Jul 2023 13:52:04 +0200
+Subject: [PATCH] Revert "Keep transcode until a replacement is implemented."
+
+Make sure users are not presented with a completely broken option.
+
+This reverts commit f7d385a40cc062fa4db46c165f82f437dea82c58.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ libk3b/core/k3bdefaultexternalprograms.cpp | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/libk3b/core/k3bdefaultexternalprograms.cpp b/libk3b/core/k3bdefaultexternalprograms.cpp
+index e659fc1f8..2ebf88367 100644
+--- a/libk3b/core/k3bdefaultexternalprograms.cpp
++++ b/libk3b/core/k3bdefaultexternalprograms.cpp
+@@ -37,6 +37,8 @@ void K3b::addDefaultPrograms( K3b::ExternalBinManager* m )
+ // https://bugs.kde.org/show_bug.cgi?id=381131
+ void K3b::addTranscodePrograms(K3b::ExternalBinManager* m)
+ {
++    Q_UNUSED(m);
++    /* Deprecated transcode
+     static const char* const transcodeTools[] =  {"transcode",
+                                              0, // K3b 1.0 only uses the transcode binary
+                                              "tcprobe",
+@@ -48,6 +50,7 @@ void K3b::addTranscodePrograms(K3b::ExternalBinManager* m)
+ 
+     for (int i = 0; transcodeTools[i]; ++i)
+         m->addProgram(new K3b::TranscodeProgram(transcodeTools[i]));
++    */
+ }
+ 
+ 
+-- 
+2.41.0
+
diff --git a/kde-apps/k3b/k3b-23.04.2.ebuild b/kde-apps/k3b/k3b-23.04.2-r1.ebuild
index d072c2b7d0bb..12bcb8cce68c 100644
--- a/kde-apps/k3b/k3b-23.04.2.ebuild
+++ b/kde-apps/k3b/k3b-23.04.2-r1.ebuild
@@ -72,10 +72,12 @@ RDEPEND="${DEPEND}
 
 DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt )
 
+PATCHES=( "${FILESDIR}/${PN}-23.04.2-disable-transcode.patch" ) # bugs 891585, 906526
+
 src_configure() {
 	local mycmakeargs=(
 		-DK3B_BUILD_API_DOCS=OFF
-		-DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=OFF
+		-DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=ON
 		-DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
 		-DK3B_ENABLE_HAL_SUPPORT=OFF
 		-DK3B_ENABLE_MUSICBRAINZ=OFF
diff --git a/kde-apps/k3b/k3b-23.04.3.ebuild b/kde-apps/k3b/k3b-23.04.3.ebuild
new file mode 100644
index 000000000000..12bcb8cce68c
--- /dev/null
+++ b/kde-apps/k3b/k3b-23.04.3.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="forceoptional"
+ECM_TEST="true"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.106.0
+QTMIN=5.15.9
+inherit ecm gear.kde.org
+
+DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/k3b/ https://userbase.kde.org/K3b"
+
+LICENSE="GPL-2 FDL-1.2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="dvd ffmpeg flac lame mad musepack sndfile sox taglib vcd vorbis"
+
+REQUIRED_USE="flac? ( taglib ) lame? ( taglib ) sox? ( 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] )
+	lame? ( 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
+	)
+"
+RDEPEND="${DEPEND}
+	app-cdr/cdrdao
+	app-cdr/cdrtools
+	dev-libs/libburn
+	media-sound/cdparanoia
+	dvd? ( >=app-cdr/dvd+rw-tools-7 )
+	sox? ( media-sound/sox )
+	vcd? ( media-video/vcdimager )
+"
+
+DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt )
+
+PATCHES=( "${FILESDIR}/${PN}-23.04.2-disable-transcode.patch" ) # bugs 891585, 906526
+
+src_configure() {
+	local mycmakeargs=(
+		-DK3B_BUILD_API_DOCS=OFF
+		-DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=ON
+		-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_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg)
+		-DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac)
+		-DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex lame)
+		-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)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	ecm_pkg_postinst
+
+	elog "If you get warnings on start-up, uncheck the \"Check system"
+	elog "configuration\" option in the \"Misc\" settings window."
+	elog
+	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."
+}