gentoo auto-resync : 24:02:2023 - 03:46:27

3 files changed, 7 insertions, 203 deletions

diff --git a/media-sound/deadbeef/Manifest b/media-sound/deadbeef/Manifest
index 61ad8a0c2cd7..4d2d0d0e8cab 100644
--- a/media-sound/deadbeef/Manifest
+++ b/media-sound/deadbeef/Manifest
@@ -2,12 +2,10 @@ AUX deadbeef-1.9.1-ffmpeg-5.0-fixes.patch 1298 BLAKE2B 5ff65bf6208ad7e75c56db0a4
 AUX deadbeef-1.9.2-cdda-plugin-clang-16-fixes.patch 1122 BLAKE2B 7693cb8fa0c5951eae240ff2d1ea7ca68c151dfcacab27dcb1cb293ae84e8ec11b94d49017f8a942b7443a9d80fcbda3a87eff84bf71d19ea1bb92fc64baf832 SHA512 ae7bddf970898d2e07ade6752b09f26782529186d880bceba93777380b103b2de8c67fbae784841904515e7a8c16e4bc34a6d1f390e1f6633ecff0bd3100dc58
 AUX deadbeef-1.9.2-drop-Werror.patch 4955 BLAKE2B 0435971de41528e20909623ff485a202e1260cb542b4b65d3cec3ec8d2f3fce097646a6bcbbd2204e39c246500b13096714d99426c4f3d468dbf0115c5907a5f SHA512 101e7316165fc28b2a300245c0fa9d86a5c1fdf2823b638fb8c3698df03a559b4dde07ac2aabd1b08ae498a42a7b298e4fc9330d2da9fec80cce6418bd504b9b
 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.2.tar.bz2 5105029 BLAKE2B fbf63f9df22fecacb2fadfe722856aeaa756bb75796a381822de4c033509f88680bb4ca458f4a270608396b3125911f974c283769da184401c4a152da49e2c27 SHA512 fa4298fb3a89b3891c2f0403b2c66e20f64206101ad44f53be5208a69b33d3de3e0ced329cf090c17a1a3c4f7b28920baf5f8c964df2b6bdea6095465d0a02d9
 DIST deadbeef-1.9.3.tar.bz2 5138392 BLAKE2B 3368c38246aae0ac125326b87c2f18523274564ad273c977620bc6e7af3ca50f111a03c3057ff62c068d8cc1942fb1f8b28639043bf9032e08f7ceb1dbb4b03a SHA512 54ef09b723df062bf35d435c959792247121ce0b0f0eebc568347ef8725bf3cdd7eee7b9c69f6443b0a2731354d96c33e18a9a9e7d4068d4de7733d1f77d4376
 DIST deadbeef-1.9.4.tar.bz2 5150264 BLAKE2B 993d7a89f1d95d7b03938d05b7f4d5a3634b36ab1743834fde20500f79e848d13d92b2933e5df2439f44ae7274235ea8d084fa51ec968b7a231158f09f057a22 SHA512 80b286c0cd80ac71bda83621f48ec51f7d58215f7c1364065a9f7da668eb13c513ec89254993449341c0da6fc6d5f8b546c45965f95b404a01af1d56949ad4f7
