gentoo auto-resync : 27:07:2022 - 03:00:38

37 files changed, 203 insertions, 226 deletions

diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index be8201f5e6ff..a096723d584c 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/cuegen/Manifest b/app-cdr/cuegen/Manifest
index 5e913cd120de..24a73e1c33d1 100644
--- a/app-cdr/cuegen/Manifest
+++ b/app-cdr/cuegen/Manifest
@@ -1,4 +1,5 @@
-AUX cuegen-1.2.0-fix-build-system.patch 260 BLAKE2B 9318ece2533fd138b6666562d564fd6d6fb7fd2891e99207b4f7c65e2e75a43950ce10756c8fc82f02d08ae6090568c13a8abce48a0e6e800d7d21ceb674f2fc SHA512 438b0a306e149e76d4e63bb6206f2296f2ebd6bcaa960ab4f8778188ec4ccb5a2497126d8d6b4076a779a92c2fa3f12b125d2b5ff59332b690250f5c03b5f4ee
+AUX cuegen-1.2.0-fix-build-system.patch 323 BLAKE2B 27a20cbd8325d1323029122931a0ae0b5cbeaec0b5c13bfdf0e3ae314426f36daf9753d2bcdb0f33f963fc148ab73c844da61dfd3efdebdcd6a9fd2e5e1b774e SHA512 3a596b936aee698cd1df28b9c575a3563602ec5e12788c080aef69255125370f237c9fac5b14bdea1c4b0ebd48726a2b958b484c35711a5f55c3c563bbdae2be
+AUX cuegen-1.2.0-missing-includes.patch 284 BLAKE2B 613f9932506e21aa0e969769bef562c5e2544f90adcfe04da4ae0deac85f6563c9060567fe28759c3c73b8b800dd812629b50d79085bc4bb3cca61210ab5957e SHA512 85a8d9ce0a5822552a7c840add75489c0165aef05b573d476f1cc5b1d3e54c9a393aa61c921a098beabbbf70776fd6f113e929b4e90523aef2c4d501588d558c
 DIST cuegen-1.2.0.tar.gz 4411 BLAKE2B 1f728200823c1121fdb165ee6af1f41cf8ac79e867cc173869843775d36d13ae6798f080b3a7c05d3f36c9fa8e0634edd9f09af5281d19165bb1c24a1ed3e9e1 SHA512 b1da7686944299994b8a04e3253aabc9c6b262f5f2d6d343d0ddd9b06d2c4b1e30441cfc9be6032675148e8d3146709924a486ef004102e02b5f90af7127d58e
-EBUILD cuegen-1.2.0.ebuild 608 BLAKE2B 1afc8988e0a854a8599ec1269a1f05ef872d2e3ed11455a752ef40c169ab0eee3f0a14b1c9ba4a33ee7264f07c02b8d9eb9f5df799d693dac76e1e82c97dab65 SHA512 69eb807758b3d57a389ad32bc777b14c031abf4279c47b7ec831b391502e6def2348c26ef6750ffa741ce007547da3455411c4ee9ab86eaee8090e21a748a4b6
+EBUILD cuegen-1.2.0-r1.ebuild 570 BLAKE2B 69b89fddd1af03820a37b16942c8d45253987c7643d0e34db65316f0d8b41ae6ce7035a8bb92dec65565172c0cc267494eb349a85b8c9a03c0f33089f366cad8 SHA512 ce084b2703cf2c0722376a52c9b3a1f4474a85c01a3cfa8739cd634828276e8732d2214483c4c86ce96fd9980655f893ba50b0de18066cc02f4cea3cb5650112
 MISC metadata.xml 399 BLAKE2B 1443ed2f7aa0c03d772d73bcb5bd45dc6722ef01819b9f36fe34931b6135aace7fc954c2a17687a78da28f86bfb9239e849bd3abd97f859574d1d042c31a9697 SHA512 d32e4ca77f79fbefd7acd261a7a0512cca77346b6f4ab79e279e1f0f8adf6eced362e0a75b715921fb60b786b03fc22b1311c2a8c6bbb16ed22ac9b4659f2698
diff --git a/app-cdr/cuegen/cuegen-1.2.0.ebuild b/app-cdr/cuegen/cuegen-1.2.0-r1.ebuild
index 2f72c4191258..85cb4049484a 100644
--- a/app-cdr/cuegen/cuegen-1.2.0.ebuild
+++ b/app-cdr/cuegen/cuegen-1.2.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit flag-o-matic toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="CUEgen is a FLAC-compatible cuesheet generator for Linux"
 HOMEPAGE="http://www.cs.man.ac.uk/~slavinp/cuegen.html"
@@ -12,12 +12,13 @@ SRC_URI="http://www.cs.man.ac.uk/~slavinp/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-PATCHES=( "${FILESDIR}"/${PN}-1.2.0-fix-build-system.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.0-fix-build-system.patch
+	"${FILESDIR}"/${PN}-1.2.0-missing-includes.patch
+)
 
 src_configure() {
-	append-cflags -W -Wall -Wstrict-prototypes -Wmissing-prototypes
 	tc-export CC
 }
 
diff --git a/app-cdr/cuegen/files/cuegen-1.2.0-fix-build-system.patch b/app-cdr/cuegen/files/cuegen-1.2.0-fix-build-system.patch
index 614ec59f905d..fa54235d0e4f 100644
--- a/app-cdr/cuegen/files/cuegen-1.2.0-fix-build-system.patch
+++ b/app-cdr/cuegen/files/cuegen-1.2.0-fix-build-system.patch
@@ -1,11 +1,12 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -1,9 +1 @@
+@@ -1,9 +1,3 @@
 -TARGET := cuegen
 -CC     := gcc
 -CFLAGS := -O2 -pipe -fomit-frame-pointer
 -WARN   := -W -Wall -Wstrict-prototypes -Wmissing-prototypes
--
++CFLAGS += -W -Wall -Wstrict-prototypes -Wmissing-prototypes
+ 
  all:	cuegen
 -
 -cuegen:	cuegen.o
diff --git a/app-cdr/cuegen/files/cuegen-1.2.0-missing-includes.patch b/app-cdr/cuegen/files/cuegen-1.2.0-missing-includes.patch
new file mode 100644
index 000000000000..98a273cddb13
--- /dev/null
+++ b/app-cdr/cuegen/files/cuegen-1.2.0-missing-includes.patch
@@ -0,0 +1,17 @@
+--- a/cuegen.c
++++ b/cuegen.c
+@@ -10,12 +10,14 @@
+  */
+ 
+ 
++#include <fcntl.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <linux/cdrom.h>
+ #include <sys/ioctl.h>
+ #include <sys/file.h>
+ #include <sys/types.h>
++#include <sys/stat.h>
+ #include <unistd.h>
+ #include <string.h>
+ 
diff --git a/app-cdr/daa2iso/Manifest b/app-cdr/daa2iso/Manifest
index 35a71abc4e0a..6f55555c82a4 100644
--- a/app-cdr/daa2iso/Manifest
+++ b/app-cdr/daa2iso/Manifest
@@ -1,4 +1,4 @@
 AUX daa2iso-0.1.7e-buildsystem.patch 342 BLAKE2B 45c7b8c8820f85524b47763fdc5d0eab4c91b89927a68d6d5c1f951c255e3140d596c129ac0dd55efcca498d72c21011326fc2c0887cb5e25a9808d2433390c7 SHA512 44ef91a071fa7723699e185a2c63ca7bcf893df08a94ba0daa6c1803b993558c1d33898818cf73b709d635dc922e32a963491c23985a2f650ea78eaa8687ef75
 DIST daa2iso-0.1.7e.zip 49862 BLAKE2B 701e8e853589e5d0fa1b2b5f80fefde0e61b32dcd40b2b326423e457510b2464fa64f1797e56d46341c13cfd938191a470e04252fd9bf0f39b76a29048a8e378 SHA512 dce00d3bfa4f4e60fd1cfa3ea606bdc8b9fdfc9ce14192ec0204a6da749dc2fb3a0f1de600c19f251e165c7b1f6b66fc14edcd97a38cfa4e163746cc8db5b38c
