gentoo resync : 20.03.2022

26 files changed, 131 insertions, 369 deletions

diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 3a039c3a03b6..18e0d5873025 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/brasero/Manifest b/app-cdr/brasero/Manifest
index 3033ed8a2688..6ace4f6f99ce 100644
--- a/app-cdr/brasero/Manifest
+++ b/app-cdr/brasero/Manifest
@@ -1,4 +1,3 @@
-AUX brasero-3.12.2-tracker3.patch 8745 BLAKE2B a3ca65c2354bc87f7d9c9bd4ec2dce06f7a97208193a48674ffb60ace244528e9f45e25b15c768af9cf5b002db549d058433eb069ad13cee2d1a2e76afee9b69 SHA512 0595dda2259c8a1a4b005ac6d8886a1b9333102df61a24cbaf61895160395374abcb2391e487b6e98eaa441fcc3164187c451edb6ddc0c19cb1b7d12658aff1b
 DIST brasero-3.12.3.tar.xz 3156012 BLAKE2B e657f29719164b786e29a4974102cf6b0eb3316bec84a08838bd62b952c43994e0187f6cfeaa5080fa794b1ff1684553a3d643cd309b2957a8d4191c7ea8cfbf SHA512 0e3c97b2a754f7178207db390e33b832fcaed3856ae5dee447e5c26d712728302dbebbf839a4fb7565f63b3ebb1e4936e20739482a8114e6fe2700805659270a
-EBUILD brasero-3.12.3.ebuild 1812 BLAKE2B 0cf25cdeb704e7008c5e7b653800e5fa43bfa988b7115e0ec7dea3e5d4bc7c094108a1284cd47700bb6db3d5b2600ddbe55fc22ea4d7a2552206fd0af0ff37e9 SHA512 2e6a695e1796ab9aeb6e5835a4f93b3450da99b5e77a965127558507c77a46c98aaf11992d7d08bc2dc47907ecb060e0f06b73c61dab10e6cddf17706a46df3e
+EBUILD brasero-3.12.3.ebuild 1811 BLAKE2B 84e138caf14fea363de23817d23c7ab47719f0c2b22613f5cbc4dda3e4e4ce5d989d932146b798bd6861ab600d4bce24aeadb46b40ff64808ae14b81149d8100 SHA512 d49cba2dc1d4c0e0bf3d6ca5e48914bd7cb05178614c44553debe7cdc1914831016e2aaef6d744c0082406a0a89272e86965e26a0ed54f73176060b0ebe429ae
 MISC metadata.xml 642 BLAKE2B 7ac9b4e7b0568b7d608eee9280b15f04218e931daac55cc6fcbafbc01fdc4bc0fcc3631403f25451dc13f07854eb366e2028903be22d8740cc9d0e1ed9074c9e SHA512 7f5c7b80d484710f9dcecd6266331054a90789f0c5e4942b0f26d6da861bdcd754f495d505562bce8a5fcf70e59f57cf54e1ab2ef521798b213eee4d2dbe2b4f
diff --git a/app-cdr/brasero/brasero-3.12.3.ebuild b/app-cdr/brasero/brasero-3.12.3.ebuild
index 5a4f2299021b..2bddf575a50f 100644
--- a/app-cdr/brasero/brasero-3.12.3.ebuild
+++ b/app-cdr/brasero/brasero-3.12.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Brasero"
 LICENSE="GPL-2+ CC-BY-SA-3.0"
 SLOT="0/3.1" # subslot is 3.suffix of libbrasero-burn3
 IUSE="+css +introspection +libburn mp3 nautilus playlist tracker"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
 
 DEPEND="
 	>=dev-libs/glib-2.29.14:2
