gentoo resync : 02.02.2022

5 files changed, 10 insertions, 182 deletions

diff --git a/media-sound/deadbeef/Manifest b/media-sound/deadbeef/Manifest
index bed2aaf73ca9..d69c21430535 100644
--- a/media-sound/deadbeef/Manifest
+++ b/media-sound/deadbeef/Manifest
@@ -1,8 +1,5 @@
 AUX deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch 492 BLAKE2B d6ed36829d7ed139c43b6aa65c940f07e3f023d0554c258a2557c528d75e85c7dd2ca57eecef56088383a3b7b0b4f12109eb899f2847b86953421e826777c954 SHA512 0cec1ae38cf48b3f2ea53f74a6348d0217b1b3f017b836489d5b520f09ad76b6526cd3add48ed23871bc86feb7f7ed697cf6a62164a202be1ecabfd947e895f6
-DIST deadbeef-1.8.4.tar.gz 13049446 BLAKE2B a6c052b3b0aa1f74b49cf29be94e235d3dfd3d3f07ed9e1d05a4fc32036e591633eaff4ab59329cf6895828c9a674eec86b62e4818784db5f8e47eed089c80eb SHA512 18c54ae2c7931419ea06f3eb581cc8e704fa6eb87d330fc09f7295f4a8ef6e88b6f8c314223c34c321cd2a54f14cb6911add41602250c39c1b1c1edbf64d63b7
-DIST deadbeef-1.8.7.tar.bz2 5029039 BLAKE2B f6ae0d664553435fca566593d715f8f9fab13711bb0e0488c80b9c7ff88a28425d1e3de2ee4c57b87722705c5ede53e0390b81cdbe6ce804d781dfe934dc21e9 SHA512 49a9610f8aa8d9853cd4f9a38d103f9a902993a5ae1990937a3ac5a14a4f8533f4233002893875aedf45f737d1a95c7cea189c61d6387bd8be7f3535d60c96eb
 DIST deadbeef-1.8.8.tar.bz2 5083407 BLAKE2B 69fd2cbaf131b3e44b426163ce6a83479bb1aff0e088c4beea09d747750f6f20b1e297eab1dd1ae0446d2af0aaf28fe0cc7c9f9e3e73fe031d369ba2f5d809ca SHA512 399f0e70eca5e102a9e73ff03199c89c6f28f3e0da96e793316d1af83f00e71f09f6cc81a3fd0b0f0d52fe9e0195a3b9ffb0cf7e7708c3ea7085f33a5ec08b47
