gentoo resync : 05.12.2021

5 files changed, 27 insertions, 214 deletions

diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest
index 9ffb19f8f203..0d4822958888 100644
--- a/media-plugins/audacious-plugins/Manifest
+++ b/media-plugins/audacious-plugins/Manifest
@@ -1,7 +1,5 @@
-AUX audacious-plugins-3.10.1-cddb-use-gnudb.org.patch 1028 BLAKE2B 165ef008cb108ce1a90ca6decc85fd6cb7c37b5f7a118ec749476a7085d868385c161a8934b66591a6d2120f7485e2711f56d6ba3c6e374ae28c583308eea5d5 SHA512 a535cd6b04780a1f8b6f0262dec25f86690916ee12b45afbca2807f64474ea4c71b87d02fc960d93da9ad2d5562ea6f83004f8a7186d9644391fcfb7a7852dbe
-DIST audacious-plugins-3.10.1.tar.bz2 1715477 BLAKE2B fda3940e6c06aadd93a3e1538be747083fcc969cf3118cf3e942787906b9ee0a13bd3c30d15ba19cb713559cdf8f7b71d7b961173b1619f0aafbdea5deb75ac3 SHA512 454e9ce4061e92a0ecda40f562d4cc7453fc0019fd76b25dbe9e319319fa37c22f9785cb29563e8074de8a88e6130106aca1e431790297e1b4636dc974fde565
 DIST audacious-plugins-4.0.5.tar.bz2 1759133 BLAKE2B b806ac110875f94f6e0f1db757d2ec0c7a0391f83efeb068f3e79c7e994fa33d0045095669b5e7ec771714419aaa98b0d0125a5dd18a00f4ee23fc899142858f SHA512 90ab2edbfc797fa835aae9937b5f478a0ca575f31c443d9e8ba7394e1615f605beb417372872874c94d4f804dba7bea9fbae2078e162178386683d8a3e36c108
-EBUILD audacious-plugins-3.10.1-r4.ebuild 3906 BLAKE2B b5ad29566b00f4f44f9623bd99485919603b767ce848e2ef87c328b1f15d0fc438c8a60b66aa4a9a1d88944a5105ab2ccee7b845d8d37db45d0eb93267a04c90 SHA512 24ba9dd7cf2286f2f1a072e37b6ca769502a4fe70cf44232008abc2749cbdd80c534d65c83805f9f241e5cc00a086da89aeb3c233a19e61324b460ec52f429c9
+DIST audacious-plugins-4.1.tar.bz2 1802825 BLAKE2B 253fddf82408708d8094836088bec1b9b7c932e75c959443579e4bbdc3a4b850757328d90b1ab7a6a0bdd85120d4b0a901f9fa22638f90938f19fd0fa35012ba SHA512 4adad3b4e9c264d52c6523fe84db56b9a87476a4ad5a86f85456a7e0276758d61675022e9e3da07e061dac45f604e54f83f9db85a37f0aaf0b75b3356a63932f
 EBUILD audacious-plugins-4.0.5.ebuild 4075 BLAKE2B 811e4373236b03297e42858b455edc1a988eef64fa8b810f566c26842bf457a93246ed3ada021b61640d4079263f8a21deeb3ff1b4b61549cf34582a980464d3 SHA512 88b73fd0db0cd40d173d05f55b57de860a6138595a435d042c210d92bb01126537ff1ab53bd01fe3d435008e1080aa4e119a626f72258dceb5e16b16eb3b7ecb
