From 914a4aa87415dabfe77181a2365766417a5919a4 Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer <eike@sf-mail.de>
Date: Wed, 17 Nov 2021 16:56:46 +0100
Subject: dev-libs/libowfat: fix build with sys-libs/glibc-2.34

Closes: https://bugs.gentoo.org/806505
Signed-off-by: Rolf Eike Beer <eike@sf-mail.de>
Signed-off-by: Sam James <sam@gentoo.org>
---
 dev-libs/libowfat/libowfat-0.32-r4.ebuild | 51 --------------------------
 dev-libs/libowfat/libowfat-0.32-r5.ebuild | 61 +++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 51 deletions(-)
 delete mode 100644 dev-libs/libowfat/libowfat-0.32-r4.ebuild
 create mode 100644 dev-libs/libowfat/libowfat-0.32-r5.ebuild

(limited to 'dev-libs/libowfat')

diff --git a/dev-libs/libowfat/libowfat-0.32-r4.ebuild b/dev-libs/libowfat/libowfat-0.32-r4.ebuild
deleted file mode 100644
index 1d012c474e76..000000000000
--- a/dev-libs/libowfat/libowfat-0.32-r4.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="reimplement libdjb - excellent libraries from Dan Bernstein"
-SRC_URI="https://www.fefe.de/${PN}/${P}.tar.xz"
-HOMEPAGE="https://www.fefe.de/libowfat/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
-IUSE="diet"
-
-RDEPEND="diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-gcc10.patch
-	"${FILESDIR}"/${P}-ar.patch
-)
-
-pkg_setup() {
-	# Required for mult/umult64.c to be usable
-	append-flags -fomit-frame-pointer
-}
-
-src_compile() {
-	emake \
-		CC=$(tc-getCC) \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB) \
-		CFLAGS="-I. ${CFLAGS}" \
-		DIET="${EPREFIX}/usr/bin/diet -Os" \
-		prefix="${EPREFIX}/usr" \
-		INCLUDEDIR="${EPREFIX}/usr/include" \
-		$( use diet || echo 'DIET=' )
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		MAN3DIR="${EPREFIX}/usr/share/man/man3" \
-		INCLUDEDIR="${EPREFIX}/usr/include" \
-		install
-
-	mv "${ED}"/usr/share/man/man3/{buffer.3,owfat-buffer.3} || die
-}
diff --git a/dev-libs/libowfat/libowfat-0.32-r5.ebuild b/dev-libs/libowfat/libowfat-0.32-r5.ebuild
new file mode 100644
index 000000000000..c85792782f66
--- /dev/null
+++ b/dev-libs/libowfat/libowfat-0.32-r5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="reimplement libdjb - excellent libraries from Dan Bernstein"
+SRC_URI="https://www.fefe.de/${PN}/${P}.tar.xz"
+HOMEPAGE="https://www.fefe.de/libowfat/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+IUSE="diet"
+
+RDEPEND="diet? ( >=dev-libs/dietlibc-0.33_pre20090721 )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc10.patch
+	"${FILESDIR}"/${P}-ar.patch
+)
+
+pkg_setup() {
+	# Required for mult/umult64.c to be usable
+	append-flags -fomit-frame-pointer
+}
+
+src_prepare() {
+	default
+
+	# do not define "__pure__", this the gcc builtin (bug #806505)
+	sed 's#__pure__;#__attribute__((__pure__));#' -i fmt.h scan.h byte.h stralloc.h str.h critbit.h || die
+	sed 's#__pure__$#__attrib__pure__#' -i  fmt.h scan.h byte.h stralloc.h str.h critbit.h || die
+	# remove unneeded definition of __deprecated__
+	sed '/^#define __deprecated__$/d' -i scan/scan_iso8601.c scan/scan_httpdate.c || die
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) \
+		AR=$(tc-getAR) \
+		RANLIB=$(tc-getRANLIB) \
+		CFLAGS="-I. ${CFLAGS}" \
+		DIET="${EPREFIX}/usr/bin/diet -Os" \
+		prefix="${EPREFIX}/usr" \
+		INCLUDEDIR="${EPREFIX}/usr/include" \
+		$( use diet || echo 'DIET=' )
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+		MAN3DIR="${EPREFIX}/usr/share/man/man3" \
+		INCLUDEDIR="${EPREFIX}/usr/include" \
+		install
+
+	mv "${ED}"/usr/share/man/man3/{buffer.3,owfat-buffer.3} || die
+}
-- 
cgit v1.2.3-65-gdbad