-EBUILD deadbeef-1.8.4-r1.ebuild 3651 BLAKE2B 729c8fe81510da3eec6fa9e0912caaa57c4e7b7e931860122e2a3b27f8ebcc41b0f7fc3ea455233f175df5ee1f169936db45eb835be3468f124c780206c96fb3 SHA512 d5ab123e4c5addf7e86b40fb9c83fdb287421204ff2db3895a4174b0ed042435845ac42be4446636496cf1f87a965a86f2aabb814564d74bc88d4ca3da45dd54
-EBUILD deadbeef-1.8.7-r2.ebuild 4010 BLAKE2B 658678730c6c67b3887628f70d19148d35b865d0295eaa67104c369db8ea0dfd896c5c604df150c410e4b2168a6bae34bbfa8aafca883f17702acc305156981e SHA512 01311fe0fe57a9c2ba841d210e4d66c63fff1638ed2f0fff06e6b3eb6b67d9a1916b0595dcc986fc172c3db61bdd8d84c3158905b5aa0371490cc5ed6e897263
-EBUILD deadbeef-1.8.8-r1.ebuild 4010 BLAKE2B 658678730c6c67b3887628f70d19148d35b865d0295eaa67104c369db8ea0dfd896c5c604df150c410e4b2168a6bae34bbfa8aafca883f17702acc305156981e SHA512 01311fe0fe57a9c2ba841d210e4d66c63fff1638ed2f0fff06e6b3eb6b67d9a1916b0595dcc986fc172c3db61bdd8d84c3158905b5aa0371490cc5ed6e897263
-MISC metadata.xml 833 BLAKE2B e76e4b70c70cfb6e3894d103a1f3489962c111fa00b60c45844de1dc6138b7e63054f58de383ac4acf7dc53804efb055cf00af2b7d2f9c323b8a6e6a520e34cc SHA512 343b5ae6082c1ca2f0cee8ed933138a43893a51356f39451b6a692d56afe5ca1d5d93675bce4e38d1789abebba537a44e6bdd2d23b87cebdde449e7243511504
+EBUILD deadbeef-1.8.8-r1.ebuild 4013 BLAKE2B bd62bccf7d2c3fb49f8b80648dee1d8752b4af837dc8a40b7fa95458668cb335505d6b23c3c395702ac100e21ee8ce61befca5677a1f323762c0c89101008410 SHA512 53791b05f7f5985939961670aa3364c98a555d5ca6e0ff3deea22031d4f499a4374ab3c78802eb065c1c64aa6a63066a9c714d4f1b31cd133bd64b9a903ff5f2
+EBUILD deadbeef-1.8.8-r2.ebuild 4019 BLAKE2B 62239ca5d1417d1052c4d32e4bdc8090c62a8032ff072bf7ab8369c45312256e5c29e94f31e2bf83e387105b14ba8f6e5688718ca9fb2227d6c02c1caec5e062 SHA512 44571382588b47434445f8e63111294da1feb5ebbca0a50ef07228d783db7674ccedc4e35694c9c451887216ceb773bcaa20cea42a6912c9a97508f23cfa3156
+MISC metadata.xml 892 BLAKE2B f13f0c59c3f1085f2b14a480d1c0fceca3cae3aa72523fe8ea7c92ec44f392e2f005df3bd46442d9d7bd1b9cfbf087319b679bcded7a53549789c2e481b8f5cc SHA512 a1fb3ea4e169b3b02345977dd6032bdf790b993be96778348b7eefc3900b2d2faa285d6a5e4cfdc9c48148397f5e58e9b6d48986e6f8245758bd06e4dfda51c0
diff --git a/media-sound/deadbeef/deadbeef-1.8.4-r1.ebuild b/media-sound/deadbeef/deadbeef-1.8.4-r1.ebuild
deleted file mode 100644
index 723b32dae0e8..000000000000
--- a/media-sound/deadbeef/deadbeef-1.8.4-r1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools plocale xdg
-
-DESCRIPTION="DeaDBeeF is a modular audio player similar to foobar2000"
-HOMEPAGE="https://deadbeef.sourceforge.io/"
-SRC_URI="https://github.com/DeaDBeeF-Player/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-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:0=
-	dev-libs/jansson:=
-	aac? ( media-libs/faad2 )
-	alsa? ( media-libs/alsa-lib )
-	cdda? (
-		dev-libs/libcdio:0=
-		media-libs/libcddb
-		dev-libs/libcdio-paranoia:0=
-	)
-	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 )
-"
-
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-"
-
-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 () {
-	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.8.8-r1.ebuild b/media-sound/deadbeef/deadbeef-1.8.8-r1.ebuild
index df7525b2b282..60f97c9006e4 100644
--- a/media-sound/deadbeef/deadbeef-1.8.8-r1.ebuild
+++ b/media-sound/deadbeef/deadbeef-1.8.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ LICENSE="
 	wavpack? ( BSD )
 "
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+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="
diff --git a/media-sound/deadbeef/deadbeef-1.8.7-r2.ebuild b/media-sound/deadbeef/deadbeef-1.8.8-r2.ebuild
index df7525b2b282..d31640a2e649 100644
--- a/media-sound/deadbeef/deadbeef-1.8.7-r2.ebuild
+++ b/media-sound/deadbeef/deadbeef-1.8.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ LICENSE="
 "
 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"
+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 )
@@ -93,7 +93,7 @@ src_prepare() {
 	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
+	for i in adplug alac dumb ffap mms gme mono2stereo psf shn sid soundtouch wma; do
 		drop_and_stub "${S}/plugins/${i}"
 	done
 
@@ -133,7 +133,6 @@ src_configure () {
 		"--disable-mono2stereo"
 		"--disable-psf"
 		"--disable-rgscanner"
-		"--disable-sc68"
 		"--disable-shn"
 		"--disable-sid"
 		"--disable-sndfile"
@@ -169,6 +168,7 @@ src_configure () {
 		"$(use_enable nullout)"
 		"$(use_enable opus)"
 		"$(use_enable pulseaudio pulse)"
+		"$(use_enable sc68)"
 		"$(use_enable shellexec)"
 		"$(use_enable shellexec shellexecui)"
 		"$(use_enable lastfm lfm)"
diff --git a/media-sound/deadbeef/metadata.xml b/media-sound/deadbeef/metadata.xml
index 4c130e8a6995..8d086b986004 100644
--- a/media-sound/deadbeef/metadata.xml
+++ b/media-sound/deadbeef/metadata.xml
@@ -15,6 +15,7 @@
 		<flag name="lastfm">last.fm/AudioScrobbler protocol support</flag>
 		<flag name="notify">Desktop notifications support</flag>
 		<flag name="nullout">Dummy output driver</flag>
+		<flag name="sc68">Atari ST and Amiga music player</flag>
 		<flag name="shellexec">Define custom shell commands that can be called on tracks</flag>
 		<flag name="supereq">Enable equalizer</flag>
 	</use>