gentoo resync : 29.06.2021

15 files changed, 418 insertions, 7 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 30236751db8e..bf0ce29c9f63 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/abcmidi/Manifest b/media-sound/abcmidi/Manifest
index 9670ffa1524c..d2128678fac2 100644
--- a/media-sound/abcmidi/Manifest
+++ b/media-sound/abcmidi/Manifest
@@ -3,7 +3,9 @@ AUX abcmidi-2016.05.05-fno-common.patch 745 BLAKE2B 8e6cb17df225b21261e42abda4f8
 DIST abcMIDI-2020.01.22.zip 569060 BLAKE2B 078ba04a614c253266a5239b5b3f133e94c1d44e2cf91c65195f85229892cd4b8d05527124741477decb8eae83d38777b27bf1135e4ad96779c0c6b68bb46747 SHA512 5897e1344ef8e88f7ae81622c18bc8144fb95e928482c8f63cd897397ce5a5d2a5f7e5a8f13a62c6f40387f875d2f3827e74dc703ccc3c9dd81cfff018efb1de
 DIST abcMIDI-2020.06.07.zip 571242 BLAKE2B 94a54ca3eb5110f74e3cb6ce3cba16e65230a202c5e33d735a3d98f2dc7fe03c997819acd065e08eaed5ad2e6f8882159ae21b2984673508c9a0842425ef5820 SHA512 d363d7148c2bd29b300f03ff70a3a4f75110d7416efe29d605f89d02c8922f227ab2dbb78a6f55fab530779af323b49a3824f609cb4e03ff6dfa4d15e3cf7969
 DIST abcMIDI-2021.05.25.zip 604797 BLAKE2B 78b2d43bb7569aa2eece63f319352aa71b77e9c5219c5f806384f007ffe026741a0852ffffe1e6b6c15b60f69f54e143cb26aa47b54baca41bc2fc231fa5b66a SHA512 57975f7c131855a713fc399c7aa1c7bd94775e7a257f2412d321aa51d0bf95cf9e1410e0819d2ad5cabde9ef996512ccca16058f7267baabc5702a926c173b3f
+DIST abcMIDI-2021.06.27.zip 605658 BLAKE2B b522c96b7f8990f297cc13a3334872763fb2879f5893f09e630d66ab425d1772e0eee64273249d26e8118c6d341dad84129e140d8c309adab160f3120b5a18a2 SHA512 b1e4a7a9b93e6633abe211258995cfa84bb8eaed3870ed20e244aa12353c6cc351ea7e1c842e4e410dad9dd91b2e8c918826138bec39503c56e95062f4a99f37
 EBUILD abcmidi-2020.01.22.ebuild 836 BLAKE2B 40f9d16d5c10a2897d1395ca2334e8ec58ea32a8e126ce5bf9e570c3e0fe8a5081737e3c83d71d522abaae6e7b7eaa2a3a3c875690e62e8bf88cc9351af9d4e6 SHA512 a64b2ce08d7968f332b9d617274ff0c08af97f554f375808608baa7c7687ff8a1ffcf1f4e264fa55346863aa853955e652f9243c5aca4536360bbea7068ae892
 EBUILD abcmidi-2020.06.07.ebuild 678 BLAKE2B d93bc531703f192645a2ad0dcb2609079e2582413c0091d7b2159689add101121039dc83e730573c75e108bb9d70633a020a9db1c0de4bbe7c541bf1895a68d2 SHA512 7139e646e3b903d6636ac931e12e59b9b09f22e88c456465ba6288a4091bf957f1c46fd2126d6cbc079b342c9021685e82a8bc6054b8b7683e6f743065a0c1ba
 EBUILD abcmidi-2021.05.25.ebuild 678 BLAKE2B d93bc531703f192645a2ad0dcb2609079e2582413c0091d7b2159689add101121039dc83e730573c75e108bb9d70633a020a9db1c0de4bbe7c541bf1895a68d2 SHA512 7139e646e3b903d6636ac931e12e59b9b09f22e88c456465ba6288a4091bf957f1c46fd2126d6cbc079b342c9021685e82a8bc6054b8b7683e6f743065a0c1ba
+EBUILD abcmidi-2021.06.27.ebuild 678 BLAKE2B d93bc531703f192645a2ad0dcb2609079e2582413c0091d7b2159689add101121039dc83e730573c75e108bb9d70633a020a9db1c0de4bbe7c541bf1895a68d2 SHA512 7139e646e3b903d6636ac931e12e59b9b09f22e88c456465ba6288a4091bf957f1c46fd2126d6cbc079b342c9021685e82a8bc6054b8b7683e6f743065a0c1ba
 MISC metadata.xml 326 BLAKE2B eff21376d5e8fdf74ead04fc307726b50c8d86faaaebdbb8aa748c9fc0025ed9ccbdbf90f6bbafb515d576cd837f72f44991b329eb56f003cfbe3b0ee9cac7d5 SHA512 aad9a108325a4a1a827ba64b96ef8410017ea1f3c8db6b51660f987df26b42ce4a6f034c6df3be5c58d44fc40e80b7f4dd3900fb4ba45c448764265273741a7a
