gentoo resync : 10.02.2019

5 files changed, 36 insertions, 16 deletions

diff --git a/media-sound/upmpdcli/Manifest b/media-sound/upmpdcli/Manifest
index 10fdfe772c35..71af8a1bcc0a 100644
--- a/media-sound/upmpdcli/Manifest
+++ b/media-sound/upmpdcli/Manifest
@@ -1,7 +1,8 @@
+AUX upmpdcli-1.3.6.initd 391 BLAKE2B 73220691754159e11d2b15f1f16a462cd80eb5b60dda8b6a45f2b9f4d56a1c054912989088f506f8bb98757606cf232debd60595c3b5f44cef391b7c1bff7af6 SHA512 562ea92fc43f15d00f0afe3ecf57d1925997e2be9245959ee1e0e50604fa64c486ee56589188db8cf34dd1175a3f59423f7822fc2967a27c9b18f259bb1d455d
 AUX upmpdcli.confd 26 BLAKE2B 840eb6e9353266f3669c00dda2a317a6146780180ff0998641dd258806b8dce0a1c49caca570c2ce1fac97e0bf3a347536c147f1a38092ae745bddd728128a01 SHA512 3dd82c12d66aac4be69a98cf25098fdb9c377c4ad0559d07f99cfb4599b6454a6880486053091d55e30b45ac8d877cfa544b1f3dc617d11c32c058767ae6a64f
-AUX upmpdcli.initd 394 BLAKE2B e2b31b58d2f1edb6a490a7244524572cb89062005a47f463c2df857a9a380a541547c65a0de28bc33945f9bb2762390a186adebb5bc36b633af713b54bff3155 SHA512 49dc040957a0af4b6d2b50eb1ee9e41f6b593358a7acd66ee809b06cc775e330757f9952843499f6d1cac6cedcd73b1907a51f31f6721ca9d3fb7719bc496709
-DIST upmpdcli-1.2.16.tar.gz 429958 BLAKE2B d484e98ca7774e6d55e42937152efda9bc2127afd6a222575055c48cd7cf5d61f6b578d80a3eca75d7299570cc9d3acc78b1e0c461f4a064528fdb9cb62eee22 SHA512 1fd5b1939f7140f2e54401967308dd155e0f72406188b82e8ccc9178f5feeb0d37cfcd28dd220dd5437d06f49955cc83d70f0bb7c3659452ccb2e73f8846a226
+AUX upmpdcli.initd 387 BLAKE2B 1cf2ab80c9447041b2b1d1a921c164a6c0436204909c4857db798ed9930d3c1f6e5957a4382cfa884e9fa296ac8d72cc5e3d4d8025234251b665fb5d85efc12f SHA512 fcbefe70aecd05f4fea6427734933344cd1f537fd187c14f05d809f8cf8bb720241aeddc526e9c5497f76e5e7cdcf14798a160b4e4303d1482b53b646dd2b03f
 DIST upmpdcli-1.3.6.tar.gz 515712 BLAKE2B 6de6a3af2e474a3f8d12865e3cdd420f31955e88a0eb1c8ffd019809666c4c613631d642b34bb5fa473fceb7207613d90584fdf856b6a49899f9c2aa31b2b471 SHA512 280b02116786c86fd5f1e472fa9070b3a6d846acd670e36d476b150d4a3e91e5a6d1546b7053b1f35a2e0de553c8517640934af010d371d3cbed248592be502d
-EBUILD upmpdcli-1.2.16.ebuild 992 BLAKE2B 55ad9cf6e1ad47cd2e2853db83ff192491689771aeba636f5199dad6fcc5d0d157a7fbaa5528eaa36b962219b34859ac631f3144d9632da94d6e07d1b720d76e SHA512 05a5ee2f3670dcd0ea351d1555a8712b59b712a4074da0211383ca46dd8d39b9e9a45f31b59ae230b02289d14581b220f4c5cbebca79d0fa308630c9925e6fb7
-EBUILD upmpdcli-1.3.6.ebuild 1042 BLAKE2B ac46e84fce1f8ffc7326ff257de334e288c17ef07d2f6778a3629b50c95137fc019d2cee829fdf25d0c09202bee3ecb837ff9c69f1478713ecaab344075e0071 SHA512 ba56672d1a1ef71d34bcd4a92df0a69ab11438a784a31faea1447ce766cd08ddb083e76f695bc502ef0338671243e9907f347b45c98dbf3107e87cced0ef033f
+DIST upmpdcli-1.4.0.tar.gz 469357 BLAKE2B edd46e86f367ff2f88346cfb4cb249dae4463095553bb220fbd9a4078315044ec7591f58c30a0f20840a9f217230e46bc3b3569989a0ae2c05a44aa140c234c4 SHA512 1ed1f0a89a02610d70fb9e380dcbdbd8d636bc4a0964a16d27bd7c04126674f7f14e50e5fe521a430a06ea04ecef1275c7ad5f1c276daae1c285b73cceba9dec
+EBUILD upmpdcli-1.3.6.ebuild 1048 BLAKE2B f28c7d3156e79ede24518503fa2760583b9fe6f4af2f0c122c0a327bc1cb693123fdbbf1007dbb87e101f44dd9312a269f960cf6c7c8c982e2eadf33211f36ec SHA512 fb8f49ca57a4479fd7e2cc4a403649f0fc7424c784c2826488e2069f6916a955baab7b4b00da515f2c5db68e868b328307a48284a0e2af5dab93e40c1423ae90
+EBUILD upmpdcli-1.4.0.ebuild 1260 BLAKE2B c0e4f83b38aa554fe246e2e65ec7152f4460ba1ed7c73a5ab7240d9279852f79cace506da9ca529872b9173bfbd166692ad62fb67ded6c96bed57cefabc03e48 SHA512 e07f423e06f57ee86484f066c16a2c7cbe416d8f845406269161eb61e4f1ff5467016e62ae4847497a72c0ab83cd798f81bc6108113e4b2e7abcb5b1dca4c87b
 MISC metadata.xml 424 BLAKE2B 255b763f479850aab6630f6b5c27eb84ea66692004c85cfafd9ad08edbfa9fe08d745c49f02bc27b126dc883ffc8c22c1d3a248cc94d163b88e8946bdb0d9362 SHA512 283c31f284c8789a0e74d8df0c5324add6875b3eb48a7dd91cb036102bda21465df2ea76656c5015ef050651765fd1fd80f66351deff9d31a2462d1009579ecc
