gentoo resync : 28.11.2020

6 files changed, 78 insertions, 9 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 481cda3f6bf6..b16b5bf68bb6 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/arss/Manifest b/media-gfx/arss/Manifest
index ca025f8928f7..886adec7b2a4 100644
--- a/media-gfx/arss/Manifest
+++ b/media-gfx/arss/Manifest
@@ -1,3 +1,4 @@
+AUX arss-0.2.3-fno-common.patch 1907 BLAKE2B b60538c8bade71c2811751de71e35c27d2f4935c7746ba9f8d01b4f5e8e505a3e98675d8773a7d1363927cc38cc30c5999b72a36d9f0d02f65173841c7a45131 SHA512 5082f91e7e2633693aed9a4dbf1a747db33ebe4bce76e5d2d73d8d6c3db98d260321bd40a98fe684c13afafc7a59dbafa85c70b8939c232cfd4c604b8f0c9076
 DIST arss-0.2.3-src.tar.gz 17597 BLAKE2B b4478a341307fb963a054897a42ab724c5f0f1fa288fc0ff8368a74a4e388d0c3446debe0a81bdb43670003b53a376d23dab4adae3dcfce4cf3effe5fb30a739 SHA512 7ef7115b310c9f4ecb7bdc8f34fb1afadabadb56d50ddef27a7688fd28af511ebaa1468f2c11a91077b8197027f9e31333c22d6b5f39d2a35d7b7dfc5b90658d
-EBUILD arss-0.2.3-r1.ebuild 489 BLAKE2B c4b882d1f316a9db22d762641b5e0d721a3a96a0f2c8c1d7bbc91aa6bc8d02e445fdeeb44423accdb7d5d407d01256863e938b6c5db08ed4dcaf66aa83f36c15 SHA512 cafea04fc6e0b34ef49f81c69b776af6c1e9535cbc3ce4650c0b8e285b791003ea0b10e6be894a12d8ca50c7e68bf41d6d7f615cc82086b127aef3e85b0e915c
+EBUILD arss-0.2.3-r1.ebuild 525 BLAKE2B 0e131cdd32e6cca25c4f9fe0d80962af3fbcadf89b8417d055af75957464dc72ad25009c1b9b5f76f3bf20d6f02a6d9639c0a78b745ce8c2ada5be3727604a6a SHA512 432e884e9bd0b8a9e148f0f82f06a40c1b869a77c7bcbc926401d91c2e4cd3305dc307373cdd4026d3ab448ae1476189b0dbaf7fafb324506f0c2be5274b93b1
 MISC metadata.xml 241 BLAKE2B 3ffb7cd5ca939bb002b4aecac183f4af6c3794a327c6ede9a5113cc4eaa322daea8953e93ee77706f6e5900915d9e186062834dd09c43e0cf33b86724d5d1caf SHA512 0993824e2e047f0cb6f62a6fbe1a9519c303a1bca222e3e8cd72640ea99d1b17dc3a7fb795fafc7d0ebd075b39b118e8249ade02e3683186f4fa2f6c01c40730
diff --git a/media-gfx/arss/arss-0.2.3-r1.ebuild b/media-gfx/arss/arss-0.2.3-r1.ebuild
index 955a208de675..63a92efd72cf 100644
--- a/media-gfx/arss/arss-0.2.3-r1.ebuild
+++ b/media-gfx/arss/arss-0.2.3-r1.ebuild
@@ -1,11 +1,11 @@
-# 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
 CMAKE_IN_SOURCE_BUILD="true"
-MY_P=${P}-src
+MY_P="${P}-src"
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Analysis & Resynthesis Sound Spectrograph"
 HOMEPAGE="http://arss.sourceforge.net"
@@ -14,11 +14,12 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
 DEPEND="sci-libs/fftw:3.0="
 RDEPEND="${DEPEND}"
 
-S=${WORKDIR}/${MY_P}/src
+S="${WORKDIR}/${MY_P}/src"
+
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
 DOCS=( ../AUTHORS ../ChangeLog )
