[gentoo-commits] repo/gentoo:master commit in: media-sound/cantata/files/, media-sound/cantata/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     db53ae9aaf5ca4a26e7a37d1b543316584cfa296
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 15 10:38:13 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 15 10:55:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db53ae9a

media-sound/cantata: Drop 2.4.2

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-sound/cantata/Manifest                       |   1 -
 media-sound/cantata/cantata-2.4.2.ebuild           | 121 ---------------------
 .../cantata/files/cantata-2.4.2-main-musl.patch    |  34 ------
 .../cantata/files/cantata-2.4.2-solid-musl.patch   |  29 -----
 4 files changed, 185 deletions(-)

diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index c8ac65fd7ed6..b546787031ac 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,2 +1 @@
-DIST cantata-2.4.2.tar.bz2 2498460 BLAKE2B 82486a644fa90567f2c1c997645817d9adee841b79fb782c4984143a0ef25758e8b6605de86eed1c09b2b63b9d570adc0c647245c5e0e900652c0444671c67a7 SHA512 c2459a53d86e12df7e6a8f7c19880f1c353c13893401a0906ec730c34ccbf1ef070c226b55c4e772e9a54a94e7cf3a2f96b0e9223ff20057045c888c4f91d87b
 DIST cantata-2.5.0.tar.bz2 2487031 BLAKE2B ad77987aae205695393a4fc782dc442a467ca392ce60251efdc68d12d29b3d2f24270f462a0dbfe0c375905f9356b8c649ff139021629ba58fd7de80819fdba0 SHA512 42f28321d01e0bc3a315030066b738dead8f8f8caed8c1115729a3d370d68d9d845f00576fc81ddba694bba6a4ae57c3f7de714b2e39874458548c3e5bb8b2d2

diff --git a/media-sound/cantata/cantata-2.4.2.ebuild b/media-sound/cantata/cantata-2.4.2.ebuild
deleted file mode 100644
index 0b6da7338566..000000000000
--- a/media-sound/cantata/cantata-2.4.2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="cs da de en_GB es fi fr hu it ja ko nl pl pt_BR ru zh_CN"
-inherit cmake plocale qmake-utils 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 ~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[ithreads]
-	|| ( kde-frameworks/breeze-icons:5 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}/${P}-solid-musl.patch" # bug 792555
-	"${FILESDIR}/${P}-main-musl.patch" # bug 807763
-)
-
-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)
-		-DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
-		-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/files/cantata-2.4.2-main-musl.patch b/media-sound/cantata/files/cantata-2.4.2-main-musl.patch
deleted file mode 100644
index 492dc815854a..000000000000
--- a/media-sound/cantata/files/cantata-2.4.2-main-musl.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d837de8669a2c0eee835d81d9105e21172c8efc0 Mon Sep 17 00:00:00 2001
-From: Helmut Pozimski <helmut@pozimski.eu>
-Date: Sat, 16 Jun 2018 10:01:19 +0200
-Subject: [PATCH] Fix gui/main.cpp build with musl
-
-Picked from VoidLinux:
-
-https://github.com/void-linux/void-packages/commit/188bc4852af59e20f60b186e7acaaaa4b8ce51ab#diff-413d61b1a38989fbf79759fb57901b99d629706587f21aa4b1b19fb8ef23fd4b
----
- gui/main.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gui/main.cpp b/gui/main.cpp
-index 3424e94f7..f3851a0ef 100644
---- a/gui/main.cpp
-+++ b/gui/main.cpp
-@@ -266,7 +266,7 @@ static void installDebugMessageHandler(const QString &cmdLine)
-     qInstallMessageHandler(cantataQtMsgHandler);
- }
- 
--#if defined Q_OS_LINUX && defined __GNUC__
-+#if defined Q_OS_LINUX && defined __GNUC__ && defined __GLIBC__
- #include <execinfo.h>
- #include <unistd.h>
- #include <signal.h>
-@@ -346,7 +346,7 @@ static void sigHandler(int i)
- 
- int main(int argc, char *argv[])
- {
--    #if defined Q_OS_LINUX && defined __GNUC__
-+    #if defined Q_OS_LINUX && defined __GNUC__ && defined __GLIBC__
-     signal(SIGSEGV, sigHandler);
-     #endif
-     QThread::currentThread()->setObjectName("GUI");

diff --git a/media-sound/cantata/files/cantata-2.4.2-solid-musl.patch b/media-sound/cantata/files/cantata-2.4.2-solid-musl.patch
deleted file mode 100644
index 6b541536c62e..000000000000
--- a/media-sound/cantata/files/cantata-2.4.2-solid-musl.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 835e48074834fb5b888d53b00f84967701d6d78a Mon Sep 17 00:00:00 2001
-From: Michael Pyne <mpyne@kde.org>
-Date: Sun, 23 Jul 2017 11:37:10 -0400
-Subject: [PATCH] Require sys/types.h for dev_t unconditionally.
-
-Fixes a build error with musl libc.  Turns out this is the required
-header for dev_t, and not just for FreeBSD.  That it works without on
-glibc is just an accident.
-
-Differential Revision: https://phabricator.kde.org/D6596
-
-(cherry picked from commit 2382c3f8d3669c473130f4baefb68d244dcb5cbc)
----
- 3rdparty/solid-lite/backends/udisks2/udisksblock.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/3rdparty/solid-lite/backends/udisks2/udisksblock.h b/3rdparty/solid-lite/backends/udisks2/udisksblock.h
-index 87c358099a..7b7305d73e 100644
---- a/3rdparty/solid-lite/backends/udisks2/udisksblock.h
-+++ b/3rdparty/solid-lite/backends/udisks2/udisksblock.h
-@@ -24,6 +24,8 @@
- #include <solid-lite/ifaces/block.h>
- #include "udisksdeviceinterface.h"
- 
-+#include <sys/types.h> // dev_t
-+
- namespace Solid
- {
- namespace Backends