gentoo resync : 12.03.2021

3 files changed, 2 insertions, 53 deletions

diff --git a/media-sound/upmpdcli/Manifest b/media-sound/upmpdcli/Manifest
index 36279ac66dd5..f638783baa16 100644
--- a/media-sound/upmpdcli/Manifest
+++ b/media-sound/upmpdcli/Manifest
@@ -1,7 +1,5 @@
 AUX upmpdcli.confd 26 BLAKE2B 840eb6e9353266f3669c00dda2a317a6146780180ff0998641dd258806b8dce0a1c49caca570c2ce1fac97e0bf3a347536c147f1a38092ae745bddd728128a01 SHA512 3dd82c12d66aac4be69a98cf25098fdb9c377c4ad0559d07f99cfb4599b6454a6880486053091d55e30b45ac8d877cfa544b1f3dc617d11c32c058767ae6a64f
 AUX upmpdcli.initd 387 BLAKE2B 1cf2ab80c9447041b2b1d1a921c164a6c0436204909c4857db798ed9930d3c1f6e5957a4382cfa884e9fa296ac8d72cc5e3d4d8025234251b665fb5d85efc12f SHA512 fcbefe70aecd05f4fea6427734933344cd1f537fd187c14f05d809f8cf8bb720241aeddc526e9c5497f76e5e7cdcf14798a160b4e4303d1482b53b646dd2b03f
-DIST upmpdcli-1.5.5.tar.gz 550726 BLAKE2B 1a32f5a3126e037f6663ab60244d7af3fd7aeb79c5878ba1ca4d8029b97917a70f5b06a82e6006fcf14642b96cb5539488b3bba03860a2dd23e6bce0efe54bdc SHA512 90ce69b4ef004e1b5db3229b3bc99637ecba0f5f7e82d0e9f567da163295b4a572d059accbeb679194d1846eb822d48378acc743ee334ffd9859f3e025f6a0f3
 DIST upmpdcli-1.5.7.tar.gz 552203 BLAKE2B fe8e8aa3f4c777925dce2a143aec201462cb2da9e33f604d48848f27acc51fad42e1c626c17b5325918f0d1de1b37c1c456240f811af118b83bc7ce3260e0687 SHA512 ce86b8f9b4e7614433ab542facbf7452426b66bf026bb21ea0e868cde9b492b09a86ee8aa259a9353f2ede6a22d1055987986747aa8e284714c5e60f73a3a55a
-EBUILD upmpdcli-1.5.5.ebuild 1266 BLAKE2B 8e943647e08b7513f9f836a4d8b39a12719722b1480a4ee431c037b424e0b972c6163d99cd7ceafce40adc51d119a2a4988ae6375634766aafaffea5562a40fd SHA512 1357b27d8910b1875da2b1b5957d7b6a5dd1d01b0a8c7444ff12759d96735ebe10963213ce25451da82ccc6a854eec9397ccea70f230b037cf304eecc220a49b
-EBUILD upmpdcli-1.5.7.ebuild 1268 BLAKE2B 9caeb9ba3faef04081a3177d35c651c4e72d083761d001761bd9f9e14a884a42e0edc19cfb6feaa663c9252caa3bce3d57518576bcbddfe2492f67e8606e2643 SHA512 7ef64f8f02d8601877ec933808fca11ce0b12b77fd28c57eba98842d5b2fb35c43c3d885a095a652b6337671c64ec31b124dd7391efd98d2dabe5d8a9a435b45
+EBUILD upmpdcli-1.5.7.ebuild 1266 BLAKE2B 8e943647e08b7513f9f836a4d8b39a12719722b1480a4ee431c037b424e0b972c6163d99cd7ceafce40adc51d119a2a4988ae6375634766aafaffea5562a40fd SHA512 1357b27d8910b1875da2b1b5957d7b6a5dd1d01b0a8c7444ff12759d96735ebe10963213ce25451da82ccc6a854eec9397ccea70f230b037cf304eecc220a49b
 MISC metadata.xml 323 BLAKE2B 3b9aa1c98130517f1e0d458e9e007330fea3b695192f11a02edb51c2845358353367bcc421a70965abed3996450afdac11d80dd7e54e6b115cbb3c0940830106 SHA512 1f004f9123b7924186183899cdd55ae2fb75a61ab59cd01ac077627a18d28c934716a31f1070e5cd1a2ab6faafd9994079bad87178c6e744093cfcd7d6a7673b
diff --git a/media-sound/upmpdcli/upmpdcli-1.5.5.ebuild b/media-sound/upmpdcli/upmpdcli-1.5.5.ebuild
deleted file mode 100644
index 32fbe2a26ccc..000000000000
--- a/media-sound/upmpdcli/upmpdcli-1.5.5.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-DESCRIPTION="UPnP Media Renderer front-end for MPD, the Music Player Daemon"
-HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
-LICENSE="GPL-2"
-
-SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="thirdparty"
-
-DEPEND="
-	dev-libs/jsoncpp
-	media-libs/libmpdclient
-	net-libs/libmicrohttpd
-	>=net-libs/libupnpp-0.20.0-r1
-"
-RDEPEND="
-	${DEPEND}
-	acct-group/upmpdcli
-	acct-user/upmpdcli
-	app-misc/recoll
-	thirdparty? ( dev-python/requests )
-"
-
-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 "mpd instance 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"
-	einfo "for more information."
-}
diff --git a/media-sound/upmpdcli/upmpdcli-1.5.7.ebuild b/media-sound/upmpdcli/upmpdcli-1.5.7.ebuild
index 90bdff1ab338..32fbe2a26ccc 100644
--- a/media-sound/upmpdcli/upmpdcli-1.5.7.ebuild
+++ b/media-sound/upmpdcli/upmpdcli-1.5.7.ebuild
@@ -11,7 +11,7 @@ LICENSE="GPL-2"
 
 SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="thirdparty"
 
 DEPEND="