gentoo auto-resync : 22:09:2022 - 17:28:08

14 files changed, 13 insertions, 136 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 81de6dc8b598..b28a52578ca5 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/darkice/Manifest b/media-sound/darkice/Manifest
index c9fbc55e5826..6fe4a35bc25f 100644
--- a/media-sound/darkice/Manifest
+++ b/media-sound/darkice/Manifest
@@ -1,4 +1,4 @@
 AUX darkice-1.3-include.patch 636 BLAKE2B 3598cf32c662453b1d4d7607b5c032e637a951fcd67943515f28bcccafb6e1110f64916563de9406a96d439990ee683a4151805ceafe08d8a44b52d49c30ae51 SHA512 14b461fe4282f9389d8a97d4b4942c0b7866860aabd91589bd6294a34796b6a0e74658ed8a0e43273fdc72bf776c14b6cf8889a1f31975ab6609f34021fdb434
 DIST darkice-1.4.tar.gz 364782 BLAKE2B 6097ddc022c4ac8dfba2deea2b6ab6e6ad86e49cc542d573572643faf6091a2ed2996f0e5c24045c22a60e972e4222c2ecd80342b2641fae52610778b9775aee SHA512 708ab08a45e216dce350f6cd36374e10d4606f77f0cde4dfbf35675d9d0778fb7a013b49fd62d713039d5fcfb9e7d66e6b7ae14acf1e5f142685eecdf7a865bc
-EBUILD darkice-1.4.ebuild 1391 BLAKE2B baeade15987f8b7c59babe2c745cacfb2c103e55ce2e6672d9afc2ff3ce0d61a7fa209d90d2bf9ca6ea8b3e6aa1c6e41048cd1f5bf3fe2d1ac2cb7b8a43e3967 SHA512 5b5192f67d4d183359d0f0c3ab9f48ed1a4dd3b0eae02f4d9e4300ad40c05e06ab9c69c4dd9d0c7ee979d1fef376691a710e86f3b339ed478bad08edac59928d
-MISC metadata.xml 592 BLAKE2B e9603d4b84793689d6089d9a90421052f13b0eb2d7e4399d6024113cd96eb53c20ddd6b353b7d89e24a5c0613f8021308a48bb57c8133d2c64fd7a6fd2a78d2d SHA512 97ccc5ea0e205c74b50b0312495790292ef389b45cd8e3fe311947773b3cb1903471ad6eb9a5181104fef8cc7ec51477a92ca2e934fb885fcf0a5c23a062e960
+EBUILD darkice-1.4.ebuild 1337 BLAKE2B cee1b570ffed3667a761fbbf92f8e28340cdeecdef19d0a591680dac934cb017259e0ea40fd82cf8c5d2952b4ea03982e2402627c7db3bb037730cf794e5cf78 SHA512 0bd56f4163a56c5d5b47cd9aa5fa3123d7d845fdbc0af224c37169e56c8675cef5d6b10b27eba1d5d37a61b34678d810a4b8d0db09749952fbd6d7c37985ae46
+MISC metadata.xml 511 BLAKE2B 9b3429b16595424e1c9c672b0f45bdbd8e7f9fc175fc723c920b380e748425448383f139f35b0074005f9f5264b5711ff59fd44691c3c66a0df162df22e5127d SHA512 b3e341dd74307fb7c6970f0df33277f3c39537636d620b9415f043332227b136fd6395e988568104e288a1b84301159d3d7f0a4b08db2045ab0e5cdb0f719ea6
diff --git a/media-sound/darkice/darkice-1.4.ebuild b/media-sound/darkice/darkice-1.4.ebuild
index d5296f02e46e..3cc45f126b10 100644
--- a/media-sound/darkice/darkice-1.4.ebuild
+++ b/media-sound/darkice/darkice-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,10 +12,9 @@ SRC_URI="https://github.com/rafael2k/${PN}/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ppc sparc x86"
-IUSE="aac aacplus alsa debug jack libsamplerate mp3 opus pulseaudio twolame vorbis"
+IUSE="aac alsa debug jack libsamplerate mp3 opus pulseaudio twolame vorbis"
 
 RDEPEND="aac? ( media-libs/faac )
-	aacplus? ( media-libs/libaacplus )
 	alsa? ( media-libs/alsa-lib )
 	jack? ( virtual/jack )
 	libsamplerate? ( media-libs/libsamplerate )
