gentoo resync : 25.01.2019

8 files changed, 44 insertions, 11 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index fe62fba9f396..3a74f40e48d4 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/jack2/Manifest b/media-sound/jack2/Manifest
index c1802ee43467..d433862bf7fa 100644
--- a/media-sound/jack2/Manifest
+++ b/media-sound/jack2/Manifest
@@ -1,4 +1,4 @@
 DIST jack2-1.9.12.tar.gz 6487135 BLAKE2B 9140b3892d2321576a7329fbef2f23e340be4b9be967ec173edbbc7a43952c9a3712ead05dbe57f958b88c1e29c8a912a937c0bd34e0122ecc600ac9d48f147d SHA512 f0271dfc8f8e2f2489ca52f431ad4fa420665816d6c67a01a76da1d4b5ae91f6dad8c4e3309ec5e0c159c9d312ed56021ab323d74bce828ace26f1b8d477ddfa
 EBUILD jack2-1.9.12-r1.ebuild 2248 BLAKE2B df3c7d95bdd19ebac930330209a968ea175fa410e88f792c6a2c2d514a4958c1d761916dee23c183f43c148d440381bcb3368aab43cbc158876065d9cec9af79 SHA512 fd3261aa55103089325e372af16d53a73035dde0b06ec048f04b0c4fe9ff376e05ac5184ec6de9db7f76270a3f32f13ebbc34ab12b719efcc190b7994a6633d4
-EBUILD jack2-9999.ebuild 2265 BLAKE2B d33ab3cddf7396a1f5c8a9888d7337e3aa2f3df55dd4af4e55261b6d6e95bcc9bfbd882b1b8b4de6d0687e7a715bf2dacc17aaf5974ccc2ef4400a6a9f91009f SHA512 06b07335899ddabf08656c8208223c1f7af92fa2e977c061b9ce1fb9437707ae1744f5fa0570a2b7940a57bb5bdedece4e75aa2662974dcd66a1744c8fa44542
+EBUILD jack2-9999.ebuild 2262 BLAKE2B 89548e80dab03db5f233396413b4fb7a6ecffdaeba8675890ea444482e6fd9633e2db1ef5f17ee7bc1b11f2f81d55f6c305f64d2f10dc8be0c1861c525b72516 SHA512 da88f72c8b05d6296026573be4f936cc5040b929a9e49588a5b3143a0161c45d8b0ec3f7c90ee15cb47d885d6fee42b32215a725b6f12f13d1f63ad4ecea14c1
 MISC metadata.xml 506 BLAKE2B ba66e2cbd670da4a3eb56f611f624ae64214475c131d53a54436c1dc1cb8f47585a31af583c44aa03bcd497b662d9bb91ae434b0d246bd4fd18519efb6ecbc35 SHA512 61c4dbd8d78c20d61fb52468ced23f4c77b0432bb066e32395b0f26b5bbf3d17231045451cbb3b390a978c9598d313d08df13389262c424bad78bcdf7cab528e
diff --git a/media-sound/jack2/jack2-9999.ebuild b/media-sound/jack2/jack2-9999.ebuild
index 7b9c9398cbcc..e93c8733c184 100644
--- a/media-sound/jack2/jack2-9999.ebuild
+++ b/media-sound/jack2/jack2-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -47,7 +47,7 @@ RDEPEND="${COMMON_DEPEND}
 	pam? ( sys-auth/realtime-base )
 	!media-sound/jack-audio-connection-kit:0"
 
