gentoo resync : 28.04.2021

6 files changed, 33 insertions, 32 deletions

diff --git a/media-sound/bristol/Manifest b/media-sound/bristol/Manifest
index 4f3710472dae..c0d0715b8816 100644
--- a/media-sound/bristol/Manifest
+++ b/media-sound/bristol/Manifest
@@ -1,7 +1,7 @@
-AUX bristol-0.60.11-cflags.patch 7046 BLAKE2B 1b51164828f40f722afeafd955efae25f11cd913bb223f670ea65368a56e8aad1c12480b3d5ec4b0787bebd5425ebc291d71bdc6f74ef1efdcc726d5d388606b SHA512 92881949eeeabd3afa6253f4830bcc3925bd8889ac8335c08b86a3d9c7e53ca097527a51a341d5f7bcb2fd81eda5e038a33eff92af381d8d6b6e0f03e5bcbe1e
-AUX bristol-0.60.11-dontcompress.patch 576 BLAKE2B 78f5629897a3ae3380f5e64ccce6fc485acddf12051a5be33ccde597ba20b8064dc8d597d6e93424c56eacd2ce8cb32bcce7c42bb9530b308136747cf21bbc5b SHA512 dd2fa1859af1e071784138af701caf65d9a076e287d767d64d70cba56462e6ce5c62aea2c50dd617598059372ef1cbe5d9571e3d18110bd64e7789fdb5d9edad
-AUX bristol-0.60.11-implicit-dec.patch 320 BLAKE2B 8fef42ab74f5f6777c86774a7f7c8092b20d8c596ab2118fd862bc32e0f3fa55ceee488cc88d4599f22b4b373d67c2af3ea189f3508e30564ffc71acb5e812a1 SHA512 50a59747c75a8843b06fc412c65d724d8f205be1c6d9d5c0aa0d38c57f0f1401634dd301b531f8a28ca43f3804727d9ded82e6fa49abd5372fc8e70f87f5b341
-AUX bristol-0.60.11-rm_alsa-iatomic.h.patch 967 BLAKE2B 9da2f53f06e4db83c5fe280e3253c70a83e052304c9e5adcd6e64956c81ea7bfd9eaf1dd5d639aca581c16bb446140fcef591753b3325aa0f700ed3a8649f1db SHA512 a86aefdcb1a6431bce94dc062b4f3e73332196fc71a154c8d171991cd61b3694958229c5d329245e098976732f03f75516dd7521d887b822bd6441e66a1bd64a
+AUX bristol-0.60.11-cflags.patch 6738 BLAKE2B 18d7245f7c7bbd13177bd48d076bde9350128b1959a723de6f6946ea7aad2c526c5cf2c9f818d3214f788d111d2b955d0f89ad4c7731c83b212b7890ff9f8d61 SHA512 d5bc27d1747f04f187f6774004ff983a26420f2290e04d3d234a6c359cf0c80c5e8cc065e5ac25b42814016576124f94ca490a585885953f4399fffe444c097c
+AUX bristol-0.60.11-dontcompress.patch 504 BLAKE2B 387cc99241f4d39bf64dca83ddb7474758f4425fad51e6e518a6a99386cca008fe4a574458617b771a54182c5238915fed3fea00d5f82fe737c8afa2a417fb55 SHA512 3a0d56b83308ae3e555956ef930943420241e0951ca71d6d6d6e1ae98eafb9dc350a97873faf6b44fccb0cf1c58ccea6bb8923e8d9ada3349f2b0fa90e10d803
+AUX bristol-0.60.11-implicit-dec.patch 292 BLAKE2B 6d9f900f00e7ca1642fe80d7cdfcf929954d9ef4948ca7d3037fc26f80ab1505ab33ab74ee6a0ff40e460f5305b2f2f2eb093c209d8900825e82637a6b0ae8df SHA512 88b528fd5a492bf77d87fc629e542315948a08cbec0abc8b4cbddc113bcb2f36ed6ed52f1f98c1083ba99adf8febc143736352817d5e2f21ec484cc689e59e5b
+AUX bristol-0.60.11-rm_alsa-iatomic.h.patch 899 BLAKE2B 98fb23ca63f58099e06704d1cfb24c543b6e41cc8a37cab82097a526e66056006263ef8125b696e35572bc8b4646b96620c77415df6fcad38e13f61c6723a076 SHA512 3c7a9642f21fc21437468968ff54aeb958bec6251ef318ad6e27a689aebfde19c73a1c420d9a92bae0f6d63bbbb202106dad4a8199e14c066273ad2b6768008b
 DIST bristol-0.60.11.tar.gz 4218697 BLAKE2B f981b3d54e763092539ff631cbb48c06846a1fdde79db385a904d1af280ffd1520c88cbcfdc7f3d504cc65bde35c55f804545eed5ccac14b1ab17b1dce3e184e SHA512 2485e89cc46922b436e47c28e66a1f5ba032f6ad16bc0bb865ce70b25ffe9658e63dcab7203a982f7610839fd862a0f4dbe905908f22c4ed24e083d9770fc180
