gentoo resync : 25.11.2020

4 files changed, 2 insertions, 105 deletions

diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index 57bdd730b650..6d0e61302aa0 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,6 +1,3 @@
-AUX yoshimi-1.7.1-fix-LV2_Descriptor.patch 3062 BLAKE2B 4c69d385c2b5e7b90e79b6e19bf6c41ee6fbe4219e3b96d1cd53cc4a760e0bc21379fc6c753c24c63c825463f5fefe9f94aadcb69be7dc3935b4a8b42601d8b8 SHA512 0a57f3a4e68e74569d4a8d9182a5d3692ca16f46e4c3dba126c8e49b4579c759554d451d7526ca1245a9e5947d4b37b9a1b12a78e322472f6c97e4dc985010ae
-DIST yoshimi-1.7.1.tar.gz 10067045 BLAKE2B 6a9d84d47413ec26c733515bd3becaca436c8168f0f22d2b71f502fde126aa5347ee55d60a74473936933f4831e9feec21c2ebc6916cdde2b2822ecddf3da4c5 SHA512 d422c08caa6bf20665442b2d88fc4ccc41b881d719d5150d1cd3d2617f2216b18c112107c5723cb1077da0ba2278a3eb2db0a8dda4ce3c6315e3875cbfaf421c
 DIST yoshimi-1.7.2.tar.gz 10256155 BLAKE2B e330e2d22117bbed2c2054efabf852aa67141a40539ca96e2df7c88cedabb445214f2d79c0f681b68d70b8c832b7bb7852d44442d3f6b1e4183fd2297768b0ca SHA512 7a52dd847cfd19c6b7cb802f181baaa291e73b52f8243e34f9899651f003779b402a20281995ce24f2335570191f6973c2bafb58a5093eba868033b6b9dd4fd9
-EBUILD yoshimi-1.7.1-r1.ebuild 1094 BLAKE2B 3ea86703750ade54eb4449a4a93afd589b366f58122649899d2f2b020e9ed8eaeb2925dec7da3f5efe354503475c805185fcb3bb1192f1f2836397ccea9e55d6 SHA512 8153ec253ded0aac30a759781e5ba6d3150213fdb8ac96a2b630179bcc67da0267a560c438250814e9194c30af851b5b46dfab4743752c4b64b9381b2cc72493
-EBUILD yoshimi-1.7.2.ebuild 1011 BLAKE2B b28c7c74baa9813d5cb76a114f259b758882a6100856c9bbdf3dd212cef46c927a9e9a9ffd41f6c84ca37bc0352aa1cbfe52db179b193b4c700df716e2d542bc SHA512 63906d2c45c61560fa04c1db3be7d7566fac17bb610f1b7906921b27e73a03401b0742a55f95bdfad4f34d60c080453eb5d648bc993c8c833c483be992c4ec73
+EBUILD yoshimi-1.7.2.ebuild 1009 BLAKE2B 397418f1d46c1d38a169b3547c8de577679b6f2fab97e06b899241487315a9273d23fae70b904a298ecfdf89f86ed88800d4c0618c2fb0b48fd1f9ccf1364376 SHA512 309654312886da14c56d25878944380259d1a9754b8066aa8bdc8ad93abd5499730fbcc20b3fef0fbc79b5612025d74a19c1435d55ec83fa53e38927f6b04b26
 MISC metadata.xml 1413 BLAKE2B c294d4bd44ddd5a51ae0294e12e053633da91e3ee4f6e71786e68d3ea674ff3966cd5992b5d9e7c43c677d64e3771662c23760b8e74a9382bd9118ca5e779a8c SHA512 d35e3df2eae6868adf65f4cb5f9e9306c9e72f930c427a01816f2dfe7b32e07641ea91c6829e7ef6c099cb3d7136541b2deedbfe926d50be66d364042c054ba4
