gentoo resync : 03.03.2021

3 files changed, 5 insertions, 75 deletions

diff --git a/net-misc/pulseaudio-dlna/Manifest b/net-misc/pulseaudio-dlna/Manifest
index a7e9bd089a2b..31087a9c8ff1 100644
--- a/net-misc/pulseaudio-dlna/Manifest
+++ b/net-misc/pulseaudio-dlna/Manifest
@@ -1,5 +1,3 @@
 AUX pulseaudio-dlna.desktop 300 BLAKE2B 47eba4d57809eed44acd5df2ce2b9333bede1713f9d291009888427c8ad507cec4a39472cee7422c4f689916b55935935d4b790c3a7ea9778e200d51cdc37fbe SHA512 f8c396e08d387c72fc60a278e40525da1922ca85ed87133538ceb2f0452c34db6da12412c65abd803702fb4a049588e7e3d47b43610e0f52ee0499323c4341b3
-DIST pulseaudio-dlna-0.6.0_pre20200114.tar.gz 709196 BLAKE2B 3113d34eaadf735646f7e421e8271fcac02ea4faed76676d5a70e05c8a26745ffd1ae135d2c5186d9db7ad146d166535a1c901927d24ae2a1a4d08720a4f78d2 SHA512 9c97d160116acf07325b18f35000b58a042243345f98cb1c9e42848e39ef3ef32a9199e31044a758a0a5ec81176be651fa3ef2917a227347017fe375e27385c7
-EBUILD pulseaudio-dlna-0.6.0_pre20200114.ebuild 1930 BLAKE2B 604544a600229a79813012483c7ee5e5ddd3281bcf21b63ea028051338b686e8e9b217f84eb630c8a808a2c8b381252378ed61248d9d518deaa183ed63c0bdfd SHA512 8767e4612b60734ba617bfdc59218da3c35350dd7d64d4820f69bb3c6a227c4f3f46a2d330e20540ada211a18f01ec81450b13ee4af9f9398912070bc10111e4
-EBUILD pulseaudio-dlna-9999.ebuild 2047 BLAKE2B 843cd815020ce22692edda72d1a97d9299f52594ff18cf629426d966310d84fc85c629d4c4c88a36b5ff5519f9835a5bb5d74c1ef2c1aaebf165ff3d9d692c40 SHA512 b9fba3cf64f9f574641ef9716b7c6a3243333139c7e4566cb79a24cea210028582b4c85eeac98abf67ab90e71867c5e5dae3f18c51e7a6f1a1ca52ba737e8af9
+EBUILD pulseaudio-dlna-9999.ebuild 2019 BLAKE2B 266ac29d3776ff6aa5e9d933eb7d099812899ebb82874453499816195b5ae51ebe4d14842ec0e2a45fdfaec14bc42e205a419af5851b5cea134104461708a7c8 SHA512 db84789f4eab84be3a43a1cf0047f5d09cd4ff57db495c38c57acc94b7f363415925c1e8239c9bb7b9f2410e6e2ee93c1d00627d77a45caf2691ae5787853e90
 MISC metadata.xml 340 BLAKE2B b7b3ce106203873c919144347d33bb3fea82da6d163d15bb6adba027a8230353976862fb3dc16592d15db37954356e240278d1677bfddd4037d7f42b6834b241 SHA512 43640a91e95c2ec3969e19341e64dd653e8e00136c03e98119e4d5f357a3f79754a49d17837326dcb8f10023ec0fc6ad3bde80f0912d532db77f3fb7727d4493
diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.0_pre20200114.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.0_pre20200114.ebuild
deleted file mode 100644
index b52ffad2c0b4..000000000000
--- a/net-misc/pulseaudio-dlna/pulseaudio-dlna-0.6.0_pre20200114.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_7 )
-
-inherit desktop distutils-r1
-
-DESCRIPTION="A lightweight DLNA/UPNP/Chromecast streaming server for PulseAudio"
-HOMEPAGE="https://github.com/masmu/pulseaudio-dlna"
-
-SRC_URI="https://github.com/masmu/pulseaudio-dlna/archive/b0db8137224f5a293329a60187365168304c3768.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
-S="${WORKDIR}/pulseaudio-dlna-b0db8137224f5a293329a60187365168304c3768"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/docopt-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.2.1[${PYTHON_USEDEP}]
-	>=dev-python/setproctitle-1.1.10[${PYTHON_USEDEP}]
-	>=dev-python/notify2-0.3[${PYTHON_USEDEP}]
-	>=dev-python/psutil-5.4.7[${PYTHON_USEDEP}]
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	>=dev-python/pyroute2-0.3.5[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3[${PYTHON_USEDEP}]
-	>=dev-python/pychromecast-2.3.0[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	>=dev-python/dbus-python-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/zeroconf-0.17.4[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-	gnome-base/librsvg[introspection]
-	x11-libs/gtk+:3[introspection]
-	|| (
-		|| (
-			media-video/ffmpeg[encode,fdk,mp3,opus,vorbis] )
-		(
-			media-libs/faac
-			media-libs/flac
-			media-sound/lame
-			media-sound/opus-tools
-			media-sound/sox
-			media-sound/vorbis-tools
-		)
-	)"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	media-sound/pulseaudio"
-
-python_prepare_all() {
-	sed -i '/dbus-python/d' setup.py || die
-	sed -i '/notify2/d' setup.py || die
-	sed -i '/docopt/d' setup.py || die
-	sed -i '/pychromecast/d' setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	domenu "${FILESDIR}/${PN}.desktop"
-}
diff --git a/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild b/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
index 27c53833cce4..d314e16809df 100644
--- a/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
+++ b/net-misc/pulseaudio-dlna/pulseaudio-dlna-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_7 python3_8 python3_9 )
 
-inherit distutils-r1
+inherit desktop distutils-r1
 
 DESCRIPTION="A lightweight DLNA/UPNP/Chromecast streaming server for PulseAudio"
 HOMEPAGE="https://github.com/masmu/pulseaudio-dlna"
@@ -42,11 +42,10 @@ RDEPEND=">=dev-python/protobuf-python-2.5.0[${PYTHON_USEDEP}]
 	x11-libs/gtk+:3[introspection]
 	|| (
 		|| (
-			media-video/ffmpeg[encode,faac,mp3,opus,vorbis]
+			media-video/ffmpeg[encode,mp3,opus,vorbis]
 			media-video/ffmpeg[encode,fdk,mp3,opus,vorbis]
 		)
 		(
-			media-libs/faac
 			media-libs/flac
 			media-sound/lame
 			media-sound/opus-tools
@@ -70,6 +69,5 @@ python_prepare_all() {
 src_install() {
 	distutils-r1_src_install
 
-	insinto /usr/share/applications
-	doins "${FILESDIR}/${PN}.desktop"
+	domenu "${FILESDIR}/${PN}.desktop"
 }