gentoo resync : 28.07.2021

16 files changed, 15 insertions, 431 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 1f87c7f18ef5..9b710e7f1689 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/darkice/Manifest b/media-sound/darkice/Manifest
index 9a44d85315f4..0f84888bb8e6 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 1325 BLAKE2B 42128b9b5a5587593f9234ea484b692c02b15f4e94c3405dcc5ec70564dfb9ef65f34c0d33f69ae4b38f2d2488dc5d0d2c62bf042f7f0cf4c269b40f502d0b1d SHA512 9179a504719e084cc5c60a66da6e7aaa649f5eab006cb2fcebe4b26a826cea0b0be92fcc73dbe39b10b3c31e8790812b66ef603f1f5eedc98926a052ef078ba7
-MISC metadata.xml 524 BLAKE2B 5e4e0267ec28209454127341db06aa8674c70459f598f9b94303bdc3430c16132cd3114ad6c8da58b62e09ad7b783d54aea181f9f66a4221b80e906b66c785ed SHA512 e32cf454853266966d8ebc6a21451598c40cff3d79b2e2d28e1579acadf277f2efe81375c31ddba1a6d4827c5e1263c23d229c3489d70cd613e46a78f63942b6
+EBUILD darkice-1.4.ebuild 1391 BLAKE2B baeade15987f8b7c59babe2c745cacfb2c103e55ce2e6672d9afc2ff3ce0d61a7fa209d90d2bf9ca6ea8b3e6aa1c6e41048cd1f5bf3fe2d1ac2cb7b8a43e3967 SHA512 5b5192f67d4d183359d0f0c3ab9f48ed1a4dd3b0eae02f4d9e4300ad40c05e06ab9c69c4dd9d0c7ee979d1fef376691a710e86f3b339ed478bad08edac59928d
+MISC metadata.xml 591 BLAKE2B c0536e1461e0f33c4756796ad0a976b7678437c9a1545defeb8afaa31966d7b1d184396eb970d6e0c320ec1b2f3c1832a23c4eb0d4c022e9454d65b1fb47a6a2 SHA512 1fa7941532722003ba3ec47be37cb44792cd4d2f2719e015e09364efe755136e04474ea9f4b3415b7edf2a964f6a0f23133055f9b9bcd1c2adc0b96da18a1c9a
diff --git a/media-sound/darkice/darkice-1.4.ebuild b/media-sound/darkice/darkice-1.4.ebuild
index b471a55018dc..d5296f02e46e 100644
--- a/media-sound/darkice/darkice-1.4.ebuild
+++ b/media-sound/darkice/darkice-1.4.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit flag-o-matic
+
 DESCRIPTION="A live audio streamer"
 HOMEPAGE="http://www.darkice.org/"
 SRC_URI="https://github.com/rafael2k/${PN}/releases/download/v${PV}/${P}.tar.gz"
