From c85399a56ccef79c29a09334beb59abb10b87c7a Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Sun, 19 Mar 2023 01:48:44 +0000
Subject: net-im/cpop: fix configure w/ clang 16

Closes: https://bugs.gentoo.org/885705
Closes: https://bugs.gentoo.org/900072
Signed-off-by: Sam James <sam@gentoo.org>
---
 net-im/cpop/cpop-0.0.4-r1.ebuild                   | 25 ---------------
 net-im/cpop/cpop-0.0.4-r2.ebuild                   | 37 ++++++++++++++++++++++
 .../files/cpop-0.0.4-implicit-func-decls.patch     | 19 +++++++++++
 3 files changed, 56 insertions(+), 25 deletions(-)
 delete mode 100644 net-im/cpop/cpop-0.0.4-r1.ebuild
 create mode 100644 net-im/cpop/cpop-0.0.4-r2.ebuild
 create mode 100644 net-im/cpop/files/cpop-0.0.4-implicit-func-decls.patch

diff --git a/net-im/cpop/cpop-0.0.4-r1.ebuild b/net-im/cpop/cpop-0.0.4-r1.ebuild
deleted file mode 100644
index 9315a2381ea0..000000000000
--- a/net-im/cpop/cpop-0.0.4-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="GTK+ network popup message client. Compatible with the jpop protocol"
-HOMEPAGE="http://www.draxil.uklinux.net/hip/index.pl?page=cpop"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND="dev-libs/glib:2
-	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-implicit-exit_memset_strlen.patch
-)
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README
-}
diff --git a/net-im/cpop/cpop-0.0.4-r2.ebuild b/net-im/cpop/cpop-0.0.4-r2.ebuild
new file mode 100644
index 000000000000..77c21027edcc
--- /dev/null
+++ b/net-im/cpop/cpop-0.0.4-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="GTK+ network popup message client. Compatible with the jpop protocol"
+HOMEPAGE="http://www.draxil.uklinux.net/hip/index.pl?page=cpop"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+	dev-libs/glib:2
+	x11-libs/gtk+:2
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-implicit-exit_memset_strlen.patch
+	"${FILESDIR}"/${P}-implicit-func-decls.patch
+)
+
+src_prepare() {
+	default
+
+	# Clang 16, bug #900072
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc README
+}
diff --git a/net-im/cpop/files/cpop-0.0.4-implicit-func-decls.patch b/net-im/cpop/files/cpop-0.0.4-implicit-func-decls.patch
new file mode 100644
index 000000000000..ff3977e18055
--- /dev/null
+++ b/net-im/cpop/files/cpop-0.0.4-implicit-func-decls.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/885705
+--- a/pop_client.c
++++ b/pop_client.c
+@@ -2,6 +2,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/socket.h>
++#include <unistd.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <errno.h>
+--- a/pop_common.h
++++ b/pop_common.h
+@@ -3,4 +3,5 @@
+ #define CP_MSGSIZE 2048
+ #define CP_PORT 3233
+ void errquit(char *message);
++void printquit(char *message);
+ #endif
-- 
cgit v1.2.3-18-g5258