gentoo auto-resync : 18:09:2022 - 05:18:37

4 files changed, 72 insertions, 9 deletions

diff --git a/app-text/expander/Manifest b/app-text/expander/Manifest
index 65ffaeeead58..b568ad40dc3b 100644
--- a/app-text/expander/Manifest
+++ b/app-text/expander/Manifest
@@ -1,4 +1,5 @@
-AUX expander-2.0.5-gentoo.patch 1971 BLAKE2B 16459adb991e28472c569ef77bd4f688110e0d2a99970ed65e5332736a1a90a82afa6a04aaec38ba53b16b3303efbe8706324ffe1a37d6b00637550802d23960 SHA512 f81577c3ee11d2e13b59258a59e02a3ec26b265ee2206fde5585f75c21db015907835ade2db88a19ab1afd778a3a7d146d99d1dfb891237d04b2e6a052f49f57
+AUX expander-2.05-clang15.patch 1705 BLAKE2B 8a9b52c411661b50c30b38e42a529563e615063762bbecf11cc0e8c67da3dfd46a7c071e85d54872d81729acf1a94f6aeede79cfaedb87165a82b81c411f9bf6 SHA512 d578094dce59698c9c505dd0902f2bb9826d44ef2d70acd3ce67cae48ca7e1fc807a080d036963dddfe91649da87f9fd88963b52945fe80e7bc75cf6340b16ac
+AUX expander-2.05-gentoo.patch 1971 BLAKE2B 16459adb991e28472c569ef77bd4f688110e0d2a99970ed65e5332736a1a90a82afa6a04aaec38ba53b16b3303efbe8706324ffe1a37d6b00637550802d23960 SHA512 f81577c3ee11d2e13b59258a59e02a3ec26b265ee2206fde5585f75c21db015907835ade2db88a19ab1afd778a3a7d146d99d1dfb891237d04b2e6a052f49f57
 DIST nedit_expander_kit_2.05.tar.gz 92571 BLAKE2B 0b77640b87372003e873a9e9146aeec82220dfc86b4f6d57220807443c007b6f4f99da8da505d7b6d2f1350150698deed84c8cb710297c6d8646ed192d3ee04a SHA512 a9d5e97db95eec9f98d71360c6af5a6908f31f59221ac1f509ae4f661b0614610b9591b9e2f58bba1175a6b609407d720369ba99cecb5496133d889bf93788ee
-EBUILD expander-2.0.5-r2.ebuild 952 BLAKE2B 44e941c8817d949c5ab0832f6f9e3b64a590c1a55563844428469daba0540a06e48c85edae474c3693de0f93c44af4f8cbf73efba18b1223e3d9a419feba4ec4 SHA512 86365e5dbc02dbc8a57a67884e256e50ab8c74b3a61c1648a814599cac2ef6d77ec5fbe33b323ca26d90a4b5efd74e16d52603fb4e6317e45baaa277c24295a9
+EBUILD expander-2.05-r3.ebuild 1003 BLAKE2B f4a589d798ce039a42490d97d2aa2c4ac825a0b49538773b8b1c4fcf53d6c63134b1f6ff0f686458182969a30c3079141cb38b83cb303a3ccc380ded8f942e37 SHA512 2256e4017eb1cbdd58372424b64ce56733c13623ffd288cdbad4bc72f2cda04d159ac6a43922bd68a2a8adbf52b0da5371fe2e2aa20c42339fab6df2f85f337d
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/app-text/expander/expander-2.0.5-r2.ebuild b/app-text/expander/expander-2.05-r3.ebuild
index 6684a72038d5..ee8a110a01e6 100644
--- a/app-text/expander/expander-2.0.5-r2.ebuild
+++ b/app-text/expander/expander-2.05-r3.ebuild
@@ -1,21 +1,23 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit toolchain-funcs
 
 DESCRIPTION="Expander is a utility that acts as a filter for text editors"
 HOMEPAGE="http://www.nedit.org"
-SRC_URI="ftp://ftp.nedit.org/pub/contrib/misc/nedit_expander_kit_2.05.tar.gz"
+SRC_URI="ftp://ftp.nedit.org/pub/contrib/misc/nedit_expander_kit_${PV}.tar.gz"
+S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~x86-linux ~ppc-macos"
 
-S="${WORKDIR}/${PN}"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-clang15.patch
+)
 
 src_compile() {
 	emake -C src CC="$(tc-getCC)"
@@ -35,7 +37,7 @@ src_install() {
 
 pkg_postinst() {
 	elog
-	elog "Instructions for using expander with NEdit are in /usr/share/doc/${PF}/INSTALL"
-	elog "Macro, definition and template files can be found in /usr/share/${P}"
+	elog "Instructions for using expander with NEdit are in ${EROOT}/usr/share/doc/${PF}/INSTALL"
+	elog "Macro, definition and template files can be found in ${EROOT}/usr/share/${P}"
 	elog
 }
diff --git a/app-text/expander/files/expander-2.05-clang15.patch b/app-text/expander/files/expander-2.05-clang15.patch
new file mode 100644
index 000000000000..a7ae9bed3ddf
--- /dev/null
+++ b/app-text/expander/files/expander-2.05-clang15.patch
@@ -0,0 +1,60 @@
+https://bugs.gentoo.org/870898
+--- a/src/align_columns.c
++++ b/src/align_columns.c
+@@ -28,6 +28,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <ctype.h>
++#include <unistd.h>
+ 
+ /*============================================================================*/
+ /*                              SYMBOL DEFINITIONS                            */
+--- a/src/align_comments.c
++++ b/src/align_comments.c
+@@ -28,6 +28,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <ctype.h>
++#include <unistd.h>
+ 
+ /*===========================================================================*/
+ /*                             SYMBOL DEFINITIONS                            */
+--- a/src/boxcomment.c
++++ b/src/boxcomment.c
+@@ -59,6 +59,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ 
+ /*============================================================================*/
+ /*                              SYMBOL DEFINITIONS                            */
+--- a/src/expander.c
++++ b/src/expander.c
+@@ -114,6 +114,7 @@
+ #include <string.h>
+ #include <time.h>
+ #include <ctype.h>
++#include <unistd.h>
+ 
+ /*==========================================================================*/
+ /*                              MACRO DEFINITIONS                           */
+@@ -1264,7 +1265,7 @@ bool_t locate_definition(
+     bool_t ignore_definition = FALSE;
+     int    i;
+     char   line[ MAXBUF ];
+-    static level = 0;
++    static int level = 0;
+     
+     /*---------------------
+     * Recursion protection.
+--- a/src/where_is.c
++++ b/src/where_is.c
+@@ -54,6 +54,7 @@
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <unistd.h>
+ 
+ typedef int bool_t;
+ 
diff --git a/app-text/expander/files/expander-2.0.5-gentoo.patch b/app-text/expander/files/expander-2.05-gentoo.patch
index 460a8164cee5..460a8164cee5 100644
--- a/app-text/expander/files/expander-2.0.5-gentoo.patch
+++ b/app-text/expander/files/expander-2.05-gentoo.patch