gentoo auto-resync : 07:10:2022 - 13:23:59

4 files changed, 82 insertions, 2 deletions

diff --git a/app-arch/arc/Manifest b/app-arch/arc/Manifest
index d783f2029abc..6da0b3bf1306 100644
--- a/app-arch/arc/Manifest
+++ b/app-arch/arc/Manifest
@@ -2,6 +2,8 @@ AUX arc-5.21m-darwin.patch 252 BLAKE2B b64cb9420b30f559fa2c22714774865305f1c5e17
 AUX arc-5.21m-gentoo-fbsd.patch 216 BLAKE2B 09d600cfddb692362e78aa5aa5770387b685ce23fde54f6e77c34e41ab52b29db52b29883d6772f735773e04209506ff61f36909d895595a34afe35ace7aec9d SHA512 6cf269ca19d5000deec43bcf7e766d28aefa53219c5af8f65429e80f4a8b8ec557199d73cb380665b4d14517118ac567a001edcee1514691901d8192109923c0
 AUX arc-5.21o-interix.patch 216 BLAKE2B 650a4b2bc908c8c09f9d325a5d43c580de42b3209642042729e7895608d6d38f0f807d0de8173ece6fbbbdaadc70a6601b3f2797753401a4aee82c860fa5d287 SHA512 c6c01f2c6a91807f71825c07bc27d7223870e4b29fa59233edb0c40e6e8cb549fd796d7c2bdf53d7a595c60f04ee2762b9fac3eeec5b640f4f9045897a402ed2
 AUX arc-5.21p-fno-common.patch 934 BLAKE2B dc9c058a2e0053dacae271c599333cf02a262857c619c214c02e4c189a2e5f7491cea04f67950c16f840bbbb94149a15aa5417e33ab698dd983c9dc10ab349da SHA512 4f79298bc9ccc8ebf8cff50ef5d943841afb3d1281bf35581f1fe0bdf512bd8ac7edf04a0149d9d30df8a2c02e45828c38f2f97d5a918de9e6f1a1f50f245058
+AUX arc-5.21p-variadic-arcdie.patch 763 BLAKE2B a45881bee6b95e7d7adcf40196e1471764ed36a9ddff8ba8583717f891fc01be63bd87e5fd0212016ae706acea3899c62e2710ce7733b1f6aaab04a53ccd75a6 SHA512 773447d292c3426cdeae9b88d237e8643fab71e1528476e53f9340a7158db014807b10acbf18af50d078db05e220a7dbffc3af0d313ed29856bdcf30a7383208
 DIST arc-5.21p.tar.gz 84791 BLAKE2B 3dc6c2e9c83a9021a9a865676e248278f88b3de868846b39e1b1a9365299c410e7bb3c0ed07cfd3ad1e3f6340eb0e3d21b57a7c6e8ea92f61b51a914d7e4fa0f SHA512 c70c01ec407cc27f6507e2715d8b553277609cb49369a1e65a83d007362a24b69bb09ef2bf168ee36ca6797bd4524644a89e9114d866351ae53fece193c2967c
-EBUILD arc-5.21p.ebuild 877 BLAKE2B 972b06941787200e3822603d861b786dfff5eb15c30f41e9ecce9d5968c59dfba4f3d1d52a7c65c985b6e3ca546dfa7cc5d570bac82602e0415f7766f3ce193f SHA512 39b6301c9aaf8bb2b88145aebb4bda1b83713f36eeb3d4f8445ceb4c4d0309666f67d59ac81817cd03eabbbcd555263723a5ead64c9cff702e87bc4683361430
+EBUILD arc-5.21p-r1.ebuild 932 BLAKE2B f94c6c052c7272354e715811da912a1400a09fcca0f8328c236262db0b3f4e8fc02f5978ab592899919f8a6e305ee28bb5aacea6dc5d6097cd4497a3fb5472cb SHA512 255e78535d43349e0c6e6376705c472a70f365a007e9026c1a50c4beee514c35d30050a4ff0a44684b608fe7503fe10689f6a54bf9a7c328622053cf01927afc
+EBUILD arc-5.21p.ebuild 878 BLAKE2B 464514b0fa878006b861ea2ad0bff1b7267b77f9ebfb2074b9828279805695e8e78462581cf848f1b7139b273e9ad8b7d5fd31776529fac3e7612d1df9d20142 SHA512 9ec42993c2fc1fcdf7fc16a31f410d61bab31d8856656a356f13a4702a5e1467137afea8bf393f8a04bc0e71ae61c760523589e7f31808e5a9d7755193bd5dbb
 MISC metadata.xml 246 BLAKE2B df27ac714b4e0372fc1c80a0c1fa1ebc69d5317b24a065765e2ce9096d170255e82650d14e93fd7a314c62cb86b60ca832c4a6dddea1bd452a83a786784da717 SHA512 ba7d31c6594e588d7ff707efa455755f1eb5bdbfccb4312368f5eb43b475c9ec422a580196ba61e0ad8504bf48979bc1277988b1c5fe84b880845e17f53eac89
