gentoo Easter resync : 12.04.2020

30 files changed, 218 insertions, 224 deletions

diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 7e930cfab082..f248e8b31ac1 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/bchunk/Manifest b/app-cdr/bchunk/Manifest
index 8d7038b11b67..487eb52a8a6c 100644
--- a/app-cdr/bchunk/Manifest
+++ b/app-cdr/bchunk/Manifest
@@ -1,5 +1,7 @@
 AUX CVE-2017-15953.patch 738 BLAKE2B a7d35373ff5fc7f105430c6480285fe567a2ecd4cf6979b0e950a0945e9cdbe78aeab9815b628af6e398d1a57ae94ebbd8ec829b01a43bc33baa434ef4863b41 SHA512 266dc695cbc53a58f99cef7bff8e399a018275dce05d50edb4465096c418fa4d77850c671b56a3656f942f0affd83110f341c91bb325d48b9d264b5370b99a51
 AUX CVE-2017-15955.patch 773 BLAKE2B ed4a57da8a73cdde213a5b6e7b454d067ac7b178d1919490657ca0a2ba095ca0b2ae05dfe929d4ee92fa6a2fc7861215cddb9f5d6727d460f6a44b18b9f38581 SHA512 060d6d637f5af2507d63edea4bdda30ae4d6fa5b8e96aaac6d9e41fe328d474bf6854fea101fd6de878ea3b5f2f3e2ccdd1b8e1182a55fe423f293b2024dc7f1
 DIST bchunk-1.2.0.tar.gz 15078 BLAKE2B 60d443380ffaa8dd1d025777c91c1374a931f16c8de2219a4ff453ee4d7c6eb235b2380ce1021911636d247a12640214dc40b29f9c9cf917ff4bc4594f189fc4 SHA512 0e1f9daa2dfeff58e2c65ac2767bff804811fa22f70a220747aa873cb01b77b4c6a809736483aa22fb3f2d2a88885469d10fb45af4626069e992a0763a5fcc2d
+DIST bchunk-1.2.2.tar.gz 15359 BLAKE2B f3d65392305ea0cc3e8a3b8449beb7bebd23f614445f44350d66fd2104db89e17fcf03f6e01144d0da2c145e2c227bb5385f67dc2d443e38b49754349c549f8f SHA512 94fcc1dea3a38a907b3f209c20f3de54028cc34bf8964d1dccf94faf3ca3851270cc8e052c29a3f04c60e525c029ebfb1c3c04fa85525e20273ac8d72cb317c8
 EBUILD bchunk-1.2.0-r4.ebuild 596 BLAKE2B 7c72f8097ff9244cff812e71c4d8a8558e0c8a8afd115c6e60f306865cffb3850c18fbb4a5cba836eb96fbcdc2c12de7b161c114e0d038b9f866d5b7061f055c SHA512 203d8f394679a24037ed6daccc1232a461249484549657025495df6d16c218b7c8f8b0d790d41ab9883d909561f027295b47a19af910a0e04c11f4d0345c1b02
+EBUILD bchunk-1.2.2.ebuild 506 BLAKE2B 4bbcaed6034d4141099527a9bb39d7fc222b4102a0cc22bdc3bb72f46d4db8239fc3df45e8a541b95677a7c47be2c7f7204166c5467b95de77333bd7c7f663c7 SHA512 c36260c248a3b4fc91e9bc61ebda2f8bf136db59c9842606c6aa4486531d30c929bf23ec5148d6bab8b0f2d1eb85554d44f08cae872af58cfc1c6f77b5666f36
 MISC metadata.xml 316 BLAKE2B f234f603d9fcf3c50f48602826b361707317ec2dd0ca1438224e6ec753e92bd0c024d773343c6b6413a920698f4673b85cf6b6411a0c53dc02253b5e341da236 SHA512 1a2c6992e5957694c18634dd12d5a567d1bd74b063f91e7c524984722955a0a72ff22ff2ef17932eb2eafd84d4493dbe6a103df3fad70e4134fa33ddcc3463e9
diff --git a/app-cdr/bchunk/bchunk-1.2.2.ebuild b/app-cdr/bchunk/bchunk-1.2.2.ebuild
new file mode 100644
index 000000000000..6e76146dfccb
--- /dev/null
+++ b/app-cdr/bchunk/bchunk-1.2.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Convert CD images from bin/cue to iso+wav/cdr"
+HOMEPAGE="http://he.fi/bchunk/"
+SRC_URI="http://he.fi/bchunk/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+DOCS=( "${PN}.spec" README ChangeLog )
+
+src_install() {
+	dobin "${PN}"
+	doman "${PN}.1"
+	einstalldocs
+}
diff --git a/app-cdr/burn-cd/Manifest b/app-cdr/burn-cd/Manifest
index ec2d80287b45..22e283487e2c 100644
--- a/app-cdr/burn-cd/Manifest
+++ b/app-cdr/burn-cd/Manifest
@@ -2,4 +2,4 @@ DIST burn-cd-1.8.0.gz 14977 BLAKE2B 3cc72d908f86affd8c6fef1144ece00ea00ef4cf6385
 DIST burn-cd-1.8.1.tar.gz 153586 BLAKE2B 7762bfe7bb497752c0f78ddc2dba2a00423db2e3ef3dcd02ecb36a60eb6a4ecab69d04bc85971531443b8820cb8320e22349817540d95c694b9861261e6e821f SHA512 2da40c703351e97d164eeef7c5662cad66292b71a97f47ae4ddcbcf11a09fb298c6c9e8160da53b0908434e64048c2397beaa988b1cbc1513660f73d8f2fe1fe
 EBUILD burn-cd-1.8.0-r1.ebuild 581 BLAKE2B eb577476b615782cd97e9ac12cb412d0e38c6469c28d0b2b1b31ab487422716d6160a340afe9faa900adaa64a0629631650b9d2754f58a2d09829d76d3ddaa2d SHA512 316c9c623639f89c7a0cf59ef9bd31acd48f0d2c1bb63356e44137a4271263088031854b6b7bd735a74087da6c952c6641365688d3a8dfa8b53cc6c9e5068d90
 EBUILD burn-cd-1.8.1.ebuild 625 BLAKE2B 9c94dd42b9cc8e076665a6309a4fa297b7b37b588607185bd55bb6d9afea3998a8b83f2ef420802af9c1db4abfafeb715bec69398005c9439dab0331d093cbba SHA512 ea01a64d3859c2a707ea6c84e580a73ac09bbbb924c41ecea644facb289fe56a2e244013de05853b894d38b1ffbbff0aff2eca35f99e49dd3b0e71269c4067ab