@@ -34,6 +36,9 @@ PATCHES=(
 )
 
 src_configure() {
+	# bug #787161
+	append-cxxflags -std=c++14
+
 	local myeconfargs=(
 		$(use_enable debug)
 		$(use_with aac faac)
diff --git a/media-sound/darkice/metadata.xml b/media-sound/darkice/metadata.xml
index 99a3a083944a..814fdc59179f 100644
--- a/media-sound/darkice/metadata.xml
+++ b/media-sound/darkice/metadata.xml
@@ -6,10 +6,11 @@
 		<name>Gentoo Sound project</name>
 	</maintainer>
 	<use>
-		<flag name="aacplus">AAC+ encoding via media-libs/libaacplus</flag>
+		<flag name="aacplus">AAC+ encoding via <pkg>media-libs/libaacplus</pkg></flag>
 		<flag name="twolame">Build with twolame support</flag>
 	</use>
 	<upstream>
+		<remote-id type="github">rafael2k/darkice</remote-id>
 		<remote-id type="google-code">darkice</remote-id>
 		<remote-id type="sourceforge">darkice</remote-id>
 	</upstream>
diff --git a/media-sound/gnome-music/Manifest b/media-sound/gnome-music/Manifest
index 04085932e3f4..e077bd42e5fb 100644
--- a/media-sound/gnome-music/Manifest
+++ b/media-sound/gnome-music/Manifest
@@ -1,5 +1,3 @@
-DIST gnome-music-40.0.tar.xz 977412 BLAKE2B acb1823fce3bb7fc8a319a22125deb2c36f4c5cb18f3ea3d21462c1fc71fb52deeb21ffb52ecd5f57aecc975e21dbcec82122f3d4c6fa10f088280efe314a4b7 SHA512 7b1cecd4afe22439e1ee4975c9f6a98690d7abc3a02914483284c258c9bc265d5b3c75cbc9e216603aaeacdc4fdeeff250f2c4e8eff01b84cfe313004266d93f
 DIST gnome-music-40.1.1.tar.xz 978092 BLAKE2B cf9e41e1d519431c33edbd03eb72565612d127d7f6fd82ca34d46b1b3ed58073b7435d3b5b80b149a5fc47ea549018756914dbef5e512cb036303b64b4882083 SHA512 3095dfd31dc32f831e776055d5c1f8c32af5958be632050f709f5c3991b272769edac09a339638de2accf6aae4bf6e8dd1f377a0136897eade2c21d2ebce5f5e
-EBUILD gnome-music-40.0.ebuild 1917 BLAKE2B 79a231cea6c2402fec980c995cb8ba06b9c69cac14ac7cb65ee543407225e8eef3d5b1f15249afdcdca82220ef2ec147ca174225235b811ea0fef1b65b8d6e1a SHA512 1c28e3bed07c342b552fe12af83ed1cd96545679a3a1bb039ae3488aaefa958016fddd97dbbcdc1ff9cb9e2492e8ee9c17e0f4d6e118104b3b0f922e69bb9d1c
 EBUILD gnome-music-40.1.1.ebuild 1917 BLAKE2B 79a231cea6c2402fec980c995cb8ba06b9c69cac14ac7cb65ee543407225e8eef3d5b1f15249afdcdca82220ef2ec147ca174225235b811ea0fef1b65b8d6e1a SHA512 1c28e3bed07c342b552fe12af83ed1cd96545679a3a1bb039ae3488aaefa958016fddd97dbbcdc1ff9cb9e2492e8ee9c17e0f4d6e118104b3b0f922e69bb9d1c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/media-sound/gnome-music/gnome-music-40.0.ebuild b/media-sound/gnome-music/gnome-music-40.0.ebuild
deleted file mode 100644
index 9a1f62b03fb6..000000000000
--- a/media-sound/gnome-music/gnome-music-40.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit gnome.org gnome2-utils meson python-single-r1 xdg
-
-DESCRIPTION="Music management for Gnome"
-HOMEPAGE="https://wiki.gnome.org/Apps/Music"
-
-LICENSE="GPL-2+"
-SLOT="0"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-
-DEPEND="${PYTHON_DEPS}
-	>=dev-libs/glib-2.50:2
-	>=net-libs/gnome-online-accounts-3.35.90[introspection]
-	>=dev-libs/gobject-introspection-1.54:=
-	>=x11-libs/gtk+-3.24.7:3[introspection]
-	>=dev-libs/libdazzle-3.28.0[introspection]
-	>=media-libs/libmediaart-1.9.1:2.0[introspection]
-	net-libs/libsoup:2.4[introspection]
-	app-misc/tracker:3=[introspection(+)]
-	>=x11-libs/pango-1.44:=
-	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.36.1:3[cairo,${PYTHON_USEDEP}]
-		>=dev-python/pycairo-1.14.0[${PYTHON_USEDEP}]
-	')
-	>=media-libs/grilo-0.3.13:0.3[introspection]
-	>=media-plugins/grilo-plugins-0.3.13:0.3
-"
-# xdg-user-dirs-update needs to be there to create needed dirs
-# https://bugzilla.gnome.org/show_bug.cgi?id=731613
-RDEPEND="${DEPEND}
-	|| (
-		app-misc/tracker-miners:3[gstreamer]
-		app-misc/tracker-miners:3[ffmpeg]
-	)
-	x11-libs/libnotify[introspection]
-	media-libs/gstreamer:1.0[introspection]
-	media-libs/gst-plugins-base:1.0[introspection]
-	media-plugins/gst-plugins-meta:1.0
-	media-plugins/grilo-plugins:0.3[tracker]
-	x11-misc/xdg-user-dirs
-"
-BDEPEND="
-	dev-libs/libxml2:2
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	python_setup
-}
-
-src_prepare() {
-	sed -e '/sys.path.insert/d' -i "${S}"/gnome-music.in || die "python fixup sed failed"
-	xdg_src_prepare
-}
-
-src_install() {
-	meson_src_install
-	python_fix_shebang "${D}"/usr/bin/gnome-music
-	python_optimize
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/media-sound/lilypond/Manifest b/media-sound/lilypond/Manifest
index 4d71e7164db8..cead7b88774f 100644
--- a/media-sound/lilypond/Manifest
+++ b/media-sound/lilypond/Manifest
@@ -9,6 +9,6 @@ DIST lilypond-2.23.2.tar.gz 17080861 BLAKE2B e27bde3625454dc070e4aeaa8c857c5e62b
 EBUILD lilypond-2.22.0.ebuild 3259 BLAKE2B 34c9bc2171a85cff5b02886e578195d44559302641c04a5b626c92b788134c73fa3f0eb6483ae6228c52580fb0ba3b17bb5be399fcd28a35e24f230f9453e034 SHA512 6441a2cb9dc97a70dd8d258a183116dcd95949fb0b30dcdada1bd2ca21529a87dec441969fe4dade21284ffbf93987e121579f43548c501ef46bf3c6f452ee4f
 EBUILD lilypond-2.22.1.ebuild 3254 BLAKE2B 01ce9c46004b87b209537f0abe90fcfdd0791056247c64f7c1617a9c65b73c2d2083aeeb8f71efe3e53922f619cf488faba5ce918e2491d27f858e3d3dbb0f22 SHA512 e039f1e478ba5838a612924e2532cf6520757887f0381e3961a4fc47a6e4f64556609bc7f048f2eea5331238a77e2056942557773bd0ce4760be2c7b10d8deb1
 EBUILD lilypond-2.23.0.ebuild 3125 BLAKE2B cc75ce170b7808b0b4873b50a0cc8d4e9f3c663b900122e7920cdc797e898c93d8a80c8655380163057b38b876335bbab18ad3215e8d7b51c083210955895005 SHA512 977dcb4ab03848244317f437c03cac79ec3b28294c2539ea216e6e0281d8963f345284ad80ec9b9fc71b9126365a5ad3daab5fd48e7ffac9bcb75f82edd71d5f
-EBUILD lilypond-2.23.2.ebuild 3133 BLAKE2B 0bdc00c6b4bb019de37e3135a0d00c9233a805c4608912396dfafc5cdaf96704b9e336aa48c885db92a23031a66484c7999f21e5a29e3efc366c0b9390f94735 SHA512 64390cce7a554bc8226b892820f40ee22215f51f96ec56aa8fffd2438485c82a4bda5ee8d81b29cdaec324c2d4ed6c4100cba2147e8638c13f86f58cc7f38006
+EBUILD lilypond-2.23.2.ebuild 3140 BLAKE2B 0451a53cebba96b961c4f5bb0bfd47e99cd1b6a544597b5b0f39e98e608330fb1d7f9a30232aca809317c17c602bef3e1314e6d0f031142fb8a60c08dfe9943b SHA512 c890a263d464f49617244e3981d960ddc3fda7e662484eb8be5b1007035c6366556331b74de5d047e24d4756b93e2ead3b955813e9cab04b779047860a2a893a
 EBUILD lilypond-9999.ebuild 3133 BLAKE2B 0bdc00c6b4bb019de37e3135a0d00c9233a805c4608912396dfafc5cdaf96704b9e336aa48c885db92a23031a66484c7999f21e5a29e3efc366c0b9390f94735 SHA512 64390cce7a554bc8226b892820f40ee22215f51f96ec56aa8fffd2438485c82a4bda5ee8d81b29cdaec324c2d4ed6c4100cba2147e8638c13f86f58cc7f38006
 MISC metadata.xml 526 BLAKE2B ce52e2b93fd4d25cded4c75feef562383276aa429f8ffe083b967377193e81ff1b0d4479d1c1a0d7bb23923f7771cdde0f93bd266ef72fb3e050fb4263d48955 SHA512 1c75ebaa028d19162a24635c978d5723541212e0fed095feda44a2b96d3ad715bc7b2425da544c61e4f3c8dbfeb26b0ccfe030233e116ee75f91a224ec118f1e
diff --git a/media-sound/lilypond/lilypond-2.23.2.ebuild b/media-sound/lilypond/lilypond-2.23.2.ebuild
index fea5dc370d4b..adb492fe79e4 100644
--- a/media-sound/lilypond/lilypond-2.23.2.ebuild
+++ b/media-sound/lilypond/lilypond-2.23.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit elisp-common autotools python-single-r1 toolchain-funcs xdg-utils
 
@@ -12,7 +12,7 @@ if [[ "${PV}" = "9999" ]]; then
 else
 	MAIN_VER=$(ver_cut 1-2)
 	SRC_URI="http://lilypond.org/download/sources/v${MAIN_VER}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~riscv ~x86"
 fi
 
 DESCRIPTION="GNU Music Typesetter"
diff --git a/media-sound/sc2mpd/Manifest b/media-sound/sc2mpd/Manifest
deleted file mode 100644
index 8d6ff1099999..000000000000
--- a/media-sound/sc2mpd/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX sc2mpd-1.1.7-python.patch 4186 BLAKE2B 8037ab9b33d25a65ec4b72b616de23c8ab12f3e93d6fe3b607039b0ad3f69f3aa37d6e7b39dc0b91767b953307464c7bd9066dc8210ef2a4c3090ad01ece220c SHA512 45b17410a6499cefd7b596c08e5fee288f16a3057e1c84da96e6388132a2fb56060f2010b65ffa38cbef0d179f8fe1c6f88da9d355f177e5524ca674bbdf0b75
-AUX sc2mpd-1.1.7-werror.patch 4237 BLAKE2B f3922de425df679e9b9e7c5249994a39e9fcda6a539f1b3d084ece8f44c8e81546b975375ca3fd8d0e81504bb712791bc99e1aa139d422805ef7dd16d79d8f16 SHA512 28d6ca71fc41ed11fab780f48861f04b28d853240107db2eed6911f3e58710e50e31bbc3f3d5c047599c1d1e544a921bc4ea4bc37e5900a02a4092c7de520fe5
-DIST openhome-sc2-20200704.tar.gz 22352681 BLAKE2B a5131f3b5c3400ff0ca58f0ce9b45c25db6fc13dcf6827ed9e4531effd3b35026d59495adf690ba65c09624c12f7755b9373ec4e4309de73f17fdeb866beeba7 SHA512 04586fbfd8053c7f01d2c3dbf421f75d0d93ac179cf5f58bc7966d364a3477a87985a1a2db1b35018aa5193a07977b7b4be60d317e7c10b275234adf9a2bd5d2
-DIST sc2mpd-1.1.7.tar.gz 238674 BLAKE2B 35fd57797612e3883ad5cc04be3f5328dbf4ec9aedb0461a801fe79566ef20de4026ad653eec6e7d932ffcd0385bb618331a519ec54838fd856d09c20f1971b8 SHA512 0b39e200f013602c851bec1ba41210c40d1a984638c86bd8dd5d61286aff19b315f282182753426e4470c8e6ccb60265b16dc6ba2e5117f59a3d40194464b4b3
-DIST sc2mpd-1.1.8.tar.gz 244898 BLAKE2B 81c3ff1b25db25cbd1bdb50f2343acb07740611dbad504fcc4670a6d351c1daace481de5292f291bdf208a911f67f4ebcc0884c0ef9eece962114860941e1941 SHA512 214b60ee154ab84e9a7ace285afa71b015987c6b6838fb2686cc81f65800f10228cc3f52e5f5e7e836fa181ea6fea5b0c4c83acc5c6eff989c82c79990f19497
-EBUILD sc2mpd-1.1.7.ebuild 3242 BLAKE2B 4a77568b4e07680e93b5e6acde2e076c1b3620942c2d9ae672e823c1f1f65b018b27b510ebe9a1dc420d89bcac79ddaa3adb662834fd3220f88c1c1c6fbbb763 SHA512 abba0c2c796c308eb1c52433e6d234c0622050bb1bd74b27405dcab27cbce2ff358ae8c50eae9b66a495bdb5ae90e3587e3fbf48d7d86de8fc36b1e9321dd53b
-EBUILD sc2mpd-1.1.8.ebuild 3071 BLAKE2B 7a6eab05845475eaf37248c5981d2961a090b3048efd26ef13a0016eeee9938e8b2bc372cb424ca3b6dbf46beb5181a6f7e635f7261c5916bfb6b17bdde83da7 SHA512 c43af142ee6c0b604f0cb7e209a19004ca76e24706edcb98f9f3b00df74c51759b2eee42cf6ca7273701df5f49c2502b88111c0da204ee23bf4e606034b27bd8
-MISC metadata.xml 217 BLAKE2B c0bbfd196fa82f939049ba60f8a1ea7fffccb97a821373c8ba9d8265585e7cdd81f6cd1623ff0704fbb52a8109d9e31c7872949ac7f5910f646bfb766392e717 SHA512 e09835e34c3f35da82048705a28fcde46e7cc04e4cc8d6118e211bec65666ee1a7f3d6c440c8de99b4a3326ea826ef75b29e0a8898b7d6a2a71a2533e43b1f9d
diff --git a/media-sound/sc2mpd/files/sc2mpd-1.1.7-python.patch b/media-sound/sc2mpd/files/sc2mpd-1.1.7-python.patch
deleted file mode 100644
index d4103a522451..000000000000
--- a/media-sound/sc2mpd/files/sc2mpd-1.1.7-python.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff -ur work.orig/ohNet/bundle_binaries.py work/ohNet/bundle_binaries.py
---- a/openhome/ohNet/bundle_binaries.py	2020-11-10 00:24:29.640122646 -0600
-+++ b/openhome/ohNet/bundle_binaries.py	2020-11-10 00:26:38.441470487 -0600
-@@ -121,22 +121,22 @@
-     parser.add_option("-m", "--managed-only", default=False, action="store_true", help="Package only the managed assembly.")

-     options, args = parser.parse_args()

-     if len(args)>0:

--        print "Too many arguments."

-+        print("Too many arguments.")

-         sys.exit(1)

-     if options.system not in ALL_SYSTEMS:

--        print "Please specify --system from one of {0}.".format(", ".join(sorted(ALL_SYSTEMS)))

-+        print("Please specify --system from one of {0}.".format(", ".join(sorted(ALL_SYSTEMS))))

-         sys.exit(1)

-     if options.architecture not in ALL_ARCHITECTURES:

--        print "Please specify --architecture from one of {0}.".format(", ".join(sorted(set(tgt.architecture for tgt in ALL_TARGETS.keys() if tgt.system == options.system))))

-+        print("Please specify --architecture from one of {0}.".format(", ".join(sorted(set(tgt.architecture for tgt in ALL_TARGETS.keys() if tgt.system == options.system)))))

-         sys.exit(1)

-     if options.configuration not in ALL_CONFIGURATIONS:

--        print "Please specify --configuration from one of {0}.".format(", ".join(sorted(ALL_CONFIGURATIONS)))

-+        print("Please specify --configuration from one of {0}.".format(", ".join(sorted(ALL_CONFIGURATIONS))))

-         sys.exit(1)

-     target = BuildTarget(options.system, options.architecture, options.configuration)

-     if target not in ALL_TARGETS:

--        print "Unrecognized target combination. Valid combinations are:"

-+        print("Unrecognized target combination. Valid combinations are:")

-         for valid_target in sorted(ALL_TARGETS.keys()):

--            print "    " + get_target_as_option_string(valid_target)

-+            print("    " + get_target_as_option_string(valid_target))

-         sys.exit(1)

- 

-     buildinfo = ALL_TARGETS[target]

-diff -ur work.orig/ohNetGenerated/bundle_binaries.py work/ohNetGenerated/bundle_binaries.py
---- a/openhome/ohNetGenerated/bundle_binaries.py	2020-11-10 00:24:29.847123204 -0600
-+++ b/openhome/ohNetGenerated/bundle_binaries.py	2020-11-10 00:26:11.793398395 -0600
-@@ -96,22 +96,22 @@
-     parser.add_option("-m", "--managed-only", default=False, action="store_true", help="Package only the managed assembly.")

-     options, args = parser.parse_args()

-     if len(args)>0:

--        print "Too many arguments."

-+        print("Too many arguments.")

-         sys.exit(1)

-     if options.system not in ALL_SYSTEMS:

--        print "Please specify --system from one of {0}.".format(", ".join(sorted(ALL_SYSTEMS)))

-+        print("Please specify --system from one of {0}.".format(", ".join(sorted(ALL_SYSTEMS))))

-         sys.exit(1)

-     if options.architecture not in ALL_ARCHITECTURES:

--        print "Please specify --architecture from one of {0}.".format(", ".join(sorted(set(tgt.architecture for tgt in ALL_TARGETS.keys() if tgt.system == options.system))))

-+        print("Please specify --architecture from one of {0}.".format(", ".join(sorted(set(tgt.architecture for tgt in ALL_TARGETS.keys() if tgt.system == options.system)))))

-         sys.exit(1)

-     if options.configuration not in ALL_CONFIGURATIONS:

--        print "Please specify --configuration from one of {0}.".format(", ".join(sorted(ALL_CONFIGURATIONS)))

-+        print("Please specify --configuration from one of {0}.".format(", ".join(sorted(ALL_CONFIGURATIONS))))

-         sys.exit(1)

-     target = BuildTarget(options.system, options.architecture, options.configuration)

-     if target not in ALL_TARGETS:

--        print "Unrecognized target combination. Valid combinations are:"

-+        print("Unrecognized target combination. Valid combinations are:")

-         for valid_target in sorted(ALL_TARGETS.keys()):

--            print "    " + get_target_as_option_string(valid_target)

-+            print("    " + get_target_as_option_string(valid_target))

-         sys.exit(1)

- 

-     buildinfo = ALL_TARGETS[target]

diff --git a/media-sound/sc2mpd/files/sc2mpd-1.1.7-werror.patch b/media-sound/sc2mpd/files/sc2mpd-1.1.7-werror.patch
deleted file mode 100644
index fd079e26fb8a..000000000000
--- a/media-sound/sc2mpd/files/sc2mpd-1.1.7-werror.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -ur ohNet/Makefile ohNet/Makefile
---- a/openhome/ohNet/Makefile	2020-11-09 23:46:21.295605850 -0600
-+++ b/openhome/ohNet/Makefile	2020-11-09 23:48:05.977868337 -0600
-@@ -344,13 +344,13 @@
- cflags_base = -fexceptions -Wall $(version_specific_cflags_third_party) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) -fvisibility=hidden $(platform_cflags)
- cflags_third_party = $(cflags_base) -Wno-int-to-pointer-cast
- ifeq ($(nocpp11), yes)
--    cppflags = $(cflags_base) -Werror
-+    cppflags = $(cflags_base)
- else ifeq ($(platform),IntelMac)
--    cppflags = $(cflags_base) -std=c++11 -Werror
-+    cppflags = $(cflags_base) -std=c++11
- else
--    cppflags = $(cflags_base) -std=c++0x -Werror
-+    cppflags = $(cflags_base) -std=c++0x
- endif
--cflags = $(cflags_base) -Werror
-+cflags = $(cflags_base)
- inc_build = Build/Include
- includes = -IBuild/Include/ $(version_specific_includes)
- bundle_build = Build/Bundles
-@@ -407,7 +407,7 @@
- 	jar = $(JAVA_HOME)/bin/jar
- endif
- 
--java_cflags = -fexceptions -Wall $(platform_java_cflags) $(version_specific_java_cflags) -Werror -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
-+java_cflags = -fexceptions -Wall $(platform_java_cflags) $(version_specific_java_cflags) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
- jarflags = cf
- dirsep = /
- prefix = /usr/local
-diff -ur ohNetGenerated/Makefile ohNetGenerated/Makefile
---- a/openhome/ohNetGenerated/Makefile	2020-11-09 23:46:21.344605971 -0600
-+++ b/openhome/ohNetGenerated/Makefile	2020-11-09 23:47:44.656814158 -0600
-@@ -276,13 +276,13 @@
- cflags_base = -fexceptions -Wall $(version_specific_cflags_third_party) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) -fvisibility=hidden $(platform_cflags)
- cflags_third_party = $(cflags_base) -Wno-int-to-pointer-cast
- ifeq ($(nocpp11), yes)
--    cppflags = $(cflags_base) -Werror
-+    cppflags = $(cflags_base)
- else ifeq ($(platform),IntelMac)
--    cppflags = $(cflags_base) -std=c++11 -Werror
-+    cppflags = $(cflags_base) -std=c++11
- else
--    cppflags = $(cflags_base) -std=c++0x -D__STDC_VERSION__=199901L -Werror
-+    cppflags = $(cflags_base) -std=c++0x -D__STDC_VERSION__=199901L
- endif
--cflags = $(cflags_base) -Werror
-+cflags = $(cflags_base)
- depsPlatform = ${openhome_system}-${openhome_architecture}
- header_install = Build/Include
- inc_build = dependencies/$(depsPlatform)/ohNet-$(depsPlatform)-Release/include/ohnet
-@@ -337,7 +337,7 @@
- 	jar = $(JAVA_HOME)/bin/jar
- endif
- 
--java_cflags = -fexceptions -Wall $(version_specific_java_cflags) -Werror -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
-+java_cflags = -fexceptions -Wall $(version_specific_java_cflags) -pipe -D_GNU_SOURCE -D_REENTRANT -DDEFINE_$(endian)_ENDIAN -DDEFINE_TRACE $(debug_specific_cflags) $(platform_cflags)
- jarflags = cf
- dirsep = /
- prefix = /usr/local
-diff -ur ohSongcast/Makefile ohSongcast/Makefile
---- a/openhome/ohSongcast/Makefile	2020-11-09 23:46:21.256605754 -0600
-+++ b/openhome/ohSongcast/Makefile	2020-11-09 23:47:23.130759816 -0600
-@@ -38,7 +38,7 @@
- # Macros used by Common.mak
- 
- ar = ${CROSS_COMPILE}ar rc $(objdir)
--cflags = -fexceptions -Wall -Werror -pipe -std=c++11 -D_GNU_SOURCE -D_REENTRANT -DDEFINE_LITTLE_ENDIAN -DDEFINE_TRACE $(debug_specific_flags) -fvisibility=hidden -DDllImport="__attribute__ ((visibility(\"default\")))" -DDllExport="__attribute__ ((visibility(\"default\")))" -DDllExportClass="__attribute__ ((visibility(\"default\")))" $(platform_cflags)
-+cflags = -fexceptions -Wall -pipe -std=c++11 -D_GNU_SOURCE -D_REENTRANT -DDEFINE_LITTLE_ENDIAN -DDEFINE_TRACE $(debug_specific_flags) -fvisibility=hidden -DDllImport="__attribute__ ((visibility(\"default\")))" -DDllExport="__attribute__ ((visibility(\"default\")))" -DDllExportClass="__attribute__ ((visibility(\"default\")))" $(platform_cflags)
- ohnetdir = ../ohNet/Build/Obj/$(osdir)/$(build_dir)/
- ohnetgenerateddir = ../ohNetGenerated/Build/Obj/$(osdir)/$(build_dir)/
- ohtopologydir = ../ohTopology/build/
diff --git a/media-sound/sc2mpd/metadata.xml b/media-sound/sc2mpd/metadata.xml
deleted file mode 100644
index 411334230662..000000000000
--- a/media-sound/sc2mpd/metadata.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>stasibear@gentoo.org</email>
-</maintainer>
-</pkgmetadata>
diff --git a/media-sound/sc2mpd/sc2mpd-1.1.7.ebuild b/media-sound/sc2mpd/sc2mpd-1.1.7.ebuild
deleted file mode 100644
index 6c6cbd7a893b..000000000000
--- a/media-sound/sc2mpd/sc2mpd-1.1.7.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Implements the SongCast protocol for use by upmpdcli and mpd"
-HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
-
-openhome_packageversion="20200704"
-
-SRC_URI="
-	https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz
-	https://www.lesbonscomptes.com/upmpdcli/downloads/openhome-sc2-${openhome_packageversion}.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	dev-libs/expat
-	media-libs/alsa-lib
-	media-libs/libsamplerate
-	media-libs/libmpdclient
-	<=net-libs/libmicrohttpd-0.9.70
-"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	mkdir openhome || die "Can't create openhome directory"
-	cd openhome || die "Can't enter openhome directory"
-	unpack openhome-sc2-${openhome_packageversion}.tar.gz
-}
-
-src_prepare() {
-	cd "${WORKDIR}" || die "Couldn't cd to WORKDIR"
-	eapply "${FILESDIR}/${P}-python.patch"
-	eapply "${FILESDIR}/${P}-werror.patch"
-	eapply_user
-}
-
-src_configure() {
-	econf "--with-openhome=${WORKDIR}/openhome"
-}
-
-src_compile() {
-
-	#### Begin ohbuild.sh reverse engineer
-
-	# build_ohNet
-	cd "${WORKDIR}/openhome/ohNet" || die "Couldn't cd to ohNet dir"
-	make native_only=yes || die "ohnet make failed"
-
-	# build_ohNetGenerated
-	cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd to ohNetGenerated dir"
-	# TODO: get from environment/make target
-	deps="${WORKDIR}/openhome/ohNetGenerated/dependencies/Linux-x64/ohNet-Linux-x64-Release"
-	mkdir -p $deps/{include/ohnet,lib/{ohnet,t4,ui,PyOhNet}} || die "Couldn't mkdir deps"
-	cd $deps || die "Couldn't cd to deps dir"
-
-	ohnet="${WORKDIR}/openhome/ohNet"
-	find "$ohnet/Build" \( -name '*.a' -o -name '*.so' \) \
-		 -exec cp '{}' lib ';' \
-		|| die "Couldn't cp binary libs"
-
-	cd "$ohnet/Build/Include" || die "Couldn't cd to include"
-	cp -R * "${deps}/include/ohnet" || die "Couldn't cp include"
-	# cd "$ohnet/Build/Tools" || die "Couldn't cd to tools"
-	# cp -R * "${deps}/lib/t4" || die "Couldn't cp tools"
-	cd "$ohnet/OpenHome/Net/T4/Templates" || die "Couldn't cd to templates"
-	cp -R * "${deps}/lib/t4" || die "Couldn't cp templates"
-	cd "$ohnet/OpenHome/Net/Bindings/Js/ControlPoint" || die "Couldn't cd to ui"
-	cp -R * "${deps}/lib/ui" || die "Couldn't cp ui"
-	cd "$ohnet/OpenHome/Net/Bindings/Python/PyOhNet" || die "Couldn't cd to py"
-	cp -R * "${deps}/lib/PyOhNet" || die "Couldn't cp py"
-
-	cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd later to ohNetGenerated dir"
-	make native_only=yes || die "ohnetgenerated make failed"
-
-	cd "Build/Include" || die "Couldn't cd later to include"
-	cp -R * "$ohnet/Build/Include" || die "Couldn't cp generated includes"
-
-	# build_ohTopology
-	cd "${WORKDIR}/openhome/ohTopology" || die "Couldn't cd to ohTopology dir"
-	mkdir -p build/Include/OpenHome/Av || die "Couldn't mkdir av"
-	cp -p OpenHome/Av/*.h build/Include/OpenHome/Av/ || die "Couldn't cp to av"
-
-	# build_ohSongcast
-	cd "${WORKDIR}/openhome/ohSongcast" || die "Couldn't cd to ohSongcast dir"
-	make release=1 library_static || die "Failed to build ohSongcast"
-
-	#### End ohbuild.sh reverse engineer
-
-	cd "${S}" || die "Failed to cd to source directory"
-	make || die "Failed to make sc2mpd"
-}
diff --git a/media-sound/sc2mpd/sc2mpd-1.1.8.ebuild b/media-sound/sc2mpd/sc2mpd-1.1.8.ebuild
deleted file mode 100644
index ef6557395fe1..000000000000
--- a/media-sound/sc2mpd/sc2mpd-1.1.8.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Implements the SongCast protocol for use by upmpdcli and mpd"
-HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli/index.html"
-
-openhome_packageversion="20200704"
-
-SRC_URI="
-	https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz
-	https://www.lesbonscomptes.com/upmpdcli/downloads/openhome-sc2-${openhome_packageversion}.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	dev-libs/expat
-	media-libs/alsa-lib
-	media-libs/libsamplerate
-	media-libs/libmpdclient
-	<=net-libs/libmicrohttpd-0.9.70
-"
-RDEPEND="${DEPEND}"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	mkdir openhome || die "Can't create openhome directory"
-	cd openhome || die "Can't enter openhome directory"
-	unpack openhome-sc2-${openhome_packageversion}.tar.gz
-}
-
-src_configure() {
-	econf "--with-openhome=${WORKDIR}/openhome"
-}
-
-src_compile() {
-	#### Begin ohbuild.sh reverse engineer
-
-	# build_ohNet
-	cd "${WORKDIR}/openhome/ohNet" || die "Couldn't cd to ohNet dir"
-	einfo "Building ohnet"
-	emake native_only=yes
-
-	# build_ohNetGenerated
-	cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd to ohNetGenerated dir"
-	# TODO: get from environment/make target
-	deps="${WORKDIR}/openhome/ohNetGenerated/dependencies/Linux-x64/ohNet-Linux-x64-Release"
-	mkdir -p ${deps}/{include/ohnet,lib/{ohnet,t4,ui,PyOhNet}} || die "Couldn't mkdir deps"
-	cd ${deps} || die "Couldn't cd to deps dir"
-
-	ohnet="${WORKDIR}/openhome/ohNet"
-	find "$ohnet/Build" \( -name '*.a' -o -name '*.so' \) \
-		 -exec cp '{}' lib ';' \
-		|| die "Couldn't cp binary libs"
-
-	cd "$ohnet/Build/Include" || die "Couldn't cd to include"
-	cp -R * "${deps}/include/ohnet" || die "Couldn't cp include"
-	# cd "$ohnet/Build/Tools" || die "Couldn't cd to tools"
-	# cp -R * "${deps}/lib/t4" || die "Couldn't cp tools"
-	cd "$ohnet/OpenHome/Net/T4/Templates" || die "Couldn't cd to templates"
-	cp -R * "${deps}/lib/t4" || die "Couldn't cp templates"
-	cd "$ohnet/OpenHome/Net/Bindings/Js/ControlPoint" || die "Couldn't cd to ui"
-	cp -R * "${deps}/lib/ui" || die "Couldn't cp ui"
-	cd "$ohnet/OpenHome/Net/Bindings/Python/PyOhNet" || die "Couldn't cd to py"
-	cp -R * "${deps}/lib/PyOhNet" || die "Couldn't cp py"
-
-	cd "${WORKDIR}/openhome/ohNetGenerated" || die "Couldn't cd later to ohNetGenerated dir"
-	einfo "Building ohnetgenerated"
-	emake native_only=yes
-
-	cd "Build/Include" || die "Couldn't cd later to include"
-	cp -R * "$ohnet/Build/Include" || die "Couldn't cp generated includes"
-
-	# build_ohTopology
-	cd "${WORKDIR}/openhome/ohTopology" || die "Couldn't cd to ohTopology dir"
-	mkdir -p build/Include/OpenHome/Av || die "Couldn't mkdir av"
-	cp -p OpenHome/Av/*.h build/Include/OpenHome/Av/ || die "Couldn't cp to av"
-
-	# build_ohSongcast
-	cd "${WORKDIR}/openhome/ohSongcast" || die "Couldn't cd to ohSongcast dir"
-	einfo "Building ohSongcast"
-	emake release=1 library_static
-
-	#### End ohbuild.sh reverse engineer
-
-	cd "${S}" || die "Failed to cd to source directory"
-	einfo "Building sc2mpd"
-	emake
-}
diff --git a/media-sound/sndio/Manifest b/media-sound/sndio/Manifest
index 5fd32a870389..83d71f3e2556 100644
--- a/media-sound/sndio/Manifest
+++ b/media-sound/sndio/Manifest
@@ -2,6 +2,6 @@ AUX sndiod 36 BLAKE2B 51d51ddac64b89c01cb7ec6b009cabb17168b1664e4339d895070fd6e8
 DIST sndio-1.7.0.tar.gz 147989 BLAKE2B 20f5969cfd6d6a62d9c04e493eda7648f686ad394db18e43ae574db235f31a025705f40f9c6ea821e04449bc1cdbc35c23dbeff9575b71fccc92c24140341d7e SHA512 f9db7bad5f30e8790488c4d20198c8a5a51f04f94e4b1067eadd7fe0fcc6f6ced3250173a627439d661dcf6faabc7bc4786b30af013788a5c88d972f1c9dc1f8
 DIST sndio-1.8.0.tar.gz 156249 BLAKE2B 46d279c0a9ab40253d9f4abf5892d6c2cbbbeeeeb5ff72f45287b16adce122550025ee2d50b45de5e6952dfac1f25041e520692b0afc31ce9cfa5e122d8799fa SHA512 c3225e59e50c3dee41df7df1d87d32ed616117ea6883d9c643a57091b2239b03988c00230882c32f68331952852781dccb8bdc5a6c92780d97a294a1bd9d8ef8
 EBUILD sndio-1.7.0-r1.ebuild 1042 BLAKE2B dec9d99b4875b58581a6f15ec73bb10ec7cf52611869e06cef594f1b0280f253489d343c7cb26554b572e58f730f37858d87ca4d9994be046cf8b330ec77f7e2 SHA512 883db34be9c592cd2528f7ff108868d541d823907b4e1a96327751bbe837680e9612a4b80d34a46b69d39e55916ff04b33a93299d6c14b631fdf2d3f81c9473c
-EBUILD sndio-1.8.0.ebuild 1049 BLAKE2B 55f1786cacbae3e9e3706cb9d23ff2879d224a6a5929cc0bc3f9ba9dec6728c81017023e6c2b859f3816af09663b1d87a43a789afb0d26f98965dfc16d6f1d4b SHA512 afbfa868aaaddffad8c066e3840cd85b9ba272894c3f31b56608c1953659e4c3fea7eef59d5ba2f70e2fd63f4bb4490b5062f6cf940bc784a581f42d315e713e
+EBUILD sndio-1.8.0.ebuild 1063 BLAKE2B 1f993207e46781dde25922f1f18278ff4e4c814376b87351df12529afcdc238f48633c188434459d1b61bd83f028873889e0ade1138b1fe1956322e251d0f74c SHA512 3e64acffd70bc3e8cbf376804111756921169d71db139a1dd378195783eca27334592e75f6ba555edea137ce929af49fbefe434e9d920b934b38976276152a1f
 EBUILD sndio-9999.ebuild 1049 BLAKE2B 55f1786cacbae3e9e3706cb9d23ff2879d224a6a5929cc0bc3f9ba9dec6728c81017023e6c2b859f3816af09663b1d87a43a789afb0d26f98965dfc16d6f1d4b SHA512 afbfa868aaaddffad8c066e3840cd85b9ba272894c3f31b56608c1953659e4c3fea7eef59d5ba2f70e2fd63f4bb4490b5062f6cf940bc784a581f42d315e713e
 MISC metadata.xml 409 BLAKE2B 61d1ac0ebe8ac2bbd208fe98e5f7f32e208315ddf71e19faf0d1b5c39f5b93fe9896ff0b9738d607d7baef54c8b026d55bc83a0d27813be65a5404f507ef2754 SHA512 3e1d53e71543488d3e9308a6b8a4ee454a69ffb26e542e0218029fe19c2eeba07aaef2167d4c9280ede9ef7d0901514d7ff82656b798a947e469b730a9e4cf85
diff --git a/media-sound/sndio/sndio-1.8.0.ebuild b/media-sound/sndio/sndio-1.8.0.ebuild
index 16b9e5b69d36..e6debfae9793 100644
--- a/media-sound/sndio/sndio-1.8.0.ebuild
+++ b/media-sound/sndio/sndio-1.8.0.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="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="ISC"