[gentoo-commits] repo/gentoo:master commit in: media-sound/deadbeef/

["Piotr Karbowski" <slashbeast@gentoo.org>]

commit:     9c65f40e6fb0f08a9a0181995c31831e45e0d66a
Author:     Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 30 22:18:21 2022 +0000
Commit:     Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
CommitDate: Sun Jan 30 22:19:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c65f40e

media-sound/deadbeef: sc68 support added; drop old.

Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org>

 media-sound/deadbeef/deadbeef-1.8.4-r1.ebuild      | 170 ---------------------
 ...ef-1.8.7-r2.ebuild => deadbeef-1.8.8-r2.ebuild} |   8 +-
 media-sound/deadbeef/metadata.xml                  |   1 +
 3 files changed, 5 insertions(+), 174 deletions(-)

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.7-r2.ebuild b/media-sound/deadbeef/deadbeef-1.8.8-r2.ebuild
similarity index 93%
rename from media-sound/deadbeef/deadbeef-1.8.7-r2.ebuild
rename to 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>