gentoo resync : 24.12.2018

3 files changed, 3 insertions, 50 deletions

diff --git a/media-sound/brutefir/Manifest b/media-sound/brutefir/Manifest
index 6a3ed9a02769..1f5e0d220258 100644
--- a/media-sound/brutefir/Manifest
+++ b/media-sound/brutefir/Manifest
@@ -1,5 +1,4 @@
 AUX brutefir-1.0k-ld.patch 4655 BLAKE2B 56ae2cf653311030e5552e50653082b059baa39bf00d1d9a2692e319b459a88b4bef4e0a1aa01aedd2ec9c97f19de0f03b966d10c6faeeccd6ef907d91b12a59 SHA512 606d32f1b76901e3cb6d106259d19c64e3a6f841fd5d0791623ad824c7264ff3ecd7178073fe488c7f1d26b996b9900f9661406f987f2443e9eb8ef9eeb6491a
 DIST brutefir-1.0k.tar.gz 246987 BLAKE2B 3db08c1f51e8febb63b293d1a242342e7d9f4fa4b447b46da37bc3de594bef8a6ee15cd8330ef73673011186dcfe47a5b056ec3c177f3982cd1837a582f050a1 SHA512 5eb81a18935fc3f014613b74c30b2e9a3acfe0ab58b72358f0428b60f0296ab54796b99fa00b12a671935b57589d710dd81b1e0ca675bd2b841c9e932a2c94ef
-EBUILD brutefir-1.0k-r1.ebuild 1217 BLAKE2B 0dd758e2e3d319e0b376b9f00f7ade1bbef1dc74a5a5f399dc516ae311ff9671a4a91e355d06cdbaa1835318c1778321dd7568999c862aaf6f795a6f38681437 SHA512 86a2d22827c14dd89105976676f7c9e48143a610b07e3ea53e5cf7536716ee4acaec0eea1ebd78d3879b0c1c6c45e2fbe30983d57bb14409232453df02951dae
-EBUILD brutefir-1.0k-r2.ebuild 1108 BLAKE2B 6cb5824eea3e58cac26ff40c9cc412dc081e39f35bd85aa9cda77e268f422f9a82587c622f85f86cacd5972614708d5fd0e513dce2d3e6bdada8428c527af6b7 SHA512 1fd4f6f28008770336559eca2077af00185c6b91f6bf72deac652a6934548ade23ceabc69fd87f1a194b6f20767e99e622e243a253aa151444b0e29a4e8f27ec
+EBUILD brutefir-1.0k-r2.ebuild 1103 BLAKE2B fa456a16de2a0014236595bbc49a5b158536a758a184d87d351053e4d898c509515f2440dce18bfc2ef6db50709314e6f527fc9777353afed53d554098ae362b SHA512 b9203230a0686522331f196fdfb3f0fb3daef3ca35ca6fc5f13b30e85906e9bef4254af5228fcaa68db9498e45ae125359844c489d763e964adcefc401e03e24
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/brutefir/brutefir-1.0k-r1.ebuild b/media-sound/brutefir/brutefir-1.0k-r1.ebuild
deleted file mode 100644
index 1ec006053754..000000000000
--- a/media-sound/brutefir/brutefir-1.0k-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Software convolution engine for applying long FIR filters"
-HOMEPAGE="http://www.ludd.luth.se/~torger/brutefir.html"
-SRC_URI="http://www.ludd.luth.se/~torger/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="media-libs/alsa-lib
-	media-sound/jack-audio-connection-kit
-	sci-libs/fftw:3.0"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-ld.patch
-}
-
-src_compile() {
-	tc-export AS CC
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" \
-		install || die "emake install failed"
-	dodoc CHANGES README
-
-	insinto /usr/share/${PN}
-	doins xtc_config directpath.txt crosspath.txt massive_config \
-		bench1_config bench2_config bench3_config bench4_config \
-		bench5_config || die "doins failed"
-}
-
-pkg_postinst() {
-	elog "Brutefir is a complicated piece of software. Please"
-	elog "read the documentation first! You can find"
-	elog "documentation here: http://www.ludd.luth.se/~torger/brutefir.html"
-	elog "Example config files are in /usr/share/brutefir"
-}
diff --git a/media-sound/brutefir/brutefir-1.0k-r2.ebuild b/media-sound/brutefir/brutefir-1.0k-r2.ebuild
index c4bc957fd6f7..5c205ce75718 100644
--- a/media-sound/brutefir/brutefir-1.0k-r2.ebuild
+++ b/media-sound/brutefir/brutefir-1.0k-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.ludd.ltu.se/~torger/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="media-libs/alsa-lib
 	media-sound/jack-audio-connection-kit