-EBUILD audacious-plugins-9999.ebuild 4135 BLAKE2B 47d3e518365c3bfe128a5a2aeb408fb65f826c5b45657145d4d52f8fc96dee1496b34b401fd980f4047064169481977788a4ebdef0303d149714d3ffb787f724 SHA512 6815e9ee457ee48470de9d0e8bf87a324def849989856fbd21cec7b016e6018f170b2698d25b7ec566239a860ead547e73c38c65a1cbd394bbf53dff2e7b0444
-MISC metadata.xml 1151 BLAKE2B c1a501964a32f0827f29da03ac657f0eef9209d28456c316586e143871683a0bafa212b3cb68216c3cb683a278ec1df28873bad7d722af548a1c587287f30fb4 SHA512 571421c81bc964254270cb1029988d7a309ada9935a2e1d25c249efb58ad696033b88cbd43318db48d774f7a5d039c5c1ce3204930fcc140b694a8d87adfe0e8
+EBUILD audacious-plugins-4.1.ebuild 3974 BLAKE2B afd357309c86249530594590ef704378b56b0b312c049c4df851cadb98c08d2a88e3918d5c4920ba5c97075bfe43677a8af5087b539de1dacc879c20da4db9fe SHA512 7ae497e09c2aad3dd52ef508c42bff919d4e6d98b49b96fa1e3797216cf678d90b0361118d4b755ecd6f752411ac35e8aea3b0bd8be4b76c27dbcf810ac94bad
+MISC metadata.xml 1347 BLAKE2B 2234e8c67fc7dd226d9f964878b5ee4d59d78cc63761ed2cad469732664f31148d320aed1de0402a504a646ec1db6ea5222673928374d5714b9626235b55f315 SHA512 e3d3eea22b25f86047aed716f7f865a905c619a96490146ba6e0453ba93616e8bf763e1644dddad8a5b7ed2a7509ecf2137f85723b01b2827034863578cf1c64
diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.10.1-r4.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.10.1-r4.ebuild
deleted file mode 100644
index 5c6bbc225c8a..000000000000
--- a/media-plugins/audacious-plugins/audacious-plugins-3.10.1-r4.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2021 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-plugins.git"
-else
-	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-	KEYWORDS="amd64 x86"
-fi
-DESCRIPTION="Lightweight and versatile audio player"
-HOMEPAGE="https://audacious-media-player.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="aac +alsa bs2b cdda cue ffmpeg flac fluidsynth http gme jack lame libnotify libsamplerate
-	lirc mms modplug mp3 nls opengl pulseaudio scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack"
-REQUIRED_USE="|| ( alsa jack pulseaudio sdl )"
-
-# The following plugins REQUIRE a GUI build of audacious, because non-GUI
-# builds do NOT install the libaudgui library & headers.
-# Plugins without a configure option:
-#   alarm
-#   albumart
-#   delete-files
-#   ladspa
-#   playlist-manager
-#   search-tool
-#   skins
-#   vtx
-# Plugins with a configure option:
-#   glspectrum
-#   gtkui
-#   hotkey
-#   notify
-#   statusicon
-BDEPEND="
-	dev-util/gdbus-codegen
-	virtual/pkgconfig
-	nls? ( dev-util/intltool )
-"
-DEPEND="
-	app-arch/unzip
-	dev-libs/dbus-glib
-	dev-libs/glib
-	dev-libs/libxml2:2
-	~media-sound/audacious-${PV}[-qt5(-)]
-	x11-libs/gtk+:2
-	x11-libs/libXcomposite
-	x11-libs/libXrender
-	aac? ( >=media-libs/faad2-2.7 )
-	alsa? ( >=media-libs/alsa-lib-1.0.16 )
-	bs2b? ( media-libs/libbs2b )
-	cdda? (
-		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia:=
-		>=media-libs/libcddb-1.2.1
-	)
-	cue? ( media-libs/libcue:= )
-	ffmpeg? ( >=media-video/ffmpeg-0.7.3 )
-	flac? (
-		>=media-libs/flac-1.2.1-r1
-		>=media-libs/libvorbis-1.0
-	)
-	fluidsynth? ( media-sound/fluidsynth:= )
-	http? ( >=net-libs/neon-0.26.4 )
-	jack? (
-		>=media-libs/bio2jack-0.4
-		virtual/jack
-	)
-	lame? ( media-sound/lame )
-	libnotify? ( x11-libs/libnotify )
-	libsamplerate? ( media-libs/libsamplerate:= )
-	lirc? ( app-misc/lirc )
-	mms? ( >=media-libs/libmms-0.3 )
-	modplug? ( media-libs/libmodplug )
-	mp3? ( >=media-sound/mpg123-1.12.1 )
-	pulseaudio? ( >=media-sound/pulseaudio-0.9.3 )
-	scrobbler? ( net-misc/curl )
-	sdl? ( media-libs/libsdl2[sound] )
-	sid? ( >=media-libs/libsidplayfp-1.0.0 )
-	sndfile? ( >=media-libs/libsndfile-1.0.17-r1 )
-	soxr? ( media-libs/soxr )
-	speedpitch? ( media-libs/libsamplerate:= )
-	vorbis? (
-		>=media-libs/libogg-1.1.3
-		>=media-libs/libvorbis-1.2.0
-	)
-	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-cddb-use-gnudb.org.patch" )
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	if ! use nls; then
-		sed -e "/SUBDIRS/s/ po//" -i Makefile || die # bug #512698
-	fi
-	[[ ${PV} == *9999 ]] && eautoreconf
-}
-
-src_configure() {
-	use mp3 || ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag"
-
-	local myeconfargs=(
-		--enable-mpris2
-		--enable-songchange
-		--enable-aosd
-		--enable-gtk
-		--enable-hotkey
-		--disable-adplug # not packaged
-		--disable-ampache # needs Qt5
-		--disable-coreaudio
-		--disable-oss4
-		--disable-qt
-		--disable-qtaudio
-		--disable-sndio
-		$(use_enable aac)
-		$(use_enable alsa)
-		$(use_enable bs2b)
-		$(use_enable cdda cdaudio)
-		$(use_enable cue)
-		$(use_enable flac)
-		$(use_enable flac filewriter)
-		$(use_enable fluidsynth amidiplug)
-		$(use_enable gme console)
-		$(use_enable http neon)
-		$(use_enable jack)
-		$(use_enable lame filewriter_mp3)
-		$(use_enable libnotify notify)
-		$(use_enable libsamplerate resample)
-		$(use_enable lirc)
-		$(use_enable mms)
-		$(use_enable modplug)
-		$(use_enable mp3 mpg123)
-		$(use_enable nls)
-		$(use_enable pulseaudio pulse)
-		$(use_enable scrobbler scrobbler2)
-		$(use_enable sdl sdlout)
-		$(use_enable sid)
-		$(use_enable sndfile)
-		$(use_enable soxr)
-		$(use_enable speedpitch)
-		$(use_enable vorbis)
-		$(use_enable wavpack)
-		$(use_with ffmpeg ffmpeg ffmpeg)
-	)
-
-	econf "${myeconfargs[@]}"
-}
diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-4.1.ebuild
index b5081063135c..54a949a3a1f4 100644
--- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild
+++ b/media-plugins/audacious-plugins/audacious-plugins-4.1.ebuild
@@ -1,25 +1,24 @@
 # 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-plugins.git"
