gentoo auto-resync : 15:11:2022 - 00:51:37

4 files changed, 4 insertions, 390 deletions

diff --git a/media-sound/deadbeef/Manifest b/media-sound/deadbeef/Manifest
index f862075a6ca6..6ea2bb9d4b3b 100644
--- a/media-sound/deadbeef/Manifest
+++ b/media-sound/deadbeef/Manifest
@@ -4,11 +4,9 @@ AUX deadbeef-1.9.2-drop-Werror.patch 4955 BLAKE2B 0435971de41528e20909623ff485a2
 AUX deadbeef-musl.patch 829 BLAKE2B 91294830e50ff996438563ab2b4ac4bd943d3f2c072ff5982ff810671389994b57d27d73dd61ca76ca4563974fc91254403cc946d95643941f23a808fa2f5c90 SHA512 5a7be29335f9b8a6a85dc233856346a216b1c7a0ade17f483d8c1144099e7b0ebb5a5ba531f96fa4fe6737f0971ff2bf1772edaf3739e81c54bebbdea11e6eeb
 AUX deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch 492 BLAKE2B d6ed36829d7ed139c43b6aa65c940f07e3f023d0554c258a2557c528d75e85c7dd2ca57eecef56088383a3b7b0b4f12109eb899f2847b86953421e826777c954 SHA512 0cec1ae38cf48b3f2ea53f74a6348d0217b1b3f017b836489d5b520f09ad76b6526cd3add48ed23871bc86feb7f7ed697cf6a62164a202be1ecabfd947e895f6
 DIST deadbeef-1.8.8.tar.bz2 5083407 BLAKE2B 69fd2cbaf131b3e44b426163ce6a83479bb1aff0e088c4beea09d747750f6f20b1e297eab1dd1ae0446d2af0aaf28fe0cc7c9f9e3e73fe031d369ba2f5d809ca SHA512 399f0e70eca5e102a9e73ff03199c89c6f28f3e0da96e793316d1af83f00e71f09f6cc81a3fd0b0f0d52fe9e0195a3b9ffb0cf7e7708c3ea7085f33a5ec08b47
-DIST deadbeef-1.9.1.tar.bz2 5136384 BLAKE2B 6e8314728b824b182ecb356d9a9cb09364650f6ca6b5e5d2f7077fc048fe62284e4959910a4cf982fd79893c503044d02417633713d0dcf34e93128aff22692e SHA512 2f959fb139078bbde3c1183019545ed3979b3c5dfc051794ea7a5ccf166156acc8d5dface3169ec705059f487d47c9b314c5400770a7572c22fbd0b903eefc5a
 DIST deadbeef-1.9.2.tar.bz2 5105029 BLAKE2B fbf63f9df22fecacb2fadfe722856aeaa756bb75796a381822de4c033509f88680bb4ca458f4a270608396b3125911f974c283769da184401c4a152da49e2c27 SHA512 fa4298fb3a89b3891c2f0403b2c66e20f64206101ad44f53be5208a69b33d3de3e0ced329cf090c17a1a3c4f7b28920baf5f8c964df2b6bdea6095465d0a02d9
+DIST deadbeef-1.9.3.tar.bz2 5138392 BLAKE2B 3368c38246aae0ac125326b87c2f18523274564ad273c977620bc6e7af3ca50f111a03c3057ff62c068d8cc1942fb1f8b28639043bf9032e08f7ceb1dbb4b03a SHA512 54ef09b723df062bf35d435c959792247121ce0b0f0eebc568347ef8725bf3cdd7eee7b9c69f6443b0a2731354d96c33e18a9a9e7d4068d4de7733d1f77d4376
 EBUILD deadbeef-1.8.8-r3.ebuild 4014 BLAKE2B ea7c4dff97eddc3c2f0b4ad6449b3dc7cb5c0f7f9fd8cc3a03fab84bfe9838a90e104ac128156be569e3b6320c0b19743f67665d42946b59ee8822812dde6455 SHA512 88e4ff5728e22f9e3ddf9dc3789b56c146a65f99963ab09dd09b2c9fb5bc30c62d54eaa4c605fc2a01348d6b6289cb706c21186d18dd758e5e1a1cbfed10794b