-DOCS=( ChangeLog README README_NETJACK2 TODO )
+DOCS=( AUTHORS.rst ChangeLog.rst README.rst README_NETJACK2 )
 
 src_prepare() {
 	default
@@ -63,7 +63,6 @@ multilib_src_configure() {
 		--celt=no
 		--doxygen=$(multilib_native_usex doc yes no)
 		--firewire=$(usex ieee1394 yes no)
-		--freebob=no
 		--iio=no
 		--opus=$(usex opus yes no)
 		--portaudio=no
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index 9998a00c79a6..f61ad09cb59b 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -2,8 +2,9 @@ AUX mpd-0.18.conf.patch 2969 BLAKE2B 6b1e56234cd061cab0f7704889af9f20ee0653d3c20
 AUX mpd-0.20.21.logrotate 112 BLAKE2B 2fd60db81c39d3b7eb1cd375450b5902d6e31734e3801819dbc9475d84750491780aab6c4db0be00039c88dce2fb25b83abc9374a0c736697d8c1cc1bd4f5b24 SHA512 32da561c59f8641e549ccec6ecf8a678cd1b9c1d7fbbef5ca6a1b1eb0f07948c2ea23366d357a16a221e0a9b96fe079df3a046f18c4410b8ddc4adce63c6d467
 AUX mpd-0.20.4.init 681 BLAKE2B 36f48fe4f2432f659c455e75c3e6a773e7d49b9194fea75cd08251cc661b4885fe4ca16cc1008b679cb441ce8eb6a309c60b132570b89e4cf8f9560e130e71be SHA512 e9dbbab915e0e84dec9bd084347e608db7802386b281dc35fa1a9401bd3a40652735a02c98a8d51074c061cbe05ff038e0a16f379638c133b6ae8a6a70ca8f39
 AUX mpd-0.21.1.logrotate 120 BLAKE2B 2111ba897a77a766adf0827c4da7132d5315c7c13ba8e29d582f1030a902492945b0bad6781bbf551e83afd38b957e953215674c669aa2745c1dfa004b20d4b6 SHA512 4a610d4805c32989673d6295fdf4290dc29b11e5b5f3baa2aa957ef9334566f13fa1937e70dc6fe414277e6a026442e4c7e4b406aaf424b96b392da0200ec732
+AUX mpd-0.21.4.init 723 BLAKE2B 4ccaff9b7ee18b1afaf38009da1c002fa36420c81f597b57e4614727d7425e9323836db997a6876ae4b8266182f34cbb72199f8db5ef8aed79f5beb4fb5ea483 SHA512 ad67bee1e614b2901e977e0a7a9bfea7ec9bdf3af9546664f42c1d1426eb5e7990028546390219912e724eeca8ad063a2ac39a048be281527b19b0a79e819961
 DIST mpd-0.20.21.tar.xz 800476 BLAKE2B 0c807ae8d79abd9400aa417b516c709073b23390aeed2b385c716e20f8c4f93376a235b54fe5f5cfcd451b04c76e105b41acbd180d294281432d4d1b6a427a15 SHA512 d44fb326ea6213ecf46721ca81efdfffaec4faa5a66e627185fd5ab7c4f0c5a380f4d04aed5c2909746a37b33987cb61f62dc2d747365da06629fbb78bf7c7d6
 DIST mpd-0.21.4.tar.xz 663648 BLAKE2B c9226d2b02b1035091d3af535c269aec3fead779bf17d95b858706affb84089ca85250452884ed5ee96008724735abf80cdfa4d2de14d9928748284d753a4638 SHA512 454fde206f98f89a58ac773037963ac895ee6ce3e7d1032c49b980a3bfbbb69782a62900a5c09e4b39f24b2d1bcd380d7b520935563dd3b8d02f701389389ca7
 EBUILD mpd-0.20.21-r1.ebuild 7308 BLAKE2B a4579b515ea1904f2973f5b424f205cc08286aec7e516c33ba3aa035c2fca93117c8ede03818d3534a7cedba6b547fb1320039771f000a989ba218a60dcb7b87 SHA512 f7601f95f10158f112a65ac7625840f5a199bb349323c662dc6477e7a9b1498a593bff8cff289c1a37b78ebb80647136e843f8816bf77a5d7e1b8a0fc1624d66
-EBUILD mpd-0.21.4.ebuild 8234 BLAKE2B e26601d1a2bba280083324b70b86ce7d52a81d91b94482120ca26f2f3390161d7c6c1b7faff64e7d891da671bb71223e621db026e6f99bff31bb34d911f212a5 SHA512 f2cd49afa96fe36502b3a03d105799209f7cd39bb20ed58b9f181eb8c454d71d0b917de8f5f41fdc421b1f7e94187ad4a534d00bd502d20a863c336dc71ba875
+EBUILD mpd-0.21.4-r1.ebuild 8226 BLAKE2B 9b35e85135238e84fcca184b6c0e0be83232589f4903a1ff35b4bbff45d44db3e5d790ccf6e0d574e32bf5e007c902d4bb2258f0b206fbbbf33ca049353f2ce2 SHA512 bf0282817fbe58f1cd9210bb3f3b3bc69ef4257857b17471772de1f6f5205d5ecdb97fa43752f55ce606ec2837099f2c2d11ddc113955b3a4fe9c6df7a8174cb
 MISC metadata.xml 2537 BLAKE2B ac6bd3cee50be9327da28245f1ab8e0c64aec6af07f09cd62cf1e1f2e55e2e58e3168406250a83d404b564c33ae63450497a0c5d553c737f9637919b737e899b SHA512 20a7a662078ae05362f4109e574e1b6bb1e0cc085f24695c3fc885e2b4b3616fabcb21a9f376b7c1c09874ec7b108683467ea3644c9bed18610e8b5684a2383a
diff --git a/media-sound/mpd/files/mpd-0.21.4.init b/media-sound/mpd/files/mpd-0.21.4.init
new file mode 100644
index 000000000000..7f0950c62938
--- /dev/null
+++ b/media-sound/mpd/files/mpd-0.21.4.init
@@ -0,0 +1,32 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+: CFGFILE=${CFGFILE:=/etc/mpd.conf}
+
+depend() {
+	need localmount
+	use net netmount nfsmount alsasound esound pulseaudio
+	config ${CFGFILE}
+}
+
+get_config() {
+	x=$1
+	test -e ${CFGFILE} || return 1
+	sed -n \
+	  -e '/^[ \t]*'${x}'/{s:^[ \t]*'${x}'[ \t]\+"\?\([^#"]\+\)[^"]*"\?$:\1: ; p }' \
+	  ${CFGFILE}
+}
+
+extra_started_commands='reload'
+command=/usr/bin/mpd
+command_args=${CFGFILE}
+required_files=${CFGFILE}
+pidfile=$(get_config pid_file)
+description="Music Player Daemon"
+
+reload() {
+      ebegin "Reloading ${RC_SVCNAME}"
+      start-stop-daemon --pidfile ${pidfile} --signal HUP
+      eend $?
+  }
diff --git a/media-sound/mpd/mpd-0.21.4.ebuild b/media-sound/mpd/mpd-0.21.4-r1.ebuild
index e93c903ec20c..5a07765cd9dc 100644
--- a/media-sound/mpd/mpd-0.21.4.ebuild
+++ b/media-sound/mpd/mpd-0.21.4-r1.ebuild
@@ -276,7 +276,7 @@ src_install() {
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
 
-	newinitd "${FILESDIR}"/${PN}-0.20.4.init ${PN}
+	newinitd "${FILESDIR}"/${P}.init ${PN}
 
 	if use unicode; then
 		sed -i -e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
diff --git a/media-sound/qmmp/Manifest b/media-sound/qmmp/Manifest
index b798de44e4a5..ab5376ff2c94 100644
--- a/media-sound/qmmp/Manifest
+++ b/media-sound/qmmp/Manifest
@@ -1,8 +1,8 @@
 DIST qmmp-1.2.3.tar.bz2 1187718 BLAKE2B f57eae68d25d709413a9cd33c48d82488be4e357eb472b19169f821ab96eba6babd75cf6d4492bade95ee590c17cb3dc789018782b136ee0829d337fb391008c SHA512 8daeae416b7c985450c7876145a896b88163608afd971f05eca9e4cbdea65039f21833836fe88cf1ceff253434370e3880c3ee7f30fe3ee7207fa8656a473d1e
-DIST qmmp-1.2.4.tar.bz2 1189587 BLAKE2B eff6d52456a79373434b793fc2303eea2ba42675626466c9842606075da8469587b850ea63a814624cb334ea66491578be134ff138594aecab9cba1c4f953b5e SHA512 086dec09700ffda8aec04c5b3c0f062cb0cde72c47902452751443fd54c8f563fc31d02f4fbf73cc0831d65aa32026c884477397d53a8e761227ab8c46be4874
 DIST qmmp-1.2.5.tar.bz2 1181154 BLAKE2B 12a0b3d47a2c844dfecf4c4236147bb3b53b18a37442b61502bc7c8388e7ca180fe744211100314fb9f2abda30174b4cf47810a3e9435262fa977faa3b246ddc SHA512 85000561ed8055e78342eeeea47064fdbac3a97d62fea26d10d7c8a19d762c73c2bdce0eea89ce2886d027cb64c127792c0848cf73ea427957cc4fd07d0f3842
+DIST qmmp-1.2.6.tar.bz2 1181291 BLAKE2B fb039d8abcc0e2c6e2e1aa64c603f1f8b81858c48332eaa480d9d71e77958af52352772394fe5c22be653fcb01bc2acc44011e5cf30ab38863f2a2deca6c0ef2 SHA512 c816f530a7b4dabfbe327f4c726c3412c8c22bc9713a288df0f0b405d9831f4958be01b3f9abd35818e54f03e5568eb79cec85bf154ac9ed8075c0bf3fd5a442
 EBUILD qmmp-1.2.3.ebuild 4172 BLAKE2B 9db4f2b3d25b782c9e27eae6ae8d2f64b247634863ee3b58362401746c0004a66d9444f8a21efb86d79841136f5a22a10d40838e98ab83b4bce04ccce5d4dae4 SHA512 911c14441c370ae4494da1e9b0dacc28ad9b469eaab72fb99a5210af73760f2597c63a1ff844c10b0a2d8a17f270f6ec3b9196b0d08ed738ce9c640e061be6e8
-EBUILD qmmp-1.2.4.ebuild 4171 BLAKE2B 83e5f7bf60a315e55491b571bdd7440edd0023b3e3bf61aa2484c6ddb06873606ecbefea24499eaef252ce4fda770b368b2c0804d88801cc43853f36fc8794fb SHA512 fb1c6f1c21b84a6ef507a8dd218ff469172861cff6b6970652bf78538859e1ebf217c21f9e60167296c8bd87dbe40bba36ffbd423708f9cafa0fd6c2d13855b5
 EBUILD qmmp-1.2.5.ebuild 4223 BLAKE2B 03bba4b756908e7ff5d7d0eeaf7afa2752591ebe0294b5bf904bbc12ec6e735d61cdaf989e52f3f3645ad5758ab7fab1ff06883af6b2d473b3cb97071908edaa SHA512 11268db2ee4019b9ade8a795a2edcb46ed90e66c1db529c44bf3349b88cf910fd3fa993909474dc30aeb4849e2fe27ba3ec94a93a86cf6a82a78d668aa8d2a76
+EBUILD qmmp-1.2.6.ebuild 4223 BLAKE2B e9020d44d635020ce71fbba6fc140a83859b28b6d7ea8120688a65fb86e41d237a04409acbf15c1c432445fa27c57bf7a4c83ba30ce977c7c835298aa17884fa SHA512 e165012fac685af0edda9e5d7bbee1ef3cd9e335d661ef981c9ea710a04e69ba21896b962dd7d9b985268b85645af686720fdc4dd488f8d340781c587f2b43d3
 EBUILD qmmp-9999.ebuild 4223 BLAKE2B 03bba4b756908e7ff5d7d0eeaf7afa2752591ebe0294b5bf904bbc12ec6e735d61cdaf989e52f3f3645ad5758ab7fab1ff06883af6b2d473b3cb97071908edaa SHA512 11268db2ee4019b9ade8a795a2edcb46ed90e66c1db529c44bf3349b88cf910fd3fa993909474dc30aeb4849e2fe27ba3ec94a93a86cf6a82a78d668aa8d2a76
 MISC metadata.xml 1821 BLAKE2B 7be33caff246653b25e3f211638a6a4da075ee1edf6605ad802b533db4cd649bad69a6bbfdf27c1cf203873362f30591fa4b72851db600e4f3040bcd0df80295 SHA512 17b548bd21cc90817f2e5c710bdb22c527350bf2e3b4ac91070d0578a34e0acf371a97fedfb62287628c5c21b53912712fcbf00a4e66e5a3debad565536a722c
diff --git a/media-sound/qmmp/qmmp-1.2.4.ebuild b/media-sound/qmmp/qmmp-1.2.6.ebuild
index 3ffb3e318976..f7e9f2152bdc 100644
--- a/media-sound/qmmp/qmmp-1.2.4.ebuild
+++ b/media-sound/qmmp/qmmp-1.2.6.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
@@ -9,7 +9,8 @@ inherit cmake-utils xdg-utils
 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"
+	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"