-MISC metadata.xml 591 BLAKE2B 9b54a0ade9fd72fbee30ea4250fb72588580d5515efcba62862b1096b3fe98cbdbb3eec58ac245b92e798b12b22e265d9ffea34fb35562f6bdd576e2a902b654 SHA512 faa26f95c90f49757434682dbe3a309123a67e3bb95b11408a99849dd7935ed0037d5c6de022ede67fa2056cde3ead181c3d6797864f6842a4bb8c980b631eae
+MISC metadata.xml 502 BLAKE2B 336fa0fc65086307d679b7693e4511c26720ee2355300a8902594ccfa495d082a099d3913b4a10d61726a4a37efdede822677d464415e532e127f3c26392906a SHA512 60ff75d29c88f5af78852a32476d1db91d0712a647ad4dd130e48360abc7363426b389664cabc5c582c2402fe65dedcc93175f67d537905b987349d2247a655a
diff --git a/app-cdr/burn-cd/metadata.xml b/app-cdr/burn-cd/metadata.xml
index d1c04c8d0488..fb5f12b99e68 100644
--- a/app-cdr/burn-cd/metadata.xml
+++ b/app-cdr/burn-cd/metadata.xml
@@ -9,7 +9,6 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription>CD and DVD command line recording and ripping tools.</longdescription>
 	<upstream>
 		<remote-id type="github">aglyzov/burn-cd</remote-id>
 		<remote-id type="sourceforge">burn-cd</remote-id>
diff --git a/app-cdr/cdemu-daemon/Manifest b/app-cdr/cdemu-daemon/Manifest
index 0856445509b1..83b55f29d16f 100644
--- a/app-cdr/cdemu-daemon/Manifest
+++ b/app-cdr/cdemu-daemon/Manifest
@@ -1,5 +1,3 @@
-DIST cdemu-daemon-3.2.3.tar.bz2 83130 BLAKE2B 2be64beb662ebeb51d75a34bccece5f5eede8abe447d4d0be60bf1bbe4e1f9ac6eeaa67783f763f4966571cf4e13fb9b61610ead40d8a13842400f48bb3b1618 SHA512 a1c7fdea9e32e71591a29de98f28dd4d2d0ffb972861916ab287ff33f5f070da8fcc113b602e4b02fd08a72f7361ae85440ef5eb156e312a849cd716207026a7
 DIST cdemu-daemon-3.2.4.tar.bz2 83580 BLAKE2B 56cfde3b9b9a98ba0da629deac717a740b7c92c67195ac282af5337f0e782b555f53221741a59abf3e78faacd066e34a722d08e27cef6fd1082cb75b46eb3ace SHA512 b5dd19a9325773e22c1910ae02f351803fb4f02197eaf5d41a984b4898a5fb0f027c70791d4c25553a9b589273fa3578d3cb12aa7a056f8639b341bd2ab44291
-EBUILD cdemu-daemon-3.2.3.ebuild 1174 BLAKE2B acc9567e6546ad5a43139b662f7bf11f0859884558f17bd8703213e53a63ecf578f229f683035a7da5d0f6aa5fb40d2bbf0b22f43bd5cb2790d66156dc58185c SHA512 2c59f3472f7c7663f24baf55e53db9d474201b7ca20ac7ae211907e5ca7e07e27416760cafd741f5c7a51418db91485e5cca586d4d7605cae336a86b163a9462
 EBUILD cdemu-daemon-3.2.4.ebuild 1143 BLAKE2B fd7e5a298070b9bf7c85ebbe7465487a8b6e9de057c7575288d1698a7332ee5412366205517762f0764fcf5a5776c89c1703a52357376d9cfd6627fa3018ebd8 SHA512 bb13b2bac89acade309e0ec1436be7f557865a4909c68201c3b95bececfb6395225e43ce9cc93f0ea124ed1a5195e7102304e8dd5f7e016cb2264dbbaa4ebafe
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.3.ebuild b/app-cdr/cdemu-daemon/cdemu-daemon-3.2.3.ebuild
deleted file mode 100644
index b538cf3f7ce7..000000000000
--- a/app-cdr/cdemu-daemon/cdemu-daemon-3.2.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-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=""
-
-COMMON_DEPEND=">=dev-libs/glib-2.38:2
-	>=dev-libs/libmirage-3.2.0:=
-	>=media-libs/libao-0.8.0:="
-DEPEND="${COMMON_DEPEND}
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/dbus
-	>=sys-fs/vhba-20130607"
-
-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/Manifest b/app-cdr/cdemu/Manifest
index b46c92992fe0..82bec7bc5c69 100644
--- a/app-cdr/cdemu/Manifest
+++ b/app-cdr/cdemu/Manifest
@@ -1,5 +1,3 @@
-DIST cdemu-client-3.2.3.tar.bz2 44311 BLAKE2B 23451618897a5281478c9d70ded357089a4baaf47b22f36b4add9c5d2c899478629ce034cce0e593b501a127cdc1f5527f0aaf1951f709bf4c2d131e898045a2 SHA512 5d98870fa42bb639009dc6971747f252f3403eda882bffacf55f647193a1a9fb7a75ad69a7512da3abdcdeb64510b0f163ea997c4d75a804fa93880b62b03dd6
 DIST cdemu-client-3.2.4.tar.bz2 44284 BLAKE2B c57fe09bef7112933a93fac9944eaff957e01692ec1ddec7fd443aa780f8b3d85d0bd640611337d896843de3ab00d09e093c293776a52afa85f781bdde7f4250 SHA512 2e10cb345e261ddaa6da68ee626770ed65749b1ea64c2bbbf0f3a2e96184c2906834886754e87e3161c3056473e5ee0dc20672ce7cb48232e6bef1c93cb80550
