gentoo Easter resync : 12.04.2020

4 files changed, 3 insertions, 157 deletions

diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 1774ed129407..df559afbd3b6 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,7 +1,4 @@
 AUX cantata-2.2.0-headers.patch 1345 BLAKE2B b11ef0fa85f0e851a812ba2b106a854f7c429ac9f757bb0b33edeab9db8f05779815ca22918811852ba895529eb7e38466057215c124c3889b97a55752ad6428 SHA512 e9c1a3fc756bd3ed37bd8729433d48d4bb652d3fd7d95b3a6024b4b1d6cda72205d1326214b283377a1ee0b376fe1199c351006e8e640ed6ca9ed98f74c1b7df
-AUX cantata-2.3.3-solidlite-static.patch 994 BLAKE2B 66b4a6a0325f0f7cb4f3886bca68c88e45aee4eb08947f422f07d7e43b585d6d3661f92152dcdb2c0fb243978fe3fd203bf14d88cfd7b472031e87f8d83430d4 SHA512 395b9d8968c2be12561ac595c99cd821296722598d33916328823137538d174f9dd2953146eee24263cc8f0485e3e1627eab678890ea6b5c6141472e4ae9aaeb
-DIST cantata-2.3.3.tar.bz2 2445139 BLAKE2B 679ac68afa6219aa684aed1202bb2268552f6fe560db36e17748b9b220ae6ec4ef103ff68b3bcc7127835f8a2debd32895f5edf319a759ce78bc161c4e540a84 SHA512 8314930c9e16a5811f607f131ce7134daa0c6de81c5f87d45967c076895540b388b89b3f2cbd82950f6defb1087e61923c1719670f19b4ed3c074f05fe8577c6
 DIST cantata-2.4.1.tar.bz2 2550982 BLAKE2B 1d965ce4a5a73d4695b51def9753c95376b71367f2e6abf69681aad84e387d86d87abcf623f613a517e5e08a633e4e9bf2bae2d28858535fac2f05ade73a6c01 SHA512 9bb9953f41ad562e186c201505db6ea42dccdcb0b60e0c6eda0c5521428ecafdba95b51e8827de3498b2b25284d36f800bfa96a49839d2a69e0f92705f44a439
-EBUILD cantata-2.3.3-r1.ebuild 3122 BLAKE2B 703fc71f6ae30d6667849d33e9f1e1500c9fa518f036541816ec0cdb7a4b1ff830c7887efb238dd377440ffaab2f5cf5a66b313f6639500cb4b34985772e2320 SHA512 aa1d225b9d6abb1161171e33cab208afaed48f0fe361e7bce9a401010740beaaaa7c9ee7b3b1c36bb98cdadb1d9c8a805bd8c8b8d1f8e10de486d3e1a31ce4cb
-EBUILD cantata-2.4.1.ebuild 3067 BLAKE2B 9d29921cac1df1acb6848ac4c4d28fd03b35df1b1c9b7d7a1a0fc75a42883cab742a36c2aeaa1005529b83cbd8750e39ecb6c8efdba34e6e0c1c420ab6f864e1 SHA512 a9b9c30a03a12584b4b7a7f3de25a0cf2f4b79a0702b71736f60b6ac3e0e31ef642dc55e0200a014033e408032dc004ccb457f473a165e215bbc5df648b273cd
+EBUILD cantata-2.4.1.ebuild 3071 BLAKE2B 84487d366feb1570a0b3ed27613988ff19d8c40e2743af2d08b67eacc57fdbbe4a953bd7ca584718a0dce7931439cb3d5773cc2476cb5a2bc3eeda50983b6116 SHA512 0004a8415f587415c5fbb2f5c59bbb6c069dd2a4697d8c8a3fbb1f8ae661565535db64da25bade171ae84db28d4d53d2bf2b0490821803eedb253b7e0e152469
 MISC metadata.xml 739 BLAKE2B 48f6246515dd08a87d867e69f1d03042ef1018654bcd726e8d91366c15e7b1275ec60f5a6df8bc38c8310d1b24b1b0f355b5339ab30be7c11f57ebe84d8c71f6 SHA512 1e212d1621607ea9a0523146e5eba5e16c9b5ddc7021d409c16ccc93840cffe39a9c601c222e97f37ab38e7c69fa5eac285872fa7a2f52b0f4e8a0cc1e520d97
