gentoo resync : 20.06.2021

3 files changed, 41 insertions, 1 deletions

diff --git a/sys-devel/autogen/Manifest b/sys-devel/autogen/Manifest
index 211a37ddb24a..8bc6aff967e9 100644
--- a/sys-devel/autogen/Manifest
+++ b/sys-devel/autogen/Manifest
@@ -1,8 +1,9 @@
+AUX autogen-5.18.16-guile-3.patch 1277 BLAKE2B 18aea6b2da8afc14c37ad6dc6b21eafcf76a93715c399a167237d653aa133879093c6b0c430f28941db8f2b5c5760b9c9586a19836e9692cd080afb9c4e0efac SHA512 a006bcd4dd496274894f7d57c8884171a370fb1fd59bf2e61478c5848b3f3a2dedcda2e01a3f70a4904036ee097d570491065d1f2bf18bcb2ce7525727e17689
 AUX autogen-5.18.16-make-4.3.patch 814 BLAKE2B 53c823c59d4c896881593190fa27242bc90cc47412ca79fa58a29ecebd6ba1f201aafca7262c7eec30749e684148ae845fb1db1f8687b15b9a332e12462a12a0 SHA512 27489e5fd3a9df979a43c479d30e8566e863cd70d20ebf5788582aeaf8144912b7153f42f8df7156cd11b21ab849ff984f5042667500ee041af76de85a8eea3e
 AUX autogen-5.18.16-no-werror.patch 738 BLAKE2B f6228e7eb39cbdffae794d62e352ee0b3bee7a60f46ef31585838fc24ac85a8dac813aa698670f0d94fc1767add8b083c646dd89c56527c2e3765fac0d61f51c SHA512 ecf7f910957bface75eb2b828c5ba90b49c205183ea9242c2f47907fbf6bfd1154b4dc1d2ed0fef8bbf3c8f01d05bfa1450ecdef73786ff0292bbfdd904bd193
 AUX autogen-5.18.16-respect-TMPDIR.patch 824 BLAKE2B de70fb423955fc006ef10765ab5d534a02ff4e0d47bb29ab47706edf0e00cad241e8e51fd60aef2168181fce7b2af2623c4c1f163f8ef98ad09efa3c6488edd7 SHA512 9a37cb7c6703ffc24bd5f839f9d466db0fa92ce830d136f34594000863a1ade0d124d7aa4ef47baf411b0473ede65a8dd1f82d0e7fd7bb2713e003dfbf9437de
 AUX autogen-5.18.16-rpath.patch 2990 BLAKE2B 8374f788feee898f35f6baae40d0a42a0426b757572217bdfaefe8b3fc308e7c3b29d41a6dd4db77677c208702cd836ac58a463814624bc965b71c8b5613935b SHA512 3279567863152a2874d64be1cae8129dfaa9d67612e6f2d3c0de408914ea5b2d19e037ade460393fd942d897776906fe5df483a69255c4f279c13893a6cec1fd
 DIST autogen-5.18.16-gnulib-3b57ddee0acffd23cc51bc8910a15cf879f90619-lib-verify.h 11231 BLAKE2B 4f38f6ae84cf5cc4ba47d8a7da3b38b06f58e30ac8b70f2b10936cbb7a775179b67f22ca8e636588515c4ace7410f98835218e3222d4a793378cdafc4aa84d0f SHA512 b8ff80fd764a3f21040b0054e71a443e3d9ec18dd631843f2de999aa54776964b36366b35fd158dbbe5f2ece146fab12c6ff5008e18c52188b718c89972f867b
 DIST autogen-5.18.16.tar.xz 1046276 BLAKE2B 23f9e0948f24ada715fb2bcbbfecba768cf51d169ea3ff4724a97b18f598d2d7fb2ffa7e23919ec8dcc0e352f9d3280f3740dab279a0af1412919cf10c6cb0bf SHA512 5f12c982dbe27873f5649a96049bf019ff183c90cc0c8a9196556b0ca02e72940cd422f6d6601f68cc7d8763b1124f2765c3b1a6335fc92ba07f84b03d2a53a1