diff --git a/media-sound/upmpdcli/files/upmpdcli-1.3.6.initd b/media-sound/upmpdcli/files/upmpdcli-1.3.6.initd
new file mode 100644
index 000000000000..f37623e8f2c1
--- /dev/null
+++ b/media-sound/upmpdcli/files/upmpdcli-1.3.6.initd
@@ -0,0 +1,14 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+description="UPnP Media Renderer front-end for MPD, the Music Player Daemon"
+pidfile=/var/run/upmpdcli.pid
+command=/usr/bin/upmpdcli
+config="${config:-/etc/upmpdcli.conf}"
+command_args="-c ${config}"
+command_args_background="-D"
+
+depend() {
+    need localmount mpd
+}
diff --git a/media-sound/upmpdcli/files/upmpdcli.initd b/media-sound/upmpdcli/files/upmpdcli.initd
index 43618aeca4ea..de11d277486e 100644
--- a/media-sound/upmpdcli/files/upmpdcli.initd
+++ b/media-sound/upmpdcli/files/upmpdcli.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 description="UPnP Media Renderer front-end for MPD, the Music Player Daemon"
@@ -10,5 +10,5 @@ command_args="-c ${config}"
 command_args_background="-D"
 
 depend() {
-    need localmount mpd
+    need localmount
 }
diff --git a/media-sound/upmpdcli/upmpdcli-1.3.6.ebuild b/media-sound/upmpdcli/upmpdcli-1.3.6.ebuild
index 72972052488f..dc2832f79f0f 100644
--- a/media-sound/upmpdcli/upmpdcli-1.3.6.ebuild
+++ b/media-sound/upmpdcli/upmpdcli-1.3.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,14 +11,14 @@ LICENSE="GPL-2"
 
 SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="thirdparty"
 
 DEPEND="
 	dev-libs/jsoncpp
 	media-libs/libmpdclient
 	net-libs/libmicrohttpd
-	net-libs/libupnpp
+	<net-libs/libupnpp-0.17.0
 "
 RDEPEND="
 	${DEPEND}
@@ -33,7 +33,7 @@ pkg_setup() {
 
 src_install() {
 	default
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newinitd "${FILESDIR}/${P}.initd" "${PN}"
 	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
 	systemd_dounit systemd/upmpdcli.service
 }
diff --git a/media-sound/upmpdcli/upmpdcli-1.2.16.ebuild b/media-sound/upmpdcli/upmpdcli-1.4.0.ebuild
index 54eaba576366..f1851fb80b75 100644
--- a/media-sound/upmpdcli/upmpdcli-1.2.16.ebuild
+++ b/media-sound/upmpdcli/upmpdcli-1.4.0.ebuild
@@ -1,9 +1,9 @@
-# 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 user
+inherit systemd user
 
 DESCRIPTION="UPnP Media Renderer front-end for MPD, the Music Player Daemon"
 HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
@@ -11,19 +11,18 @@ LICENSE="GPL-2"
 
 SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="thirdparty"
 
 DEPEND="
 	dev-libs/jsoncpp
 	media-libs/libmpdclient
 	net-libs/libmicrohttpd
-	net-libs/libupnpp
+	>=net-libs/libupnpp-0.17.0
 "
 RDEPEND="
 	${DEPEND}
 	thirdparty? ( dev-python/requests )
-	media-sound/mpd[curl]
 "
 
 pkg_setup() {
@@ -35,10 +34,16 @@ src_install() {
 	default
 	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
 	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	systemd_dounit systemd/upmpdcli.service
 }
 
 pkg_postinst() {
 	einfo
+	einfo "This package no longer assumes that upmpdcli is driving an"
+	einfo "mpdinstance on the same host (https://bugs.gentoo.org/670130)."
+	einfo "Probably it is though, so be sure your mpd is built with"
+	einfo "USE=curl."
+	einfo
 	einfo "Consider installing media-sound/sc2mpd.  If upmpdcli"
 	einfo "detects sc2mpd at run-time, capabilities are added"
 	einfo "including internet radio support.  See upstream docs"