-EBUILD cdemu-3.2.3.ebuild 1154 BLAKE2B 3d92cf3120f13bc45e368459442a67e1c99edaef33abc2f45896b84fdbf963ad590c7b284ca475058d50d10ae6bd1cf0959d92bd3b652bf04c280d204f0eb986 SHA512 652bed51cb9fea593b1e4e1beaceaf9824385e44bc7301978adf8ff8a3216a7aa3e4590d66f6d2e108d4bb373e5d727e6eb061cec6d4c01aac4d1003baffd135
 EBUILD cdemu-3.2.4.ebuild 1168 BLAKE2B 4b200f6ff6b6eb25924e76462612ef4b82b91b4606ac47769596945bffcba8c40cd6afcb4e85a83fdcc24dc9f246e8824a4fa66a934870aae3661d63d2eddfb9 SHA512 7cd167c09177d565ef7539b7fcdc7829c5940206b0db2e3b2b962b9e6198b6a1c7fc87d7678ae2fb3ef3d0870739994a887dbe0e7d2cbb537f301f353392be39
 MISC metadata.xml 529 BLAKE2B 88d72a301708901597eb11c475ae67d8477381c77d430b49042cb4a8658aa44b88273858f87cbbaa1fc16ae222b604fa9ff81f6f791d39c39d5c76b58b9d0d81 SHA512 27850929d16910038f7b406c0ec4c22648c91a6f8a8f9cd56c0a3ea8e4e772de9b77598514c5a621eb71386635a327829251a90128ba33073ac34485a3b60a92
diff --git a/app-cdr/cdemu/cdemu-3.2.3.ebuild b/app-cdr/cdemu/cdemu-3.2.3.ebuild
deleted file mode 100644
index f1a8668e7e68..000000000000
--- a/app-cdr/cdemu/cdemu-3.2.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit bash-completion-r1 cmake-utils 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.bz2"
-
-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 )"
-DEPEND="
-	dev-util/desktop-file-utils
-	>=dev-util/intltool-0.21
-	>=sys-devel/gettext-0.18
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS README )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	python_fix_shebang src/cdemu
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPOST_INSTALL_HOOKS=OFF
-		-DCMAKE_INSTALL_COMPLETIONSDIR="$(get_bashcompdir)"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/app-cdr/cdrdao/Manifest b/app-cdr/cdrdao/Manifest
index f20a70a639cb..a91ac72b159f 100644
--- a/app-cdr/cdrdao/Manifest
+++ b/app-cdr/cdrdao/Manifest
@@ -1,5 +1,5 @@
 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.ebuild 1279 BLAKE2B b4434c60ebe1c6be00f5c276506cd474b07c78a5a1121ce2e120d76094a38dbe3f36e6a1720cb439fb98fb67c09d4bd6f6e65804b1eed45c3b2e1ca8375c763b SHA512 bbb460bd2fc35493c48099ce065c3b4f5cc89361aa5638ffd15e5115310dd613c5dc41ffd99990a0959d1db0bc1ed5bb2fb5358a457e9fbdd9e8b6c5e087b0af
+EBUILD cdrdao-1.2.4.ebuild 1276 BLAKE2B ab937b86d99dcf9f2e97a5f42bb88f54ecca1ebc30eaf2afa5e3bdd2becd4b219cae6dc04f1755d1e891d6d01ed94a42d3b6094e324ce2f4d24ddf7870a86c6e SHA512 2826430e12617ed865524ce4b70c21b250cd48b3d28d8c72f53758667082e9cbd8d2b484a8de7899b5b950323967f91de9e6157f137daf3f36b9e28f64975edb
 MISC metadata.xml 395 BLAKE2B 271ac8836e1bc4bd8b8405ab9fdfdaaa4046b47bb44b07bdb78d063853a82433117d69d4dd46e89b4f42008b55f10e69d8262340bd29fe396061add32ed9959a SHA512 66d6f12a07e09dd91c828d34941963b1a498e1be14f0cadcb145b47471e148559280fb237a68c1d99ba3c2360e0603a231f124b950b3debde76fe476a5491351
diff --git a/app-cdr/cdrdao/cdrdao-1.2.4.ebuild b/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
index b69577f0b35c..242e7767047c 100644
--- a/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
+++ b/app-cdr/cdrdao/cdrdao-1.2.4.ebuild
@@ -16,7 +16,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="encode mad vorbis"
 
 COMMON_DEPEND="
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index 6bdde09eac8b..11e72fced3ad 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,5 +1,5 @@
 AUX cdrtools-fix-clone-uclibc.patch 2582 BLAKE2B dfa564f67e15dfcdab9e654572c95f89787fded558e88edecde89237ea5097b6a6cc0233b5950f0df460490af415255a56130d27b7198b3c1fee279e288835f9 SHA512 23031747c1d7bc0292beb754f059381df1f1ac7851c9fdb7f296c933f3a9d7c4e52848f90ab50c459432628d74a7546752b299d74199259d84eb89ce92ae0077
 DIST cdrtools-3.02a09.tar.bz2 2156745 BLAKE2B 3e7a7ed65faffc67d53df8dff78562dd28f2e71bb01c36f9c57c033a4a812e6a5579a212322a15c8abb5c8005d38e6e9ba5a5bfab46d9a729a673aa8ce3425e7 SHA512 59c31186f163c7aaa96083efeb0bc31e697c5d53d3343ec487eddd90dc8df6cfee50a69859a64a7004585c73a081cc453cc647c563b32ef74070d075039342d4
