gentoo resync : 16.09.2020

9 files changed, 19 insertions, 186 deletions

diff --git a/media-plugins/cmt-plugins/Manifest b/media-plugins/cmt-plugins/Manifest
index 52b833a6874f..5f87a4408f9e 100644
--- a/media-plugins/cmt-plugins/Manifest
+++ b/media-plugins/cmt-plugins/Manifest
@@ -1,12 +1,7 @@
-AUX cmt-plugins-1.16-darwin.patch 316 BLAKE2B 898372b2a5a4a621758209adeb4d96185a5dd0dcd3cfec57bbc0cce4798f4a78b12eaf2e1bb9ec96b61457099bdea4a5cf2883a58ea17f38101829b45a7ccf17 SHA512 1a73be4184681fff4f6827fa47508d8177c1fccb492b66ad89638a5c4725fcc828545b225db6b38eb6971aefe7eef92edee4f6b3a7013365eb60010935db1497
-AUX cmt-plugins-1.16-mallocstdlib.patch 1992 BLAKE2B 0b1703227bb3d413fad609519a8c1555f2173684ec9b7f32e5d62d51877a8c98b52542c7e2321181b1b00d2d49fa41aab3f8a82b54827254bc9b3c14fa5cfaa8 SHA512 6b099ad314f4c2c3048a3b8e171d36bdf8dbca277989270666779881e02d1f9ba5b4027e5b1676c2092eca19221cd4f3d46789b4dcf7bdee0ab57e5e51d769e7
-AUX cmt-plugins-1.16-respect-ldflags.patch 369 BLAKE2B 4d64564551d56b9aad53e019c4b217f5d4e1fefdfce60995294783a74825a7bf356aab5ae48d5e4d83751e1fdd33e96fb2e814eb057a0a756ca28f9d7d13ee12 SHA512 3f4cfdab23de0b2fa2c841c4699a2f975b526575261f29756cdb3e9515dd7629e34bf847d027a305e32a9489e414dd59efd55e18a368f3ffc928ce86f80a5add
-AUX cmt-plugins-1.16-sa.patch 666 BLAKE2B de5b533d76cece9d5ffb93ae9956218bd090ee0f5b88afa8eca3ca9d435af401e472831f1e91c954719eb7c59057464057ed17bd7ffb9d93829d21aed39f20f1 SHA512 162791653741af546a64cabd74f8737f965c9e8799a1d80ae5d2b292b200b1710702b901aaf759457b7737530f2b03824cd135150329f60a2aa56011f17fd244
+AUX cmt-plugins-1.17-clang.patch 408 BLAKE2B 1f3a819e3921efc109dc4d3c48d9f3ae35e17c4bdc49cd7ba0b1236a4294360553a509d4f589ad5056ea774f199a68b7cf9e9bec748aa2f6d9971320f7399f5a SHA512 f5d6c1a30d190f0e644d1653080d0593aec8c5138ed6e15958312047a6a2e60b993d621feb00112ab474c0fae8414882887ef6deb43c1a70250398a4ec61a537
 AUX cmt-plugins-1.17-darwin.patch 361 BLAKE2B 64947385e7a1cb3cad87ff8036bd7b3c094cc432ad38fb279e971fbe914541e27329e7077d81f7ae89984aa833828edaad062793bbd2088228999df34f615652 SHA512 fb73ae2fe2c48e9235e5a9fc584dd4018792d94985706b41035c0dffbab99619bf9791f4a9da785f994b4488b3f05b99b64913242ed3357bf74a3a0b78bb5490
-AUX cmt-plugins-1.17-makefile.patch 845 BLAKE2B f2ae6fbc954ea1f40e4da1e320b89cd8e6b8478217a905dab9c0cebadb28a3ed2f22cac977b4a3233f78e0c9bd0b2f5057b3da203c2fd93d65b8c3c76b6058af SHA512 0cf21f829757000196555211ff65753e2f43716847905ef96ae9f0d44d71e7cfaca6049fe01ef20f557f3adbaa908cdcba087c84ae530351687a9c2efe122c20
+AUX cmt-plugins-1.17-makefile.patch 851 BLAKE2B bcc73d4da76d201c7907991cb2bb982867c424432d70e7cadf91a03f778025b85fcc7945af2bd14466ff779e77ebcf13af2cf3d006ccb2b3053ebfbd455188d8 SHA512 d2efb151f1bbbf58fe7f2699f6ebb81fd4adce216833b08bd56a5149f6f2965f65033953ec8ec18be6499b562d50e18ea81f9a0b7fcf0baddc9c15c4d1c4d0b5
 AUX cmt.rdf 3943 BLAKE2B e45e6b1e25a8be51d687e0eb931e62bba4a2c821bb35e7784077983df8b66b3b5f9a9497df19588acf68ab2f55a28a50c1cc392fcdc58651befda54f8e60edc3 SHA512 265bb9ed2cff657a2698dc1182bb3079a6d3f70a6db86aa20cfc992b5cf54a341a65f9af278630671c3657dc730de85a0b95caae785893412ad5659a195b820c
 DIST cmt_1.17.tgz 64070 BLAKE2B 903b540f0232e34dadb4683f5fe2478a0124dd1864c49868f8d5db4742cd89e55600c1b7aadea56b04b831b528b8930c472c2d05149b00e81cec503c69dc9c87 SHA512 7df31a44c41622785b569ef79bef91cba098fed89ca65dcb31b9fdd751caff863cf42eb7ca2ffab08e883fbcd040ab1c7290a96abf58e908be44ab803d672e26
