gentoo auto-resync : 02:04:2025 - 01:33:40

6 files changed, 3 insertions, 215 deletions

diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 9a1586029038..de9c1886d949 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,9 +1,5 @@
-AUX cantata-2.2.0-headers.patch 1345 BLAKE2B b11ef0fa85f0e851a812ba2b106a854f7c429ac9f757bb0b33edeab9db8f05779815ca22918811852ba895529eb7e38466057215c124c3889b97a55752ad6428 SHA512 e9c1a3fc756bd3ed37bd8729433d48d4bb652d3fd7d95b3a6024b4b1d6cda72205d1326214b283377a1ee0b376fe1199c351006e8e640ed6ca9ed98f74c1b7df
-AUX cantata-2.5.0-fix-build-taglib2.patch 2182 BLAKE2B 053d5e8e2a111b0944732e8cc5240f78763b8bdeec0544e5e806ec10876eef608875f77264837cc83a6418fa2a397d46e4396f8bee8fd94c3e080594c963a68b SHA512 bb5c2a712c3bf5cdb1e274470b184b66e243debf768f7286d636b9556991a973c718e8cda693ae8a308d95c0d006dbffbfc13f34a6e8b83f25282aae150dff1b
 AUX cantata-3.3.0-cdparanoia.patch 989 BLAKE2B f90435a3d037b34cb8a8783d6b2826c931c0f3796b0b2c905910cd853055950f8ae9d5b64a7c5be674c3a2e5f50253a6e62bf6623ca76ad093bd7bb48e76c4c4 SHA512 014d0168e5e204d1356b64a8238f7fcae63eea093e9fcde02f600c0380a81b6cc189519c2f68a87cc80e00695423e6e6ce4bed601f739e54e8b49109b755c342
 AUX cantata-3.3.0-rm-vendor.patch 7742 BLAKE2B 1ec70c25d9a6ee60a7130bc5f82eb930a6e884c13ea28b3f7ee3fcab07fb4178b89b91fe190dd12fac8d7d868c606f113997ef27f76b3854ff00d678c8906611 SHA512 674872a610610c3828ea4597351fa0c10ac48e6ccdea96ea79c67286914d82e45365c774b4d5829cc3da17b51980a4eef5857f086d48e2deb81d6fc14b31fc1d
-DIST cantata-2.5.0.tar.bz2 2487031 BLAKE2B ad77987aae205695393a4fc782dc442a467ca392ce60251efdc68d12d29b3d2f24270f462a0dbfe0c375905f9356b8c649ff139021629ba58fd7de80819fdba0 SHA512 42f28321d01e0bc3a315030066b738dead8f8f8caed8c1115729a3d370d68d9d845f00576fc81ddba694bba6a4ae57c3f7de714b2e39874458548c3e5bb8b2d2
 DIST cantata-3.3.0.tar.gz 4783803 BLAKE2B 78995492080cacf4d5f01e923a71edb2208baa9238d269679f6ea0112cf06066295bbeb40b18439bcd45fea8079ea6c52422f5515ed6f0c1511f7942f3b96f15 SHA512 ec011a2e544a882c68a808d27752457e4702f20b0ed66124dcc10586c8f5cc975690a4fc7368abc2747fd4f603f19b787a45f5a664f3ace8bcc9f1f86369253e
