[gentoo-commits] repo/gentoo:master commit in: app-i18n/kcc/, app-i18n/kcc/files/

[gentoo-commits] repo/gentoo:master commit in: app-i18n/kcc/, app-i18n/kcc/files/

[Ionen Wolkens]

commit:     3ea4b8de3f9e4a8e7432bc702b6d458f434bbb98
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 09:48:00 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 10:01:03 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ea4b8de

app-i18n/kcc: EAPI7->8, fix build w/ upcoming clang16

Also fix license, tidy, and pass -std=gnu89 (uses K&R)

Closes: https://bugs.gentoo.org/871399
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 app-i18n/kcc/files/kcc-1.0-clang16.patch | 19 +++++++++++++++++++
 app-i18n/kcc/kcc-1.0.ebuild              | 18 ++++++++++--------
 2 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/app-i18n/kcc/files/kcc-1.0-clang16.patch b/app-i18n/kcc/files/kcc-1.0-clang16.patch
new file mode 100644
index 000000000000..a813a9ceb759
--- /dev/null
+++ b/app-i18n/kcc/files/kcc-1.0-clang16.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/871399
+--- a/kcc.c
++++ b/kcc.c
+@@ -33,2 +33,3 @@
+ #include <sys/stat.h>
++#include <unistd.h>
+ 
+@@ -138,4 +139,6 @@
+ #ifdef __STDC__
++int getstr(char *str, register int n, FILE *fp);
+ void error(char *format, ...);
+ #else
++int getstr();
+ void error();
+@@ -152,3 +155,3 @@
+  ---------------------------------------------------------------------*/
+-main(c, v)
++int main(c, v)
+     register int c;

diff --git a/app-i18n/kcc/kcc-1.0.ebuild b/app-i18n/kcc/kcc-1.0.ebuild
index 79b890dd7eb6..0aa425112c84 100644
--- a/app-i18n/kcc/kcc-1.0.ebuild
+++ b/app-i18n/kcc/kcc-1.0.ebuild
@@ -1,33 +1,35 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
-DESCRIPTION="A Kanji code converter"
+DESCRIPTION="Kanji code converter"
 HOMEPAGE="http://www2s.biglobe.ne.jp/~Nori/ruby/"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
+S="${WORKDIR}/${PN}"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 x86"
 
-S="${WORKDIR}/${PN}"
 PATCHES=(
 	"${FILESDIR}"/${PN}-gcc3-gentoo.diff
 	"${FILESDIR}"/${PN}-exit.diff
-	"${FILESDIR}"/${PN}-1.0-fix-build-system.patch
+	"${FILESDIR}"/${P}-fix-build-system.patch
+	"${FILESDIR}"/${P}-clang16.patch
 )
 
 src_configure() {
 	tc-export CC
+	append-cflags -std=gnu89 # old codebase, incompatible with c2x
 }
 
 src_install() {
 	dobin kcc
 	einstalldocs
 
-	cp -f kcc.jman kcc.1 || die
+	cp kcc.jman kcc.1 || die
 	doman -i18n=ja kcc.1
 }