gentoo resync : 05.12.2021

4 files changed, 15 insertions, 103 deletions

diff --git a/media-sound/audacious/Manifest b/media-sound/audacious/Manifest
index be7efdfdc754..59bb3c98db54 100644
--- a/media-sound/audacious/Manifest
+++ b/media-sound/audacious/Manifest
@@ -1,7 +1,6 @@
-DIST audacious-3.10.1.tar.bz2 564481 BLAKE2B d1f76f34f0f6fbbe5ba92a95015fa0f3ef6399cc05f69f58474523761b00a4de7b8471660d9cb640487110cc3998df59f21108ff0b4ea72014ad75cd32ad864b SHA512 e88891caaa3897f9b4abf39136e20834aedf1287d0d5eefea392fda89050db8db00c6f363976a68fe250ddbae4e27590f7615916a76370a44ca9235f1fa60b43
 DIST audacious-4.0.5.tar.bz2 577422 BLAKE2B a65810baf0f733327a3e37e6efd2af3d35245b1e99936a4cd39d8068e0df06779ab3c08e839e4b3586f70bec2d16a605c62328f863f747247181851ac7c151c2 SHA512 4be7ebeee937f9b29931a28e1d80782b9df8beec70eab3917f5adccd0bf02aa6003a5b8361359b792edac2d2f31a257b853db43d59dd0674e5a3fbec7e7c1e46
+DIST audacious-4.1.tar.bz2 586472 BLAKE2B baed9f47ddca9b6a4668da542483e8ead049126383e8d1b090b29153b698cc83042ce0620bc5c3e78e59c599cb9f1be72b9c8d2e8c3c87f36fae45554a743b24 SHA512 6e603108c245a146c3bb360e99d85e949b25a50a4d97eca6a0519cb457a93e8d73131504ae10f86c34c0e9d98fb5fdf6660accc0bb3bb480332cb674ac27ac9f
 DIST gentoo_ice-xmms-0.2.tar.bz2 51839 BLAKE2B d3bf8dbfee675dd588bc0258f1015c76877b6b0a3835813d8e9621d149b924aaa33544d07f7ad44a01c058d41d7480b3908b0773c124af33b6e020c376b13d54 SHA512 e863a8f86073007c47ce8c20739aae4bff22e22a7ddc11556b12ae6ebb68654cec7310fdc9d05f2c47f81cf2591fe601b2eb12a2fd911c0a6118c9f3cc524f05
-EBUILD audacious-3.10.1-r1.ebuild 1696 BLAKE2B 09463aa9d83d1d610ea48321f81783dc2127d3be5b8d4574cc96d7edaebbbe8b88cf025aa4a8606cb2c6a4ce6745a59bc0f787203c66f07735dfd5732152aa5a SHA512 f31880f63020fb113020bf60a59f187117d1f60e545102da755615419affbd5599ce97c856e80541b1db67346855081ee0ec220584effa252d5f534534fe98aa
 EBUILD audacious-4.0.5.ebuild 1773 BLAKE2B 0debd08f37dd9d9e1bbe5cf313afc2d5769f75a12bab7b6df82ca73d3fbb92946aa2ba98a27395a1b2fcf8b1f5a9cedac67ffc9f2e212e395362e27f69022602 SHA512 effed1ada2d153a2734607ea4e0c3b0990d70dddd9eafe8b703ca1fc8683d85cba863d5ee5e49babf643919ecdbe68aa563a4df9e8135f862de827c55e443203
