gentoo auto-resync : 12:03:2025 - 01:49:51next

4 files changed, 93 insertions, 8 deletions

diff --git a/app-text/multitail/Manifest b/app-text/multitail/Manifest
index a13b6ae3fa76..5ae199ab84d4 100644
--- a/app-text/multitail/Manifest
+++ b/app-text/multitail/Manifest
@@ -1,10 +1,12 @@
 AUX multitail-7.0.0-fix-clang16-build.patch 884 BLAKE2B a4f1f2bb1f064ed6df54b3a0d3a0339bb9fd2d07624f31e16d2dbd30300d55ba7a25844ac6fa82a44fcb68ce4a7617548ebbf894caf654d352e831c0178de3c4 SHA512 e47f87e62f8ef710924464879c40520be555133f0ea0755d0e427d894e27dc884eecfab2d90a6fbe800d0eadedf50bc2393217f4b70359efaf576f2cd150e75b
 AUX multitail-7.0.0-fix-lto-type-mismatch.patch 1016 BLAKE2B f9154926741dd63018f43c2c1e20b63761c71fd43268955055ae3e63530c257b19bf190fdddd895de582e43a6ae49e8cde91184e7ced168d414bdb84a436fead SHA512 8a2a5bc238beccfdf9f2234adbbc4cae1ba0002110a431412ec539b2d077037e7b796e989781e60e2258334c80086c32f6bd42aada4cf12a14b092fb0639b9e7
 AUX multitail-7.0.0-gentoo.patch 1029 BLAKE2B 7aa35008a0dc58f82bdde4c2972b7028e60dea86c47d86ac221d5546fd38fdc7b311c8006ea5aaf4f73f63435058a12eb485ce2c07940c0c3e94ba18fc8e1c09 SHA512 ff56f33c780b401a9ae5dcdd9598438bc22bbb3946408140e3165ba8a613c55b84b4d0ee210eaffae21d49dd396fd6f795fe54c4a0db5c0ba9f46befc7f4287c
+AUX multitail-7.1.5-cmake-gnuinstalldirs.patch 1587 BLAKE2B 71e55754e4e8107fa19ec7c5fcbd80459d3a4d02d278221c907c79d679bc95f07bced4ee9cb9e9846431607f733b5af82f71cbd11a097c0848345d799d8ee972 SHA512 519f173fd27adbda4db985de67783bc2b9f52e50062ca67cc8c96839da34aea6d1c2bcafb93973a578effa46fdcb524e7f3caf7d918cb3ed34c82f050d8cc1eb
+AUX multitail-7.1.5-ncurses.patch 1465 BLAKE2B b15ef48f0341621dce6a449a4697c9a31c80d547d00d57afcbe7abb309d6ddb0e1f38f8cbda5dca905de8bc647bc591e18467f19ea10479431dae5333698546c SHA512 6097fd14788e89800a077690e4d3b5066783a863f85609decde527457700d0cfe135ace358bb7bd8898b4c2a4f37edaa51b43f1a0735cc371c9a40252b6b3d27
 DIST multitail-7.0.0.tar.gz 152425 BLAKE2B 1afbee9501926b860bd063768e6d20b7e6fe97b7ca8eaeb279639f3ef4f32d3c694650e2471abab067add04fbd1ce7b94dfc2f709baca460e9a36a34cb0746d2 SHA512 325abc2ec3e55f274b8f080c54e878ee301af1df5761def95b5fee0abe65cc999a2db0184e1d7a7378c048b1766e03f9553262d3bba88c8fad87c4952d1d59ae
 DIST multitail-7.1.2.tar.gz 153409 BLAKE2B 852f7a0f22581b043c65f24bc1a19ffb0e7fa8c91d8152b58a1127a51b1833cded0b22c5430f96417af277927daefeb73d5acef38bdbc54898cc48ec0a4e9436 SHA512 6f006d68a6c0fcfec9f6aada4a1ad0a031b61ea46c60231faa6fd7ea934f6f74ca30f12f8983658c9ae6ae2e08bade9159e3426ed47cd9171d0b190ec9f3e5b5
 DIST multitail-7.1.5.tar.gz 152590 BLAKE2B 40bb8123aa091aecc64e603d40120d97b118185b8c461e46c087e9491cc32ce8779530881eb1fe27aae0cbb17f08ce679ad4a8c045e2506e9f3705596f2f4301 SHA512 7b52eaa9c99e8747f841b23ad3f7154d8cb65c5f4bd2f89fc80d37b6a2fecdacfd7657c5ba37356e67fd03f7992556af648b7d26bb730f7e8966d0230182a8a6
 EBUILD multitail-7.0.0.ebuild 1505 BLAKE2B 0d91356fd7fbca2563e7a0b06ca404c8417a0fc4b4522bca3bef202808180e009e6d207514dbe70988ce786bf32209a2c8fd90dc5532097c9eee60ee0e4211b3 SHA512 0e7e750b661b1a8ef42652fde8dc8d7e7487b703d286ece197951e057c87bb3600e6866128587d7442a6cbf601052a7cd05be36a612b6626b80d4e5598dfeb83
 EBUILD multitail-7.1.2.ebuild 1440 BLAKE2B 78f723f49077f6111c0f75a2af24e21f240f6d9960e3611d8acba8004d8c53dd85f776375c8ae08e66e8df5ce73d3d002173d5d9434cce618ec70589c6c041bc SHA512 934f2b5bac397a8e3ada7c72a5b6c1f7835e0f1cfff557f3994c36ce984c3425143eb48c2d102b163b39b855b45dd02111e972a534a4d2d534c3ea6d0bc153ff