-EBUILD deadbeef-1.8.8-r4.ebuild 4043 BLAKE2B 5008997377e53d221c24586054f9c541c3d36f6200b2e78d532d55704114a1d3d369144456fab685b5e5543510d7125a2db5e5fa9b55e6050ef78479ffa1a83a SHA512 c79472edef844bf8d6e8117f136ba660ec106994583c1652ee0e8936bcd993ab7d84bc36a22e515a3a77d865a667c6a254f4bc7a8e73dba374dcde437a76a41e
-EBUILD deadbeef-1.9.1-r2.ebuild 4015 BLAKE2B a0a3bb5266ce7e8d691f6a888be0e466b31fa9bbd4ce4fab77800ebd7d2c07f1fa8bb57d15e6542777d98f1dfd9ef1447774df471360fb5104ded398bd078aae SHA512 18f2ed71b40dc9c29273901b793628cccf0f8d2e54d7bc29b376d3702079d961020548d208347058cf9654e0f0d6c9ae7a547cef7f0f2194210ed5808a81bfe3
-EBUILD deadbeef-1.9.1-r3.ebuild 4071 BLAKE2B 0d33c9e8db1898d3a957dce8bbd0e8b67255f308b413cd223d07d07e702a760558414f47a19d4906a8f9136ee7feb9c537f654c5df992d29663c076b104696ff SHA512 a32d0846460d4b6ea3e5f028a3c494ebcba7ffffc91935997c9440dc539b99be574816dbc87a7719aa9583864b5ad927757770990c997d545203813ca54ca6e2
 EBUILD deadbeef-1.9.2-r1.ebuild 4191 BLAKE2B 42d24a0ceaf9867a1a7e8ba38fc500eb531ba0b865850bc4853d8fe317d337c3d6d28e9c601e0d82e73740a0643124d340c04dd27f95f7717bb00661067b1d27 SHA512 fffd91bdb425acd9ac55107f5f69f74947065332a89751154295c2d66b1b3cc4443cb0c8678242b731fd848d7e8f85ab3df3ce04a09fcb5b0d9b9adf103d2c66
+EBUILD deadbeef-1.9.3.ebuild 4010 BLAKE2B 4cd96425d689d4765b8be9771ff7261fb0d6ccc9f607de6cf0dad8e5e767be6bae6241f8205007c3deb42a11ac78e6567394dfc2c9c13391e5d9ead9b4158a46 SHA512 4578f312832a8309272b2e1d98793dd6b4db2f50cdcde13cba1f10c2ff52b2d4999f86a801f5b986a2f7834ebd3ba2c4a58fc4b396f06fda65be269a31a34720
 MISC metadata.xml 969 BLAKE2B 0f8c160dd8cf50b9d8ed80efe90575527ec0a732f1c0e3dc5c3bf8ad77cea61a81af60de3b49cb38e7fe89128db136a0e61537fdcb93a89745bd0e11b69e3e71 SHA512 4ab2ea957796b6cf15129365f10d876b794bab521861e23f0f166f413c723b34f8cac17799cfc18529498a462d7bac7f633ec33093627c4167c3f4471d43da3a
