gentoo auto-resync : 08:10:2023 - 18:03:40

4 files changed, 55 insertions, 13 deletions

diff --git a/app-backup/cdbackup/Manifest b/app-backup/cdbackup/Manifest
index 87a6c6796e97..fafed1f6aaa0 100644
--- a/app-backup/cdbackup/Manifest
+++ b/app-backup/cdbackup/Manifest
@@ -1,3 +1,5 @@
+AUX cdbackup-0.7.1-makefile.patch 686 BLAKE2B 2cb4dad8c11a8f8d8f4858a5ba9b66eb5852925bf0b2d5a1527695032af4e3424d9e3006234cbaf23f5fef476fc2fcd3fc0c055df6fea3cdfeb02d9dc1cab53c SHA512 d3ace496c1195969f4b2cea0185dba4ad1c7987ebab9805e3c4badc65311647d8835deddd1835817e8543556d5e8677fc83f523f7b65f6fffc4ef915a948b377
+AUX cdbackup-0.7.1-u_char-musl.patch 295 BLAKE2B 9b45c61cf65b9888712e2822a5d634a8437157d49a4e12da287dfc2197c307b3c967b3fb0db8fa6a9bdb9c370007e6ec0b26d10f06ba25fb2c903a30ecdbc8a2 SHA512 0ab371124c1924f02e54de8dee09cee4a6751cd21e0ab83ffc56fd9dcdd85e7be14c064d51e62b3c4f843e80fdf2a97be8f1a7d532fa2fb8619558f3dbf76699
 DIST cdbackup-0.7.1.tar.gz 22710 BLAKE2B eb21cf8ebd0c0a5487a86fb1d8afe7743be070743bdf3245fd4131c06c8ffe97b4bb93096e8952fb8479fac0cf3d764375478437691386ab762607aa420f8540 SHA512 9246295090a7d52ff452d5d24a429f2a21179e4d8deb4e9d6f2ab607dd04230830e3524f25d0180e36f62c7f7f87dec11cb3c1c01cde51708d467d6e0a4afc8f
-EBUILD cdbackup-0.7.1-r1.ebuild 730 BLAKE2B 60fac951df47218ba0173c7925517fe6e6b57300beca28c17080b885ba72fff4be38a2b29e490ac88e6c6cb43615b2eb0758bfcbf49d9491071e793e0a8d3659 SHA512 0c190a6d87e63ffccd66982053c82b9c628ce44f2cc0519ab9367c06ed0c9b9968d259dd3e09ac918a178c3cd42a393e1fdffdc9ae7b9a979301f9f91c807133
+EBUILD cdbackup-0.7.1-r2.ebuild 617 BLAKE2B f53b4c8c4d9dfa7ce5ac3076c521e0f17a4b95594cc568fb91b98f949f0e9e6be98d3390f32d5ae24a483cd34115173502b2ee83c79f19631d3b5e375cb25bec SHA512 2047408d77c3e7741c1ece1a9bc8cc79fbf601316c8ed56e5c46b18261c469dc2d3bc05c6b40e6f8e2f9469dc78b11bc3df83befc1ba34cdab47ecd0477c0244
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
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 */