-EBUILD cdrtools-3.02_alpha09-r2.ebuild 8319 BLAKE2B ba0bb2b0a734f3eafb229450e0e3975d931037078acb6ba8b150587dcb5b453e0f15fe02936a5c795effd34d470473f9b07649d50c9800f5c30050cec98e30dc SHA512 44dde2b5a613443676eafdbb461189b22725cd86c0e3fe0f6b66fa80f7bb2f9c984a578b8ec76f08ddd3519efa9f612a4844ae62adc63d33a5eb94920466b0e3
-EBUILD cdrtools-3.02_alpha09.ebuild 8241 BLAKE2B d1e10f0816e07c71e9a196dc5fae74a63598797ac1cb5a3a3fdb7c6d852a845fbf190e3f4197d083e2e7c0b681e99262b3e0d3cfc264717b68a7e3907bea3eab SHA512 b04fb46fcf25d3e4ce389c0ab1a77f78fbdfce5ffd3cce6e390cb24d1dee5fea5098c3172c37a5440030cfe8ee2bbe747217979ee59aced9b44405f9066b081b
+EBUILD cdrtools-3.02_alpha09-r2.ebuild 8315 BLAKE2B 0c6772e9eb7217aa5e2f103de670ff089a473c7bde41eb5877996a4d0897b23ecbba5874d33ff6599503c776c657e18754d43a3d7adbcb1b91f30bb3565b2b1b SHA512 6c58a4243a73f8de285488bb3b01509d3d261ae38b67433f41f4b5cff173067ef036a4b0ed7667b5a95da1269e74f2b6c6f49042cc948d33b808950cf6e0601b
+EBUILD cdrtools-3.02_alpha09.ebuild 8238 BLAKE2B 7bb73807895571dee4c7322a86ded1540ed2446f9be36fe72039a259b88c048a7f03725aa146c7977c69dd132aa143fb30cb9ef92e185e1bb475b902e6c14af3 SHA512 2547caf73df8bfa14b25e144d49208e53c771acbb0a23ce87e8d1c249e16a3cb2fd73babedcf4c3cfd5f0a8f180343de22fb6ac71780dee9f1040e0c6ca607e6
 MISC metadata.xml 533 BLAKE2B 13eeaf0e3fd17234f44138fc6b6fe1b0ef5e369b823a1adb9063743702b9afe86f1d939bb451df1cc6337c2e3790e38b1f890e68c46eeed9210ccc6d96e0944e SHA512 ddf004043b6d96ef6ec697f2452df1df68b234e4b899c047743a8cdd971167607f91c05435bc0a7978f65e13895fecec31a20a2b2f659a696fa3e4e704e18818
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
index 2743c501d42e..282f987416e4 100644
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
+++ b/app-cdr/cdrtools/cdrtools-3.02_alpha09-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 83036c5f5a00..b6c8ee6bdd56 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="acl caps nls unicode"
 
 RDEPEND="acl? ( virtual/acl )
diff --git a/app-cdr/cue2toc/Manifest b/app-cdr/cue2toc/Manifest
index 3a58aa928ff1..62b13b9b04af 100644
--- a/app-cdr/cue2toc/Manifest
+++ b/app-cdr/cue2toc/Manifest
@@ -1,3 +1,3 @@
 DIST cue2toc-0.4.tar.gz 76689 BLAKE2B f5171457f0061ca1062501b54dc360b8b76a3fb402a0041fa0db4541eb41ebc04e332fafa918fac7d7ace9e50348d867ecb9e41ee09c8b3d5e621fa64a72de2e SHA512 37fd4680890a38681331d4fb83a37daa9ddc39e45b2822930328796f1f57ac39635c609b27340b1ab06dd5b73720e77d96b601d1ee994c5ce836077a368cd95d
-EBUILD cue2toc-0.4.ebuild 395 BLAKE2B 573906540bf1ea60db6f583166af6f4ac6ebb7d9fdc069adccab30240ec0c9780f26ef2cef1b6686389de2a67a831731ba1d6651a8c2b36fa673e25cb6f68c08 SHA512 96c4434bdb5e179048d1b294619b37f259dc1ea3258e5f161a13730aaed86042287005f361c6011c385d6aaa5dcfdfb0e1e5081528e7a4affc1b3d1453d5866e
+EBUILD cue2toc-0.4.ebuild 388 BLAKE2B 34e08a6b46c62041e911265e69ddf5eaa262fad19c212334a41471ce3e82d9e25b31877637214eeffe17f8d89db7ed1697bccec079e102550c84193867d940fc SHA512 5f820ff005be80e07686bd5969c2f9b7086666e01a68dcf9434c1f04b28e61c0b1b8f6c5657c0e7c67425bdeb782d11b8d140d2a7677fa7f1b43b971ab8efac8
 MISC metadata.xml 724 BLAKE2B a402466ee09177145cf5854ef3a48fb0edbe2a99f09b8c31a5400f66475d5d0350c93e4a55c5220a1cd3af5efba8dbbb5d5cec8a13a46ca9a8c6ec087c17c420 SHA512 2759d0408975e9fe04b825956c9957826cc290f36ff277779dea87250618f0774eeaddaaad73e96ef8068fd130b94e2b52bb6b3a45dcb17edd116cd4fcef966a