-EBUILD bristol-0.60.11-r2.ebuild 1174 BLAKE2B 93f1e15dc42aff36b40d2d10d6e9b143a4efff9ce5b40d92ee4a90339a396b01756152e2735b7f05d5c6976be98e6fc147d04a27056c0980332389e27fe468a2 SHA512 a85e2434d5c7b42f1d8fd34286c5eec3ce000b5687320726f602786bb2871953125ab03144f87a38dcbe644e7601da643cd15613ebd16845dd57f02edcbc9e09
+EBUILD bristol-0.60.11-r2.ebuild 1197 BLAKE2B 880c8ab7d9de0830d221c803eea631404591310353b2e0650e56bb4ed9f258f6a7e19cb677aedb7386fc22d64a76c3cbaf5e6137ea378373f8f798bdec1f0f7e SHA512 4b0f8945bbf36824411176e918fe3f5f5cd4f1682930af298145ea6f82631a52091c5c97f1e7528bf25235564b9b8e854f3c6aca639b65f3d1bb9386ffee69e0
 MISC metadata.xml 599 BLAKE2B fa41cf25b04bb687587a736332f3b66a63a52d13c0371b64aaf8c7d12515df8ac9b15c3e70687b6cd8157b493a65992f2e8a1a96db12cd372215b9791b46fc7d SHA512 ca1be472e9a1dce6e55d3313e9b11f0839fbb321c5b662ebf4a9aca0915d10b15cbe3aee3629b285886e84b53f8c7d0c65613e58be32d5d98f04360b368da1ba