diff --git a/media-sound/deadbeef/deadbeef-1.8.8-r4.ebuild b/media-sound/deadbeef/deadbeef-1.8.8-r4.ebuild
deleted file mode 100644
index 3238d975fa3a..000000000000
--- a/media-sound/deadbeef/deadbeef-1.8.8-r4.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg flag-o-matic toolchain-funcs plocale
-
-DESCRIPTION="DeaDBeeF is a modular audio player similar to foobar2000"
-HOMEPAGE="https://deadbeef.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="
-	GPL-2
-	LGPL-2.1
-	wavpack? ( BSD )
-"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm mp3 musepack nls notify nullout opus oss pulseaudio sc68 shellexec +supereq threads vorbis wavpack"
-
-REQUIRED_USE="
-	|| ( alsa oss pulseaudio nullout )
-"
-
-DEPEND="
-	x11-libs/gtk+:3
-	net-misc/curl:=
-	dev-libs/jansson:=
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	cdda? (
-		dev-libs/libcdio:=
-		media-libs/libcddb
-		dev-libs/libcdio-paranoia:=
-	)
-	cover? ( media-libs/imlib2[jpeg,png] )
-	dts? ( media-libs/libdca )
-	ffmpeg? ( media-video/ffmpeg:= )
-	flac? (
-		media-libs/flac:=
-		media-libs/libogg
-	)
-	mp3? ( media-sound/mpg123 )
-	musepack? ( media-sound/musepack-tools )
-	nls? ( virtual/libintl )
-	notify? (
-		sys-apps/dbus
-		dev-libs/libdispatch
-	)
-	opus? ( media-libs/opusfile )
-	pulseaudio? ( media-sound/pulseaudio )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	lastfm? ( dev-libs/libdispatch )
-"
-
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	sys-devel/clang
-	sys-devel/llvm
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch"
-)
-
-src_prepare() {
-	default
-
-	drop_from_linguas() {
-		sed "/${1}/d" -i "${S}/po/LINGUAS" || die
-	}
-
-	drop_and_stub() {
-		rm -rf "${1}"
-		mkdir "${1}"
-		cat > "${1}/Makefile.in" <<-EOF
-			all: nothing
-			install: nothing
-			nothing:
-		EOF
-	}
-
-	plocale_for_each_disabled_locale drop_from_linguas || die
-
-	eautopoint --force
-	eautoreconf
-
-	# Get rid of bundled gettext.
-	drop_and_stub "${S}/intl"
-
-	# Plugins that are undesired for whatever reason, candidates for unbundling and such.
-	for i in adplug alac dumb ffap mms gme mono2stereo psf shn sid soundtouch wma; do
-		drop_and_stub "${S}/plugins/${i}"
-	done
-
-	rm -rf "${S}/plugins/rg_scanner/ebur128"
-}
-
-src_configure () {
-	if ! tc-is-clang; then
-		AR=llvm-ar
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-
-		strip-unsupported-flags
-	fi
-
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	local myconf=(
-		"--disable-static"
-		"--disable-staticlink"
-		"--disable-portable"
-		"--disable-rpath"
-
-		"--disable-libmad"
-		"--disable-gtk2"
-		"--disable-adplug"
-		"--disable-coreaudio"
-		"--disable-dumb"
-		"--disable-alac"
-		"--disable-ffap"
-		"--disable-gme"
-		"--disable-mms"
-		"--disable-mono2stereo"
-		"--disable-psf"
-		"--disable-rgscanner"
-		"--disable-shn"
-		"--disable-sid"
-		"--disable-sndfile"
-		"--disable-soundtouch"
-		"--disable-src"
-		"--disable-tta"
-		"--disable-vfs-zip"
-		"--disable-vtx"
-		"--disable-wildmidi"
-		"--disable-wma"
-
-		"$(use_enable alsa)"
-		"$(use_enable oss)"
-		"$(use_enable pulseaudio pulse)"
-		"$(use_enable mp3)"
-		"$(use_enable mp3 libmpg123)"
-		"$(use_enable nls)"
-		"$(use_enable vorbis)"
-		"$(use_enable threads)"
-		"$(use_enable flac)"
-		"$(use_enable supereq)"
-		"$(use_enable cdda)"
-		"$(use_enable cdda cdda-paranoia)"
-		"$(use_enable aac)"
-		"$(use_enable cover artwork)"
-		"$(use_enable cover artwork-imlib2)"
-		"$(use_enable cover artwork-network)"
-		"$(use_enable dts dca)"
-		"$(use_enable ffmpeg)"
-		"$(use_enable converter)"
-		"$(use_enable musepack)"
-		"$(use_enable notify)"
-		"$(use_enable nullout)"
-		"$(use_enable opus)"
-		"$(use_enable pulseaudio pulse)"
-		"$(use_enable sc68)"
-		"$(use_enable shellexec)"
-		"$(use_enable shellexec shellexecui)"
-		"$(use_enable lastfm lfm)"
-		"$(use_enable wavpack)"
-
-		"--enable-gtk3"
-		"--enable-vfs-curl"
-		"--enable-shared"
-		"--enable-m3u"
-		"--enable-pltbrowser"
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-sound/deadbeef/deadbeef-1.9.1-r2.ebuild b/media-sound/deadbeef/deadbeef-1.9.1-r2.ebuild
deleted file mode 100644
index e555833d4e50..000000000000
--- a/media-sound/deadbeef/deadbeef-1.9.1-r2.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools xdg flag-o-matic toolchain-funcs plocale
-
-DESCRIPTION="DeaDBeeF is a modular audio player similar to foobar2000"
-HOMEPAGE="https://deadbeef.sourceforge.io/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="
-	GPL-2
-	LGPL-2.1
-	wavpack? ( BSD )
-"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-IUSE="aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm mp3 musepack nls notify +nullout opus oss pulseaudio sc68 shellexec +supereq threads vorbis wavpack"
-
-REQUIRED_USE="
-	|| ( alsa oss pulseaudio nullout )
-"
-
-DEPEND="
-	x11-libs/gtk+:3
-	net-misc/curl:=
-	dev-libs/jansson:=
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	cdda? (
-		dev-libs/libcdio:=
-		media-libs/libcddb
-		dev-libs/libcdio-paranoia:=
-	)
-	cover? (
-		media-libs/imlib2[jpeg,png]
-	)
-	dts? ( media-libs/libdca )
-	ffmpeg? ( media-video/ffmpeg )
-	flac? (
-		media-libs/flac:=
-		media-libs/libogg
-	)
-	mp3? ( media-sound/mpg123 )
-	musepack? ( media-sound/musepack-tools )
-	nls? ( virtual/libintl )
-	notify? (
-		sys-apps/dbus
-	)
-	opus? ( media-libs/opusfile )
-	pulseaudio? ( media-sound/pulseaudio )
-	vorbis? ( media-libs/libvorbis )
-	wavpack? ( media-sound/wavpack )
-	dev-libs/libdispatch
-"
-
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	sys-devel/clang
-	sys-devel/llvm
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch"
-	"${FILESDIR}/deadbeef-musl.patch" # 870187
-)
-
-src_prepare() {
-	default
-
-	drop_from_linguas() {
-		sed "/${1}/d" -i "${S}/po/LINGUAS" || die
-	}
-
-	drop_and_stub() {
-		rm -rf "${1}"
-		mkdir "${1}"
-		cat > "${1}/Makefile.in" <<-EOF
-			all: nothing
-			install: nothing
-			nothing:
-		EOF
-	}
-
-	plocale_for_each_disabled_locale drop_from_linguas || die
-
-	eautopoint --force
-	eautoreconf
-
-	# Get rid of bundled gettext.
-	drop_and_stub "${S}/intl"
-
-	# Plugins that are undesired for whatever reason, candidates for unbundling and such.
-	for i in adplug alac dumb ffap mms gme mono2stereo psf shn sid soundtouch wma; do
-		drop_and_stub "${S}/plugins/${i}"
-	done
-
-	rm -rf "${S}/plugins/rg_scanner/ebur128"
-}
-
-src_configure () {
-	if ! tc-is-clang; then
-		AR=llvm-ar
-		CC=${CHOST}-clang
-		CXX=${CHOST}-clang++
-		NM=llvm-nm
-		RANLIB=llvm-ranlib
-
-		strip-unsupported-flags
-	fi
-
-	export HOST_CC="$(tc-getBUILD_CC)"
-	export HOST_CXX="$(tc-getBUILD_CXX)"
-	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
-
-	local myconf=(
-		"--disable-static"
-		"--disable-staticlink"
-		"--disable-portable"
-		"--disable-rpath"
-
-		"--disable-libmad"
-		"--disable-gtk2"
-		"--disable-adplug"
-		"--disable-coreaudio"
-		"--disable-dumb"
-		"--disable-alac"
-		"--disable-ffap"
-		"--disable-gme"
-		"--disable-mms"
-		"--disable-mono2stereo"
-		"--disable-psf"
-		"--disable-rgscanner"
-		"--disable-shn"
-		"--disable-sid"
-		"--disable-sndfile"
-		"--disable-soundtouch"
-		"--disable-src"
-		"--disable-tta"
-		"--disable-vfs-zip"
-		"--disable-vtx"
-		"--disable-wildmidi"
-		"--disable-wma"
-
-		"$(use_enable alsa)"
-		"$(use_enable oss)"
-		"$(use_enable pulseaudio pulse)"
-		"$(use_enable mp3)"
-		"$(use_enable mp3 libmpg123)"
-		"$(use_enable nls)"
-		"$(use_enable vorbis)"
-		"$(use_enable threads)"
-		"$(use_enable flac)"
-		"$(use_enable supereq)"
-		"$(use_enable cdda)"
-		"$(use_enable cdda cdda-paranoia)"
-		"$(use_enable aac)"
-		"$(use_enable cover artwork)"
-		"$(use_enable cover artwork-network)"
-		"$(use_enable dts dca)"
-		"$(use_enable ffmpeg)"
-		"$(use_enable converter)"
-		"$(use_enable musepack)"
-		"$(use_enable notify)"
-		"$(use_enable nullout)"
-		"$(use_enable opus)"
-		"$(use_enable pulseaudio pulse)"
-		"$(use_enable sc68)"
-		"$(use_enable shellexec)"
-		"$(use_enable shellexec shellexecui)"
-		"$(use_enable lastfm lfm)"
-		"$(use_enable wavpack)"
-
-		"--enable-gtk3"
-		"--enable-vfs-curl"
-		"--enable-shared"
-		"--enable-m3u"
-		"--enable-pltbrowser"
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-sound/deadbeef/deadbeef-1.9.1-r3.ebuild b/media-sound/deadbeef/deadbeef-1.9.3.ebuild
index a4a08e5811cc..504808ef7c02 100644
--- a/media-sound/deadbeef/deadbeef-1.9.1-r3.ebuild
+++ b/media-sound/deadbeef/deadbeef-1.9.3.ebuild
@@ -53,7 +53,7 @@ DEPEND="
 	pulseaudio? ( media-sound/pulseaudio )
 	vorbis? ( media-libs/libvorbis )
 	wavpack? ( media-sound/wavpack )
-	dev-libs/libdispatch
+	dev-libs/libdispatch:=
 "
 
 RDEPEND="${DEPEND}"
@@ -66,8 +66,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch"
-	"${FILESDIR}/deadbeef-musl.patch" # 870187
+	"${FILESDIR}/deadbeef-1.9.2-drop-Werror.patch"
 )
 
 src_prepare() {