-EBUILD daa2iso-0.1.7e.ebuild 568 BLAKE2B c957e130a7fa6a1dbb2bb4eba21e60a5145f7e4858716fba4c692eacdd96227d2e8ca1df7fd605d1e8aeb48bfb156b617c59a2ff1705d30b07b1fc492b732c28 SHA512 1688513072d3064df22f6d571931437dca043c17e9a1915a56317f9b74f54957889ddd898f45a9055b5154e3edd4e9e6503becf4e01e13a79c41c9103013b829
+EBUILD daa2iso-0.1.7e-r1.ebuild 547 BLAKE2B 477f926b9bc169c9845852982831cd2de0ae5572ade84a6bffe11a9d0e1fb4efbee93ee51a5dfff38d6ca6c94be59e6d061956c8b21c5902c76f7217184cce41 SHA512 5be51a509cfd4ab3847842acd6a357a18e4ff17b0e21b1908acdf93f70d904df3f58eadeac0be930b28e31a9e3c911803789bf05bb1d080045ba606a695e6f20
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-cdr/daa2iso/daa2iso-0.1.7e.ebuild b/app-cdr/daa2iso/daa2iso-0.1.7e-r1.ebuild
index 1f49851b0089..7d825d3686d5 100644
--- a/app-cdr/daa2iso/daa2iso-0.1.7e.ebuild
+++ b/app-cdr/daa2iso/daa2iso-0.1.7e-r1.ebuild
@@ -1,23 +1,21 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="Program for converting the DAA and GBI files to ISO"
 HOMEPAGE="http://aluigi.org/mytoolz.htm"
 SRC_URI="http://aluigi.org/mytoolz/${PN}.zip -> ${P}.zip"
+S="${WORKDIR}/src"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
-DEPEND="app-arch/unzip"
-RDEPEND=""
+BDEPEND="app-arch/unzip"
 
