gentoo resync : 28.04.2021

40 files changed, 309 insertions, 149 deletions

diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index c9a40c32524e..1b5af049ee84 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/brasero/Manifest b/app-cdr/brasero/Manifest
index d571d975c4f6..92959389bcb4 100644
--- a/app-cdr/brasero/Manifest
+++ b/app-cdr/brasero/Manifest
@@ -1,3 +1,3 @@
 DIST brasero-3.12.2.tar.xz 3742120 BLAKE2B 42cc60d3f4e26e948321c34f2514172aeac5a1b2624e6b23f27cc9725efd5cf0844a54175161b4c94601bbd5c4a6f18ccdd62353e862eddaab17e0d164f4694c SHA512 14886e772123f179f79d3172b59e21ced990fd8834cd27e8717eb635a75163c44c1d5084818b53da559a0c2ef25e7c0da4a3a7d3781e2ea74b59cfe98987384f
-EBUILD brasero-3.12.2-r1.ebuild 1966 BLAKE2B 64356df46aec4079532b22f9e4a9f5ab68dc2d88e0d49c31acc4b776c87e51af1e99a9abe2bacea7267944097cfec49063afb44f294346bf5418d97ea66e5d93 SHA512 a9bdb3a140a76bfe07e795509d3e568297b18218a6dc80dc94b0097ba7f983964d8acbdda5fa6ff05466ee70abc4e1a55c212927985732476557e0d91c192d2f
+EBUILD brasero-3.12.2-r2.ebuild 2092 BLAKE2B 1c0dbb77b9eb0119c82e7617966053f0e9970c356b7e395eab70c9081c94f2e7f4b0d6f44188aa804ee0371b9cec4eb5008685f3fb72162b8654cbccde71ce55 SHA512 dfe209442fbf441d96c252cdb4a81bc76fb41144c07f307aa49fe271593dd90f77ac0abe81521f448692342e9cc16eaf8e30554e640460aa80cc1f44385ad16d
 MISC metadata.xml 746 BLAKE2B cc74b666873593a356e42643f62e16a4919441f08ce9645e367ce5f52b6b3c3d0a2bd1a5bc64b49348239b04c7543a66993926d216a7ada19f2129417106e1dd SHA512 9824ae80fa067cedf46aa47f83d481b18704b94af6258657eb099bde328abae196b8f86ce7e92a800fea6b657b5a774afc37888fb92b560fda1403d8adf06c7d
diff --git a/app-cdr/brasero/brasero-3.12.2-r1.ebuild b/app-cdr/brasero/brasero-3.12.2-r2.ebuild
index 917812f33104..3c5638c56409 100644
--- a/app-cdr/brasero/brasero-3.12.2-r1.ebuild
+++ b/app-cdr/brasero/brasero-3.12.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -74,3 +74,9 @@ src_configure() {
 		$(use_enable playlist) \
 		$(use_enable tracker search)
 }
