gentoo resync : 15.01.2020

4 files changed, 58 insertions, 48 deletions

diff --git a/media-plugins/mcp-plugins/Manifest b/media-plugins/mcp-plugins/Manifest
index 145f08be73df..87aa97b53393 100644
--- a/media-plugins/mcp-plugins/Manifest
+++ b/media-plugins/mcp-plugins/Manifest
@@ -1,4 +1,4 @@
+AUX mcp-plugins-0.4.0-makefile.patch 1406 BLAKE2B 605a1324a2882642236313ef256993881cb6dee0c4bdb1ad9054018ab93a23cc5a6394d341a5b19284ca3018d0dce1739aaf931fa424e4638ecbe94855b9bdc6 SHA512 11214d6861ec74ede6846d0af52f1ab4a999de5ef237597f870b9f3c4d790a13045cf74a44c34e2793b8bea85d6fac4a3847b605e8065d83f54e32e1f863fc93
 DIST MCP-plugins-0.4.0.tar.bz2 23637 BLAKE2B 5f68fe60e5368b0753657bfae4fe1605f1600bb15136e3e7ed6c0e612acc9463d22bc387e537eaede3aac4f0808ecb73b7afea288a2a25bd7854e748f49b06cb SHA512 8a5e431ea539a46ce3d3f554fae21fc09028d898e24c316ab1b0d3d6540650107a1d10ce9a4cb6d1f0d2fd8868e2b43cf439f47ed6d90fb066375bbf3883d344
-EBUILD mcp-plugins-0.4.0-r1.ebuild 746 BLAKE2B 95cb0ae8cce92de8b83bce50c8d1868fdc818b5112f37ce5cfeb54127e4b921261a386d05314aff21e12852d188c09c860a1c83c0d2184aeb9f1d8e44975cdd2 SHA512 4bbaaadf7411668c983f13060a6df5bb101748bd6cd57d8ecf4985f5476408e4b516ed92a3c19520afd63af1eb1d0da74ecfac251f1c60518ba930eb56033111
-EBUILD mcp-plugins-0.4.0.ebuild 730 BLAKE2B 981a804523e205c017217633c83c0483389f2e6a276b4076df7028c8a9ccef3cb59039fbd24d7b9d9e5ad3fbdfff648ee37249ee0f15226546680e6f9406e0db SHA512 315b548d7fefbed0b8de522db7a01e0a59414f7973fead296ea624b71614e9f7df99d9f7a24975c43811479cb3c2ebcca28c4368def18786106b0dc7459b972a
+EBUILD mcp-plugins-0.4.0-r1.ebuild 668 BLAKE2B 5e97475e41795dd81b5c3dc16afc1494393835da8fffc259694e9dcc6bf63532d50dab9238349539b9aa1edab90a8e1ea5747fcee27bde366796aa67fb53c187 SHA512 fc6269b897b002219e4f1157922c5d15d55439b32ce602894944f9793ac555fb89ee6d3b28746d94dcab00500eee2ac0f9cf95cceb921f11a39f0873bb5f974a
 MISC metadata.xml 259 BLAKE2B 91d2cc7f9ffec656984dd18988a2590a831985a51c93d540af04f796a82b49fedb3adbd5eae9c4c502aa8b4132252c0816589d47d7e8030d9e943dd852f3503d SHA512 1884a7f7d50806bd4addad63ca916f7e27388c953e6345e15fe20d500c217f5f0fcc05fcfa6e20220c28a870801f5e8aab538f5c7f8f211d27de27c98abdb600
