gentoo new year resync : 01.01.2021

3 files changed, 81 insertions, 11 deletions

diff --git a/media-sound/tap-reverbed/Manifest b/media-sound/tap-reverbed/Manifest
index 0c9b90a4b15b..6a7a9533570a 100644
--- a/media-sound/tap-reverbed/Manifest
+++ b/media-sound/tap-reverbed/Manifest
@@ -1,4 +1,5 @@
+AUX tap-reverbed-0-fno-common.patch 1379 BLAKE2B 107a0172c782e775b081abb2a6bab43a5c9a22518dfd4a7a372ec53b43f4ed1230ef7671c95a45a972400bbeb0443a6ef0d0f17162e50836c52e2506d68ea084 SHA512 5f932d010a25633f37833c0808ab585a256b14ea611accfd5005212b05b0ff07a479052e88e486326f2101f8404254e9753638be96bb0e6dea8cdb46ea4d6f37
 AUX tap-reverbed-flags.patch 1549 BLAKE2B 710b8a2276cd7ca79623e65f9aecaf80c9856a4cf26730c8891deb6894d4c3a357aed0b7359d3672f80d66e5934c0b75693d4ab45550b995e9e431084e3d6577 SHA512 8bd6781d1dbe61231916f0294557b724532baefcbd04317e7483617482f640bc0b4a05e2b3d2b4062c4fb964347602dcb426df9dae96368f384b84e1970780e8
 DIST tap-reverbed-r0.tar.gz 90703 BLAKE2B 7230220b93a5015be790873dec288149cd7d30253a2f4847bbe5c555328a3fff65195bbf6485be71afb91638fb267a3d6cdf351b6edbff4589044f0fba061df5 SHA512 72b3f1257cf5a7076a35afa92604b8df96051e6727f49b9b01192873e6cb3b21e3daaa9e70796966faa13d2e94b9fdf34cdb41b3e91805dbc9787897a7882cda
-EBUILD tap-reverbed-0-r1.ebuild 956 BLAKE2B 0bdf95350a3dd2d09105b6ffe14ea029a80c8e358507465969c47b600bcd543c41bc2f535c50a726472bad29cd79afc96ce901f003c41252eb663aef17882616 SHA512 9ab24ff89673a090eeb72ef3ef3da925fc10043acef46629637103aad80befd2182326b00df28681cfcd1daa80e524116700f205d2575d50165888ee1fd25301
+EBUILD tap-reverbed-0-r1.ebuild 997 BLAKE2B 4a1b3d9d709a24a730296a218c898119676ec38e1691bc6f21a49ece3ddb3ea7749e74b51848bd24707946644a812e23d403882cf605c1f39607bc5862b45726 SHA512 75f77d12af5e4976e58a54adfdcf7dc662a701ec62de13d41d9bf1cc400fadf038bcf1d9d2796568676e50be1ca6bf25cf08b9612d669f77230cc90c281f5d2c
 MISC metadata.xml 340 BLAKE2B 46e1eef9a17d36dcfdee59018c25fd271b5bb6f34f76c54803eb009345d1daaa67e2ea8127c43c7a071040e6bd41ca324d6bbcf006fb42b37ff62771a43b9fe5 SHA512 b9c58d0b65d68884a4945054cde9176b0ee6db20ff5d22cac318373c13b9b6b23d5c2cef3cd057ae1b244ec59c00ab1dd3e15f38adb0c577dc48d8aeaa7f722a
diff --git a/media-sound/tap-reverbed/files/tap-reverbed-0-fno-common.patch b/media-sound/tap-reverbed/files/tap-reverbed-0-fno-common.patch
new file mode 100644
index 000000000000..c01461f62f09
--- /dev/null
+++ b/media-sound/tap-reverbed/files/tap-reverbed-0-fno-common.patch
@@ -0,0 +1,65 @@
+--- a/src/ports.c
++++ b/src/ports.c
+@@ -37,6 +37,16 @@
+ #define LIST_WIDTH 200
+ #define LIST_HEIGHT 100
+ 
++extern unsigned long sample_rate;
++extern jack_client_t * client;
++extern const char ** ports_in;
++extern const char ** ports_out;
++
++extern jack_port_t * in_L_port;
++extern jack_port_t * in_R_port;
++extern jack_port_t * out_L_port;
++extern jack_port_t * out_R_port;
++
+ 
+ extern GtkWidget * ports_button;
+ 
+--- a/src/sound.c
++++ b/src/sound.c
+@@ -44,6 +44,16 @@
+  */
+ /* #define REVERBED_CALC_FLOAT */
+ 
++unsigned long sample_rate;
++jack_client_t * client;
++const char ** ports_in;
++const char ** ports_out;
++
++jack_port_t * in_L_port;
++jack_port_t * in_R_port;
++jack_port_t * out_L_port;
++jack_port_t * out_R_port;
++
+ 
+ extern int client_running;
+ extern REVTYPE * curr;
+--- a/src/sound.h
++++ b/src/sound.h
+@@ -24,15 +24,15 @@
+ 
+ 
+ 
+-unsigned long sample_rate;
+-jack_client_t * client;
+-const char ** ports_in;
+-const char ** ports_out;
+-
+-jack_port_t * in_L_port;
+-jack_port_t * in_R_port;
+-jack_port_t * out_L_port;
+-jack_port_t * out_R_port;
++extern unsigned long sample_rate;
++extern jack_client_t * client;
++extern const char ** ports_in;
++extern const char ** ports_out;
++
++extern jack_port_t * in_L_port;
++extern jack_port_t * in_R_port;
++extern jack_port_t * out_L_port;
++extern jack_port_t * out_R_port;
+ 
+ void comp_coeffs(void);
+ void load_revtype_data(void);
diff --git a/media-sound/tap-reverbed/tap-reverbed-0-r1.ebuild b/media-sound/tap-reverbed/tap-reverbed-0-r1.ebuild
index cb0e9050ffb5..94d080247bed 100644
--- a/media-sound/tap-reverbed/tap-reverbed-0-r1.ebuild
+++ b/media-sound/tap-reverbed/tap-reverbed-0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -13,17 +13,21 @@ SRC_URI="mirror://sourceforge/tap-plugins/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
-RDEPEND="media-libs/ladspa-sdk
+RDEPEND="
+	media-libs/ladspa-sdk
 	media-plugins/tap-plugins
-	x11-libs/gtk+:2
-	media-sound/jack-audio-connection-kit"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	media-sound/jack-audio-connection-kit
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-S=${WORKDIR}/${MY_P}
-PATCHES=( "${FILESDIR}/${PN}-flags.patch" )
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-flags.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
 
 src_prepare() {
 	default