-EBUILD cantata-2.5.0-r3.ebuild 3028 BLAKE2B ae715897e11a62901f61cf25c3d844e0c1b9e3fb8d757f050ae3392a951981f99b75d2dd12ffb4b881b34cd713ec0889c1eaa7064f752f303dedc603a9b0ac41 SHA512 69553e3305d3ae8d351e2d72c13649490a7605cf1fa15718770132e376034374201e52c344fb539406448cf0687e76f303312909afa2c8eaeb1e7b8c639b4428
-EBUILD cantata-3.3.0.ebuild 2793 BLAKE2B 195143a18514bb914a6a2165b22411c3f81f29f31954ac1d5479082cd228c2dd845ac73ff9b8c2d76f49b116e3978dbabf23d21e18b94fe19deae0c7fe9b4382 SHA512 e9d9186570abe6d5e5a97a172998d9f77f841baeaf3341c4c9cdda1005e740872af512bc974a70eccbca7b7fe99e4bbbb5a5eaa05a9919d37fcdb2e375f5e053
-MISC metadata.xml 736 BLAKE2B 1c20dbd81873fffceeb50e411b3b32b52a18b6eb9fc0b1280050507632a6aec6e17a6705c86ea30bc83692aefc0e80391e477f664616d93989f2d8f41add4404 SHA512 99b3f2141438cf0af1a9909ca9932021e8d0de995181af249461d00c18c590f3dd97760dd813036479d10d9c2c3ce67ebdeb733ee58f7e23805787719b63e6a3
+EBUILD cantata-3.3.0.ebuild 2792 BLAKE2B b1e780074c561f89c6eb6bf399922533ac494b6e0af07fd116a88d88ee6b01bb434a85e31a9546cd6fc8d676849df55a6eadc8d744aa1f1ef214a0324291e4cf SHA512 9e82bb8df00b295b4008d37c3595ac84d64ee142cb1e3a545ecf91ae858209af0103fff4588c7d2efdbd7387642935102ef31d95fc2dab69e77dcf507a8fa944
+MISC metadata.xml 629 BLAKE2B a5b832cb7b08b71e25c31b8431744b4082cb20495291fcafb7cf82cba769bb49b3dca16493024545990edc4c71cc3dfbf9306c04077b03f7ad8e93d77e80cb9f SHA512 845e3a36e7c9d7a73b63c72c274b5329dc382303fc6e9e888742699ab9bd5e6238e8eaa83f871bc2080442121096c10aeead789149a21cbecf5ffabacb927767
diff --git a/media-sound/cantata/cantata-2.5.0-r3.ebuild b/media-sound/cantata/cantata-2.5.0-r3.ebuild
deleted file mode 100644
index d124273d5af5..000000000000
--- a/media-sound/cantata/cantata-2.5.0-r3.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PLOCALES="cs da de en_GB es fi fr hu it ja ko nl pl pt_BR ru zh_CN"
-inherit cmake plocale xdg
-
-DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)"
-HOMEPAGE="https://github.com/CDrummond/cantata"
-SRC_URI="https://github.com/CDrummond/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
-IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib udisks zeroconf"
-REQUIRED_USE="
-	?? ( cdda cdio )
-	cdda? ( udisks || ( cddb musicbrainz ) )
-	cddb? ( || ( cdio cdda ) taglib )
-	cdio? ( udisks || ( cddb musicbrainz ) )
-	mtp? ( taglib udisks )
-	musicbrainz? ( || ( cdio cdda ) taglib )
-	replaygain? ( taglib )
-"
-# cantata has no tests
-RESTRICT="test"
-
-COMMON_DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5[sqlite]
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	sys-libs/zlib
-	virtual/libudev:=
-	cdda? ( media-sound/cdparanoia )
-	cddb? ( media-libs/libcddb )
-	cdio? ( dev-libs/libcdio-paranoia:= )
-	mtp? ( media-libs/libmtp:= )
-	musicbrainz? ( media-libs/musicbrainz:5= )
-	replaygain? (
-		media-libs/libebur128:=
-		media-sound/mpg123
-		media-video/ffmpeg:0=
-	)
-	streaming? ( dev-qt/qtmultimedia:5 )
-	taglib? (
-		media-libs/taglib:=[asf(+),mp4(+)]
-		udisks? ( sys-fs/udisks:2 )
-	)
-	zeroconf? ( net-dns/avahi )
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-lang/perl[perl_features_ithreads]
-	|| ( kde-frameworks/breeze-icons:* kde-frameworks/oxygen-icons:* )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/qtconcurrent:5
-"
-BDEPEND="dev-qt/linguist-tools:5"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.0-headers.patch"
-	"${FILESDIR}/${PN}-2.5.0-fix-build-taglib2.patch"
-)
-
-src_prepare() {
-	remove_locale() {
-		rm "translations/${PN}_${1}".ts || die
-	}
-
-	cmake_src_prepare
-
-	# Unbundle 3rd party libs
-	rm -r 3rdparty/{ebur128,qtsingleapplication} || die
-
-	plocale_find_changes "translations" "${PN}_" ".ts"
-	plocale_for_each_disabled_locale remove_locale
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCANTATA_HELPERS_LIB_DIR="$(get_libdir)"
-		-DENABLE_CDPARANOIA=$(usex cdda)
-		-DENABLE_CDDB=$(usex cddb)
-		-DENABLE_CDIOPARANOIA=$(usex cdio)
-		-DENABLE_HTTP_SERVER=$(usex http-server)
-		-DENABLE_MTP=$(usex mtp)
-		-DENABLE_MUSICBRAINZ=$(usex musicbrainz)
-		-DENABLE_FFMPEG=$(usex replaygain)
-		-DENABLE_MPG123=$(usex replaygain)
-		-DENABLE_HTTP_STREAM_PLAYBACK=$(usex streaming)
-		-DENABLE_TAGLIB=$(usex taglib)
-		-DENABLE_DEVICES_SUPPORT=$(usex udisks)
-		-DENABLE_AVAHI=$(usex zeroconf)
-		-DENABLE_REMOTE_DEVICES=OFF
-		-DENABLE_UDISKS2=ON
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	has_version media-sound/mpd || \
-		elog "An instance of media-sound/mpd, local or remote, is required to set up Cantata."
-
-	if ! has_version app-misc/media-player-info; then
-		elog "Install app-misc/media-player-info to enable identification"
-		elog "and querying of portable media players"
-	fi
-}
diff --git a/media-sound/cantata/cantata-3.3.0.ebuild b/media-sound/cantata/cantata-3.3.0.ebuild
index 5d5530e4499d..0eead19fecd0 100644
--- a/media-sound/cantata/cantata-3.3.0.ebuild
+++ b/media-sound/cantata/cantata-3.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nullobsi/cantata/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 ~x86"
 IUSE="cdda cddb http-server mtp musicbrainz replaygain streaming +taglib udisks zeroconf"
 REQUIRED_USE="
 	cdda? ( taglib udisks || ( cddb musicbrainz ) )
