gentoo auto-resync : 19:03:2023 - 06:33:49

3 files changed, 85 insertions, 5 deletions

diff --git a/app-crypt/ccrypt/Manifest b/app-crypt/ccrypt/Manifest
index 8086cc1a0640..ffc38be0de68 100644
--- a/app-crypt/ccrypt/Manifest
+++ b/app-crypt/ccrypt/Manifest
@@ -1,3 +1,4 @@
+AUX ccrypt-1.11-refresh-macro-clang16.patch 1720 BLAKE2B 6569364cc12bae99fbac4983f765d51b5861b9da9556e7bc487c6c96fde8904e06021b234c0855d45b0590ddc71539c764ca11eb13ae74eac3dc73be7a581695 SHA512 c7420e30d5e6b93a58e6694c684fac348acdcf27fe68d131cf865f1edf0452357e68e00898df7ba5157926da59990884b1122fa557094185e579e68589f3676e
 DIST ccrypt-1.11.tar.gz 834575 BLAKE2B 6b3441f6b1c58ed63db43ddc999ee64e67afc3ce02222de2a41562bc066aad0f076e75ab496d94e7f3f1a9554b1382c083f3af04074904c1110f610cb5ac19b3 SHA512 75c2b93e855d36e717d3b7cabee7ce43ce372a21c8291beb43f24fd69e11114bb0e19e6dd03ec5d901e7e60eac9351afab65c346b7304b16054b91d392050313
-EBUILD ccrypt-1.11-r3.ebuild 502 BLAKE2B a976b6f2b5c989e0ae67711529870fb0dd529b3f210d68d6407e1f975f6572740f0a5e3d6ea8565deebb27883853fbf0c3f5509c4ccfdc55d59b4d53fb6ad274 SHA512 afa132f71a3aaa070176e3f5fdae3cd822cbc5534da781bb9487c8588ffea8e47994b58aeae0e00283d67da2dd3b30d1c74f5ddf913f21f138b9fad6464af480
+EBUILD ccrypt-1.11-r4.ebuild 649 BLAKE2B 175670c36036e2722b9118815de6b94f9d40eb90d1b16f6b3987b4a91f963466207a6a1b3843b7fafcfba8d57add3b023a71b48d818f01f2fe099d0d96e93b29 SHA512 db69b16911b98a766a66eca70b94cc1e2eaf925aca7038cea07dbb47f8ea84e130f803de18fc8e2b62eeca4501dbe824b4e0d312281e7bb4e24d7fcf2f2c421d
 MISC metadata.xml 244 BLAKE2B 076b91128bec7304a72b04816fad77a632b4f3db17537e0bf1cc36d4c09580daab07d8da94b59ff5fb283a55a1947750097387cd2e2650aa68102801916dd6b2 SHA512 c66754ee21972de956051ca5472572c7f10cc9a435f86eeb2f8b8bae8b4f8029a1db278363a97ebaeefe40bef4db2f8f0ff23278c594906ce7c1642bafedc75c
diff --git a/app-crypt/ccrypt/ccrypt-1.11-r3.ebuild b/app-crypt/ccrypt/ccrypt-1.11-r4.ebuild
index dc921dadfc0a..a8bd812cb08c 100644
--- a/app-crypt/ccrypt/ccrypt-1.11-r3.ebuild
+++ b/app-crypt/ccrypt/ccrypt-1.11-r4.ebuild
@@ -1,7 +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 autotools
 
 DESCRIPTION="Encryption and decryption"
 HOMEPAGE="https://sourceforge.net/projects/ccrypt/"
@@ -13,8 +15,21 @@ KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="emacs"
 
 RDEPEND="virtual/libcrypt:="
-DEPEND="${RDEPEND}
-	emacs? ( >=app-editors/emacs-23.1:* )"
+DEPEND="
+	${RDEPEND}
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.11-refresh-macro-clang16.patch
+)
+
+src_prepare() {
+	default
+
+	# Clang 16 patch
+	eautoreconf
+}
 
 src_configure() {
 	econf \
diff --git a/app-crypt/ccrypt/files/ccrypt-1.11-refresh-macro-clang16.patch b/app-crypt/ccrypt/files/ccrypt-1.11-refresh-macro-clang16.patch
new file mode 100644
index 000000000000..f610a1c38065
--- /dev/null
+++ b/app-crypt/ccrypt/files/ccrypt-1.11-refresh-macro-clang16.patch
@@ -0,0 +1,64 @@
+https://bugs.gentoo.org/900130
+
+Refresh macro from gettext.
+--- a/m4/intdiv0.m4
++++ b/m4/intdiv0.m4
+@@ -1,5 +1,5 @@
+-# intdiv0.m4 serial 6 (gettext-0.18.2)
+-dnl Copyright (C) 2002, 2007-2008, 2010-2016 Free Software Foundation, Inc.
++# intdiv0.m4 serial 9 (gettext-0.21.1)
++dnl Copyright (C) 2002, 2007-2008, 2010-2020 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+ dnl with or without modifications, as long as this notice is preserved.
+@@ -12,7 +12,7 @@ AC_DEFUN([gt_INTDIV0],
+   AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ 
+   AC_CACHE_CHECK([whether integer division by zero raises SIGFPE],
+-    gt_cv_int_divbyzero_sigfpe,
++    [gt_cv_int_divbyzero_sigfpe],
+     [
+       gt_cv_int_divbyzero_sigfpe=
+ changequote(,)dnl
+@@ -31,8 +31,11 @@ changequote([,])dnl
+       if test -z "$gt_cv_int_divbyzero_sigfpe"; then
+         AC_RUN_IFELSE(
+           [AC_LANG_SOURCE([[
+-#include <stdlib.h>
++#include <stdlib.h> /* for exit() */
+ #include <signal.h>
++#if !(defined _WIN32 && !defined __CYGWIN__)
++#include <unistd.h> /* for _exit() */
++#endif
+ 
+ static void
+ sigfpe_handler (int sig)
+@@ -44,7 +47,7 @@ sigfpe_handler (int sig)
+ int x = 1;
+ int y = 0;
+ int z;
+-int nan;
++int inan;
+ 
+ int main ()
+ {
+@@ -59,7 +62,7 @@ int main ()
+ #endif
+ 
+   z = x / y;
+-  nan = y / y;
++  inan = y / y;
+   exit (2);
+ }
+ ]])],
+@@ -79,8 +82,8 @@ changequote([,])dnl
+       fi
+     ])
+   case "$gt_cv_int_divbyzero_sigfpe" in
+-    *yes) value=1;;
+-    *) value=0;;
++    *yes) value=1 ;;
++    *)    value=0 ;;
+   esac
+   AC_DEFINE_UNQUOTED([INTDIV0_RAISES_SIGFPE], [$value],
+     [Define if integer division by zero raises signal SIGFPE.])