4 files changed, 2 insertions, 162 deletions
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 5679a8ab8dc1..d9b2b4ab9704 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,9 +1,6 @@
-AUX cantata-2.1.0-headers.patch 1018 SHA256 6dcb056e22db3d2633235caa3dbb7b52b7bb4ac35c370cfa65438704bcc1324a SHA512 4e5f2d37ab36196919a78c0c4277c2428ef1e7681324ac071fc91408d40f4aa856dfe94bde7d7f600aac13e773921814ab416631fd534ac17a13177c21439a30 WHIRLPOOL fbb9f13a557ee47061689a2be3842cff65c1853a48e06801ab728827892e7ca7460a9b8966b3590b61e5ce9fa2b3f5c5acef71a0dc6958438b1bea14c33849ba
 AUX cantata-2.2.0-headers.patch 1345 SHA256 360b7600d99395684fb6d3cb57817c94646fb7d4290343e776eb4241b08bbeab SHA512 e9c1a3fc756bd3ed37bd8729433d48d4bb652d3fd7d95b3a6024b4b1d6cda72205d1326214b283377a1ee0b376fe1199c351006e8e640ed6ca9ed98f74c1b7df WHIRLPOOL 354e2d42f8164cb90d9ee3600945e0f9c00d9ce1061278640389fb6bfae39677ac0d21dd7bf98b730a73539001e6134061af4def3f6df3c7aa082fa024f8a247
-DIST cantata-2.1.0.tar.bz2 2207271 SHA256 9317afcae75c709ec733da069d4245b47e6e2c297a259eaf87a181fa9d1cd4c4 SHA512 bf03933785110d0d0c1dfbfc27f4974869ae7c79afe3cf1da1f3024c95d86733d8bea77f2a882887de79a7897ffcdac4262e58747dd4e979824943991675c5d2 WHIRLPOOL 5d58b84290c387d535e556553e64bba36520a099565c44bed1c4e9cf800c2a432ac09296b989a557e72d81a951c926b4bb638f2d2ab7976735059ebb74b8c8e2
 DIST cantata-2.2.0.tar.bz2 2251649 SHA256 c84691eb17711118d3c512d70cb422267f7a137290082cdd1ff0a871b4a8e5c0 SHA512 519a2e24c8b2a1c98a2006a1f590945e1bd5e98a2c3a1b5da23e40f2297f1477d48d69b48ec669219f5ab8fdc955486fe29db6914abeef1fba2a47377f694ecd WHIRLPOOL 50a44192368ee90708ecf906401c28d6a06878d61cfefae04bcab3463343c11bcfe3054880364886e57f797cc303fe14a4f2010e87ad873ba4de3738c05399e7
-EBUILD cantata-2.1.0.ebuild 2723 SHA256 7fdfe99cde06625022f88171ce34eac5e6f237364b7cc05406975f679d9ab95b SHA512 e7bbd6e7f55c59d987306e3745879468c61d701f8a2fe053227c366dffe2ebeb3cca3837172546b8c4235295d4200174a45a2c64801ff364129b32a00e981df7 WHIRLPOOL be66a7bb36bbd1f0fbc2b9f3cec9bcadbb3fd0876a192ac012fa3de71cb51f3735309adec021881e2b9969f82adeffa69a2f9cace466dff7f2756f0e74d130db
-EBUILD cantata-2.2.0.ebuild 2907 SHA256 5f869d6707ea1d202fd5cba097b5c599f565cb71881b67319c7839cb0546757b SHA512 e5138541e16e34f1da6cdaf8c87395932a0e161e2827553a806dd41a6c7df8beba88813660352c088bca5530168d6598dbf2fa2a3e3dabb293ad7a1284ea6e06 WHIRLPOOL 2aee08a30c99c56b950338f0d77545ddb596ae8f3d93709d5deaaacb73f19c9a2ed4b5c86b91c6c9392b1ba34c090c35d40ab18bc316aa2b4c838fd5218b3a2f
+EBUILD cantata-2.2.0.ebuild 2906 SHA256 c1c1ee56622596b87f3607801c6fff3ed864775a7bb1b8732503b7e804428b46 SHA512 62a3a89fe9661db39cc7a8682fd4df72f8fa911a25a4cb1db66cc8f0cd0acdd00912b60a43442832b2dc01df69ab4015e817b345dbe0dc3b71418f52334ee03a WHIRLPOOL 3af7435d468cc97d9a40fb331096c57de5245551bd34952a0acc8ddf874bde97f3ec87850b30811f928aa0c30310dd5d5704bea43286f1edc908b7f12238ec1d
 MISC ChangeLog 4843 SHA256 c02d7b259f24e9f14dad63626564aa1145641a0d51de8917409827182e856af6 SHA512 c39f1feb920ce7e4dcdce22b93ff1c14876305aec11e29b0e52cf96f286cb267a6388ad5a665ccef9d625e04cd0b82be1dcdc7526f6a649cab3962533010b54e WHIRLPOOL 6c6b93df770ec945ac481d827880b4bf93836e95e6f8bfb599ab3b7f2d32d6d510359cfd181ce55e5b3be20251b3ff273cb57b0df39136522c87814ce3ec55cb
 MISC ChangeLog-2015 5497 SHA256 9ebde97b0b56ec60a5f1c83fbebd8e180d5421fd389249afafcec7ad4bf674ee SHA512 2bd57729bbc7f86b5149e9c61b7da340a9b4435b68b05e0e31f1ecd983738180ffc4c91027137f89c54018186ee4e1d33f77ea5a97405dae44bdc1a463157193 WHIRLPOOL 9b6be1f1d1e14ecb5bd1a5377d0145e3a42174ec06ea882f775d9fecbb1d4e622c70a732c65c12b88ae1da80d0a20434e5f7656056cce3f13f75f0fa5ce76ad6
 MISC metadata.xml 739 SHA256 eeacc7f784bb39383fe7343cde6f5558465011e86678a41da9fc16a10c6d6fca SHA512 1e212d1621607ea9a0523146e5eba5e16c9b5ddc7021d409c16ccc93840cffe39a9c601c222e97f37ab38e7c69fa5eac285872fa7a2f52b0f4e8a0cc1e520d97 WHIRLPOOL 255b97ad9b0e411307e16b8679992542560b2e2588e5a375aa2bc55dc742f7eca8156a34cf494767855d8aa50efb9cfedf191bdcc4bccec4881e7f29a2b7ea47
