gentoo Easter resync : 12.04.2020

3 files changed, 3 insertions, 78 deletions

diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index a7aa370b3013..c910b0eb7827 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,9 +1,7 @@
 DIST audacious-3.10.1.tar.bz2 564481 BLAKE2B d1f76f34f0f6fbbe5ba92a95015fa0f3ef6399cc05f69f58474523761b00a4de7b8471660d9cb640487110cc3998df59f21108ff0b4ea72014ad75cd32ad864b SHA512 e88891caaa3897f9b4abf39136e20834aedf1287d0d5eefea392fda89050db8db00c6f363976a68fe250ddbae4e27590f7615916a76370a44ca9235f1fa60b43
-DIST audacious-3.9-gtk3.tar.bz2 600249 BLAKE2B 08559eafc85236e8e881d0cbe6f08e29c82baf0fc46b9209f1d3eee290460260bfa99e6e8f26940f8c6854f3782da24061226ebdb416b6249d10914093e16276 SHA512 6ff98d027c13b30ea9600a9aba914ec993c69826199b8dc303cb60cebdf2af06a7e3dd4af1d34a86343be5485848a57c8a29e48d2a45a33945585550de4e5f9c
-DIST audacious-4.0-beta1.tar.bz2 571077 BLAKE2B 5e47791e59b1f0abc149dfbc3f2727b2e7868e09a4f1a72720a5a07de3ef137030c69b77e3b8348d1db95ee4d7f986989e32903fe66c296fe99468688a8ceb64 SHA512 6696a18a29132eff6e0546883b76bd76af82931e43bff13786bc57e9e3ac36ea5c83b89155812c2c89b754779263e2528eb3423c34ba676790fcba3408a9240e
+DIST audacious-4.0.tar.bz2 579176 BLAKE2B 62127d9dcc666e0834c71d5004863fe7c2f7a5835a3549aa88decd6e74d6714e70f59343c3a8b5a73bfe43064bf47f8b2d15d964c4957ad70ed17f65a90c0ccb SHA512 82a44270a4dad39098f7055d540a44e6e0e9826a3f140d7feb537518e42a8d391357c1adbcc62d118b0a82e79c88729e74748f8b41b9d8e4ff40ffc5d96ec759
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 BLAKE2B d3bf8dbfee675dd588bc0258f1015c76877b6b0a3835813d8e9621d149b924aaa33544d07f7ad44a01c058d41d7480b3908b0773c124af33b6e020c376b13d54 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05
 EBUILD audacious-3.10.1.ebuild 1795 BLAKE2B bcea95295deb3f1b069c44441c7aa27e2a4136084acaa5b821909f48d43fd669cfecd28034d5d94f57d757075f4f8c24e637e919a2fdff29a5bfa76a67abd752 SHA512 6b4b29e2d61adf73eb9e610cf68ac6581ae0434e34a4aab71d3e56e3dc85a77857b3f68b3a8f66f674b62c4588983dc9166fbff6e70050e9aa851f0713b0556d
-EBUILD audacious-3.9-r1.ebuild 1585 BLAKE2B 5b3acabf06f46c95cb4fcce6ecc58768ca55fe7b71195efda2e96d8563218f3b40e3e940a53e9b32bea873bc349769d971e40415d2b58882654df8e0a620c90f SHA512 ae3133d291ce0b855f7308b9c050a6bc4c6c189afd5f4d975d1c531d0217ccb6ddb82693b433556401eea30540f791986a8b5340edd8d239987747e80f4d90fa
-EBUILD audacious-4.0_beta1.ebuild 1768 BLAKE2B 19fe627632cd73686ee0314b21e7175571b0dc70cf43746d7fb4d401ad3e15e8cf0ee0a06eab8af0830235751ad43435b041aef1d30a3b73a6b208a84f184335 SHA512 4baad23c469aef2475963c8e21f119289db5b6c5e6e6d38a6a072024c94040d00fca10e6deeb3b1743ca477bd14bfcf1e60f0c64422ebb68f5f916dc12cef6fd
+EBUILD audacious-4.0.ebuild 1768 BLAKE2B 05d92d11c5b4b4fab175c6ff7a07996d86a9939f5303e23a046133d04308b9d90ff7391e866f0bf458ee72a16674c1f6e128343b172e3825c3928ccab53d383b SHA512 df4cd28d09993ccc387eba815757984ebad77bdb2070258fe0f1be8e1d2321135ff6a25fdabae66441a8ddc92d4d104e06b754841163d0ece945cf2ac603cca6
 EBUILD audacious-9999.ebuild 1831 BLAKE2B 0686555744115d856c466cc1177b200e5e66f54c39b1ebd76ed9ce86ac29f0bde9cdf51f14cf4b968cb7d607107b836bbfcdebf279776b5694073e0ede6aec50 SHA512 4b3ae117d67cffc3464cbe5f533abed8d1d3ad2e94165c2422ec0450411ab7c40cb81073f223a387c3a2e2c1316cd1496a3f4ef77737ecd6e84ce7ffc462cf72
 MISC metadata.xml 514 BLAKE2B 6ca503bd16bd79e7a453a6eca5c74802c2b078b3cefa4cf886fac391feb2a11db4398a462502cd4f10dcb2c5ffc60f30e51ab348761118cb1a446c8d865b9145 SHA512 6c8d823ff6be4d914e79193e20fa3dca4948f3945b5c6e6977e72f3d6dee3a8ba01ddc06d3a1a7231c5cf3b585d4f655703cd6df8f3c21d326c91db2edda5107
diff --git a/media-sound/audacious/audacious-3.9-r1.ebuild b/media-sound/audacious/audacious-3.9-r1.ebuild
deleted file mode 100644
index 593acf1e62be..000000000000
--- a/media-sound/audacious/audacious-3.9-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${P/_/-}-gtk3"
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="Lightweight and versatile audio player"
-HOMEPAGE="https://audacious-media-player.org/"
-SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2
-	mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	>=dev-libs/dbus-glib-0.60
-	>=dev-libs/glib-2.28
-	>=x11-libs/cairo-1.2.6
-	>=x11-libs/pango-1.8.0
-	virtual/freedesktop-icon-theme
-	x11-libs/gtk+:3
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( dev-util/intltool )
-"
-PDEPEND="~media-plugins/audacious-plugins-${PV}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	if ! use nls; then
-		sed -e "/SUBDIRS/s/ po//" -i Makefile || die # bug #512698
-	fi
-}
-
-src_configure() {
-	# D-Bus is a mandatory dependency, remote control,
-	# session management and some plugins depend on this.
-	# Building without D-Bus is *unsupported* and a USE-flag
-	# will not be added due to the bug reports that will result.
-	# Bugs #197894, #199069, #207330, #208606
-	econf \
-		--disable-valgrind \
-		--enable-dbus \
-		--enable-gtk \
-		$(use_enable nls)
-}
-
-src_install() {
-	default
-
-	# Gentoo_ice skin installation; bug #109772
-	insinto /usr/share/audacious/Skins/gentoo_ice
-	doins -r "${WORKDIR}"/gentoo_ice/.
-	docinto gentoo_ice
-	dodoc "${WORKDIR}"/README
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-sound/audacious/audacious-4.0_beta1.ebuild b/media-sound/audacious/audacious-4.0.ebuild
index 2a75308519c1..13924b39fcb0 100644
--- a/media-sound/audacious/audacious-4.0_beta1.ebuild
+++ b/media-sound/audacious/audacious-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7