4 files changed, 49 insertions, 41 deletions
diff --git a/app-misc/gcal/Manifest b/app-misc/gcal/Manifest
index e090e49a030f..6885fc4d22ed 100644
--- a/app-misc/gcal/Manifest
+++ b/app-misc/gcal/Manifest
@@ -1,6 +1,5 @@
+AUX gcal-4.1-configure-clang16.patch 1136 BLAKE2B 452f8c93aa71db4ee732c7412469eaa22d150225d43f3490ff7857f085ded3ca7a5220156f71369e530955c4167e621da0e8d3fc09ff28a382b0aca55a585c0b SHA512 2b3b2d677f98e8fecba6914c36b8f2479b35186b55e10b77f4c8b26b1fd6701617a4928ba21ab7d96e760bd9fbaeaedcf30e5d91bf3fc7ad010584169e117307
 AUX gcal-4.1-glibc228.patch 3267 BLAKE2B b754919136da6652ef2f44bfbf9f9b0be839b89a35b23d028a4ca0cbb6101297066c862b2139ac424b276caf59dd12473d0194ca5b49f42c5bfcdfea2b37d3e1 SHA512 e1d54483561ac5b9473bcc42702b015a196fcde100dd2098dfd07642b7a5ee28887ef259296e98d7a46f18781e2b6a9c89424ebfe65b8ce601457b4f75af08af
-DIST gcal-3.6.3.tar.xz 1640172 BLAKE2B 322a3bf34a389ab92daa0262b8b36f99b585c7f76e46e5a921a5e23ced74ae98bf09446e02988c98c29ecadf631b6624cb43e76c8da736a185e52ed34441c334 SHA512 9be7d6e58a55fbb7531f91bd2a6fa51e8d62364636c31d8d65f6ac24415ac2de8af5eaab8496e155c2820b7480ecf926c4395114ff4363deb21bd268dec44963
 DIST gcal-4.1.tar.xz 1658948 BLAKE2B 980b509923d7e3afbd391f1129a77e647f61e09d68aec29490bc16041260e56082097732f015260515036a4560bee18391c8f6aaa5eaff69740f18a37a44d8f2 SHA512 24b9ee87c3dbfd3231b2017fd0a3030cc5b7c7fde032ea1fcf816b0f10dc40d808c646aa8ece86651da4f3928fecf35f84f4c68c0bfdb8cf63e3ecc189d2074d
-EBUILD gcal-3.6.3.ebuild 756 BLAKE2B d921836afc98c73ef7040bb23f6672fc80b0c4256351b1ad53d4219de8574d6f20154b7e59dc41517a065411ca24d7f356ebe2c31621837a82fd27c86d4a2b1a SHA512 abec0eb87080b32bdbf86be2643eb9aa56f0fbdd4fe5d8355a3f40fa1ffc241335793150bf1634691448ba60998eee2ed91419d49a3190b6e05043993788d851
-EBUILD gcal-4.1.ebuild 881 BLAKE2B 9e9cf497307c14dc5d745a1d1937976e2b8d1729c3564afe7997f41fa4a1a07a80f89cdce4bc80553f52f7594ad04326332c7f88ef9856f24fed77e2ba60a412 SHA512 b6b5b4ad0353b626c5a0bf80f8a9fb0459182f2e5848130d2761fe91684fc61d95d926eeeb166b6f937260488afe66f153d82af8beab01a53d93f25b52770080
+EBUILD gcal-4.1-r1.ebuild 1039 BLAKE2B 813b1606ba3bc4f48aad3cab902191ac9df5faf56ec96dee242a5ce9096eb34c94128127216764e7a0aaeba562f278a05507d3a24df9e53d699400c23d966932 SHA512 0edd5b429035e6cbe4c19547fb4591037fe2f15fa63911ea396976f19d74fc8d83333250541e0a72f459e77f4932f6116a71bb7a96464270df130e3f79558498
 MISC metadata.xml 1096 BLAKE2B 2d86ba9f428f52f8a716c2a7e5719b647fe4217a7c037d9681885524f0dde1216cf237f2c89df955425a3ccbf0a23f9f16266da53cfa6801efeb537b0a5028aa SHA512 a665d4af51626778e22513885711a95907624a2ef4ce383a4493f8132335790e4bc7bccb75fd319217aa297c28eaf9db8ab04b14f22fefe80820a5ec0a2b0bc4