diff --git a/media-plugins/mcp-plugins/files/mcp-plugins-0.4.0-makefile.patch b/media-plugins/mcp-plugins/files/mcp-plugins-0.4.0-makefile.patch
new file mode 100644
index 000000000000..7d733014aa9b
--- /dev/null
+++ b/media-plugins/mcp-plugins/files/mcp-plugins-0.4.0-makefile.patch
@@ -0,0 +1,44 @@
+--- a/Makefile
++++ b/Makefile
+@@ -15,35 +15,36 @@
+ #  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+ 
+-CPPFLAGS += -I. -fPIC -D_REENTRANT -Wall -O3
++CXXFLAGS += -fPIC -Wall
++CPPFLAGS += -I. -D_REENTRANT
+ 
+ 
+ all:	mvclpf24.so mvchpf24.so cs_phaser.so cs_chorus.so
+ 
+ 
+ mvclpf24.so:	mvclpf24.o mvclpf24_if.o exp2ap.o
+-	g++ -shared  mvclpf24.o mvclpf24_if.o exp2ap.o -o mvclpf24.so
++	$(CXX) $(LDFLAGS) -shared mvclpf24.o mvclpf24_if.o exp2ap.o -o mvclpf24.so
+ 
+ mvclpf24.o:	ladspaplugin.h mvclpf24.h
+ mvclpf24_if.o:	ladspaplugin.h mvclpf24.h
+ 
+ 
+ mvchpf24.so:	mvchpf24.o mvchpf24_if.o exp2ap.o
+-	g++ -shared  mvchpf24.o mvchpf24_if.o exp2ap.o -o mvchpf24.so
++	$(CXX) $(LDFLAGS) -shared mvchpf24.o mvchpf24_if.o exp2ap.o -o mvchpf24.so
+ 
+ mvchpf24.o:	ladspaplugin.h mvchpf24.h
+ mvchpf24_if.o:	ladspaplugin.h mvchpf24.h
+ 
+ 
+ cs_phaser.so:	cs_phaser.o cs_phaser_if.o exp2ap.o
+-	g++ -shared cs_phaser.o cs_phaser_if.o exp2ap.o -o cs_phaser.so
++	$(CXX) $(LDFLAGS) -shared cs_phaser.o cs_phaser_if.o exp2ap.o -o cs_phaser.so
+ 
+ cs_phaser.o:	ladspaplugin.h cs_phaser.h
+ cs_phaser_if.o:	ladspaplugin.h cs_phaser.h
+ 
+ 
+ cs_chorus.so:	cs_chorus.o cs_chorus_if.o exp2ap.o
+-	g++ -shared  cs_chorus.o cs_chorus_if.o exp2ap.o -o cs_chorus.so
++	$(CXX) $(LDFLAGS) -shared cs_chorus.o cs_chorus_if.o exp2ap.o -o cs_chorus.so
+ 
+ cs_chorus.o:	ladspaplugin.h cs_chorus.h
+ cs_chorus_if.o:	ladspaplugin.h cs_chorus.h
diff --git a/media-plugins/mcp-plugins/mcp-plugins-0.4.0-r1.ebuild b/media-plugins/mcp-plugins/mcp-plugins-0.4.0-r1.ebuild
index 252f4d2ca534..6953b27216b7 100644
--- a/media-plugins/mcp-plugins/mcp-plugins-0.4.0-r1.ebuild
+++ b/media-plugins/mcp-plugins/mcp-plugins-0.4.0-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit multilib toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 MY_P=${P/mcp/MCP}
 
@@ -12,23 +13,22 @@ SRC_URI="http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
+KEYWORDS="amd64 ~ppc x86"
 
 DEPEND="media-libs/ladspa-sdk"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
-src_prepare() {
+PATCHES=( "${FILESDIR}"/${PN}-0.4.0-makefile.patch )
+
+src_configure() {
 	tc-export CXX
-	sed -i -e "s/-O3//" \
-		-e "s/g++/$(tc-getCXX) ${LDFLAGS}/" Makefile || die "sed failed"
 }
 
 src_install() {
-	dodoc AUTHORS README
-	insinto /usr/$(get_libdir)/ladspa
-	insopts -m0755
-	doins *.so
+	einstalldocs
+
+	exeinto /usr/$(get_libdir)/ladspa
+	doexe *.so
 }
diff --git a/media-plugins/mcp-plugins/mcp-plugins-0.4.0.ebuild b/media-plugins/mcp-plugins/mcp-plugins-0.4.0.ebuild
deleted file mode 100644
index 9170b0e43095..000000000000
--- a/media-plugins/mcp-plugins/mcp-plugins-0.4.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit multilib toolchain-funcs
-
-MY_P=${P/mcp/MCP}
-
-DESCRIPTION="MCP ladspa plugins package. Includes moogvcf, phaser & chorus"
-HOMEPAGE="http://www.kokkinizita.net/linuxaudio/"
-SRC_URI="http://www.kokkinizita.net/linuxaudio/downloads/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="media-libs/ladspa-sdk"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	tc-export CXX
-	sed -i -e "s/-O3//" \
-		-e "s/g++/$(tc-getCXX) ${LDFLAGS}/" Makefile || die "sed failed"
-}
-
-src_install() {
-	dodoc AUTHORS README
-	insinto /usr/$(get_libdir)/ladspa
-	insopts -m0755
-	doins *.so
-}