gentoo auto-resync : 22:02:2025 - 00:16:22

3 files changed, 3 insertions, 118 deletions

diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 5006ddf53966..9a1586029038 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -4,7 +4,6 @@ AUX cantata-3.3.0-cdparanoia.patch 989 BLAKE2B f90435a3d037b34cb8a8783d6b2826c93
 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-r2.ebuild 3027 BLAKE2B 991603af35e393ce1c18cd05ae56877eb5427892ca5c32df9c4de59e9d53f7c3b92ac9eea482bc56096d8e37071896434f54d855613194581ad186d88ed2f650 SHA512 8c5d32d685400a295cbd290e142197f73b9471d44a2a8451a91736094227df6a66468016a6aa709a271006091cfebe6bde49976b88fd97d1819b1a62b5758d2b
-EBUILD cantata-2.5.0-r3.ebuild 3029 BLAKE2B b602e63e269cf030e5530e8dc1b7d9d8fe55174918b2f23ce2cadf5cd588b9ccaa0f9342eeed20e07a3a35e72279e23947d6e870d948e7f8893e87a46ae59f39 SHA512 77bc72e443b67c56a88da45df3baf7641a6ed99b159a617c763ee02eb8488ab92086d756e784675178a22647a744963d1b82527d2e3d00e87aa01bace9ceeaac
+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
diff --git a/media-sound/cantata/cantata-2.5.0-r2.ebuild b/media-sound/cantata/cantata-2.5.0-r2.ebuild
deleted file mode 100644
index 334a2e24c048..000000000000
--- a/media-sound/cantata/cantata-2.5.0-r2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2024 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-5.38.2-r3[perl_features_ithreads] <dev-lang/perl-5.38.2-r3[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" )
-
-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-2.5.0-r3.ebuild b/media-sound/cantata/cantata-2.5.0-r3.ebuild
index 139eb5c102bd..d124273d5af5 100644
--- a/media-sound/cantata/cantata-2.5.0-r3.ebuild
+++ b/media-sound/cantata/cantata-2.5.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/CDrummond/${PN}/releases/download/v${PV}/${P}.tar.bz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib udisks zeroconf"
 REQUIRED_USE="
 	?? ( cdda cdio )