-EBUILD deadbeef-1.8.8-r3.ebuild 4014 BLAKE2B ea7c4dff97eddc3c2f0b4ad6449b3dc7cb5c0f7f9fd8cc3a03fab84bfe9838a90e104ac128156be569e3b6320c0b19743f67665d42946b59ee8822812dde6455 SHA512 88e4ff5728e22f9e3ddf9dc3789b56c146a65f99963ab09dd09b2c9fb5bc30c62d54eaa4c605fc2a01348d6b6289cb706c21186d18dd758e5e1a1cbfed10794b
-EBUILD deadbeef-1.9.2-r1.ebuild 4189 BLAKE2B 5759ad20a0bae71d98f90647d4d0cdf896b07a84683d3d7b03742a9cbc85772744d15f79d1dccf33d0513f980838ccc7aa2819d52af94744d89ad5e19a189bb3 SHA512 5924492fa447c34944855990665b49a6303b909e75431a1db08aedc1f6fb3b54e15eba8f48d47543ae6fc82193656a98a5e99310caa7a02f9e5fc84265c83cf3
+DIST deadbeef-1.9.5.tar.bz2 5204015 BLAKE2B 45b9023807a5652c38f6cafd5ea0fca87e2872db264538f5c9d9ee4815281fe3f4e08eee5d43a083a67b3a9f646de24a90147d76f15622710d8f4adbdabe0c8d SHA512 c7a15f47fd8081a363e5cba732aa4ff4b1c311408728fbc5f7f47cf349bc112274a1d9fe0df8a58f09abf8f7656d914fb1baafa38fdf4dcb38fae7e1f70f682c
 EBUILD deadbeef-1.9.3.ebuild 4008 BLAKE2B 20955715a8328cb668a33c36d2e9572a2dfd8366bf497addff80632fb7cf1566d67bcb7c2563ede3502c51cbec0be23ff51d1f6ff02f89aa09ee0ebff850eb3d SHA512 7b2499bbec78d414533c4a21b1f8a0e8f883ed8f29614a8f6147d383e01e6e7f1528424723091f1bc3c41975bdbbad8db2b39ed18a5a50df7bd39289484131e9
 EBUILD deadbeef-1.9.4.ebuild 4061 BLAKE2B 1b2ad1950f229839ecf939c4d91420d701557078b90e07cade51a82225cd3717779ca180678f85be97ef16373e405803e661dc630cf1219bd67bf9bf9a942e68 SHA512 d99a6599e224c7fbaa9b1eca875078286b07f84cb6b1a848aed4824f206c0e8de5b94fc564da3f748d765489ffdcbcc9728da992279dd083e679aacedec66bc8
+EBUILD deadbeef-1.9.5.ebuild 4061 BLAKE2B 1d49cac4c50b93cadfa0d30b184bb98ab7028a226d107d3a001fb1bdbe2753db3083deb66949c621304292dad9ccffe11b1ff7778b53b70211e0ba9e2831fbbe SHA512 04b0cccbd30e0613ccc1a48f3198f1c4e71f712478d194ad3d4ba13b12f62a5fbfdfdea69e5ea9e812db5b12afcc2b776d755e4d5de0eeaa8a7ac6dad64c1e68
 MISC metadata.xml 969 BLAKE2B 0f8c160dd8cf50b9d8ed80efe90575527ec0a732f1c0e3dc5c3bf8ad77cea61a81af60de3b49cb38e7fe89128db136a0e61537fdcb93a89745bd0e11b69e3e71 SHA512 4ab2ea957796b6cf15129365f10d876b794bab521861e23f0f166f413c723b34f8cac17799cfc18529498a462d7bac7f633ec33093627c4167c3f4471d43da3a
diff --git a/media-sound/deadbeef/deadbeef-1.8.8-r3.ebuild b/media-sound/deadbeef/deadbeef-1.8.8-r3.ebuild
deleted file mode 100644
index 573c0542dd95..000000000000
--- a/media-sound/deadbeef/deadbeef-1.8.8-r3.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 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 x86"
-IUSE="aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm mp3 musepack nls notify nullout opus oss pulseaudio 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 sc60 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-sc68"
-		"--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 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.2-r1.ebuild b/media-sound/deadbeef/deadbeef-1.9.5.ebuild
index 356d8a3ba11d..a7bb13b63cfe 100644
--- a/media-sound/deadbeef/deadbeef-1.9.2-r1.ebuild
+++ b/media-sound/deadbeef/deadbeef-1.9.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -15,7 +15,7 @@ LICENSE="
 	wavpack? ( BSD )
 "
 SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 IUSE="aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm libsamplerate mp3 musepack nls notify +nullout opus oss pulseaudio sc68 shellexec +supereq threads vorbis wavpack"
 
 REQUIRED_USE="
@@ -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,10 +66,7 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch"
 	"${FILESDIR}/deadbeef-1.9.2-drop-Werror.patch"
-	"${FILESDIR}/deadbeef-1.9.1-ffmpeg-5.0-fixes.patch"
-	"${FILESDIR}/deadbeef-1.9.2-cdda-plugin-clang-16-fixes.patch"
 )
 
 src_prepare() {
@@ -94,8 +91,8 @@ src_prepare() {
 	eautopoint --force
 	eautoreconf
 
-	# Get rid of bundled gettext.
-	drop_and_stub "${S}/intl"
+	# Get rid of bundled gettext. (Avoid build failures with musl)
+	use elibc_musl || 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