gentoo Easter resync : 12.04.2020

3 files changed, 41 insertions, 13 deletions

diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index 1fcb168b897b..c8853f20f252 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,4 +1,4 @@
 AUX yoshimi-1.5.10.2-cxxflags.patch 2592 BLAKE2B 383784742913ad2a2d711a1999269438eea525da3ed54fdd24fbad46932e05e781b18b2cbad1bd1e5bbe3ef160762f865517bbcda9ea6f5c4df4eb413af8b278 SHA512 78c3e2a84f44e9220b2f3fcc1cbac1b243a4fd19036d32f0ded794c90f83e5797ff3cddcb57ae3612656be27954b1db69b92d4b2107d8c18ffbdbd984abb87bd
-DIST yoshimi-1.5.10.2.tar.gz 9668476 BLAKE2B 1b443a51e952123abaf54b992902113533461064f2fc99032ac89f28a25ba4687176a97013ea118283e8ca2b7d92f44c105380e3d6cecb66560db7a0a8ef6532 SHA512 a39ba123f304e43d70833648ce224733794cb43c160fd2e6cf29bb4a782bea355c4bbfa1c33bf20c98a8c1f5d049788154aaf906a3daa56f288719a0b019139c
-EBUILD yoshimi-1.5.10.2.ebuild 1013 BLAKE2B 022fb8bc3c1fb2fe426bc977d6e3921e90f76e68f9312afd99f4a14193d74a00a5cd7927bac72f6a0b5fda37a788fe542c77e32b6482b0ad2c42ec8c63878793 SHA512 ddec3c3cc3ad93fcb577d93131839701be9b9c51f865800ec4425c6838e4da71f5199dfac255dd051f18a57c2f25f2ff67612ac25e119d73afaa1257f99bd059
-MISC metadata.xml 400 BLAKE2B b3d1fcfb88b7ec80023ff3ed78ddf0f31845cb4524402d7ebb24bd294857e4459f18b7f526687a163c6a2c08609325e60f85c17cd1055e32214fd415ab9968a6 SHA512 ba28fba7667eb3ef9f1e9b611c79b89e552f19cea6deefacd7bc7dc0bcc916c2d738adfa453e873ac7872d6a2d2a04aacba5a54c443d3009021940f944996dac
+DIST yoshimi-1.7.0.1.tar.gz 9987526 BLAKE2B e1793b0515fce39a62288f61fda0028c1683080c276b451f2cc67edd617ed2d25d408d3571ac56e8a7d6a4fd537719ba517b4faef969810520fc8af3aee013de SHA512 d403ca3f54a0c8eb27a1f4ea3bf90ab0fd8041b864259c94b0970b24b50b79fc84ea623af2981a1b00e65ebdd3f9ceeb0b5f04c64f62e5694aa55b31bb8390ce
+EBUILD yoshimi-1.7.0.1.ebuild 1032 BLAKE2B 61e247d835af7733a1bfa0d8e7a2a3011c5c2c7b6384c0ca5613992a769492b7aee994af3208378fd465f0580984504b990b87a02dbfb7154e120ee9fe05b0d4 SHA512 7224d8385a5feb36ec7dfbf62ee6b2b8f4bac15139174ac0766008c5c89c4c650d720d7553848da18f3c7ac3d181c6adf423208ee887d02e8df2f32ce5ffe2a7
+MISC metadata.xml 1650 BLAKE2B 1581b61fd8129d530dd164a50aa38a9621d947cd42b1a6c0c41924e7539c44f38c30f2e91d440a094b878c2f5db720c71de4df93f378061e0db2063419477021 SHA512 eec6c334d5c7ad11741c6318cea8374d2b46b2700372b1eebed66e1808a819794029d0d13306b8b5d7df3d7830569f8f76188dfb502eb1df4f668f1c21e4d152
diff --git a/media-sound/yoshimi/metadata.xml b/media-sound/yoshimi/metadata.xml
index 1b622256a8da..5d989b377648 100644
--- a/media-sound/yoshimi/metadata.xml
+++ b/media-sound/yoshimi/metadata.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>denis7774@gmail.com</email>
+		<name>Reva Denis aka RarogCmex</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>sound@gentoo.org</email>
 		<name>Gentoo Sound project</name>
@@ -11,4 +19,24 @@
 	<upstream>
 		<remote-id type="github">Yoshimi/yoshimi</remote-id>
 	</upstream>
+	<longdescription>
+	Yoshimi is a software audio synthesizer, originally forked from ZynAddSubFX
+	Features
+	Three separate engines
+	each with distinctive characteristics, can be used together or individually
+	Sixteen engine kits for the ultimate in multi-layering of engines, or for synthesized drum kits 
+	Vector Control
+	manage up to four independent sounds on any channel with faders or an X/Y midi joystick
+	Solo
+	step through up to 16 sounds seamlessly while playing in real time (including vector sounds)
+	Microtonal Tuning
+	Scala-compatible scales and keymaps
+	Extensive Midi-Learn
+	capture almost all internal controls and many switches with ordinary 7-bit values, or NRPNs, or even 7-bit NRPNs, then edit the responses
+	Command Line Access
+	headless operation and high accessibility, for those with sight- or motor control issues
+	Rich variations of tone and timbre
+	Yoshimi provides the means to ensure no two notes are ever identical - just like in the real world.
+	And much more...
+	</longdescription>
 </pkgmetadata>
diff --git a/media-sound/yoshimi/yoshimi-1.5.10.2.ebuild b/media-sound/yoshimi/yoshimi-1.7.0.1.ebuild
index 442d7fa96369..e4c00e99a9c0 100644
--- a/media-sound/yoshimi/yoshimi-1.5.10.2.ebuild
+++ b/media-sound/yoshimi/yoshimi-1.7.0.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake xdg
+inherit cmake xdg flag-o-matic
 
 DESCRIPTION="Software synthesizer based on ZynAddSubFX"
 HOMEPAGE="https://yoshimi.github.io/"
@@ -17,7 +17,7 @@ IUSE="+lv2"
 BDEPEND="virtual/pkgconfig"
 DEPEND="
 	>=dev-libs/mxml-2.5
-	>=media-libs/alsa-lib-1.0.17
+	media-libs/alsa-lib
 	media-libs/fontconfig
 	media-libs/libsndfile
 	sci-libs/fftw:3.0=
@@ -33,19 +33,19 @@ RDEPEND="${DEPEND}"
 
 CMAKE_USE_DIR="${WORKDIR}/${P}/src"
 
-PATCHES=( "${FILESDIR}"/${P}-cxxflags.patch )
-
 DOCS=( Changelog README.txt )
 
 src_prepare() {
 	cmake_src_prepare
-	# respect doc dir
-	sed -e "s#/doc/yoshimi#/doc/${PF}#" -i src/CMakeLists.txt || die
+	append-cxxflags -lpthread
+	append-cppflags -lpthread
 }
 
 src_configure() {
-	local mycmakeargs=(
-		-DLV2Plugin=$(usex lv2)
-	)
+	local mycmakeargs=( -DLV2Plugin=$(usex lv2) )
 	cmake_src_configure
 }
+src_install() {
+	cmake_src_install
+	mv "${D}"/usr/share/doc/yoshimi "${D}"/usr/share/doc/${P}
+}