gentoo resync : 13.11.2021

3 files changed, 2 insertions, 64 deletions

diff --git a/media-sound/yoshimi/Manifest b/media-sound/yoshimi/Manifest
index 23d51c545413..e8a5d348e1ee 100644
--- a/media-sound/yoshimi/Manifest
+++ b/media-sound/yoshimi/Manifest
@@ -1,5 +1,3 @@
-DIST yoshimi-2.1.0.tar.gz 7471945 BLAKE2B f95fb49ec901e5a513960bfc4c1d27ce1979f3cd664d7ca7ddb723ad41fb06153749db0560a32f41c44c7fb433fde09ee49e898cb8bf55e232536b163d616992 SHA512 d90666ca2599d057d5c22abfc5e64f9a31eb323d13c50f771b92c5f94f7da9049b79dc8a478b3832142a97f8c2f5ea384a26e1543fdd6c063930989e34b146eb
 DIST yoshimi-2.1.1.1.tar.gz 7479260 BLAKE2B eec292d489c01054ff3e7b4402a359d5abc29157048b475df8482630dccaae9fdff6cc697d95614778e34d363215633b0dc8beaeb1c832c02f98f0f21384b42e SHA512 4feaf7b779d450e4d8f9612a141fdcd2858117c738c56bb43fa12a19f9806d6c990e560dfc62755c7d39e23608f516fb017b0c4063440996c5c17286a58bf946
-EBUILD yoshimi-2.1.0-r1.ebuild 1193 BLAKE2B d29685b96b0e40949d055036cb266e7eae25d4b0e0f7c135f75fbb796eb0a6148e3c19b3a57c3aaede3ac84f4d679aa9a5402003b52d4689d8ab295d213280f2 SHA512 f8d6b1642c5540e67352af2ccf278ade542d1cf18fb8bc3772017bc94f1ac9568b52b80c0bb287945ed1fdf0a35a94493688b54bc8fb674a6feca9ed0b4579b4
-EBUILD yoshimi-2.1.1.1.ebuild 1195 BLAKE2B 0d5c2293fd43c238fb68bbbb0cd21f5554d16dccd9ca10de130136ff7813c450cc1ede150b8b278ac2b9e9d8502332cf9032ff433ccab94f9bdbc882af85e295 SHA512 1837120f7c243549b618bb261b46ed0ad6ac3846c3b89a6126b5a73b203a8d9a2b250ae441c6253bbcff61cfd36b2945bf1faaaaf79d2735d16a35c8db930a42
+EBUILD yoshimi-2.1.1.1.ebuild 1193 BLAKE2B d29685b96b0e40949d055036cb266e7eae25d4b0e0f7c135f75fbb796eb0a6148e3c19b3a57c3aaede3ac84f4d679aa9a5402003b52d4689d8ab295d213280f2 SHA512 f8d6b1642c5540e67352af2ccf278ade542d1cf18fb8bc3772017bc94f1ac9568b52b80c0bb287945ed1fdf0a35a94493688b54bc8fb674a6feca9ed0b4579b4
 MISC metadata.xml 1414 BLAKE2B 4dab154682ec4f0dfe9f4ee1f2b1510f020ef9bf8ce8b871c7bae3709a505faff8e07a2af20cedc3de357dd01c5a2bc192b2776153c1fb028894db732e0215dc SHA512 0ae6d64001643cc80c58929a4d28af6c3c4e0433b31567091e495dd34c350f7fa8908bf89d9aea1b3f004b40e7c8b60ec36025d04fa510f93af17f2316833c61
diff --git a/media-sound/yoshimi/yoshimi-2.1.0-r1.ebuild b/media-sound/yoshimi/yoshimi-2.1.0-r1.ebuild
deleted file mode 100644
index e4052c27b49d..000000000000
--- a/media-sound/yoshimi/yoshimi-2.1.0-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic xdg
-
-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
-	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}"
-
-S="${WORKDIR}/${P}/src"
-
-DOCS=( ../Changelog ../README.txt )
-
-src_prepare() {
-	cmake_src_prepare
-	sed -e "/^install.*doc.*DATAROOTDIR/s/${PN}/${PF}/" -i CMakeLists.txt || die
-	append-cxxflags -lpthread
-	append-cppflags -lpthread
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLV2Plugin=$(usex lv2)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	# unpack Histories.tar.bz2 to avoid QA issues
-	pushd "${ED}/usr/share/doc/${PF}" || die
-	tar xvf Histories.tar.bz2 || die
-	rm Histories.tar.bz2
-	popd
-}
diff --git a/media-sound/yoshimi/yoshimi-2.1.1.1.ebuild b/media-sound/yoshimi/yoshimi-2.1.1.1.ebuild
index 23dfc649dc2c..e4052c27b49d 100644
--- a/media-sound/yoshimi/yoshimi-2.1.1.1.ebuild
+++ b/media-sound/yoshimi/yoshimi-2.1.1.1.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"