gentoo resync : 06.01.2018

3 files changed, 4 insertions, 82 deletions

diff --git a/media-libs/freeverb3/Manifest b/media-libs/freeverb3/Manifest
index 513d369c30a0..d465f84a78aa 100644
--- a/media-libs/freeverb3/Manifest
+++ b/media-libs/freeverb3/Manifest
@@ -1,5 +1,4 @@
 AUX freeverb3-3.1.2_pre20151102-jack-audacious-3-6.patch 2943 BLAKE2B de4464dff7c5476f39d3757f945edae4a524b2267fe02988add4d1f1bab314a06910ba8f2cb5ed66e5843a7725df2abbbc0b00b04a5cf20036832d14ffe414e4 SHA512 fe5d2a14f08f123a1c16bdab4c84f1f2c3b3fa800bf05efca28b1c0b755ed1d8e5848a1b95a8d8fd7a8f4dd626b3ad0e87db072db877f195495558f09f75cb30
 DIST freeverb3-3.1.2_pre20151102.tar.gz 8416503 BLAKE2B 114089be0829e3f1ac36e43e43f455f020e0c72ee6e8e66e1dc2571b8715e56bbdf3b71aa332c3451d511ea4695d6b11a08fb11c9a0e8876ed2556a964be38d9 SHA512 ccdcf8832155e479164bb6a4cb2f830db83bf55b8c797ba96686abe8392e7d88f55c6ab8bcb2db447ec3ab4f5cca05e09ec0753a61452c01a32ff9f4008b3536
-EBUILD freeverb3-3.1.2_pre20151102-r1.ebuild 2239 BLAKE2B 797515196d2f1efd40fa6ace0865b48cdc30a2e865268bc97d3445e42a87b7702d781c3066f6882025818e9cb5274da2d02c9df7f1158e441a6587a758acd34e SHA512 d9dd88027ebf0a28affe04f6e14b8def82097146331bf50ca0cef485fd9952494426bb9d794a21663f662dd85f336d3bc60970a8c566df4ed5c1302cf6356b1b
-EBUILD freeverb3-3.1.2_pre20151102.ebuild 2059 BLAKE2B 82a173d6feab5f0c8938b2522b0d726541738151f7f645f0cc2cbbb8855152305870539cfb4c27d8e3b00e13673be97219ef47bc2ff4b6e53c05fd0290742a46 SHA512 58cf24f0297669492de917bc9df0d43f61325fab49d4465ccfd9fdcfd7e6ea2cc4d900ff23b2afcd079b3eff8236790f5089acf43867093e2fe65ce2a1b8aa4a
+EBUILD freeverb3-3.1.2_pre20151102-r1.ebuild 2166 BLAKE2B 365c7fd3b7b9031c50a5dfd6c16a6403194bfc2a87cd4624d1042ccb99acd8bf5a6c553c3368e3ca5410185f9dedf015d7cfd1b9e32ccd513d8b0b15e3db0ee4 SHA512 0e4693c93a52604084c09cb9a3d2377eee846837e14d07529c8afa3897f623c8ca9cf5b2a4a54673d3e54e05a87a42619c550e6316255c086e78ff1de480405e
 MISC metadata.xml 659 BLAKE2B a7f87a8f8a936d3b366baa087d928641b6690029a039526b4d10bb66ae65d1017d476ea278482853444e613844ab1a16030a7816fe120ecc26c5ee34f8ecd181 SHA512 160cb0784d386e3afe894c5552de7991ceacf332c78e47ebf4b33f02e8f36c3eb05b355f2156cea4b7146a0f13551c1341e5aed0e47ceee39f43c63885e4cece
diff --git a/media-libs/freeverb3/freeverb3-3.1.2_pre20151102-r1.ebuild b/media-libs/freeverb3/freeverb3-3.1.2_pre20151102-r1.ebuild
index 7bf95fa1c744..99aab4c4be8d 100644
--- a/media-libs/freeverb3/freeverb3-3.1.2_pre20151102-r1.ebuild
+++ b/media-libs/freeverb3/freeverb3-3.1.2_pre20151102-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://www.hartwork.org/public/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 _IUSE_INSTRUCTION_SETS="cpu_flags_x86_3dnow cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1"
 IUSE="${_IUSE_INSTRUCTION_SETS} audacious forcefpu jack openmp plugdouble threads"
 
@@ -21,9 +21,7 @@ _GTK_DEPEND=">=dev-libs/glib-2.4.7:2
 	x11-libs/cairo"
 
 RDEPEND=">=sci-libs/fftw-3.0.1
-	audacious? (
-		|| ( >=media-sound/audacious-3.7[gtk3]
-			( >=media-sound/audacious-3.6 <media-sound/audacious-3.7 ) )
+	audacious? ( >=media-sound/audacious-3.7[gtk3]
 		${_GTK_DEPEND}
 		media-libs/libsndfile )
 	jack? ( media-sound/jack-audio-connection-kit
diff --git a/media-libs/freeverb3/freeverb3-3.1.2_pre20151102.ebuild b/media-libs/freeverb3/freeverb3-3.1.2_pre20151102.ebuild
deleted file mode 100644
index 7ebbab40e26d..000000000000
--- a/media-libs/freeverb3/freeverb3-3.1.2_pre20151102.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils multilib versionator
-
-MY_PV=796b552e8a32cc8e63d40dfb94b8a6209731060b
-DESCRIPTION="Reverb and Impulse Response Convolution plug-ins (Audacious/JACK)"
-HOMEPAGE="https://savannah.nongnu.org/projects/freeverb3"
-SRC_URI="https://www.hartwork.org/public/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-_IUSE_INSTRUCTION_SETS="cpu_flags_x86_3dnow cpu_flags_x86_avx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1"
-IUSE="${_IUSE_INSTRUCTION_SETS} audacious forcefpu jack openmp plugdouble threads"
-
-_GTK_DEPEND=">=dev-libs/glib-2.4.7:2
-	>=x11-libs/gtk+-3.0.0:3
-	x11-libs/pango
-	x11-libs/cairo"
-
-RDEPEND=">=sci-libs/fftw-3.0.1
-	audacious? ( >=media-sound/audacious-3.6
-		${_GTK_DEPEND}
-		media-libs/libsndfile )
-	jack? ( media-sound/jack-audio-connection-kit
-		${_GTK_DEPEND}
-		media-libs/libsndfile )"
-DEPEND=${RDEPEND}
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-profile \
-		--enable-release \
-		--disable-autocflags \
-		--enable-undenormal \
-		$(use_enable threads pthread) \
-		$(use_enable forcefpu) \
-		--disable-force3dnow \
-		$(use_enable cpu_flags_x86_3dnow 3dnow) \
-		$(use_enable cpu_flags_x86_sse sse) \
-		$(use_enable cpu_flags_x86_sse2 sse2) \
-		$(use_enable cpu_flags_x86_sse3 sse3) \
-		$(use_enable cpu_flags_x86_sse4_1 sse4) \
-		$(use_enable cpu_flags_x86_avx avx) \
-		--disable-fma \
-		--disable-fma4 \
-		$(use_enable openmp omp) \
-		--disable-sample \
-		$(use_enable jack) \
-		$(use_enable audacious) \
-		--disable-srcnewcoeffs \
-		$(use_enable plugdouble) \
-		--disable-pluginit \
-		|| die "econf failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc ChangeLog README || die 'dodoc failed'
-
-	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 || die
-}