diff --git a/app-arch/arc/arc-5.21p-r1.ebuild b/app-arch/arc/arc-5.21p-r1.ebuild
new file mode 100644
index 000000000000..5aa3d47610cd
--- /dev/null
+++ b/app-arch/arc/arc-5.21p-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Create & extract files from DOS .ARC files"
+HOMEPAGE="https://arc.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.21m-darwin.patch
+	"${FILESDIR}"/${PN}-5.21m-gentoo-fbsd.patch
+	"${FILESDIR}"/${PN}-5.21o-interix.patch
+	"${FILESDIR}"/${PN}-5.21p-fno-common.patch
+	"${FILESDIR}"/${PN}-5.21p-variadic-arcdie.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i Makefile \
+		-e 's/CFLAGS = $(OPT) $(SYSTEM)/CFLAGS += $(SYSTEM)/' \
+		|| die "sed Makefile"
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" OPT="${LDFLAGS}"
+}
+
+src_install() {
+	dobin arc marc
+	doman arc.1
+	dodoc Arc521.doc Arcinfo Changelog Readme
+}
diff --git a/app-arch/arc/arc-5.21p.ebuild b/app-arch/arc/arc-5.21p.ebuild
index 9794421ee4e3..535030c9466f 100644
--- a/app-arch/arc/arc-5.21p.ebuild
+++ b/app-arch/arc/arc-5.21p.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Create & extract files from DOS .ARC files"
-HOMEPAGE="http://arc.sourceforge.net"
+HOMEPAGE="https://arc.sourceforge.net"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-arch/arc/files/arc-5.21p-variadic-arcdie.patch b/app-arch/arc/files/arc-5.21p-variadic-arcdie.patch
new file mode 100644
index 000000000000..787748f6d3fa
--- /dev/null
+++ b/app-arch/arc/files/arc-5.21p-variadic-arcdie.patch
@@ -0,0 +1,38 @@
+Convert arcdie to variadic function, which solves the issue with
+-Werror=implicit-int enabled.
+
+Bug: https://bugs.gentoo.org/870517
+
+diff --git a/arcmisc.c b/arcmisc.c
+index ea12b41..3d6272e 100644
+--- a/arcmisc.c
++++ b/arcmisc.c
+@@ -3,6 +3,7 @@
+  * $Header: /cvsroot/arc/arc/arcmisc.c,v 1.4 2005/10/09 01:38:22 highlandsun Exp $ 
+  */
+ 
++#include <stdarg.h>
+ #include <stdio.h>
+ #include <ctype.h>
+ #include "arc.h"
+@@ -223,11 +224,14 @@ upper(string)
+ }
+ /* VARARGS1 */
+ VOID
+-arcdie(s, arg1, arg2, arg3)
+-	char           *s;
++arcdie(char * s, ...)
+ {
++	va_list ap;
++
+ 	fprintf(stderr, "ARC: ");
+-	fprintf(stderr, s, arg1, arg2, arg3);
++	va_start(ap, s);
++	vfprintf(stderr, s, ap);
++	va_end(ap);
+ 	fprintf(stderr, "\n");
+ #if	UNIX
+ 	perror("UNIX");
+-- 
+2.35.1
+