-S=${WORKDIR}/src
 PATCHES=( "${FILESDIR}"/${P}-buildsystem.patch )
 
 src_configure() {
@@ -25,6 +23,6 @@ src_configure() {
 }
 
 src_install() {
-	emake PREFIX="${ED%/}"/usr install
+	emake PREFIX="${ED}"/usr install
 	einstalldocs
 }
diff --git a/app-cdr/disc-cover/Manifest b/app-cdr/disc-cover/Manifest
index 9d37208f753d..4e78135331a6 100644
--- a/app-cdr/disc-cover/Manifest
+++ b/app-cdr/disc-cover/Manifest
@@ -1,3 +1,3 @@
 DIST disc-cover-1.5.6.tar.gz 52749 BLAKE2B e816e77df2306f51aa55043c25adc62a21efe2cfeafa36c52dd3fa6e026d603297705ab99b4f5fcf9eab106fdc4bb940a5de2428553909f45bc99c3c927cd8b6 SHA512 ac00eeda8da63312afa16fdd4d12d160c651dc44aa44e769b92cad1dd9ddb10f123e8fc64e14853302455047ec86582fa9de423ccacd32912a078d2a21cb0d8c
-EBUILD disc-cover-1.5.6-r1.ebuild 723 BLAKE2B 618abdac5be327f1f4f537e3f95d29aac93b3068aeab44d126daa39cd607ea269b05c0298c31cadf83662dcd4f5c2ec48e857b95034885289086c1c67869bf23 SHA512 eef1769ab9d301ecdf526e79960c79520113a8a1e8ad762ae7c50a5409e1542a24099da3b4a1789987b96b974682306c321162924b30a0a8cfb954c8f307681e
+EBUILD disc-cover-1.5.6-r2.ebuild 707 BLAKE2B b7cf486d72c4ad5dd0e62cbc4f950b1602cdc21652f485136b9a874de730f3744a0348b1382876ef4f1115701bb914a75bd9ab5b6f5e2f22363d5c5fe0c078dd SHA512 178a0578c450ff246294d8a4173faef072d6a7999fed97b1beabd4a5a01dcfc6e87c1925db091f4f23a9c841b8aa9df3ef5a67c618bdbf2e8c2dcf6f973c9484
 MISC metadata.xml 467 BLAKE2B bf0180fe1b96e8ba460f6b87457b25972876b95d20e275672cad5766316ff776f4215dc174271d37004b21d475a66f5e5366f7dda46817dc894b3bc8af56518a SHA512 7eda5fc34c3c850bf3b7d9734f81238a998236df8a41b4e11c31d4b1ea3bf88574c2944b6ddd3b2a7f06c4f1da3a6cf0ae09d143f910ab5294b9f91ccbc653c9
diff --git a/app-cdr/disc-cover/disc-cover-1.5.6-r1.ebuild b/app-cdr/disc-cover/disc-cover-1.5.6-r2.ebuild
index 6e832050733c..a1ac3c577040 100644
--- a/app-cdr/disc-cover/disc-cover-1.5.6-r1.ebuild
+++ b/app-cdr/disc-cover/disc-cover-1.5.6-r2.ebuild
@@ -1,22 +1,20 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Creates CD-Covers via LaTeX by fetching cd-info from freedb.org or local file"
 HOMEPAGE="https://web.archive.org/web/20151104062521/http://www.vanhemert.co.uk/disc-cover.html"
 SRC_URI="http://www.vanhemert.co.uk/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
 SLOT="0"
+KEYWORDS="amd64 ppc sparc x86"
 
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
+BDEPEND="dev-lang/perl"
+RDEPEND="${BDEPEND}
 	dev-perl/Audio-CD-disc-cover
-	virtual/latex-base
-"
+	virtual/latex-base"
 
 src_compile() {
 	pod2man disc-cover > disc-cover.1 || die
@@ -24,8 +22,10 @@ src_compile() {
 
 src_install() {
 	dobin disc-cover
-	dodoc AUTHORS CHANGELOG TODO
+
+	einstalldocs
 	doman disc-cover.1
-	insinto /usr/share/${PN}/templates
-	doins templates/*
+
+	insinto /usr/share/disc-cover/templates
+	doins -r templates/.
 }
diff --git a/app-cdr/dvd+rw-tools/Manifest b/app-cdr/dvd+rw-tools/Manifest
index 84f54feb2643..cbbb8b2c2864 100644
--- a/app-cdr/dvd+rw-tools/Manifest
+++ b/app-cdr/dvd+rw-tools/Manifest
@@ -10,6 +10,5 @@ AUX dvd+rw-tools-7.1-clang.patch 2341 BLAKE2B 752850357de4e38d1f3ba992720834b131
 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 1536 BLAKE2B 079c22093d821610304c2b687b14feb4e15d70c50acf897c97c40a3d99c9783174feabd7ab08029e85a4011a33ff759d607429b04889f0a56938c37c22919e08 SHA512 e9eeacdc4c4ef38eca0195b90ad1fc6a5e8722c637fb5dcc608a131cc496efdc7f37ac5e2180276e65337834bc1a8dca18c46e3e3624e9447cedcf90f6a0c376
-EBUILD dvd+rw-tools-7.1-r4.ebuild 1629 BLAKE2B e1e0af3b4e5af6e758b14b7d243269c794973d3cf8ce5c9b53e62d60128939c0662e2828359a4a42738643664a68f7de00527c20c786ab7492d3e096881d36dc SHA512 0eee3493c96c936aaaefd27fc52016c8b4a3940789da1c97705f100db799b0b725161373c884debc52b904172a0af5c47d1dcaee69c8cf04b8d3cbae1c06f948
+EBUILD dvd+rw-tools-7.1-r4.ebuild 1628 BLAKE2B 11f7ea46d0e72f72e1f121b177d3d85451f6be38c73c5f252e6cf750d122402aed55e645b9fd51a92ee566ff48a452fab9aa9135e3c737287a2badeeb9c26583 SHA512 4193e23537e486ed06da6cfe6019473e079fd75fb598e51350363e6a3f1a43d2134f0f2f85adda50e15e2495a5ef6656ae2a1604709259c8aa4cdd8a21e43537
 MISC metadata.xml 403 BLAKE2B 792a6072f6a596de2a7e859c32970ddde144d8aed5a02177922f6c204dddc6a937fdb6a88b36a08831a75dbe3453835b118cecd129ceed15545f257d93f66059 SHA512 d7246446af71367b4eed423b1006956cdff0ce074891966b366dcc67af5d9a60dcb29ce366d04bc220d14bef8ba6dabdf5558264be826f72d3bc77bbc63482e1
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
deleted file mode 100644
index f2e040ecf9d2..000000000000
--- a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs
-
-DESCRIPTION="A set of tools for DVD+RW/-RW drives"
-HOMEPAGE="http://fy.chalmers.se/~appro/linux/DVD+RW/"
-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 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="app-cdr/cdrtools"
-DEPEND="${RDEPEND}
-	sys-devel/m4"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-7.0-sysmacros.patch
-	"${FILESDIR}"/${PN}-7.0-wctomb-r1.patch
-	"${FILESDIR}"/${PN}-7.0-glibc2.6.90.patch
-	"${FILESDIR}"/${PN}-7.0-dvddl-r1.patch
-	"${FILESDIR}"/${PN}-7.0-wexit.patch
-	"${FILESDIR}"/${PN}-7.0-reload.patch
-	"${FILESDIR}"/${PN}-7.1-noevent.patch
-	"${FILESDIR}"/${PN}-7.1-lastshort.patch
-	"${FILESDIR}"/${PN}-7.1-bluray_srm+pow.patch
-	"${FILESDIR}"/${PN}-7.1-bluray_pow_freespace.patch
-)
-
-src_prepare() {
-	# Linux compiler flags only include -O2 and are incremental.
-	sed -i '/FLAGS/s:-O2::' Makefile.m4 || die "failed to sed out FLAGS"
-	default
-}
-
-src_compile() {
-	emake SHELL="${EPREFIX}"/bin/bash CC="$(tc-getCC)" CXX="$(tc-getCXX)"
-}
-
-src_install() {
-	emake SHELL="${EPREFIX}"/bin/bash prefix="${ED}/usr" install
-	dodoc index.html
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		elog 'If you receive an error, "unable to anonymously mmap...'
-		elog 'Resource temporarily unavailable" when running growisofs,'
-		elog 'then you may need to run "ulimit -l unlimited".'
-	fi
-}
diff --git a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild
index a1505f94a078..e7b519f1933e 100644
--- a/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild
+++ b/app-cdr/dvd+rw-tools/dvd+rw-tools-7.1-r4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://fy.chalmers.se/~appro/linux/DVD+RW/tools/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="app-cdr/cdrtools"
diff --git a/app-cdr/dvdshrink/Manifest b/app-cdr/dvdshrink/Manifest
index b902603b1e16..10cbd91b11a4 100644
--- a/app-cdr/dvdshrink/Manifest
+++ b/app-cdr/dvdshrink/Manifest
@@ -1,4 +1,4 @@
 AUX dvdshrink-2.6.1_p10-fix-paths.patch 793 BLAKE2B 7bca779d2e17ed4388dfdf8e6798bf11111a3a25c3bac722f0a5e428b703ccaaad0cd83f8e906d5ed17d123745d073f12d83c130f03fbf38d8a13f981b85cf5f SHA512 8302a9e62b57346a107857c3c3b7095c5838771919b16d4f248c03582100fbb9ab3d55aafbe8b3a911dc1fa89c746a438a9da60ca77af7419068c5bafb9816a3
 DIST dvdshrink-2.6.1-10mdk.tar.gz 1087571 BLAKE2B a45427483b5519ee7abbc787e7afea2f9edcb49f8f6a15843184e7c62e51f7ebb18ad1db35ea695004eda9763dfc9b2a5522b7b4c279a2b63a71b96d091ffe37 SHA512 6766f95bd2bb29ef0877d9b22bc45eb2c508ad2d1a7bb99f84b3f858987fc098a696f15f953efe006bf9556a73f6aa0e6247afcdf8e4c5dad826ddba97f02c06
-EBUILD dvdshrink-2.6.1_p10.ebuild 1057 BLAKE2B fb2aec0b5becdf5fb614772ea354e83b2f016ef7188738693f5f7989cda135c8829a420c9fac0eae4f0504f3028ee24e6d07565e1a4c079c6c7826dc993ec05e SHA512 8543b0872cd04663d1aa27bafb38c1fb7415ffe2bfdbc0c86295906a893f9eb06c6915b0881dca073619a55e00e8e12279763550349a931fd41eb07699a802e6
-MISC metadata.xml 428 BLAKE2B a8ca0107be96bab8cfb3b3a3833188173cfc9b63f5b751a7ce0723fddb991623e78e3bcab516ad7892b920e7cc3d089338b866ca25796af8324acbf8fd851a38 SHA512 6708ce2fb19fe1f19dde1f8c713575080398b917c45a5c9fb12e814ea4ee6509234bc42bf60482f9e1e46f36ae7b156682e29cfbfe305e7aec7a95838e10b5b9
+EBUILD dvdshrink-2.6.1_p10-r1.ebuild 1048 BLAKE2B f9745c1cf7f45e2409abaacbef3b86fca9af1bc26e4269fc429ad3d1f00fb7050029b9dfa2cc231302379bd2654f71ccb2ed9c245a379c3eee77841c84a6d807 SHA512 b23497141ff1238cd417b0563c863eeaa3a7083227b347b7dcc89a0ae344983945efa334e82c989e0a5fc823f5751e3ed1ebf37d33a86042c226bfdde50718f6
+MISC metadata.xml 431 BLAKE2B 961c093cdacc8eaf73991a52b2f14640ec5841b0bc88ede80adaf0dc72214575c4e0db131ed739e26262eaa3188bff972cd5c05ef0878e5389e7632f9f6f18b6 SHA512 47622d88c083be97b6b3366f65d7d297e5efa1355bd8cdc7cee3aa8611556843405bb6eea344c229c3a9b9600dbb3d761090cc0dc4f8370763e57c3000061b74
diff --git a/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild b/app-cdr/dvdshrink/dvdshrink-2.6.1_p10-r1.ebuild
index e052a53b1fb1..e55e9cbe6fdc 100644
--- a/app-cdr/dvdshrink/dvdshrink-2.6.1_p10.ebuild
+++ b/app-cdr/dvdshrink/dvdshrink-2.6.1_p10-r1.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit desktop
 
 DESCRIPTION="Scriptable DVD copy software"
 HOMEPAGE="http://dvdshrink.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P/_p/-}mdk.tar.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -22,11 +23,8 @@ RDEPEND="
 	>=media-video/mjpegtools-1.8.0-r1
 	>=media-video/subtitleripper-0.3.4-r1
 	>=media-video/transcode-1.0.2-r2[dvd]
-	gtk? ( >=dev-perl/Gtk2-1.104 )
-"
-DEPEND=""
+	gtk? ( >=dev-perl/Gtk2-1.104 )"
 
-S=${WORKDIR}/${PN}
 PATCHES=( "${FILESDIR}"/${PN}-2.6.1_p10-fix-paths.patch )
 
 src_install() {
diff --git a/app-cdr/dvdshrink/metadata.xml b/app-cdr/dvdshrink/metadata.xml
index a161229051ce..70683941b6ed 100644
--- a/app-cdr/dvdshrink/metadata.xml
+++ b/app-cdr/dvdshrink/metadata.xml
@@ -3,9 +3,8 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<longdescription>
-XDVDShrink is a project in BASH and Perl-Gtk2 that allows you to create fair-use
-archival copies of DVD content on single-layer writable DVDs.
-</longdescription>
+		XDVDShrink is a project in BASH and Perl-Gtk2 that allows you to create fair-use archival copies of DVD content on single-layer writable DVDs.
+	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">dvdshrink</remote-id>
 	</upstream>
diff --git a/app-cdr/gaffitter/Manifest b/app-cdr/gaffitter/Manifest
index 027cff9ca5d1..26745525d610 100644
--- a/app-cdr/gaffitter/Manifest
+++ b/app-cdr/gaffitter/Manifest
@@ -1,5 +1,5 @@
-AUX gaffitter-0.6.0-fix-build-system.patch 713 BLAKE2B f4faa44bd548d8a806a18e4a86a336c64f045e9bb82f1a4fbe657346e45865ab78e3c28b582a2a43e95a0561cbe2bafd626d1130d73044bcb114546b5eca466b SHA512 72724f2c638ad93d5a10991a1f0b674a2977b6b8a97956cfc08db456dad5775ca35e1fe49848a103ab0a335351a40ce792613263adcba2df7985f48b109ef3b2
+AUX gaffitter-0.6.0-fix-build-system.patch 704 BLAKE2B 74e97a02e2f169a0c30a91f5bbd6f80073ef683d183aa126af5a56b056bea4c43fecb2125e24e43735d59bf1b3cfaa57647b44291df9d93bc863241041c5edfd SHA512 91b0dc7be3329aa408fd4f45f3458a116b8649d238c3a5431ba5b7e847451f9ae4d342fce8a284b30605c8628ca608ee877b4ee63add4b946db6f36ba6ddc263
 DIST gaffitter-0.6.0.tar.bz2 44433 BLAKE2B 8ae8fb68711168619e69b79c8544dcb926e984ed3e311062060c71f691588c581fb90744c3e984847bd3061e6ed18e6ae07896af8812d6896fb27291af9450e0 SHA512 f27313b0274d2b08e6e9cd7ce86d93c3a944d6d4e4ad103cba8137dd4074bcdfcbd470ef6decdd192e6e5086f27968e27e0b76ca738e9b538db14d83816010b6
 DIST scripts-0.1.0.tar.bz2 5859 BLAKE2B fa774440d9f5b1e8c3a1b4cfd2d65d1d943a904d196df2657ff12e079266b211476bd61b2514be9f629522106ef0b1ef2b21fbb8e0431bf4c6a04273fe3d8a83 SHA512 6730df258444fa4fb17a0d0438b8b1394f857638ce95aaa28dae5345d0bf7517a226a0483a6e8ab89a5012aef9b79586a0cd2b576f9a1ceafc6f29e45d797a20
-EBUILD gaffitter-0.6.0-r1.ebuild 882 BLAKE2B 251e65386c7ff36d5fe8fe3e100b7ea19f983a44a8f1ffbaeb7f4088e4538aff21124ae8d676b3b785071100ce0a0e9cbe9f88d2531512937d522f18064173b0 SHA512 7457798f7c242fd904e47391d76d44fc6de3c962574487fedb90a031029bde84785e6c9af8f8a60eac27bb586febc761c588783d659f08432a360c76b98d8bf9
+EBUILD gaffitter-0.6.0-r2.ebuild 879 BLAKE2B 1b6406b282a83fa3cbd19278d7f079b89e821f480d3a5bfa31afa1bd68f232674f5bd1739960bb1977a34a1fa1c2a1b6bfd54983ea4e190323e9cc5d275042c3 SHA512 ed34ad428ec4ac777f309d20868056dcbbc108a3ff65b1b61ff9369529ba4b4cea8bdfeaa46b95c7856c688854c2dbfe617159ae475a626232fbe08406417ae8
 MISC metadata.xml 351 BLAKE2B 4cc047b7c07fe53d30b4f7fbc28d758c4904183e3c53487907966a8b7fce51f40931d78503f2f79e60c05f99614bbf0b82b19457f3df88ebdeeeb0c1a1a080e1 SHA512 2d92ff63dfa00d8300b4c7dc8ced295640fdc48f7b256c2639e4c43d7e0552fb81d9c93b7f8c1c0b922abf7c94f03127b4d621c0e6f7ccc662dcb680ba5d5d5c
diff --git a/app-cdr/gaffitter/files/gaffitter-0.6.0-fix-build-system.patch b/app-cdr/gaffitter/files/gaffitter-0.6.0-fix-build-system.patch
index df7d99b9c31e..7d6ea908607a 100644
--- a/app-cdr/gaffitter/files/gaffitter-0.6.0-fix-build-system.patch
+++ b/app-cdr/gaffitter/files/gaffitter-0.6.0-fix-build-system.patch
@@ -26,7 +26,7 @@
  
 -gaffitter: $(OBJS) gaffitter.cc Params.h
 -	$(CXX) $(CXXFLAGS) $@.cc $(OBJS) -o $@ $(LDFLAGS)
-+gaffitter: $(OBJS) Params.h
++gaffitter: $(OBJS)
  ###########################################################################
  
  objs: $(OBJS)	
diff --git a/app-cdr/gaffitter/gaffitter-0.6.0-r1.ebuild b/app-cdr/gaffitter/gaffitter-0.6.0-r2.ebuild
index f3f46c1d5e98..964b631ce675 100644
--- a/app-cdr/gaffitter/gaffitter-0.6.0-r1.ebuild
+++ b/app-cdr/gaffitter/gaffitter-0.6.0-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
diff --git a/app-cdr/graveman/Manifest b/app-cdr/graveman/Manifest
index 9c93cbbc54f7..2f49fa2e3cb9 100644
--- a/app-cdr/graveman/Manifest
+++ b/app-cdr/graveman/Manifest
@@ -1,7 +1,8 @@
-AUX desktop-entry.patch 544 BLAKE2B 8d02275e4dcbc4819f252b4493da4808384b2f036e0e208411bd9d734cca1802cee3c141cb0f2f4939f3286e146be9c4bbe13b8e1bf652a156d54eab377e0aba SHA512 92c46a60de5676e0fbb4a22c0e382586b0ac165ad9346f6dd4363c9ec6b19225f80755605bdcf25fdbb834d0868c7040703847797f3b835bde0849be5a08204f
-AUX joliet-long.patch 796 BLAKE2B 308e8471cbbcd2767370c452417d64bad6839126f95a4ed68c005074fb7daef85dc28076615679c1ba507a3091115e4a07ae4e6596492addb4101cdc71f72123 SHA512 cc3280b8eb0f79c89e70cdee5852119d8c13165483222fc1c750b65bfbeb081de9153387f30113ef90e553f18a5ef9625f4bd5737bd6fba521e3846294d27ade
-AUX rename.patch 505 BLAKE2B a7794bdc1a45b34fee773fb0482054b80506d7865c98e7c88f5995c3c4ee377086470d8288640f7e9686e208ba43e49ca2631348d709fa48357ceb815ec5218e SHA512 5ae9769ddd1c26a34d155d38ec2dede550e63be6fa7cb7f8a3cdd7b289aadce370c3f015bac91d0379b20f9f5a2265daff6f69b22350df9486b515c956d7abf5
-AUX sox.patch 1396 BLAKE2B c6f193498e8086111a90aa0811e4d3396c743722a8c31ac8286d37d3bf98d17bb12bd505574af2fc10633a796cdc5bf07924ebd7a2bf63e2fc8cb470feaa8ccb SHA512 545e3439a81e131a704c53e0c5a016d32a99e5bbda788ef5f3a6b1819cac7f4d5b98688e3738f3e6f1440eaba3a69efc1b2718edd578c9e4499166e4d527bd2d
+AUX cflags.patch 453 BLAKE2B 834bc5e8713616c445aaf38c0e0f40c23e9e1b8ac9b45608d3d503fa7fa12a1cc3b219d78295789c3fbba3ed638a3052d9b56105835355ec79878e274d9b8844 SHA512 6a563d78b173663ef7750ee189a576164a61b386ab7ea74325fa5fd48d656bf64fda5d02be5efa9dd7fb883ce4bccca9c1efb63e979c22976cc0c29da53ca20e
+AUX desktop-entry.patch 329 BLAKE2B 4280f5ea838eb488ac83996b364d0a3ee4f26dd5fe374376d315d8130c343ae127bec41217844f72e917dfb11dd38b88113bafaf68f4f6ad59af224bbd54ca7d SHA512 5f909042ee1835f2d208d1df7b271b503c30e854c1df36783c308a9650b3e67c4e6beae735948f84624ae212977e88d17deb7d592f12e82c73b2ba60fa63eb05
+AUX joliet-long.patch 720 BLAKE2B b248bd3973cd827914d52161726125485c55b3223d214821082e4c4f67e6a3577e28cad2654f681c310ea67b7e85a1b1f5fca7ccbc651e20dc3c8f1c3ff6766e SHA512 9f69cc29dadad9d35c44aa5f77ac0555ebc6c61dee003c263273fda325bd310d3c6fcc2b87dabd5742839dd1bb90244d755315e643e5a8b8b3d7bbda1e73c74e
+AUX rename.patch 429 BLAKE2B c91c1d010366c0ec0a44e38528a4b1a53b28da0342ce690ea9e7966c4f29e8af55cea8e201a8983bc3c38790de94842d897ca41429798462b7118271447bd13a SHA512 16c5b75aa8196f21194bbd81a4aaf5fa00d0081bc944ef590b0e2df6f9f0ede982e30fc0f114d1672311dbb4d72f367fc985b96787948437b4bc70dadb2ea8e1
+AUX sox.patch 1232 BLAKE2B bd3dbdfcd81583063dbe3c66ff4d4fde43523512e2cb037ab83e0e0655587f7fb9e643ef2440cc514c69801e32c7f1ec84c04a50efa18b95dc7295cda9870cdf SHA512 cfd26fd5497dc887bc885871b71a88bc2e28566de3b7d0f949fab15752145859c5fa96fb680e3f765c559f3889bb788f3eafd9bc0164d03a77f7d29b93fbf7ab
 DIST graveman-0.3.12-5.tar.gz 962523 BLAKE2B b7650c79ccd379ede48d9b1a9abbb1504e88e787feaf7897f50509d92ff51171e366e99bba4c9f9d153d92b4bbc5970b9775064e7f482fb0b1ccf12e5e50c4e0 SHA512 c09ec1b5273411e61ee568260eb921bb10aafa90ccd0f4074228741c1f0470650368f96e595763d77b46c87fa4a038a1d5a3a022f8019afd5f772754f9636ee4
-EBUILD graveman-0.3.12_p5-r3.ebuild 1669 BLAKE2B c24ace1a1b5c3d2b4c9932aa06a550951eab47696e32f905ca6e81abe7d485d1ce33bf983e395f41be890cdf578f4e99c6b43ecbf2d7899497bea4d36436dac8 SHA512 ff5242c43e21ca828bfd4f4e15db679c3583b8b6a7e3f76ec94442c74d8a72197e3698cf119c19376682af2e74998162d4e8b2860054c1bcc7d0506ef7625d13
+EBUILD graveman-0.3.12_p5-r4.ebuild 1686 BLAKE2B 586a11e8d9ad3d8650b312eaa6d0b3e4021c7963a58a00b77768696d7928c91c710cc5000708967b81d83a0b45c322bf278a378e1237fb3d04d36b11b38207e7 SHA512 a725bb6b41c439826cb5be7b2db5002186250001a2ba9e784956c0c9225b11ceb60bcef3ce5f2ac3badcacf450f1e79110e221fb4a1e7fc64c2af418b13937e8
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-cdr/graveman/files/cflags.patch b/app-cdr/graveman/files/cflags.patch
new file mode 100644
index 000000000000..45df210130fa
--- /dev/null
+++ b/app-cdr/graveman/files/cflags.patch
@@ -0,0 +1,25 @@
+--- a/configure.in
++++ b/configure.in
+@@ -23,7 +23,7 @@
+ 
+ 
+ 
+-AC_INIT(configure.in)
++AC_INIT(configure.ac)
+ AC_CONFIG_HEADER(config.h)
+ AM_MAINTAINER_MODE
+ 
+@@ -283,13 +283,6 @@
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[gettext domain])
+ 
+-if test "A$enable_debug" = "A"; then
+-	enable_debug=no
+-	CFLAGS="-Wall"
+-else
+-	CFLAGS="-Wall -g"
+-fi
+-
+ dnl Ecriture des fichiers
+ AC_OUTPUT([ m4/Makefile 
+ Makefile
diff --git a/app-cdr/graveman/files/desktop-entry.patch b/app-cdr/graveman/files/desktop-entry.patch
index 4a683d2c84ec..e2a678af8ba0 100644
--- a/app-cdr/graveman/files/desktop-entry.patch
+++ b/app-cdr/graveman/files/desktop-entry.patch
@@ -1,6 +1,5 @@
-diff -ur graveman-0.3.12-5.orig/desktop/graveman.desktop.in graveman-0.3.12-5/desktop/graveman.desktop.in
---- graveman-0.3.12-5.orig/desktop/graveman.desktop.in	2005-05-24 00:07:08.000000000 +0300
-+++ graveman-0.3.12-5/desktop/graveman.desktop.in	2008-05-10 06:33:32.000000000 +0300
+--- a/desktop/graveman.desktop.in
++++ b/desktop/graveman.desktop.in
 @@ -1,5 +1,4 @@
  [Desktop Entry]
 -Encoding=UTF-8
diff --git a/app-cdr/graveman/files/joliet-long.patch b/app-cdr/graveman/files/joliet-long.patch
index 0b0f66656aa3..47f6ecf04011 100644
--- a/app-cdr/graveman/files/joliet-long.patch
+++ b/app-cdr/graveman/files/joliet-long.patch
@@ -1,5 +1,5 @@
---- a/src/mkisofs.c.old	2005-05-28 02:37:14.000000000 +0200
-+++ b/src/mkisofs.c	2005-07-11 02:10:44.000000000 +0200
+--- a/src/mkisofs.c
++++ b/src/mkisofs.c
 @@ -91,13 +91,13 @@
        }
      }
diff --git a/app-cdr/graveman/files/rename.patch b/app-cdr/graveman/files/rename.patch
index 5970656a3c55..a2410354c23e 100644
--- a/app-cdr/graveman/files/rename.patch
+++ b/app-cdr/graveman/files/rename.patch
@@ -1,5 +1,5 @@
---- a/src/callbacks.c.old	2006-05-23 17:42:48.642913000 +0200
-+++ b/src/callbacks.c	2006-05-23 17:42:52.553201500 +0200
+--- a/src/callbacks.c
++++ b/src/callbacks.c
 @@ -268,7 +268,7 @@
  
    gtk_tree_model_get(Ltreemodel, &Liter, 2, &Lname, -1);
diff --git a/app-cdr/graveman/files/sox.patch b/app-cdr/graveman/files/sox.patch
index 570bc8406177..d0a9b3f2fac4 100644
--- a/app-cdr/graveman/files/sox.patch
+++ b/app-cdr/graveman/files/sox.patch
@@ -1,6 +1,5 @@
-diff -Naur /var/tmp/portage/graveman-0.3.12_p5/work/graveman-0.3.12-5/src/sox.c ./src/sox.c
---- a/src/sox.c	2005-05-28 02:37:14.000000000 +0200
-+++ b/src/sox.c	2007-01-27 18:22:11.000000000 +0100
+--- a/src/sox.c
++++ b/src/sox.c
 @@ -37,7 +37,7 @@
  gboolean check_sox()
  {
diff --git a/app-cdr/graveman/graveman-0.3.12_p5-r3.ebuild b/app-cdr/graveman/graveman-0.3.12_p5-r4.ebuild
index d9adf8a2b0cb..47779a863ae3 100644
--- a/app-cdr/graveman/graveman-0.3.12_p5-r3.ebuild
+++ b/app-cdr/graveman/graveman-0.3.12_p5-r4.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit autotools gnome2
 
 DESCRIPTION="Graphical frontend for cdrecord, mkisofs, readcd and sox using GTK+2"
 HOMEPAGE="http://graveman.tuxfamily.org/"
 SRC_URI="http://graveman.tuxfamily.org/sources/${PN}-${PV/_p/-}.tar.gz"
+S="${WORKDIR}/${P/_p/-}"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -33,30 +35,30 @@ RDEPEND="
 		media-libs/libogg
 		media-libs/libvorbis
 		media-sound/sox
-	)
-"
-DEPEND="${RDEPEND}
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-util/intltool
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-S="${WORKDIR}/${P/_p/-}"
+	nls? ( sys-devel/gettext )"
 
 src_prepare() {
 	eapply \
 		"${FILESDIR}"/joliet-long.patch \
 		"${FILESDIR}"/rename.patch \
-		"${FILESDIR}"/desktop-entry.patch
+		"${FILESDIR}"/desktop-entry.patch \
+		"${FILESDIR}"/cflags.patch
 
 	if use mp3 || use vorbis; then
 		eapply "${FILESDIR}"/sox.patch
 	fi
 
 	# Fix tests
-	echo glade/dialog_media.glade >> po/POTFILES.in
-	echo glade/window_welcome.glade >> po/POTFILES.in
-	echo src/flac.c >> po/POTFILES.in
+	cat <<- EOF >> po/POTFILES.in || die
+		glade/dialog_media.glade
+		glade/window_welcome.glade
+		src/flac.c
+	EOF
 
 	# Prevent m4_copy error when running aclocal
 	# m4_copy: won't overwrite defined macro: glib_DEFUN, bug #579918
diff --git a/app-cdr/mirage2iso/Manifest b/app-cdr/mirage2iso/Manifest
index 51aab5818ea5..602b9da79a94 100644
--- a/app-cdr/mirage2iso/Manifest
+++ b/app-cdr/mirage2iso/Manifest
@@ -1,5 +1,5 @@
 DIST mirage2iso-0.4.2-tests.tar.xz 12362388 BLAKE2B 7ed280ead88e3f63efe7d545f428ebe901762455f641f24d12e5b01270d29a6a47ba0cfb895bb3e7967bee4de192b0bf42eaf0714b0120683df434d8f2e5f627 SHA512 94955524e8caecf7c9e27e016677e03265311bff6fe1e7f873f8bb009e27a2cad7748e451de382a76ec312d39aee1ef94edd81386009d120c2a3ba63494a366e
 DIST mirage2iso-0.4.2.tar.xz 93168 BLAKE2B 957734f8fe1a57b7472f20250ae0b7347d8fac8b8bf51ed1ecacbe3521b0fc23c846e9fd9988ab8484e081b015726ae8e183fc171577a57b72fb00181e593650 SHA512 ef2671bf6887696f09fbf12df5af06ee5a6d66a9b6dd95ac5c84b71a6dc3216a4c5013aee7b8fb8ffebc8cab1a707b66f10ddefc5e20a5abe3ad0edce960b817
-EBUILD mirage2iso-0.4.2.ebuild 800 BLAKE2B ab858df133b77a7640e44c5c97645e9893392f16eb76c2346eea2b48b40409db33b8a11185c7005981bf4df5be12d21349227b5a0dbb10d52ffb85bd996d8827 SHA512 0791fad85876ea76e24e4c580534864a4fe864e9df2ebd76b7e879bbc5c2c428493a1cdc57697c73c7c73892ac36d9377218d9a041d1498fd1197743c18fef4b
-EBUILD mirage2iso-9999.ebuild 791 BLAKE2B 7f67b03e7c44a6c092bc07dbb637c1aaef9286c13cfd6225deeb233a469e52aadce8384c41574dba97c3b9106facfa9372e3fe1e4314a72016a16266130afd0d SHA512 e22d09aa9dfe4101b88120a4b718add10da9c2298da204aac33b108102fa759b9fca58a2e3f201fa40f1690fd82616d4404342e8bde2081475b19c6a9a4736c2
+EBUILD mirage2iso-0.4.2-r1.ebuild 713 BLAKE2B 90d984200f80153a512841e7e2b283feede6fee9c885ed19a4cf044ff0cda1a73c7630999935ee9bda370fe09c1f5f39850f22c1800270a1c73ed58598a8c56b SHA512 a1202459785e5da11b189c3f04caafcc694d7aa54318ac60848f048f909c3405d70c399e48d5fa398deae34e2c12b33d2901ff57a5adea8402bc3e39c44e216a
+EBUILD mirage2iso-9999.ebuild 649 BLAKE2B 26cfcbf9f8560e66f55d89f3319f8aa63d3f546182f1b1d4b80912ad559d05c46dbb45332b122699d70a51517dfd024f426dd6957fd67efff1a3c87b9f2567d6 SHA512 7940b94b69ba1cc0c158e343561280c37846ecd032185119c735ba87d39a0030572eed5dedab9022bc7958c15db5f6abc554b93cf3894ac4a766aa26c0a51245
 MISC metadata.xml 621 BLAKE2B 2ffa7d090ab9acc71204bb46c7258d78fe80fde4cb79d76ccd64cc6af9988fe307e974508cd7107a13ebec8722b5ffa1814cf14cb05cc6ef01085198ba782661 SHA512 b16fccbc99573c79ca7375b49418223680428e969d4c33e8c1e36d4e926b965bdef6b21b415aa5a028f978300a3710d26862d4e9032139a3d1b439f4960d6bf0
diff --git a/app-cdr/mirage2iso/mirage2iso-0.4.2.ebuild b/app-cdr/mirage2iso/mirage2iso-0.4.2-r1.ebuild
index c1efb10c0087..86120322a7c6 100644
--- a/app-cdr/mirage2iso/mirage2iso-0.4.2.ebuild
+++ b/app-cdr/mirage2iso/mirage2iso-0.4.2-r1.ebuild
@@ -1,33 +1,28 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="CD/DVD image converter using libmirage"
 HOMEPAGE="https://github.com/mgorny/mirage2iso/"
-SRC_URI="https://github.com/mgorny/${PN}/releases/download/v${PV}/${P}.tar.xz
+SRC_URI="
+	https://github.com/mgorny/${PN}/releases/download/v${PV}/${P}.tar.xz
 	test? ( https://github.com/mgorny/${PN}/releases/download/v${PV}/${P}-tests.tar.xz )"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="pinentry test"
+RESTRICT="!test? ( test )"
 
-COMMON_DEPEND=">=dev-libs/libmirage-2.0.0:0=
+DEPEND="
+	>=dev-libs/libmirage-2.0.0:0=
 	dev-libs/glib:2=
 	pinentry? ( dev-libs/libassuan:0= )"
-DEPEND="${COMMON_DEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	pinentry? ( app-crypt/pinentry )"
-
-RESTRICT="!test? ( test )"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
-	local myconf=(
-		$(use_with pinentry libassuan)
-	)
-
-	econf "${myconf[@]}"
+	econf $(use_with pinentry libassuan)
 }
diff --git a/app-cdr/mirage2iso/mirage2iso-9999.ebuild b/app-cdr/mirage2iso/mirage2iso-9999.ebuild
index 117ba275a26e..3ad793f93b52 100644
--- a/app-cdr/mirage2iso/mirage2iso-9999.ebuild
+++ b/app-cdr/mirage2iso/mirage2iso-9999.ebuild
@@ -1,31 +1,26 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-EGIT_REPO_URI="https://github.com/mgorny/mirage2iso.git"
 inherit autotools git-r3
 
 DESCRIPTION="CD/DVD image converter using libmirage"
 HOMEPAGE="https://github.com/mgorny/mirage2iso/"
-SRC_URI=""
+EGIT_REPO_URI="https://github.com/mgorny/mirage2iso.git"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS=""
 IUSE="pinentry test"
+RESTRICT="!test? ( test )"
 
-COMMON_DEPEND=">=dev-libs/libmirage-2.0.0:0=
+DEPEND="
+	>=dev-libs/libmirage-2.0.0:0=
 	dev-libs/glib:2=
 	pinentry? ( dev-libs/libassuan:0= )"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/libassuan
-	virtual/pkgconfig
-	test? ( app-arch/xz-utils )"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	pinentry? ( app-crypt/pinentry )"
-
-RESTRICT="!test? ( test )"
+BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	default
@@ -33,9 +28,5 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf=(
-		$(use_with pinentry libassuan)
-	)
-
-	econf "${myconf[@]}"
+	econf $(use_with pinentry libassuan)
 }
diff --git a/app-cdr/multicd/Manifest b/app-cdr/multicd/Manifest
index dd265b0b6cbc..e5dc95bf15f6 100644
--- a/app-cdr/multicd/Manifest
+++ b/app-cdr/multicd/Manifest
@@ -1,3 +1,3 @@
 DIST multicd-1.7.5.tar.gz 22437 BLAKE2B 7b355fb6a7a99322fa4c3502da7f3949ca372fdebff786ca239260129432596a8556c68d62184ec22ca1c4b1f31b1ab3940793f8656c88f6e1fadd75c96c18d0 SHA512 c17be38d36e0c81a5a230729bbf78c26bfc4e1288f959f6a176951b142772727b58e976e30d12beb05b835aa4126b5410f6f2f8a5aca4bbb89794d336c072b85
-EBUILD multicd-1.7.5-r1.ebuild 473 BLAKE2B 1492453c3e9c37cafd7f06f778ecd9ea2001b5c2b2167351340e8b0ba57bdd367c0e048b35ee6a5dfbe0c6384717ac4e8d9c4148e479b7b782935ec71a03da90 SHA512 220e3680e807516c947484f8cd4794c8d20566e84eda0584f94d549dcee56f14351b7a8e86ad52d2c166910bf6ddcb4eabd2696f3cfd12680705f39c8148bc32
+EBUILD multicd-1.7.5-r2.ebuild 456 BLAKE2B e912a7e0334143f57d8c028beedbbca7075975ea533e57662d49433b29bb824e08ce1a5927aba47548cce419b593d91a6c7a2cd8152486935a932993ff681db4 SHA512 dce38c81656cba7ff89e4a31ab17b3f05785b87f196d9012e38a391d97bc5cf66ed084eefc3ed7a5fce2a71216577b003401237c2792b98372d3ea858b799164
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-cdr/multicd/multicd-1.7.5-r1.ebuild b/app-cdr/multicd/multicd-1.7.5-r2.ebuild
index aaba8ca308a8..6060d9c2af62 100644
--- a/app-cdr/multicd/multicd-1.7.5-r1.ebuild
+++ b/app-cdr/multicd/multicd-1.7.5-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Tool for making direct copies of your files to multiple cd's"
 HOMEPAGE="http://danborn.net/multicd/"
@@ -10,12 +10,10 @@ SRC_URI="http://danborn.net/multicd/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE=""
 
 RDEPEND="
 	app-cdr/cdrtools
-	>=dev-lang/perl-5.8.6
-"
+	dev-lang/perl"
 
 src_install() {
 	dobin multicd
diff --git a/app-cdr/nrg2iso/Manifest b/app-cdr/nrg2iso/Manifest
index 1945eae4b468..eec46cdad295 100644
--- a/app-cdr/nrg2iso/Manifest
+++ b/app-cdr/nrg2iso/Manifest
@@ -1,5 +1,5 @@
 DIST nrg2iso-0.4.tar.gz 8553 BLAKE2B 2bd7907dc027c1bf602447c32f24f82d1627a90922aa32ebabecc15a3b3bb8d021f0dc3e13661351626a36365c76e325cded37046d7ac0f84ce6239c034a87e1 SHA512 fa9e081984345770fad713cdfc5711c8c9ace3981d1cc8130b4c2b83eca517c7765eaab758a34dd5e59846f24c6e3f76f3fc89e984305c4358859b0b28e1ec68
 DIST nrg2iso-test.iso 55452 BLAKE2B c4bd651bde0bc66b781332cc186828fbe3fbff2c77150f5ac5cea5f42824b0016fd8b007991d94801a64edc43ce84e050a2db654380e3a0497b33d3abb11cdf5 SHA512 905c0b30482a3b411e786a4cc225dab7513a33c32bfd312717f4666543323456d2b6b6ddbeee75ed194e04cf28d472c87ffbdbf783c63abd06fae7e433601fba
 DIST nrg2iso-test.nrg 362652 BLAKE2B c122ae3b0c310e5c823ccbf33906135aa74f1001b02dc31f7fc0fa77b87b5627d31ea8746a64f0e8a2450e0ec20dc25f5fd72e202113237a95bc219f321c79df SHA512 c29f7e7d3f692a03fdbc5d0c1a112ead73efb45b102302f7f1685f9f2ccfe1eed9b690a3c3f1c7d7d79da9197fdb40dd06ca7bab4187e5dfca81d47268b550b7
-EBUILD nrg2iso-0.4-r2.ebuild 979 BLAKE2B f609e6ab29030888de0ffbbd7d29d27cc600defa630d4c49abee0bd4f310d555c649730da3b73e25695380ebf1b81b34ff075e3d9d0a43b2526e193de9237c0b SHA512 6aa36a3a5881705294cf63faa8353574fb78e4e578bccf54d9a239d3d9a6681e69a070c21718d86d11d12291d13557f37791fef8ee218368f35cd0c9c867908f
+EBUILD nrg2iso-0.4-r3.ebuild 966 BLAKE2B 2c23f85f8aadfb8421f8bdfeb2b12d57ff7702f4a479d8ef6f7c3adea0dd07c50e847915029da7121efe905d8ffcfc8bd26521c6b79b6099d1c0d09710b1279a SHA512 9a2e787495cca6e40ba43662735fb43d7afc31f371f32ddaf9ac54afd5c585034862d4e35cac3a909c723d871a0790119f795c3b52b92e2b824c9a783c7727d4
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-cdr/nrg2iso/nrg2iso-0.4-r2.ebuild b/app-cdr/nrg2iso/nrg2iso-0.4-r3.ebuild
index 16c6a8f6cce1..487dbc003d53 100644
--- a/app-cdr/nrg2iso/nrg2iso-0.4-r2.ebuild
+++ b/app-cdr/nrg2iso/nrg2iso-0.4-r3.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="Convert CD images from nrg (Nero) to iso"
 HOMEPAGE="http://gregory.kokanosky.free.fr/v4/linux/nrg2iso.en.html"
-SRC_URI="http://gregory.kokanosky.free.fr/v4/linux/${P}.tar.gz
+SRC_URI="
+	http://gregory.kokanosky.free.fr/v4/linux/${P}.tar.gz
 	test? (
 		https://yegortimoshenko.s3.amazonaws.com/${PN}-test.iso
 		https://yegortimoshenko.s3.amazonaws.com/${PN}-test.nrg
@@ -18,19 +19,22 @@ SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
-DOCS=( CHANGELOG )
+
+src_configure() {
+	tc-export CC
+}
 
 src_compile() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} ${PN}.c -o ${PN}
+	emake nrg2iso
 }
 
 src_test() {
 	einfo "checking that nrg -> iso matches the expected output"
-	"${S}/${PN}" "${DISTDIR}/${PN}-test.nrg" "${T}/${PN}-test.iso" || die "conversion failed"
-	diff "${DISTDIR}/${PN}-test.iso" "${T}/${PN}-test.iso" || die "unexpected iso"
+	./nrg2iso "${DISTDIR}"/nrg2iso-test.nrg "${T}"/nrg2iso-test.iso || die "conversion failed"
+	diff "${DISTDIR}"/nrg2iso-test.iso "${T}"/nrg2iso-test.iso || die "unexpected iso"
 }
 
 src_install() {
-	dobin ${PN}
+	dobin nrg2iso
 	einstalldocs
 }
diff --git a/app-cdr/uif2iso/Manifest b/app-cdr/uif2iso/Manifest
index 8905b30b6b28..dfb0a7ba0bc4 100644
--- a/app-cdr/uif2iso/Manifest
+++ b/app-cdr/uif2iso/Manifest
@@ -1,5 +1,5 @@
 DIST uif2iso-0.1.7c.zip 113727 BLAKE2B ae82e898cf27da8e3283af4c3d8dc2bea87fe29fbe998cf720f7876665c621495b1f68ab28af1250d7d041640404fc3d04c112eb7599476dfe4cb8118ab1dad9 SHA512 22e2e2d156cae7f2f72ba5959bf3b4282609397d148e6a98666382003ce568e185a90e6af8821829d302c1efea1ca2c6d155df0181c6a29294d70de8adc9591f
 DIST uif2iso-test.iso 55296 BLAKE2B b17ea40509445665c9103b38fcf26fd8b6e84917e9a0d31c7a53bbb201c310685649c06d055454dc2883e1d566d98912003d74ffbb68f6e6dca8dd47c1705a59 SHA512 775f8fc87a51709c6ef10ae2751cc8600c22d70af419afd680a1917338a699e6a3934597af26400f67ff68fdea5db32e416d73fda370ef71f0d19a5bbdcbedd6
 DIST uif2iso-test.uif 499 BLAKE2B 8e5098629c11572e839bc481ef44e7ff79c46926e049c3f5fb41b1868f63775f509740679835b289222299cfc9710ae8ff7f1739089a44f6fabd1d12720251fb SHA512 6863305d325ec6cf6c8693512d011ec4150bcf0be94f84495e4075cea74412b9fd8ede17f77ad9f7d4b3cf205c9406adbd5440697c7857ab094e4659d074efeb
-EBUILD uif2iso-0.1.7c-r1.ebuild 1103 BLAKE2B 8313a0cf293a7f91724021bbfd7acb12a5a57765675b2998181e83a1ad8c6eaf6509057afb4be3042e02e4597f33e029a8c105ee30b9ad5b901b56db1e5fa96f SHA512 d9a48714fae4dba6466e481254b878a0861fcc45dc050d1b8c24e9faa7be05b8fc1dea3f2e4f85bc8c0a33a451faca55d7ee3c86e6a2270d15989990581ae52a
+EBUILD uif2iso-0.1.7c-r2.ebuild 1106 BLAKE2B 22634592981f3e6044d6446e68e8201cd953e7d3bcd8ced0e22a4436881ba79331bb41563efa84b36551fe79045578cb2af6a469bdec22533a59892d5ee34f47 SHA512 6cf5501d560529921884c9262f2c1df630088e10acd8f56c849854758583f82b86ad1a90d896dab37f05cdb0e59156cc7b88e3055ebad2fe2f81d6ef58dfa525
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-cdr/uif2iso/uif2iso-0.1.7c-r1.ebuild b/app-cdr/uif2iso/uif2iso-0.1.7c-r1.ebuild
deleted file mode 100644
index 5c029a5a00fb..000000000000
--- a/app-cdr/uif2iso/uif2iso-0.1.7c-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit toolchain-funcs
-
-DESCRIPTION="Convert CD images from uif (MagicISO) to iso"
-HOMEPAGE="http://aluigi.altervista.org/mytoolz.htm#uif2iso"
-SRC_URI="mirror://gentoo/${P}.zip
-	 test? ( https://yegortimoshenko.s3.amazonaws.com/${PN}-test.iso
-	       	 https://yegortimoshenko.s3.amazonaws.com/${PN}-test.uif )"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="sys-libs/zlib"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}"
-
-src_compile() {
-	emake CC="$(tc-getCC)" -C src -f - <<-'EOF'
-	      CPPFLAGS += -DMAGICISO_IS_SHIT
-	      LDLIBS = -lz
-	      uif2iso: $(patsubst %.c,%.o,$(wildcard *.c))
-	EOF
-}
-
-src_test() {
-	einfo "checking that uif -> iso matches the expected output"
-	src/${PN} "${DISTDIR}/${PN}-test.uif" "${T}/${PN}-test.iso" # always returns 1
-	diff "${DISTDIR}/${PN}-test.iso" "${T}/${PN}-test.iso" || die "unexpected iso"
-}
-
-src_install() {
-	dobin src/${PN}
-	dodoc ${PN}.txt README
-}
diff --git a/app-cdr/uif2iso/uif2iso-0.1.7c-r2.ebuild b/app-cdr/uif2iso/uif2iso-0.1.7c-r2.ebuild
new file mode 100644
index 000000000000..ae20184cc167
--- /dev/null
+++ b/app-cdr/uif2iso/uif2iso-0.1.7c-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Convert CD images from uif (MagicISO) to iso"
+HOMEPAGE="http://aluigi.altervista.org/mytoolz.htm#uif2iso"
+SRC_URI="
+	mirror://gentoo/${P}.zip
+	test? (
+		https://yegortimoshenko.s3.amazonaws.com/${PN}-test.iso
+		https://yegortimoshenko.s3.amazonaws.com/${PN}-test.uif
+	)"
+S="${WORKDIR}"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-libs/zlib"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
+
+src_compile() {
+	emake CC="$(tc-getCC)" -C src -f - <<- 'EOF'
+		CPPFLAGS += -DMAGICISO_IS_SHIT
+		LDLIBS = -lz
+		uif2iso: $(patsubst %.c,%.o,$(wildcard *.c))
+	EOF
+}
+
+src_test() {
+	einfo "checking that uif -> iso matches the expected output"
+	src/uif2iso "${DISTDIR}"/uif2iso-test.uif "${T}"/uif2iso-test.iso # always returns 1
+	diff "${DISTDIR}"/uif2iso-test.iso "${T}"/uif2iso-test.iso || die "unexpected iso"
+}
+
+src_install() {
+	dobin src/uif2iso
+	dodoc uif2iso.txt README
+}
diff --git a/app-cdr/xcdroast/Manifest b/app-cdr/xcdroast/Manifest
index 35151d993509..c92d58c3576e 100644
--- a/app-cdr/xcdroast/Manifest
+++ b/app-cdr/xcdroast/Manifest
@@ -8,5 +8,5 @@ AUX suid-perms.patch 1362 BLAKE2B c0ddb6945070c021eddca470df8e6f82882e490f843344
 DIST xcdroast-0.98alpha16.tar.gz 3563666 BLAKE2B 781f06e89265e9f30ea651d39219d7083a2cfc2833bc2ab0b57d9f67de77b2eb8aa6755148cd259e3c188a72f07026ecda91d0bbe09af4b55c696c75274739e0 SHA512 dec789955eb70a14f6bcb7c0895a6ca4b7c471cc5ee7ab12af1e671c8586c481c4a05e20eb42724d686d561a551809d9437dafadd3cd081079cefc28e0b94df7
 DIST xcdroast-1.19.tar.gz 3448552 BLAKE2B 2e4e2b5119d5002870142d95345ddd33dad40c5a9d7517594da0dfd945bea012d5391b61fb6264d790aaaacf4de6b990fc77f4b40fab594ac1a5d2279dafa933 SHA512 79449353ba5a1be990366e85bd807e4ef35ec19f021986634ee9549608dca0e447b61dbbed0f30f588baac49fc6b93c055800bedb629ff77274d7da7c39d7881
 EBUILD xcdroast-0.98_alpha16-r3.ebuild 1513 BLAKE2B 3fa1536535cf517fcfb247f8aca2eae1365c388a0cab1651aa9598b3b6c784c16c91b3c0a808b467221ad8a44df08f5ffdd9046e62035ab150b5a214a291e920 SHA512 b15971f106fe8cec6224356123fbb28fc9c4ac25c9491c1e4d305192fa3a988286c11524312aa38e92cc98dcf9a0f7c696e242b0efad5ffbd49aadb2ca8dfc40
-EBUILD xcdroast-1.19-r1.ebuild 839 BLAKE2B 527c8275d210209c57c66599995434e8a53149a845d904b7c2e3c55e641fedaf071f568ef8cf72e7fb155b2cd37a4a365f9f64b366708d38508d0d520e1d2e76 SHA512 3c6c58356eb70a12fc28ee0d92c279d9415492c8ea59b66f79d799bca45ca3403c0843cc75c2ec0dd529c24806bf06560b6108ec5dc9ea4f8e4b3374d9ad81d3
+EBUILD xcdroast-1.19-r1.ebuild 836 BLAKE2B eadd39f7a97a98b3669342fc28872388c7adb4e38aae4b9f004ab3217449258b040fc7c34370d84cf4e25cf4f77f455a63e03f9b11e83aaf5f6f8777b9e24a10 SHA512 0eeae0a75906465244cd670bc03b1da2f8b7d7f6b64ece046b2b3d7be7dfa62513e8b7d06a29248c9242222817027a22b7a5f89c5fdfdf905212a6951d6c0487
 MISC metadata.xml 245 BLAKE2B e15022e3e73c9053c3465d1bd1fc1e652d9194ef5e98d0199152716c01b21244edc7b10af28209408b47e5fdc9a476c316072de87c017297ddd9ccc6f255ea7d SHA512 e4085522aa9abc0509372f8f63ac0ea3de80e6ba697b2acc0f6b822598c99b3967df43413305b9dafb4b2dff0f11adfd5e5732919652ab0812aa9f364fde32f2
diff --git a/app-cdr/xcdroast/xcdroast-1.19-r1.ebuild b/app-cdr/xcdroast/xcdroast-1.19-r1.ebuild
index 17994dcb4dfb..63b715197b22 100644
--- a/app-cdr/xcdroast/xcdroast-1.19-r1.ebuild
+++ b/app-cdr/xcdroast/xcdroast-1.19-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P/_/}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc ~sparc x86"
 IUSE="nls suid"
 
 RDEPEND=">=app-cdr/cdrtools-3.02_alpha09