diff --git a/app-cdr/cue2toc/cue2toc-0.4.ebuild b/app-cdr/cue2toc/cue2toc-0.4.ebuild
index 53717f1601d8..66abd1c3f554 100644
--- a/app-cdr/cue2toc/cue2toc-0.4.ebuild
+++ b/app-cdr/cue2toc/cue2toc-0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/cue2toc/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="!app-cdr/cdrdao"
diff --git a/app-cdr/dumpet/Manifest b/app-cdr/dumpet/Manifest
index 46b511d5b1da..838b72e1be14 100644
--- a/app-cdr/dumpet/Manifest
+++ b/app-cdr/dumpet/Manifest
@@ -1,3 +1,5 @@
+AUX musl-byteswap-fix.patch 294 BLAKE2B 1967a0ec276357db52b57ed84b2f111dd456477b0ba01f018e2823e2498764c1cb0119838b5d455991438104965ac679e86cfc0fa4ba71ca89ddb4e1b3de1145 SHA512 7cba10e469b80bb895c8e3c03b3e3184482b54acabdf602226d9dfdd62004bcf5a48ceeed0fa30edc3e789b4be321383c63adf4f726baa6e89960949bde58a58
 DIST dumpet-2.1_p20140601.tar.gz 20140 BLAKE2B def3e7948096e2543bf24324b17c3b3123b867e750971858cb403732efde6c217fcf1c04955a0dd4ed2f99fdaedecab1becdcc1027645e7a955ed1addf11daa1 SHA512 161911ae136aa81abff5a591593acf421a4101e3f80cb259c5b2190581d5cbd06641eefe4c873d40d1b2adabedb2e42ef7fdd0a6e39ec98e1927550ae8960eda
 EBUILD dumpet-2.1_p20140601-r1.ebuild 865 BLAKE2B 05fe70b1311e20e32e5b199555613d70ad6ccfa1f2a748ffe61133945cd05a4b88e6e2eea78140bc781338fdd609bb8e535860768c500f60f793722ee8ccecc8 SHA512 d30ff2f0d940e404323bb0f9c2e52ad4c26034aad295dff9dd0ecc771d4c3e2bad130007fbd1513ca3f282ebd0098368b443c25974fa6714e81df7a8e2553075
+EBUILD dumpet-2.1_p20140601-r2.ebuild 918 BLAKE2B b7236f9ba6bc556e61d7cede87f0e6b574db1424be8379e57ebb8cb310c4750c43594d349e338a15636486f772f107c7188eb2fb24325565b98725763f97e9cf SHA512 fb835a7c8f653d08b3aad3e9c0617fdbdb636f6753e737619f1c0ee55ae56d2ec713796a4446024eb59be90a7395d8bba5818233f4a1f3c0bb763d24ac29b369
 MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/app-cdr/dumpet/dumpet-2.1_p20140601-r2.ebuild b/app-cdr/dumpet/dumpet-2.1_p20140601-r2.ebuild
new file mode 100644
index 000000000000..fb18f5b349bd
--- /dev/null
+++ b/app-cdr/dumpet/dumpet-2.1_p20140601-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs vcs-snapshot
+
+COMMIT="8f47670dd582c96ad1b6dd3c9b9da0acebded5d8"
+
+DESCRIPTION="A tool to dump and debug bootable CD-like images"
+HOMEPAGE="https://github.com/rhboot/dumpet"
+SRC_URI="https://github.com/rhboot/dumpet/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+#Restrict tests since required test file is unavailable
+RESTRICT="test"
+
+RDEPEND="dev-libs/libxml2
+	dev-libs/popt"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( dev-util/valgrind )"
+
+PATCHES=( "${FILESDIR}"/musl-byteswap-fix.patch )
+
+src_prepare() {
+	sed -i Makefile \
+		-e "s/^install : all$/install :/" \
+		-e "s/^CFLAGS:=/CFLAGS?=/" \
+		-e "s/^CC:=/CC?=/" \
+		|| die
+	default
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" dumpet
+}
+
+pkg_setup() {
+	tc-export CC
+}
diff --git a/app-cdr/dumpet/files/musl-byteswap-fix.patch b/app-cdr/dumpet/files/musl-byteswap-fix.patch
new file mode 100644
index 000000000000..83beb321c595
--- /dev/null
+++ b/app-cdr/dumpet/files/musl-byteswap-fix.patch
@@ -0,0 +1,11 @@
+diff -ur a/applepart.c b/applepart.c
+--- a/applepart.c	2020-03-30 10:25:52.122137073 -0500
++++ b/applepart.c	2020-03-30 10:26:09.803672537 -0500
+@@ -27,6 +27,7 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <errno.h>
++#include <byteswap.h>
+ 
+ #include "applepart.h"
+ #include "endian.h"
diff --git a/app-cdr/dvd+rw-tools/Manifest b/app-cdr/dvd+rw-tools/Manifest
index f46cc26a4b26..63cde386b6e3 100644
--- a/app-cdr/dvd+rw-tools/Manifest
+++ b/app-cdr/dvd+rw-tools/Manifest
@@ -9,5 +9,5 @@ AUX dvd+rw-tools-7.1-bluray_srm+pow.patch 427 BLAKE2B 5caea4e6afd1af9b0afd33e9cf
 AUX dvd+rw-tools-7.1-lastshort.patch 593 BLAKE2B e24b41b6eb39961568133f91a110afc87b26597ead0b623deb22bff11a40638bd5faca1de75b8289484889d2d2768077fd637dfe57fdb8bc9f61c1ddd6bed91d SHA512 554b1eb09a00e6bba38acc6ab983f3e0e810b919eb2205f9ee6473d83edd0fdd524e29b844f4c5a55f8044bb72457b2896a24488d691773a00aa355dd1be9975
 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 1538 BLAKE2B 8562279b7f76d612472d74e2659a9ab3695db5df3add7640e1eb3de1a0ef2d891f9022508bbf1099d514a89312d7502569a6e7a15491270f31c55f3eb94d61de SHA512 a6c754e470bd6493c16ddd6c58996c3474a77ceadcd6516b3f38744076fd237a693b0dfe5911dfec0f230792618f0e9d3820798d8378d3b97f2fc896ac9957af
