From 806eccf534d69aa1deaa266ec35491bb89cfa441 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Tue, 22 Nov 2022 02:25:02 +0000
Subject: app-cdr/cuecue: fix configure w/ clang 16

Signed-off-by: Sam James <sam@gentoo.org>
---
 app-cdr/cuecue/cuecue-0.2.2-r4.ebuild             | 54 --------------------
 app-cdr/cuecue/cuecue-0.2.2-r5.ebuild             | 62 +++++++++++++++++++++++
 app-cdr/cuecue/files/cuecue-0.2.2-configure.patch | 13 +++++
 3 files changed, 75 insertions(+), 54 deletions(-)
 delete mode 100644 app-cdr/cuecue/cuecue-0.2.2-r4.ebuild
 create mode 100644 app-cdr/cuecue/cuecue-0.2.2-r5.ebuild
 create mode 100644 app-cdr/cuecue/files/cuecue-0.2.2-configure.patch

diff --git a/app-cdr/cuecue/cuecue-0.2.2-r4.ebuild b/app-cdr/cuecue/cuecue-0.2.2-r4.ebuild
deleted file mode 100644
index 72d3a48deb62..000000000000
--- a/app-cdr/cuecue/cuecue-0.2.2-r4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Cuecue converts .cue + [.ogg|.flac|.wav|.mp3] to .cue + .bin"
-HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-# Enable one use flag by default, bug #254745
-IUSE="flac mp3 +vorbis"
-REQUIRED_USE="|| ( flac mp3 vorbis )"
-
-DEPEND="
-	flac? ( media-libs/flac:= )
-	mp3? ( media-libs/libmad )
-	vorbis? ( media-libs/libvorbis media-libs/libogg )
-"
-RDEPEND="
-	${DEPEND}
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-flac113.diff # bug 157706
-	"${FILESDIR}"/${P}-namespace.patch
-	"${FILESDIR}"/${P}-unused.patch
-	"${FILESDIR}"/${P}-fno-common.patch
-)
-
-src_configure() {
-	econf \
-		$(use_enable flac) \
-		$(use_enable mp3) \
-		$(use_enable vorbis ogg) \
-		--disable-libFLACtest \
-		--disable-oggtest \
-		--disable-vorbistest
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	default
-
-	insinto /usr/include
-	doins src/libcuecue/cuecue.h
-}
diff --git a/app-cdr/cuecue/cuecue-0.2.2-r5.ebuild b/app-cdr/cuecue/cuecue-0.2.2-r5.ebuild
new file mode 100644
index 000000000000..24e5f7cca2ac
--- /dev/null
+++ b/app-cdr/cuecue/cuecue-0.2.2-r5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Cuecue converts .cue + [.ogg|.flac|.wav|.mp3] to .cue + .bin"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# Enable one use flag by default, bug #254745
+IUSE="flac mp3 +vorbis"
+REQUIRED_USE="|| ( flac mp3 vorbis )"
+
+DEPEND="
+	flac? ( media-libs/flac:= )
+	mp3? ( media-libs/libmad )
+	vorbis? ( media-libs/libvorbis media-libs/libogg )
+"
+RDEPEND="
+	${DEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-flac113.diff # bug 157706
+	"${FILESDIR}"/${P}-namespace.patch
+	"${FILESDIR}"/${P}-unused.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+	"${FILESDIR}"/${P}-configure.patch
+)
+
+src_prepare() {
+	default
+
+	# Clang 16
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable flac) \
+		$(use_enable mp3) \
+		$(use_enable vorbis ogg) \
+		--disable-libFLACtest \
+		--disable-oggtest \
+		--disable-vorbistest
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	default
+
+	insinto /usr/include
+	doins src/libcuecue/cuecue.h
+}
diff --git a/app-cdr/cuecue/files/cuecue-0.2.2-configure.patch b/app-cdr/cuecue/files/cuecue-0.2.2-configure.patch
new file mode 100644
index 000000000000..d0a9864228aa
--- /dev/null
+++ b/app-cdr/cuecue/files/cuecue-0.2.2-configure.patch
@@ -0,0 +1,13 @@
+-ansi -pednatic breaks various configure tests. autoconf already says
+not to use -Werror but any -W* is dangerous for configure itself.
+--- a/configure.in
++++ b/configure.in
+@@ -4,7 +4,7 @@ dnl AM_INIT_AUTOMAKE
+ 
+ AC_CONFIG_SRCDIR(src/libcuecue/cuecue.c)
+ 
+-CFLAGS="$CFLAGS -Wall -ansi -pedantic -g -Os"
++CFLAGS="-Wall -O2 ${CFLAGS}"
+ VERSION=0.2.2
+ 
+ PACKAGE="cuecue"
-- 
cgit v1.2.3-65-gdbad