gentoo resync : 08.06.2019

6 files changed, 2 insertions, 604 deletions

diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index 82d06da2160a..91a2fd83fb9b 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,11 +1,4 @@
-AUX qmmp-1.3.0-projectm-3.1.patch 3549 BLAKE2B ad650249ef621a84fe1fe359ae03c62df67deceee0c78c0a64ef00895ab3853bb072b0877ee5cae7aaf62eae617b439c97e1628c2060def5900c0904a6791620 SHA512 c21b3f3ce63479fa3f53b7a3079b5e3e4b998899f45c11ad1d7da6724ad48c80a7227958f73a2b4f141c9c814765b97b86e1ca29af8818f331f7291f28f8c3bf
-DIST qmmp-1.2.6.tar.bz2 1181291 BLAKE2B fb039d8abcc0e2c6e2e1aa64c603f1f8b81858c48332eaa480d9d71e77958af52352772394fe5c22be653fcb01bc2acc44011e5cf30ab38863f2a2deca6c0ef2 SHA512 c816f530a7b4dabfbe327f4c726c3412c8c22bc9713a288df0f0b405d9831f4958be01b3f9abd35818e54f03e5568eb79cec85bf154ac9ed8075c0bf3fd5a442
-DIST qmmp-1.3.0.tar.bz2 1220426 BLAKE2B 0a64b36876ed672c380c097897aa69f6d44f9d5fc7fdc2006ece63c91438fc72f3df67cf4c63d17dab526d8e67c45593b035df0e1ccfc1c179824807637aa812 SHA512 e91dc40ca8e96c1a5527ca73443e192bb8f2198a449f46911894b0e2779011766b2c6fd3b1786d2fbe3d87ccc7ee6b987ece0a3260144981bb74b96b3b7c3bb3
-DIST qmmp-1.3.1.tar.bz2 1221322 BLAKE2B ab0a4ecf5746926f2778a99d076f2756883621a4962f8f78a57d5eacb9977def9e8c3d186576715735763d991e6ee88d1ecd6f02e601a4b302ccd7ddf4176866 SHA512 936928bbe058253dc8cf95fb17b5ba840b3b51240d68ed9fefe4f09fd918d0908d1fc7ec816b7b08386c3da72fe78da73316e36b1b52018017d2a23fd8275556
 DIST qmmp-1.3.2.tar.bz2 1221919 BLAKE2B 3081aa6b3ef4712ea064d5bb23e9ac7da5e102fde820c378438c13723bd007fe8e79ac351b0ad01ca0aa22c50f6b6773965ce418742cf1386d2ae1d7ba7b1758 SHA512 5c68d87650abf10d03dc8638df73a6694e470af1121a936bb983bcbcea04d95616ad8a55d87e8874b51b7424a890dad2c5353afe65db7029f6513a382e2144e4