diff --git a/media-sound/cantata/cantata-2.1.0.ebuild b/media-sound/cantata/cantata-2.1.0.ebuild
deleted file mode 100644
index 57c74fe9299c..000000000000
--- a/media-sound/cantata/cantata-2.1.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="cs de en_GB es fr hu it ja ko pl ru zh_CN"
-inherit cmake-utils gnome2-utils 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/cantata/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain taglib udisks"
-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 )
-"
-
-RDEPEND="
-	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 )
-	cdio? ( dev-libs/libcdio-paranoia )
-	cddb? ( media-libs/libcddb )
-	mtp? ( media-libs/libmtp )
-	musicbrainz? ( media-libs/musicbrainz:5= )
-	replaygain? (
-		media-libs/libebur128
-		media-sound/mpg123
-		virtual/ffmpeg
-	)
-	taglib? (
-		media-libs/taglib[asf(+),mp4(+)]
-		media-libs/taglib-extras
-		udisks? ( sys-fs/udisks:2 )
-	)
-"
-DEPEND="${RDEPEND}
-	dev-qt/qtconcurrent:5
-	dev-qt/linguist-tools:5
-"
-
-# cantata has no tests
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${P}-headers.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_CDIOPARANOIA=$(usex cdio)
-		-DENABLE_CDDB=$(usex cddb)
-		-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_TAGLIB=$(usex taglib)
-		-DENABLE_TAGLIB_EXTRAS=$(usex taglib)
-		-DENABLE_DEVICES_SUPPORT=$(usex udisks)
-		-DENABLE_HTTP_STREAM_PLAYBACK=OFF
-		-DENABLE_REMOTE_DEVICES=OFF
-		-DENABLE_UDISKS2=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_pkg_postrm
-}
diff --git a/media-sound/cantata/cantata-2.2.0.ebuild b/media-sound/cantata/cantata-2.2.0.ebuild
index 077a4a9f8beb..388cff4d5613 100644
--- a/media-sound/cantata/cantata-2.2.0.ebuild
+++ b/media-sound/cantata/cantata-2.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib udisks"
 REQUIRED_USE="
 	?? ( cdda cdio )
diff --git a/media-sound/cantata/files/cantata-2.1.0-headers.patch b/media-sound/cantata/files/cantata-2.1.0-headers.patch
deleted file mode 100644
index a442a2c1022d..000000000000
--- a/media-sound/cantata/files/cantata-2.1.0-headers.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Description: Fix include location for ebur128 files
- The Debian packages for ebur128 are shipping the headers in:
-
-    libebur128-dev: /usr/include/ebur128.h
-
- while the upstream code expects ebur128/ebur128.h
-
-Author: Stuart Prescott <stuart@debian.org>
-Forwarded: not sure -- check interaction with cmake rules
---- a/replaygain/ffmpeginput.cpp
-+++ b/replaygain/ffmpeginput.cpp
-@@ -31,7 +31,7 @@
- #include <QString>
- #include <QList>
- #include <QByteArray>
--#include "ebur128/ebur128.h"
-+#include "ebur128.h"
- #include "ffmpeginput.h"
- 
- static QMutex mutex;
---- a/replaygain/mpg123input.cpp
-+++ b/replaygain/mpg123input.cpp
-@@ -18,7 +18,7 @@
- #include <QFile>
- #include <QString>
- #include <QByteArray>
--#include "ebur128/ebur128.h"
-+#include "ebur128.h"
- #include "mpg123input.h"
- 
- struct Mpg123Input::Handle {
---- a/replaygain/trackscanner.h
-+++ b/replaygain/trackscanner.h
-@@ -25,7 +25,7 @@
- #define _SCANNER_H_
- 
- #include "jobcontroller.h"
--#include "ebur128/ebur128.h"
-+#include "ebur128.h"
- 
- class Input;
-