-EBUILD audacious-9999.ebuild 1775 BLAKE2B 2d19d6000935c4b791cd4e7004c233728934565837ac2ee5e404037ac84fd31a4bbcd5d7e04dc30cc79096f03f2dbf23121673ff2d5b89788901ce0ebf424839 SHA512 7ffb349b5d701f1d333804e469fc01e46740f4fa8d63cf5c89bfb61a9cf077648bd022c6d9bccc5c640f2e8220456dfaf32abd2c40c823c6d0f907b5ebe1844a
-MISC metadata.xml 368 BLAKE2B 4f11ce67a96b1567d44e7662ef108657336f4769c1bce6ee1077465e1a71d222f11030d47eb9d804b27f71e9bbfb20aadff7d227bb084e4ae42136fbbb3f9bd6 SHA512 802980a1e3d91b964da2864afdea30f7402f46f52fc89ee7827512d56d5f106041d1585e77daac35e579fb331faf3db502d8a846041ba7816a35dce60a035cd5
+EBUILD audacious-4.1.ebuild 1465 BLAKE2B 7ffc93b77444d6af074a894ea427060fdfdd6bb4346cc5d09e7a32692dd9ed7c655bf9fa26bc7c30bc65acf825e2f279d17fac10e60316dd9b2113afa6d212f3 SHA512 0c96c6ba78911798457dcfca6ba3fadfa98f74585a154f621a21e45d2cf53e62605fabcf3f96ce44afc8f1cbb8e623de81ca123a471f2946b5622c502efc9a5e
+MISC metadata.xml 510 BLAKE2B 76fa4b58a1b93140cf1b0fd33a14670567ff2ed0fb7b9779db3dd99ebbc7a316d25f7e4d8c3bb6eb8a6d90bd96f0610c0c42fb00cb1b74800e7cba20acdb0ed9 SHA512 b2603e668fc0b82dc2eb86862d98a4b3e5ad2233036a8413785d998c4df09dd7f2974dc644f7c5cd99ea73e423d6ecf850adcf624a081b6071cfca064959828f
diff --git a/media-sound/audacious/audacious-3.10.1-r1.ebuild b/media-sound/audacious/audacious-3.10.1-r1.ebuild
deleted file mode 100644
index 14d88ac879a1..000000000000
--- a/media-sound/audacious/audacious-3.10.1-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${P/_/-}"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious.git"
-else
-	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-	KEYWORDS="amd64 x86"
-fi
-inherit xdg
-
-DESCRIPTION="Lightweight and versatile audio player"
-HOMEPAGE="https://audacious-media-player.org/"
-SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="nls"
-
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( dev-util/intltool )
-"
-DEPEND="
-	>=dev-libs/dbus-glib-0.60
-	>=dev-libs/glib-2.28
-	>=x11-libs/cairo-1.2.6
-	x11-libs/gtk+:2
-	>=x11-libs/pango-1.8.0
-	virtual/freedesktop-icon-theme
-"
-RDEPEND="${DEPEND}"
-PDEPEND="~media-plugins/audacious-plugins-${PV}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	default
-	[[ ${PV} == *9999 ]] && git-r3_src_unpack
-}
-
-src_prepare() {
-	default
-	if ! use nls; then
-		sed -e "/SUBDIRS/s/ po//" -i Makefile || die # bug #512698
-	fi
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-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 \
-		--disable-qt \
-		$(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
-}
diff --git a/media-sound/audacious/audacious-9999.ebuild b/media-sound/audacious/audacious-4.1.ebuild
index a292996186c1..3203374019e0 100644
--- a/media-sound/audacious/audacious-9999.ebuild
+++ b/media-sound/audacious/audacious-4.1.ebuild
@@ -1,23 +1,18 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 MY_P="${P/_/-}"
 
-if [[ ${PV} == *9999 ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/audacious-media-player/audacious.git"
-else
-	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~riscv ~x86"
-fi
 inherit xdg
 
 DESCRIPTION="Lightweight and versatile audio player"
 HOMEPAGE="https://audacious-media-player.org/"
+SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
 SRC_URI+=" mirror://gentoo/gentoo_ice-xmms-0.2.tar.bz2"
 
+KEYWORDS="~amd64 ~riscv ~x86"
 LICENSE="BSD-2"
 SLOT="0"
 IUSE="nls"
@@ -27,13 +22,10 @@ BDEPEND="
 	nls? ( dev-util/intltool )
 "
 DEPEND="
-	>=dev-libs/dbus-glib-0.60
-	>=dev-libs/glib-2.28
+	dev-libs/glib:2
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
-	>=x11-libs/cairo-1.2.6
-	>=x11-libs/pango-1.8.0
 	virtual/freedesktop-icon-theme
 "
 RDEPEND="${DEPEND}"
@@ -41,17 +33,11 @@ PDEPEND="~media-plugins/audacious-plugins-${PV}"
 
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	default
-	[[ ${PV} == *9999 ]] && git-r3_src_unpack
-}
-
 src_prepare() {
 	default
 	if ! use nls; then
-		sed -e "/SUBDIRS/s/ po//" -i Makefile || die # bug #512698
+		sed -e "/SUBDIRS/s/ po//" -i Makefile || die "failed to sed" # bug #512698
 	fi
-	[[ ${PV} == *9999 ]] && eautoreconf
 }
 
 src_configure() {
diff --git a/media-sound/audacious/metadata.xml b/media-sound/audacious/metadata.xml
index 48fde7d07198..3e3caa0614e6 100644
--- a/media-sound/audacious/metadata.xml
+++ b/media-sound/audacious/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>asturm@gentoo.org</email>
-		<name>Andreas Sturmlechner</name>
+	<maintainer type="person" proxied="yes">
+		<email>marco@scardovi.com</email>
+		<name>Marco Scardovi</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
 	</maintainer>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>