-else
-	SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~riscv ~x86"
-fi
 DESCRIPTION="Lightweight and versatile audio player"
 HOMEPAGE="https://audacious-media-player.org/"
+SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2"
 
+KEYWORDS="~amd64 ~riscv ~x86"
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack
-	lame libnotify libsamplerate lirc mms modplug mp3 nls opengl pulseaudio
-	scrobbler sdl sid sndfile soxr speedpitch streamtuner vorbis wavpack X"
+IUSE="
+	aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack
+	openmpt lame libnotify libsamplerate lirc mms modplug mp3 nls opengl
+	pulseaudio scrobbler sdl sid sndfile soxr speedpitch streamtuner vorbis
+	wavpack
+"
+
 REQUIRED_USE="ampache? ( http ) streamtuner? ( http )"
 
 # The following plugins REQUIRE a GUI build of audacious, because non-GUI
@@ -46,14 +45,15 @@ BDEPEND="
 "
 DEPEND="
 	app-arch/unzip
-	dev-libs/dbus-glib
-	dev-libs/glib
+	dev-libs/glib:2
 	dev-libs/libxml2:2
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5
 	dev-qt/qtwidgets:5
 	~media-sound/audacious-${PV}
+	sys-libs/zlib
+	x11-libs/gdk-pixbuf:2
 	aac? ( >=media-libs/faad2-2.7 )
 	alsa? ( >=media-libs/alsa-lib-1.0.16 )
 	ampache? ( =media-libs/ampache_browser-1* )
@@ -77,6 +77,7 @@ DEPEND="
 	)
 	lame? ( media-sound/lame )
 	libnotify? ( x11-libs/libnotify )
