gentoo resync : 24.07.2021

4 files changed, 2 insertions, 182 deletions

diff --git a/media-sound/brutefir/Manifest b/media-sound/brutefir/Manifest
index 08a7c5377813..c59f5da351fc 100644
--- a/media-sound/brutefir/Manifest
+++ b/media-sound/brutefir/Manifest
@@ -1,7 +1,4 @@
-AUX brutefir-1.0k-ld.patch 4655 BLAKE2B 56ae2cf653311030e5552e50653082b059baa39bf00d1d9a2692e319b459a88b4bef4e0a1aa01aedd2ec9c97f19de0f03b966d10c6faeeccd6ef907d91b12a59 SHA512 606d32f1b76901e3cb6d106259d19c64e3a6f841fd5d0791623ad824c7264ff3ecd7178073fe488c7f1d26b996b9900f9661406f987f2443e9eb8ef9eeb6491a
 AUX brutefir-1.0o-ld.patch 4226 BLAKE2B 2173740f52c60845e181508619d26b0aa21f52329d6f35ba62fbeaec9ce62f69041fcef84d1e3e999fbd34568116b51716a90b1ea8b4232e20a032efcbbb9f86 SHA512 bf8f736a634b80d40a3880393b9958f78278f83c122e310a8e3848ec83634e6d729754cae22c3e455292be84ba0ce8e794fe1009cb5c9eeb3bdc2efca9037b1e
-DIST brutefir-1.0k.tar.gz 246987 BLAKE2B 3db08c1f51e8febb63b293d1a242342e7d9f4fa4b447b46da37bc3de594bef8a6ee15cd8330ef73673011186dcfe47a5b056ec3c177f3982cd1837a582f050a1 SHA512 5eb81a18935fc3f014613b74c30b2e9a3acfe0ab58b72358f0428b60f0296ab54796b99fa00b12a671935b57589d710dd81b1e0ca675bd2b841c9e932a2c94ef
 DIST brutefir-1.0o.tar.gz 246504 BLAKE2B ab2b3c1d22e45422d01aa45a9e869770cbf017d85c1f7af54562a0972545df1f9ae5aa0d155baa02ee5aeef1c65eccf6bc9c9f75edce0f54882e4095ba2f1493 SHA512 e696948eeabb54a9cea8a9f2629c11c620fd37bc685cf32d3c21b1ea89ae7127f703c04a1f1775b073f5135b9268cc0a387c8087da5828cc2194295f850e8d1f
-EBUILD brutefir-1.0k-r2.ebuild 1066 BLAKE2B efbf3ea427688107fdac99fa6c84d118b39bb6a696f01bab9be1fff2080009a1137872383e46033d2570fa70cf6b52d5e860943f988f84dfcaeeacf34ed65c49 SHA512 044b154d4582ccebc9b76c083fa81742b59432216099ac2d73b41f919afee3d88f9f49d671a23d7d491cc27f7cc0cddf9d2096299fbd3877bb07e063c3e8c6a1
-EBUILD brutefir-1.0o.ebuild 1065 BLAKE2B 7de0cc6545b88c7755912bad73bb524d8556722161e98e12e67c48f5df070e41dc7e5c1443e5e18d98012ac32a2d4e71356238eee7ddf1251ddcc43477b758d0 SHA512 765229b15dae7542fbda5d9a1d0c6d4528e12c7e9d7fcf06bf0ce41d4526c728efd853103542a63b271ec79634a22ae25da245d777fe06357e85a81c02af12f3
+EBUILD brutefir-1.0o.ebuild 1063 BLAKE2B fa81db073894f7d0fbc8140846c9793fb5f1c2e1946803f1946b0ca822293c0b511458fe3d9b25a0a9e1f6e4848e88f34483f5b2dccb7dd6119a4255fb070a11 SHA512 b18c3cd495134c8fd596a6408eb1d4c521b9dc535c93001c4af6f7e380ff37b89552a30dbb6b9d4d0b673cde9f9885f83f379328314ce33adab508ff44902a1c
 MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-sound/brutefir/brutefir-1.0k-r2.ebuild b/media-sound/brutefir/brutefir-1.0k-r2.ebuild