diff --git a/media-sound/abcmidi/abcmidi-2021.06.27.ebuild b/media-sound/abcmidi/abcmidi-2021.06.27.ebuild
new file mode 100644
index 000000000000..10c98f2d31f4
--- /dev/null
+++ b/media-sound/abcmidi/abcmidi-2021.06.27.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+MY_P="abcMIDI-${PV}"
+DESCRIPTION="Programs for processing ABC music notation files"
+HOMEPAGE="https://ifdo.ca/~seymour/runabc/top.html"
+SRC_URI="https://ifdo.ca/~seymour/runabc/${MY_P}.zip"
+S="${WORKDIR}"/${PN}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+BDEPEND="app-arch/unzip"
+
+src_prepare() {
+	default
+	sed -i "s:-O2::" configure.ac || die
+	sed -i "s:@datarootdir@/doc/abcmidi:@docdir@:" Makefile.in || die
+	eautoreconf
+}
+
+src_install() {
+	default
+
+	if use examples ; then
+		docinto examples
+		dodoc samples/*.abc
+	fi
+}
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 172dfbd817c9..ff6ae93c7a2d 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -2,6 +2,6 @@ DIST Ardour-6.6.0.tar.bz2 12046173 BLAKE2B d3a61ebe97fc26d89eee3f7a43c1ac47f5fda
 DIST Ardour-6.7.0.tar.bz2 12135868 BLAKE2B 3b217340187e16d3da9302e3505c499c3bba8da7e3be82ff12e8aa99e1c934d42e71c62ae357d7a1265e668293c933a2192ae2f6d6b97f21a2f7c379caf5e9be SHA512 73cf6fff40c838c42c3b29842e15d2e2b991f1e92d57ef0a8e68ef75b39ec8075906ac3ded322b521f2c5fd9fa9d1b7f9c7770b4cc6deee9efe1796889aeffe2
 DIST ardour-6.6-volatile-atomic-glib-2.68.patch.gz 22322 BLAKE2B cd113f721d0c6c63c85372873cd43782e3a43b8963c4f9222e771039c4b397585582ffd4cb77d4928bcdc656ef533e4a4b40799ff0c32355985c592589766466 SHA512 3fa2ede8b943881b9c77b233892f146e354c4722265f6599417d55fdf69961d65f6d54ed2c74f53f1f835d006ee99e44adcb03ee117ba44a7be3bedbae2c8efc
 EBUILD ardour-6.6-r1.ebuild 4945 BLAKE2B dda6893230c2d51602a747fb457112a7936bf9a2e2a655704e4f63ebc8dfa9733b432350a2ae68aabc4b16332777d35eebc0ac802e2239a1e90c39bfa795b3da SHA512 7e1e73686843a064bfcf6721e833f149b1fed9e31db00e67da6408bb2c9b8839c2bd909c22dccbc89043769deadb843bfbcdf4273857c5f40bc0dde4683a9414
-EBUILD ardour-6.7.ebuild 4795 BLAKE2B 33705f54a881e4d8274296ed6d0521bbf10156c42623f6f4122be5f0f5d95e60ce9cd0a2fb5b96c90a656293c9ff56b773b4f22641817018d3b7901c10ce007d SHA512 eea973718a53f4a40d4fb89ebd16467e601b93ea528a6dcf3f74a79e5e73cc7e3be31987a402f4ac23c2f4fdf6f693ff68c838065beedc544a0e8bfaf761d97f
+EBUILD ardour-6.7.ebuild 4794 BLAKE2B 1099ee8ee97ee53d0f0408c90856091ba21bdee97c6300268259a98af4600639742cb69cfdbd7d0951895e84225f2d41b6243d4ec90e60034289f7245345fb3d SHA512 cb9cc699ff26a81c7d9bbb4e20cdecbd5885c83f9c414545c46a988e65995f733d212bce011f5c6a4e103e5d4502c045f663c128b330f7e83f13e357aac2438d
 EBUILD ardour-9999.ebuild 4795 BLAKE2B 33705f54a881e4d8274296ed6d0521bbf10156c42623f6f4122be5f0f5d95e60ce9cd0a2fb5b96c90a656293c9ff56b773b4f22641817018d3b7901c10ce007d SHA512 eea973718a53f4a40d4fb89ebd16467e601b93ea528a6dcf3f74a79e5e73cc7e3be31987a402f4ac23c2f4fdf6f693ff68c838065beedc544a0e8bfaf761d97f
 MISC metadata.xml 450 BLAKE2B 1b17e6d54f2b963b5fe406bb724735dee2c71b982e35acc8e22f6f9737a3519b42d6c9fa20af80359468a57c1596df2b83f525078603d3416a8b66b15df1db75 SHA512 480478c33714996c12180962aa503ca1fbb6d44195abc83203e8be60be5477a9815e9a5ebac7e475f83a731629213d517565b217087c39c4e4f03d02cdb5e68e
diff --git a/media-sound/ardour/ardour-6.7.ebuild b/media-sound/ardour/ardour-6.7.ebuild
index c275eb05302b..9480507f8e06 100644
--- a/media-sound/ardour/ardour-6.7.ebuild
+++ b/media-sound/ardour/ardour-6.7.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="~amd64 x86"
 	SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
 	S="${WORKDIR}/Ardour-${PV}.0"
 fi
diff --git a/media-sound/chuck/Manifest b/media-sound/chuck/Manifest
index 3f367d61b188..93ba3630530a 100644
--- a/media-sound/chuck/Manifest
+++ b/media-sound/chuck/Manifest
@@ -1,5 +1,7 @@
 AUX chuck-1.4.0.0-hid-smc.patch 2937 BLAKE2B 5bc65ffc74409860218983635501c319f4a69448e93340671ad252cd4bb5edd3d4765aa196b3618d7af37897aff40267e7d8538672560dc4de9650a12a5964b6 SHA512 09b04441e9bbd11a15e798878b79010598dd97513a64f6df21e5ed066147382d6021a496e1d1a33b2268d04caa972a1a94afe48c44a226439e3334da35f47be0
 AUX chuck-1.4.0.0-makefile.patch 941 BLAKE2B 64ef7342c0c07ca573efb7e7142854a4d366494983b400af484d9c0354cc662d1090bf6396e4955634ab2e1c9864a5011a8dcc6fe1213c02d4491cd9b57fb729 SHA512 3bb7cb3fa04863c2a4debf5eade64233d3d3ce38272f2d73d14d1772895c5f88ec415b1c22aa3b077204d4569a24ad25c6ca757e2c6a4df31e9fe48eea9c9fdc
 DIST chuck-1.4.0.1.tgz 14689073 BLAKE2B 408e2512f07a33fc86db80b05005ea65351257036f663153845038a0edeef95054dac9878d37eb22cc122035a6d1f80d008e151811277d4ee9d24ba3d79ad26b SHA512 92da0569349c900e633e8e3e544a0e5ec7df7b41a8508d2a99c825dfe490f00208b50b883298ce091b46f4e9274dabe0ec8bcfd80d094dd006b3c342f74bd202
+DIST chuck-1.4.1.0.tgz 14902696 BLAKE2B df324c793236fccc26f6604d1120dc1777cb2ffd8c95a8eff42e8963b9e7011aa88fb094145b4845821c39be781d77ac163cb02025db4fd6db7972f3c390fe65 SHA512 8967c1279959b6a41759519eace468fa4384cd0511c365cef91f8c03e8d720407637c2f9f33df6abd246b7c2155005e82d206113c90a4f23fb22b02f6f426704
 EBUILD chuck-1.4.0.1-r1.ebuild 1831 BLAKE2B 913b35f2727d5f5f728bd35ad2ca414df4c364b6f3963dc67e2170433aaa3160c31c71d42da6b138a743c537fbb53f95394b14e4ed9a4dff1d69d7054dde88e4 SHA512 fec380d7c388988e382884b713ea32f6c007885cd7c1203a06ca64490e7d0ea8482e9b609387e7719ac4b8dcc1ffc6b7e07f9d53426aaa3379a3f493b570c364
+EBUILD chuck-1.4.1.0.ebuild 1833 BLAKE2B 5b1b7a9194fb5ec0d56efb3152fa46c07487aaf8bda33a2b945ebb0e5d0da53736f778d5d4abebf74e3a2b49964a1935685c0ee92b42b1f17a745941543d3b77 SHA512 210e5d6f72c8d9c3ff2b729df89676bdfb120849b2ca4e09c037d3d84620e8df44db706d8f564f55eca8ac445cb518c4f7b3cf6ec6aa49f8dc9a8370b1b6204b
 MISC metadata.xml 967 BLAKE2B 505781d22a20892538d6bcdda07f1a1ecaecb56c8574cc6745d4fddfa2b4d3ab643947c1403827bc306eb0082434327beccd0eb583287eea9a488bf6adc4ad21 SHA512 9d4c5d826ec6f90bf81a84e389f2ecca527b5116693fc5c32ccb456f5cb29f7daa42f4d655d57d4ed11a0c7625ec65904777e765a64217a4c3b5ad8a9e17b6e0
diff --git a/media-sound/chuck/chuck-1.4.1.0.ebuild b/media-sound/chuck/chuck-1.4.1.0.ebuild
new file mode 100644
index 000000000000..fe70a1b1ed7b
--- /dev/null
+++ b/media-sound/chuck/chuck-1.4.1.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Strongly-timed, concurrent, and on-the-fly audio programming language"
+HOMEPAGE="http://chuck.cs.princeton.edu/"
+SRC_URI="http://chuck.cs.princeton.edu/release/files/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+alsa jack examples"
+REQUIRED_USE="|| ( alsa jack )"
+
+RDEPEND="app-eselect/eselect-chuck
+	media-libs/libsndfile
+	alsa? ( media-libs/alsa-lib )
+	jack? ( virtual/jack )"
+DEPEND="${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0.0-hid-smc.patch
+	"${FILESDIR}"/${PN}-1.4.0.0-makefile.patch
+)
+
+compile_backend() {
+	backend=$1
+	pushd "${S}/src" &>/dev/null || die
+	einfo "Compiling against ${backend}"
+	emake CC=$(tc-getCC) CXX=$(tc-getCXX) linux-${backend}
+	mv chuck{,-${backend}} || die
+	emake clean
+	popd &>/dev/null || die
+}
+
+src_compile() {
+	# when compile with athlon or athlon-xp flags
+	# chuck crashes on removing a shred with a double free or corruption
+	# it happens in Chuck_VM_Stack::shutdown() on the line
+	#   SAFE_DELETE_ARRAY( stack );
+	replace-cpu-flags athlon athlon-xp i686
+
+	use jack && compile_backend jack
+	use alsa && compile_backend alsa
+}
+
+src_install() {
+	use jack && dobin src/chuck-jack
+	use alsa && dobin src/chuck-alsa
+
+	dodoc AUTHORS DEVELOPER PROGRAMMER QUICKSTART README THANKS TODO VERSIONS
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "Chuck now can use multiple audio engines, so you can specify"
+		elog "the preferred audio engine with chuck-{jack,alsa}"
+		elog "Or you can use 'eselect chuck' to set the audio engine"
+	fi
+	eselect chuck update --if-unset
+}
diff --git a/media-sound/gnome-sound-recorder/Manifest b/media-sound/gnome-sound-recorder/Manifest
index 92bda9081df7..2e59cdddb5af 100644
--- a/media-sound/gnome-sound-recorder/Manifest
+++ b/media-sound/gnome-sound-recorder/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-sound-recorder-40.0.tar.xz 199056 BLAKE2B e830b746ccf9e038a6f425dee9a6ef8eb88cd849659570c11364b833b0be8c7e7302c0b20e8c853d7228a589d6e3953fecf2fddb31304a1905678aa99b461248 SHA512 28de1dbb9251c834513be55c3f4107cd014d74e634e383e6feb3b9430ff562e19d29e9abcd566b0fc0ed1ec3841add0f694b47c51fe91a3b4ba33b9f43a0d617
-EBUILD gnome-sound-recorder-40.0.ebuild 1041 BLAKE2B 5ee12aad7c5e782970991de609ef9efa8c2144a7397668d8e0bdbde0cf780b2ea78197589732967ce1e7234d81ddcce65e47278af09af4a7cdf64daf118cb580 SHA512 0807cc982b4a5632757c5b7023e41a0c81bcdb8ec4a5a164af2e8fd9f5271f87a2fce11a1992545c19f59cbdc461db68abdf37105f4d0b8ff7eb97b3b4739ac4
+EBUILD gnome-sound-recorder-40.0.ebuild 1048 BLAKE2B 1ed337d3faf845a00bf860b032bbc10c0ce31d22914d6c39c2064e1d370b7b6cf53ea918090ab42f839f48400c7031d25a2b0026707a5dac78f57261364fb84a SHA512 a8b998f49f1dd357383f3cbbe39494a660bb0777a7add6f893fa39f52e0ef46f7ceb1bc6a472358a31760c17be98a2fb3c7b6f496e638882978b289ec31e52f1
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-sound-recorder/gnome-sound-recorder-40.0.ebuild b/media-sound/gnome-sound-recorder/gnome-sound-recorder-40.0.ebuild
index 7b4b3c46303f..a16fdea8099a 100644
--- a/media-sound/gnome-sound-recorder/gnome-sound-recorder-40.0.ebuild
+++ b/media-sound/gnome-sound-recorder/gnome-sound-recorder-40.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Design/Apps/SoundRecorder"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 DEPEND="
 	>=dev-libs/gjs-1.54.0
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index be09fda0a219..ddf83baf0c66 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,5 +1,5 @@
 DIST lollypop-1.2.35.tar.xz 509916 BLAKE2B 8cf9ea74287b6ac7d4942c2312cc4d6e07d4748d505cc9e45a896129f9e4a43ef5c65c0c18764597d7ce3c4d2fc93804c501f68ea3b67625e200497613077af6 SHA512 179fa5e77482db35de9e30e392e6d07bb5c832d5d1decaee06982570bdcbb809dc99375eeb6fe3dce75829af3570953ce517e3b4eaabceac807b9d5c382bd53e
 DIST lollypop-1.4.18.tar.xz 575120 BLAKE2B 62ff404c0e7c2ac7029ebb45143db35b0b93b30bfc386fb08aa4a2fc10916efb190118f41e40a0f795bef4f8d0b21b0353b9e27bbb75c5471132145028fc8b27 SHA512 17f2db91a56fd140c66c251732eca4b2a6cc1849b5dc72f0a4014c766c64eee475bc9d2305d307e2a54184ab5dd812a5fb27b39acf60a1c468770d1d34307982
 EBUILD lollypop-1.2.35.ebuild 1524 BLAKE2B 360da0031d44177ecf8e0965653d6238080a2360557ff732e60135a599f4f1e25fd647b2ebe60d618af1fd774a0cd82169d400dc1f9a9f5a28613a4b96b909f3 SHA512 d04d122dc72180395082b41c29617167d95735a7461d361f64b304b3f676ad5f1a3c37a290ef43fd840a440dda7dffdbdda4fb8fdc74fd5d929d1b72653dba1a
-EBUILD lollypop-1.4.18.ebuild 1542 BLAKE2B 87cd7eab1b8b9f7e4a85d3e6aa05e4ff330eed6621795789dc45f15dd217d18250c57bd4b149d8fa54c6b012d2cfaac8d766fedb4719aa3bc25ffb9a82142ac2 SHA512 fe03fd5397a2297576f03755c9fcc0f4268d801d9227aae677d1671749f15fa3aec27fa419a8acece354a678118e57ab0a5bcba2552666356f89759c347a7212
+EBUILD lollypop-1.4.18.ebuild 1549 BLAKE2B 45fcf42b8f20f04da12381a310a41c376a9214b869bb279fb04702519b76d0d7592e20fa7379624830abf7509a564d4ca50377e9c71c05fefcc23ee1c54218b7 SHA512 6802e58a2799c975d4c5b91992397104e59dbcf0dd1bd7697f484e16faba5ab43df63ebfb8db8abe707d527f339c06aadb280a2c7611e722778a6dd9eeee6745
 MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/media-sound/lollypop/lollypop-1.4.18.ebuild b/media-sound/lollypop/lollypop-1.4.18.ebuild
index affb509a01eb..f643b34105a8 100644
--- a/media-sound/lollypop/lollypop-1.4.18.ebuild
+++ b/media-sound/lollypop/lollypop-1.4.18.ebuild
@@ -10,7 +10,7 @@ inherit python-single-r1 gnome2-utils meson xdg
 DESCRIPTION="Modern music player for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/Lollypop"
 SRC_URI="https://adishatz.org/${PN}/${P}.tar.xz"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index fcfc4c49c445..d178cc068099 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -7,10 +7,12 @@ DIST mpd-0.22.4.tar.xz 729264 BLAKE2B d8060a205f94fa369ad8aee7a3e12f1389e7587aac
 DIST mpd-0.22.5.tar.xz 730308 BLAKE2B 2c7375af25c1b5d6dd8cf79f71e67842f75dcdb38b1ca90c8dda2661a5bd6d110ad0ebbefc53e0a38cfa6434ee4d2ad99688982588ee6d8d6895b24e15e3f927 SHA512 589516b7ee5820cbeee99042017b411a46857d39547302bce0bedb9c265da2c8465224a6817a1b7e65105f344398bee5fb2a3674064e42507157cdac01416295
 DIST mpd-0.22.6.tar.xz 730524 BLAKE2B 675b876415a343ba387e26ad800b2e562b40a5e3aaacdff31e0ec9d6ad09f0117406f82e519a08ba3187020b482dcd0434267f9e84dd13e9e1bf8565d1967c2c SHA512 5e417204e24d11fa609740ae92bc1d796aad2d63537655f655074d829cd79cadaf1ca025171dcf5486c1e557cc946152c21e299286b1cb74cc342da2b1f41343
 DIST mpd-0.22.8.tar.xz 737368 BLAKE2B 96866fdbcf124534d99db1bde89039d515c64afd7c65d341e6772be796feebf2fa20714f90856f82036dc322087ec2f85d8a4d85efad523a5f275f3d89d64920 SHA512 54b381e6d4e6113cd170ca7afbb671bef4ababb4de80a80504fe951f53aaf66269c123b7923112ab40291e069fa27457936227204cc84b42cf44aac1721c0d0d
+DIST mpd-0.22.9.tar.xz 738432 BLAKE2B c0c3a87ea83941e7ab85b4338db40daeff0c7fe665d4e0b27eebdf7cb06302d2b7a7573724d06d06d45a62583304f095ec4f67a21467748de665067e10a2514c SHA512 744e20e9a2b5df0f0c01b33809aa87cb159385b69868df5418302b091e6c5265dd70de13f383efcd71f76ae059c73969667212e55ee96e13d89ca0da5c2d4ae2
 EBUILD mpd-0.21.26.ebuild 8065 BLAKE2B bd01f82bd58a5026a179ed246a5b280b48c1f55fdbe80f41481f36a1e25827cbecd1a9904de791bd8a81e249b187aa0d94eff31c09e58f01032ea85196ef8338 SHA512 96879862ea3f10d67e420968703a476d02b4fc0c288fa1118170d225ce853303507de4a5265913f6afaa6690cde7b7995a7cf190ad8073df4c34914fd73af44c
 EBUILD mpd-0.22.3.ebuild 8122 BLAKE2B 79a904effc8fb09208f648dee611ba9795f2b25676399e9972aa0b4708c1084368a5c691dbbbe9336b8825439029a7f2b1b090bd0d58263569c104a2080b239a SHA512 23ef558178b9a67bbf39ade963e6cea591ee18157403ff0612c28640a8820d4d328b4dcddd465127658277222d8683a3f0ae8e02dfa8dd1ca32904abb5e83584
 EBUILD mpd-0.22.4-r1.ebuild 8514 BLAKE2B 6b3c92ba40b90459a9bab52a8ea7adf3878823a3e19dcaa32f925a68e4bb47473e1f5474c0299bf9e9065362061c99f6a63a48d4111d7e8efb02c0f6415e2ec8 SHA512 a618f86daae62d7e93eae96115a8593e9fd2a310c9a5167f1098d5f470136ca665dacd1aca18f98b068b21f4fca89d4b4f5d5dacd578d75bacb70fb52fd43c97
 EBUILD mpd-0.22.5.ebuild 8514 BLAKE2B 6b3c92ba40b90459a9bab52a8ea7adf3878823a3e19dcaa32f925a68e4bb47473e1f5474c0299bf9e9065362061c99f6a63a48d4111d7e8efb02c0f6415e2ec8 SHA512 a618f86daae62d7e93eae96115a8593e9fd2a310c9a5167f1098d5f470136ca665dacd1aca18f98b068b21f4fca89d4b4f5d5dacd578d75bacb70fb52fd43c97
 EBUILD mpd-0.22.6.ebuild 8514 BLAKE2B 6b3c92ba40b90459a9bab52a8ea7adf3878823a3e19dcaa32f925a68e4bb47473e1f5474c0299bf9e9065362061c99f6a63a48d4111d7e8efb02c0f6415e2ec8 SHA512 a618f86daae62d7e93eae96115a8593e9fd2a310c9a5167f1098d5f470136ca665dacd1aca18f98b068b21f4fca89d4b4f5d5dacd578d75bacb70fb52fd43c97
 EBUILD mpd-0.22.8.ebuild 8514 BLAKE2B 2724c46d1ee527aea93d3767cd89cb72ec416cf3e733e5a085cf023a265002f3bffe4e3faffd63151b8be0c259a8d065472f9e023b01327836f4a72fe3c3841c SHA512 52a61a59ec75fb83e6c04bbe59dd2e7d3f0a420d5f6a5f1b76016ecb2acaa40be2c4c2785621c3b2811c99e12e8392e8886395955a64ff8ab2b900e38bd1fec9
+EBUILD mpd-0.22.9.ebuild 8514 BLAKE2B 2724c46d1ee527aea93d3767cd89cb72ec416cf3e733e5a085cf023a265002f3bffe4e3faffd63151b8be0c259a8d065472f9e023b01327836f4a72fe3c3841c SHA512 52a61a59ec75fb83e6c04bbe59dd2e7d3f0a420d5f6a5f1b76016ecb2acaa40be2c4c2785621c3b2811c99e12e8392e8886395955a64ff8ab2b900e38bd1fec9
 MISC metadata.xml 2563 BLAKE2B a974514d9226d8ddb4ac85adaaccb4beb5104fc28d68248ac4afe87ab5358e2e7a4214444444419c20c22533ffeb1649308f805958273bce8f603f6f47551884 SHA512 642ecc4d91cfd82db6e4afa9e35f1dd01dd7c4be23576303cc29e266e629463b73491c61d0c0ff5b7dba753ea6c60ec89ccf1f5a895968e9127852b445151a39
diff --git a/media-sound/mpd/mpd-0.22.9.ebuild b/media-sound/mpd/mpd-0.22.9.ebuild
new file mode 100644
index 000000000000..cb6f9fbd098d
--- /dev/null
+++ b/media-sound/mpd/mpd-0.22.9.ebuild
@@ -0,0 +1,299 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic linux-info meson systemd xdg-utils
+
+DESCRIPTION="The Music Player Daemon (mpd)"
+HOMEPAGE="https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD"
+SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
+	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
+	+ipv6 jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
+	modplug mpg123 musepack +network nfs openal opus oss pipe pulseaudio qobuz
+	recorder samba selinux sid signalfd sndfile sndio soundcloud sqlite systemd
+	test tidal twolame udisks vorbis wavpack webdav wildmidi upnp
+	zeroconf zip zlib"
+
+OUTPUT_PLUGINS="alsa ao fifo jack network openal oss pipe pulseaudio sndio recorder"
+DECODER_PLUGINS="audiofile faad ffmpeg flac fluidsynth mad mikmod
+	modplug mpg123 musepack flac sid vorbis wavpack wildmidi"
+ENCODER_PLUGINS="audiofile flac lame twolame vorbis"
+
+REQUIRED_USE="
+	|| ( ${OUTPUT_PLUGINS} )
+	|| ( ${DECODER_PLUGINS} )
+	network? ( || ( ${ENCODER_PLUGINS} ) )
+	recorder? ( || ( ${ENCODER_PLUGINS} ) )
+	upnp? ( expat )
+	webdav? ( curl expat )
+	"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/mpd
+	sys-libs/liburing:=
+	alsa? (
+		media-libs/alsa-lib
+		media-sound/alsa-utils
+	)
+
+	ao? ( media-libs/libao[alsa?,pulseaudio?] )
+	audiofile? ( media-libs/audiofile:= )
+
+	cdio? (
+		dev-libs/libcdio:=
+		dev-libs/libcdio-paranoia
+	)
+
+	chromaprint? ( media-libs/chromaprint )
+	curl? ( net-misc/curl )
+	dbus? ( sys-apps/dbus )
+	doc? ( dev-python/sphinx )
+	expat? ( dev-libs/expat )
+	faad? ( media-libs/faad2 )
+	ffmpeg? ( media-video/ffmpeg:0= )
+	flac? ( media-libs/flac )
+	fluidsynth? ( media-sound/fluidsynth )
+	gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 )
+	icu? (  dev-libs/icu:= )
+	id3tag? ( media-libs/libid3tag )
+	jack? ( virtual/jack )
+	lame? ( network? ( media-sound/lame ) )
+	libmpdclient? ( media-libs/libmpdclient )
+	libsamplerate? ( media-libs/libsamplerate )
+	libsoxr? ( media-libs/soxr )
+	mad? ( media-libs/libmad )
+	mikmod? ( media-libs/libmikmod )
+	mms? ( media-libs/libmms )
+	modplug? ( media-libs/libmodplug )
+	mpg123? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	network? ( media-libs/libshout )
+	nfs? ( net-fs/libnfs )
+	openal? ( media-libs/openal )
+	opus? ( media-libs/opus )
+	pulseaudio? ( media-sound/pulseaudio )
+	qobuz? ( dev-libs/libgcrypt:0 )
+	samba? ( net-fs/samba )
+	selinux? ( sec-policy/selinux-mpd )
+	sid? ( || (
+		media-libs/libsidplay:2
+		media-libs/libsidplayfp
+	) )
+	sndfile? ( media-libs/libsndfile )
+	sndio? ( media-sound/sndio )
+	soundcloud? ( >=dev-libs/yajl-2:= )
+	sqlite? ( dev-db/sqlite:3 )
+	systemd? ( sys-apps/systemd )
+	tidal? ( dev-libs/yajl
+		net-misc/curl )
+	twolame? ( media-sound/twolame )
+	udisks? ( sys-fs/udisks:2 )
+	upnp? ( net-libs/libupnp:0 )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	wildmidi? ( media-sound/wildmidi )
+	zeroconf? ( net-dns/avahi[dbus] )
+	zip? ( dev-libs/zziplib )
+	zlib? ( sys-libs/zlib:= )"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.58:=
+	test? ( dev-cpp/gtest )"
+
+BDEPEND=">=dev-util/meson-0.49.2
+	virtual/pkgconfig"
+
+pkg_setup() {
+	if use eventfd; then
+		CONFIG_CHECK+=" ~EVENTFD"
+		ERROR_EVENTFD="${P} requires eventfd in-kernel support."
+	fi
+
+	if use signalfd; then
+		CONFIG_CHECK+=" ~SIGNALFD"
+		ERROR_SIGNALFD="${P} requires signalfd in-kernel support."
+	fi
+
+	if use inotify; then
+		CONFIG_CHECK+=" ~INOTIFY_USER"
+		ERROR_INOTIFY_USER="${P} requires inotify in-kernel support."
+	fi
+
+	if use eventfd || use signalfd || use inotify; then
+		linux-info_pkg_setup
+	fi
+
+	elog "If you will be starting mpd via /etc/init.d/mpd, please make
+	sure that MPD's pid_file is _set_."
+}
+
+src_prepare() {
+	sed -i \
+		-e 's:^#filesystem_charset.*$:filesystem_charset "UTF-8":' \
+		-e 's:^#user.*$:user "mpd":' \
+		-e 's:^#bind_to_address.*any.*$:bind_to_address "localhost":' \
+		-e 's:^#bind_to_address.*$:bind_to_address "/var/lib/mpd/socket":' \
+		-e 's:^#music_directory.*$:music_directory "/var/lib/mpd/music":' \
+		-e 's:^#playlist_directory.*$:playlist_directory "/var/lib/mpd/playlists":' \
+		-e 's:^#db_file.*$:db_file "/var/lib/mpd/database":' \
+		-e 's:^#log_file.*$:log_file "/var/lib/mpd/log":' \
+		-e 's:^#pid_file.*$:pid_file "/var/lib/mpd/pid":' \
+		-e 's:^#state_file.*$:state_file "/var/lib/mpd/state":' \
+		doc/mpdconf.example || die
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dbzip2=$(usex bzip2 enabled disabled)
+		-Dcdio_paranoia=$(usex cdio enabled disabled)
+		-Dchromaprint=$(usex chromaprint enabled disabled)
+		-Dcue=$(usex cue true false)
+		-Dcurl=$(usex curl enabled disabled)
+		-Ddbus=$(usex dbus enabled disabled)
+		-Deventfd=$(usex eventfd true false)
+		-Dexpat=$(usex expat enabled disabled)
+		-Dicu=$(usex icu enabled disabled)
+		-Did3tag=$(usex id3tag enabled disabled)
+		-Dinotify=$(usex inotify true false)
+		-Dipv6=$(usex ipv6 enabled disabled)
+		-Diso9660=$(usex cdio enabled disabled)
+		-Dlibmpdclient=$(usex libmpdclient enabled disabled)
+		-Dlibsamplerate=$(usex libsamplerate enabled disabled)
+		-Dmms=$(usex mms enabled disabled)
+		-Dnfs=$(usex nfs enabled disabled)
+		-Dsignalfd=$(usex signalfd true false)
+		-Dsmbclient=$(usex samba enabled disabled)
+		-Dsoxr=$(usex libsoxr enabled disabled)
+		-Dsqlite=$(usex sqlite enabled disabled)
+		-Dsystemd=$(usex systemd enabled disabled)
+		-Dtest=$(usex test true false)
+		-Dudisks=$(usex udisks enabled disabled)
+		-Dupnp=$(usex upnp enabled disabled)
+		-Dwebdav=$(usex webdav enabled disabled)
+		-Dzeroconf=$(usex zeroconf avahi disabled)
+		-Dzlib=$(usex zlib enabled disabled)
+		-Dzzip=$(usex zip enabled disabled)
+		)
+
+	emesonargs+=(
+		-Dalsa=$(usex alsa enabled disabled)
+		-Dao=$(usex ao enabled disabled)
+		-Dfifo=$(usex fifo true false)
+		-Djack=$(usex jack enabled disabled)
+		-Dopenal=$(usex openal enabled disabled)
+		-Doss=$(usex oss enabled disabled)
+		-Dpipe=$(usex pipe true false)
+		-Dpulse=$(usex pulseaudio enabled disabled)
+		-Drecorder=$(usex recorder true false)
+		-Dsndio=$(usex sndio enabled disabled)
+	)
+
+	if use samba || use upnp; then
+		emesonargs+=( -Dneighbor=true )
+	fi
+
+	append-lfs-flags
+	append-ldflags "-L/usr/$(get_libdir)/sidplay/builders"
+
+	if use network; then
+
+	emesonargs+=(
+		-Dshine=disabled
+		-Dshout=enabled
+		-Dvorbisenc=$(usex vorbis enabled disabled)
+		-Dhttpd=true
+		-Dlame=$(usex lame enabled disabled)
+		-Dtwolame=$(usex twolame enabled disabled)
+		-Dwave_encoder=$(usex audiofile true false)
+	)
+	fi
+
+	emesonargs+=(
+		# media-libs/adplug is not packaged anymore
+		-Dadplug=disabled
+		-Daudiofile=$(usex audiofile enabled disabled)
+		-Dfaad=$(usex faad enabled disabled)
+		-Dffmpeg=$(usex ffmpeg enabled disabled)
+		-Dflac=$(usex flac enabled disabled)
+		-Dfluidsynth=$(usex fluidsynth enabled disabled)
+		-Dgme=$(usex gme enabled disabled)
+		-Dmad=$(usex mad enabled disabled)
+		-Dmikmod=$(usex mikmod enabled disabled)
+		-Dmodplug=$(usex modplug enabled disabled)
+		-Dmpcdec=$(usex musepack enabled disabled)
+		-Dmpg123=$(usex mpg123 enabled disabled)
+		-Dopus=$(usex opus enabled disabled)
+		-Dsidplay=$(usex sid enabled disabled)
+		-Dsndfile=$(usex sndfile enabled disabled)
+		-Dvorbis=$(usex vorbis enabled disabled)
+		-Dwavpack=$(usex wavpack enabled disabled)
+		-Dwildmidi=$(usex wildmidi enabled disabled)
+
+	)
+
+	emesonargs+=(
+		-Dqobuz=$(usex qobuz enabled disabled)
+		-Dsoundcloud=$(usex soundcloud enabled disabled)
+		-Dtidal=$(usex tidal enabled disabled)
+	)
+
+	emesonargs+=(
+		--libdir="/usr/$(get_libdir)"
+		-Ddocumentation=$(usex doc enabled disabled)
+		-Dsolaris_output=disabled
+
+		-Ddatabase=true
+		-Ddsd=true
+		-Dio_uring=enabled
+		-Dtcp=true
+
+		-Dsystemd_system_unit_dir="$(systemd_get_systemunitdir)"
+		-Dsystemd_user_unit_dir="$(systemd_get_userunitdir)"
+		)
+
+	if use icu; then
+		emesonargs+=( -Diconv=enabled )
+	else
+		emesonargs+=( -Diconv=disabled )
+	fi
+
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	insinto /etc
+	newins doc/mpdconf.example mpd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-0.21.1.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}-0.21.4.init ${PN}
+
+	keepdir /var/lib/mpd
+	keepdir /var/lib/mpd/music
+	keepdir /var/lib/mpd/playlists
+
+	fowners mpd:audio -R /var/lib/mpd
+
+	rm -r "${ED}"/usr/share/doc/mpd || die
+
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/media-sound/spotify/Manifest b/media-sound/spotify/Manifest
index f5ba5017d908..196d0ed737ba 100644
--- a/media-sound/spotify/Manifest
+++ b/media-sound/spotify/Manifest
@@ -6,5 +6,5 @@ EBUILD spotify-1.0.72-r1.ebuild 3217 BLAKE2B 83f0aac50e11c914b2e63f0dbfb6245019c
 EBUILD spotify-1.1.26-r1.ebuild 3133 BLAKE2B 0cb705233a3c73afb3199e47d96a97e53eacf2c6cb190c421a3412d6783f6c966de1089b147cb086a3e0228862d392ded5ac4ec1117eda21c4bf1a84617bc91d SHA512 8f0ed03641ffa16d447925f24e9f53c01507cea74b860d3c8f5dff2b3df1895cdbd47c2484fb8c316b9e3fe2723d00cafe1934d57eff17f217d28a6bc06aca53
 EBUILD spotify-1.1.26-r2.ebuild 3389 BLAKE2B a54b9a095c1e17dd5f20f1c3c4c44a687551c06553724d795527c1399cc4a4456676a856d27da6dcb01fef36fbf611f3bf1cd4c794c032322dac6b368b367262 SHA512 5fc0016a01a26641c56155ca516fb4f42b6c9a2d88143c335da7f8bea28d8ab36abd11c411867ec9e7bcca794a4d360e18b92a929d4d0aa57435008a4c7369b5
 EBUILD spotify-1.1.55.ebuild 3452 BLAKE2B deb0bcd9286a1f9c1021f4d3d8277568da170cd7a48250f21a48354158125d9a187038b4366260d4765d3730957cb185dc62060a615dce7ba11bc530a4cc06fc SHA512 8a7b3d41dc2f3be099aa9ba3fab6b84dee0a95f06776995ae11c7ca52f058eba83d7afa769dcab70ce8490f57f25bcc957d6e28075d87e3069f15275800736d3
-EBUILD spotify-1.1.56.ebuild 3452 BLAKE2B ca08758cc97998d21f347aa33486bc53a0aca375165bfe6f46ec090ba0b38657100e508900163ce1b06e7213e2037add979e0a7d9f869d226f43ff93306441eb SHA512 8e0edbc9c88db5946ef6687ba26faed2938f1dc7801c6cedaba1d14de3f6f105ae509643c51413438769a3212584202e44711ee789b69aaa760c3a07270bc83b
+EBUILD spotify-1.1.56.ebuild 3475 BLAKE2B ee53be64dac9d6fb2ecc65ebb8e27a2b67cc1eb21048899ceb83d813a63099ab8d8846ce20de8207a6dc55df7bf8c2adfb79e40e132b745412e048f551fd965b SHA512 b10f6790dd0fa49812bb31ea58df3255ea9c9bbbca7a21bbbaf5ff24978aa831fae84561e6ccd486e11396df6d9e22cd0b60ac6a4339f8c9286860487080e4e2
 MISC metadata.xml 632 BLAKE2B 4c68e175f8bfe81df9c89a76d97ea02c71cdb7a7fe1737d95ae20a49840f734372953fbcfaa8af5ecd918ee1444fabacff223487707e9d0e76993d94f6878b8d SHA512 2947ed146739cec0abed1142356d5fc2d8d32251fe117cb7f999b1e83e65223b93700106913db90a41718ca7a88f3a42661af3617ae1bde2e695907e746638ae
diff --git a/media-sound/spotify/spotify-1.1.56.ebuild b/media-sound/spotify/spotify-1.1.56.ebuild
index 7a6cfcac18ae..52c323401ad5 100644
--- a/media-sound/spotify/spotify-1.1.56.ebuild
+++ b/media-sound/spotify/spotify-1.1.56.ebuild
@@ -34,6 +34,7 @@ RDEPEND="
 	systray? ( gnome-extra/gnome-integration-spotify )
 	x11-libs/gtk+:2
 	app-accessibility/at-spi2-atk
+	x11-libs/libxkbcommon
 	x11-libs/libXScrnSaver
 	x11-libs/libXtst
 	x11-libs/libSM