+EBUILD dvd+rw-tools-7.1-r3.ebuild 1535 BLAKE2B 87c7c1af66dffb6b9fe9d6c0bbc7264e6718d73b5ddf2bb6f5f780825cb79e96a49f4ced1cfcc2b200879786d73e27f7fdb4a6f1d80eed1827809305b57a4552 SHA512 6100514ba13ee7e65b7e41baf6da9bd98a3e46e78cbd0d48b4073852e237dcfa9e0ae73d0a27eb29f6a994e28185508c79b62d0d1dc7eb9973a5a909d284a921
 MISC metadata.xml 293 BLAKE2B 52fa8d7ab0ea6ec8869040cbdfee249187f47ec2220813c866675c140ef3db973493e1469d7de9c6e9e2d02b3c3b72f08a0f0fe5923774a2b934cef35b7f07f3 SHA512 eb980abc7dc1cb53be1fe388de068272fc51aeae7d714738cd3a9f3b7b07b92f4f2e89e216e1067364d4496857b69545050e435a51a4ca1589e6c4a691bee16d
diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
index 64ecc66e3868..aee2f063fd21 100644
--- a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
+++ b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
@@ -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 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="virtual/cdrtools"
diff --git a/app-cdr/gcdemu/Manifest b/app-cdr/gcdemu/Manifest
index 0a140c0f3aa3..57d7ffbbe9dd 100644
--- a/app-cdr/gcdemu/Manifest
+++ b/app-cdr/gcdemu/Manifest
@@ -1,5 +1,3 @@
-DIST gcdemu-3.2.3.tar.bz2 52229 BLAKE2B 9f8d0b6e04b438c0637f42875b144ad4d1a643b8f1216d868040121e417203ffedbf983fec235eb30bf9d11bcfe142e52c1c89966ac3b64442071d0897a9e8bf SHA512 1d31b9edeb111145c7dd438fc645c7513877fe89f78cf262c282bba2d2e7f9a99a8499e607bf00f880186bd4a37a8ebbcc5ba14e1e014254e767a8335396d6e2
 DIST gcdemu-3.2.4.tar.bz2 52209 BLAKE2B 620b1ea8616cf0d7f80954dd00ad1442b55fedafc5ff27ad5aa917e69a803a9629ccadb33ec3fdb2371c464bd484a15e85e00036dee5a67283fbf7e8d64e252c SHA512 920ab87a0b200f3f3983ff878871265084787f1468c042352c319ff3a37131547cc1e981801eefaee1e419ec306b026f7a18da165a17e3ddc6a92998a42e7b41