diff --git a/media-sound/cantata/cantata-2.3.3-r1.ebuild b/media-sound/cantata/cantata-2.3.3-r1.ebuild
deleted file mode 100644
index b29c21cf2734..000000000000
--- a/media-sound/cantata/cantata-2.3.3-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="cs da de en_GB es fr hu it ja ko pl pt_BR ru zh_CN"
-inherit cmake l10n 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 libav 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 )
-"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-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
-		libav? ( media-video/libav:= )
-		!libav? ( 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
-"
-
-# cantata has no tests
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.0-headers.patch"
-	"${FILESDIR}/${P}-solidlite-static.patch" # bug 678228
-)
-
-src_prepare() {
-	remove_locale() {
-		rm "translations/${PN}_${1}".ts || die
-	}
-
-	cmake_src_prepare
-
-	# Unbundle 3rd party libs
-	rm -r 3rdparty/{ebur128,qtsingleapplication} || die
-
-	l10n_find_plocales_changes "translations" "${PN}_" ".ts"
-	l10n_for_each_disabled_locale_do 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/cantata-2.4.1.ebuild b/media-sound/cantata/cantata-2.4.1.ebuild
index 3a8db8b4bd5a..830330e2fe15 100644
--- a/media-sound/cantata/cantata-2.4.1.ebuild
+++ b/media-sound/cantata/cantata-2.4.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PLOCALES="cs da de en_GB es fr hu it ja ko pl pt_BR ru zh_CN"
+PLOCALES="cs da de en_GB es fi fr hu it ja ko nl pl pt_BR ru zh_CN"
 inherit cmake l10n qmake-utils xdg
 
 DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)"
@@ -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 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="cdda cddb cdio http-server libav mtp musicbrainz replaygain streaming taglib udisks zeroconf"
 REQUIRED_USE="
 	?? ( cdda cdio )
diff --git a/media-sound/cantata/files/cantata-2.3.3-solidlite-static.patch b/media-sound/cantata/files/cantata-2.3.3-solidlite-static.patch
deleted file mode 100644
index 891917eebcb1..000000000000
--- a/media-sound/cantata/files/cantata-2.3.3-solidlite-static.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From aa35362aa2835e9e2903f5f785f10402a6abd3a1 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 17 Feb 2019 16:58:48 +0100
-Subject: [PATCH] Fix solid-lite static linking
-
-If BUILD_SHARED_LIBS is part of standard system cmake args:
-
-  cantata: error while loading shared libraries: libsolidlite.so:
-  cannot open shared object file: No such file or directory
----
- 3rdparty/solid-lite/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/3rdparty/solid-lite/CMakeLists.txt b/3rdparty/solid-lite/CMakeLists.txt
-index 4ae51aab..86e37189 100644
---- a/3rdparty/solid-lite/CMakeLists.txt
-+++ b/3rdparty/solid-lite/CMakeLists.txt
-@@ -202,7 +202,7 @@ if(APPLE)
-    set(solidlite_OPTIONAL_LIBS ${IOKIT_LIBRARY})
- endif()
- 
--add_library(solidlite ${solidlite_LIB_SRCS})
-+add_library(solidlite STATIC ${solidlite_LIB_SRCS})
- 
- if ( UDEV_FOUND )
-    set(solidlite_OPTIONAL_LIBS ${solidlite_OPTIONAL_LIBS} ${UDEV_LIBS})
--- 
-2.20.1
-