+
+src_install() {
+	default
+	mv "${ED}"/usr/share/{appdata,metainfo} || die
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/app-cdr/cdemu-daemon/Manifest b/app-cdr/cdemu-daemon/Manifest
index 66687da09efe..3889066782c1 100644
--- a/app-cdr/cdemu-daemon/Manifest
+++ b/app-cdr/cdemu-daemon/Manifest
@@ -1,3 +1,5 @@
 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
 EBUILD cdemu-daemon-3.2.4.ebuild 1137 BLAKE2B d7f1e6223350898280bd4fc40ea09cb3906b0cc8c5c4f11b999234a13008e3346ea9f40c74bea10dd189b6e71d9c6a8370df286cd406c6671ad2849e3fff7cd5 SHA512 8db90ffaae996a013b7977eb6ff7c35502cc4a76776028c657b9d64968a59e50348624d971b9e5683273a4c12892ae01ea1b2659d67e41bdc83baf44336c58f9
+EBUILD cdemu-daemon-3.2.5.ebuild 1250 BLAKE2B 0451eb13c3047608826e556639c99931b9645b97a5a9b16a4bea5a02dd926939639f97c9de9c934e4bb9d92757c4e2e81ea6c2ec7dbc0b22421755c9bbd18ed3 SHA512 437dfa697e7fb1c5cb82ddc9e58ae86d076d77ae6adad57853cc89b474511b75f00ecbae4e2aa77d14b946a9d090676d3ae1f8d98bd3c2754dac3a63f25eb6b4
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.5.ebuild b/app-cdr/cdemu-daemon/cdemu-daemon-3.2.5.ebuild
new file mode 100644
index 000000000000..ddfa7e43cf65
--- /dev/null
+++ b/app-cdr/cdemu-daemon/cdemu-daemon-3.2.5.ebuild
@@ -0,0 +1,46 @@
+# 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/Manifest b/app-cdr/cdemu/Manifest
index b3d353ee45dc..2c9fa5304214 100644
--- a/app-cdr/cdemu/Manifest
+++ b/app-cdr/cdemu/Manifest
@@ -1,3 +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 1148 BLAKE2B 2cd75916330a18dbee969689c64280a8513677ef30939a53dc9991ab03f9fe9ecfdebfd9109fae72073b2dfebd07b0e021a9bffdcfc0682f5f33f5ea5edeb3a5 SHA512 519f6cbffec8f58cd8d9bdcc796fc982a0f5440a177929487f1935ac05bb8ac95f0387fac5392543fde04b2f3e780bfb725bcac9743bb5b240eea931fed91038
+EBUILD cdemu-3.2.5.ebuild 1282 BLAKE2B 4eb0f5ca3cb7aa2e86c4260e1c77d2cca7f89cfaf8b212c420eaec0519085a9970ebe7c7e5833d870c27ec0dbaccdef724a5ff6f73037c026af7dce6283fe2aa SHA512 49a4e663981dfcc4c0b051297fdc3f746ab3fdc4ae751ed80e5566bd987c34ec26545017a2ac22dfbba3f7bf3b821c7a994937dd9953806b2643dc3edb553712
 MISC metadata.xml 529 BLAKE2B 88d72a301708901597eb11c475ae67d8477381c77d430b49042cb4a8658aa44b88273858f87cbbaa1fc16ae222b604fa9ff81f6f791d39c39d5c76b58b9d0d81 SHA512 27850929d16910038f7b406c0ec4c22648c91a6f8a8f9cd56c0a3ea8e4e772de9b77598514c5a621eb71386635a327829251a90128ba33073ac34485a3b60a92
diff --git a/app-cdr/cdemu/cdemu-3.2.5.ebuild b/app-cdr/cdemu/cdemu-3.2.5.ebuild
new file mode 100644
index 000000000000..6187021b80e4
--- /dev/null
+++ b/app-cdr/cdemu/cdemu-3.2.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit bash-completion-r1 cmake python-single-r1 xdg-utils
+
+MY_P=cdemu-client-${PV}
+DESCRIPTION="Command-line tool for controlling cdemu-daemon"
+HOMEPAGE="https://cdemu.sourceforge.io"
+SRC_URI="https://download.sourceforge.net/cdemu/cdemu-client/${MY_P}.tar.xz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+cdemu-daemon"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	cdemu-daemon? ( app-cdr/cdemu-daemon:0/7 )"
+BDEPEND="${PYTHON_DEPS}
+	dev-util/desktop-file-utils
+	>=dev-util/intltool-0.21
+	>=sys-devel/gettext-0.18
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS README )
+
+src_prepare() {
+	cmake_src_prepare
+
+	python_fix_shebang src/cdemu
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DPOST_INSTALL_HOOKS=OFF
+		# requires bash-completion as BDEPEND, better install it manually
+		-DENABLE_BASH_COMPLETION=OFF
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	newbashcomp data/cdemu-bash-completion.sh cdemu
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 3ad84cbfad42..e1202bd7d986 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,6 +1,6 @@
-AUX cdrtools-fix-clone-uclibc.patch 2582 BLAKE2B dfa564f67e15dfcdab9e654572c95f89787fded558e88edecde89237ea5097b6a6cc0233b5950f0df460490af415255a56130d27b7198b3c1fee279e288835f9 SHA512 23031747c1d7bc0292beb754f059381df1f1ac7851c9fdb7f296c933f3a9d7c4e52848f90ab50c459432628d74a7546752b299d74199259d84eb89ce92ae0077
+AUX cdrtools-fix-clone-uclibc.patch 2405 BLAKE2B 6fe443e87aafee2a6e4b9ef5d6d6e9b01f8b77095ce7e6b249338264b75adf6b600afd1c4758fb1d684f01fdbd30b9285bac132064df21cca52e6ed644d69c4e SHA512 17c184d90f10f7ebde0c621b349255eb284f9b940ec6cd63427249a9bd6e16d998f06a8eab930fa03afb4ed1589421b6e57f0b183e3d4aa837c0ad65ad413727
 DIST cdrtools-3.02a09.tar.bz2 2156745 BLAKE2B 3e7a7ed65faffc67d53df8dff78562dd28f2e71bb01c36f9c57c033a4a812e6a5579a212322a15c8abb5c8005d38e6e9ba5a5bfab46d9a729a673aa8ce3425e7 SHA512 59c31186f163c7aaa96083efeb0bc31e697c5d53d3343ec487eddd90dc8df6cfee50a69859a64a7004585c73a081cc453cc647c563b32ef74070d075039342d4
-EBUILD cdrtools-3.02_alpha09-r2.ebuild 8297 BLAKE2B 65e19383adf285dbd5c17198980065b72ae68b1d3fb0230bdf24c99dd75d676a8be7bbbe8341c4b1f8524c8fd2df924415e5449827a7f4b8b1550b27b0237ceb SHA512 18a54a75aa91f13f264d7727838185bf416bdc6eafff2c2eca8114135e049811252640a5b11a676456009700ac4e4152e890d3b565c8dd8213de559612ed436f
-EBUILD cdrtools-3.02_alpha09-r3.ebuild 8390 BLAKE2B 6d52220fe1cb9167b30046a5867633a861065dbde79be6f94c248e0aa2f00fcd3141b53ce4fc9b4238f50c7d489720eb7ff85a0963164b373846a23967835bdb SHA512 3ef7fb1d5eac6b11794c381926d81c4923d3bc4ff4883dcbd9b5e2add1159b870166bc3d9251150a5603ea426f954c69e3774942260800eada6eabe4133d7aae
-EBUILD cdrtools-3.02_alpha09.ebuild 8228 BLAKE2B 3098d78b8e24cbfd05561414efad292df734be83ce43467ba42f4f55e228d25591a3edf5d99c78536d78ee555d4dc43d552b8ebfdde04dd8bfc5cf72b47db318 SHA512 6249c073bba824c75157ed1fa951264dda8aa00ed59311f037a3f146705f6009640dbf903fd53ede517310ccb9420343ef5772f91454c5552b605cac134a015e
+EBUILD cdrtools-3.02_alpha09-r2.ebuild 8298 BLAKE2B 92eaf5035bec31a10ffaed49138f4de28a75f5ccf0a3ff6401d6e3f84e0f098966318091782174814e97ef5c7199d1caef643dffae4edfe820960413b680e852 SHA512 c01148b8575d22082db7149a9d35df2d882af4914e93913fddca96c8ccc90a0dad9a2a34e54d5ede8ad923fa1c095794c6d11714001310a8e2893d02fe0ea12e
+EBUILD cdrtools-3.02_alpha09-r3.ebuild 8384 BLAKE2B 4fc7ae83367d37e6826baefd0d82269ee51b8fba295b3c2e05d45a45908f81f791d56141b0a77360084db8b3330b8e68c00985843cde466c52a8d0376122ee9f SHA512 8657702c20daafbb779c9b9993e67ccb394bad99bdf9d969e0ac4789bf4bfce9065f8c0c000a41ed58a80472ce67b861797c60e992eb22d1151d303e8e9b0c7e
+EBUILD cdrtools-3.02_alpha09.ebuild 8229 BLAKE2B 4fca2a03eeadcbd6601401ef93c26df3ee5896c1a1b11e865f49f14d4252ada0b9006e5191cfac24efdb4dcad1e4e9212f77c8886653929a92704acc79b757bf SHA512 560007695b98ed541e35fdb9d1a97de494cefe7c10e0bb95bcc9d59abd3b295a286d16de92239a32714e006fed8899038f0d191e70cc32ea01097c020b8d8a3b
 MISC metadata.xml 444 BLAKE2B 4d6375fb99e7751846883ef73422767522b2d43c9d48869a9babac90e507b90e076a80b6cb9e920869c07000d64168b1cd1b75c1d7655e9b06c0a4a2bd957fdd SHA512 0945a0d302bd8c16b1512a8b63250bd39b7685121fb26dc9677b6c4fb1c81bee41b104df07fa77f83cb8a8461ccf408a0ce2a3cd979bb943935109f4b664b020
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
index b86d95dc2ee5..5ff3221ef76d 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl caps nls unicode selinux"
 
 BDEPEND="
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r3.ebuild
index 38f39f61459a..fddb123d5e83 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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl caps nls unicode selinux"
 
 BDEPEND="
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
index bc2a268925bd..f11ca585ee0f 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09.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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl caps nls unicode"
 
 RDEPEND="acl? ( virtual/acl )
@@ -48,7 +48,7 @@ src_prepare() {
 	# going to include this so let's try to carry it forward.
 	# Contact me if it needs updating.  Bug #486782.
 	# Anthony G. Basile <blueness@gentoo.org>.
-	use elibc_uclibc && epatch "${FILESDIR}"/${PN}-fix-clone-uclibc.patch
+	use elibc_uclibc && eapply "${FILESDIR}"/${PN}-fix-clone-uclibc.patch
 
 	# Remove profiled make files.
 	find -name '*_p.mk' -delete || die "delete *_p.mk"
diff --git a/app-cdr/cdrtools/files/cdrtools-fix-clone-uclibc.patch b/app-cdr/cdrtools/files/cdrtools-fix-clone-uclibc.patch
index 9ffd28a5ba5c..4ba244bf32b7 100644
--- a/app-cdr/cdrtools/files/cdrtools-fix-clone-uclibc.patch
+++ b/app-cdr/cdrtools/files/cdrtools-fix-clone-uclibc.patch
@@ -1,6 +1,5 @@
-diff -Naur cdrtools-3.02.orig/readcd/readcd.c cdrtools-3.02/readcd/readcd.c
---- cdrtools-3.02.orig/readcd/readcd.c	2016-01-24 11:15:19.000000000 -0500
-+++ cdrtools-3.02/readcd/readcd.c	2016-04-09 12:29:54.727635502 -0400
+--- a/readcd/readcd.c
++++ b/readcd/readcd.c
 @@ -257,7 +257,7 @@
  BOOL	pifscan;
  BOOL	plot;
diff --git a/app-cdr/cdw/Manifest b/app-cdr/cdw/Manifest
index 913da6f24a7e..33776894cd52 100644
--- a/app-cdr/cdw/Manifest
+++ b/app-cdr/cdw/Manifest
@@ -1,6 +1,5 @@
 AUX cdw-0.8.1-fix-ar-call.patch 680 BLAKE2B a258766221e3be5eee1d8b1ed9670b09d6119f868caee45c2af72e6c83d44c9073b679162fe275d98e4aa5f8a0e1d558cee83b7eb114d6a7584cff6c88a90a54 SHA512 412da6962e86f263214e883935778cab987a0895cd633dda250a80155f5304350dd4c0682d0b3f262c8801b6bfd858349b44af08288237b5c0d53ef0cd4c0dc6
 DIST cdw-0.8.1.tar.gz 858791 BLAKE2B 971a5c69ef1452bb4fd02e74bb2a81492de5dc16c024d185c43bb19aa0e293b727e74f72ce73ef3aebcdb941500f95433dc6243f1171f68943b2dbe7bdc176f7 SHA512 08f6bac823f534987835f434190601d0a72df2246ff78bfe1af98fd30dda25edb8cf2e09161b3a0bc55e9efefbc453b409cc95fd3c117d447f07e49f79072e33
-EBUILD cdw-0.8.1-r1.ebuild 773 BLAKE2B 21f23121e6a768553ba716406f5f6a85f2439ae89f72d3c544be6da81804966a2df259c22470608a50183afbff0dc3e612eda3915481eb7bf696806a1a2da9df SHA512 4a638e201cc290a51223f48eaf82a46b05e50ace89bf881952ab0e76e66fa38077d84dd8359e8a133bd53774110f83b2d6949f349629cd1b7ee774e37d7f1f1d
-EBUILD cdw-0.8.1.ebuild 683 BLAKE2B 7db6d921230dc4e4ef268c3d20399c428de148f5a1293593530f6f651736d3ecc9b6ae203d209a490890d4379e54e34f06e9857901e809bccf7108020bf79213 SHA512 4c0447b1797904aeb82b6137d1cb5be39a37510171dc5c7457ab796168ab6fa1a5560ad41fb3db5bde9420e415101e1b8eba12e2796f33e9c70f71f546a96bd6
-EBUILD cdw-9999.ebuild 849 BLAKE2B 90d2548a91d97e58118ab8d1bdd5ba50a36742c3ec35b8e163c3c35d46eff7d095c9a823a34c29cc1bff3447fe2c0234f6984da2ddaabbcbf55c1406ff81108d SHA512 a21229cfe723712d29c76746a3613c214ba6098ba13b3672096a2e756d203362fa4afb91c9a230d8e9f79328a3d59406159ed0713e9e3add5421f06ee6b2984f
+EBUILD cdw-0.8.1-r1.ebuild 772 BLAKE2B 4b06ec3921e5325cc14cc9927d4eeeaaf6306a12a073497387aa27010a349463d6c59f655ea9fd3699b8533bc4647a3b68c13359f7eafce0b7ad749a30864a15 SHA512 4ad309ca6f42f8ee3381b62be47b6536999bdd5fa83d52929d8144c2b64186ef4754d86163052538503b9905f5902c65e51bb90bd56b5feac6e40554afe184fb
+EBUILD cdw-9999.ebuild 849 BLAKE2B 1b3cec67333b8b9e3d252bb73e61bd3e29ded12e9e40ddb218a5a9776449ece9b199815408b0d5a257fc6c6e7c54b09f12e79dbe923397a235df39374a9f8e10 SHA512 69640a53715ab78d789874dc59eda68a433f39ed134da645fcf78e60a3b03e0007c3e38ceeb36e3aabd9f0c203cc12af8ac59b3bbcd3c067a9631e7a9cc86757
 MISC metadata.xml 476 BLAKE2B 37ecd4660e4f625f24214e7475616787265a19c2799e727834201fc9f4ab7d369a33d5e554e37daa4052c2250abd237edcc42fcf965a26a7827e1fa3cd85e23c SHA512 93c7458dd0ece6cc43f8cfed098a22d32e5032aaf92d48fa92f6be2c01f3a2c74f0edba1adcc035ed87e7a5d06be31197827432ea37e3df4ff70c7e8f17bb5d1
diff --git a/app-cdr/cdw/cdw-0.8.1-r1.ebuild b/app-cdr/cdw/cdw-0.8.1-r1.ebuild
index 317cc629ee9f..a059a13f7d59 100644
--- a/app-cdr/cdw/cdw-0.8.1-r1.ebuild
+++ b/app-cdr/cdw/cdw-0.8.1-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools toolchain-funcs
 
 DESCRIPTION="An ncurses based console frontend for cdrtools and dvd+rw-tools"
@@ -10,7 +11,7 @@ SRC_URI="mirror://sourceforge/cdw/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	app-cdr/cdrtools
diff --git a/app-cdr/cdw/cdw-0.8.1.ebuild b/app-cdr/cdw/cdw-0.8.1.ebuild
deleted file mode 100644
index b4597335f09b..000000000000
--- a/app-cdr/cdw/cdw-0.8.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="An ncurses based console frontend for cdrtools and dvd+rw-tools"
-HOMEPAGE="http://cdw.sourceforge.net"
-SRC_URI="mirror://sourceforge/cdw/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="
-	app-cdr/cdrtools
-	app-cdr/dvd+rw-tools
-	dev-libs/libburn
-	dev-libs/libcdio[-minimal]
-	sys-libs/ncurses:*[unicode]
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	econf LIBS="$( $(tc-getPKG_CONFIG) --libs ncurses )"
-}
-
-src_install() {
-	DOCS="AUTHORS ChangeLog NEWS README THANKS cdw.conf" \
-		default
-}
diff --git a/app-cdr/cdw/cdw-9999.ebuild b/app-cdr/cdw/cdw-9999.ebuild
index 1e52c861c848..0c9539fc86eb 100644
--- a/app-cdr/cdw/cdw-9999.ebuild
+++ b/app-cdr/cdw/cdw-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 ECVS_SERVER="cdw.cvs.sourceforge.net:/cvsroot/cdw"
 ECVS_MODULE="cdw"
 ECVS_TOPDIR="${DISTDIR}/cvs-src/${ECVS_MODULE}"
-
 inherit autotools cvs toolchain-funcs
 
 DESCRIPTION="An ncurses based console frontend for cdrtools and dvd+rw-tools"
diff --git a/app-cdr/dolphin-plugins-mountiso/Manifest b/app-cdr/dolphin-plugins-mountiso/Manifest
index 90ff3c5c5de9..84665b889d20 100644
--- a/app-cdr/dolphin-plugins-mountiso/Manifest
+++ b/app-cdr/dolphin-plugins-mountiso/Manifest
@@ -1,5 +1,6 @@
-DIST dolphin-plugins-20.08.3.tar.xz 230272 BLAKE2B 1978ffebe88d95350cac0892c56e127507b6ddd6d5675bca8f420990552e20ff271e6f5742a2bdeff685c82464e70177ac83e5e9368547eb175a3e8133d77624 SHA512 2010be567ef025375caac92e90c0259faea1eb58bdbc55e441e42a10af68b6313391707a7f6b6b10285ba80dcbdee92468fa5088970eb98d4ea8afea145976d9
+AUX dolphin-plugins-mountiso-20.12.3-dont-mount-ISO-multiple-times.patch 1626 BLAKE2B 0adc695494b95e300bc4b3539cdaf8c67ab8a6c60761977d93d375d1bb1c01ab5d8e65860de63f689b7a971a1f72fdae602e84620f54505ba7547067e6c3ba72 SHA512 402db0b683e71957ecba9d9280b3bf3f8911304ca06e4f767d3432376793d45e8c63ca8e16fea4cbf2f975ebcc467c6a9793ae64f15807ba88cd70b3b2d22d30
 DIST dolphin-plugins-20.12.3.tar.xz 239340 BLAKE2B 141e5d2bb6190edaef98cec2a271e41b916966118300d69f4eb5e7da15e51730476f23a20312b76fca0fc1490501e83528b4f0cb62f9f6c64e4caf5ac5b2cd37 SHA512 1d5303e92d912bc80c5260263b081205d36372f1f15205ebd3e705697a114f8481edd1ad31004d7906c3088d43a74cb1e33dac6e1196c247e702a544d67db11b
-EBUILD dolphin-plugins-mountiso-20.08.3.ebuild 1533 BLAKE2B 48540c43db4b2317dcf456d1d62c149145e1791c018147076c7ea4da1df178bcac205a4702e4a812fdda4bd7b4b74018717c3247101bcc4293c875f088c4a5be SHA512 3fcccd613b05a494fd32e65a98a7dd4af4f1c863aa38a23a8de3a4438533bb1e421007c4d63e1f30100e4a178645c05f2d0af5680c81534ff14bbb7d464f8e2d
-EBUILD dolphin-plugins-mountiso-20.12.3.ebuild 1536 BLAKE2B a6494225f50cad2dfb63d62d1717daa627fdc29c107803d7ebdfde6faea4a5619c2f9262c46f798a9259f78fdcaa60507b245614d1016f077a68c943cde526ad SHA512 fb5db91d02841b0fb97cfad513fd2545fded5b08a3682499d4dd335c70b37fa1d83296bcef3dfe6c68e66f1a5ddae228c40f28b866e607a4046a6db0afa7e75a
+DIST dolphin-plugins-21.04.0.tar.xz 242608 BLAKE2B c12366f9a0d661e79b968ce375e2ea46dd8d90f322691755dc238d4dd08d07f6527711aa117fead2a3714d7f97c508e53c5ecd87a69c23c397e44033669fe5b1 SHA512 9f093133eba93615392a117f8184177f06bb117d4a3ad4691025ef26e4d83e251f966c157ae107f52447c78bf600ab586a175f57a02f78fec8e620aa5462138d
+EBUILD dolphin-plugins-mountiso-20.12.3-r1.ebuild 1619 BLAKE2B a9e27570026206592dade9cc52dbe329650b809e521d96affee8e2ac540b185e02e3fe4aae6e7aaefec64f6176b311c3e528ef40822dc66c3d097717227dafbb SHA512 c569f1835d7341b3b71a89433bbbd9f73a9a28bfae7685de3b016ecac4ae829a985f2c6b614b0dafcc60f3762957f343105ca9cf9bcb0388c58b32331cf31bf4
+EBUILD dolphin-plugins-mountiso-21.04.0.ebuild 1525 BLAKE2B 574c02ec140244bfc8584b3ed8356844395e01ce0e1cd0280b8dfbd0f4f1bdd5f4fb9d864e7bd79f55fcfc6c35e34d1aed9ab5ae68394ea27c4fb5e79061cd14 SHA512 05006fb0530a6d837df603ea0ae95d637189d6286e397452140dbe636392603be348f83cea5a17b82aa9e914e7a7761b01e1dca101ce950385b5374e035d4b8c
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-20.08.3.ebuild b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-20.12.3-r1.ebuild
index 21fec5cbd098..8b0f89d13e0f 100644
--- a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-20.08.3.ebuild
+++ b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-20.12.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,9 +8,9 @@ KDE_RELEASE_SERVICE="true"
 KDE_ORG_CATEGORY="sdk"
 KDE_ORG_NAME="dolphin-plugins"
 MY_PLUGIN_NAME="mountiso"
-KFMIN=5.74.0
+KFMIN=5.75.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 inherit ecm kde.org
 
 DESCRIPTION="Dolphin plugin for ISO loopback device mounting"
@@ -36,6 +36,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-dont-mount-ISO-multiple-times.patch" # KDE-bug 434617
+)
+
 src_prepare() {
 	ecm_src_prepare
 	# kxmlgui, qtnetwork only required by dropbox
diff --git a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-20.12.3.ebuild b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-21.04.0.ebuild
index fc497549263a..27a4b3f28f94 100644
--- a/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-20.12.3.ebuild
+++ b/app-cdr/dolphin-plugins-mountiso/dolphin-plugins-mountiso-21.04.0.ebuild
@@ -4,11 +4,11 @@
 EAPI=7
 
 ECM_HANDBOOK="false"
-KDE_RELEASE_SERVICE="true"
+KDE_GEAR="true"
 KDE_ORG_CATEGORY="sdk"
 KDE_ORG_NAME="dolphin-plugins"
 MY_PLUGIN_NAME="mountiso"
-KFMIN=5.75.0
+KFMIN=5.80.0
 PVCUT=$(ver_cut 1-3)
 QTMIN=5.15.2
 inherit ecm kde.org
diff --git a/app-cdr/dolphin-plugins-mountiso/files/dolphin-plugins-mountiso-20.12.3-dont-mount-ISO-multiple-times.patch b/app-cdr/dolphin-plugins-mountiso/files/dolphin-plugins-mountiso-20.12.3-dont-mount-ISO-multiple-times.patch
new file mode 100644
index 000000000000..fc59e1718503
--- /dev/null
+++ b/app-cdr/dolphin-plugins-mountiso/files/dolphin-plugins-mountiso-20.12.3-dont-mount-ISO-multiple-times.patch
@@ -0,0 +1,41 @@
+From f136702d2adc8643ea12f1b6e3bf97925f1b33f0 Mon Sep 17 00:00:00 2001
+From: Kwon-Young Choi <kwon-young.choi@hotmail.fr>
+Date: Fri, 19 Mar 2021 17:10:31 +0100
+Subject: [PATCH] BackingFile property should be use with StorageVolume instead
+ of StorageAccess
+
+BUG: 434617
+
+When mounting an iso with `udisksctl`, first a loop device is created
+`/dev/loop0` then a second device `/dev/loop0p1` is used to mount it on
+a filesystem location.
+
+Querying for StorageAccess devices sometimes only returns the `/dev/loop0p1`
+device without the `/dev/loop0` device and the BackingFile property does not
+work on `/dev/loop0p1`.
+
+Solution: query for StorageVolume instead which returns all loop devices:
+`/dev/loop0` and `/dev/loop1`.
+
+Warning: Because StorageVolume returns more devices, the function
+`getDeviceFromBackingFile` could be a little bit slower.
+---
+ mountiso/mountisoaction.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mountiso/mountisoaction.cpp b/mountiso/mountisoaction.cpp
+index e5575ae..d198a89 100644
+--- a/mountiso/mountisoaction.cpp
++++ b/mountiso/mountisoaction.cpp
+@@ -78,7 +78,7 @@ MountIsoAction::MountIsoAction(QObject *parent, const QVariantList &)
+ const Solid::Device getDeviceFromBackingFile(const QString &backingFile)
+ {
+     const QList<Solid::Device> blockDevices =
+-        Solid::Device::listFromQuery("[ IS StorageAccess AND IS GenericInterface ]");
++        Solid::Device::listFromQuery("[ IS StorageVolume AND IS GenericInterface ]");
+ 
+     for (const Solid::Device &device : blockDevices) {
+         auto genericDevice = device.as<Solid::GenericInterface>();
+-- 
+GitLab
+
diff --git a/app-cdr/extract-xiso/Manifest b/app-cdr/extract-xiso/Manifest
index 711a80b3e03b..aefb077e395b 100644
--- a/app-cdr/extract-xiso/Manifest
+++ b/app-cdr/extract-xiso/Manifest
@@ -1,4 +1,4 @@
 AUX extract-xiso-2.7.1-headers.patch 437 BLAKE2B fbfcfe1d84c25bbb51fc60a20e1a374f75f6ca23c59bf24451312fd048c26fb77e176abbebce8a868f23625de1eac7cde531858f63faee94bbe55142e02de123 SHA512 4d6a46259d4c96a405d8e52347dfc9fad53bbfe5c2d4fabd74a81c6e698a4da9351c50bff6a6e810ffad4e8b927f0d687538c210eebf905ab454e2dd4146aa58
 DIST extract-xiso-2.7.1.tar.gz 207518 BLAKE2B bf99e2555e85344db318bdedf0e6dfb80b5f8cd079dc2083ba94e06c62032235d88296909a1aa887180ce94ce9d80a6b39aab25ed99b04741951aed79c2e8cdb SHA512 a7153d96fa7cfb01dfa385a0984d94dc0fa5ac14ce9f7e2d50287b7e1edbb6a4ba84b6b874aa2628b1a82f23b30687958e411699487896cc48787f48e0e012c6
-EBUILD extract-xiso-2.7.1.ebuild 841 BLAKE2B d1c2836da3a8a2e968a67db04f6e87b997dfab6940d5f83a35d92ac684aed807af3115ad0c6865499e3e28aae896089b684ccbf05a3c177c89eb0db4a5678913 SHA512 44e08656e849be59fde8d5df1bd3a2f3a683a5705ef61e0380554aaea66b42e2def3afedba0aa71e5869dd2a22d3673ee5c9c0b3ccc1039afea41317ac16e18a
+EBUILD extract-xiso-2.7.1.ebuild 841 BLAKE2B 2404cd4b33d0a600b60a277484f15b8914aa14e8383e064236ea8d7b76c5c5b3a71ecd0b7954d2c04c4c6861f1e38626de33dfcff959824337f9da0e3ce5fe7a SHA512 c7bfd6f784df14cb1a61a3f6c5b2d1da85fa6e6d430ef0b779c2b73989b6a267f073d8d07ffc484c744673805436a8fdfd2a88366a85c48d596c7798bec7a673
 MISC metadata.xml 254 BLAKE2B d184436ef368897cce203f5474b9b5098be36d4fe81ec4823e7df0cafb12ab34749cc1ae6ea836744de9d6b0c31f1b5aecbef4c8c53eaf9c5d134633c3ecd177 SHA512 96121b47ba5081b6e6f2b105d2ab6dc001cfd872530826d19fc836486c9eff4b2aeacd9a7d213646664d2a0d1d0445d2fd00c44c1974c875b8394285c788a464
diff --git a/app-cdr/extract-xiso/extract-xiso-2.7.1.ebuild b/app-cdr/extract-xiso/extract-xiso-2.7.1.ebuild
index db5abc7149dc..f4e6324db818 100644
--- a/app-cdr/extract-xiso/extract-xiso-2.7.1.ebuild
+++ b/app-cdr/extract-xiso/extract-xiso-2.7.1.ebuild
@@ -1,25 +1,28 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
 MY_PV=${PV/_beta/b}
 
 DESCRIPTION="Tool for extracting and creating optimised Xbox ISO images"
 HOMEPAGE="https://sourceforge.net/projects/extract-xiso"
 SRC_URI="mirror://sourceforge/extract-xiso/${P}.tar.gz"
+S="${WORKDIR}"/${PN}
 
 LICENSE="BSD-4"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
-S=${WORKDIR}/${PN}
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.7.1-headers.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.7.1-headers.patch
+	default
+
 	sed -i \
 		-e 's:__LINUX__:__linux__:' \
 		*.[ch] */*.[ch] || die
diff --git a/app-cdr/gcdemu/Manifest b/app-cdr/gcdemu/Manifest
index d2353b1d780e..8f52c6f50a46 100644
--- a/app-cdr/gcdemu/Manifest
+++ b/app-cdr/gcdemu/Manifest
@@ -1,3 +1,5 @@
 DIST gcdemu-3.2.4.tar.bz2 52209 BLAKE2B 620b1ea8616cf0d7f80954dd00ad1442b55fedafc5ff27ad5aa917e69a803a9629ccadb33ec3fdb2371c464bd484a15e85e00036dee5a67283fbf7e8d64e252c SHA512 920ab87a0b200f3f3983ff878871265084787f1468c042352c319ff3a37131547cc1e981801eefaee1e419ec306b026f7a18da165a17e3ddc6a92998a42e7b41
+DIST gcdemu-3.2.5.tar.xz 47960 BLAKE2B 8e45fe31461120b33080b9e40bd1def1c4ddfe562a9ca60814c66fbe073325d867692bd367e89e8281e34955eb232c37d8908a8962f5aa4587000b28c296d32b SHA512 d7e7b6ee1677213d858fca18103dd6d06e5de3f6c65fd16f19925b14ef50c73ebd0cbee3cb5c65aa5a59be3da1865f3e87b5e7c1a5921c496ae083727365e10b
 EBUILD gcdemu-3.2.4.ebuild 1183 BLAKE2B c074d8aea4b77a06bbd688216333b7364c9fc9e7ce6fb966792d825c7c3c7b25f354a38af74d319b37dd7ad5d21f001a475e6373d56df4e6ceff2687a0bf0e91 SHA512 57ed9764e6c13e78239a8dd9f1219bfd02a4a909d9b6a2fe171a6fb4248a4f195fe93d58f3dfa46f4341d4ca07e9ca90101664a007a6a7506f6f378593d8db62
+EBUILD gcdemu-3.2.5.ebuild 1185 BLAKE2B 28b942dc763c9e73994ee2800557c39df8109a1b0d8e8736f9a53126dcb22242ce2ca848e9e615ff49fec4801372acdf320c6e8868a9542ce310a86c441593ba SHA512 c45c318e7755b84bbc74e2de225769d5148da7cf1a6e26cd580f501272369a4b1f04cce41bad5f7366d32ef00a9d17b60af120072b4df49e7ad7fddcb5cc7687
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/app-cdr/gcdemu/gcdemu-3.2.5.ebuild b/app-cdr/gcdemu/gcdemu-3.2.5.ebuild
new file mode 100644
index 000000000000..d6e7b2808caa
--- /dev/null
+++ b/app-cdr/gcdemu/gcdemu-3.2.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake gnome2-utils python-single-r1 xdg-utils
+
+DESCRIPTION="Gtk+ GUI for controlling cdemu-daemon"
+HOMEPAGE="https://cdemu.sourceforge.io"
+SRC_URI="https://download.sourceforge.net/cdemu/gcdemu/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# librsvg for pixbuf-loader
+RDEPEND="${PYTHON_DEPS}
+	app-cdr/cdemu-daemon:0/7
+	$(python_gen_cond_dep '
+		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+	')
+	gnome-base/librsvg:2
+	x11-libs/gdk-pixbuf[introspection]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/libnotify[introspection]"
+BDEPEND="${PYTHON_DEPS}
+	dev-util/desktop-file-utils
+	>=dev-util/intltool-0.21
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS README )
+
+src_prepare() {
+	cmake_src_prepare
+	python_fix_shebang src/gcdemu
+}
+
+src_configure() {
+	local mycmakeargs=( -DPOST_INSTALL_HOOKS=OFF )
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	gnome2_schemas_update
+}
diff --git a/app-cdr/graveman/Manifest b/app-cdr/graveman/Manifest
index 605cea0dbc7a..31185fef972b 100644
--- a/app-cdr/graveman/Manifest
+++ b/app-cdr/graveman/Manifest
@@ -3,5 +3,5 @@ AUX joliet-long.patch 796 BLAKE2B 308e8471cbbcd2767370c452417d64bad6839126f95a4e
 AUX rename.patch 505 BLAKE2B a7794bdc1a45b34fee773fb0482054b80506d7865c98e7c88f5995c3c4ee377086470d8288640f7e9686e208ba43e49ca2631348d709fa48357ceb815ec5218e SHA512 5ae9769ddd1c26a34d155d38ec2dede550e63be6fa7cb7f8a3cdd7b289aadce370c3f015bac91d0379b20f9f5a2265daff6f69b22350df9486b515c956d7abf5
 AUX sox.patch 1396 BLAKE2B c6f193498e8086111a90aa0811e4d3396c743722a8c31ac8286d37d3bf98d17bb12bd505574af2fc10633a796cdc5bf07924ebd7a2bf63e2fc8cb470feaa8ccb SHA512 545e3439a81e131a704c53e0c5a016d32a99e5bbda788ef5f3a6b1819cac7f4d5b98688e3738f3e6f1440eaba3a69efc1b2718edd578c9e4499166e4d527bd2d
 DIST graveman-0.3.12-5.tar.gz 962523 BLAKE2B b7650c79ccd379ede48d9b1a9abbb1504e88e787feaf7897f50509d92ff51171e366e99bba4c9f9d153d92b4bbc5970b9775064e7f482fb0b1ccf12e5e50c4e0 SHA512 c09ec1b5273411e61ee568260eb921bb10aafa90ccd0f4074228741c1f0470650368f96e595763d77b46c87fa4a038a1d5a3a022f8019afd5f772754f9636ee4
-EBUILD graveman-0.3.12_p5-r2.ebuild 1671 BLAKE2B dfd7db4044f5e0f72cd2561191cc7938d5c64e4ad7f60883d155ef0a32e02b85048c04c561b94998d220bfeaa8d98fc47b2553ec624067952967f326a8ea3d1a SHA512 db1f956b2c3d8588760d7bad8f651c0fadc925e3ef0faaa7860d25b7337195037809bc608d4d04af6e2b4b19920035bb8dc24c834c113649aac0f0360613a140
+EBUILD graveman-0.3.12_p5-r2.ebuild 1664 BLAKE2B 957fd8320a208ce1946090105a059cafbdff1f82893a2d1742ce3aa1666ed16f07703fd949ce70339fd9745e8453f752b733bf59a53edfa25d484dcca329cac3 SHA512 30fce9edc73c3f90b0d79c65557727964de217453b4501b757a81eb373f5b55e04f957b7d8a6822fbe792ba0e84a22bfab1309937f07861d6f9120600cf3818f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild b/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild
index bb2aeac49bd6..4e5aefa550df 100644
--- a/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild
+++ b/app-cdr/graveman/graveman-0.3.12_p5-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit autotools eutils gnome2
+inherit autotools gnome2
 
 DESCRIPTION="Graphical frontend for cdrecord, mkisofs, readcd and sox using GTK+2"
 HOMEPAGE="http://graveman.tuxfamily.org/"
diff --git a/app-cdr/mp3burn/Manifest b/app-cdr/mp3burn/Manifest
index 1b7c48df7b38..b8d11a59d095 100644
--- a/app-cdr/mp3burn/Manifest
+++ b/app-cdr/mp3burn/Manifest
@@ -1,4 +1,4 @@
-AUX mp3burn-0.4.2-build.patch 450 BLAKE2B 495a56ba698a6e160583cdcdfff895f09cb478c9a7d03142aef5e4a038488a5127f0d8ad5a01f2ce2b4b351f5309339251c39582f49471b3865b182184ffc7a9 SHA512 0b3d88fb3d716da0ba97e4a041f7df3204c67b3033374f592a37d4cc9414ee6fb95fe7ab50b9e47036ba353c2382fe18cea5d8bc2993cfb374c93a31858f38f2
+AUX mp3burn-0.4.2-build.patch 382 BLAKE2B b59dd5b1f2d651003443ceda9590dcd57ecaa0b6bf84175bbf92945539e67c3597be11afe57cbbf093b7695e90b85dd3a7fe81f0c7f570e82f33391099aa2b47 SHA512 20143dd5b54b651d38338339337f586ee90b7e53bf7eb313b80ce043d7a99439e825ce5e4a48ec597bba4bb0a09c669439b3f59f9753aed240e2feeb8c4be4c5
 DIST mp3burn-0.4.2.tar.gz 17166 BLAKE2B 099954b2bd5ba6ff2dcbdade63b7bd2ffeaf4c269eee9c856149b8a899ed995e131516446b80c905850733e385bb4f6cb52ad2cb15fe4306dce417cadbb359ec SHA512 96234f7e7a528b0073e3cb8130d5f606741532954e54de56757b4b0945d24fa72860e62ae1d78a13463ed8dca22848d99d49791957ba3c92cb60591d0f54f261
-EBUILD mp3burn-0.4.2.ebuild 702 BLAKE2B e2a8ba047672e76cdf26c973a6f4c020abce25acde9bde05088ca87da109c495e42923da9de83e0fc328e87da59dcb83c4dec46d04fd05801eeb6d377ef4e54e SHA512 d75cfca9a5520d161a46ac749834fd6639f2b3f88a7e36acc6ed104d176eca593cedf4d8f7ca310ac37c80c3265d17228e30589ae620534996c80e1c60fb6f83
+EBUILD mp3burn-0.4.2.ebuild 672 BLAKE2B d45887642da859647e1b41ac700242c876765bd38e092622c8c7d36dc2264d18db5bcd3cd3af970d0403d79a2c4eedf91c8ae7861acd6b13b9b17f217f79f3c4 SHA512 49f563645163d7a6881e8ed88d2aa333a88c68b5c38099051cc7b7b7b8b72dfaf1417443bc95b223870e87a88f21614d33b35bb34be3b778abc9c9735172260d
 MISC metadata.xml 244 BLAKE2B e3e13de16e966b5bf7cb78a5941c209f349ad3862e14028e8b48825b691269a8397f681ef076c017ef72c14d1adecc64f6a9582a20eaad8c002f5d254b4cdbd5 SHA512 5dadcff7ab9780843e5ff9b58fc515cfb20b2d19633112459a961e4fdceff3f6e17b3490ecb891d47d5f448500a826ff673b62709e91864e4f0d87c624d62445
diff --git a/app-cdr/mp3burn/files/mp3burn-0.4.2-build.patch b/app-cdr/mp3burn/files/mp3burn-0.4.2-build.patch
index 13cf94d42643..d7d814c3872a 100644
--- a/app-cdr/mp3burn/files/mp3burn-0.4.2-build.patch
+++ b/app-cdr/mp3burn/files/mp3burn-0.4.2-build.patch
@@ -1,5 +1,5 @@
---- mp3burn	2013-08-18 23:13:34.843372424 +0000
-+++ mp3burn	2013-08-18 23:14:15.663182707 +0000
+--- a/mp3burn
++++ b/mp3burn
 @@ -412,6 +412,8 @@
  => F<mp3decoder>.  I<(Note:  Currently, the MP3 decoder must be
  able to accept mpg123-style command-line arguments.)>
diff --git a/app-cdr/mp3burn/mp3burn-0.4.2.ebuild b/app-cdr/mp3burn/mp3burn-0.4.2.ebuild
index 8c1183cd0515..40200fbbd700 100644
--- a/app-cdr/mp3burn/mp3burn-0.4.2.ebuild
+++ b/app-cdr/mp3burn/mp3burn-0.4.2.ebuild
@@ -1,34 +1,32 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Burn mp3s without filling up your disk with .wav files"
 HOMEPAGE="https://sourceforge.net/projects/mp3burn"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
 
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
+RDEPEND="
 	app-cdr/cdrtools
-	media-sound/mpg123
-	media-libs/flac
-	media-sound/vorbis-tools
+	dev-lang/perl
 	dev-perl/MP3-Info
 	dev-perl/Ogg-Vorbis-Header
 	dev-perl/String-ShellQuote
+	media-libs/flac
+	media-sound/mpg123
+	media-sound/vorbis-tools
 "
+BDEPEND="dev-lang/perl"
 
-S="${WORKDIR}/${PN}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-build.patch"
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+)
 
 src_install() {
 	dobin ${PN}
diff --git a/app-cdr/plextor-tool/Manifest b/app-cdr/plextor-tool/Manifest
index 86518aa1d910..b0eb673cdd92 100644
--- a/app-cdr/plextor-tool/Manifest
+++ b/app-cdr/plextor-tool/Manifest
@@ -1,4 +1,4 @@
-AUX plextor-tool-0.5.0-build.patch 2102 BLAKE2B a87425f879e7ee6f7d84df05405b14d2d39ed877a9104c0103ce3e01101a7ca1e7472ffadaf86c5c4b0fb45fcab956ab225fff9654dfb0173abebf243eb9cd75 SHA512 2422e53823b986d230c8fddc2fba52a3cd9c95433e20aecf6a20224fdf9516cb840b270d11bc4e18f1aa2d33cfc22c6687736db230f04b23e5c788e9abfe2ce5
+AUX plextor-tool-0.5.0-build.patch 2106 BLAKE2B 014effff2580bcd739382e947fded1f9470f4500f39a52cb1a94cbe13fc2e6e7913714193b9f2884acdae31ad1ee7ab7c38db0149accf5a9ef258220aa65a4b9 SHA512 91c5026067a6db4becd117c579313827ac36cb68da84679eb54cee2c75a0f83127529981417fa6a3249483b6f75b5b16b814b41ad0e0c4195785153aff59cd23
 DIST plextor-tool-0.5.0.src.tar.bz2 51594 BLAKE2B 2a613b6cf338d75d257e4f3ef839ae7131fdf454617be846ec43aa4cce970369defc7e5009697628cb7c76e91c3f718c6f316e69285ec96aacfaa56e79e5e597 SHA512 a613c081bf01f387cd3b6b03b1c81e12a654e1e706ff96ad8aae9afe5e001b91627f95995fae838a5b47c83dd1d07bfefcb0c26d9bb981f4f72bbb3e2eaa8d75
-EBUILD plextor-tool-0.5.0.ebuild 796 BLAKE2B 4eb8c39f6826774710aa182f129ee083c7fa138ecccd8797b0950f5e624029f03fecc973ffafe8b3b62fdd4012b34034abcbcebf68770ab7d9eb1982b586067d SHA512 82f522ce6bbdfa0c08e1f5ddedf2dcbce3753193eb1adb1826c199ce0fe19bf6a28aac37cefb70f885e6a21610ac7d5423bb72a0ed663c4eb02ef62d8146983f
+EBUILD plextor-tool-0.5.0.ebuild 815 BLAKE2B 31499d866d54f82e84d835c9dec91b5294279b62a7ccac45a83ee78268cdc93527855085e36c07e0a2bcaec074f5a710d459a08b838c77fc9e31f37e02ded332 SHA512 80a5751839895bac44a8e20a085e6d75d839063934140cde9c3cc40192c13baabbfc5296845c33bf4ea0e89c03c3bcc057ff9d9fce190f56a5ec0c72d8a4b8d4
 MISC metadata.xml 249 BLAKE2B a949abcb3ac4ee7aa4a6207dff2afac158ce4f44e885b23a07f999582a36027a7128403bd180d568c635935c280c898bdb2f65fc20a5b44736f7b4e2110ba335 SHA512 e1662bd9f712bc0da714654fcb21498be5767fad9e47402de895f518a4d97d0f7a79bbf4717c46f5c3c595c5841c6983507435e6ca325f6f9324f9a581c2cdc8
diff --git a/app-cdr/plextor-tool/files/plextor-tool-0.5.0-build.patch b/app-cdr/plextor-tool/files/plextor-tool-0.5.0-build.patch
index d2a181f14fed..f01aa00d920b 100644
--- a/app-cdr/plextor-tool/files/plextor-tool-0.5.0-build.patch
+++ b/app-cdr/plextor-tool/files/plextor-tool-0.5.0-build.patch
@@ -1,5 +1,5 @@
---- Makefile
-+++ Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -2,17 +2,17 @@
  #               Copyright (c) 1999-2002 Georg Huettenegger
  #
diff --git a/app-cdr/plextor-tool/plextor-tool-0.5.0.ebuild b/app-cdr/plextor-tool/plextor-tool-0.5.0.ebuild
index 39a125aaf854..0822d71769e4 100644
--- a/app-cdr/plextor-tool/plextor-tool-0.5.0.ebuild
+++ b/app-cdr/plextor-tool/plextor-tool-0.5.0.ebuild
@@ -1,34 +1,43 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="Tool to change the parameters of a Plextor CD-ROM drive"
 HOMEPAGE="http://plextor-tool.sourceforge.net/"
 SRC_URI="mirror://sourceforge/plextor-tool/${P}.src.tar.bz2"
+S="${WORKDIR}"/${PN}/src
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="static"
 
-S=${WORKDIR}/${PN}/src
+PATCHES=(
+	"${FILESDIR}"/${P}-build.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-build.patch
+	default
+
 	gunzip plextor-tool.8.gz || die
 }
 
 src_compile() {
 	local targets="plextor-tool"
+
 	use static && targets="${targets} pt-static"
-	echo ${targets} > my-make-targets
+
+	echo ${targets} > my-make-targets || die
+
 	emake CC="$(tc-getCC)" ${targets}
 }
 
 src_install() {
 	local targets=$(<my-make-targets)
+
 	dodoc ../doc/{NEWS,README} TODO
 	dobin ${targets}
 	doman plextor-tool.8
diff --git a/app-cdr/tkdvd/Manifest b/app-cdr/tkdvd/Manifest
index e05edbc4756b..aad149f964b8 100644
--- a/app-cdr/tkdvd/Manifest
+++ b/app-cdr/tkdvd/Manifest
@@ -1,3 +1,3 @@
 DIST tkdvd-4.0.9.tar.gz 71046 BLAKE2B 0253f9c891f6ee617ef392279a126b23e031025df96fdd261a440277724d910714db721cf0d92e8f20c6ce4df5a5ae5c7fac1776a5fd42bf73cb5ff31dbef628 SHA512 948cbbf98338aaf92e4e74e81fbd996d7646f6737a7adfad16063bd8747994e33e034b277942536423d9c099f85dec6649c2be6f1a0e1efba8da7537ea426820
-EBUILD tkdvd-4.0.9-r1.ebuild 800 BLAKE2B 4728e13410c05f400ad0c7769fb0f62bbfa6148e792f63638f69af9d4696638cef885a2388f3f0b1895e22411ef552c94ce8ef3092a3a09c405aa4cafbe1d3e1 SHA512 bceed84c447a61e86502eef8100d9edf0fa5484101fddcf6c0a16926560c32f796aa39ca18857e1cf0cfca85193dde1bc5aa44076fe03bb6ac26c14ed77c720c
+EBUILD tkdvd-4.0.9-r1.ebuild 794 BLAKE2B 88a9051b681ad1ed468fa30c8cfba2abea9fad0c5e591d70b3ae30b969249f36b71b67ce98f5bbe2f81880bfd7d8b5955a9c344a53dbf1a5cf90070a9a58b19e SHA512 02af0e95a5065cfb3c2c340c9f47cd0f7373497eeb720f7d2abcac706354267811d7d82703b2196b53911b41dfa125f6f007320f6508be8dcb3e84efb23c6ff4
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild b/app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild
index 4370360dc7ad..e0adb201c246 100644
--- a/app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild
+++ b/app-cdr/tkdvd/tkdvd-4.0.9-r1.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils
+inherit desktop
 
 DESCRIPTION="A Tcl/Tk GUI for writing DVDs and CDs"
 HOMEPAGE="http://regis.damongeot.free.fr/tkdvd/"
 SRC_URI="http://regis.damongeot.free.fr/tkdvd/dl/${P}.tar.gz"
+S="${WORKDIR}"/tkdvd
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE=""
 
 RDEPEND="
 	app-cdr/cdrtools
@@ -21,8 +21,6 @@ RDEPEND="
 	dev-lang/tk:0
 "
 
-S=${WORKDIR}/tkdvd
-
 src_compile() { :; }
 
 src_install() {
diff --git a/app-cdr/xbiso/Manifest b/app-cdr/xbiso/Manifest
index 95055bbd9486..e53fce5d7a2c 100644
--- a/app-cdr/xbiso/Manifest
+++ b/app-cdr/xbiso/Manifest
@@ -1,5 +1,4 @@
-AUX xbiso-0.6.1-libs.patch 830 BLAKE2B afc08139e91399a28763f437cc6b6149f65195003178d1d9d75e9ff33f8fd5ac1647c5e3235bb12e32eab2c0994874ce805fecb0edfd4dd10b6680887dbb63b1 SHA512 727e8d1a7887a9ec8c694700f55c22db07792303c2a79aa091a73f7218b3df85ced7faf079762b94e4c0dbc6f2cabcbe2e14dbd16c1bfc1be43231ae3fd66c7a
+AUX xbiso-0.6.1-libs.patch 758 BLAKE2B 730292d6bcfdd89b05f209477d7ac398f5624075f520f040e5077e98dcdc8409af56a10a697c2c10556e34b37163e51218000f0a2aa290932cd51b16cb9d138f SHA512 922e022da38f3ad2b621cdb382dfd79c1e79397967c3f818f446a42397b37eb2eaab38c0f9d0b0fd595e549adcb44b1508a7bbae1034fcc8586167d1bcf107ad
 DIST xbiso-0.6.1.tar.gz 49698 BLAKE2B ac1605df188b0ec84d0798a0c0220405ce5082160025dc7b21405f1a17f8e0439c6f8d5dbbe293db1645ac0ad195fb0791fe765ea9e1b8c199461f97a2525dce SHA512 351b558c591c3a6c633fb07e081d57cf7ac8b15272ae19878f7d33a796567177aa4eb2fad64d71e6fd86ac18e1c25d30b52013a83ce5d44854f37ec893282fcc
-EBUILD xbiso-0.6.1-r2.ebuild 790 BLAKE2B 7808229d86475624a06913793338d75ed28e66ff13ed27a5bae4acd4cade83ecdb52d32d85389fd736c4f866bd3c01bce701dfd277eea75d753710fba72f3127 SHA512 e13180337d597f44019550978ba3a5ce465322b04061c92fa8b516df4505b66b6211e6edae7fe7d7a35efe9cb1e6a37fd805731e10cd545a12e34163442fcda2
-EBUILD xbiso-0.6.1-r3.ebuild 799 BLAKE2B 61ce71499c1b791bf3de965ea996c2f8eeaee0057769dde1b87b01a101181e8071b6918e9d9e6e4f28c433c06a5d30f6a9dc4f861d9cb8f2b44701d9fc890ec1 SHA512 26337c617650fe436ef9c9772e85e2506b539b10301477d7478f5a563100c6b4e08dedcb5d6c0ee42cda0b568da3e7677f2be179a8fcc84b982bf51545037fa6
+EBUILD xbiso-0.6.1-r3.ebuild 797 BLAKE2B 6b2344b9070ac9bea47acb3abfaca30281b4d2a43c9fc161816753ec9ab6c34995c40fd6fb12ac7f457b887aa3731be6db2ba90cf00b2bed6810ee7ad6b56921 SHA512 5acfb0e5b5410e8a4eaac97d19be607c28f2b5c3bd2138c5e30e9d6d0be33ef0f768b3d4fda094ab0f295387ddce7b413cfe9111e35300e742f55b19085e084a
 MISC metadata.xml 247 BLAKE2B d21bba6853017889144969818fc5147041d96b924fe59bfd2c0eae9d4ddb91ec7a6ded7aba530416dd388787c1e311d00d840e5a9f47d55fb1c7632e6d166c37 SHA512 c99518b71acec8e93cb1ee0d413e78b81984cd4baeb252efc639738813c96655104bc2398d7f2e967edbd0ac4ec1b08c187afad31be039a8f15e3b6a39324cd7
diff --git a/app-cdr/xbiso/files/xbiso-0.6.1-libs.patch b/app-cdr/xbiso/files/xbiso-0.6.1-libs.patch
index 32b3523d9c92..0b867751c373 100644
--- a/app-cdr/xbiso/files/xbiso-0.6.1-libs.patch
+++ b/app-cdr/xbiso/files/xbiso-0.6.1-libs.patch
@@ -1,5 +1,5 @@
---- a/configure.in	2014-12-02 18:56:23.000000000 +0300
-+++ b/configure.in	2014-12-02 19:09:46.724190436 +0300
+--- a/configure.in
++++ b/configure.in
 @@ -6,13 +6,13 @@
  
  dnl Checks for libraries.
diff --git a/app-cdr/xbiso/xbiso-0.6.1-r2.ebuild b/app-cdr/xbiso/xbiso-0.6.1-r2.ebuild
deleted file mode 100644
index 9340e06f7dce..000000000000
--- a/app-cdr/xbiso/xbiso-0.6.1-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic
-
-DESCRIPTION="Xbox xdvdfs ISO extraction utility"
-HOMEPAGE="https://sourceforge.net/projects/xbiso/"
-SRC_URI="mirror://sourceforge/xbiso/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
-
-src_prepare() {
-	sed -i -e 's:C) $(CFLAGS):C) $(LDFLAGS) $(CFLAGS):' Makefile.in || die #337769
-	epatch "${FILESDIR}/${P}-libs.patch"
-	mv configure.in configure.ac || die #426262
-	eautoreconf
-}
-
-src_configure() {
-	# for this package, interix behaves the same as BSD
-	[[ ${CHOST} == *-interix* ]] && append-flags -D_BSD
-
-	econf --disable-ftp
-}
-
-src_install() {
-	dobin xbiso
-	dodoc CHANGELOG README
-}
diff --git a/app-cdr/xbiso/xbiso-0.6.1-r3.ebuild b/app-cdr/xbiso/xbiso-0.6.1-r3.ebuild
index 5894d4c30c22..6d770560ed44 100644
--- a/app-cdr/xbiso/xbiso-0.6.1-r3.ebuild
+++ b/app-cdr/xbiso/xbiso-0.6.1-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/xbiso/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 src_prepare() {
diff --git a/app-cdr/xcdroast/Manifest b/app-cdr/xcdroast/Manifest
index e2d37290beb3..febbd5e58039 100644
--- a/app-cdr/xcdroast/Manifest
+++ b/app-cdr/xcdroast/Manifest
@@ -6,5 +6,5 @@ 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
-EBUILD xcdroast-0.98_alpha16-r3.ebuild 1505 BLAKE2B ccc281de127104c396958fe410199a6afe0139d79431db7448adc4e53f7c42400f4dcf6d8c50b0526c204fde5bf018292933614d44deb29b13c29bcd50de7f4c SHA512 17849c061fb27d3222181f672d095391a5bfa522edd0abeb45cdd87dc78d341eeac21f9b52ff84d9c1768bc69c0be5d2e6d20a694c49b0b978757136acf8cc6b
+EBUILD xcdroast-0.98_alpha16-r3.ebuild 1513 BLAKE2B 3fa1536535cf517fcfb247f8aca2eae1365c388a0cab1651aa9598b3b6c784c16c91b3c0a808b467221ad8a44df08f5ffdd9046e62035ab150b5a214a291e920 SHA512 b15971f106fe8cec6224356123fbb28fc9c4ac25c9491c1e4d305192fa3a988286c11524312aa38e92cc98dcf9a0f7c696e242b0efad5ffbd49aadb2ca8dfc40
 MISC metadata.xml 328 BLAKE2B e1ead0160661ab7a22a643443efc928258bb33e2a4e2fb44fe1ebba82f3c772cc0958b83ef4d205ae818bf20eb1e4c12388f5ec4914e0c8f3c085fc7a1a04115 SHA512 8f2bcc611909dedcf7da9f98ae5053f290558546bfe64f3d028e8a81f2f9145073fadbc944975520e28cf383a84a6a53093278ace5ee2df265d7dfe44004011f
diff --git a/app-cdr/xcdroast/xcdroast-0.98_alpha16-r3.ebuild b/app-cdr/xcdroast/xcdroast-0.98_alpha16-r3.ebuild
index 9aa6eaea2be1..5302219832b5 100644
--- a/app-cdr/xcdroast/xcdroast-0.98_alpha16-r3.ebuild
+++ b/app-cdr/xcdroast/xcdroast-0.98_alpha16-r3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit gnome2-utils
+inherit desktop gnome2-utils
 
 DESCRIPTION="Lightweight cdrtools front-end for CD and DVD writing"
 HOMEPAGE="http://www.xcdroast.org/"