gentoo resync : 29.12.2022

4 files changed, 0 insertions, 188 deletions

diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index f48c11f01aea..6ed01eaf00ce 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,8 +1,4 @@
 AUX cantata-2.2.0-headers.patch 1345 BLAKE2B b11ef0fa85f0e851a812ba2b106a854f7c429ac9f757bb0b33edeab9db8f05779815ca22918811852ba895529eb7e38466057215c124c3889b97a55752ad6428 SHA512 e9c1a3fc756bd3ed37bd8729433d48d4bb652d3fd7d95b3a6024b4b1d6cda72205d1326214b283377a1ee0b376fe1199c351006e8e640ed6ca9ed98f74c1b7df
-AUX cantata-2.4.2-main-musl.patch 1196 BLAKE2B 13272e8b73aa97d4bac7b81de362dc9b58fc79e576f94fd8f314249072d3d32e83113f8cf7c1126d4af02f27c0cc025217a33665d36f4a75bc6e5dc664a7dcaf SHA512 23d22e126ea39739c67331b3db3a17d61bb4d0a462273c6bd7e652c8ca421fe3d15e264e3f752c6b0b6a7349753bd4396e061e5280fce2e7a26b2058453e4dcd
-AUX cantata-2.4.2-solid-musl.patch 1035 BLAKE2B 43b0f3312e93f8fe92b56dd488a70c815f448b6907ae1db3418f65aaef394f06ffb82279c483185cc4cde74081b28a0bba3b92c8c5a29f2fff2d3ff5ab510d67 SHA512 eb34e0939500b9176829347329ed508f0ba08e92cf450b949661a103782385cfd9175551cd8f0832799ebcf116c89cca98fad4eaa236729c38c1724b5b981221
-DIST cantata-2.4.2.tar.bz2 2498460 BLAKE2B 82486a644fa90567f2c1c997645817d9adee841b79fb782c4984143a0ef25758e8b6605de86eed1c09b2b63b9d570adc0c647245c5e0e900652c0444671c67a7 SHA512 c2459a53d86e12df7e6a8f7c19880f1c353c13893401a0906ec730c34ccbf1ef070c226b55c4e772e9a54a94e7cf3a2f96b0e9223ff20057045c888c4f91d87b
 DIST cantata-2.5.0.tar.bz2 2487031 BLAKE2B ad77987aae205695393a4fc782dc442a467ca392ce60251efdc68d12d29b3d2f24270f462a0dbfe0c375905f9356b8c649ff139021629ba58fd7de80819fdba0 SHA512 42f28321d01e0bc3a315030066b738dead8f8f8caed8c1115729a3d370d68d9d845f00576fc81ddba694bba6a4ae57c3f7de714b2e39874458548c3e5bb8b2d2
-EBUILD cantata-2.4.2.ebuild 3122 BLAKE2B 5b63451d54fc89b3bf5d73248cf52f907b144899fbe807811d790d2e1c3ff715cb858938be19203bef55eed785f867ffb8466a3130ab90f93bf6215d04f9e595 SHA512 eab98c659bd6cf62ca4e2399336c0daf91b4a64f53289d9069c8d016a41c21ce80e3cf626cfbcfa5a3517352978b07594b59af63e9325fb57b6886a53cc67f9e
 EBUILD cantata-2.5.0.ebuild 2966 BLAKE2B 41b9349b5955f2bcd0b523cfb52e230d489082a765aa221699d629965892ee5be7fd7de362b713cd98c280b1834dced1f33c9e709ce745b009c20f4dd0c09bd7 SHA512 cf700170c18964caf712ebc13fd458b0021c076860d1ae3509606048acdb7b614bb0276ce4601b57f2739fe200ecac5b4bf0bce25d040f2fadb7578d39b9be3c
 MISC metadata.xml 740 BLAKE2B 20184d3cb15c328f809d6d182cd2a9c93df568e0cdcdd74aec83e0a2d66424da412d7b1432212e70857af62c49da2ca390070b452d34e50ecf7f91d2ab782582 SHA512 f9d6d49ab1977f21a8014acc34cab6334c9e3e7d9524d021f821ee20ad38d55dc47274986759f458d1f495b91b4dce0a95e6ff4b23ddf8375514e8b7e8e0165c
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