-DIST cmt_src_1.16.tgz 63909 BLAKE2B b476b701f63125a11e2f03cb837552ddf26beba0c897873959c2577f3d897866bea0dccb480e4fcb0462a0ffea4d380b5a99998b082a46f7222049d2d2db4c9f SHA512 be4aaa064183b6121b4ca8d7d2535cb9a3bcb557e3a2f22b45ec9775b0e296f70a9a7edf697b78095d6ef1564bb5459bb742649082ac724d1774c0790379af21
-EBUILD cmt-plugins-1.16-r4.ebuild 1366 BLAKE2B 59909e4d1eb09213596a1e19816da22722da63d4e727a50129a4e0f12cbda914f68e2d41fb7a5799f2f0b72e2cd4ff42ddee4aaf1a98c6f1783f7eef40a3531f SHA512 9c9b370721a00fb0290b4a12dddc54e116e009cb9b19ad268242ba518a0ce63d0f08527246eb6d5b6ab1a5503782b47adb5ba42bb39e9dddb72f12835c5c56a5
-EBUILD cmt-plugins-1.17-r1.ebuild 1030 BLAKE2B b3d4d1256b83925a3eeda60200c3b083e7a0e492e6e0b02e224c8f54b8801c50bf98fb07f2e119f5e4677a55ae637a672c84daa2fe7e7e88eb091aebddc97351 SHA512 c082df57c6426f88ded1c4c4e12df2a86efd9362cee6f4c8a7f4e7a767fc75bb79b7643b5ab73428ff4ea100f68702130c6d51784b11f4080a5359f560846d21
+EBUILD cmt-plugins-1.17-r1.ebuild 1059 BLAKE2B bdde7e8e5ac2802ee1ffb7f56c1b3d57193ea584d7ea05fae116899c21c38276684cf7c641cca876a30e62879198865369a5949c983eef6e64826ec93a474d2d SHA512 7b4951daf42adc4e1cb0cf1cc692c0ad80e675cbe28d8fed1058f9954b48ae81ecca94348b79117de67a88cd79c2f2bab640c1cac5d39e4cf802a38b5504eb52
 MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-plugins/cmt-plugins/cmt-plugins-1.16-r4.ebuild b/media-plugins/cmt-plugins/cmt-plugins-1.16-r4.ebuild
