gentoo auto-resync : 24:07:2022 - 02:51:59

23 files changed, 247 insertions, 327 deletions

diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 2d245784727e..6b0a0a679d25 100644
--- a/app-cdr/Manifest.gz
+++ b/app-cdr/Manifest.gz
diff --git a/app-cdr/b5i2iso/Manifest b/app-cdr/b5i2iso/Manifest
index cc9fca635e01..ba644d9cb711 100644
--- a/app-cdr/b5i2iso/Manifest
+++ b/app-cdr/b5i2iso/Manifest
@@ -1,4 +1,4 @@
-AUX b5i2iso-0.2-segfault.patch 388 BLAKE2B 151e6f41afe5e241be181de2b0ce50a2ee0bff64ab1b04ff99501b2844705a1295cbfea28b85446d2aa899eb6e3a58b9f40e992c336965f8b07749e1698af53c SHA512 133fb1c4da9391e1465f0c820fea2038859c351dbf9b9a8de293294c66857a68f0f544bbca9b8a927a615cc3488a691db6a0bb532bea98362904876634966a5f
+AUX b5i2iso-0.2-segfault.patch 377 BLAKE2B b64cf2f53c1d6cb824a8c119a03ed0c33686e1b867043b354d8065ab897db7010aebbbc7a47a27caa10050a7a556b9a33513ca33381affee9c936ca8a60b0ce8 SHA512 dc487dfa703f99dfe2c71dd33e7f088e231f68e27453fca55abafe7cc947d9f96ef07fe6558165c3752b9d0e2bf3041ea82b64f078168a620d24fcbf2f16c0af
 DIST b5i2iso-0.2.tar.bz2 7503 BLAKE2B a1ac74596213845c49dd007390445640ebe6226ae6273f4e05d567c58badb2ca2698c06951be7348c63c89920dd8034e376343d387665ae08ee13747efcf903b SHA512 2ec6ce30225370898aee9876937b70ee38ed68b6515bef13eb010f1ef1970894995461d5dc5f44ac24d2e7e682774e4fc3c6d2bdde8f744129a3f6103b50f9e4
-EBUILD b5i2iso-0.2-r1.ebuild 566 BLAKE2B 1203d0d037fc908dbbe7ceda22d7a1361dc8a45caebf9c3b8ee1e5c260d253808438eccf034d6d8c6e0f3fdd42d765f2f00c6e5c3e68cef859f9d1813172f718 SHA512 8f65c6c9ab081713d779417d93bef18935f583010e982212238b978e6a8e33b3105972c52121f6dfa2b31f3b03da6b405a1d57c4fa9f3542b35e379fb435df38
+EBUILD b5i2iso-0.2-r2.ebuild 554 BLAKE2B e1afd9485907499b58ce1a3a497d9254c315be3031da7bbe538f6f56402f0a247a9bd9e6ca4bc9a2f53a592147f34e5b5e3b90342b2a88985c2a71af5087317a SHA512 780f3f9c20b8d1c2545de6c0e5f10d209ea893c744e0ba59b339340a0d90e791c6a9b45b53f159827f39a154bdf9461f1e029ee8ca7eb2f8feaa222c5d6e1e51
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/app-cdr/b5i2iso/b5i2iso-0.2-r1.ebuild b/app-cdr/b5i2iso/b5i2iso-0.2-r2.ebuild
index 2257660d9dfa..93024872c4d1 100644
--- a/app-cdr/b5i2iso/b5i2iso-0.2-r1.ebuild
+++ b/app-cdr/b5i2iso/b5i2iso-0.2-r2.ebuild
@@ -1,24 +1,26 @@
-# 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 toolchain-funcs
 
 DESCRIPTION="Convert CD images from b5i (BlindWrite) to iso"
 HOMEPAGE="https://web.archive.org/web/20100116120705/b5i2iso.berlios.de"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-PATCHES=( "${FILESDIR}/${P}-segfault.patch" )
 
-S=${WORKDIR}/${PN}
+PATCHES=( "${FILESDIR}"/${P}-segfault.patch )
 
 src_compile() {
-	$(tc-getCC) ${LDFLAGS} ${CFLAGS} src/${PN}.c -o ${PN}
+	tc-export CC
+	emake -C src b5i2iso
 }
 
 src_install() {
-	dobin ${PN}
+	dobin src/b5i2iso
 }
diff --git a/app-cdr/b5i2iso/files/b5i2iso-0.2-segfault.patch b/app-cdr/b5i2iso/files/b5i2iso-0.2-segfault.patch
index 6fda80e79605..1863ca42afee 100644
--- a/app-cdr/b5i2iso/files/b5i2iso-0.2-segfault.patch
+++ b/app-cdr/b5i2iso/files/b5i2iso-0.2-segfault.patch
@@ -1,5 +1,5 @@
---- b5i2iso/src/b5i2iso.c
-+++ b5i2iso/src/b5i2iso.c
+--- a/src/b5i2iso.c
++++ b/src/b5i2iso.c
 @@ -1,3 +1,4 @@
 +#include <errno.h>
  #include <stdio.h>
@@ -15,4 +15,4 @@
 +}
  fdest = fopen(destfilename,"wb");
  
- fseek(fsource, 2352, SEEK_CUR);
\ No newline at end of file
+ fseek(fsource, 2352, SEEK_CUR);
diff --git a/app-cdr/bin2iso/Manifest b/app-cdr/bin2iso/Manifest
index 7843fe235af6..c8405c8e7304 100644
--- a/app-cdr/bin2iso/Manifest
+++ b/app-cdr/bin2iso/Manifest
@@ -1,4 +1,5 @@
+AUX bin2iso-19b-fixes.patch 606 BLAKE2B 9ac2541668283854a8072d9766f22f56ec7f78853fab46dc377e77543d13f5c512ef254d99b9263bda9d7955bfd21c06d3c90bde0b0ee3aa1712cd0ba006db26 SHA512 4bfe4e1e84297986870664e3e70926cff8978e2447e7ebeaaa84a6515dd20c813dabc4af312f2953285e5bb1daccd30576376bed1bb5dfbdac5091eef7fdd9ff
 AUX bin2iso-19b-sanity-checks.patch 903 BLAKE2B cdd4efb8e631114aa593dbbec3d4f6f0cc88b8c2dee30d138212269d86b55eaaef70d520c91a13bcb408b507a5020c51f1170d4cc5a237a412b3a113ad1e534e SHA512 cbeaf8e620bc54e531293cee179b94c63cb6e8925ac579d65d0f700013235d9da683af8f367f1687828d23c3aa6f6bd20196e2d4201593048ae0152baf7e26a3
 DIST bin2iso-19b.tar.bz2 9805 BLAKE2B 0800f00d4c67481e1fa4c681450ac4f7c5110aadb1f06e70219ac980590af6e37407c75c9e41d3189726922157af843d951461f19915e66da3a30eb2645d7379 SHA512 1f2dbde824ee32eb3be878bf1b96167d753a3f40eb0baf59f3c72907dcc6ce4c999c04d008efde5269dec306b6eab3dd2b15a18a81388c105545abd04e1769c5