diff --git a/media-sound/bristol/bristol-0.60.11-r2.ebuild b/media-sound/bristol/bristol-0.60.11-r2.ebuild
index e5481dc9adb8..b23ac9b3f46b 100644
--- a/media-sound/bristol/bristol-0.60.11-r2.ebuild
+++ b/media-sound/bristol/bristol-0.60.11-r2.ebuild
@@ -40,6 +40,8 @@ src_prepare() {
 }
 
 src_configure() {
+	tc-export PKG_CONFIG
+
 	append-cflags -fcommon
 	econf \
 		--disable-static \
diff --git a/media-sound/bristol/files/bristol-0.60.11-cflags.patch b/media-sound/bristol/files/bristol-0.60.11-cflags.patch
index ebce6f444fbe..86bedd6c7993 100644
--- a/media-sound/bristol/files/bristol-0.60.11-cflags.patch
+++ b/media-sound/bristol/files/bristol-0.60.11-cflags.patch
@@ -1,5 +1,5 @@
---- bristol-0.60.11/bin/Makefile.am
-+++ bristol-0.60.11/bin/Makefile.am
+--- a/bin/Makefile.am
++++ b/bin/Makefile.am
 @@ -1,7 +1,7 @@
  AUTOMAKE_OPTIONS = foreign
  
@@ -9,8 +9,8 @@
  
  #bin_PROGRAMS = bristoljackstats bristolnotegen bristolNRPgen
  bin_PROGRAMS = bristoljackstats
---- bristol-0.60.11/brighton/Makefile.am
-+++ bristol-0.60.11/brighton/Makefile.am
+--- a/brighton/Makefile.am
++++ b/brighton/Makefile.am
 @@ -1,6 +1,6 @@
  AUTOMAKE_OPTIONS = foreign
  
@@ -19,8 +19,8 @@
  
  bin_PROGRAMS = brighton
  brighton_LDFLAGS = -Bdynamic -L../libbrighton/ -L../libbristolmidi/.libs @BRIGHTON_LIBXLIBS@ -L/usr/X11R6/lib -L../libbvg
---- bristol-0.60.11/bristol/Makefile.am
-+++ bristol-0.60.11/bristol/Makefile.am
+--- a/bristol/Makefile.am
++++ b/bristol/Makefile.am
 @@ -1,6 +1,6 @@
  AUTOMAKE_OPTIONS = foreign
  
@@ -29,8 +29,8 @@
  
  bin_PROGRAMS = bristol
  #bristol_LDFLAGS = -Bdynamic -L../libbristolmidi/.libs -L../libbristolaudio/.libs -L../libbristol -L../libbristolic
---- bristol-0.60.11/libbrighton/Makefile.am
-+++ bristol-0.60.11/libbrighton/Makefile.am
+--- a/libbrighton/Makefile.am
++++ b/libbrighton/Makefile.am
 @@ -1,6 +1,6 @@
  AUTOMAKE_OPTIONS = foreign
  
@@ -39,8 +39,8 @@
  
  noinst_LIBRARIES = libbrighton.a
  #libbrighton_a_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ @BRIGHTON_LIBXLIBS@ @BRIGHTON_LIBXLIBS@
---- bristol-0.60.11/libbrightonC11/Makefile.am
-+++ bristol-0.60.11/libbrightonC11/Makefile.am
+--- a/libbrightonC11/Makefile.am
++++ b/libbrightonC11/Makefile.am
 @@ -1,6 +1,6 @@
  AUTOMAKE_OPTIONS = foreign
  
@@ -49,8 +49,8 @@
  
  #libC11_la_LDFLAGS= -export-dynamic -version-info @BRISTOL_SO_VERSION@
  #libC11_la_LIBADD=
---- bristol-0.60.11/libbrightonX11/Makefile.am
-+++ bristol-0.60.11/libbrightonX11/Makefile.am
+--- a/libbrightonX11/Makefile.am
++++ b/libbrightonX11/Makefile.am
 @@ -1,6 +1,6 @@
  AUTOMAKE_OPTIONS = foreign
  
@@ -59,8 +59,8 @@
  
  #libB11_a_LDFLAGS= -export-dynamic -version-info @BRISTOL_SO_VERSION@
  #libB11_a_LIBADD= -L/usr/X11R6/lib -lX11
---- bristol-0.60.11/libbristol/Makefile.am
-+++ bristol-0.60.11/libbristol/Makefile.am
+--- a/libbristol/Makefile.am
++++ b/libbristol/Makefile.am
 @@ -1,6 +1,6 @@
  AUTOMAKE_OPTIONS = foreign
  
@@ -69,8 +69,8 @@
  #libbristol_a_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ -march=core2 -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer -O3
  #libbristol_la_LIBADD=$(top_builddir)/libbristol/libbristol.la
  
---- bristol-0.60.11/libbristolaudio/Makefile.am
-+++ bristol-0.60.11/libbristolaudio/Makefile.am
+--- a/libbristolaudio/Makefile.am
++++ b/libbristolaudio/Makefile.am
 @@ -1,6 +1,6 @@
  AUTOMAKE_OPTIONS = foreign
  
@@ -79,8 +79,8 @@
  
  #libbristolaudio_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@
  #libbristolaudio_la_LIBADD=@ALSA_LIBS@ @JACK_LIBS@
---- bristol-0.60.11/libbristolic/Makefile.am
-+++ bristol-0.60.11/libbristolic/Makefile.am
+--- a/libbristolic/Makefile.am
++++ b/libbristolic/Makefile.am
 @@ -1,6 +1,6 @@
  AUTOMAKE_OPTIONS = foreign
  
@@ -89,8 +89,8 @@
  #libbristolic_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@
  
  noinst_LIBRARIES = libbristolic.a
---- bristol-0.60.11/libbristolmidi/Makefile.am
-+++ bristol-0.60.11/libbristolmidi/Makefile.am
+--- a/libbristolmidi/Makefile.am
++++ b/libbristolmidi/Makefile.am
 @@ -1,6 +1,6 @@
  AUTOMAKE_OPTIONS = foreign
  
@@ -99,8 +99,8 @@
  libbristolmidi_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@
  libbristolmidi_la_LIBADD=@ALSA_LIBS@ @JACK_LIBS@ -lm
  
---- bristol-0.60.11/libbvg/Makefile.am
-+++ bristol-0.60.11/libbvg/Makefile.am
+--- a/libbvg/Makefile.am
++++ b/libbvg/Makefile.am
 @@ -1,6 +1,6 @@
  AUTOMAKE_OPTIONS = foreign
  
diff --git a/media-sound/bristol/files/bristol-0.60.11-dontcompress.patch b/media-sound/bristol/files/bristol-0.60.11-dontcompress.patch
index 0b7cedc9e29d..dddcb4a45aea 100644
--- a/media-sound/bristol/files/bristol-0.60.11-dontcompress.patch
+++ b/media-sound/bristol/files/bristol-0.60.11-dontcompress.patch
@@ -1,5 +1,5 @@
---- a/Makefile.am	2012-01-12 18:23:23.000000000 +0100
-+++ b/Makefile.am	2018-10-04 01:22:03.656483227 +0200
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -9,9 +9,6 @@
  	$(INSTALL) -d $(DESTDIR)$(mandir)/man1
  	$(INSTALL) -m 0644 $(srcdir)/bristol.1 $(DESTDIR)$(mandir)/man1/
diff --git a/media-sound/bristol/files/bristol-0.60.11-implicit-dec.patch b/media-sound/bristol/files/bristol-0.60.11-implicit-dec.patch
index 4f3ba054cd9b..93b329f4b5a9 100644
--- a/media-sound/bristol/files/bristol-0.60.11-implicit-dec.patch
+++ b/media-sound/bristol/files/bristol-0.60.11-implicit-dec.patch
@@ -1,5 +1,5 @@
---- bristol-0.60.11/bristol/bristolmemorymoog.c
-+++ bristol-0.60.11/bristol/bristolmemorymoog.c
+--- a/bristol/bristolmemorymoog.c
++++ b/bristol/bristolmemorymoog.c
 @@ -33,6 +33,7 @@
  #include "bristolmemorymoog.h"
  
diff --git a/media-sound/bristol/files/bristol-0.60.11-rm_alsa-iatomic.h.patch b/media-sound/bristol/files/bristol-0.60.11-rm_alsa-iatomic.h.patch
index 9d11b4f7d99b..3ac88b13ab29 100644
--- a/media-sound/bristol/files/bristol-0.60.11-rm_alsa-iatomic.h.patch
+++ b/media-sound/bristol/files/bristol-0.60.11-rm_alsa-iatomic.h.patch
@@ -11,7 +11,6 @@ Reviewed-by: James Cowgill <jcowgill@debian.org>
 Bug-Debian: https://bugs.debian.org/834180
 Forwarded: no
 Index: bristol-0.60.11/libbristolaudio/audioEngineJack.c
-===================================================================
 --- a/libbristolaudio/audioEngineJack.c
 +++ b/libbristolaudio/audioEngineJack.c
 @@ -38,9 +38,6 @@