From: Sebastian Pipping <sping@gentoo.org>
Date: Tue, 24 Mar 2020 22:28:52 +0000 (+0100)
Subject: media-libs/freeverb3: Drop masked Jack and Audacious bits to survive
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=55146687ca4ec05fb93e2daa640cb6a668743fbf;p=gentoo.git

media-libs/freeverb3: Drop masked Jack and Audacious bits to survive

Bug: https://bugs.gentoo.org/671828
Signed-off-by: Sebastian Pipping <sping@gentoo.org>
Package-Manager: Portage-2.3.92, Repoman-2.3.20
---

diff --git a/media-libs/freeverb3/freeverb3-3.2.1-r1.ebuild b/media-libs/freeverb3/freeverb3-3.2.1-r2.ebuild
similarity index 57%
rename from media-libs/freeverb3/freeverb3-3.2.1-r1.ebuild
rename to media-libs/freeverb3/freeverb3-3.2.1-r2.ebuild
index ad6ce443e98f..956f16ac14ea 100644
--- a/media-libs/freeverb3/freeverb3-3.2.1-r1.ebuild
+++ b/media-libs/freeverb3/freeverb3-3.2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,27 +10,9 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="audacious forcefpu jack openmp plugdouble threads"
+IUSE="forcefpu openmp plugdouble threads"
 
-REQUIRED_USE="jack? ( audacious )"
-
-_GTK_DEPEND="
-	>=dev-libs/glib-2.4.7:2
-	x11-libs/cairo
-	x11-libs/gtk+:3
-	x11-libs/pango
-"
-RDEPEND="
-	sci-libs/fftw:3.0=
-	audacious? ( ${_GTK_DEPEND}
-		=media-sound/audacious-3.9*[gtk3(+)]
-		media-libs/libsndfile
-	)
-	jack? ( ${_GTK_DEPEND}
-		virtual/jack
-		media-libs/libsndfile
-	)
-"
+RDEPEND="sci-libs/fftw:3.0="
 DEPEND="${RDEPEND}"
 
 src_configure() {
@@ -42,8 +24,8 @@ src_configure() {
 		--disable-profile
 		--disable-sample
 		--disable-srcnewcoeffs
-		$(use_enable audacious)
-		$(use_enable jack)
+		--disable-audacious
+		--disable-jack
 		$(use_enable openmp omp)
 		$(use_enable plugdouble)
 		$(use_enable threads pthread)
@@ -55,10 +37,6 @@ src_install() {
 	emake DESTDIR="${D}" install
 	einstalldocs
 
-	if use audacious ; then
-		find "${D}/usr/$(get_libdir)/audacious/" -name '*.la' -print -delete || die
-	fi
-
 	insinto /usr/share/${PN}/samples/IR
 	doins samples/IR/*.wav
 }
diff --git a/media-libs/freeverb3/metadata.xml b/media-libs/freeverb3/metadata.xml
index c5d214afe1db..5a8e3e767be9 100644
--- a/media-libs/freeverb3/metadata.xml
+++ b/media-libs/freeverb3/metadata.xml
@@ -10,7 +10,6 @@
 		<name>Gentoo Sound project</name>
 	</maintainer>
 	<use>
-		<flag name="audacious">Build Audacious plugin</flag>
 		<flag name="forcefpu">Disable assembly code</flag>
 		<flag name="plugdouble">Build plugins in double precision mode
 			(default is float)</flag>
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 419ade28d380..03f6afbc88e0 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -136,10 +136,6 @@ app-backup/backup-manager s3
 # Requires stable phpunit
 dev-php/PEAR-Text_Password test
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2017-11-04)
-# Requires audacious, which is masked. Bug 632513
-media-libs/freeverb3 audacious jack
-
 # Andreas Sturmlechner <asturm@gentoo.org> (2017-10-22)
 # Requires unmaintained unstable dependency net-libs/gloox.
 # The go flag requires stable masked dev-lang/go[gccgo].
diff --git a/profiles/package.mask b/profiles/package.mask
index b049823d8031..011c9fe0f661 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -52,7 +52,11 @@ x11-misc/xplanetFX
 # Package appears dead upstream, purpose unclear after media-sound/audacious-3.9
 # is gone, bug #671828. GTK2 (3.10.1) or Qt5 (4.0) version of Audacious remains.
 # Masked for removal in 30 days.
-media-libs/freeverb3
+#
+# Sebastian Pipping <sping@gentoo.org> (2020-03-24)
+# Audacious aspect dropped from Freeverb3 ebuild now so that
+# package media-libs/freeverb3 can live on.
+# Keeping Audacious 3.9* masked for removal as before.
 =media-sound/audacious-3.9*
 =media-plugins/audacious-plugins-3.9*