-EBUILD autogen-5.18.16-r1.ebuild 1898 BLAKE2B 8a9346fbe09ff58d43b894ac6222fe80e297d26ba1649be72269acf457f0928ce7ce90ca0b2be456c842a299fa14c9420bab73d20a8ea928b827ab62c4932f3b SHA512 3f086bb0afc193db640734dd30d4b1a338bfbb6821c2b04d5a059fab8bf625b8f0ce659dd5514d233708194746d54bc8ac745e387b6fbe3352f0c3a44526a1a1
+EBUILD autogen-5.18.16-r1.ebuild 1941 BLAKE2B 225d7a95f7394bd9141bc8450d7eb15ea9618161f93a24d5d79d87089cd276498de6020da7c394bd859020073f76684da35c42077380336c588a0d623089575f SHA512 5c27d4f8de99448e2fb14bfc3b7ede24ec0e2761936746cb231a85c9ae9e46e85514d3fcf9113545486fe7bb449dd804e237cdc52f663b81c710c72648176e58
 MISC metadata.xml 369 BLAKE2B 84e42ca4413579471dd92284666f1a2565b58191e94ed3392e540dd09b8f423138ec4e3bdef6bba9e2f1cec71d425138f3d3954ad2e6bd8c57fed69bed91789c SHA512 48f4b495b998480adae388ddd9319edbc0e0e91a35904df6d98d79866b5b814fa20446c7c9b78e5d65c63ba1c281659db3cfa49908e70d85d16f76caca3c7541
diff --git a/sys-devel/autogen/autogen-5.18.16-r1.ebuild b/sys-devel/autogen/autogen-5.18.16-r1.ebuild
index 580f8317fbc3..748c7fec6d47 100644
--- a/sys-devel/autogen/autogen-5.18.16-r1.ebuild
+++ b/sys-devel/autogen/autogen-5.18.16-r1.ebuild
@@ -24,6 +24,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.18.16-rpath.patch
 	"${FILESDIR}"/${PN}-5.18.16-respect-TMPDIR.patch
 	"${FILESDIR}"/${PN}-5.18.16-make-4.3.patch
+	"${FILESDIR}"/${PN}-5.18.16-guile-3.patch
 )
 
 src_prepare() {
diff --git a/sys-devel/autogen/files/autogen-5.18.16-guile-3.patch b/sys-devel/autogen/files/autogen-5.18.16-guile-3.patch
new file mode 100644
index 000000000000..2d21c4fae3e7
--- /dev/null
+++ b/sys-devel/autogen/files/autogen-5.18.16-guile-3.patch
@@ -0,0 +1,38 @@
+--- a/config/guile.m4
++++ b/config/guile.m4
+@@ -61,7 +61,7 @@
+ #
+ AC_DEFUN([GUILE_PKG],
+  [PKG_PROG_PKG_CONFIG
+-  _guile_versions_to_search="m4_default([$1], [2.2 2.0 1.8])"
++  _guile_versions_to_search="m4_default([$1], [3.0 2.2 2.0 1.8])"
+   if test -n "$GUILE_EFFECTIVE_VERSION"; then
+     _guile_tmp=""
+     for v in $_guile_versions_to_search; do
+--- a/configure
++++ b/configure
+@@ -14799,7 +14799,7 @@ $as_echo "no" >&6; }
+ 		PKG_CONFIG=""
+ 	fi
+ fi
+-  _guile_versions_to_search="2.2 2.0 1.8"
++  _guile_versions_to_search="3.0 2.2 2.0 1.8"
+   if test -n "$GUILE_EFFECTIVE_VERSION"; then
+     _guile_tmp=""
+     for v in $_guile_versions_to_search; do
+--- a/agen5/guile-iface.h
++++ b/agen5/guile-iface.h
+@@ -16,6 +16,13 @@
+ # define AG_SCM_TO_LONG(_v)           scm_to_long(_v)
+ # define AG_SCM_TO_ULONG(_v)          ((unsigned long)scm_to_ulong(_v))
+ 
++#elif GUILE_VERSION < 400000
++# define AG_SCM_IS_PROC(_p)           scm_is_true( scm_procedure_p(_p))
++# define AG_SCM_LIST_P(_l)            scm_is_true( scm_list_p(_l))
++# define AG_SCM_PAIR_P(_p)            scm_is_true( scm_pair_p(_p))
++# define AG_SCM_TO_LONG(_v)           scm_to_long(_v)
++# define AG_SCM_TO_ULONG(_v)          ((unsigned long)scm_to_ulong(_v))
++
+ #else
+ # error unknown GUILE_VERSION
+   choke me.