deleted file mode 100644
index 28ddf46c7b96..000000000000
--- a/media-sound/brutefir/brutefir-1.0k-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Software convolution engine for applying long FIR filters"
-HOMEPAGE="https://torger.se/anders/brutefir.html"
-SRC_URI="https://torger.se/anders/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="
-	media-libs/alsa-lib
-	sci-libs/fftw:3.0
-	virtual/jack"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-ld.patch )
-
-src_compile() {
-	tc-export AS CC
-	emake
-}
-
-src_install() {
-	emake LIBDIR="/usr/$(get_libdir)" DESTDIR="${D}" \
-		install
-	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
-}
-
-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.0o.ebuild b/media-sound/brutefir/brutefir-1.0o.ebuild
index 62520e57bd6b..50944dbbc9bf 100644
--- a/media-sound/brutefir/brutefir-1.0o.ebuild
+++ b/media-sound/brutefir/brutefir-1.0o.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://torger.se/anders/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	media-libs/alsa-lib
diff --git a/media-sound/brutefir/files/brutefir-1.0k-ld.patch b/media-sound/brutefir/files/brutefir-1.0k-ld.patch
deleted file mode 100644
index 6860b5f360b5..000000000000
--- a/media-sound/brutefir/files/brutefir-1.0k-ld.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-The problem is that it passes -fPIC to the linker, and it does not use gcc as
-frontend, it uses ld directly. The problem is that -f on ld that produces a
-DT_AUXILIARY rather than causing any PIC code production. Fix also DESTDIR
-handling and add LIBDIR variable for multilib systems.
-
-See, http://bugs.gentoo.org/252338
-
-diff -ur brutefir-1.0k.orig/Makefile brutefir-1.0k/Makefile
---- brutefir-1.0k.orig/Makefile	2009-03-31 22:36:20.000000000 +0300
-+++ brutefir-1.0k/Makefile	2009-06-21 05:44:03.000000000 +0300
-@@ -1,11 +1,13 @@
- ###################################
- # Where to install
--INSTALL_PREFIX	= $(DESTDIR)/usr/local
-+# PREFIX	= /usr/local
-+PREFIX		= /usr
-+LIBDIR		= $(PREFIX)/lib
- 
- ###################################
- # Where to find libraries, and their header files.
--LIBPATHS	= -L/usr/local/lib
--INCLUDE		= -I/usr/local/include
-+# LIBPATHS	= -L/usr/local/lib
-+# INCLUDE	= -I/usr/local/include
- ifdef FFTW_PATH
- LIBPATHS	+= -L$(FFTW_PATH)/lib
- INCLUDE		+= -I$(FFTW_PATH)/include
-@@ -17,19 +19,15 @@
- 
- ###################################
- # Binaries
--FLEX	= flex
--LD	= ld
--CC	= gcc
--AS	= as
-+FLEX	?= flex
-+CC	?= gcc
-+AS	?= as
- 
- ###################################
- # Flags
--CC_WARN		= -Wall -Wlong-long -Wpointer-arith -Wshadow \
-+CFLAGS		+= -Wall -Wlong-long -Wpointer-arith -Wshadow \
- -Wcast-qual -Wcast-align -Wwrite-strings -Wstrict-prototypes \
- -Wmissing-prototypes -Wmissing-declarations -Wnested-externs
--CC_FLAGS	= $(DEFINE) -O2
--CC_FPIC		= -fPIC
--LD_SHARED	= -shared
- 
- ###################################
- # Objects and libs for targets
-@@ -74,7 +72,7 @@
- BRUTEFIR_OBJS	+= $(BRUTEFIR_IA32_OBJS)
- endif
- BRUTEFIR_LIBS	+= -ldl
--LDMULTIPLEDEFS	= -Xlinker --allow-multiple-definition
-+LINKFLAGS	= -fPIC -shared -Xlinker --allow-multiple-definition
- # assume that we have alsa, osss and jack
- LIB_TARGETS	+= alsa.bfio
- LIB_TARGETS	+= oss.bfio
-@@ -83,11 +81,11 @@
- 
- # Solaris
- ifeq ($(UNAME),SunOS)
--CC_WARN		= -Wall -Wlong-long -Wpointer-arith -Wshadow \
-+CFLAGS		+= -Wall -Wlong-long -Wpointer-arith -Wshadow \
- -Wcast-qual -Wwrite-strings -Wmissing-prototypes -Wmissing-declarations \
- -Wnested-externs
- ifeq ($(UNAME_P),sparc)
--CC_FLAGS	+= -Wa,-xarch=v8plus
-+CFLAGS		+= -Wa,-xarch=v8plus
- endif
- BRUTEFIR_LIBS	+= -lrt -ldl
- endif
-@@ -112,43 +110,44 @@
- 	$(AS) -o $@			$<
- 
- %.fpic.o: %.c
--	$(CC) -o $@			-c $(INCLUDE) $(CC_FPIC) $(CC_WARN) $(CC_FLAGS) $<
-+	$(CC) -fPIC -shared -o $@	-c $(INCLUDE) $(CFLAGS) $<
- 
- %.o: %.c
--	$(CC) -o $@			-c $(INCLUDE) $(CC_WARN) $(CC_FLAGS) $<
-+	$(CC) -o $@			-c $(INCLUDE) $(CFLAGS) $<
- 
- # special rule to avoid to get warnings from code generated by flex
- bfconf_lexical.o: bfconf_lexical.c
--	$(CC) -o $@			-c $(INCLUDE) $(CC_FLAGS) $<
-+	$(CC) -o $@			-c $(INCLUDE) $(CFLAGS) $<
- 
- %.c: %.lex
- 	$(FLEX) -o$@ $<
- 
- brutefir: $(BRUTEFIR_OBJS)
--	$(CC) $(LIBPATHS) $(LDMULTIPLEDEFS) -o $@ $(BRUTEFIR_OBJS) $(BRUTEFIR_LIBS)
-+	$(CC) $(LDFLAGS) $(LDMULTIPLEDEFS) $(CFLAGS) $(LIBPATHS) -o $@ $(BRUTEFIR_OBJS) $(BRUTEFIR_LIBS)
- 
- alsa.bfio: $(BFIO_ALSA_OBJS)
--	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS) -lc
-+	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFIO_ALSA_OBJS) $(BFIO_ALSA_LIBS) -lc
- 
- oss.bfio: $(BFIO_OSS_OBJS)
--	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS) -lc
-+	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFIO_OSS_OBJS) -lc
- 
- jack.bfio: $(BFIO_JACK_OBJS)
--	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS) -lc
-+	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFIO_JACK_OBJS) $(BFIO_JACK_LIBS) -lc
- 
- file.bfio: $(BFIO_FILE_OBJS)
--	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS) -lc
-+	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFIO_FILE_OBJS) -lc
- 
- cli.bflogic: $(BFLOGIC_CLI_OBJS)
--	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS) -lc
-+	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFLOGIC_CLI_OBJS) -lc
- 
- eq.bflogic: $(BFLOGIC_EQ_OBJS)
--	$(LD) $(LD_SHARED) $(CC_FPIC) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS) -lc
-+	$(CC) $(LINKFLAGS) $(LDFLAGS) $(CFLAGS) $(LIBPATHS) -o $@ $(BFLOGIC_EQ_OBJS) -lc
- 
- install: $(BIN_TARGETS) $(LIB_TARGETS)
--	install -d $(INSTALL_PREFIX)/bin $(INSTALL_PREFIX)/lib/brutefir
--	install $(BIN_TARGETS) $(INSTALL_PREFIX)/bin
--	install $(LIB_TARGETS) $(INSTALL_PREFIX)/lib/brutefir
-+	install -d $(DESTDIR)$(PREFIX)/bin
-+	install $(BIN_TARGETS) $(DESTDIR)$(PREFIX)/bin
-+	install -d $(DESTDIR)$(LIBDIR)/brutefir
-+	install $(LIB_TARGETS) $(DESTDIR)$(LIBDIR)/brutefir
- 
- clean:
- 	rm -f *.core core bfconf_lexical.c $(BRUTEFIR_OBJS) $(BFIO_FILE_OBJS)  \