gentoo resync : 17.07.2021

3 files changed, 12 insertions, 9 deletions

diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index f631ecb48baa..5941e40ebb1e 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,6 +1,6 @@
-DIST qmmp-1.4.6.tar.bz2 1297295 BLAKE2B ec0b27c5faf2c76c15ff8594eecad8b6f73bb5fefd60e4916751a297ff055b252762c8e1ff6d6fc75535bc299159fc595e95767977958a8e94ff2d13218e6fb1 SHA512 dca9d06763be6ded45db14a5e8967e9bd8eebc14e5ec7b077171417e942d61a904ecd1944b8d80deecfb642248663739c3e1784449a10466475deb6e575ea7dc
 DIST qmmp-1.5.0.tar.bz2 1337043 BLAKE2B 71da332bb125ddcc37cdc159e155af2e185cfef8f70348484ca6099666a4715258fadb8a7db68329a009e0d727b1d7b000553e34eb56552c229b6cc1a5f3dd45 SHA512 b8a29bf6b2f6da08e1ff2801c973821663570de436562ba79b40212b8b8522f0e25ea79c941bfacf252904851ed477cbfa66d7f145b172f93a105127894d5e04
-EBUILD qmmp-1.4.6.ebuild 4049 BLAKE2B bdb6ba0a6ad610e92d46d42371c66ef1a965e85bd565fce5e2f2295fd3ade3cb063414a29e523599250b0a743510459876f63bf1b8973e9449fbb06698eaa0f8 SHA512 67657e3a6f89c33c166f1aa34d33446c58ad3d77b18dad4b05560d228effa93603d9f4421621bc1bbd785a8ae3f9099daa0d9a78dbef277f75f3c34d691283e5
-EBUILD qmmp-1.5.0.ebuild 4132 BLAKE2B e56d49d4e6676bf1894261f53f71d031c858cb5b7ded275a93813a1b19aa5120aae22fc0433ed9c177bf1cc8832002e22325afdd7cda8676acfad72ac756c2f4 SHA512 cc252dbd29a703a5d8b5aa11c1a0a9ebe5ee7c4fd21df9acb4ebc1ec2c7267cedaeac82cde25c3c5b274cdc1f4fbcb01bb551872544b5b5dc25311b0f916625f
+DIST qmmp-1.5.1.tar.bz2 1363593 BLAKE2B 7c344ce2d9c1bc419b17c8d3727afa6f95273e7487f539b0e2f8cb5328f0185a7aab184d9df01a023f896e8b516135fd58ebe0e2204fb1f5ca283f4e0c04d78f SHA512 4b866e7b53ea1757a94e028730dd99bab3b56917e6835b46284cce148e779e00a5fe0a396667283aa13c980a9ee33d0fe76df0198320f1897ec3b73bcd1f275e
+EBUILD qmmp-1.5.0.ebuild 4131 BLAKE2B 9a1ad81f31602acdefc2e9c3a30d3953c61d19edc5186f796399bbb5a24e7e078d9deebb35d09594b66a56a9e396c4f141832b259c7739c8a06ca8299c78a224 SHA512 6f39f9ee519e07872d6c73eb51f78bb4c71fb1c1665d905cc511064ab86e8cf0c541e8cd4a6440682e57371bfbc30b51dba98ac309bb65fa19af7e50ffbd55b3
+EBUILD qmmp-1.5.1.ebuild 4133 BLAKE2B 7d65727a5858560cea4992734486ef6d080c64673ff65509a6883f05dc0f21b125f84635203b2f06f4d2baebddd2b769141b7db2ac9768fe23ffa46a7f888d30 SHA512 12d3d0b02a7a221a7f6edc82e0da2d3f7c60b77013f34c734f38155abbd924a4f53c98554a58317fc71dd30be06ad158eb34e387aa9439af778f75570bdc5736
 EBUILD qmmp-9999.ebuild 4133 BLAKE2B 7d65727a5858560cea4992734486ef6d080c64673ff65509a6883f05dc0f21b125f84635203b2f06f4d2baebddd2b769141b7db2ac9768fe23ffa46a7f888d30 SHA512 12d3d0b02a7a221a7f6edc82e0da2d3f7c60b77013f34c734f38155abbd924a4f53c98554a58317fc71dd30be06ad158eb34e387aa9439af778f75570bdc5736
 MISC metadata.xml 1882 BLAKE2B 05e4092242842436df6f1dfcd82ab4b7a08675668d6ff5817dc7901bafdeb1725ef26fe7529cf38ca7a5f3edcded04cbee82c3d2bc44644e902b29c238a671f9 SHA512 790c2d0d07117a51a9f33f4575a871e839d1fc403309d765888f98aa532292d8e7dcfc23ba127037babc48272927aab9aae37781b9264991606115690eeb875c
diff --git a/media-sound/qmmp/qmmp-1.5.0.ebuild b/media-sound/qmmp/qmmp-1.5.0.ebuild
index b5d8a08df439..3f6f68e35de6 100644
--- a/media-sound/qmmp/qmmp-1.5.0.ebuild
+++ b/media-sound/qmmp/qmmp-1.5.0.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.3"
 	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.4.6.ebuild b/media-sound/qmmp/qmmp-1.5.1.ebuild
index 2170cb945e31..2fe547a222c2 100644
--- a/media-sound/qmmp/qmmp-1.4.6.ebuild
+++ b/media-sound/qmmp/qmmp-1.5.1.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.3"
 	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
@@ -20,9 +20,10 @@ 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 lyrics +mad midi mms modplug mplayer musepack notifier opus oss projectm
-pulseaudio qsui qtmedia scrobbler shout sid sndfile soxr stereo tray udisks +vorbis wavpack"
+IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca
+ffmpeg flac game gnome jack ladspa lyrics +mad midi mms modplug mplayer musepack
+notifier opus oss pipewire projectm pulseaudio qsui qtmedia scrobbler shout sid
+sndfile soxr stereo tray udisks +vorbis wavpack"
 
 REQUIRED_USE="
 	gnome? ( dbus )
@@ -68,6 +69,7 @@ RDEPEND="
 	mplayer? ( media-video/mplayer )
 	musepack? ( >=media-sound/musepack-tools-444 )
 	opus? ( media-libs/opusfile )
+	pipewire? ( media-video/pipewire )
 	projectm? (
 		dev-qt/qtgui:5[-gles2-only]
 		dev-qt/qtopengl:5
@@ -94,7 +96,7 @@ DEPEND="${RDEPEND}
 DOCS=( AUTHORS ChangeLog README )
 
 src_prepare() {
-	if has_version dev-libs/libcdio-paranoia; then
+	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
@@ -136,6 +138,7 @@ src_configure() {
 		-DUSE_NOTIFIER="$(usex notifier)"
 		-DUSE_OPUS="$(usex opus)"
 		-DUSE_OSS="$(usex oss)"
+		-DUSE_PIPEWIRE="$(usex pipewire)"
 		-DUSE_PROJECTM="$(usex projectm)"
 		-DUSE_PULSE="$(usex pulseaudio)"
 		-DUSE_QSUI="$(usex qsui)"