app-backup/cdbackup: update EAPI 6 -> 8

Closes: https://bugs.gentoo.org/714644
Signed-off-by: David Seifert <soap@gentoo.org>

3 files changed, 52 insertions, 12 deletions

diff --git a/app-backup/cdbackup/cdbackup-0.7.1-r1.ebuild b/app-backup/cdbackup/cdbackup-0.7.1-r2.ebuild
index 184aa586db4c..89093287bfc2 100644
--- a/app-backup/cdbackup/cdbackup-0.7.1-r1.ebuild
+++ b/app-backup/cdbackup/cdbackup-0.7.1-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -12,23 +12,20 @@ SRC_URI="http://www.muempf.de/down/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 RDEPEND=">=app-cdr/cdrtools-1.11.28"
-DEPEND=""
 
-src_prepare() {
-	sed -i -e '/cd\(backup\|restore\)/,+1 s:CFLAGS:LDFLAGS:' \
-		"${S}"/Makefile || die "sed Makefile failed"
-	default
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-u_char-musl.patch
+)
 
-src_compile() {
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)"
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
 	dobin cdbackup cdrestore
 	doman cdbackup.1 cdrestore.1
-	dodoc CHANGES CREDITS README
+	einstalldocs
 }
diff --git a/app-backup/cdbackup/files/cdbackup-0.7.1-makefile.patch b/app-backup/cdbackup/files/cdbackup-0.7.1-makefile.patch
new file mode 100644
index 000000000000..aac8e317ce5b
--- /dev/null
+++ b/app-backup/cdbackup/files/cdbackup-0.7.1-makefile.patch
@@ -0,0 +1,32 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,6 +1,5 @@
+ # compiler selection and options
+-CC       = gcc
+-CFLAGS   = -g -O2 -Wall
++CFLAGS   += -Wall
+ DEPFLAGS = -MM -MG
+ 
+ # install location
+@@ -18,19 +17,16 @@
+ 
+ all: $(TARGETS)
+ 
+-%.o: %.c
+-	$(CC) $(CFLAGS) -c $< -o $@
+-
+ $(DEPFILE): Makefile
+ 	@$(CC) $(DEPFLAGS) cdbackup.c cdrestore.c cdrom.c virtual.c misc.c > $@
+ 
+ include $(DEPFILE)
+ 
+ cdbackup: cdbackup.o cdrom.o virtual.o virtual-backup.o misc.o
+-	$(CC) $(CFLAGS) -o $@ $^
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ cdrestore: cdrestore.o cdrom.o virtual.o misc.o
+-	$(CC) $(CFLAGS) -o $@ $^
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
+ 
+ strip: $(TARGETS)
+ 	strip $(TARGETS)
diff --git a/app-backup/cdbackup/files/cdbackup-0.7.1-u_char-musl.patch b/app-backup/cdbackup/files/cdbackup-0.7.1-u_char-musl.patch
new file mode 100644
index 000000000000..06d0d2c485ca
--- /dev/null
+++ b/app-backup/cdbackup/files/cdbackup-0.7.1-u_char-musl.patch
@@ -0,0 +1,11 @@
+--- a/virtual.h
++++ b/virtual.h
+@@ -42,7 +42,7 @@
+   };
+ 
+ struct toc_entry {
+-  u_char track_no;	/* track number */
++  unsigned char track_no;	/* track number */
+   char is_data;		/* 1 = data track */
+   char is_cdbackup;	/* was it created by CD-Backup? */
+   int sec_start;	/* start sector */