-EBUILD qmmp-1.2.6.ebuild 4221 BLAKE2B 7c67cfa55ac6cf2fdeabfee469ea7e492b81e8acb560a70a2890dae2704daf6963de5ee00d9a25de04c6b84433c91e3462a23786dbb2d26ece85b4d23d316d12 SHA512 d54e4e481244f1abc5817d45f7487e19e4d88ef6d17a42f72e55df62817d2994c499167004f05d8eb6e1e607573d1145454403251ef31c488f219b868a4f9ffc
-EBUILD qmmp-1.3.0.ebuild 4322 BLAKE2B 45ab0e243e10901cd0456c8459b4f751484da95b797c68b2e648ce4a7963ce77613f352dfe23fb4fe98b22f83338c177035a2a16326d8469e6843840d659e693 SHA512 e54d1867d000359ee22b41761e5b4ae7708639aab24b3a05faf3adfd1e8e095e67ed2c3c74a878a131d11b73a6a97e90c8aafed94db3432970e7da99fb4c61ea
-EBUILD qmmp-1.3.1.ebuild 4270 BLAKE2B 0e4a4bdab7e45fdd23db669d2a8e69703e6ca16ecf96f5c06097156aa3feda3c67bd97bb410aa036123cf1ea8c8129ce54d43ec7ffbd9a044651108434dcc142 SHA512 ef99784cbeeba0d8bfcb19c49884033df7e217d92d5b343d77be0bf222ef11aac6601dcca7fb2b78fef129908df5ffc7af9d71acd05455da89e48135e8f06f34
-EBUILD qmmp-1.3.2.ebuild 4269 BLAKE2B 293b9ee67741158812b5de962afe246b0f2c30a5aceeeabfb48817c0c571b5eb07283943f4b6c2d7aa7627ffbee6639480eee1b558c899170ec7128d1250915c SHA512 afd972d018e0e4263b54c373de893ac950f876033f0721aec12ef195e733285fe1533962ed27597b24a4562c86420246e9803032f1343d4358182a745695b8ea
+EBUILD qmmp-1.3.2.ebuild 4268 BLAKE2B 9027930e327d56248e1d4d83e69895a3ad9b0ffc9d26d67ce8ec073b72a8392de89509e59041f79e778c2e1664c4a62fdab3df8645a0cb8edf724f2879575310 SHA512 1786f3400aa0d8426744149bfd0ea1c7c2a3180be002972c52e800d33747f8beb8efca9e4a86065e944aba709b73673dc4f056ea9540828cfaacbdbf76186cf2
 EBUILD qmmp-9999.ebuild 4223 BLAKE2B 03bba4b756908e7ff5d7d0eeaf7afa2752591ebe0294b5bf904bbc12ec6e735d61cdaf989e52f3f3645ad5758ab7fab1ff06883af6b2d473b3cb97071908edaa SHA512 11268db2ee4019b9ade8a795a2edcb46ed90e66c1db529c44bf3349b88cf910fd3fa993909474dc30aeb4849e2fe27ba3ec94a93a86cf6a82a78d668aa8d2a76
 MISC metadata.xml 1821 BLAKE2B 7be33caff246653b25e3f211638a6a4da075ee1edf6605ad802b533db4cd649bad69a6bbfdf27c1cf203873362f30591fa4b72851db600e4f3040bcd0df80295 SHA512 17b548bd21cc90817f2e5c710bdb22c527350bf2e3b4ac91070d0578a34e0acf371a97fedfb62287628c5c21b53912712fcbf00a4e66e5a3debad565536a722c