diff --git a/app-misc/gcal/files/gcal-4.1-configure-clang16.patch b/app-misc/gcal/files/gcal-4.1-configure-clang16.patch
new file mode 100644
index 000000000000..077a1f5e5105
--- /dev/null
+++ b/app-misc/gcal/files/gcal-4.1-configure-clang16.patch
@@ -0,0 +1,31 @@
+https://src.fedoraproject.org/rpms/barcode/c/80372a75c7ee2a448913350f19f9e3f7c8495b8c?branch=rawhide
+
+Include <term.h> during the terminal library check for function
+prototypes.  Otherwise this configure check always fails if the
+compiler does not accept implicit function declarations.
+
+Submitted upstream:
+
+  <https://lists.gnu.org/archive/html/bug-gcal/2022-12/msg00000.html>
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -319,7 +319,7 @@ if test "$gcal_cv_use_term" = yes; then
+   AC_MSG_CHECKING(for working terminal libraries)
+   SAVE_LIBS=$LIBS
+   LIBS="$LIBS $TTYLIBS"
+-  AC_TRY_LINK(,
++  AC_TRY_LINK([#include <term.h>],
+     [tgetent(0); tgetflag(0); tgetnum(0); tgetstr(0);],
+     [gcal_ttylibs_ok=yes])
+   if test "$gcal_ttylibs_ok" = yes; then
+@@ -334,7 +334,7 @@ if test "$gcal_cv_use_term" = yes; then
+         [TTYLIBS="-ltermcap"])
+       AC_MSG_CHECKING(for working terminal libraries again)
+       LIBS="$LIBS $TTYLIBS"
+-      AC_TRY_LINK(,
++      AC_TRY_LINK([#include <term.h>],
+         [tgetent(0); tgetflag(0); tgetnum(0); tgetstr(0);],
+         [gcal_ttylibs_ok=yes])
+       if test "$gcal_ttylibs_ok" = yes; then
+
diff --git a/app-misc/gcal/gcal-3.6.3.ebuild b/app-misc/gcal/gcal-3.6.3.ebuild
deleted file mode 100644
index f872ffb027c7..000000000000
--- a/app-misc/gcal/gcal-3.6.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="The GNU Calendar - a replacement for cal"
-HOMEPAGE="https://www.gnu.org/software/gcal/"
-SRC_URI="mirror://gnu/gcal/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="ncurses nls unicode"
-
-RDEPEND="nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-arch/xz-utils
-	nls? ( >=sys-devel/gettext-0.17 )
-"
-
-DOCS=( BUGS LIMITATIONS NEWS README THANKS TODO )
-
-src_configure() {
-	tc-export CC
-	append-cppflags -D_GNU_SOURCE
-	econf \
-		--disable-rpath \
-		$(use_enable nls) \
-		$(use_enable ncurses term) \
-		$(use_enable unicode)
-}
diff --git a/app-misc/gcal/gcal-4.1.ebuild b/app-misc/gcal/gcal-4.1-r1.ebuild
index ee18f98e3850..39a20a9fc729 100644
--- a/app-misc/gcal/gcal-4.1.ebuild
+++ b/app-misc/gcal/gcal-4.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit flag-o-matic toolchain-funcs
+inherit autotools flag-o-matic toolchain-funcs
 
 DESCRIPTION="The GNU Calendar - a replacement for cal"
 HOMEPAGE="https://www.gnu.org/software/gcal/"
@@ -24,12 +24,24 @@ BDEPEND="
 
 DOCS=( BUGS LIMITATIONS NEWS README THANKS TODO )
 
-PATCHES=( "${FILESDIR}/${P}-glibc228.patch" )
+PATCHES=(
+	"${FILESDIR}/${P}-glibc228.patch"
+	"${FILESDIR}/${PN}-4.1-configure-clang16.patch"
+)
+
+src_prepare() {
+	default
+
+	# Drop once ${PN}-4.1-configure-clang16.patch merged
+	eautoreconf
+}
 
 src_configure() {
 	tc-export CC
 	append-cppflags -D_GNU_SOURCE
+
 	use unicode && append-libs -lunistring
+
 	econf \
 		--disable-rpath \
 		$(use_enable nls) \