@@ -26,7 +25,7 @@ RDEPEND="aac? ( media-libs/faac )
 	vorbis? ( media-libs/libvorbis )"
 DEPEND="${RDEPEND}"
 
-REQUIRED_USE="|| ( aac aacplus mp3 opus twolame vorbis )
+REQUIRED_USE="|| ( aac mp3 opus twolame vorbis )
 		|| ( alsa jack pulseaudio )"
 
 DOCS=( AUTHORS ChangeLog FAQ NEWS README TODO )
@@ -42,7 +41,7 @@ src_configure() {
 	local myeconfargs=(
 		$(use_enable debug)
 		$(use_with aac faac)
-		$(use_with aacplus)
+		--without-aacplus
 		$(use_with alsa)
 		$(use_with jack)
 		$(use_with libsamplerate samplerate)
diff --git a/media-sound/darkice/metadata.xml b/media-sound/darkice/metadata.xml
index 3d179b2827ce..12ca22f989d4 100644
--- a/media-sound/darkice/metadata.xml
+++ b/media-sound/darkice/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo Sound project</name>
 	</maintainer>
 	<use>
-		<flag name="aacplus">AAC+ encoding via <pkg>media-libs/libaacplus</pkg></flag>
 		<flag name="twolame">Build with twolame support</flag>
 	</use>
 	<upstream>
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index eb780aa972bc..bfb93bd79292 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,6 +1,6 @@
 DIST picard-2.8.2.tar.gz 5095347 BLAKE2B ddaab9e7d09bd7848d55ac385cd901b5f7b3e2044811cd63b16027159586e01028f2885202c4d2bbfa20926305e110e075778f0b907ff8812c937fe0905a8fef SHA512 18b4ebc6e898f4e2910d4d022a12c0516030133318467c38a77325ce088a9dd632d3d8105944570f75b918d3f4dc32b1a501e93bc92a7315ec9ff35ed3e56699
 DIST picard-2.8.3.tar.gz 5098160 BLAKE2B 5f7290de8faee502f3a4984e0080409a31f9971428da635fb79a9f2ec540d71a256584010d747de77c86e85cd58df929e8ddaa09840ebc2c17e5cdbb035c5d68 SHA512 b87e768f0f13e1e306279f71004b5ffaebb2cfc44be23f041d9193432bdc631c4a2b893d72b47109b06c450d6ff4e2b0a70c2a4b0cc5d1608a4481d26526b0e3
 EBUILD picard-2.8.2.ebuild 1448 BLAKE2B 694d79f9a133a075eeaa985e500600e2310e45e7671285303f96c02a5a78d7a7c44df9e99b9851842f338f1dea5dccf8e2c1a193d09f8960f3c9ad41275b891f SHA512 aaa97fddb14ab0500dce3533314c8ebe3892b7a8a0a4741e29bb83e99e7be5e7c32c77a14bcb5130888d1a9170ba5155086fe148d046e8dfb0c9b0eb6a78332b
-EBUILD picard-2.8.3.ebuild 1450 BLAKE2B 80a78442f2b442fb7998d31b4799c995b12f0a504174f3c2dad9f8ca4a17b86a71cf1ab668c7a65cf3e995b1c67db4bb58095ab01eb42addd49939f911e20884 SHA512 b58c87fa1f4f971ac5ca759abb8c67b441f9df4fc492e69dc64920c4c09c0d2b12ec93cb7cf644a3444a36823e177b37bf3019e87af144a01c61281d689f0d5f
+EBUILD picard-2.8.3.ebuild 1449 BLAKE2B fe90d31072eb6d6ae92fcef13be55d1262d2a9d3f9a55be439e87bee55e5af435049ca109b446c8aa695eb2cfe48219350fda84288adf13b6d92d0072ad30267 SHA512 21eb9ad0fe35973d32709321870bb2de1689ec6cedfe7b571d4eb79db478f100d19169354946b8a21afe9298d709067737e3b28dae7a8b695a636da917d39ced
 EBUILD picard-9999.ebuild 1450 BLAKE2B 80a78442f2b442fb7998d31b4799c995b12f0a504174f3c2dad9f8ca4a17b86a71cf1ab668c7a65cf3e995b1c67db4bb58095ab01eb42addd49939f911e20884 SHA512 b58c87fa1f4f971ac5ca759abb8c67b441f9df4fc492e69dc64920c4c09c0d2b12ec93cb7cf644a3444a36823e177b37bf3019e87af144a01c61281d689f0d5f
 MISC metadata.xml 740 BLAKE2B cc09a7bf012e0b85ff55531ace5d8b187cd68fdae7d274cb640a7ae446296c2ac70bb599955d6ab2570b3eb879c28cad0cf2e70fe7339c2c0c58fd8b0dcdcac7 SHA512 321188fd4887593a3683b2c507673baa9e2faf2b46b0158338a67e72dbf5267b93c1e358ceadeacd707d6a6bb234a4fae8ef681779463c4ab5bd3b79dbd47c43
diff --git a/media-sound/picard/picard-2.8.3.ebuild b/media-sound/picard/picard-2.8.3.ebuild
index e50d604072d8..6ee75852aa3a 100644
--- a/media-sound/picard/picard-2.8.3.ebuild
+++ b/media-sound/picard/picard-2.8.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 	S="${WORKDIR}/${PN}-release-${PV}"
 fi
 
diff --git a/media-sound/rawrec/Manifest b/media-sound/rawrec/Manifest
index fcbe6f800212..d5cb18cbe04c 100644
--- a/media-sound/rawrec/Manifest
+++ b/media-sound/rawrec/Manifest
@@ -1,5 +1,5 @@
 AUX rawrec-0.9.991-fix-build-system.patch 900 BLAKE2B 3572e6c249c777514aed2f35c5a0814aa148ea352361b72c50c4da377bd274ed8241c361fa9124735d881cf6b3ba5dcf6151b0a1484d33469d7dc57a61c57d98 SHA512 f2223ec30e07b43d8ae6790f3e4c7f363824646b5fd7c6fb4e72f8637cfc60306a3b322efae656566752b933da00d19790d6bfeb5c84442ebdfc2960358ecef2
 AUX rawrec-libs.patch 817 BLAKE2B 8da060f6631560d3f994af4471aa08f7f4a0d01664281adac71350088e81e724f021d2ffcd768b889f9472dd819d4e95ef284ded121fe0661854a511b96fb4ef SHA512 86707ebc6533c137c3a569394cbfd17626dd855e2caeebe2a469091ad5d88f50932e4b4717d4e9cf88e44678c4bc51f74bfccd04c13d98f6e3471300fdaf4dd8
 DIST rawrec-0.9.991.tar.gz 62134 BLAKE2B 2ff1bc864f0da3d2416f3b5dfc8f331396544d396a47f94dcbd7b2880453a007db1254610262799239a6096fd7465018129fd23c59fe5b30cef9069a55de0eec SHA512 3f0c6080b246231089cf01dbb5be0e9e6749cd9d339a9d3ea865681e836767c69909bb9f70ef7d87b39298603438169e9531e957e364dfcbe64aef074f862d90
-EBUILD rawrec-0.9.991.ebuild 722 BLAKE2B 330e9703dee738673819103046adb12a3dc80b59698994fc8edf24ead1d7c5c82362711f320ee6b7c7d240cfde6949237784193a7294b75bcb053b0119006cd7 SHA512 e7bea812993c6755fe3a8b1e39e8a298f93aa29ddf6ad32e046ea1a96b5d27460c6d41a2eb65a4057c3a4fa1b7ae631dc57dbb376d8dc625d06602b7b228e0f2
+EBUILD rawrec-0.9.991.ebuild 709 BLAKE2B a5dbea523250c18c9d400a08dba27a6bb024b1047949cc8443256595ed4e8acdfa5768e8bd2e4c2c66f5a13a61d713fea3eb94716944ea22b7368622bb18b6f7 SHA512 2ec95cdf647fbd5bddeeff075741cee373900381c53fce2b9777bd7ae5df15c5d2b4ac8b79a06efa5309698a4f1aa99427534587a3b7c047993e764fc01a2e16
 MISC metadata.xml 330 BLAKE2B 1eab8ed840c95f766a44b300531bda10817cbe6e2f71fe83272e3b8e2f827586d1205052219d77dd86b64a9374a5e4b00a8d6c52948d7af893f8df842d084f2f SHA512 6fab8f4bc304a9f173c846569d122f2e890627a286003a603ef4385268b19693c981cb1f03a014683745c8e249718d865715b13d157700b315092d6f7a58f5f3
diff --git a/media-sound/rawrec/rawrec-0.9.991.ebuild b/media-sound/rawrec/rawrec-0.9.991.ebuild
index 940ba0cdbc25..9f32c4413301 100644
--- a/media-sound/rawrec/rawrec-0.9.991.ebuild
+++ b/media-sound/rawrec/rawrec-0.9.991.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="CLI program to play and record audiofiles"
 HOMEPAGE="http://rawrec.sourceforge.net"
diff --git a/media-sound/sndio/Manifest b/media-sound/sndio/Manifest
index 799e703ee316..42430486ba17 100644
--- a/media-sound/sndio/Manifest
+++ b/media-sound/sndio/Manifest
@@ -1,7 +1,7 @@
 AUX sndio-1.8.0-fix-hardcoded-pkgconfdir.patch 421 BLAKE2B 0e9fb5f30d53c18596584e23cccf34909ea0c86c289ff3e8790f29d7d0ec221f26371afa9df7e6f4d0268aa4f0561ea5ccf73e2eaf02a375f15d75a41ddf5640 SHA512 aaf789a6182c6a8e9f2ac2f8894ed52cf0a895f89192a3e326af7db781fd9721fc2768b9f00ca7e834a1ee4a1e748f1bda439f01a32e8ffdaa85273ec0fc57c4
 AUX sndiod 36 BLAKE2B 51d51ddac64b89c01cb7ec6b009cabb17168b1664e4339d895070fd6e844e5b1cce7be92c6198ebf57e733e40261f767921d9678957b633a903c2bd659266c4d SHA512 80f2fc6eb775889ac9ba6257651a18bf030668d577727a8f78dc864717e90251757eb779a6ac97ae5468629da59a399c9df013d470744b6d480c1aa09a602323
 DIST sndio-1.8.0.tar.gz 156249 BLAKE2B 46d279c0a9ab40253d9f4abf5892d6c2cbbbeeeeb5ff72f45287b16adce122550025ee2d50b45de5e6952dfac1f25041e520692b0afc31ce9cfa5e122d8799fa SHA512 c3225e59e50c3dee41df7df1d87d32ed616117ea6883d9c643a57091b2239b03988c00230882c32f68331952852781dccb8bdc5a6c92780d97a294a1bd9d8ef8
-EBUILD sndio-1.8.0-r1.ebuild 1135 BLAKE2B d3eab359c89fc896b16a23a8a80b1202c381ec3ada3def20ba139aa50ed504a435f4666b9789337368e1a44cdbc31b18ca415095b952cdb736a9b36c12cee7e3 SHA512 008d8eeda8774b6927076bb12d429a097d7a41aaab69ab351a3ffe9a515d6ff877c327f9aa3b73372e5efa166c7364196a397f678385631dedb98f00e001d454
+EBUILD sndio-1.8.0-r1.ebuild 1133 BLAKE2B e8cff84bcae25b3b76fbc58c6536962beff5aa9669d8483e5309689f258d311af32ea65e59843f6d791a86d1dd8413656149cb1549f411a4619c2397375cde3a SHA512 47e656ef48cc29412fc1620552ca206f57a3e3b22a68546ca089998ffcaa6803bc654f88ab3778c43af2dc93ce1eed2cf2c5d758e6dc74871ac4a59f46e0c954
 EBUILD sndio-1.8.0.ebuild 1062 BLAKE2B b2ad8c433260bc1c81afa7c384dc2d4c25bfcec944b8d31ae7b84d83705540a0f6ec8bd4caf4830adf31cd1d4a9f0b3a0e684ecdb07dac13110fd2d47b4afe51 SHA512 3d290983c6e3a69e862ae503db7dc00c8eaa77a0bd050a16add83ca8399b63a74bf8622ce1841421cd118b29ea4ff3488f9d571a6ef6f214e029b65da3becffa
 EBUILD sndio-9999.ebuild 1049 BLAKE2B 55f1786cacbae3e9e3706cb9d23ff2879d224a6a5929cc0bc3f9ba9dec6728c81017023e6c2b859f3816af09663b1d87a43a789afb0d26f98965dfc16d6f1d4b SHA512 afbfa868aaaddffad8c066e3840cd85b9ba272894c3f31b56608c1953659e4c3fea7eef59d5ba2f70e2fd63f4bb4490b5062f6cf940bc784a581f42d315e713e
 MISC metadata.xml 410 BLAKE2B 75c853b9665a82c30c29f3aa0e9171fe2665ed2f7e4c1a7ccdd04258a07e4ef753ad01066934adccc3434aa52332b7007148c818b568335a2429bd8afc61d974 SHA512 b26adba8415ba084c079fabf29b966886bda8736165fbd9f0db13fe4da80e9be373ea7ed2d59e3b8c2b9a04eb84d8327f432c091c3ee936a82650a7983a7a483
diff --git a/media-sound/sndio/sndio-1.8.0-r1.ebuild b/media-sound/sndio/sndio-1.8.0-r1.ebuild
index 07775266328f..707930361c9d 100644
--- a/media-sound/sndio/sndio-1.8.0-r1.ebuild
+++ b/media-sound/sndio/sndio-1.8.0-r1.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_MIN_CLONE_TYPE="single+tags"
 else
 	SRC_URI="http://www.sndio.org/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~sparc x86"
 fi
 
 LICENSE="ISC"
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index 9c1fbeb3182f..4799783e9e68 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -1,8 +1,4 @@
-AUX zynaddsubfx-3.0.5-cmake.patch 469 BLAKE2B 98d1d0fadd3aebab6b0336149f0aa897d99ab6939178c6af08a261ad5800dbfdf62693fd8f93575daaf05c02caa8d4ab63aa907b49df2e671548204aadad009a SHA512 bacc4916f4a3cdb11b492092e65fd935b28bb72a5097d7090adf8bec9a4a874a80e0fb0c62cb24daf5b98102a4bcbc1b4d6ff288472ea64b7a316f8c801714bf
-AUX zynaddsubfx-3.0.5-docs.patch 436 BLAKE2B 23724992b4ce5a58961984481bcf9782a7960ca033a6abe7f71f061e8c7e4026de470b71080e5eb58f67f882a6138824d893949acd44d95ed026df24eaf95e3a SHA512 958d4f7bbb6b267b4aae2295df99eaad5f41f574183c1bb03ed6499475cb8ac3a2c52edaae60fce5a552e8d53dbed9f6677fa6c67aec4ec4dfa4436e591eae84
 AUX zynaddsubfx-3.0.6-docs.patch 500 BLAKE2B 6f6e81c4e700f42c56417f4226408bfb7b45b67999a2c15eed5871d108f88cad49bcb5ea794b34dfaded63af335351c3a376d56797234403896d4337d05bae4a SHA512 5f240dc9256b6398a8b1ae517b0efc737afd87420a263d8bab63e1e6d81d522d43fcc95b696987d489072753bc283399e9792a0d6d44c4717111dc5fa45cd809
-DIST zynaddsubfx-3.0.5.tar.bz2 8141703 BLAKE2B 61f28a62d5ef8c17b5e38febb8ad1ecd40c80f87b26d90804131b97b57534adf5ad96a1f54980b75fd5e71185e2d5376a7df35696c7bcfd593b5d8e34bd2e386 SHA512 1e4d5a6393937e6c7103e6d0e97df76f2d129350854c2f338aa888591091b1508c63e9b52c8e5a176e282ff2f6b72c6a87de54875c412771aff26e8ece2c84e8
 DIST zynaddsubfx-3.0.6.tar.bz2 10001014 BLAKE2B 4adbeffb9bc0bd77bf81a6734f5c26fc676426e644e27cebb8e54e8d74d869c0e1b468782cd1a64aacef8f9b788d434a8d30a194944650eea03c4fd146ee7bf7 SHA512 86311f00d97e20c7eb22a46c99736c56765ed9737e728ef380a324e4a92c731086ed74f5d7bfeae104b690ab1ee1b40bfb8f240bc4c46f8afd47308ec48cbcea
-EBUILD zynaddsubfx-3.0.5.ebuild 2020 BLAKE2B 1d91b8f853875abcdfbc0e11bdfe29365b14479708d721aaf06450aadde4c6e5e601002a3fdb5b45ab874b8de70b515012e6876b584be9d59d8f956600d5e4e2 SHA512 a72b79d923b556ff0b9310ea90600a16dfbdf9e3494cbe1d662b775ccbbe6415711f1dcd2f59fb23672a3667d6ce09c0ecfa89100a7f2c4fb51397b2aac504a8
 EBUILD zynaddsubfx-3.0.6-r1.ebuild 2056 BLAKE2B cfda66874d5bd776be27d65fdb12a219a36a5412bf9d0459313a50102cfe88c656344a27476f6038d7e8e54050758cdbb9926dea936fcacb713447d3f1f8a7c5 SHA512 baefccc9b6c538b6f37488cd75f942e5a7c8551b189f070cda9a552e213be807483ff40208310dc175a3f7b895593e3085ec7fa423cc98e7747480c6430e82f9
 MISC metadata.xml 428 BLAKE2B 5a450f26afae683f0aa9ff386c87c37c3445b81240d4864fe90564f2c86913af772174cfeaeb82c29b4df0b92337d00f710d8779c9f3300865e7d20e6f9fc06c SHA512 53de61301fd080758dc195c67dfaf9ece5fba941988d17ca6edb7249e01a8804fe4e7edf961a4a0ec6891730dc6f6250e5cf7e91441061eb1e487be243c9b111
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.5-cmake.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.5-cmake.patch
deleted file mode 100644
index 8fbcf9aca56a..000000000000
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.5-cmake.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix missing CMake include
-
-Authored by:  Simon van der Veldt 2020-09-30
-Committed by:  Mark McCurry 2020-10-03
-
---- a/src/Nio/CMakeLists.txt
-+++ b/src/Nio/CMakeLists.txt
-@@ -21,6 +21,7 @@
- add_definitions(-DIN_DEFAULT="${DefaultInput}")
- 
- if(JackEnable)
-+    include(CheckIncludeFiles)
-     include_directories(${JACK_INCLUDE_DIR})
-     list(APPEND zynaddsubfx_nio_SRCS JackEngine.cpp JackMultiEngine.cpp)
-     list(APPEND zynaddsubfx_nio_lib ${JACK_LIBRARIES})
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.5-docs.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.5-docs.patch
deleted file mode 100644
index 44060eaf4824..000000000000
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.5-docs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -28,9 +28,6 @@ include(CTestConfig.cmake)
- add_subdirectory(src)
- add_subdirectory(doc) # Doxygen only
-
--install(FILES AUTHORS.txt COPYING HISTORY.txt README.adoc
--	DESTINATION share/doc/zynaddsubfx
--	)
- install(FILES zynaddsubfx-jack-multi.desktop zynaddsubfx-jack.desktop zynaddsubfx-alsa.desktop zynaddsubfx-oss.desktop
-     DESTINATION share/applications)
- install(FILES zynaddsubfx.svg
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
deleted file mode 100644
index 36d58edcadf9..000000000000
--- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
+++ /dev/null
@@ -1,90 +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
-
-DESCRIPTION="Software synthesizer capable of making a countless number of instruments"
-HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zynaddsubfx/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="alsa doc dssi +fltk jack lash portaudio"
-
-REQUIRED_USE="|| ( alsa jack portaudio )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-DEPEND="
-	>=dev-libs/mxml-2.2.1
-	media-libs/liblo
-	sci-libs/fftw:3.0
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	dssi? ( media-libs/dssi )
-	fltk? (
-		>=x11-libs/fltk-1.3:1
-		x11-libs/libX11
-		x11-libs/libXpm
-	)
-	jack? ( virtual/jack )
-	lash? ( media-sound/lash )
-	portaudio? ( media-libs/portaudio )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-docs.patch
-	"${FILESDIR}"/${P}-cmake.patch # bug 761823
-)
-
-DOCS=( ChangeLog HISTORY.txt README.adoc )
-
-src_prepare() {
-	cmake_src_prepare
-
-	if ! use dssi; then
-		sed -i -e '/pkg_search_module.*DSSI/s/^/#DONT/' src/CMakeLists.txt || die
-	fi
-	if ! use jack; then
-		sed -e '/pkg_check_modules.*JACK/s/^/#DONT/' -i {rtosc,src}/CMakeLists.txt || die
-	fi
-	if ! use lash; then
-		sed -i -e '/pkg_search_module.*LASH/s/^/#DONT/' src/CMakeLists.txt || die
-	fi
-	if ! use portaudio; then
-		sed -i -e '/pkg_check_modules.*PORTAUDIO/s/^/#DONT/' src/CMakeLists.txt || die
-	fi
-
-	# FIXME upstream: sandbox error
-	sed -i -e '/add_subdirectory(bash-completion)/d' doc/CMakeLists.txt || die
-}
-
-src_configure() {
-	append-cxxflags -std=c++11
-
-	local mycmakeargs=(
-		-DPluginLibDir=$(get_libdir)
-		$(cmake_use_find_package alsa Alsa)
-		$(cmake_use_find_package doc Doxygen)
-		$(cmake_use_find_package fltk FLTK)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doc
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-	cmake_src_install
-	insinto /usr/share/${PN}
-	doins -r instruments/*
-}