-EBUILD bin2iso-19b-r2.ebuild 653 BLAKE2B 532e9367dd39798b093e11191777fc208c2bc2a2f35db59aed39b423507b77d755ffe9ede8cef493fc617b9c1d9988534be5d9447b148d098d7340d036554707 SHA512 93d5cdbdcafd86ae8377919071bb2e83d426b7480e233dbfc240022922f421de679d68f2bd549d8a0655fe0cb447012c8b66a986dfcb894c2fcccefcb2b130bd
+EBUILD bin2iso-19b-r3.ebuild 639 BLAKE2B 41845dfd6da25719df7c40308c25372f9e72ae79e3d70be4830ab118c80330ce74da140a62e222a8306f32b1f21cac3e68851963cbc167c883f3f5db4668e71a SHA512 ead2892e0df715ab073b08f1406345793be4d862842fb71461f5df54417cb0dc1b33e4f6e8ef4602330139704ba68b3477256c929b4a23552014b5d52585e018
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-cdr/bin2iso/bin2iso-19b-r2.ebuild b/app-cdr/bin2iso/bin2iso-19b-r3.ebuild
index 4abbf52bf1c3..3a14eccc6f75 100644
--- a/app-cdr/bin2iso/bin2iso-19b-r2.ebuild
+++ b/app-cdr/bin2iso/bin2iso-19b-r3.ebuild
@@ -1,28 +1,30 @@
-# 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 toolchain-funcs
 
 DESCRIPTION="converts RAW format (.bin/.cue) files to ISO/WAV format"
 HOMEPAGE="http://users.andara.com/~doiron/bin2iso/"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
+S="${WORKDIR}/${PN}"
 
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
-S=${WORKDIR}/${PN}
-
-PATCHES=( "${FILESDIR}"/${P}-sanity-checks.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-sanity-checks.patch
+	"${FILESDIR}"/${P}-fixes.patch
+)
 
 src_compile() {
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} bin2iso19b_linux.c -o ${PN} || die "compile failed"
+	tc-export CC
+	emake bin2iso19b_linux
 }
 
 src_install() {
-	dobin ${PN}
+	newbin bin2iso19b_linux bin2iso
 	dodoc readme.txt
 }
diff --git a/app-cdr/bin2iso/files/bin2iso-19b-fixes.patch b/app-cdr/bin2iso/files/bin2iso-19b-fixes.patch
new file mode 100644
index 000000000000..fc28945ea990
--- /dev/null
+++ b/app-cdr/bin2iso/files/bin2iso-19b-fixes.patch
@@ -0,0 +1,24 @@
+--- a/bin2iso19b_linux.c
++++ b/bin2iso19b_linux.c
+@@ -1,6 +1,12 @@
++#ifndef _POSIX_C_SOURCE

++#define _POSIX_C_SOURCE 200809L

++#endif

++

+ #include <stdio.h>

+ #include <string.h>

+ #include <stdlib.h>

++#include <unistd.h>

++#include <sys/types.h>

+ 

+ #define DEBUG 0

+ #define CHECK 0 /* don't bother checking bin for validity... */

+@@ -111,7 +117,7 @@
+    unsigned long size; /* track size in bytes */

+ } tTrack;

+ 

