From 7f43eaea7734cbbf7cdf2dd82a0b0f8c3b872440 Mon Sep 17 00:00:00 2001
From: Ionen Wolkens <ionen@gentoo.org>
Date: Wed, 28 Sep 2022 23:34:58 -0400
Subject: dev-util/ftjam: fix build with clang16

Revbump unlikely to matter for other compilers, but doesn't hurt.

Closes: https://bugs.gentoo.org/870655
Signed-off-by: Ionen Wolkens <ionen@gentoo.org>
---
 dev-util/ftjam/files/ftjam-2.5.3-clang16.patch |  7 +++++
 dev-util/ftjam/ftjam-2.5.3_rc2-r2.ebuild       | 36 -------------------------
 dev-util/ftjam/ftjam-2.5.3_rc2-r3.ebuild       | 37 ++++++++++++++++++++++++++
 3 files changed, 44 insertions(+), 36 deletions(-)
 create mode 100644 dev-util/ftjam/files/ftjam-2.5.3-clang16.patch
 delete mode 100644 dev-util/ftjam/ftjam-2.5.3_rc2-r2.ebuild
 create mode 100644 dev-util/ftjam/ftjam-2.5.3_rc2-r3.ebuild

diff --git a/dev-util/ftjam/files/ftjam-2.5.3-clang16.patch b/dev-util/ftjam/files/ftjam-2.5.3-clang16.patch
new file mode 100644
index 000000000000..5a6c6089b086
--- /dev/null
+++ b/dev-util/ftjam/files/ftjam-2.5.3-clang16.patch
@@ -0,0 +1,7 @@
+https://bugs.gentoo.org/870655
+--- a/jam.h
++++ b/jam.h
+@@ -382,2 +382,3 @@
+ # include <string.h>
++# include <unistd.h>
+ # include <time.h>
diff --git a/dev-util/ftjam/ftjam-2.5.3_rc2-r2.ebuild b/dev-util/ftjam/ftjam-2.5.3_rc2-r2.ebuild
deleted file mode 100644
index 816961d7bfa0..000000000000
--- a/dev-util/ftjam/ftjam-2.5.3_rc2-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_PV=$(ver_rs 3 "")
-
-DESCRIPTION="A 100% compatible, enhanced implementation of the make alternative Jam"
-HOMEPAGE="http://freetype.sourceforge.net/jam/index.html"
-SRC_URI="http://david.freetype.org/jam/ftjam-${MY_PV}.tar.bz2"
-
-LICENSE="perforce GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-
-BDEPEND="sys-devel/bison"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-DOCS=( README README.ORG CHANGES RELNOTES )
-HTML_DOCS=( Jam.html Jambase.html Jamfile.html )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.3-nostrip.patch
-	"${FILESDIR}"/${PN}-2.5.3-i-hate-yacc.patch
-	"${FILESDIR}"/${PN}-2.5.3-false-flags.patch
-)
-
-src_prepare() {
-	default
-
-	tc-export CC RANLIB
-	export AR="$(tc-getAR) ru" #720706
-}
diff --git a/dev-util/ftjam/ftjam-2.5.3_rc2-r3.ebuild b/dev-util/ftjam/ftjam-2.5.3_rc2-r3.ebuild
new file mode 100644
index 000000000000..806e3bc1fa14
--- /dev/null
+++ b/dev-util/ftjam/ftjam-2.5.3_rc2-r3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PV=$(ver_rs 3 "")
+
+DESCRIPTION="A 100% compatible, enhanced implementation of the make alternative Jam"
+HOMEPAGE="http://freetype.sourceforge.net/jam/index.html"
+SRC_URI="http://david.freetype.org/jam/ftjam-${MY_PV}.tar.bz2"
+
+LICENSE="perforce GPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+BDEPEND="sys-devel/bison"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+DOCS=( README README.ORG CHANGES RELNOTES )
+HTML_DOCS=( Jam.html Jambase.html Jamfile.html )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.3-nostrip.patch
+	"${FILESDIR}"/${PN}-2.5.3-i-hate-yacc.patch
+	"${FILESDIR}"/${PN}-2.5.3-false-flags.patch
+	"${FILESDIR}"/${PN}-2.5.3-clang16.patch
+)
+
+src_prepare() {
+	default
+
+	tc-export CC RANLIB
+	export AR="$(tc-getAR) ru" #720706
+}
-- 
cgit v1.2.3-65-gdbad