diff --git a/media-sound/qmmp/files/qmmp-1.3.0-projectm-3.1.patch b/media-sound/qmmp/files/qmmp-1.3.0-projectm-3.1.patch
deleted file mode 100644
index 0db7359bff47..000000000000
--- a/media-sound/qmmp/files/qmmp-1.3.0-projectm-3.1.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-Index: qmmp/src/plugins/Visual/projectm/CMakeLists.txt
-===================================================================
---- qmmp/src/plugins/Visual/projectm/CMakeLists.txt	(revision 8708)
-+++ qmmp/src/plugins/Visual/projectm/CMakeLists.txt	(revision 8709)
-@@ -15,6 +15,12 @@
-   MESSAGE(WARNING "Unsuppoted OpenGL implementation, projectM disabled")
- ENDIF(${Qt5Gui_OPENGL_IMPLEMENTATION} STREQUAL GL)
- 
-+pkg_search_module(PROJECTM_31 libprojectM>=3.1.0)
-+
-+IF(PROJECTM_31_FOUND)
-+ADD_DEFINITIONS(-DPROJECTM_31)
-+ENDIF(PROJECTM_31_FOUND)
-+
- find_file(PROJECTM_CONFIG config.inp
-           PATHS "/usr/share/projectM/" "/usr/local/share/projectM/")
- 
-Index: qmmp/src/plugins/Visual/projectm/projectm.pro
-===================================================================
---- qmmp/src/plugins/Visual/projectm/projectm.pro	(revision 8708)
-+++ qmmp/src/plugins/Visual/projectm/projectm.pro	(revision 8709)
-@@ -13,6 +13,8 @@
- 
- RESOURCES = translations/translations.qrc
- 
-+#DEFINES += PROJECTM_31
-+
- unix {
-     PKGCONFIG += libprojectM
-     target.path = $$PLUGIN_DIR/Visual
-Index: qmmp/src/plugins/Visual/projectm/projectmwrapper.cpp
-===================================================================
---- qmmp/src/plugins/Visual/projectm/projectmwrapper.cpp	(revision 8708)
-+++ qmmp/src/plugins/Visual/projectm/projectmwrapper.cpp	(revision 8709)
-@@ -1,5 +1,5 @@
- /***************************************************************************
-- *   Copyright (C) 2013 by Ilya Kotov                                      *
-+ *   Copyright (C) 2013-2019 by Ilya Kotov                                 *
-  *   forkotov02@ya.ru                                                      *
-  *                                                                         *
-  *   This program is free software; you can redistribute it and/or modify  *
-@@ -40,8 +40,16 @@
-         projectM::selectPreset(index);
- }
- 
-+#ifdef PROJECTM_31
-+void ProjectMWrapper::presetSwitchedEvent(bool isHardCut, size_t index) const
-+{
-+    Q_UNUSED(isHardCut);
-+    emit currentPresetChanged(index);
-+}
-+#else
- void ProjectMWrapper::presetSwitchedEvent(bool isHardCut, unsigned int index) const
- {
-     Q_UNUSED(isHardCut);
-     emit currentPresetChanged(index);
- }
-+#endif
-Index: qmmp/src/plugins/Visual/projectm/projectmwrapper.h
-===================================================================
---- qmmp/src/plugins/Visual/projectm/projectmwrapper.h	(revision 8708)
-+++ qmmp/src/plugins/Visual/projectm/projectmwrapper.h	(revision 8709)
-@@ -1,5 +1,5 @@
- /***************************************************************************
-- *   Copyright (C) 2013 by Ilya Kotov                                      *
-+ *   Copyright (C) 2013-2019 by Ilya Kotov                                 *
-  *   forkotov02@ya.ru                                                      *
-  *                                                                         *
-  *   This program is free software; you can redistribute it and/or modify  *
-@@ -40,7 +40,11 @@
-     void selectPreset(int index);
- 
- private:
-+#ifdef PROJECTM_31
-+    void presetSwitchedEvent(bool isHardCut, size_t index) const override;
-+#else
-     void presetSwitchedEvent(bool isHardCut, unsigned int index) const override;
-+#endif
- 
- 
- };
-Index: qmmp
-===================================================================
---- qmmp	(revision 8708)
-+++ qmmp	(revision 8709)
-
-Property changes on: qmmp
-___________________________________________________________________
-Modified: svn:mergeinfo
-## -0,0 +0,1 ##
-   Merged /trunk/qmmp:r8708
diff --git a/media-sound/qmmp/qmmp-1.2.6.ebuild b/media-sound/qmmp/qmmp-1.2.6.ebuild
deleted file mode 100644
index 81b05993cbeb..000000000000
--- a/media-sound/qmmp/qmmp-1.2.6.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils xdg-utils
-[[ ${PV} = 9999 ]] && inherit subversion
-
-DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
-HOMEPAGE="http://qmmp.ylsoftware.com"
-if [[ ${PV} != 9999 ]]; then
-	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
-		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
-	KEYWORDS="amd64 x86"
-else
-	QMMP_DEV_BRANCH="1.2"
-	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# KEYWORDS further up
-IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
-gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
-pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
-
-REQUIRED_USE="
-	gnome? ( dbus )
-	shout? ( soxr vorbis )
-	udisks? ( dbus )
-"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/taglib
-	x11-libs/libX11
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	archive? ( app-arch/libarchive )
-	bs2b? ( media-libs/libbs2b )
-	cdda? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
-	)
-	cue? ( media-libs/libcue )
-	curl? ( net-misc/curl )
-	dbus? ( dev-qt/qtdbus:5 )
-	enca? ( app-i18n/enca )
-	ffmpeg? (
-		!libav? ( media-video/ffmpeg:= )
-		libav? ( media-video/libav:= )
-	)
-	flac? ( media-libs/flac )
-	game? ( media-libs/game-music-emu )
-	jack? (
-		media-libs/libsamplerate
-		media-sound/jack-audio-connection-kit
-	)
-	ladspa? ( media-libs/ladspa-cmt )
-	mad? ( media-libs/libmad )
-	midi? ( media-sound/wildmidi )
-	mms? ( media-libs/libmms )
-	modplug? ( >=media-libs/libmodplug-0.8.4 )
-	mplayer? ( media-video/mplayer )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	opus? ( media-libs/opusfile )
-	projectm? (
-		dev-qt/qtgui:5[-gles2]
-		dev-qt/qtopengl:5
-		media-libs/libprojectm
-	)
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
-	qtmedia? ( dev-qt/qtmultimedia:5 )
-	scrobbler? ( net-misc/curl )
-	shout? ( media-libs/libshout )
-	sid? ( >=media-libs/libsidplayfp-1.1.0 )
-	sndfile? ( media-libs/libsndfile )
-	soxr? ( media-libs/soxr )
-	udisks? ( sys-fs/udisks:2 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	wavpack? ( media-sound/wavpack )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-DOCS=( AUTHORS ChangeLog README )
-
-src_prepare() {
-	if has_version dev-libs/libcdio-paranoia; then
-		sed -i \
-			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
-			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_AAC="$(usex aac)"
-		-DUSE_ALSA="$(usex alsa)"
-		-DUSE_ANALYZER="$(usex analyzer)"
-		-DUSE_ARCHIVE="$(usex archive)"
-		-DUSE_BS2B="$(usex bs2b)"
-		-DUSE_CDA="$(usex cdda)"
-		-DUSE_COVER="$(usex cover)"
-		-DUSE_CROSSFADE="$(usex crossfade)"
-		-DUSE_CUE="$(usex cue)"
-		-DUSE_CURL="$(usex curl)"
-		-DUSE_KDENOTIFY="$(usex dbus)"
-		-DUSE_MPRIS="$(usex dbus)"
-		-DUSE_ENCA="$(usex enca)"
-		-DUSE_FFMPEG="$(usex ffmpeg)"
-		-DUSE_FILEWRITER="$(usex vorbis)"
-		-DUSE_FLAC="$(usex flac)"
-		-DUSE_GME="$(usex game)"
-		-DUSE_GNOMEHOTKEY="$(usex gnome)"
-		-DUSE_HAL=OFF
-		-DUSE_JACK="$(usex jack)"
-		-DUSE_LADSPA="$(usex ladspa)"
-		-DUSE_LYRICS="$(usex lyrics)"
-		-DUSE_MAD="$(usex mad)"
-		-DUSE_MIDI="$(usex midi)"
-		-DUSE_MMS="$(usex mms)"
-		-DUSE_MODPLUG="$(usex modplug)"
-		-DUSE_MPLAYER="$(usex mplayer)"
-		-DUSE_MPC="$(usex musepack)"
-		-DUSE_NOTIFIER="$(usex notifier)"
-		-DUSE_OPUS="$(usex opus)"
-		-DUSE_OSS="$(usex oss)"
-		-DUSE_PROJECTM="$(usex projectm)"
-		-DUSE_PULSE="$(usex pulseaudio)"
-		-DUSE_QSUI="$(usex qsui)"
-		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
-		-DUSE_SCROBBLER="$(usex scrobbler)"
-		-DUSE_SHOUT="$(usex shout)"
-		-DUSE_SID="$(usex sid)"
-		-DUSE_SNDFILE="$(usex sndfile)"
-		-DUSE_SOXR="$(usex soxr)"
-		-DUSE_STEREO="$(usex stereo)"
-		-DUSE_STATICON="$(usex tray)"
-		-DUSE_UDISKS2="$(usex udisks)"
-		-DUSE_VORBIS="$(usex vorbis)"
-		-DUSE_WAVPACK="$(usex wavpack)"
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-sound/qmmp/qmmp-1.3.0.ebuild b/media-sound/qmmp/qmmp-1.3.0.ebuild
deleted file mode 100644
index a895b3e7408a..000000000000
--- a/media-sound/qmmp/qmmp-1.3.0.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils xdg-utils
-[[ ${PV} = 9999 ]] && inherit subversion
-
-DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
-HOMEPAGE="http://qmmp.ylsoftware.com"
-if [[ ${PV} != 9999 ]]; then
-	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
-		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	QMMP_DEV_BRANCH="1.2"
-	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# KEYWORDS further up
-IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
-gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
-pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
-
-REQUIRED_USE="
-	gnome? ( dbus )
-	shout? ( soxr vorbis )
-	udisks? ( dbus )
-"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/taglib
-	x11-libs/libX11
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	archive? ( app-arch/libarchive )
-	bs2b? ( media-libs/libbs2b )
-	cdda? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
-	)
-	cue? ( media-libs/libcue )
-	curl? ( net-misc/curl )
-	dbus? ( dev-qt/qtdbus:5 )
-	enca? ( app-i18n/enca )
-	ffmpeg? (
-		!libav? ( media-video/ffmpeg:= )
-		libav? ( media-video/libav:= )
-	)
-	flac? ( media-libs/flac )
-	game? ( media-libs/game-music-emu )
-	jack? (
-		media-libs/libsamplerate
-		media-sound/jack-audio-connection-kit
-	)
-	ladspa? ( media-libs/ladspa-cmt )
-	mad? ( || (
-		media-libs/libmad
-		media-sound/mpg123
-	) )
-	midi? ( media-sound/wildmidi )
-	mms? ( media-libs/libmms )
-	modplug? ( >=media-libs/libmodplug-0.8.4 )
-	mplayer? ( media-video/mplayer )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	opus? ( media-libs/opusfile )
-	projectm? (
-		dev-qt/qtgui:5[-gles2]
-		dev-qt/qtopengl:5
-		media-libs/libprojectm
-	)
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
-	qtmedia? ( dev-qt/qtmultimedia:5 )
-	scrobbler? ( net-misc/curl )
-	shout? ( media-libs/libshout )
-	sid? ( >=media-libs/libsidplayfp-1.1.0 )
-	sndfile? ( media-libs/libsndfile )
-	soxr? ( media-libs/soxr )
-	udisks? ( sys-fs/udisks:2 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	wavpack? ( media-sound/wavpack )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-DOCS=( AUTHORS ChangeLog README )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-projectm-3.1.patch
-)
-
-src_prepare() {
-	if has_version dev-libs/libcdio-paranoia; then
-		sed -i \
-			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
-			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_AAC="$(usex aac)"
-		-DUSE_ALSA="$(usex alsa)"
-		-DUSE_ANALYZER="$(usex analyzer)"
-		-DUSE_ARCHIVE="$(usex archive)"
-		-DUSE_BS2B="$(usex bs2b)"
-		-DUSE_CDA="$(usex cdda)"
-		-DUSE_COVER="$(usex cover)"
-		-DUSE_CROSSFADE="$(usex crossfade)"
-		-DUSE_CUE="$(usex cue)"
-		-DUSE_CURL="$(usex curl)"
-		-DUSE_KDENOTIFY="$(usex dbus)"
-		-DUSE_MPRIS="$(usex dbus)"
-		-DUSE_ENCA="$(usex enca)"
-		-DUSE_FFMPEG="$(usex ffmpeg)"
-		-DUSE_FILEWRITER="$(usex vorbis)"
-		-DUSE_FLAC="$(usex flac)"
-		-DUSE_GME="$(usex game)"
-		-DUSE_GNOMEHOTKEY="$(usex gnome)"
-		-DUSE_HAL=OFF
-		-DUSE_JACK="$(usex jack)"
-		-DUSE_LADSPA="$(usex ladspa)"
-		-DUSE_LYRICS="$(usex lyrics)"
-		-DUSE_MAD="$(usex mad)"
-		-DUSE_MIDI="$(usex midi)"
-		-DUSE_MMS="$(usex mms)"
-		-DUSE_MODPLUG="$(usex modplug)"
-		-DUSE_MPLAYER="$(usex mplayer)"
-		-DUSE_MPC="$(usex musepack)"
-		-DUSE_NOTIFIER="$(usex notifier)"
-		-DUSE_OPUS="$(usex opus)"
-		-DUSE_OSS="$(usex oss)"
-		-DUSE_PROJECTM="$(usex projectm)"
-		-DUSE_PULSE="$(usex pulseaudio)"
-		-DUSE_QSUI="$(usex qsui)"
-		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
-		-DUSE_SCROBBLER="$(usex scrobbler)"
-		-DUSE_SHOUT="$(usex shout)"
-		-DUSE_SID="$(usex sid)"
-		-DUSE_SNDFILE="$(usex sndfile)"
-		-DUSE_SOXR="$(usex soxr)"
-		-DUSE_STEREO="$(usex stereo)"
-		-DUSE_STATICON="$(usex tray)"
-		-DUSE_UDISKS2="$(usex udisks)"
-		-DUSE_VORBIS="$(usex vorbis)"
-		-DUSE_WAVPACK="$(usex wavpack)"
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-sound/qmmp/qmmp-1.3.1.ebuild b/media-sound/qmmp/qmmp-1.3.1.ebuild
deleted file mode 100644
index 611727b19b0e..000000000000
--- a/media-sound/qmmp/qmmp-1.3.1.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils xdg-utils
-[[ ${PV} = 9999 ]] && inherit subversion
-
-DESCRIPTION="Qt5-based audio player with winamp/xmms skins support"
-HOMEPAGE="http://qmmp.ylsoftware.com"
-if [[ ${PV} != 9999 ]]; then
-	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
-		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~x86"
-else
-	QMMP_DEV_BRANCH="1.2"
-	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-# KEYWORDS further up
-IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca ffmpeg flac game
-gnome jack ladspa libav lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
-pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
-
-REQUIRED_USE="
-	gnome? ( dbus )
-	shout? ( soxr vorbis )
-	udisks? ( dbus )
-"
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsql:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/taglib
-	x11-libs/libX11
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	archive? ( app-arch/libarchive )
-	bs2b? ( media-libs/libbs2b )
-	cdda? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
-	)
-	cue? ( media-libs/libcue )
-	curl? ( net-misc/curl )
-	dbus? ( dev-qt/qtdbus:5 )
-	enca? ( app-i18n/enca )
-	ffmpeg? (
-		!libav? ( media-video/ffmpeg:= )
-		libav? ( media-video/libav:= )
-	)
-	flac? ( media-libs/flac )
-	game? ( media-libs/game-music-emu )
-	jack? (
-		media-libs/libsamplerate
-		media-sound/jack-audio-connection-kit
-	)
-	ladspa? ( media-libs/ladspa-cmt )
-	mad? ( || (
-		media-libs/libmad
-		media-sound/mpg123
-	) )
-	midi? ( media-sound/wildmidi )
-	mms? ( media-libs/libmms )
-	modplug? ( >=media-libs/libmodplug-0.8.4 )
-	mplayer? ( media-video/mplayer )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	opus? ( media-libs/opusfile )
-	projectm? (
-		dev-qt/qtgui:5[-gles2]
-		dev-qt/qtopengl:5
-		media-libs/libprojectm
-	)
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.9 )
-	qtmedia? ( dev-qt/qtmultimedia:5 )
-	scrobbler? ( net-misc/curl )
-	shout? ( media-libs/libshout )
-	sid? ( >=media-libs/libsidplayfp-1.1.0 )
-	sndfile? ( media-libs/libsndfile )
-	soxr? ( media-libs/soxr )
-	udisks? ( sys-fs/udisks:2 )
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-	)
-	wavpack? ( media-sound/wavpack )
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-"
-
-DOCS=( AUTHORS ChangeLog README )
-
-src_prepare() {
-	if has_version dev-libs/libcdio-paranoia; then
-		sed -i \
-			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
-			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
-	fi
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_AAC="$(usex aac)"
-		-DUSE_ALSA="$(usex alsa)"
-		-DUSE_ANALYZER="$(usex analyzer)"
-		-DUSE_ARCHIVE="$(usex archive)"
-		-DUSE_BS2B="$(usex bs2b)"
-		-DUSE_CDA="$(usex cdda)"
-		-DUSE_COVER="$(usex cover)"
-		-DUSE_CROSSFADE="$(usex crossfade)"
-		-DUSE_CUE="$(usex cue)"
-		-DUSE_CURL="$(usex curl)"
-		-DUSE_KDENOTIFY="$(usex dbus)"
-		-DUSE_MPRIS="$(usex dbus)"
-		-DUSE_ENCA="$(usex enca)"
-		-DUSE_FFMPEG="$(usex ffmpeg)"
-		-DUSE_FILEWRITER="$(usex vorbis)"
-		-DUSE_FLAC="$(usex flac)"
-		-DUSE_GME="$(usex game)"
-		-DUSE_GNOMEHOTKEY="$(usex gnome)"
-		-DUSE_HAL=OFF
-		-DUSE_JACK="$(usex jack)"
-		-DUSE_LADSPA="$(usex ladspa)"
-		-DUSE_LYRICS="$(usex lyrics)"
-		-DUSE_MAD="$(usex mad)"
-		-DUSE_MIDI="$(usex midi)"
-		-DUSE_MMS="$(usex mms)"
-		-DUSE_MODPLUG="$(usex modplug)"
-		-DUSE_MPLAYER="$(usex mplayer)"
-		-DUSE_MPC="$(usex musepack)"
-		-DUSE_NOTIFIER="$(usex notifier)"
-		-DUSE_OPUS="$(usex opus)"
-		-DUSE_OSS="$(usex oss)"
-		-DUSE_PROJECTM="$(usex projectm)"
-		-DUSE_PULSE="$(usex pulseaudio)"
-		-DUSE_QSUI="$(usex qsui)"
-		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
-		-DUSE_SCROBBLER="$(usex scrobbler)"
-		-DUSE_SHOUT="$(usex shout)"
-		-DUSE_SID="$(usex sid)"
-		-DUSE_SNDFILE="$(usex sndfile)"
-		-DUSE_SOXR="$(usex soxr)"
-		-DUSE_STEREO="$(usex stereo)"
-		-DUSE_STATICON="$(usex tray)"
-		-DUSE_UDISKS2="$(usex udisks)"
-		-DUSE_VORBIS="$(usex vorbis)"
-		-DUSE_WAVPACK="$(usex wavpack)"
-	)
-
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/media-sound/qmmp/qmmp-1.3.2.ebuild b/media-sound/qmmp/qmmp-1.3.2.ebuild
index ddf529cdf62d..479ae90ea42c 100644
--- a/media-sound/qmmp/qmmp-1.3.2.ebuild
+++ b/media-sound/qmmp/qmmp-1.3.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://qmmp.ylsoftware.com"
 if [[ ${PV} != 9999 ]]; then
 	SRC_URI="http://qmmp.ylsoftware.com/files/${P}.tar.bz2
 		mirror://sourceforge/${PN}-dev/files/${P}.tar.bz2"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 else
 	QMMP_DEV_BRANCH="1.2"
 	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"