-EBUILD multitail-7.1.5.ebuild 1437 BLAKE2B 5e4d98c4d95a26f1fba935c2433b27b4bdb9e29726b3052e6bc67f86eb6593d49ee6c43b8489fa5127c29df538cb3e2ca2227db7cf30343fbfd7d6732406ff90 SHA512 c184fc78a0463c37d5941cbc442623184957f98db9dc96921aa3cfcabe96f8bbbba52d0a9d99fc7dca3027811905839268024b2d62fffcff81a57a5b4c23b30b
+EBUILD multitail-7.1.5-r1.ebuild 1559 BLAKE2B 46772db546a862327d2003635ec4e00ab94b0aeb07af2b960d80a45fdecff062ebcf040d8c54b72586d62d9baffa4369b9bdcef1ed5825e2deab4cab1c82c3d6 SHA512 5409c891a0482944cf2f1fa1171b253a7ef740f83620aad419a5371109a47c8e6557a598efe71c489a19ea9ab61c4456ce9f85ee071c211790f7e97ec5575932
 MISC metadata.xml 358 BLAKE2B febc299cf49a8c7bb3a55c83a95fbce0ceb46a9297f91a8d34e6275fb66f7847b08d0facfdcaacc2d88b97af8cf64244712f424a1bfcd11fa866fab7f4d28702 SHA512 834755fd8e98223a18d1487ad8e182bbdd02094b3b52603f7945099dfb0f525a5f08f1d2162b2a5785ce01fd252e4a6b2f4ad9b7ae775e7922ac560a332ea42c