-EBUILD gcdemu-3.2.3.ebuild 1188 BLAKE2B 74a4f8da860965c78c1de8f4411cff7f1206526b1b7fe5b79d48925b77ee3a6c3e47536b86cc3a7b7c8925122a2f93e6b3b41c1276f190a10da149da74598fc7 SHA512 88771b0deaaf655540be9809944a8593d80f326e898ad57c8c66a7e2159b7abf5b3a509cceff29dc073cc2659f8980c6b8804641403d8f76aa1a6f4cc58ad5b2
 EBUILD gcdemu-3.2.4.ebuild 1203 BLAKE2B 0a07dfa62d3f772e0de893aa9364e4cf461296c52d821a7d3d5e166988de08245c101fcef0f50a487a4d691665003de638a523a212106993f217c8ae5aff7da3 SHA512 581d0e50d2a723665feb4544325017a21922b86f0877aca6b24712f1957cda014ad73369d00f83544a71c9a2fdf9741be49f2970c9c8f5f3e7bc0d0cceaa2f92
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/app-cdr/gcdemu/gcdemu-3.2.3.ebuild b/app-cdr/gcdemu/gcdemu-3.2.3.ebuild
deleted file mode 100644
index d9618a7dd7b6..000000000000
--- a/app-cdr/gcdemu/gcdemu-3.2.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit cmake-utils 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.bz2"
-
-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]"
-DEPEND="
-	dev-util/desktop-file-utils
-	>=dev-util/intltool-0.21
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS README )
-
-src_prepare() {
-	cmake-utils_src_prepare
-	python_fix_shebang src/gcdemu
-}
-
-src_configure() {
-	local mycmakeargs=( -DPOST_INSTALL_HOOKS=OFF )
-	cmake-utils_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/gtkcdlabel/Manifest b/app-cdr/gtkcdlabel/Manifest
deleted file mode 100644
index 432a00200109..000000000000
--- a/app-cdr/gtkcdlabel/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gtkcdlabel-1.15.tar.bz2 36468 BLAKE2B afddc7029fa509f792757f2f57f07002854b0387c7c417cd3b45297757e7dc3c019d0a9a0207b5025ecd91c8c3713503f0e7f43b2eb7e2abe7054b32ae271352 SHA512 3edcaa0b15a592d684a20c34282437f5f51201cd6dde915a1a02ac1ed388a2046f8e2ce7aecf4afac3e4af01191d747c34e50d689eb945072bc20f4458bf7356
-EBUILD gtkcdlabel-1.15.ebuild 797 BLAKE2B 11dd4b13a2ebc8facf95bcf70b49d04ae50d0f40844979f797e408b30f7db1b7006e43ab0d041d0f7e4a19c29f83136105add399d868af7faea77d16ea68d94b SHA512 d6aea211740fb17fdfa2f813e437eca7667dfd4e2ae5190d7a919d74beb4a30c6940d8f2d8884b93e9b7b091827b2ee7f828bb9ef60d118731ddd52e44046766
-MISC metadata.xml 247 BLAKE2B d8d62acef0f0dc2775a84b74f6e185af3172c49a298011a8c9b54283b7fcb37a15edeeb4a411544d992883e7303d1a43a9cb553efbf5ed00c30ccfb9ee86bc25 SHA512 dc900409a542a32f73819f826b53be8e553d7890f136cfc4533c2931c605c45282bf87b89dbde2f7a630a5d8497ace4b8e1b1f8922ad45bc6eb68c347a1d92e5
diff --git a/app-cdr/gtkcdlabel/gtkcdlabel-1.15.ebuild b/app-cdr/gtkcdlabel/gtkcdlabel-1.15.ebuild
deleted file mode 100644
index c0c631081be7..000000000000
--- a/app-cdr/gtkcdlabel/gtkcdlabel-1.15.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="A GUI for cdlabelgen that generates CD labels"
-HOMEPAGE="http://gtkcdlabel.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}
-	>=app-cdr/cdlabelgen-4
-	$(python_gen_cond_dep '
-		dev-python/pygtk[${PYTHON_MULTI_USEDEP}]
-	')"
-RDEPEND="${DEPEND}"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	default
-	python_fix_shebang .
-}
-
-src_install() {
-	dobin "usr/bin/${PN}.py"
-	insinto /usr/share
-	doins -r usr/share/{applications,"${PN}",pixmaps}
-	dodoc usr/share/doc/"${PN}"/{AUTHORS,README}
-}
diff --git a/app-cdr/gtkcdlabel/metadata.xml b/app-cdr/gtkcdlabel/metadata.xml
deleted file mode 100644
index a38de18b27b2..000000000000
--- a/app-cdr/gtkcdlabel/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">gtkcdlabel</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-cdr/isomaster/Manifest b/app-cdr/isomaster/Manifest
index 2ad5f7f08a45..f7ccf96a16c0 100644
--- a/app-cdr/isomaster/Manifest
+++ b/app-cdr/isomaster/Manifest
@@ -2,6 +2,8 @@ AUX isomaster-1.3.14-include-path.patch 840 BLAKE2B e1247441758fb0ac40da3f214418
 AUX isomaster-1.3.9-iniparser-3.0.0.patch 780 BLAKE2B bd7f3cff83b01bb241e005ce200016dd7ee30ac8798a9c250924f20da55f1f774558b64d37bf0a4e30dc44f18ed06f585bda4e3c2c0edf31b203ce5554d7cc50 SHA512 0681ab5b4578f67b1eb9e8180fde951d4a34dbf40452ee29a6f09992afed6da5084791d86778296964cb39d59d2eaf51b97972e02582a5d6ff3698655bf09134
 DIST isomaster-1.3.13.tar.bz2 245085 BLAKE2B ae2333f5511aae8deed76e556cf6055f7ad257d613dcf5c85274946f31f0da879b5fb7953d065046371c6f20faa15663ecb3c5d976c4dff404140cd09d23207c SHA512 dbc6a77fabf8d454bbde25a7540e68820bf773bc991176e5684e87aeb6044ad1bbbcf1c4f537148c18ec8847572949a52d6578a14f68b8ad3f21d542685859ba
 DIST isomaster-1.3.14.tar.bz2 257674 BLAKE2B 7b7abeb586eb8c6964d7959222195c1999f81275dea305e7c4efec1fef6dd9d9d4969552e6a6a4a882a9fe227ea072c6639879896e50799db9e67732e1331ad4 SHA512 5454baa4ce4e09df8ec4331718df3e1d81c0647867a21cfc4c4b15d90e509371a636e8fada7e624c0cf6d1b03b564bf89a2a26e13b5ec1b4cca91407bbc518f5
+DIST isomaster-1.3.15.tar.bz2 251622 BLAKE2B 9a3dd4e4a0d6aa0ff5b76774322e2f66257dda18e01835cad911f7abaa83584de1388a6c21bed8a8c8b5b9e94d4a2f23801e656b2586cb24b38b5aa4ca074c15 SHA512 08d4b12ba1f35e8fdca75b05b3125b046a03e1f1dab6876226b45c76e8a40fa78296854e8142a0864402563913af4c935ffe338777b593026e40e121b4089661
 EBUILD isomaster-1.3.13.ebuild 1490 BLAKE2B 65c8871a3222bff5abac963ec42ca8547155e2b70c26bf87829e7d03714454a6724abae637882b3913e5e6fdb8b8f994570edfdf40ac492944ed3a252cfc979a SHA512 8693942b49c6b7c85e1c7db64f6f8cb98bb13848f3943c9b29e041e7978a44c089bc33fd1e342ec5b28108feb75f1f11621fb0e7f256879c8582cee462b5d4b2
 EBUILD isomaster-1.3.14.ebuild 1495 BLAKE2B 3c508e9fb2edcad37f05cdf222f15e80453b3d150249ed47ca910769c7df07f288529f433c2c6d592eadcfc29ace212b0a9bc88f1b01d0e397cd5572b0bfbbe3 SHA512 e51aaf01126082cf2f2b41ce6ba7f240d04df5500663d65ed60870317130069486b04399c436920434ff2ff2a7f243c4eaae21a0f44cb11fdec92e1a212df437
+EBUILD isomaster-1.3.15.ebuild 1503 BLAKE2B 3ca6260debe02234e74a00c524530824672ce0458b82346208f4236f568e669c62b4de16f876eb474bd54c7d54899f520ff38619b514d362860313f98ab5472c SHA512 daad43b38d78f9b05ecdc1228209ff2478717d767094efc40884c5fc70c8be39901601f9675eb3fa1b7743a35f769c2455406e66ac93c1423f4ec5d3e13d7576
 MISC metadata.xml 249 BLAKE2B 3647e2ef94ad009c86dc9d42c1396ad9420ade97042882b8d8f60f676c465cfd6ea3cea4b77caccadd99eb0cbe1ef83b18b799ec676da4ecfbff528d21bb5ffb SHA512 334ac61f9acc5c4917fd29afb3b420b1689b39be80cada419bed1db033e64130866d0995abe5f1c75eb1290f51734e9ad4c8d06fd8b49c288ecf617a0693d273
diff --git a/app-cdr/isomaster/isomaster-1.3.15.ebuild b/app-cdr/isomaster/isomaster-1.3.15.ebuild
new file mode 100644
index 000000000000..2012fa69bf64
--- /dev/null
+++ b/app-cdr/isomaster/isomaster-1.3.15.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs xdg-utils
+
+DESCRIPTION="Graphical CD image editor for reading, modifying and writing ISO images"
+HOMEPAGE="http://littlesvr.ca/isomaster"
+SRC_URI="http://littlesvr.ca/${PN}/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND=">=dev-libs/iniparser-4.1:4
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	nls? ( >=sys-devel/gettext-0.19.1 )"  # bug 512448
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.3.14-include-path.patch
+)
+
+pkg_setup() {
+	myisoconf=(
+		DEFAULT_EDITOR=leafpad
+		MYDOCPATH=/usr/share/doc/${PF}/bkisofs
+		USE_SYSTEM_INIPARSER=1
+		LIB_INIPARSER=iniparser4
+		PREFIX=/usr
+		)
+
+	use nls || myisoconf+=( WITHOUT_NLS=1 )
+}
+
+src_prepare() {
+	default
+	rm -f configure || die #274361
+	rm -R iniparser-4.1 || die
+}
+
+src_compile() {
+	tc-export CC
+	emake "${myisoconf[@]}"
+}
+
+_apply_linguas() {
+	mv "${D}"/usr/share/locale{,_ALL} || die
+	dodir /usr/share/locale
+	for lingua in ${LINGUAS}; do
+		[[ -d "${D}"/usr/share/locale_ALL/${lingua} ]] || break
+		mv "${D}"/usr/share/{locale_ALL/${lingua},locale/} || die
+	done
+	rm -R "${D}"/usr/share/locale_ALL || die
+}
+
+src_install() {
+	emake "${myisoconf[@]}" DESTDIR="${D}" install
+	dodoc {CHANGELOG,CREDITS,README,TODO}.TXT *.txt
+
+	use nls && _apply_linguas  # bug 402679, bug 512448
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-cdr/xfburn/Manifest b/app-cdr/xfburn/Manifest
index b889e2214a8a..afa3942b4fef 100644
--- a/app-cdr/xfburn/Manifest
+++ b/app-cdr/xfburn/Manifest
@@ -1,3 +1,5 @@
 DIST xfburn-0.6.1.tar.bz2 847568 BLAKE2B 30ce56257d4794c23712cebd334f0cfa6c631f55f7213fc7daecb1d693450821faef4c9a78de824e7832fdcb91c128fb75c639a5fa403932e74619cc8910e5ed SHA512 8ea747ab248a20e835082bbb89e09c3e4746201a1da956bc87a2eef5359d1508e5461c7d8a35327aa2261fb7cac576e8521596f83011bc2240b2fbebde60b9c2
+DIST xfburn-0.6.2.tar.bz2 869745 BLAKE2B ed8658d729dc0cf1ee40773fa82baf9a5301225bce4c971201ae8d21bffb74e81fb9d1b674f8b9e0bc55585a3fc9f380a0aa3718173ce7425d40f3dfcd4e1fb6 SHA512 c74d21244b5029aaa72c4911ea7549458aea161623a6a020a165b8148f320053a83189de87f71192f006579ca435558d0c07e1a8aa4165db8cfb30581f8882b4
 EBUILD xfburn-0.6.1.ebuild 1021 BLAKE2B 2fb308b5befe32c6c337dfb064b92fcc55b768bfaf72676e0244ab2e3d2746db29f912dd3a3ec8209e4553dbee7ee15888f1b234e6084789de6d7bb3b4b7bb23 SHA512 54b90ffa15161b36e97c0de8071c2378e9f4d1130f1662be6db01313ba20b9761c121e8a5b2d70d8f08491fa20729cf1615f3d06259647a37091fe276fff9c2b
+EBUILD xfburn-0.6.2.ebuild 1024 BLAKE2B dd9ea9fd92b11023564a36fdc5432440b3b7d7258bb153fe1ff40d4d44e17e5896ad7b437e0a91ed5dc04c67a7252d41ea52d20e479808702b10fb65819bbcca SHA512 da5c666e997a2635229a660966b02a5cd660fc87db1ed3fb9f706076f74ae1fce4bf8b3e04cfe5ec5c73db1cc89907d488ee8394c30cdf6f41f56e2985e8ba63
 MISC metadata.xml 481 BLAKE2B 336b6da9e50fab974d5d320a93ffa10e24cb4621f13835e6a0fa86a95067b28e26fc3c9ca2e17eeecc69f0c842f98bdcebc273bc164cb26baa6b87f39f7c85ca SHA512 1ef204c9fe28b54edffac8132485e3bc326b0452a3014f7be50378be871621e62771f53810b441e4db18b657707e875b67fd2e1231609f62534adbfee2270fc4
diff --git a/app-cdr/xfburn/xfburn-0.6.2.ebuild b/app-cdr/xfburn/xfburn-0.6.2.ebuild
new file mode 100644
index 000000000000..228b229e74be
--- /dev/null
+++ b/app-cdr/xfburn/xfburn-0.6.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg-utils
+
+DESCRIPTION="GTK+ based CD and DVD burning application"
+HOMEPAGE="https://goodies.xfce.org/projects/applications/xfburn"
+SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE="gstreamer +udev"
+
+RDEPEND=">=dev-libs/glib-2.32:=
+	>=dev-libs/libburn-0.4.2:=
+	>=dev-libs/libisofs-0.6.2:=
+	>=x11-libs/gtk+-3.20:3=
+	>=xfce-base/exo-0.11:=
+	>=xfce-base/libxfce4ui-4.12:=
+	gstreamer? (
+		media-libs/gstreamer:1.0=
+		media-libs/gst-plugins-base:1.0= )
+	udev? ( dev-libs/libgudev:= )"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+src_configure() {
+	local myconf=(
+		$(use_enable udev gudev)
+		$(use_enable gstreamer)
+	)
+
+	econf "${myconf[@]}"
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_desktop_database_update
+}