gentoo resync : 25.09.2021

3 files changed, 2 insertions, 53 deletions

diff --git a/media-sound/upmpdcli/Manifest b/media-sound/upmpdcli/Manifest
index 4459dfbabb82..7d21280de44b 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.12.tar.gz 582091 BLAKE2B da3c0826a40e815790fa7f758c7511b5932190f0913295098e9c1fae92f9b0083ffbe2b7e95c97cedf76580cefaea27f4ef1f89326dbb67089314f6ff7f8c181 SHA512 ebe8076e3f99b525df115d11940a46a518725a34dcdfbb42eb763b6e148beb968a8e2015c4dd9e696224f3da2745b7356b3094de68332f50590a3421372f1dfc
-DIST upmpdcli-1.5.7.tar.gz 552203 BLAKE2B fe8e8aa3f4c777925dce2a143aec201462cb2da9e33f604d48848f27acc51fad42e1c626c17b5325918f0d1de1b37c1c456240f811af118b83bc7ce3260e0687 SHA512 ce86b8f9b4e7614433ab542facbf7452426b66bf026bb21ea0e868cde9b492b09a86ee8aa259a9353f2ede6a22d1055987986747aa8e284714c5e60f73a3a55a
-EBUILD upmpdcli-1.5.12.ebuild 1034 BLAKE2B 0caee9f429812affd145864fb0affbe5268f06204ec9935484fe84fe45b6ae9aa198077eaf733b630d4e3a414a3f8b233ff8069d422bbedb202bd47cdc9b6e03 SHA512 034872dbd08edfdbb5a9ed3237d10fdc0c8a1e7843ba3e8e588146f84e05161831b5bd4a79688b5f724852e0bd2700e2e34cc33e657dd8be0876bfd6fe583ce1
-EBUILD upmpdcli-1.5.7.ebuild 1266 BLAKE2B 8e943647e08b7513f9f836a4d8b39a12719722b1480a4ee431c037b424e0b972c6163d99cd7ceafce40adc51d119a2a4988ae6375634766aafaffea5562a40fd SHA512 1357b27d8910b1875da2b1b5957d7b6a5dd1d01b0a8c7444ff12759d96735ebe10963213ce25451da82ccc6a854eec9397ccea70f230b037cf304eecc220a49b
+EBUILD upmpdcli-1.5.12.ebuild 1032 BLAKE2B 77a9478420316c2c6a821a41f53c7736d048f641cc1d5e01c1e897afe3b37f1b9fdaa3f50353ba307013826ad00d0071fa3753b7fda37b5fda7b533f2864b555 SHA512 3d6fad7e7496e23114743ee897644284631565ed30d1f42227f44a1bd1b7f88db63a51482141d413597185fb4f78c303e0b676d9f767338c138fa21cb967eafd
 MISC metadata.xml 324 BLAKE2B 53acf2369d1e3957218ea3634ed2fe10034b9d74109af9df7acfcf29a37697ade6488aefc5df3503754833b0f6dc5df777feb945355f633fa6e1a3ade8b13adf SHA512 871929dc11894dc91b3257a5e9e8f5164e3f5e1af0dce2cc7571dd106cc70bd777562bb56913ca45f3bf1cf0316938f7f2c0a8386bdcf408c0f834385db4d45d
diff --git a/media-sound/upmpdcli/upmpdcli-1.5.12.ebuild b/media-sound/upmpdcli/upmpdcli-1.5.12.ebuild
index cd91d0a00939..d5b5585b951c 100644
--- a/media-sound/upmpdcli/upmpdcli-1.5.12.ebuild
+++ b/media-sound/upmpdcli/upmpdcli-1.5.12.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="
diff --git a/media-sound/upmpdcli/upmpdcli-1.5.7.ebuild b/media-sound/upmpdcli/upmpdcli-1.5.7.ebuild
deleted file mode 100644
index 32fbe2a26ccc..000000000000
--- a/media-sound/upmpdcli/upmpdcli-1.5.7.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."
-}