+	openmpt? ( media-libs/libopenmpt )
 	libsamplerate? ( media-libs/libsamplerate:= )
 	lirc? ( app-misc/lirc )
 	mms? ( >=media-libs/libmms-0.3 )
@@ -96,7 +97,6 @@ DEPEND="
 		>=media-libs/libvorbis-1.2.0
 	)
 	wavpack? ( >=media-sound/wavpack-4.50.1-r1 )
-	X? ( dev-qt/qtx11extras:5 )
 "
 RDEPEND="${DEPEND}"
 
@@ -109,9 +109,8 @@ pkg_setup() {
 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() {
@@ -122,7 +121,6 @@ src_configure() {
 		--enable-songchange
 		--disable-adplug # not packaged
 		--disable-gtk
-		--disable-openmpt # not packaged
 		--disable-oss4
 		--disable-coreaudio
 		--disable-sndio
@@ -140,6 +138,7 @@ src_configure() {
 		$(use_enable jack)
 		$(use_enable lame filewriter_mp3)
 		$(use_enable libnotify notify)
+		$(use_enable openmpt openmpt)
 		$(use_enable libsamplerate resample)
 		$(use_enable lirc)
 		$(use_enable mms)
@@ -157,9 +156,7 @@ src_configure() {
 		$(use_enable streamtuner)
 		$(use_enable vorbis)
 		$(use_enable wavpack)
-		$(use_enable X qthotkey)
 		$(use_with ffmpeg ffmpeg ffmpeg)
 	)
-
 	econf "${myeconfargs[@]}"
 }
diff --git a/media-plugins/audacious-plugins/files/audacious-plugins-3.10.1-cddb-use-gnudb.org.patch b/media-plugins/audacious-plugins/files/audacious-plugins-3.10.1-cddb-use-gnudb.org.patch
deleted file mode 100644
index 3c1ab7372f5e..000000000000
--- a/media-plugins/audacious-plugins/files/audacious-plugins-3.10.1-cddb-use-gnudb.org.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 33edaf1a021bc466aea7c6b0bfdd624b951a15ab Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B6rn=20Ketelaars?= <bjorn.ketelaars@hydroxide.nl>
-Date: Tue, 30 Jun 2020 07:10:28 +0200
-Subject: [PATCH] Move from freedb.org to gnudb.gnudb.org
-
-The freedb.org database of compact track listings has shut down. Any
-program functionality that tries to fetch from or submit data to
-freedb.org is broken now.
-
-An alternative service is available at gnudb.gnudb.org, see
-https://www.gnudb.org/
-
-Fixes https://redmine.audacious-media-player.org/issues/994
----
- src/cdaudio/cdaudio-ng.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/cdaudio/cdaudio-ng.cc b/src/cdaudio/cdaudio-ng.cc
-index 6fd02de14..1b9c7bf1e 100644
---- a/src/cdaudio/cdaudio-ng.cc
-+++ b/src/cdaudio/cdaudio-ng.cc
-@@ -126,7 +126,7 @@ const char * const CDAudio::defaults[] = {
-  "use_cdtext", "TRUE",
-  "use_cddb", "TRUE",
-  "cddbhttp", "FALSE",
-- "cddbserver", "freedb.org",
-+ "cddbserver", "gnudb.gnudb.org",
-  "cddbport", "8880",
-  nullptr};
- 
diff --git a/media-plugins/audacious-plugins/metadata.xml b/media-plugins/audacious-plugins/metadata.xml
index bbcd7fe3d655..48c147d9acdd 100644
--- a/media-plugins/audacious-plugins/metadata.xml
+++ b/media-plugins/audacious-plugins/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>
@@ -15,6 +19,7 @@
 		<flag name="cue">Support CUE sheets using the libcue library</flag>
 		<flag name="fluidsynth">Support FluidSynth as MIDI synth backend</flag>
 		<flag name="gme">Support various gaming console music formats</flag>
+		<flag name="openmpt">Add support for OpenMTP</flag>
 		<flag name="http">Support HTTP streams through neon</flag>
 		<flag name="scrobbler">Build with scrobbler/LastFM submission support</flag>
 		<flag name="sid">Build with SID (Commodore 64 Audio) support</flag>