gentoo resync : 03.03.2019

3 files changed, 0 insertions, 151 deletions

diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 3c8ea8fe50fb..86814bdb755b 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,8 +1,5 @@
 AUX cantata-2.2.0-headers.patch 1345 BLAKE2B b11ef0fa85f0e851a812ba2b106a854f7c429ac9f757bb0b33edeab9db8f05779815ca22918811852ba895529eb7e38466057215c124c3889b97a55752ad6428 SHA512 e9c1a3fc756bd3ed37bd8729433d48d4bb652d3fd7d95b3a6024b4b1d6cda72205d1326214b283377a1ee0b376fe1199c351006e8e640ed6ca9ed98f74c1b7df
-AUX cantata-2.3.2-opusfile.patch 1529 BLAKE2B fdfd27280f757ba4fa017fde4d52514dbbece6219feede3e35f9304de783787a75e43f6a1ecabc2d9bdd773c1c5db3e6d85dc206ed5e0d8425c23a37b52d0213 SHA512 e6b8d714ca6a37fd096ad77fb187e9552058dae98c73ebed9f30e04dd03f8467a27ce0cf1afa9a868e86cb5c8aad05599bafb6b56929de9753251e2bb22c6b78
 AUX cantata-2.3.3-solidlite-static.patch 994 BLAKE2B 66b4a6a0325f0f7cb4f3886bca68c88e45aee4eb08947f422f07d7e43b585d6d3661f92152dcdb2c0fb243978fe3fd203bf14d88cfd7b472031e87f8d83430d4 SHA512 395b9d8968c2be12561ac595c99cd821296722598d33916328823137538d174f9dd2953146eee24263cc8f0485e3e1627eab678890ea6b5c6141472e4ae9aaeb
-DIST cantata-2.3.2.tar.bz2 2440595 BLAKE2B d77a41752ff9660f27da11748497b394667f456edf52d785b3ebf31446045a4de2bcc9b22ac2d68dfd4e0f00d10a53ae9e79643e116783879eb68bab48b59589 SHA512 d55ee5f2194626db3465d8c499459bac82656e12bdb5f771581eef9d6a42ee25fc9b31e8bb5cea8913cbd47a967141f990efddb353797f81e722b7b99a73b1a4
 DIST cantata-2.3.3.tar.bz2 2445139 BLAKE2B 679ac68afa6219aa684aed1202bb2268552f6fe560db36e17748b9b220ae6ec4ef103ff68b3bcc7127835f8a2debd32895f5edf319a759ce78bc161c4e540a84 SHA512 8314930c9e16a5811f607f131ce7134daa0c6de81c5f87d45967c076895540b388b89b3f2cbd82950f6defb1087e61923c1719670f19b4ed3c074f05fe8577c6
-EBUILD cantata-2.3.2.ebuild 3231 BLAKE2B eb0e61fe493625c48e813a5bfef9f783ee18228f4d0834e773d090f9e222039827cfad373cec47ac73cf6c588446d5f6097c3388c4e2fd7168519a52d8a10880 SHA512 5a5a92ca899306963e8740a6000b5333ac71bfb10086a1b6e35c7ce598275fc9a21b16b4881b80353a786e13f70b388785119f18bc05c9c2b35cf42b2144a5d0
 EBUILD cantata-2.3.3-r1.ebuild 3133 BLAKE2B 07da67ff326f1309b0fcd7f42aa02c70a102b92c48b2aa442f8d5bfb6b1b066f80b6d67a3efb8f6491d135493bc403c385f4732b67bcc656d22b49067c1cfc48 SHA512 6b880a9b9533fc98e20ce7d222288f09141cb50e2b29e1de7e8130edaeaed80df47c3f6d14405d19d9827ae2d8df1a7703a5c489d06ce9f0aaef6621bebe865d
 MISC metadata.xml 739 BLAKE2B 48f6246515dd08a87d867e69f1d03042ef1018654bcd726e8d91366c15e7b1275ec60f5a6df8bc38c8310d1b24b1b0f355b5339ab30be7c11f57ebe84d8c71f6 SHA512 1e212d1621607ea9a0523146e5eba5e16c9b5ddc7021d409c16ccc93840cffe39a9c601c222e97f37ab38e7c69fa5eac285872fa7a2f52b0f4e8a0cc1e520d97
diff --git a/media-sound/cantata/cantata-2.3.2.ebuild b/media-sound/cantata/cantata-2.3.2.ebuild
deleted file mode 100644
index e65a73704d8d..000000000000
--- a/media-sound/cantata/cantata-2.3.2.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="cs da de en_GB es fr hu it ja ko pl pt_BR ru zh_CN"
-inherit cmake-utils gnome2-utils l10n qmake-utils xdg-utils
-
-DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)"
-HOMEPAGE="https://github.com/CDrummond/cantata"
-SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 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 )
-"
-
-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
-	|| ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
-	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]
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/qtconcurrent:5
-	dev-qt/linguist-tools:5
-"
-
-# cantata has no tests
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.2.0-headers.patch"
-	"${FILESDIR}/${P}-opusfile.patch"
-)
-
-src_prepare() {
-	remove_locale() {
-		rm "translations/${PN}_${1}".ts || die
-	}
-
-	cmake-utils_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-utils_src_configure
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-
-	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
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/cantata/files/cantata-2.3.2-opusfile.patch b/media-sound/cantata/files/cantata-2.3.2-opusfile.patch
deleted file mode 100644
index 956edf1d5133..000000000000
--- a/media-sound/cantata/files/cantata-2.3.2-opusfile.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From cdf4363df91475b091ad20000078ca8ef21ce91f Mon Sep 17 00:00:00 2001
-From: Craig Drummond <craig.p.drummond@gmail.com>
-Date: Sat, 11 Aug 2018 08:31:40 +0100
-Subject: [PATCH] Add '.opus' to list of recognised extensions for local files.
-
----
- models/playqueuemodel.cpp | 2 +-
- 1 file changed, 1 insertions(+), 1 deletion(-)
-
-diff --git a/models/playqueuemodel.cpp b/models/playqueuemodel.cpp
-index deaaa78f3..c6c4c4130 100644
---- a/models/playqueuemodel.cpp
-+++ b/models/playqueuemodel.cpp
-@@ -89,7 +89,7 @@ QSet<QString> PlayQueueModel::constFileExtensions = QSet<QString>()
-                                                   << QLatin1String("m4b") << QLatin1String("mp4") << QLatin1String("m4p") << QLatin1String("wav") << QLatin1String("wv")
-                                                   << QLatin1String("wvp") << QLatin1String("aiff") << QLatin1String("aif") << QLatin1String("aifc") << QLatin1String("ape")
-                                                   << QLatin1String("spx") << QLatin1String("tta") << QLatin1String("mpc") << QLatin1String("mpp") << QLatin1String("mp+")
--                                                  << QLatin1String("dff") << QLatin1String("dsf")
-+                                                  << QLatin1String("dff") << QLatin1String("dsf") << QLatin1String("opus")
-                                                   // And playlists...
-                                                   << QLatin1String("m3u") << QLatin1String("m3u8") << constPlsPlaylist << constXspfPlaylist;
-