diff --git a/app-cdr/brasero/files/brasero-3.12.2-tracker3.patch b/app-cdr/brasero/files/brasero-3.12.2-tracker3.patch
deleted file mode 100644
index 7a98f336cc14..000000000000
--- a/app-cdr/brasero/files/brasero-3.12.2-tracker3.patch
+++ /dev/null
@@ -1,240 +0,0 @@
-From ca0d487aac3b9cf21e520a00b94cb3eaf833b9a3 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Thu, 24 Dec 2020 12:19:49 +0100
-Subject: [PATCH 1/5] Obtain TrackerSparqlConnection in a single point
-
-The is_available vmethod tries to create a connection if it's not
-there. But the BraseroSearchTracker initialization already tries to
-obtain the SPARQL connection. Let this method return wether
-initialiation was successful.
----
- src/brasero-search-tracker.c | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/src/brasero-search-tracker.c b/src/brasero-search-tracker.c
-index fe7be2bd..f8c29c0d 100644
---- a/src/brasero-search-tracker.c
-+++ b/src/brasero-search-tracker.c
-@@ -56,12 +56,6 @@ brasero_search_tracker_is_available (BraseroSearchEngine *engine)
- 	BraseroSearchTrackerPrivate *priv;
- 
- 	priv = BRASERO_SEARCH_TRACKER_PRIVATE (engine);
--	GError *error = NULL;
--	if (priv->connection)
--		return TRUE;
--	
--	priv->cancellable = g_cancellable_new ();
-- 	priv->connection = tracker_sparql_connection_get (priv->cancellable, &error);
- 	return (priv->connection != NULL);
- }
- 
--- 
-GitLab
-
-
-From c0dace005ec34b345845aacd1f929fd618b199af Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Thu, 24 Dec 2020 12:37:13 +0100
-Subject: [PATCH 2/5] Fix ORDER BY clauses in Tracker search
-
-The ?urn variable is not defined anywhere else in the query, so
-ordering is left undefined. Access the url/filename properly here.
----
- src/brasero-search-tracker.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/brasero-search-tracker.c b/src/brasero-search-tracker.c
-index f8c29c0d..94085070 100644
---- a/src/brasero-search-tracker.c
-+++ b/src/brasero-search-tracker.c
-@@ -307,7 +307,7 @@ brasero_search_tracker_query_start_real (BraseroSearchEngine *search,
- 	g_string_append (query, ")");
- 
- 	g_string_append (query,
--			 "} ORDER BY DESC(nie:url(?urn)) DESC(nfo:fileName(?urn))");
-+			 "} ORDER BY DESC(?url) DESC(nfo:fileName(?file))");
- 
- 	tracker_sparql_connection_query_async (priv->connection,
- 					       query->str,
--- 
-GitLab
-
-
-From f7181445bf9c88b7fab1bb5237d602b491694a9e Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Thu, 24 Dec 2020 13:04:03 +0100
-Subject: [PATCH 3/5] Only use fts:rank with FTS searches
-
-This fixes two things:
-- The use of fts:match depends on priv->keywords being set, but
-  fts:rank() has undefined behavior if fts:match is not present.
-  Its value is returned in the cursor, but fortunately unused,
-  so it can go away.
-
-- Fixes "garbage" being added at the end of the query, concretely
-  ") } ORDER BY ... " is appended at the supposed end of the query
-  string. Older SPARQL parser implementations would allow garbage
-  at the end of its parsing state, I suspect "LIMIT 0 OFFSET 10000"
-  was just a mean to push it to that state that it'd allow the
-  remaining string, so that is gone too.
----
- src/brasero-search-tracker.c | 21 +++++++++------------
- 1 file changed, 9 insertions(+), 12 deletions(-)
-
-diff --git a/src/brasero-search-tracker.c b/src/brasero-search-tracker.c
-index 94085070..ae1d388a 100644
---- a/src/brasero-search-tracker.c
-+++ b/src/brasero-search-tracker.c
-@@ -234,7 +234,7 @@ brasero_search_tracker_query_start_real (BraseroSearchEngine *search,
- 
- 	priv = BRASERO_SEARCH_TRACKER_PRIVATE (search);
- 
--	query = g_string_new ("SELECT ?file ?url ?mime fts:rank(?file) "	/* Which variables should be returned */
-+	query = g_string_new ("SELECT ?file ?url ?mime "			/* Which variables should be returned */
- 			      "WHERE {"						/* Start defining the search and its scope */
- 			      "  ?file a nfo:FileDataObject . "			/* File must be a file (not a stream, ...) */
- 	                      "  ?file nie:url ?url . "				/* Get the url of the file */
-@@ -293,21 +293,18 @@ brasero_search_tracker_query_start_real (BraseroSearchEngine *search,
- 				 " ) ");
- 	}
- 
--	if (priv->keywords)
-+	if (priv->keywords) {
- 		g_string_append_printf (query,
- 					"  ?file fts:match \"%s\" ",		/* File must match possible keywords */
- 					priv->keywords);
- 
--	g_string_append (query,
--			 " } "
--			 "ORDER BY ASC(fts:rank(?file)) "
--			 "OFFSET 0 "
--			 "LIMIT 10000");
--
--	g_string_append (query, ")");
--
--	g_string_append (query,
--			 "} ORDER BY DESC(?url) DESC(nfo:fileName(?file))");
-+		g_string_append (query,
-+				 " } "
-+				 "ORDER BY ASC(fts:rank(?file))");
-+	} else {
-+		g_string_append (query,
-+				 "} ORDER BY DESC(?url) DESC(nfo:fileName(?file))");
-+	}
- 
- 	tracker_sparql_connection_query_async (priv->connection,
- 					       query->str,
--- 
-GitLab
-
-
-From ede7758e2fae487d57be641a120c4c02bfd249f1 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Thu, 24 Dec 2020 13:15:21 +0100
-Subject: [PATCH 4/5] Observe nfo:FileDataObject/nie:InformationElement split
-
-These resources are interpreted differently in Tracker 3.0 compared
-to older versions, the newer version makes those 2 different resources
-(one representing the "file", other the "content) that relate to each
-other. In older tracker versions, these 2 aspects were conflated in
-a single resource.
-
-The query is implicitly crossing that barrier, so make it explicit.
-With this change, the query may run with either version.
----
- src/brasero-search-tracker.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/brasero-search-tracker.c b/src/brasero-search-tracker.c
-index ae1d388a..9aa06289 100644
---- a/src/brasero-search-tracker.c
-+++ b/src/brasero-search-tracker.c
-@@ -238,7 +238,8 @@ brasero_search_tracker_query_start_real (BraseroSearchEngine *search,
- 			      "WHERE {"						/* Start defining the search and its scope */
- 			      "  ?file a nfo:FileDataObject . "			/* File must be a file (not a stream, ...) */
- 	                      "  ?file nie:url ?url . "				/* Get the url of the file */
--	                      "  ?file nie:mimeType ?mime . ");			/* Get its mime */
-+	                      "  ?file nie:mimeType ?mime . "			/* Get its mime */
-+			      "  ?content nie:isStoredAs ?file . ");		/* Get the resource representing the content */
- 
- 	if (priv->mimes) {
- 		int i;
-@@ -259,7 +260,7 @@ brasero_search_tracker_query_start_real (BraseroSearchEngine *search,
- 		gboolean param_added = FALSE;
- 
- 		g_string_append (query,
--				 "  ?file a ?type . "
-+				 "  ?content a ?type . "
- 				 "  FILTER ( ");
- 
- 		if (priv->scope & BRASERO_SEARCH_SCOPE_MUSIC) {
--- 
-GitLab
-
-
-From 05589be7da3a0dfb00617df049d129abba703c36 Mon Sep 17 00:00:00 2001
-From: Carlos Garnacho <carlosg@gnome.org>
-Date: Thu, 24 Dec 2020 13:22:43 +0100
-Subject: [PATCH 5/5] Support Tracker 3.0
-
-Add the compile-time checks, and add the minimal code catering for
-the API changes. In 3.0 connections are no longer singletons.
----
- configure.ac                 | 6 +++++-
- src/brasero-search-tracker.c | 8 ++++++++
- 2 files changed, 13 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index d0c7a870..96afc551 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -388,7 +388,7 @@ AC_ARG_ENABLE(search,
- if test x"$enable_search" != "xno"; then
-         # Try to figure out the tracker API version to use
-         tracker_api="0.10"
--        m4_foreach([VERSION], [[0.10], [0.12], [0.14], [0.16], [0.18], [1.0], [2.0]],
-+        m4_foreach([VERSION], [[0.10], [0.12], [0.14], [0.16], [0.18], [1.0], [2.0], [3.0]],
-                               [PKG_CHECK_EXISTS([tracker-sparql-VERSION >= $TRACKER_REQUIRED],
-                                                 [tracker_api="VERSION"])
-                               ])
-@@ -408,6 +408,10 @@ if test x"$enable_search" = "xyes"; then
- 	AC_SUBST(BRASERO_SEARCH_LIBS)
- 	build_tracker="yes"
- 	build_search="yes"
-+
-+	if test x"$tracker_api" = x"3.0"; then
-+		AC_DEFINE(HAVE_TRACKER3, 1, [define if tracker3 is available])
-+	fi
- else
- 	build_search="no"
- fi
-diff --git a/src/brasero-search-tracker.c b/src/brasero-search-tracker.c
-index 9aa06289..40c5f1ac 100644
---- a/src/brasero-search-tracker.c
-+++ b/src/brasero-search-tracker.c
-@@ -17,6 +17,8 @@
-  * with this program.  If not, see <http://www.gnu.org/licenses/>.
-  */
- 
-+#include "config.h"
-+
- #include <stdlib.h>
- 
- #include <libtracker-sparql/tracker-sparql.h>
-@@ -444,7 +446,13 @@ brasero_search_tracker_init (BraseroSearchTracker *object)
- 
- 	priv = BRASERO_SEARCH_TRACKER_PRIVATE (object);
- 	priv->cancellable = g_cancellable_new ();
-+
-+#ifdef HAVE_TRACKER3
-+	priv->connection = tracker_sparql_connection_bus_new ("org.freedesktop.Tracker3.Miner.Files",
-+							      NULL, NULL, &error);
-+#else
- 	priv->connection = tracker_sparql_connection_get (priv->cancellable, &error);
-+#endif
- 
- 	if (error) {
- 		g_warning ("Could not establish a connection to Tracker: %s", error->message);
--- 
-GitLab
-
diff --git a/app-cdr/cdemu-daemon/Manifest b/app-cdr/cdemu-daemon/Manifest
index 2ff4a25792f4..0fe60541923a 100644
--- a/app-cdr/cdemu-daemon/Manifest
+++ b/app-cdr/cdemu-daemon/Manifest
@@ -1,7 +1,3 @@
-DIST cdemu-daemon-3.2.4.tar.bz2 83580 BLAKE2B 56cfde3b9b9a98ba0da629deac717a740b7c92c67195ac282af5337f0e782b555f53221741a59abf3e78faacd066e34a722d08e27cef6fd1082cb75b46eb3ace SHA512 b5dd19a9325773e22c1910ae02f351803fb4f02197eaf5d41a984b4898a5fb0f027c70791d4c25553a9b589273fa3578d3cb12aa7a056f8639b341bd2ab44291
-DIST cdemu-daemon-3.2.5.tar.xz 85948 BLAKE2B f9b977ce964b15835afef54131cc158bc45389af30739706d93984bc24787b95034d9da7d56e88e018be9db66c185c16b7cf7481e0fdd0e97fed9e55b61419fd SHA512 6b084dc1809c9ccf8f9c24c671f13259d2e1ca6d2e6f7f85d44a47b4e973a68d7c92e470071421cdf6f2142eb26bdfd277a2f9c85b960d0b315b51a2d65953c7
 DIST cdemu-daemon-3.2.6.tar.xz 85976 BLAKE2B 33d03324fbc222674967f1d6b93c2bf1793528948cfce1089dbdfe799d3b40eaabae2e3f62b4696eba020f04c192e9d458a91e8bdd85465e00ec5a84194982e0 SHA512 cead8e4f7e0eec6e1284924cfe88cdfb78ec9f0769ffa423cd1801261540b3806a9704b6abbddc175e9e7d1aeef2acb9889b36ed13d89fd4b9dcda91fe1a08ca
-EBUILD cdemu-daemon-3.2.4.ebuild 1137 BLAKE2B d7f1e6223350898280bd4fc40ea09cb3906b0cc8c5c4f11b999234a13008e3346ea9f40c74bea10dd189b6e71d9c6a8370df286cd406c6671ad2849e3fff7cd5 SHA512 8db90ffaae996a013b7977eb6ff7c35502cc4a76776028c657b9d64968a59e50348624d971b9e5683273a4c12892ae01ea1b2659d67e41bdc83baf44336c58f9
-EBUILD cdemu-daemon-3.2.5.ebuild 1248 BLAKE2B 5029e96ff3d723425f528dc730ee6667ce187a5a57266c1896468bc75312b8f6f634ae7e2e4140251e32757ba006290364f790772fef3a1ea3dc92cc185df3d5 SHA512 10fcef4225daa7fbf993a00673139831ca9e0b87589da3b476caf6ed0b4fd83513427d370e0625e36915fedd0266b315f80ac4def68ad4ba6852fe49820ece72
-EBUILD cdemu-daemon-3.2.6.ebuild 1250 BLAKE2B 0451eb13c3047608826e556639c99931b9645b97a5a9b16a4bea5a02dd926939639f97c9de9c934e4bb9d92757c4e2e81ea6c2ec7dbc0b22421755c9bbd18ed3 SHA512 437dfa697e7fb1c5cb82ddc9e58ae86d076d77ae6adad57853cc89b474511b75f00ecbae4e2aa77d14b946a9d090676d3ae1f8d98bd3c2754dac3a63f25eb6b4
+EBUILD cdemu-daemon-3.2.6.ebuild 1248 BLAKE2B 31ef50a145d0588b7ce53b5575abbbfd08ff598bc36f88194e0d35d74256ec2ca0e3e938835a07fa8b40bf8f64492cac8626300e28a97a70563918dcdf2bf5f5 SHA512 b336c2c7388383f943e3bf4cd5e23e9700b65ed6f2379a57da898beab60d411e8868604ccbb253d91e5a6249eedc4f2c747a5a54cb24dd3d42b647bc51c368e6
 MISC metadata.xml 333 BLAKE2B 99feb77e860cccd95f60688c7c2104267b6abb6188a8f24e50728b39487892ef29c58e5ddfb7a56578d27c34e9d4bb16371298449d2a3de5e6a79a6a5712e37c SHA512 2a387604d78412e81477271c793d46b197609d4d9037aa55d0146cfbbc9eae01633a7a9ac6908f923174ecfedf7336792147dc6e7c5b13db057855282e45e129
diff --git a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.4.ebuild b/app-cdr/cdemu-daemon/cdemu-daemon-3.2.4.ebuild
deleted file mode 100644
index f41b381ac9fc..000000000000
--- a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Daemon of the CDEmu optical media image mounting suite"
-HOMEPAGE="https://cdemu.sourceforge.io"
-SRC_URI="https://download.sourceforge.net/cdemu/cdemu-daemon/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0/7" # subslot = CDEMU_DAEMON_INTERFACE_VERSION_MAJOR in CMakeLists.txt
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=dev-libs/glib-2.38:2
-	>=dev-libs/libmirage-3.2.0:=
-	>=media-libs/libao-0.8.0:="
-RDEPEND="${DEPEND}
-	sys-apps/dbus
-	>=sys-fs/vhba-20130607"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS README )
-
-pkg_postinst() {
-	elog "You will need to load the vhba module to use cdemu devices:"
-	elog " # modprobe vhba"
-	elog "To automatically load the vhba module at boot time, edit your"
-	elog "/etc/conf.d/modules file."
-
-	if [[ -e ${ROOT}/etc/conf.d/cdemud ]]; then
-		elog
-		elog "${PN} no longer installs an init.d service; instead, it is"
-		elog "automatically activated when needed via dbus."
-		elog "You can therefore remove ${ROOT}/etc/conf.d/cdemud"
-	fi
-}
diff --git a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.5.ebuild b/app-cdr/cdemu-daemon/cdemu-daemon-3.2.5.ebuild
deleted file mode 100644
index 5b25b97d8257..000000000000
--- a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.5.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake systemd
-
-DESCRIPTION="Daemon of the CDEmu optical media image mounting suite"
-HOMEPAGE="https://cdemu.sourceforge.io"
-SRC_URI="https://download.sourceforge.net/cdemu/cdemu-daemon/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/7" # subslot = CDEMU_DAEMON_INTERFACE_VERSION_MAJOR in CMakeLists.txt
-KEYWORDS="amd64 x86"
-
-DEPEND=">=dev-libs/glib-2.38:2
-	>=dev-libs/libmirage-3.2.0:=
-	>=media-libs/libao-0.8.0:="
-RDEPEND="${DEPEND}
-	sys-apps/dbus
-	>=sys-fs/vhba-20130607"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS README )
-
-src_install() {
-	cmake_src_install
-
-	insinto /etc/modules-load.d
-	newins - vhba.conf <<<"vhba"
-	systemd_douserunit service-example/cdemu-daemon.service
-	insinto /usr/share/dbus-1/services
-	doins service-example/net.sf.cdemu.CDEmuDaemon.service
-}
-
-pkg_postinst() {
-	elog "As of 3.2.5, cdemu-daemon no longer supports autoloading"
-	elog "on non-systemd systems.  OpenRC users have to start it manually."
-	elog
-	elog "We install /etc/modules-load.d/vhba.conf to load the module"
-	elog "automatically, and D-BUS autolaunch will start cdemu-daemon user"
-	elog "service."
-}
diff --git a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.6.ebuild b/app-cdr/cdemu-daemon/cdemu-daemon-3.2.6.ebuild
index ddfa7e43cf65..931b086d6aa4 100644
--- a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.6.ebuild
+++ b/app-cdr/cdemu-daemon/cdemu-daemon-3.2.6.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
@@ -11,7 +11,7 @@ SRC_URI="https://download.sourceforge.net/cdemu/cdemu-daemon/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0/7" # subslot = CDEMU_DAEMON_INTERFACE_VERSION_MAJOR in CMakeLists.txt
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND=">=dev-libs/glib-2.38:2
 	>=dev-libs/libmirage-3.2.0:=
diff --git a/app-cdr/cdemu/Manifest b/app-cdr/cdemu/Manifest
index cede50646183..3bc434ddd294 100644
--- a/app-cdr/cdemu/Manifest
+++ b/app-cdr/cdemu/Manifest
@@ -1,5 +1,5 @@
 DIST cdemu-client-3.2.4.tar.bz2 44284 BLAKE2B c57fe09bef7112933a93fac9944eaff957e01692ec1ddec7fd443aa780f8b3d85d0bd640611337d896843de3ab00d09e093c293776a52afa85f781bdde7f4250 SHA512 2e10cb345e261ddaa6da68ee626770ed65749b1ea64c2bbbf0f3a2e96184c2906834886754e87e3161c3056473e5ee0dc20672ce7cb48232e6bef1c93cb80550
 DIST cdemu-client-3.2.5.tar.xz 41596 BLAKE2B 5b3e5a16f9daa0ab2c670a8cba54af380894e668c87a64a5e2126777d6725420d9bb7f41290ca69eba12e20db97b00cc74aea3df9694ef331e7a571b913820b1 SHA512 d143705607507503cd7828f02e7a0fbe5d33f15e28ce61f453567d8635ed863c5b508ed2b1964f034d846ecdea752bd3dfb565350174db3e06cf7d29c2f828bf
 EBUILD cdemu-3.2.4.ebuild 1138 BLAKE2B e3caa0228db29ddf52558edf3ad3515ca65448781d9261a0fc52bb22bdef0422c28f3fd972d75791c0c6aacdd1e023f3867b072a10aab94081c6b322047c0e82 SHA512 e5fc828e8bf3fdbafeed4d3d81558aac3db9d866d4ffec65ac88346eb4e1facafc272be29089118edd7235aae228a6d7cab78abff71487f321acdb488d73973a
-EBUILD cdemu-3.2.5.ebuild 1274 BLAKE2B fa1ea6ddb47130434120c2b1037806c02411d02d5e4bf97599f7a0bad97fe3cf8c47db5bf82e0e8620e1e58d66fce2ada5dadfe71062f9f5443b3f0791f54806 SHA512 81aca1e47e74d0f7af7b1cef06dabddc3f28e53061dce02b0c5ca481fb8f98d5183a71f43f213404be13c94db11d2e35c79836940bf616f53b04dcadadea03fc
+EBUILD cdemu-3.2.5.ebuild 1275 BLAKE2B 7ea7273104385bdaf2ad626abf5f143e8b83684017cdcf33f75971cdff78f380d5305478e43be8793b6457e6cc7bc262f414ee68b556aa5a763377df64f008ab SHA512 b96fd754e796bed533862b26bc8d4807bbed1193dce577ff9852ac8b198492f90c61e41c32a7cfb448ecedab905a704978cdf929513555689170c7a02e396aba
 MISC metadata.xml 530 BLAKE2B 78454943e47661858c79699f9f4346803ebdccf4d9bc37e3577fee85ba2b0a7d20f5fea844a0fe33d78b0424098dc030b9ccbe6e5db078817f1272baac7ba08d SHA512 e1f4efd8dacd7def02135e75276293b4be8642d6be80eda30da3de4409824622c6e99beba76318ebaa58635d723f681f9129580f8da1c9b49bd0c29dcf0a7fcb
diff --git a/app-cdr/cdemu/cdemu-3.2.5.ebuild b/app-cdr/cdemu/cdemu-3.2.5.ebuild
index 0206fc3d15ee..6815cec94bc3 100644
--- a/app-cdr/cdemu/cdemu-3.2.5.ebuild
+++ b/app-cdr/cdemu/cdemu-3.2.5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit bash-completion-r1 cmake python-single-r1 xdg-utils
 
diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
index ccab6ca0d11c..ccdf965e97be 100644
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@@ -1,5 +1,6 @@
 AUX cdrdao-1.2.4-ax_pthread.patch 16846 BLAKE2B a76c7c68c53a57731e652325d98f9f2ce434c9c9385e8583fb948fe2e1c120ad564a95bc247993493afbef1163206c30fc8a141d72ee723b3bcabb20a5f9f36a SHA512 83789963569dbaa599294bd79447e3351309675817eef683e2f90974d68fda00c705eca43c015128d6c6e9ec98f14bf7f205f8e3ab46f33c1bf0afaf0f055694
 AUX cdrdao-1.2.4-wformat-security.patch 4864 BLAKE2B fa300eefe5d714de0245a9e745d13f051dcbc14590efb33a367dd113474984618e62e347fc3cdc26a057169ff95bdde25b36d9b7bcb25aa9cdd5fd9b07a42ec1 SHA512 a40fd8c91fa207ad52f3cde9318fc4422f14aeea15bab4d2cd1e04d3f09a2fc2b666397cdbddc89245c97a6a98ac155c0ecf71c1e2993a366a21016bd337a33e
 DIST cdrdao-1.2.4.tar.bz2 1442181 BLAKE2B e1163b25c165a7acd7ec8c53069794724d93f09a486150255a58985e3fd0a222ba7ac5c124cb7a6991cf440ac701651be38754615fd3d0d295affa93595dc388 SHA512 41f20275ca44ec9003d0e3ed280cc98012353005cda6f544ebfa44f3f79f991845c0ef17af74db9456f1bacc342a7fd48c9e942d757927a4a9ff91808f7bbb09
+EBUILD cdrdao-1.2.4-r1.ebuild 1031 BLAKE2B 6a0ec89b5a0c5b01e9cc24dcf5170c9c5b3197aab87066c606255868f55cd52b6e011ace349d885a9c04661d56db49776c91b4acdb274935748082855e36d535 SHA512 eda054c6904d5608aaf4cb33cd4677185eb1d0ce5ab154cea97545109d7ebf1d14e0fba5cc7e97c197e8e17717f72bea8c473bf76665494e3fe3fb77a327eb77
 EBUILD cdrdao-1.2.4.ebuild 1284 BLAKE2B 7485eaab37ac6a7135b9eee4fc5662ba3627bce46a059296c5f19320f35c0b3c48ccbf1ad583eb1ed5dc860cf24f6f15903317369384d628fb1fc848d9073d78 SHA512 42a46ff652308f2aa7595dde209a5757d51825090132527d2bd28cba019b0d860699e970c0e4f6d28afc95c48a9a235b0b47bbca652142391b28fa059e5f1bd3
-MISC metadata.xml 396 BLAKE2B 3ff854150552e92c6c593a97364fffc98f7618115adf29fc6f1bbbece071a72400b0119a1fe088d9c73cb2f4c561a4a2174e4ff970194e37a8688f305ee352d8 SHA512 4e3d11ed9565d6f406fc78f190e0cc08f81f8f5cb4090f568bc11324100794a0856cdad99a521dd729cdfe7c1c53cac35f9e886de1eb5d2567cfbc5681f66a8c
+MISC metadata.xml 625 BLAKE2B ff700b39fec5af69fa8cb3b67b739f27c377ff403d6d6d7ff6683bc692a8ff39460cb368e8d7953d6ccfba8742eebb2399da02023677fc4569faabf32ec72325 SHA512 caf28974318f108e9cb51245a2f42431f32663a7b87d40437faeb4e2350572901ff9d78eb946a11d6be74cdd7f3ff7f42d98033cb44965d0a6b22d82eeac286e
diff --git a/app-cdr/cdrdao/cdrdao-1.2.4-r1.ebuild b/app-cdr/cdrdao/cdrdao-1.2.4-r1.ebuild
new file mode 100644
index 000000000000..4bdda62111a1
--- /dev/null
+++ b/app-cdr/cdrdao/cdrdao-1.2.4-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Burn CDs in disk-at-once mode -- with optional GUI frontend"
+HOMEPAGE="http://cdrdao.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="encode mad vorbis"
+
+DEPEND="app-cdr/cdrtools
+	encode? ( >=media-sound/lame-3.99 )
+	mad? (
+		media-libs/libao
+		media-libs/libmad
+	)
+	vorbis? (
+		media-libs/libao
+		media-libs/libvorbis
+	)"
+RDEPEND="${DEPEND}
+	!app-cdr/cue2toc"
+BDEPEND="gnome-base/gconf
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-ax_pthread.patch"
+	"${FILESDIR}/${P}-wformat-security.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-cxxflags -std=c++11
+	local myeconfargs=(
+		--without-gcdmaster
+		$(use_with vorbis ogg-support)
+		$(use_with mad mp3-support)
+		$(use_with encode lame)
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/app-cdr/cdrdao/metadata.xml b/app-cdr/cdrdao/metadata.xml
index 7dc22fa1c02f..c4d81bdcb729 100644
--- a/app-cdr/cdrdao/metadata.xml
+++ b/app-cdr/cdrdao/metadata.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>martin.dummer@gmx.net</email>
+		<name>Martin Dummer</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
-	CD command line recording, ripping and copying tool.	Especially ISOs- and
-	bin/cue-files are handled very well.
+		CD command line recording, ripping and copying tool. Especially ISOs and bin/cue-files are handled very well.
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">cdrdao</remote-id>
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index e161f4db4647..9a2d1e0a2b86 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,5 +1,5 @@
 DIST cdrtools-3.02a09.tar.bz2 2156745 BLAKE2B 3e7a7ed65faffc67d53df8dff78562dd28f2e71bb01c36f9c57c033a4a812e6a5579a212322a15c8abb5c8005d38e6e9ba5a5bfab46d9a729a673aa8ce3425e7 SHA512 59c31186f163c7aaa96083efeb0bc31e697c5d53d3343ec487eddd90dc8df6cfee50a69859a64a7004585c73a081cc453cc647c563b32ef74070d075039342d4
-EBUILD cdrtools-3.02_alpha09-r3.ebuild 8173 BLAKE2B 190449712525437fc7c95e633454e7df33d8e9c6a1c7600012adbf25fe4a3827a86732bdf6eb570113839a0e81564b7cd354be206b81a46eaba9a16ab9e19c8c SHA512 83915ab1c34a908868585cd44f7d79a8139c9e694e235d65a1d43e2e9deb3684100f41bffacd98b94fa3e363a0836960afd9a6b84734919aede80a0c7b38f966
-EBUILD cdrtools-3.02_alpha09-r4.ebuild 8617 BLAKE2B 2354ada2471f0899967fa25d0706d9086db4344ef36820967f5cc68a858cbf5bd9cedb9b805ceb96c6f477d16bafa74d38d15f004fc094b0a83da15640db4710 SHA512 80cffa29bb69af76540d53511e8413678f036f917152a83fb35df655bcf274972859f91c4624f00d7096da3046d7dd14faf1ea9ba0eb9b63772e96d1622e94b8
-EBUILD cdrtools-3.02_alpha09.ebuild 7877 BLAKE2B f17ef5dccacc490ace542c9d76df52998623ba25a649814d06a50e359ae1adee23b81a31fe4d1bf0ece4367901c8719d92715187db2945fcf1359e0f900030ec SHA512 8968ef6bc7a9f030cee3eb93a21ed9334148de742ce80bcd4b8032fefbff3faed50798ca96881e8ec60a291de9dbb6772c35b64532772a8136c2ece7b9142a59
+EBUILD cdrtools-3.02_alpha09-r3.ebuild 8176 BLAKE2B 47e5d32a77a929a0982e8823b72f424a88668e3e42bde40bf0a633e587fdaf27ed1a9573d9029f6f46cf0928813e498f070d2338258edcdd97e71bd01ee35932 SHA512 6a53a2eb61a2c6d370eb701a7007f6d5f411a5f22bd0de72d7a9d639111857f24f822eb4ce94115e012ce6db4dc26ecaf74802114aebdf752c6931f39c0ad567
+EBUILD cdrtools-3.02_alpha09-r4.ebuild 8621 BLAKE2B 3c852c9912b64d1f018024f9d19d425dd3b79f8626e4bbc9d3cdfd20e9eee8c4f15c534fbb5c29b68848612a86f1db00a26f45a5133a0a7fe2bfa2a1fa9ad415 SHA512 cacff66bf2cab9f922308e07b62745db8af3c8725f2393a34eb62df106b61d3321a38989681359889f8782b29301d7a21f136bc1a09bc6af1a72d919d9569983
+EBUILD cdrtools-3.02_alpha09.ebuild 7881 BLAKE2B 3ca107b16e92797b85e0fd09a5e205db41d73977220998d7b0baef7d29120bb0cbbeb788c739f98d9e3b8f4bdcda5f6b2a5a57b2cf55562edc2d82136a6d8aef SHA512 0835b77c2af21e5cff24ab0da2d089273b2984eca57087e3e0e92f0cc01325718d7b583f87179d8dba9bb3ad2d46f95752afce55b5d51bc678cc0a3c33bb3c67
 MISC metadata.xml 445 BLAKE2B 43f12bca87633d1b039beed2fb401b652eafb937afc8a27d9d84885d306636bc29978beb17426dc782cb7c2e7ba9333b9346b6455fa72db2b778800f39995476 SHA512 c552eae00d8560d482fcb02799f064f5481e67ec12107760c841620db2d3023826377e186f5dc1b3555eea9b40964b4c7020b1deb82574ff1ff3ad7fd957bde9
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild
index 425a7139ca91..4c8c0cdc196d 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$
 
 LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl caps nls unicode selinux"
 
 BDEPEND="
@@ -78,8 +78,8 @@ src_prepare() {
 
 	# Respect CC/CXX variables.
 	cd "${S}"/RULES || die
-	local tcCC=$(tc-getCC)
-	local tcCXX=$(tc-getCXX)
+	local tcCC="$(tc-getCC)"
+	local tcCXX="$(tc-getCXX)"
 	# fix RISC-V build err, bug 811375
 	ln -s i586-linux-cc.rul riscv-linux-cc.rul || die
 	ln -s i586-linux-cc.rul riscv64-linux-cc.rul || die
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild
index 6d509d8f5364..d57c022de7c1 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r4.ebuild
@@ -78,8 +78,8 @@ src_prepare() {
 
 	# Respect CC/CXX variables.
 	cd "${S}"/RULES || die
-	local tcCC=$(tc-getCC)
-	local tcCXX=$(tc-getCXX)
+	local tcCC="$(tc-getCC)"
+	local tcCXX="$(tc-getCXX)"
 	# fix RISC-V build err, bug 811375
 	ln -s i586-linux-cc.rul riscv-linux-cc.rul || die
 	ln -s i586-linux-cc.rul riscv64-linux-cc.rul || die
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
index 60454053d67b..ff5c7db00ebe 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
@@ -71,8 +71,8 @@ src_prepare() {
 
 	# Respect CC/CXX variables.
 	cd "${S}"/RULES || die
-	local tcCC=$(tc-getCC)
-	local tcCXX=$(tc-getCXX)
+	local tcCC="$(tc-getCC)"
+	local tcCXX="$(tc-getCXX)"
 	sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \
 		rules1.top || die "sed rules1.top"
 	sed -i -e "/^CC_COM_DEF=/s|gcc|${tcCC}|" \
diff --git a/app-cdr/dolphin-plugins-mountiso/Manifest b/app-cdr/dolphin-plugins-mountiso/Manifest
index ed8dd67b6896..6e8289df3423 100644
--- a/app-cdr/dolphin-plugins-mountiso/Manifest
+++ b/app-cdr/dolphin-plugins-mountiso/Manifest
@@ -1,5 +1,5 @@
 DIST dolphin-plugins-21.08.3.tar.xz 254604 BLAKE2B 9a7a9c7a1cf82d458c1fd0bbce6b47c233b8a7a20bd1d1696bc75d6b04c8e4a9d6464025d8ad39b3bb96b8dd428fb880a5d318f7c0d13ef3bc8bf24a42c24169 SHA512 2fb7fbd6490d768f3eb7d756429d858337b8088a7c87836ed4a54fc3f863f50c4973bbe2ae149d53d2769d7ce3c31fbd737bc4afc74fd14260a158da83992076
-DIST dolphin-plugins-21.12.1.tar.xz 254672 BLAKE2B ab30e233774bd4d1bcd2446e19180235ba04248cf636f2c3dbe8b0e0c4a5756a35fbde78f429d2daf03cff969d47023395958305c94b3ab05e614f1e004347f8 SHA512 4fc0eb757cc32a881c0f764a09acc7aa1b8be302b8b74608121151a3ddb4cd3a2b299c0eb1fe5d7dcdf702cc331dd2bbda986bef079f9110a6fb0b9274ce397b
+DIST dolphin-plugins-21.12.3.tar.xz 254696 BLAKE2B e669a8acbf8b5559a602dd3ae646e2384b89a672bb0ed42d2f094b75a1eaefd6994644daaa70d17f9baba8ea491cef632090050b93e0f5e0b50f203a6166338e SHA512 3dad72b6e0283a8c825aded82e9d15bc5e03303bbfc6dd8f1e6af2cb3892ec9b04a3c97f01246e20abe6d86e5a91fa1c4f8fff48ed24186a3780009a78298d23
 EBUILD dolphin-plugins-mountiso-21.08.3.ebuild 1520 BLAKE2B 1b84b974e4b0c854e17cefed151b0d5547013cd2bcfb6d3ec7a85daf254fe2f71246bd56a64e5af3a9a2ca923c9601ac04c2fdf4833287e76c704602d315eb3f SHA512 bc96692b892f4b1348ddc53dad7faae7d7f3deb7a9de7a491ed36ec95ee2528480048bb467bacd2aca1d9a8bba98f2b002c10aaf1f42e1271e790642fcedd5a4
-EBUILD dolphin-plugins-mountiso-21.12.1.ebuild 1515 BLAKE2B bce0b53f939eba7251a64726776a88c4e4ed199c84d09f86abf831acea2029e42cfe81ccaeba4d7a006c0097b1e5a77de4e842e76850246e615acf8d5930e816 SHA512 9d46a1c82d40eac5a87a7c40c7629c1361d9d3c46f707d5f4340bc415e86725e8582a11d5cbfdbf519d90aa1636cbffe15de0df189e1e9345b1a67d6d5626441
+EBUILD dolphin-plugins-mountiso-21.12.3.ebuild 1515 BLAKE2B bce0b53f939eba7251a64726776a88c4e4ed199c84d09f86abf831acea2029e42cfe81ccaeba4d7a006c0097b1e5a77de4e842e76850246e615acf8d5930e816 SHA512 9d46a1c82d40eac5a87a7c40c7629c1361d9d3c46f707d5f4340bc415e86725e8582a11d5cbfdbf519d90aa1636cbffe15de0df189e1e9345b1a67d6d5626441
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-21.12.1.ebuild b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-21.12.3.ebuild
index 79a49e47e56a..79a49e47e56a 100644
--- a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-21.12.1.ebuild
+++ b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-21.12.3.ebuild
diff --git a/app-cdr/dvd+rw-tools/Manifest b/app-cdr/dvd+rw-tools/Manifest
index f51a6c320d74..84f54feb2643 100644
--- a/app-cdr/dvd+rw-tools/Manifest
+++ b/app-cdr/dvd+rw-tools/Manifest
@@ -11,5 +11,5 @@ AUX dvd+rw-tools-7.1-lastshort.patch 593 BLAKE2B e24b41b6eb39961568133f91a110afc
 AUX dvd+rw-tools-7.1-noevent.patch 783 BLAKE2B 78f27d65759b98607ac6e3eb29ce44c2d88029f7fdaffd3a6d305166b82a069c8a8621b2c680bfbb3a9a2e6585370bc6c1503b4107e903f69099565bfdc0de8d SHA512 0df88a56b3b776934fea0caca1ac247b5b5416fa4985601ac7996633a833b4d264b334d6bb9c5d7587227529ee36a7f2087fad9f6851b4cde8918204d8718b47
 DIST dvd+rw-tools-7.1.tar.gz 140846 BLAKE2B e456be6ee8d1863e78abc6d494a1ce08a49e3aec9b45533408c33ff4620dfc450b968280ce0453b0c0d966f3afca0d23e1ed7e3497caee8216561ad85599b138 SHA512 938f9ec5597158af275c7bf63002696ba362f6f22a219108c6a1df28792f0485046a7af5ce57e41695aaaa0d69543bd66cbbeb4415df5c0e0a902a3f1d278a31
 EBUILD dvd+rw-tools-7.1-r3.ebuild 1536 BLAKE2B 079c22093d821610304c2b687b14feb4e15d70c50acf897c97c40a3d99c9783174feabd7ab08029e85a4011a33ff759d607429b04889f0a56938c37c22919e08 SHA512 e9eeacdc4c4ef38eca0195b90ad1fc6a5e8722c637fb5dcc608a131cc496efdc7f37ac5e2180276e65337834bc1a8dca18c46e3e3624e9447cedcf90f6a0c376
-EBUILD dvd+rw-tools-7.1-r4.ebuild 1630 BLAKE2B a69486fe14572584f48efb1f2859a3ff913488829212d79ddc7cad239b2cad393090c8ea8e3646c00aeed9dbe801993015432ab7aa8a0d7c181e3219927a1f8d SHA512 d4e11f7764c8169919a763c9fe4d9dca2ca8a263837c2e933fc84e36fe3514842780a8590df3c48922afcf56a1d8689e9bb68987f98baf6970cbc74382e11127
+EBUILD dvd+rw-tools-7.1-r4.ebuild 1629 BLAKE2B e1e0af3b4e5af6e758b14b7d243269c794973d3cf8ce5c9b53e62d60128939c0662e2828359a4a42738643664a68f7de00527c20c786ab7492d3e096881d36dc SHA512 0eee3493c96c936aaaefd27fc52016c8b4a3940789da1c97705f100db799b0b725161373c884debc52b904172a0af5c47d1dcaee69c8cf04b8d3cbae1c06f948
 MISC metadata.xml 403 BLAKE2B 792a6072f6a596de2a7e859c32970ddde144d8aed5a02177922f6c204dddc6a937fdb6a88b36a08831a75dbe3453835b118cecd129ceed15545f257d93f66059 SHA512 d7246446af71367b4eed423b1006956cdff0ce074891966b366dcc67af5d9a60dcb29ce366d04bc220d14bef8ba6dabdf5558264be826f72d3bc77bbc63482e1
diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild
index 7da5c5623c03..a1505f94a078 100644
--- a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild
+++ b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.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
@@ -10,7 +10,7 @@ SRC_URI="http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="app-cdr/cdrtools"
diff --git a/app-cdr/isoimagewriter/Manifest b/app-cdr/isoimagewriter/Manifest
index ee6e75f9c005..e0d61cccc28c 100644
--- a/app-cdr/isoimagewriter/Manifest
+++ b/app-cdr/isoimagewriter/Manifest
@@ -1,3 +1,3 @@
 DIST isoimagewriter-0.8.tar.xz 430368 BLAKE2B d540ca0ee874b633618480ff5cc30ceea5f0aef84e3e4b0236fc6474ce590661ca8728a3719cc733cc791d14cfdcaad609ffa32d79b99df141381aa3f35edec8 SHA512 1d5031695647be54e5de10f6243b68bf8d2dc29a7894c8ac69954df353d5baa740290b572c89cd37650718749117f5e3b25dd99b8b374d8ba0376288878f9199
-EBUILD isoimagewriter-0.8.ebuild 668 BLAKE2B e8764f7dc2751b3250f147493d826cf68a4718e726a23c689558fba78765399dd69b5a0e180b225fb205e7c9b6177395e8683eed5bd08a0211b826c83e30de83 SHA512 d313ab98ebc8ad9797b601fd14e7fca971af38e251a09e0585ccf92042294aedadb80f9c734c3ce87252147a132f865822909a7001990d2be4f7fe2de11aebc7
+EBUILD isoimagewriter-0.8-r1.ebuild 673 BLAKE2B 75f9407b7663d19f1141fc1cfe9bdb09dee09ba929557feda4e8c4004d78ba5725dd3ad9eeff430553e1d0758430bb4756eb3065bbbc09b7285e6662252e57d1 SHA512 91f707eabc5ea818de44d658fe2b469503c177703ee7c565f1f2a37ea78a999d19f8fa91d4ea9fcd1dbc322915273187dd6cc6534782f58eaf30f3a9c4a30004
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/app-cdr/isoimagewriter/isoimagewriter-0.8.ebuild b/app-cdr/isoimagewriter/isoimagewriter-0.8-r1.ebuild
index 54df9ef3f20f..23e3bc194eca 100644
--- a/app-cdr/isoimagewriter/isoimagewriter-0.8.ebuild
+++ b/app-cdr/isoimagewriter/isoimagewriter-0.8-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 KFMIN=5.60.0
 QTMIN=5.12.3
@@ -20,7 +20,7 @@ SLOT="5"
 IUSE=""
 
 DEPEND="
-	app-crypt/gpgme[cxx,qt5]
+	app-crypt/gpgme:=[cxx(+),qt5]
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=kde-frameworks/kauth-${KFMIN}:5
diff --git a/app-cdr/xcdroast/Manifest b/app-cdr/xcdroast/Manifest
index a21bd5b2f78f..35151d993509 100644
--- a/app-cdr/xcdroast/Manifest
+++ b/app-cdr/xcdroast/Manifest
@@ -6,5 +6,7 @@ AUX io_compile.patch 625 BLAKE2B e1737c621d4305fc67f871ae32301f440fab9cea25c9348
 AUX io_progressbar_fix.patch 806 BLAKE2B bb9b5a68580ba937a3ca16f9b5e7bab9a9843a23fa6058cd61d7b984e4a41c165e8c9b9dbb024beff5094d6f9a94ee71e3d9da080de245b949c35d742b678265 SHA512 7ac76062e49c7480157b16ad11d45ca81e6394515ad897fe59be8a6af938ac7d11e4d1160b21447c83e6aaed0147d29b3260a001d52eac1e806608e3b027d579
 AUX suid-perms.patch 1362 BLAKE2B c0ddb6945070c021eddca470df8e6f82882e490f8433447d0628a91c14601f0aa5e89ed1b058fbf2917e95b18a77fb8e26693dba4eba0b9324bb3aab20572bc1 SHA512 ca96f168cff8fe4052de92ac58451d39532d959be428284da7dc6307f0cd36e661e760b8dd5f5902260cc3a953b51e894b4b87ca4f0340f98f079da5c97c4a7a
 DIST xcdroast-0.98alpha16.tar.gz 3563666 BLAKE2B 781f06e89265e9f30ea651d39219d7083a2cfc2833bc2ab0b57d9f67de77b2eb8aa6755148cd259e3c188a72f07026ecda91d0bbe09af4b55c696c75274739e0 SHA512 dec789955eb70a14f6bcb7c0895a6ca4b7c471cc5ee7ab12af1e671c8586c481c4a05e20eb42724d686d561a551809d9437dafadd3cd081079cefc28e0b94df7
+DIST xcdroast-1.19.tar.gz 3448552 BLAKE2B 2e4e2b5119d5002870142d95345ddd33dad40c5a9d7517594da0dfd945bea012d5391b61fb6264d790aaaacf4de6b990fc77f4b40fab594ac1a5d2279dafa933 SHA512 79449353ba5a1be990366e85bd807e4ef35ec19f021986634ee9549608dca0e447b61dbbed0f30f588baac49fc6b93c055800bedb629ff77274d7da7c39d7881
 EBUILD xcdroast-0.98_alpha16-r3.ebuild 1513 BLAKE2B 3fa1536535cf517fcfb247f8aca2eae1365c388a0cab1651aa9598b3b6c784c16c91b3c0a808b467221ad8a44df08f5ffdd9046e62035ab150b5a214a291e920 SHA512 b15971f106fe8cec6224356123fbb28fc9c4ac25c9491c1e4d305192fa3a988286c11524312aa38e92cc98dcf9a0f7c696e242b0efad5ffbd49aadb2ca8dfc40
-MISC metadata.xml 329 BLAKE2B 8fb3332cfdec115aed5062756a2feed8fe6b981d7936254143765ca461e38ed52e1d6e0f04f5cfec333fbd3066f04fbfcaeea493f1a8ea66a52d5ab25d553904 SHA512 3799b123b2053923fbb6c065897d3195c73eaf3fa3eb17ea5fce3fbda4af8f1fdae7fbbee351353d31b51bc4492706561a410d630bb5d28c2f5792365aea41a7
+EBUILD xcdroast-1.19-r1.ebuild 839 BLAKE2B 527c8275d210209c57c66599995434e8a53149a845d904b7c2e3c55e641fedaf071f568ef8cf72e7fb155b2cd37a4a365f9f64b366708d38508d0d520e1d2e76 SHA512 3c6c58356eb70a12fc28ee0d92c279d9415492c8ea59b66f79d799bca45ca3403c0843cc75c2ec0dd529c24806bf06560b6108ec5dc9ea4f8e4b3374d9ad81d3
+MISC metadata.xml 245 BLAKE2B e15022e3e73c9053c3465d1bd1fc1e652d9194ef5e98d0199152716c01b21244edc7b10af28209408b47e5fdc9a476c316072de87c017297ddd9ccc6f255ea7d SHA512 e4085522aa9abc0509372f8f63ac0ea3de80e6ba697b2acc0f6b822598c99b3967df43413305b9dafb4b2dff0f11adfd5e5732919652ab0812aa9f364fde32f2
diff --git a/app-cdr/xcdroast/metadata.xml b/app-cdr/xcdroast/metadata.xml
index 27169b9f6ce5..385e9d104dae 100644
--- a/app-cdr/xcdroast/metadata.xml
+++ b/app-cdr/xcdroast/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>bircoph@gentoo.org</email>
-		<name>Andrew Savchenko</name>
-	</maintainer>
+<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">xcdroast</remote-id>
 	</upstream>
diff --git a/app-cdr/xcdroast/xcdroast-1.19-r1.ebuild b/app-cdr/xcdroast/xcdroast-1.19-r1.ebuild
new file mode 100644
index 000000000000..17994dcb4dfb
--- /dev/null
+++ b/app-cdr/xcdroast/xcdroast-1.19-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop xdg
+
+DESCRIPTION="Lightweight cdrtools front-end for CD and DVD writing"
+HOMEPAGE="http://www.xcdroast.org/"
+SRC_URI="mirror://sourceforge/xcdroast/${P/_/}.tar.gz"
+S="${WORKDIR}"/${P/_/}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="nls suid"
+
+RDEPEND=">=app-cdr/cdrtools-3.02_alpha09
+	media-libs/alsa-lib
+	>=x11-libs/gtk+-2:2"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+	nls? ( sys-devel/gettext )"
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable suid user-host-mode)
+}
+
+src_install() {
+	default
+
+	dodoc -r AUTHORS ChangeLog README doc/*
+
+	newicon -s 48 xpms/ico_cdwriter.xpm xcdroast.xpm
+	make_desktop_entry xcdroast "X-CD-Roast" xcdroast "AudioVideo;DiscBurning"
+}