diff --git a/media-gfx/arss/files/arss-0.2.3-fno-common.patch b/media-gfx/arss/files/arss-0.2.3-fno-common.patch
new file mode 100644
index 000000000000..a575c248c349
--- /dev/null
+++ b/media-gfx/arss/files/arss-0.2.3-fno-common.patch
@@ -0,0 +1,67 @@
+--- a/arss.c
++++ b/arss.c
+@@ -31,6 +31,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.*
+ 
+ char *version = "0.2.3";
+ char *date = "May 29th, 2008";
++extern int32_t quiet;
+ 
+ #define MSG_NUMBER_EXPECTED "A number is expected after %s\nExiting with error.\n"
+ 
+--- a/dsp.c
++++ b/dsp.c
+@@ -1,5 +1,12 @@
+ #include "dsp.h"
+ 
++double pi;
++double LOGBASE;
++double LOOP_SIZE_SEC;
++int32_t BMSQ_LUT_SIZE;
++int32_t clocka;
++
++
+ void fft(double *in, double *out, int32_t N, uint8_t method)
+ {
+ 	/* method :
+--- a/dsp.h
++++ b/dsp.h
+@@ -17,13 +17,13 @@
+ #define LOOP_SIZE_SEC_D	10.0
+ #define BMSQ_LUT_SIZE_D	16000
+ 
+-double pi;
+-double LOGBASE;			// Base for log() operations. Anything other than 2 isn't really supported
++extern double pi;
++extern double LOGBASE;			// Base for log() operations. Anything other than 2 isn't really supported
+ #define TRANSITION_BW_SYNT 16.0		// defines the transition bandwidth for the low-pass filter on the envelopes during synthesisation
+-double LOOP_SIZE_SEC;		// size of the noise loops in seconds
+-int32_t BMSQ_LUT_SIZE;		// defines the number of elements in the Blackman Square look-up table. It's best to make it small enough to be entirely cached
++extern double LOOP_SIZE_SEC;		// size of the noise loops in seconds
++extern int32_t BMSQ_LUT_SIZE;		// defines the number of elements in the Blackman Square look-up table. It's best to make it small enough to be entirely cached
+ 
+-int32_t clocka;
++extern int32_t clocka;
+ 
+ extern void fft(double *in, double *out, int32_t N, uint8_t method);
+ extern void normi(double **s, int32_t xs, int32_t ys, double ratio);
+--- a/util.c
++++ b/util.c
+@@ -1,5 +1,7 @@
+ #include "util.h"
+ 
++int32_t quiet;
++
+ void win_return()
+ {
+ 	#ifdef WIN32
+--- a/util.h
++++ b/util.h
+@@ -11,7 +11,7 @@
+ 
+ #include "dsp.h"
+ 
+-int32_t quiet;
++extern int32_t quiet;
+ 
+ extern void win_return();
+ extern int32_t gettime();
diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest
index 26d127e139b1..0dc0b392511b 100644
--- a/media-gfx/gmic/Manifest
+++ b/media-gfx/gmic/Manifest
@@ -1,6 +1,6 @@
 AUX gmic-2.9.2_ipa-sra.patch 665 BLAKE2B b61fa87ac2da5fd5956c89cb4a6c128f266a175dca70cd34ff4bed0483c934241a375131eaddd6ebd5f3afb52e694d4fc6839d20718bc06463c0e263f15b6d5a SHA512 6f04cac4de5914cedd269655fe58ca406199c042bdbab6e706cfea49516d0a7e1234e61c51b6a142341a7984dd96e97c4b8f13c2efbe427627be26539af8653e
 DIST gmic_2.9.2.tar.gz 6639693 BLAKE2B 4b452cc5c82e8ea30a1bd65e51b6187fc12d9c7f8af6d0f8107a8d183c6e87dff11394f103eae7ac17daa00c6c9aa0f47ce78a92156e2da9bc4ee0fcacbf398d SHA512 be8707b5c156b17189548c1f808b976afcb7b7cce20ff54ff4589eda9a76a8cddf81c64b7a53c332254b2c8c29fb8ca0926016cadcb1efb7131a38d857fce796
-DIST gmic_2.9.3.tar.gz 7279292 BLAKE2B 920a94321b2916f65bb2c5b273c4938acdcd7b4825a3eeeb15407b1a6d7881f927792f89524db7d3a33272ddae8e39e8f60d29a922b5dd2873e6b9be2948a646 SHA512 e640c73b9d008b445d075b02ed7d359a0c2ee51df8245557192e38ed108e6db43de0fca577f1636c40b2c4a7db038f79926e7666b9f00b6421cda96d9a91b3ff
+DIST gmic_2.9.4.tar.gz 7279628 BLAKE2B ca5fc69a2990a86a340c4305dc406d4e9032ba04afa59819dc2c788b4c181d23bd03d3050380802fe1effa2b6389df60734f8b3523fac7b0ff6bc35b64a368a6 SHA512 76bb4798e91a68e76a985d7fbc488f8677facaa1efc4ab3a0b9c7d966aa3f5763d1ae1de80f572636d58f1831d9bdae1651ea0b6a76d49a18bf5ad6e12756d73
 EBUILD gmic-2.9.2-r1.ebuild 4848 BLAKE2B 19cec459abf67e10c99319c9fc1174eba19390e94bfe07595d75c3bcf144cad2235281b1a07eabb56c245aba87ceda414c602f64b51734669010961f652db473 SHA512 1857c8b9c01dbd03f3e2dee257fece0ebb6574ce1eb91db76be86e1b3879b0aed7067ba25857e247e49ec1adfb4cc483f52b41ede31f9156b8650e4f295593c8
-EBUILD gmic-2.9.3.ebuild 4848 BLAKE2B 19cec459abf67e10c99319c9fc1174eba19390e94bfe07595d75c3bcf144cad2235281b1a07eabb56c245aba87ceda414c602f64b51734669010961f652db473 SHA512 1857c8b9c01dbd03f3e2dee257fece0ebb6574ce1eb91db76be86e1b3879b0aed7067ba25857e247e49ec1adfb4cc483f52b41ede31f9156b8650e4f295593c8
+EBUILD gmic-2.9.4.ebuild 4848 BLAKE2B 19cec459abf67e10c99319c9fc1174eba19390e94bfe07595d75c3bcf144cad2235281b1a07eabb56c245aba87ceda414c602f64b51734669010961f652db473 SHA512 1857c8b9c01dbd03f3e2dee257fece0ebb6574ce1eb91db76be86e1b3879b0aed7067ba25857e247e49ec1adfb4cc483f52b41ede31f9156b8650e4f295593c8
 MISC metadata.xml 605 BLAKE2B f1ed3b46614a3e3273e4bdedfd7b45629eca482a0805ff1bda2161e4d785a478b91f8ccdbab399b184ec93d020211e35e4503fbf4205b1e2e1f04c7e547303bd SHA512 8303e0a301edb88bdb7522baf47e29b39e895ccaa729231d64b6a39af73f0eb1626c39439f1ed70d496d982f3abca4ff9586d20fc5a9d08b0e57a19b60bf088d
diff --git a/media-gfx/gmic/gmic-2.9.3.ebuild b/media-gfx/gmic/gmic-2.9.4.ebuild
index 4af6d1c63fa1..4af6d1c63fa1 100644
--- a/media-gfx/gmic/gmic-2.9.3.ebuild
+++ b/media-gfx/gmic/gmic-2.9.4.ebuild