diff --git a/media-sound/yoshimi/files/yoshimi-1.7.1-fix-LV2_Descriptor.patch b/media-sound/yoshimi/files/yoshimi-1.7.1-fix-LV2_Descriptor.patch
deleted file mode 100644
index 94e225e4f48f..000000000000
--- a/media-sound/yoshimi/files/yoshimi-1.7.1-fix-LV2_Descriptor.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/src/LV2_Plugin/YoshimiLV2Plugin.cpp b/src/LV2_Plugin/YoshimiLV2Plugin.cpp
-index 3502689..9be6128 100644
---- a/src/LV2_Plugin/YoshimiLV2Plugin.cpp
-+++ b/src/LV2_Plugin/YoshimiLV2Plugin.cpp
-@@ -378,7 +378,7 @@ bool YoshimiLV2Plugin::init()
- }
- 
- 
--LV2_Handle	YoshimiLV2Plugin::instantiate (const struct _LV2_Descriptor *desc, double sample_rate, const char *bundle_path, const LV2_Feature *const *features)
-+LV2_Handle	YoshimiLV2Plugin::instantiate (const struct LV2_Descriptor *desc, double sample_rate, const char *bundle_path, const LV2_Feature *const *features)
- {
-     SynthEngine *synth = new SynthEngine(0, NULL, true);
-     if (synth == NULL || !synth->getRuntime().isRuntimeSetupCompleted()){
-@@ -711,9 +711,9 @@ bool YoshimiLV2PluginUI::init()
- }
- 
- 
--LV2UI_Handle YoshimiLV2PluginUI::instantiate(const _LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature * const *features)
-+LV2UI_Handle YoshimiLV2PluginUI::instantiate(const LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature * const *features)
- {
--    const _LV2UI_Descriptor *desc = descriptor;
-+    const LV2UI_Descriptor *desc = descriptor;
-     descriptor = desc;
-     const char *plug = plugin_uri;
-     plugin_uri = plug;
-diff --git a/src/LV2_Plugin/YoshimiLV2Plugin.h b/src/LV2_Plugin/YoshimiLV2Plugin.h
-index a484a8b..47f4729 100644
---- a/src/LV2_Plugin/YoshimiLV2Plugin.h
-+++ b/src/LV2_Plugin/YoshimiLV2Plugin.h
-@@ -106,7 +106,7 @@ public:
-    virtual void registerAudioPort(int) {}
- 
-    //static methods
--   static LV2_Handle	instantiate (const struct _LV2_Descriptor *, double sample_rate, const char *bundle_path, const LV2_Feature *const *features);
-+   static LV2_Handle	instantiate (const struct LV2_Descriptor *, double sample_rate, const char *bundle_path, const LV2_Feature *const *features);
-    static void connect_port(LV2_Handle instance, uint32_t port, void *data_location);
-    static void activate(LV2_Handle instance);
-    static void deactivate(LV2_Handle instance);
-@@ -159,7 +159,7 @@ public:
-     YoshimiLV2PluginUI(const char *, LV2UI_Write_Function, LV2UI_Controller, LV2UI_Widget *widget, const LV2_Feature *const *features);
-     ~YoshimiLV2PluginUI();
-     bool init();
--    static LV2UI_Handle	instantiate(const struct _LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature *const *features);
-+    static LV2UI_Handle	instantiate(const struct LV2UI_Descriptor *descriptor, const char *plugin_uri, const char *bundle_path, LV2UI_Write_Function write_function, LV2UI_Controller controller, LV2UI_Widget *widget, const LV2_Feature *const *features);
-     static void cleanup(LV2UI_Handle ui);
-     static void static_guiClosed(void *arg);
-     void run();
diff --git a/media-sound/yoshimi/yoshimi-1.7.1-r1.ebuild b/media-sound/yoshimi/yoshimi-1.7.1-r1.ebuild
deleted file mode 100644
index 4c2573a12e31..000000000000
--- a/media-sound/yoshimi/yoshimi-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg flag-o-matic
-
-DESCRIPTION="Software synthesizer based on ZynAddSubFX"
-HOMEPAGE="https://yoshimi.github.io/"
-SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+lv2"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	>=dev-libs/mxml-2.5
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/libsndfile
-	sci-libs/fftw:3.0=
-	sys-libs/ncurses:0=
-	sys-libs/readline:0=
-	sys-libs/zlib
-	virtual/jack
-	x11-libs/cairo[X]
-	x11-libs/fltk:1[opengl]
-	lv2? ( media-libs/lv2 )
-"
-RDEPEND="${DEPEND}"
-
-CMAKE_USE_DIR="${WORKDIR}/${P}/src"
-
-DOCS=( Changelog README.txt )
-
-PATCHES=( "${FILESDIR}/${PN}-1.7.1-fix-LV2_Descriptor.patch" )
-
-src_prepare() {
-	cmake_src_prepare
-	append-cxxflags -lpthread
-	append-cppflags -lpthread
-}
-
-src_configure() {
-	local mycmakeargs=( -DLV2Plugin=$(usex lv2) )
-	cmake_src_configure
-}
-src_install() {
-	cmake_src_install
-	mv "${D}"/usr/share/doc/yoshimi "${D}"/usr/share/doc/${P}
-}
diff --git a/media-sound/yoshimi/yoshimi-1.7.2.ebuild b/media-sound/yoshimi/yoshimi-1.7.2.ebuild
index bb04f4a15df6..0d9ef3eefcc6 100644
--- a/media-sound/yoshimi/yoshimi-1.7.2.ebuild
+++ b/media-sound/yoshimi/yoshimi-1.7.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN^}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+lv2"
 
 BDEPEND="virtual/pkgconfig"