diff --git a/app-text/multitail/files/multitail-7.1.5-cmake-gnuinstalldirs.patch b/app-text/multitail/files/multitail-7.1.5-cmake-gnuinstalldirs.patch
new file mode 100644
index 000000000000..936ad9eaec04
--- /dev/null
+++ b/app-text/multitail/files/multitail-7.1.5-cmake-gnuinstalldirs.patch
@@ -0,0 +1,37 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 22d41c1..ee50976 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,5 @@
+ cmake_minimum_required(VERSION 3.6)
++include(GNUInstallDirs)
+ 
+ ## use ccache if found
+ find_program(CCACHE_EXECUTABLE "ccache" HINTS /usr/local/bin /opt/local/bin)
+@@ -183,18 +183,18 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
+ 
+ 
+ # install the bin
+-install(TARGETS multitail DESTINATION bin)
++install(TARGETS multitail DESTINATION ${CMAKE_INSTALL_BINDIR})
+ # install the config file
+-install(FILES multitail.conf DESTINATION etc RENAME multitail.conf.new)
++install(FILES multitail.conf DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
+ # install the manual files
+-install(FILES multitail.1 DESTINATION share/man/man1)
++install(FILES multitail.1 DESTINATION ${CMAKE_INSTALL_MANDIR})
+ # install doc files
+-install(FILES manual.html DESTINATION share/doc/multitail-${VERSION})
+-install(FILES LICENSE DESTINATION share/doc/multitail-${VERSION})
+-install(FILES README.md DESTINATION share/doc/multitail-${VERSION})
+-install(FILES thanks.txt DESTINATION share/doc/multitail-${VERSION})
++install(FILES manual.html DESTINATION ${CMAKE_INSTALL_DOCDIR})
++install(FILES LICENSE DESTINATION ${CMAKE_INSTALL_DOCDIR})
++install(FILES README.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
++install(FILES thanks.txt DESTINATION ${CMAKE_INSTALL_DOCDIR})
+ # cp conversion-scripts/* etc/multitail/
+-install(DIRECTORY conversion-scripts DESTINATION etc/multitail)
++install(DIRECTORY conversion-scripts DESTINATION ${CMAKE_INSTALL_SYSCONFDIR})
+ 
+ 
+ if(USE_CPPCHECK)
diff --git a/app-text/multitail/files/multitail-7.1.5-ncurses.patch b/app-text/multitail/files/multitail-7.1.5-ncurses.patch
new file mode 100644
index 000000000000..ae4f7f150592
--- /dev/null
+++ b/app-text/multitail/files/multitail-7.1.5-ncurses.patch
@@ -0,0 +1,44 @@
+https://bugs.gentoo.org/945647
+https://github.com/folkertvanheusden/multitail/pull/44
+
+From 4ebc884f2276a63c81532deb2e4a068b330d71aa Mon Sep 17 00:00:00 2001
+From: madjic <madjic@madjic.de>
+Date: Thu, 12 Dec 2024 23:31:09 +0100
+Subject: [PATCH] fix implicit function declaration for waddnwstr in linux
+
+---
+ mt.c | 2 --
+ mt.h | 4 ++--
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/mt.c b/mt.c
+index 39a5c17..a97acad 100644
+--- a/mt.c
++++ b/mt.c
+@@ -707,8 +707,6 @@ void do_color_print(proginfo *cur, char *use_string, int prt_start, int prt_end,
+ 		if (!is_control_or_extended_ascii)
+ 		{
+ #if defined(UTF8_SUPPORT) && defined(NCURSES_WIDECHAR)
+-// FIXME warning: implicit declaration of function ‘waddnwstr’ is invalid in C99  [-Wimplicit-function-declaration]
+-// see /usr/include/ncurses.h
+ 			waddnwstr(win -> win, &wcur, 1);
+ #else
+ 			wprintw(win -> win, "%c", wcur);
+diff --git a/mt.h b/mt.h
+index f6c37a0..2f401eb 100644
+--- a/mt.h
++++ b/mt.h
+@@ -60,10 +60,10 @@ typedef enum { SCHEME_TYPE_EDIT = 0, SCHEME_TYPE_FILTER } filter_edit_scheme_t;
+ #endif
+ 
+ #if defined(UTF8_SUPPORT) && !defined(__APPLE__)
+-        #if defined(__FreeBSD__) || defined (__linux__)
++        #if defined(__FreeBSD__)
+                 #include <panel.h>
+                 #include <curses.h>
+-        #else
++        #else /* if defined (__linux__) */
+                 #include <ncursesw/panel.h>
+                 #include <ncursesw/ncurses.h>
+         #endif
+
diff --git a/app-text/multitail/multitail-7.1.5.ebuild b/app-text/multitail/multitail-7.1.5-r1.ebuild
index be9322af7832..00ac29ba15f9 100644
--- a/app-text/multitail/multitail-7.1.5.ebuild
+++ b/app-text/multitail/multitail-7.1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,16 +20,24 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-7.0.0-gentoo.patch
+	"${FILESDIR}"/${PN}-7.1.5-ncurses.patch
+	"${FILESDIR}"/${PN}-7.1.5-cmake-gnuinstalldirs.patch
 )
 
 src_prepare() {
+	# Don't clobber toolchain defaults
+	sed -i -e '/-D_FORTIFY_SOURCE=2/d' CMakeLists.txt || die
+
 	cmake_src_prepare
+
 	# cmake looks for licence.txt to install it, which does not exist in the package
 	cp LICENSE license.txt || die
 }
 
 src_configure() {
 	local mycmakeargs=(
+		-DCMAKE_INSTALL_SYSCONFDIR="${EPREFIX}/etc"
+		-DUSE_CPPCHECK=OFF
 		-DUTF8_SUPPORT=$(usex unicode)
 	)
 	CMAKE_BUILD_TYPE=$(usex debug Debug)
@@ -40,12 +48,6 @@ src_configure() {
 src_install() {
 	cmake_src_install
 
-	insinto /etc
-	doins multitail.conf
-
-	rm -rf "${ED}"/usr/{ect,etc} || die
-	rm -rf "${ED}"/usr/share/doc/multitail-VERSION=${PV} || die
-
 	local DOCS=( README.md thanks.txt )
 	local HTML_DOCS=( manual.html )
 	einstalldocs