gentoo resync : 16.02.1018

4 files changed, 107 insertions, 7 deletions

diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index ab5376ff2c94..a68997a043da 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,8 +1,9 @@
+AUX qmmp-1.3.0-projectm-3.1.patch 3549 BLAKE2B ad650249ef621a84fe1fe359ae03c62df67deceee0c78c0a64ef00895ab3853bb072b0877ee5cae7aaf62eae617b439c97e1628c2060def5900c0904a6791620 SHA512 c21b3f3ce63479fa3f53b7a3079b5e3e4b998899f45c11ad1d7da6724ad48c80a7227958f73a2b4f141c9c814765b97b86e1ca29af8818f331f7291f28f8c3bf
 DIST qmmp-1.2.3.tar.bz2 1187718 BLAKE2B f57eae68d25d709413a9cd33c48d82488be4e357eb472b19169f821ab96eba6babd75cf6d4492bade95ee590c17cb3dc789018782b136ee0829d337fb391008c SHA512 8daeae416b7c985450c7876145a896b88163608afd971f05eca9e4cbdea65039f21833836fe88cf1ceff253434370e3880c3ee7f30fe3ee7207fa8656a473d1e
-DIST qmmp-1.2.5.tar.bz2 1181154 BLAKE2B 12a0b3d47a2c844dfecf4c4236147bb3b53b18a37442b61502bc7c8388e7ca180fe744211100314fb9f2abda30174b4cf47810a3e9435262fa977faa3b246ddc SHA512 85000561ed8055e78342eeeea47064fdbac3a97d62fea26d10d7c8a19d762c73c2bdce0eea89ce2886d027cb64c127792c0848cf73ea427957cc4fd07d0f3842
 DIST qmmp-1.2.6.tar.bz2 1181291 BLAKE2B fb039d8abcc0e2c6e2e1aa64c603f1f8b81858c48332eaa480d9d71e77958af52352772394fe5c22be653fcb01bc2acc44011e5cf30ab38863f2a2deca6c0ef2 SHA512 c816f530a7b4dabfbe327f4c726c3412c8c22bc9713a288df0f0b405d9831f4958be01b3f9abd35818e54f03e5568eb79cec85bf154ac9ed8075c0bf3fd5a442
+DIST qmmp-1.3.0.tar.bz2 1220426 BLAKE2B 0a64b36876ed672c380c097897aa69f6d44f9d5fc7fdc2006ece63c91438fc72f3df67cf4c63d17dab526d8e67c45593b035df0e1ccfc1c179824807637aa812 SHA512 e91dc40ca8e96c1a5527ca73443e192bb8f2198a449f46911894b0e2779011766b2c6fd3b1786d2fbe3d87ccc7ee6b987ece0a3260144981bb74b96b3b7c3bb3
 EBUILD qmmp-1.2.3.ebuild 4172 BLAKE2B 9db4f2b3d25b782c9e27eae6ae8d2f64b247634863ee3b58362401746c0004a66d9444f8a21efb86d79841136f5a22a10d40838e98ab83b4bce04ccce5d4dae4 SHA512 911c14441c370ae4494da1e9b0dacc28ad9b469eaab72fb99a5210af73760f2597c63a1ff844c10b0a2d8a17f270f6ec3b9196b0d08ed738ce9c640e061be6e8
-EBUILD qmmp-1.2.5.ebuild 4223 BLAKE2B 03bba4b756908e7ff5d7d0eeaf7afa2752591ebe0294b5bf904bbc12ec6e735d61cdaf989e52f3f3645ad5758ab7fab1ff06883af6b2d473b3cb97071908edaa SHA512 11268db2ee4019b9ade8a795a2edcb46ed90e66c1db529c44bf3349b88cf910fd3fa993909474dc30aeb4849e2fe27ba3ec94a93a86cf6a82a78d668aa8d2a76
-EBUILD qmmp-1.2.6.ebuild 4223 BLAKE2B e9020d44d635020ce71fbba6fc140a83859b28b6d7ea8120688a65fb86e41d237a04409acbf15c1c432445fa27c57bf7a4c83ba30ce977c7c835298aa17884fa SHA512 e165012fac685af0edda9e5d7bbee1ef3cd9e335d661ef981c9ea710a04e69ba21896b962dd7d9b985268b85645af686720fdc4dd488f8d340781c587f2b43d3
+EBUILD qmmp-1.2.6.ebuild 4221 BLAKE2B 7c67cfa55ac6cf2fdeabfee469ea7e492b81e8acb560a70a2890dae2704daf6963de5ee00d9a25de04c6b84433c91e3462a23786dbb2d26ece85b4d23d316d12 SHA512 d54e4e481244f1abc5817d45f7487e19e4d88ef6d17a42f72e55df62817d2994c499167004f05d8eb6e1e607573d1145454403251ef31c488f219b868a4f9ffc
+EBUILD qmmp-1.3.0.ebuild 4322 BLAKE2B 45ab0e243e10901cd0456c8459b4f751484da95b797c68b2e648ce4a7963ce77613f352dfe23fb4fe98b22f83338c177035a2a16326d8469e6843840d659e693 SHA512 e54d1867d000359ee22b41761e5b4ae7708639aab24b3a05faf3adfd1e8e095e67ed2c3c74a878a131d11b73a6a97e90c8aafed94db3432970e7da99fb4c61ea
 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
new file mode 100644
index 000000000000..0db7359bff47
--- /dev/null
+++ b/media-sound/qmmp/files/qmmp-1.3.0-projectm-3.1.patch
@@ -0,0 +1,91 @@
+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
index f7e9f2152bdc..81b05993cbeb 100644
--- a/media-sound/qmmp/qmmp-1.2.6.ebuild
+++ b/media-sound/qmmp/qmmp-1.2.6.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}"
diff --git a/media-sound/qmmp/qmmp-1.2.5.ebuild b/media-sound/qmmp/qmmp-1.3.0.ebuild
index 70985023af4a..a895b3e7408a 100644
--- a/media-sound/qmmp/qmmp-1.2.5.ebuild
+++ b/media-sound/qmmp/qmmp-1.3.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils xdg-utils
 [[ ${PV} = 9999 ]] && inherit subversion
@@ -34,6 +34,7 @@ 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
@@ -61,7 +62,10 @@ RDEPEND="
 		media-sound/jack-audio-connection-kit
 	)
 	ladspa? ( media-libs/ladspa-cmt )
-	mad? ( media-libs/libmad )
+	mad? ( || (
+		media-libs/libmad
+		media-sound/mpg123
+	) )
 	midi? ( media-sound/wildmidi )
 	mms? ( media-libs/libmms )
 	modplug? ( >=media-libs/libmodplug-0.8.4 )
@@ -93,6 +97,10 @@ DEPEND="${RDEPEND}
 
 DOCS=( AUTHORS ChangeLog README )
 
+PATCHES=(
+	"${FILESDIR}"/${P}-projectm-3.1.patch
+)
+
 src_prepare() {
 	if has_version dev-libs/libcdio-paranoia; then
 		sed -i \