deleted file mode 100644
index 73484d26bbeb..000000000000
--- a/media-plugins/cmt-plugins/cmt-plugins-1.16-r4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs multilib-minimal
-
-S="${WORKDIR}/cmt/src"
-MY_P="cmt_src_${PV}"
-
-DESCRIPTION="CMT (computer music toolkit) LADSPA library plugins"
-HOMEPAGE="http://www.ladspa.org/"
-SRC_URI="http://www.ladspa.org/download/${MY_P}.tgz"
-
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE=""
-
-DEPEND=">=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}]"
-RDEPEND=""
-
-src_prepare() {
-	sed -i \
-		-e "/^CFLAGS/ s/-O3/${CFLAGS}/" \
-		-e 's|/usr/local/include||g' \
-		-e 's|/usr/local/lib||g' makefile \
-			|| die "sed makefile failed"
-	sed -i -e "s/^CXXFLAGS*/CXXFLAGS = ${CXXFLAGS} \$(INCLUDES) -Wall -fPIC\n#/" \
-		"${S}/makefile" || die "sed makefile failed (CXXFLAGS)"
-
-	cd "${S}" || die
-	epatch "${FILESDIR}/${P}-mallocstdlib.patch"
-	epatch "${FILESDIR}/${P}-respect-ldflags.patch"
-	epatch "${FILESDIR}/${P}-sa.patch"
-	use elibc_Darwin && epatch "${FILESDIR}/${P}-darwin.patch"
-	multilib_copy_sources
-}
-
-multilib_src_compile() {
-	tc-export CXX
-	emake PLUGIN_LIB="cmt.so"
-}
-
-multilib_src_install() {
-	insopts -m755
-	insinto /usr/$(get_libdir)/ladspa
-	doins *.so
-}
-
-multilib_src_install_all() {
-	insinto /usr/share/ladspa/rdf/
-	doins "${FILESDIR}/cmt.rdf"
-
-	dodoc ../README
-	dohtml ../doc/*
-}
diff --git a/media-plugins/cmt-plugins/cmt-plugins-1.17-r1.ebuild b/media-plugins/cmt-plugins/cmt-plugins-1.17-r1.ebuild
index 9ef01406f196..e2ac70a80af2 100644
--- a/media-plugins/cmt-plugins/cmt-plugins-1.17-r1.ebuild
+++ b/media-plugins/cmt-plugins/cmt-plugins-1.17-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="CMT (computer music toolkit) LADSPA library plugins"
 HOMEPAGE="http://www.ladspa.org/"
 SRC_URI="http://www.ladspa.org/download/${MY_P}.tgz"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
 LICENSE="LGPL-2.1"
 SLOT="0"
 IUSE=""
@@ -22,6 +22,7 @@ RDEPEND=""
 
 PATCHES=(
 	"${FILESDIR}/${P}-makefile.patch"
+	"${FILESDIR}/${P}-clang.patch"
 )
 
 DOCS="../README"
diff --git a/media-plugins/cmt-plugins/files/cmt-plugins-1.16-darwin.patch b/media-plugins/cmt-plugins/files/cmt-plugins-1.16-darwin.patch
deleted file mode 100644
index f4352bfdcb91..000000000000
--- a/media-plugins/cmt-plugins/files/cmt-plugins-1.16-darwin.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u src-org/makefile src/makefile
---- src-org/makefile	Thu Oct 28 19:22:56 2004
-+++ src/makefile	Thu Oct 28 19:28:16 2004
-@@ -68,7 +68,7 @@
- targets:	$(PLUGIN_LIB)
- 
- $(PLUGIN_LIB):	$(PLUGIN_OBJECTS)
--	$(CXX)	-shared							\
-+	$(CXX)	-dynamiclib -ldl						\
- 		-o $(PLUGIN_LIB)					\
- 		$(PLUGIN_OBJECTS)					
- 
diff --git a/media-plugins/cmt-plugins/files/cmt-plugins-1.16-mallocstdlib.patch b/media-plugins/cmt-plugins/files/cmt-plugins-1.16-mallocstdlib.patch
deleted file mode 100644
index f4e7663282c6..000000000000
--- a/media-plugins/cmt-plugins/files/cmt-plugins-1.16-mallocstdlib.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Index: cmt/src/analogue.cpp
-===================================================================
---- cmt.orig/src/analogue.cpp
-+++ cmt/src/analogue.cpp
-@@ -24,7 +24,6 @@
- 
- /*****************************************************************************/
- 
--#include <malloc.h>
- #include <math.h>
- #include <stdlib.h>
- #include "cmt.h"
-Index: cmt/src/canyondelay.cpp
-===================================================================
---- cmt.orig/src/canyondelay.cpp
-+++ cmt/src/canyondelay.cpp
-@@ -25,7 +25,7 @@
- /*****************************************************************************/
- 
- 
--#include <malloc.h>
-+#include <stdlib.h>
- #include <math.h>
- #include "cmt.h"
- 
-Index: cmt/src/lofi.cpp
-===================================================================
---- cmt.orig/src/lofi.cpp
-+++ cmt/src/lofi.cpp
-@@ -24,7 +24,6 @@
- 
- /*****************************************************************************/
- 
--#include <malloc.h>
- #include <math.h>
- #include <stdlib.h>
- #include "cmt.h"
-Index: cmt/src/phasemod.cpp
-===================================================================
---- cmt.orig/src/phasemod.cpp
-+++ cmt/src/phasemod.cpp
-@@ -24,7 +24,6 @@
- 
- /*****************************************************************************/
- 
--#include <malloc.h>
- #include <math.h>
- #include <stdlib.h>
- #include "cmt.h"
-Index: cmt/src/syndrum.cpp
-===================================================================
---- cmt.orig/src/syndrum.cpp
-+++ cmt/src/syndrum.cpp
-@@ -24,7 +24,7 @@
- 
- /*****************************************************************************/
- 
--#include <malloc.h>
-+#include <stdlib.h>
- #include <math.h>
- #include "cmt.h"
- 
-Index: cmt/src/vcf303.cpp
-===================================================================
---- cmt.orig/src/vcf303.cpp
-+++ cmt/src/vcf303.cpp
-@@ -26,7 +26,7 @@
- /*****************************************************************************/
- 
- 
--#include <malloc.h>
-+#include <stdlib.h>
- #include <math.h>
- #include "cmt.h"
- 
diff --git a/media-plugins/cmt-plugins/files/cmt-plugins-1.16-respect-ldflags.patch b/media-plugins/cmt-plugins/files/cmt-plugins-1.16-respect-ldflags.patch
deleted file mode 100644
index e851c2a781ed..000000000000
--- a/media-plugins/cmt-plugins/files/cmt-plugins-1.16-respect-ldflags.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=334711
-
---- cmt/src/makefile.old	2010-09-13 16:43:26.000000000 +0100
-+++ cmt/src/makefile	2010-09-13 16:45:08.000000000 +0100
-@@ -66,7 +66,8 @@
- targets:	$(PLUGIN_LIB)
- 
- $(PLUGIN_LIB):	$(PLUGIN_OBJECTS)
--	$(CXX)	-shared							\
-+	$(CXX)	$(LDFLAGS)						\
-+		-shared							\
- 		-o $(PLUGIN_LIB)					\
- 		$(PLUGIN_OBJECTS)					
- 
diff --git a/media-plugins/cmt-plugins/files/cmt-plugins-1.16-sa.patch b/media-plugins/cmt-plugins/files/cmt-plugins-1.16-sa.patch
deleted file mode 100644
index 161c06d27eed..000000000000
--- a/media-plugins/cmt-plugins/files/cmt-plugins-1.16-sa.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fix strict aliasing warnings: reeverb/Components/allpass.h:36:2: warning:
-dereferencing type-punned pointer will break strict-aliasing rules
-
-https://bugs.gentoo.org/show_bug.cgi?id=307563
-
-Index: cmt/src/freeverb/Components/denormals.h
-===================================================================
---- cmt.orig/src/freeverb/Components/denormals.h
-+++ cmt/src/freeverb/Components/denormals.h
-@@ -8,7 +8,7 @@
- #ifndef _denormals_

- #define _denormals_

- 

--#define undenormalise(sample) if(((*(unsigned int*)&sample)&0x7f800000)==0) sample=0.0f

-+#define undenormalise(sample) if((((unsigned int)sample)&0x7f800000)==0) sample=0.0f

- 

- #endif//_denormals_

- 

diff --git a/media-plugins/cmt-plugins/files/cmt-plugins-1.17-clang.patch b/media-plugins/cmt-plugins/files/cmt-plugins-1.17-clang.patch
new file mode 100644
index 000000000000..621816beaf5f
--- /dev/null
+++ b/media-plugins/cmt-plugins/files/cmt-plugins-1.17-clang.patch
@@ -0,0 +1,13 @@
+diff --git a/src/disintegrator.cpp b/src/disintegrator.cpp
+index 867fe37..7563a5d 100644
+--- a/src/disintegrator.cpp
++++ b/src/disintegrator.cpp
+@@ -67,7 +67,7 @@ namespace disintegrator {
+     };
+ 
+     template<OutputFunction write_output>
+-    static void run(LADSPA_Handle instance,
++    void run(LADSPA_Handle instance,
+ 	            unsigned long sample_count) {
+ 	
+ 	Plugin *pp = (Plugin *) instance;
diff --git a/media-plugins/cmt-plugins/files/cmt-plugins-1.17-makefile.patch b/media-plugins/cmt-plugins/files/cmt-plugins-1.17-makefile.patch
index ca76e859b5f7..93f3ab5df99c 100644
--- a/media-plugins/cmt-plugins/files/cmt-plugins-1.17-makefile.patch
+++ b/media-plugins/cmt-plugins/files/cmt-plugins-1.17-makefile.patch
@@ -16,7 +16,7 @@ index 159dd46..5c2c0f4 100644
  plugin:	$(PLUGIN_LIB)
  
 +%.o: %.cpp
-+	$(CXX) $(INCLUDES) $(CFLAGS) -c -o $*.o $*.cpp
++	$(CXX) $(INCLUDES) $(CFLAGS) -fPIC -c -o $*.o $*.cpp
 +
 +
  targets:	$(PLUGIN_LIB)