+-buffered_fread(unsigned char *array, unsigned int size) {

++int buffered_fread(unsigned char *array, unsigned int size) {

+    unsigned int i;

+    

+    if(INBUF_WIDX == 0) {    

diff --git a/app-cdr/ccd2iso/Manifest b/app-cdr/ccd2iso/Manifest
index 1721f8ccced7..340ed403c21e 100644
--- a/app-cdr/ccd2iso/Manifest
+++ b/app-cdr/ccd2iso/Manifest
@@ -1,4 +1,4 @@
 AUX ccd2iso-0.3-headers.patch 240 BLAKE2B 536e0114f0485ae4e79f8801f737c380cafdc37c6d2dc1f272415385324839cfddd56af7f07085bfb181ae1a1e05531ecc6869b6f66b35dd89c8c9d50a1ead1e SHA512 e0d334fb378d5ad0dc25653ab810d3c55a0f8c19a03b4b2180352a20e2b9e405209b37448f57a72fd7c2628601e6f5528118db3fe9e431d580c7d9443bb440a3
 DIST ccd2iso-0.3.tar.gz 158221 BLAKE2B 5cb83f62f6b98e725c5c30e58e9082fd6eff612169d3b8fe0d244bd567f7319879c99792400f788b736874f5ae026ed53154b8e5599f82fbfea879e634f8f155 SHA512 40e0e5bd792c851dd0549a08a3a0d7226cc05893316dc9575d4c9131dce758d992081355de569e3e66dca310545bf3a17c1cd6431ab97e790fdbe5b19c09adc1
-EBUILD ccd2iso-0.3.ebuild 542 BLAKE2B cd3b513a8c4f7d39f77343d8f25558f0c884b8aca909f8aa7e0b398cfba7e36e30ea2fe0a184deeb4cab7a71cc1d45bea98f55144a5f471e33b3aa6004fab636 SHA512 443eb2dfb80bf01a250c6832106e5017984b6a08b1d8fcc6fcd3cd525875fd1cadc5122e6b7a2f3f147f8d83210e760ef719159c35ff41d5dea4fb457484842b
-MISC metadata.xml 242 BLAKE2B 1a4d22b980e571fc2ed44ddc534697022a110d14707c2062421bcb6d3299f6af5837f0715ac210e93c3c4ee860138a5029f24d4538d887a4055ad5df2bd5c895 SHA512 4bfdf91f9a8ecd2ec1a469a2b03d288947727a3e8b55152406c1757066070c9bc3699ecfb33e4aebcf6ccb18b2f87669d746ad6a9ec7195f738620ba84ff0a4a
+EBUILD ccd2iso-0.3-r1.ebuild 447 BLAKE2B 6c79da8d40c3a98cd76bffdf4a79d2c0375952d27359814a398d7d036d82d6462a0a496a735ce5c7bd47e6b46af084d31b7f3c18b4eb6f9def8e86fc2cb85b8b SHA512 f0983831d76c6c4131f0f9c294108efe6d8bed029e246e8ba49add87c9bfc3c94c2d60bd19734d63bc746e52cb5e37295fc3f71bdfd5e62d1e58aa969112865f
+MISC metadata.xml 243 BLAKE2B 1ebc64c54e4359596f57f068fa5b1d68c709b51b19b8e770bb26b2cb8d5511c2743e6f7be5c941470a7bfcda4b77d3665af67c3effba0bd453b44d5b19bb9f12 SHA512 5df241e7491038cca5badda5347325a856c5b936a7cc9e68530352b53294eb7ca7c3abdfda754c7178308408bd2b0000dcf4224ba4f86a608c5a48dab703290e
diff --git a/app-cdr/ccd2iso/ccd2iso-0.3.ebuild b/app-cdr/ccd2iso/ccd2iso-0.3-r1.ebuild
index 27a136490d28..2e75c0698598 100644
--- a/app-cdr/ccd2iso/ccd2iso-0.3.ebuild
+++ b/app-cdr/ccd2iso/ccd2iso-0.3-r1.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
 
 DESCRIPTION="Convert CD images from ccd (CloneCD) to iso"
 HOMEPAGE="https://sourceforge.net/projects/ccd2iso/"
@@ -10,9 +10,5 @@ SRC_URI="mirror://sourceforge/ccd2iso/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-PATCHES=( "${FILESDIR}/${P}-headers.patch" )
 
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
+PATCHES=( "${FILESDIR}"/${P}-headers.patch )
diff --git a/app-cdr/ccd2iso/metadata.xml b/app-cdr/ccd2iso/metadata.xml
index b492b015b434..1bc8dcd11a29 100644
--- a/app-cdr/ccd2iso/metadata.xml
+++ b/app-cdr/ccd2iso/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!--maintainer-needed-->
-<upstream>
-    <remote-id type="sourceforge">ccd2iso</remote-id>
-</upstream>
+	<!--maintainer-needed-->
+	<upstream>
+		<remote-id type="sourceforge">ccd2iso</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-cdr/cdck/Manifest b/app-cdr/cdck/Manifest
index 4e19c425ab6b..11378b85d0ef 100644
--- a/app-cdr/cdck/Manifest
+++ b/app-cdr/cdck/Manifest
@@ -1,3 +1,8 @@
+AUX cdck-0.7.0-automake.patch 1014 BLAKE2B 18de71eeb6a16c1f3f2d13e89f05529db2be2d447a3b45da633e3b3fce81a708d37f2e105dae22237c76f6d0f067f91565db6f345a7266d5c7df40173c77eac0 SHA512 a3b6ebe8e2b5214bbb0e64d7db13a95dea13cbea6938c00b4e3ddf9f34c266e9cd9dc73dbe8538981b5edb260839686f4902e47a7a4bcb964b75a69e7f925763
+AUX cdck-0.7.0-cross.patch 567 BLAKE2B c2c8918846a538a9cd691b3e8ed0c652e5a877e883e686c16d4ef7b8c2b11b6edf8604ed63497d8740a472eb56916bfed3fa9d76e90f99c49ec3cf8e9731d873 SHA512 69e66148bbcf292d1a0203a161aca4427934c8ea3b3057d1aac94dcefb58e834aee4f192eb4687520bfee14e371e39629a724c69f2093aec8a1d1abc92de35e0
+AUX cdck-0.7.0-gcc-10.patch 778 BLAKE2B ec561616410032168670f7296c0bedbfb527a67d05e228cef22dd1aa6107d70538d4d441251926fa23a5a05c17ad996642b3b5d4bbb64a3895ec9ce517b21c51 SHA512 fddea13b657cf0559af6707155eec5b9d46dfd46008dab5be81cc213e71e07bbc4e61d1047ea0d765526c136fa8b08314dbc957d7a1cf59d48cefbf574e89239
+AUX cdck-0.7.0-man.patch 1333 BLAKE2B d30ee613f824ed32e37b98abc1f9bb0f05404170e16dadb7875e1f4801d6d7ef832c288b26120ec4355d3f1536bdb6cb1e285d73df488073881deb705b58238b SHA512 87a81800f6b55373e16fa74963c901e7bdc043424fec57a51451067d3ae0d52d3b3384633d8d22c87aaf99745c21ee92608ef21df178950a2a1dfa20e66cf85c
+AUX cdck-0.7.0-wording.patch 712 BLAKE2B e08817be37f907a634e387261393512de394d1a0e53efd8aaad844184c98ca4b039f930ef12cc5dff6f02456e68506c22c5eb9207ef24ef97ccad8d22e1ac50a SHA512 2f479d4764f6f2fc7798005761838f9035ee0c654aaea85c5b5512d52aa95b80256a0feb02ad7ecdbcd36dd25936c52309f0068ec699a51a2e5df2aad2698b38
 DIST cdck-0.7.0.tar.gz 240285 BLAKE2B 78b0d4949dd39b12ba6813586d956c3f11cd4119b196edbbfcd09487b360ebc3968c7f9f946945e3fbf1e2c4a8c033ed672ff7d84c876a10d73dfd3c1058aaa7 SHA512 aa53a2270fdf4f7d9b61bfe5b4a876ea63baad18b7cc7c920049b446f5518aee3c8389a9c5990bd96ce7e641222d39a70da86e2c6235bb68f054c576ddbc3730
-EBUILD cdck-0.7.0-r2.ebuild 536 BLAKE2B 52ff0a14aae4756d6a4a4f4a51eb15cce44e4a4307203b4dcbbb4c136b32830ef3863f23148aedb3965fb0df3c0562878141f014d893082c6bda9a5225c8c671 SHA512 49a144f0c1051c533bfef10d8c8cea62ca04b692501d8131709421bb3aa44449d668548d8275f479eb40793bf5df3dbb5c1b0ead01c23606c3488c9c912685b7
+EBUILD cdck-0.7.0-r3.ebuild 654 BLAKE2B f2a6f7d3f90f69dcba24c05c0f16297f092b1a58d284c10e2c448e5d12d5d184a84c56de8eec8ff6ac33660c0b24d116db9dece9f34bb6fb66caa3eb7b10122f SHA512 1ce65998adcb7db3697a87f6e88dfcef8649f872caf49088465cb22d2250af1eadcfcecaee1a329608e6c23565bdbcaaf241a6c2b1dacf4e23525be1a0e00c40
 MISC metadata.xml 688 BLAKE2B bd6f3196c5d361d64249c7ee491c330dc81dca7c2f2226bd464402a2618cff15d8cc0a6843ee3a7d9db77c02264ab1166527f574c47e12395b607ccdd0a6eb8c SHA512 c528112bf233634a9413505becae98956bbd64038c5abcb9accd90286cfef7df12a615e1f929e4781cb56b4d583f04760ef59f08a8891c90d939b5f12e5cedf5
diff --git a/app-cdr/cdck/cdck-0.7.0-r2.ebuild b/app-cdr/cdck/cdck-0.7.0-r3.ebuild
index cfbbfbbd6480..ca0805885897 100644
--- a/app-cdr/cdck/cdck-0.7.0-r2.ebuild
+++ b/app-cdr/cdck/cdck-0.7.0-r3.ebuild
@@ -1,7 +1,9 @@
-# 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 autotools
 
 DESCRIPTION="Measure the read time per sector on CD or DVD to check the quality"
 HOMEPAGE="http://swaj.net/unix/index.html#cdck"
@@ -10,21 +12,21 @@ SRC_URI="http://swaj.net/unix/cdck/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-man.patch
+	"${FILESDIR}"/${P}-wording.patch
+	"${FILESDIR}"/${P}-automake.patch
+	"${FILESDIR}"/${P}-cross.patch
+	"${FILESDIR}"/${P}-gcc-10.patch
+)
 
 src_prepare() {
 	default
-
-	sed -e '1d' -i man/cdck_man.in || die "sed failed"
-}
-
-src_configure() {
-	econf --disable-shared
+	eautoreconf
 }
 
 src_install() {
 	default
-
-	dobin src/cdck
-	doman man/cdck.1
+	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/app-cdr/cdck/files/cdck-0.7.0-automake.patch b/app-cdr/cdck/files/cdck-0.7.0-automake.patch
new file mode 100644
index 000000000000..629b48d8b4a4
--- /dev/null
+++ b/app-cdr/cdck/files/cdck-0.7.0-automake.patch
@@ -0,0 +1,42 @@
+Description: allow libtool to auto(re)conf
+Origin: vendor
+Forwarded: no
+Author: tony mancill <tmancill@debian.org>
+Last-Update: 2015-03-04
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -16,7 +16,6 @@
+ 
+ AC_SYS_LARGEFILE
+ 
+-AC_DISABLE_SHARED
+ AM_PROG_LIBTOOL
+ AC_SUBST(LIBTOOL_DEPS)
+ 
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -10,12 +10,12 @@ CLEANFILES = *~ *.o *.la *.lo *.a
+ EXTRA_DIST = config.h cdck template.plot template-ps.plot
+ 
+ INCLUDES = @CPPFLAGS@
+-CFLAGS =  @CFLAGS@ -DBUILD=\"@target@\" -DDATE=\""`date`"\"
++AM_CFLAGS =  @CFLAGS@ -DBUILD=\"@target@\" -DDATE=\""`date`"\"
+ 
+ CXXLINK = $(LIBTOOL) --mode=link $(CC) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ 
+ lib_LTLIBRARIES  = libcdck.la
+-noinst_LIBRARIES = libcdck.a
++#noinst_LIBRARIES = libcdck.a
+ 
+ LIBCDCK_SRCS = 		\
+ 	lib_main.cpp	\
+@@ -28,7 +28,7 @@ LIBCDCK_SRCS = 		\
+ 	lib_cdinfo.h
+ 
+ libcdck_la_SOURCES = $(LIBCDCK_SRCS)
+-libcdck_a_SOURCES  = $(LIBCDCK_SRCS)
++#libcdck_a_SOURCES  = $(LIBCDCK_SRCS)
+ 
+ bin_PROGRAMS = cdck
+ 
diff --git a/app-cdr/cdck/files/cdck-0.7.0-cross.patch b/app-cdr/cdck/files/cdck-0.7.0-cross.patch
new file mode 100644
index 000000000000..dae65e604898
--- /dev/null
+++ b/app-cdr/cdck/files/cdck-0.7.0-cross.patch
@@ -0,0 +1,20 @@
+Description: replace hard-coded `gcc' with $CC in configure.ac
+ to allow cross-building.
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/901177
+Forwarded: not-yet
+Author: Helmut Grohne <helmut@subdivi.de>
+Reviewed-by: gregor herrmann <gregoa@debian.org>
+Last-Update: 2018-06-09
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -96,7 +96,7 @@
+    CXXFLAGS="$CXXFLAGS -Wall -Wwrite-strings -Woverloaded-virtual -fno-exceptions -fno-rtti -export-dynamic "
+ fi
+ 
+-SUPCXX=`gcc -print-file-name=libsupc++.a`
++SUPCXX=`$CC -print-file-name=libsupc++.a`
+ 
+ LIBS="$SUPCXX $LIBS"
+ 
diff --git a/app-cdr/cdck/files/cdck-0.7.0-gcc-10.patch b/app-cdr/cdck/files/cdck-0.7.0-gcc-10.patch
new file mode 100644
index 000000000000..145503096b0b
--- /dev/null
+++ b/app-cdr/cdck/files/cdck-0.7.0-gcc-10.patch
@@ -0,0 +1,18 @@
+Description: Fix detection of gcc version.
+ Use numeric instead of string comparison, then gcc version 10 is greater then 3.
+Origin: vendor
+Bug-Debian: https://bugs.debian.org/957073
+Author: gregor herrmann <gregoa@debian.org>
+Last-Update: 2020-04-17
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -50,7 +50,7 @@
+ echo $_echo_n "checking version of ${CC} ... $_echo_c"
+ exec 15> ./.gcc.test
+ cat >&15 <<EOF
+-${CC} -v 2>&1 | perl -e '\$/=undef;\$_=<STDIN>;s/.*ver.+?([[0-9\.]]+).*//s;\$_=\$1;print; s/\.//sg;s/^.*?(\d{0,4}).*\$/\$1/; exit 0 if (\$_ gt 300); exit -1'
++${CC} -v 2>&1 | perl -e '\$/=undef;\$_=<STDIN>;s/.*ver.+?([[0-9\.]]+).*//s;\$_=\$1;print; s/\.//sg;s/^.*?(\d{0,4}).*\$/\$1/; exit 0 if (\$_ >= 300); exit -1'
+ EOF
+ sh ./.gcc.test 2>/dev/null
+ if test $? -ne 0 ; then
diff --git a/app-cdr/cdck/files/cdck-0.7.0-man.patch b/app-cdr/cdck/files/cdck-0.7.0-man.patch
new file mode 100644
index 000000000000..664b5e77872d
--- /dev/null
+++ b/app-cdr/cdck/files/cdck-0.7.0-man.patch
@@ -0,0 +1,50 @@
+Author: gregor herrmann <gregoa@debian.org>
+Last-Update: 2015-03-04
+Description:
+ - fix calls to pod2man
+ - remove stray "=cut", leads to pod2man errors
+ - add a note about using the gnuplot datafile
+Bugs-Ubuntu: https://bugs.launchpad.net/bugs/476591
+
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -11,7 +11,7 @@
+ EXTRA_DIST = cdck_man.in
+ 
+ cdck.1:
+-	pod2man --section=cdck.1 --verbose cdck_man.in > cdck.1
++	pod2man --section=1 --verbose --name=cdck cdck_man.in > cdck.1
+ 
+ 
+ #
+--- a/man/cdck_man.in
++++ b/man/cdck_man.in
+@@ -1,5 +1,3 @@
+-=cut
+-
+ =head1 NAME
+ 
+        cdck - simple CD/DVD check program
+@@ -17,6 +15,8 @@
+        -i Print CD/DVD information and quit, perform no timings (default mode)
+ 
+        -t Perform timing test
++
++	  Note: this option will not work for audio CDs.
+ 
+        -p Save data for gnuplot(1) program
+ 
+@@ -26,7 +26,11 @@
+ 
+        -v Verbose operations
+ 
++       To actually plot your data you have to start gnuplot and plot the datafile:
++          $ gnuplot
++          gnuplot> plot "cdck-plot.dat"
++
+ =head1 COPYRIGHT
+ 
+-       This manpage was written by gregor herrmann <gregor+debian@comodo.priv.at> for the
+-       Debian project but may be used by others.
++       This manpage was written by gregor herrmann <gregoa@debian.org>
++       for the Debian project, but may be used by others.
diff --git a/app-cdr/cdck/files/cdck-0.7.0-wording.patch b/app-cdr/cdck/files/cdck-0.7.0-wording.patch
new file mode 100644
index 000000000000..74e91c1f6bb6
--- /dev/null
+++ b/app-cdr/cdck/files/cdck-0.7.0-wording.patch
@@ -0,0 +1,25 @@
+Description: improve wording
+Author: DenverD
+Reviewed-by: gregor herrmann <gregoa@debian.org>
+Last-Update: 2010-05-25
+
+--- a/src/lib_main.cpp
++++ b/src/lib_main.cpp
+@@ -566,7 +566,7 @@
+ 	fprintf (stdout, "\nConclusion:\n");
+ 
+ 	if (bad_sectors > 0) {
+-		fprintf (stdout, "   Disc contains BAD or even readable sectors, put it into trash can!\n");
++		fprintf (stdout, "   Disc contains BAD or even unreadable sectors, put it into trash can!\n");
+ 		return;
+ 	}
+ 
+@@ -580,7 +580,7 @@
+ 		return;
+ 	}
+ 
+-	fprintf (stdout, "   Even there is no unreadable sectors, disc is unstable!\n");
++	fprintf (stdout, "   Even though there are no unreadable sectors, disc is unstable!\n");
+ }
+ 
+ void Ccdrom::DeallocateTimings()
diff --git a/app-cdr/cdlabelgen/Manifest b/app-cdr/cdlabelgen/Manifest
index 6594aea33268..f24b6240b8d7 100644
--- a/app-cdr/cdlabelgen/Manifest
+++ b/app-cdr/cdlabelgen/Manifest
@@ -1,4 +1,4 @@
 AUX 4.0.0-create-MAN_DIR.diff 695 BLAKE2B f292796ab872b6a1c9440f60551ea3eebc56cd37752415d59bff1346cb33f21fb0a0907c5e1e59d0ab57b85c41b12576d7dee6415305c155b2da9b9b6b507ff6 SHA512 21e4414fd2bd9c619e9c78371ae6300e4a9ba9f81ac4bb2c4afbbc4fe2ca783409fd6e18e2164e1b1017fd452d06f3ddf14a6823477e4811dd749eb2681b386f
 DIST cdlabelgen-4.3.0.tgz 209771 BLAKE2B 7d8be25da83a7e4235c9aa9188855ed0f2600eab79e19a9cb1287b30609ad40d6b28a14329fd6281e6aee049ea7d402ecc61d116c00e3c4b02da05cdb4a28fab SHA512 e9528dc1cfead1f3a90b2109346ac1e5305875e2a10dc3196a1caa94fb6e30daeff4bdac5eb43cb6710fdf36fc98349fdeaa225eaa6db3825bf9fd33cc9ab8cf
-EBUILD cdlabelgen-4.3.0.ebuild 629 BLAKE2B d092f64eede7c49347d420d37dc5f27dee2563640defc5be89fd6833367cc83a3998871ebf66469118ba6c8c23b8b418af5cd137cc52e924d5c68a94c9ec47fe SHA512 a562efc1ae82a08e34902683848610bd2d124d161c7fa7a78b9c313001f211ba24d19da81e6f1b11a5e8d3ed11131fbbd5316dba0a86b039e820a8d7b12e2b30
+EBUILD cdlabelgen-4.3.0-r1.ebuild 602 BLAKE2B a0ba758c8bbe542d62deac9e1f994f931c35cbe0053e96e36186647dd5067ecb7bd1d4e31ab7275ca97ee8d37c1e90ec7df1e356fb8008cc568b3e4b6dfd2369 SHA512 11346f00d98dd37bee1960eeb6eacb3576fbac68f27fc1a8c471ffb9f0ae00465b95fd289dae4fb8b0632f1ebd2791d0d6bdcb82104e7b90572e29156ef2f080
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-cdr/cdlabelgen/cdlabelgen-4.3.0.ebuild b/app-cdr/cdlabelgen/cdlabelgen-4.3.0-r1.ebuild
index e72ab4ecc2c7..b7469be291ee 100644
--- a/app-cdr/cdlabelgen/cdlabelgen-4.3.0.ebuild
+++ b/app-cdr/cdlabelgen/cdlabelgen-4.3.0-r1.ebuild
@@ -1,27 +1,27 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="CD cover, tray card and envelope generator"
 HOMEPAGE="https://www.aczoom.com/tools/cdinsert"
 SRC_URI="https://www.aczoom.com/pub/tools/${P}.tgz"
+
 LICENSE="aczoom"
 SLOT="0"
 KEYWORDS="amd64 ppc ~sparc x86"
-IUSE=""
 
 RDEPEND="dev-lang/perl"
-DEPEND=""
 
 PATCHES=( "${FILESDIR}"/4.0.0-create-MAN_DIR.diff )
-DOCS=( ChangeLog README INSTALL.WEB )
 
 src_install() {
-	emake BASE_DIR="${D}"/usr install
-	einstalldocs
-	insinto "/usr/share/${PN}"
+	emake BASE_DIR="${ED}"/usr install
+	dodoc ChangeLog README INSTALL.WEB
+
+	insinto /usr/share/cdlabelgen
 	doins *.html
-	exeinto "/usr/share/${PN}"
+
+	exeinto /usr/share/cdlabelgen
 	doexe cdinsert{,-ps}.pl
 }
diff --git a/app-cdr/cdrtools/Manifest b/app-cdr/cdrtools/Manifest
index a48842e92089..8571ebf39b42 100644
--- a/app-cdr/cdrtools/Manifest
+++ b/app-cdr/cdrtools/Manifest
@@ -1,5 +1,4 @@
 DIST cdrtools-3.02a09.tar.bz2 2156745 BLAKE2B 3e7a7ed65faffc67d53df8dff78562dd28f2e71bb01c36f9c57c033a4a812e6a5579a212322a15c8abb5c8005d38e6e9ba5a5bfab46d9a729a673aa8ce3425e7 SHA512 59c31186f163c7aaa96083efeb0bc31e697c5d53d3343ec487eddd90dc8df6cfee50a69859a64a7004585c73a081cc453cc647c563b32ef74070d075039342d4
 EBUILD cdrtools-3.02_alpha09-r3.ebuild 8175 BLAKE2B bec7f255ac6caefcb7bebcb88c2282da478076a5c47ff8e97e0235e9cb61c22b12d097277b95789f3a358ff2764156e85ed633478b1fd9ce77a34e95ac8e35d9 SHA512 775751d8e2f14acb24a5d139a47e9022a15b18054e24fabe397d5c74652be95d7acbbb0fa89d3d250a5cfa245b5744f4c0a6665bcac73834cd753c78ca16236e
 EBUILD cdrtools-3.02_alpha09-r4.ebuild 9006 BLAKE2B c185543b1b29af2555cebf3d97f821fac8db389b422d82b85d6d8f273abe4e47d0f2696d524842ba3fb73baf8dad3fc88c288725259bd2183392887f635ec647 SHA512 4e2aa1ccc621172333301bb8e05bbfe136557c574312aa745862eec8b1969e85ed51ecf49417772acb2bb8df2cb11fc7653d63f54f6f5c41fc2c5ad45abba503
-EBUILD cdrtools-3.02_alpha09.ebuild 7881 BLAKE2B 3ca107b16e92797b85e0fd09a5e205db41d73977220998d7b0baef7d29120bb0cbbeb788c739f98d9e3b8f4bdcda5f6b2a5a57b2cf55562edc2d82136a6d8aef SHA512 0835b77c2af21e5cff24ab0da2d089273b2984eca57087e3e0e92f0cc01325718d7b583f87179d8dba9bb3ad2d46f95752afce55b5d51bc678cc0a3c33bb3c67
 MISC metadata.xml 445 BLAKE2B 43f12bca87633d1b039beed2fb401b652eafb937afc8a27d9d84885d306636bc29978beb17426dc782cb7c2e7ba9333b9346b6455fa72db2b778800f39995476 SHA512 c552eae00d8560d482fcb02799f064f5481e67ec12107760c841620db2d3023826377e186f5dc1b3555eea9b40964b4c7020b1deb82574ff1ff3ad7fd957bde9
diff --git a/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild b/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
deleted file mode 100644
index ff5c7db00ebe..000000000000
--- a/app-cdr/cdrtools/cdrtools-3.02_alpha09.ebuild
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit fcaps toolchain-funcs flag-o-matic gnuconfig
-
-MY_P="${P/_alpha/a}"
-
-DESCRIPTION="A set of tools for CD/DVD reading and recording, including cdrecord"
-HOMEPAGE="https://sourceforge.net/projects/cdrtools/"
-SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 -riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="acl caps nls unicode"
-
-RDEPEND="acl? ( virtual/acl )
-	caps? ( sys-libs/libcap )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	x11-misc/makedepend
-	nls? ( >=sys-devel/gettext-0.18.1.1 )"
-
-S=${WORKDIR}/${P/_alpha[0-9][0-9]}
-
-FILECAPS=(
-	cap_sys_resource,cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_ipc_lock,cap_sys_rawio+ep usr/bin/cdrecord --
-	cap_dac_override,cap_sys_admin,cap_sys_nice,cap_net_bind_service,cap_sys_rawio+ep usr/bin/cdda2wav --
-	cap_dac_override,cap_sys_admin,cap_net_bind_service,cap_sys_rawio+ep usr/bin/readcd
-)
-
-cdrtools_os() {
-	local os="linux"
-	[[ ${CHOST} == *-darwin* ]] && os="mac-os10"
-	echo "${os}"
-}
-
-src_prepare() {
-	default
-
-	gnuconfig_update
-
-	# Remove profiled make files.
-	find -name '*_p.mk' -delete || die "delete *_p.mk"
-
-	# Adjusting hardcoded paths.
-	sed -i -e "s|opt/schily|usr|" \
-		$(find ./ -type f -name \*.[0-9ch] -exec grep -l 'opt/schily' '{}' '+') \
-		|| die "sed opt/schily"
-
-	sed -i -e "s|\(^INSDIR=\t\tshare/doc/\)|\1${PF}/|" \
-		$(find ./ -type f -exec grep -l '^INSDIR.\+doc' '{}' '+') \
-		|| die "sed doc"
-
-	# Respect libdir.
-	sed -i -e "s|\(^INSDIR=\t\t\)lib|\1$(get_libdir)|" \
-		$(find ./ -type f -exec grep -l '^INSDIR.\+lib\(/siconv\)\?$' '{}' '+') \
-		|| die "sed multilib"
-
-	# Do not install static libraries.
-	sed -i -e "s|include\t\t.*rules.lib||" \
-		$(find ./ -type f -exec grep -l '^include.\+rules\.lib' '{}' '+') \
-		|| die "sed rules"
-
-	# Enable verbose build.
-	sed -i -e '/@echo.*==>.*;/s:@echo[^;]*;:&set -x;:' \
-		RULES/*.rul RULES/rules.prg RULES/rules.inc \
-		|| die "sed verbose rules"
-
-	# Respect CC/CXX variables.
-	cd "${S}"/RULES || die
-	local tcCC="$(tc-getCC)"
-	local tcCXX="$(tc-getCXX)"
-	sed -i -e "/cc-config.sh/s|\$(C_ARCH:%64=%) \$(CCOM_DEF)|${tcCC} ${tcCC}|" \
-		rules1.top || die "sed rules1.top"
-	sed -i -e "/^CC_COM_DEF=/s|gcc|${tcCC}|" \
-		-e "/^CC++_COM_DEF=/s|g++|${tcCXX}|" \
-		-e "/COPTOPT=/s|-O||" \
-		-e 's|$(GCCOPTOPT)||' \
-		cc-gcc.rul || die "sed cc-gcc.rul"
-	sed -i -e "s|^#\(CONFFLAGS +=\).*|\1\t-cc=${tcCC}|" \
-		rules.cnf || die "sed rules.cnf"
-
-	# Schily make setup.
-	cd "${S}"/DEFAULTS || die
-	local os=$(cdrtools_os)
-
-	sed -i \
-		-e "s|^\(DEFLINKMODE=\).*|\1\tdynamic|" \
-		-e "s|^\(LINUX_INCL_PATH=\).*|\1|" \
-		-e "s|^\(LDPATH=\).*|\1|" \
-		-e "s|^\(RUNPATH=\).*|\1|" \
-		-e "s|^\(INS_BASE=\).*|\1\t${ED}/usr|" \
-		-e "s|^\(INS_RBASE=\).*|\1\t${ED}|" \
-		-e "s|^\(DEFINSGRP=\).*|\1\t0|" \
-		-e '/^DEFUMASK/s,002,022,g' \
-		Defaults.${os} || die "sed Schily make setup"
-	# re DEFUMASK above:
-	# bug 486680: grsec TPE will block the exec if the directory is
-	# group-writable. This is painful with cdrtools, because it makes a bunch of
-	# group-writable directories during build. Change the umask on their
-	# creation to prevent this.
-}
-
-ac_cv_sizeof() {
-	cat <<-EOF >"${T}"/test.c
-	#include <inttypes.h>
-	#include <stddef.h>
-	#include <stdint.h>
-	#include <sys/types.h>
-	int main () {
-		static int test_array [1 - 2 * !((sizeof(TYPE)) == LEN)];
-		test_array [0] = 0;
-		return test_array [0];
-	}
-	EOF
-
-	local i=1
-	while [[ ${i} -lt 20 ]] ; do
-		if ${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o /dev/null -DTYPE="$1" -DLEN=$i 2>/dev/null; then
-			echo ${i}
-			return 0
-		fi
-		: $(( i += 1 ))
-	done
-	return 1
-}
-
-src_configure() {
-	use acl || export ac_cv_header_sys_acl_h="no"
-	use caps || export ac_cv_lib_cap_cap_get_proc="no"
-	export ac_cv_header_pulse_pulseaudio_h="no"
-
-	# skip obsolete configure script
-	if tc-is-cross-compiler ; then
-		# Cache known values for targets. #486680
-
-		tc-export CC
-		local var val t types=(
-			char "short int" int "long int" "long long"
-			"unsigned char" "unsigned short int" "unsigned int"
-			"unsigned long int" "unsigned long long"
-			float double "long double" size_t ssize_t ptrdiff_t
-			mode_t uid_t gid_t pid_t dev_t time_t wchar_t
-			"char *" "unsigned char *"
-		)
-		for t in "${types[@]}" ; do
-			var="ac_cv_sizeof_${t// /_}"
-			var=${var//[*]/p}
-			val=$(ac_cv_sizeof "${t}") || die "could not compute ${t}"
-			export "${var}=${val}"
-			einfo "Computing sizeof(${t}) as ${val}"
-		done
-		# We don't have these types.
-		export ac_cv_sizeof___int64=0
-		export ac_cv_sizeof_unsigned___int64=0
-		export ac_cv_sizeof_major_t=${ac_cv_sizeof_dev_t}
-		export ac_cv_sizeof_minor_t=${ac_cv_sizeof_dev_t}
-		export ac_cv_sizeof_wchar=${ac_cv_sizeof_wchar_t}
-
-		export ac_cv_type_prototypes="yes"
-		export ac_cv_func_mlock{,all}="yes"
-		export ac_cv_func_{e,f,g}cvt=$(usex elibc_glibc)
-		export ac_cv_func_dtoa_r="no"
-		export ac_cv_func_sys_siglist{,_def}="no"
-		export ac_cv_func_printf_{j,ll}="yes"
-		export ac_cv_realloc_null="yes"
-		export ac_cv_no_user_malloc="no"
-		export ac_cv_var_timezone="yes"
-		export ac_cv_var___progname{,_full}="yes"
-		export ac_cv_fnmatch_igncase="yes"
-		export ac_cv_file__dev_{fd_{0,1,2},null,std{err,in,out},tty,zero}="yes"
-		export ac_cv_file__usr_src_linux_include="no"
-
-		case $(cdrtools_os) in
-		linux)
-			export ac_cv_func_bsd_{g,s}etpgrp="no"
-			export ac_cv_hard_symlinks="yes"
-			export ac_cv_link_nofollow="yes"
-			export ac_cv_access_e_ok="no"
-
-			export ac_cv_dev_minor_noncontig="yes"
-			case ${ac_cv_sizeof_long_int} in
-			4) export ac_cv_dev_minor_bits="32";;
-			8) export ac_cv_dev_minor_bits="44";;
-			esac
-
-			cat <<-EOF >"${T}"/test.c
-			struct {
-				char start[6];
-				unsigned char x1:4;
-				unsigned char x2:4;
-				char end[5];
-			} a = {
-				.start = {'S', 't', 'A', 'r', 'T', '_'},
-				.x1 = 5,
-				.x2 = 4,
-				.end = {'_', 'e', 'N', 'd', 'X'},
-			};
-			EOF
-			${CC} ${CPPFLAGS} ${CFLAGS} -c "${T}"/test.c -o "${T}"/test.o
-			if grep -q 'StArT_E_eNdX' "${T}"/test.o ; then
-				export ac_cv_c_bitfields_htol="no"
-			elif grep -q 'StArT_T_eNdX' "${T}"/test.o ; then
-				export ac_cv_c_bitfields_htol="yes"
-			fi
-			;;
-		esac
-	fi
-}
-
-src_compile() {
-	if use unicode; then
-		local flags="$(test-flags -finput-charset=ISO-8859-1 -fexec-charset=UTF-8)"
-		if [[ -n ${flags} ]]; then
-			append-flags ${flags}
-		else
-			ewarn "Your compiler does not support the options required to build"
-			ewarn "cdrtools with unicode in USE. unicode flag will be ignored."
-		fi
-	fi
-
-	# If not built with -j1, "sometimes" cdda2wav will not be built.
-	emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \
-		LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true"
-}
-
-src_install() {
-	# If not built with -j1, "sometimes" manpages are not installed.
-	emake -j1 CPPOPTX="${CPPFLAGS}" COPTX="${CFLAGS}" C++OPTX="${CXXFLAGS}" \
-		LDOPTX="${LDFLAGS}" GMAKE_NOWARN="true" install
-
-	# These symlinks are for compat with cdrkit.
-	dosym schily /usr/include/scsilib
-	dosym ../scg /usr/include/schily/scg
-
-	dodoc ABOUT Changelog* CONTRIBUTING PORTING README.linux-shm READMEs/README.linux
-
-	cd "${S}"/cdda2wav || die
-	docinto cdda2wav
-	dodoc Changelog FAQ Frontends HOWTOUSE NEEDED README THANKS TODO
-
-	cd "${S}"/mkisofs || die
-	docinto mkisofs
-	dodoc ChangeLog* TODO
-
-	# Remove man pages related to the build system
-	rm -rvf "${ED}"/usr/share/man/man5 || die
-}
-
-pkg_postinst() {
-	fcaps_pkg_postinst
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		einfo
-		einfo "Darwin/OS X use the following device names:"
-		einfo
-		einfo "CD burners: (probably) ./cdrecord dev=IOCompactDiscServices"
-		einfo
-		einfo "DVD burners: (probably) ./cdrecord dev=IODVDServices"
-		einfo
-	fi
-}
diff --git a/app-cdr/cue2toc/Manifest b/app-cdr/cue2toc/Manifest
index 89f4197c07a4..7d3d492b3c94 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 388 BLAKE2B 34e08a6b46c62041e911265e69ddf5eaa262fad19c212334a41471ce3e82d9e25b31877637214eeffe17f8d89db7ed1697bccec079e102550c84193867d940fc SHA512 5f820ff005be80e07686bd5969c2f9b7086666e01a68dcf9434c1f04b28e61c0b1b8f6c5657c0e7c67425bdeb782d11b8d140d2a7677fa7f1b43b971ab8efac8
+EBUILD cue2toc-0.4-r1.ebuild 381 BLAKE2B c64c20a04cf6ee8561ff6272251350ae2de552ed26c3526f290750974f4d2458927ad30ceb025339bf13460e278d70f415ae0c10a16cc2509678f71b86117008 SHA512 0f152d2c5ef27cc1897896ea814ed5a083dd4f0c7e1c8cce2e3ca3ef2ed802eb40ca8285d2d05ba3ed8ce8901ee003b8229718f3079e72a15d6106e090fe0f65
 MISC metadata.xml 725 BLAKE2B f02db6e63eee5f2c9d424ba1913e7d22617772d516e647f61ee30445aad99cd1ac610dbcd1fda985b9f5bb835a39961ffb0e7e3a9c6af99f4578d780320010e4 SHA512 97403e9443a61cf67e199289e7ff32c319be23b62ddf36c9a5123b4879a93ed3d90e8e5a407e6b68eb5ae6c812f83c25b06d2521e31a9a5a88b4645cc22df8c7
diff --git a/app-cdr/cue2toc/cue2toc-0.4.ebuild b/app-cdr/cue2toc/cue2toc-0.4-r1.ebuild
index 66abd1c3f554..6e3e60ba4aea 100644
--- a/app-cdr/cue2toc/cue2toc-0.4.ebuild
+++ b/app-cdr/cue2toc/cue2toc-0.4-r1.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="Convert CUE files to cdrdao's TOC format"
 HOMEPAGE="http://cue2toc.sourceforge.net/"
@@ -10,6 +10,5 @@ SRC_URI="mirror://sourceforge/cue2toc/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86"
-IUSE=""
 
-DEPEND="!app-cdr/cdrdao"
+DEPEND="!!app-cdr/cdrdao"