diff --git a/media-sound/cantata/files/cantata-2.2.0-headers.patch b/media-sound/cantata/files/cantata-2.2.0-headers.patch
deleted file mode 100644
index 962c8413a9fd..000000000000
--- a/media-sound/cantata/files/cantata-2.2.0-headers.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Description: Fix include location for ebur128 files
- The Debian packages for ebur128 are shipping the headers in:
-
-    libebur128-dev: /usr/include/ebur128.h
-
- while the upstream code expects ebur128/ebur128.h
-
-Author: Stuart Prescott <stuart@debian.org>
-Forwarded: not sure -- check interaction with cmake rules
-diff --git a/replaygain/ffmpeginput.cpp b/replaygain/ffmpeginput.cpp
-index 24e47d34..382bac90 100644
---- a/replaygain/ffmpeginput.cpp
-+++ b/replaygain/ffmpeginput.cpp
-@@ -31,7 +31,7 @@ extern "C" {
- #include <QString>
- #include <QList>
- #include <QByteArray>
--#include "ebur128/ebur128.h"
-+#include "ebur128.h"
- #include "ffmpeginput.h"
- 
- static QMutex mutex;
-diff --git a/replaygain/mpg123input.cpp b/replaygain/mpg123input.cpp
-index 43ae0371..6a7b266f 100644
---- a/replaygain/mpg123input.cpp
-+++ b/replaygain/mpg123input.cpp
-@@ -18,7 +18,7 @@ extern "C" {
- #include <QFile>
- #include <QString>
- #include <QByteArray>
--#include "ebur128/ebur128.h"
-+#include "ebur128.h"
- #include "mpg123input.h"
- 
- struct Mpg123Input::Handle {
-diff --git a/replaygain/trackscanner.h b/replaygain/trackscanner.h
-index b8709115..631e551a 100644
---- a/replaygain/trackscanner.h
-+++ b/replaygain/trackscanner.h
-@@ -25,7 +25,7 @@
- #define _SCANNER_H_
- 
- #include "jobcontroller.h"
--#include "ebur128/ebur128.h"
-+#include "ebur128.h"
- 
- class Input;
- 
diff --git a/media-sound/cantata/files/cantata-2.5.0-fix-build-taglib2.patch b/media-sound/cantata/files/cantata-2.5.0-fix-build-taglib2.patch
deleted file mode 100644
index c0cc7490b18d..000000000000
--- a/media-sound/cantata/files/cantata-2.5.0-fix-build-taglib2.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-patch from fork as official is archived
-https://github.com/nullobsi/cantata/commit/45bac9eb3e99ed75b6539f92418556dac1c0193d.patch
-diff --git a/tags/tags.cpp b/tags/tags.cpp
-index ce86a1e8..5817dc1b 100644
---- a/tags/tags.cpp
-+++ b/tags/tags.cpp
-@@ -619,7 +619,7 @@ static void readAPETags(TagLib::APE::Tag *tag, Song *song, ReplayGain *rg, QImag
-         if (map.contains("COVER ART (FRONT)")) {
-             const TagLib::ByteVector nullStringTerminator(1, 0);
- 
--            TagLib::ByteVector item = map["COVER ART (FRONT)"].value();
-+            TagLib::ByteVector item = map["COVER ART (FRONT)"].binaryData();
-             int pos = item.find(nullStringTerminator);   // Skip the filename
- 
-             if (++pos > 0) {
-@@ -1301,7 +1301,7 @@ static void readTags(const TagLib::FileRef fileref, Song *song, ReplayGain *rg,
-         }
-     } else if (TagLib::RIFF::WAV::File *file = dynamic_cast< TagLib::RIFF::WAV::File * >(fileref.file())) {
-         if (file->tag()) {
--            readID3v2Tags(file->tag(), song, rg, img, lyrics, rating);
-+            readID3v2Tags(file->ID3v2Tag(), song, rg, img, lyrics, rating);
-         }
-     #ifdef TAGLIB_ASF_FOUND
-     } else if (TagLib::ASF::File *file = dynamic_cast< TagLib::ASF::File * >(fileref.file())) {
-@@ -1419,7 +1419,7 @@ static bool writeTags(const TagLib::FileRef fileref, const Song &from, const Son
-         }
-     } else if (TagLib::RIFF::WAV::File *file = dynamic_cast< TagLib::RIFF::WAV::File * >(fileref.file())) {
-         if (file->tag()) {
--            changed=writeID3v2Tags(file->tag(), from, to, rg, img, rating) || changed;
-+            changed=writeID3v2Tags(file->ID3v2Tag(), from, to, rg, img, rating) || changed;
-         }
-     #ifdef TAGLIB_ASF_FOUND
-     } else if (TagLib::ASF::File *file = dynamic_cast< TagLib::ASF::File * >(fileref.file())) {
-@@ -1455,7 +1455,7 @@ Song read(const QString &fileName)
- 
-     readTags(fileref, &song, nullptr, nullptr, nullptr, nullptr);
-     song.file=fileName;
--    song.time=fileref.audioProperties() ? fileref.audioProperties()->length() : 0;
-+    song.time=fileref.audioProperties() ? fileref.audioProperties()->lengthInSeconds() : 0;
-     return song;
- }
- 
diff --git a/media-sound/cantata/metadata.xml b/media-sound/cantata/metadata.xml
index 4c29857ebbda..1aaba5bbf0b5 100644
--- a/media-sound/cantata/metadata.xml
+++ b/media-sound/cantata/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo KDE Project</name>
 	</maintainer>
 	<use>
-		<flag name="cdio">Use <pkg>dev-libs/libcdio-paranoia</pkg> for CD support (instead of cdparanoia)</flag>
 		<flag name="http-server">Enable internal HTTP server to play non-MPD files</flag>
 		<flag name="replaygain">Enable ReplayGain support, for relative volume adjustments</flag>
 		<flag name="streaming">Enable playback of MPD HTTP streams using (<pkg>dev-qt/qtmultimedia</pkg>)</flag>