gentoo auto-resync : 22:11:2022 - 13:06:24

5 files changed, 163 insertions, 0 deletions

diff --git a/app-text/multitail/Manifest b/app-text/multitail/Manifest
index 7b4beced272b..e2c7d7e1a25f 100644
--- a/app-text/multitail/Manifest
+++ b/app-text/multitail/Manifest
@@ -1,4 +1,9 @@
 AUX multitail-6.4.1-gentoo.patch 1440 BLAKE2B 968afe0a5f78e328c16019df6330cef6abc03999d919e4f761c4cf97d1a465a9aa085452538f48f6f1f0357d1b9a7a69f48dfc47fa2c09703595f896dcc97fdb SHA512 eb53834c68dc46c22a2d900cf5e8835a98ff9c9b001ae15eb778bb6348bd48b17dea8a1605bfcc9ddad4324300a81013a0a3710e559c00e369ae42cdfb38b6a7
+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
 DIST multitail-6.4.2.tgz 155757 BLAKE2B aba6fea993e0d91071bddcf6d06767773ad6ea6054436dbd8a7163553b1cdfc03040362b87e9b2d31f8fe2165f213c718904f9295d3ab2076707cabf423ae681 SHA512 668c453372ba1e4013aa5191c697bdcaad82c84732841c120a506bee063d2134941e93aed63f96e5aeeb6045829a13aba012f9514dbd9520ab4f1b9b75b42dbd
+DIST multitail-7.0.0.tar.gz 152425 BLAKE2B 1afbee9501926b860bd063768e6d20b7e6fe97b7ca8eaeb279639f3ef4f32d3c694650e2471abab067add04fbd1ce7b94dfc2f709baca460e9a36a34cb0746d2 SHA512 325abc2ec3e55f274b8f080c54e878ee301af1df5761def95b5fee0abe65cc999a2db0184e1d7a7378c048b1766e03f9553262d3bba88c8fad87c4952d1d59ae
 EBUILD multitail-6.4.2-r1.ebuild 1325 BLAKE2B 266d8fe2b7be9ef97487256010b84d25d046bd16a5790eb920e730d84228b2b7f678a73dd85f3a67a9a38d184f38ef030d92f9153398566f6a4982a99d19284f SHA512 717979028622d84bb660d477aca52ee7f2b1b6ea430a4982e35680830f0a14e7829e7551b96e48784af0f51f9c1f987b1aaa8baf8fd61c211d8f187035b1816f
+EBUILD multitail-7.0.0.ebuild 1542 BLAKE2B 5947c1575da67b12c8bc1bc3a3ea653a3c5823a20d36ba6c57511e2daac2803760c334fd12272b1d815baf3fad1b141bfb264da1d0f3ee3a902e8303dc57c2df SHA512 965e09079358d49af79eacc3b30350bd62599da65b907092a6eb9e5367e73f01c8653d4c1af657d6dd5b2d9d2c15ecefa46bbe0a0e767dad6cb1b70c7400cfb2
 MISC metadata.xml 358 BLAKE2B febc299cf49a8c7bb3a55c83a95fbce0ceb46a9297f91a8d34e6275fb66f7847b08d0facfdcaacc2d88b97af8cf64244712f424a1bfcd11fa866fab7f4d28702 SHA512 834755fd8e98223a18d1487ad8e182bbdd02094b3b52603f7945099dfb0f525a5f08f1d2162b2a5785ce01fd252e4a6b2f4ad9b7ae775e7922ac560a332ea42c
diff --git a/app-text/multitail/files/multitail-7.0.0-fix-clang16-build.patch b/app-text/multitail/files/multitail-7.0.0-fix-clang16-build.patch
new file mode 100644
index 000000000000..1c706e0d0236
--- /dev/null
+++ b/app-text/multitail/files/multitail-7.0.0-fix-clang16-build.patch
@@ -0,0 +1,34 @@
+Clang16 will not suppert implicit int and implicit function declarations.
+This patch makes the source code ready for clang16. 
+See also: https://bugs.gentoo.org/870412
+
+Bug: https://bugs.gentoo.org/874102
+
+This patch is already merged upstream, see: https://github.com/folkertvanheusden/multitail/pull/10
+
+Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
+
+--- a/misc.c
++++ b/misc.c
+@@ -477,7 +477,7 @@ void heartbeat(void)
+ 	mydoupdate();
+ }
+ 
+-void do_check_for_mail()
++void do_check_for_mail(dtime_t time)
+ {
+ 	if (check_for_mail > 0 && mail_spool_file != NULL)
+ 	{
+diff --git a/misc.h b/misc.h
+index febf11a..5566519 100644
+--- a/misc.h
++++ b/misc.h
+@@ -1,5 +1,7 @@
++#import "mt.h"
++
+ void info(void);
+ void statistics_menu(void);
+ void heartbeat(void);
+-void do_check_for_mail();
++void do_check_for_mail(dtime_t time);
+ void store_statistics(proginfo *cur, dtime_t now);
diff --git a/app-text/multitail/files/multitail-7.0.0-fix-lto-type-mismatch.patch b/app-text/multitail/files/multitail-7.0.0-fix-lto-type-mismatch.patch
new file mode 100644
index 000000000000..6ad621dd540e
--- /dev/null
+++ b/app-text/multitail/files/multitail-7.0.0-fix-lto-type-mismatch.patch
@@ -0,0 +1,29 @@
+Fix mismatching declarations so build does not fail with -Werror=lto-type-mismatch
+
+Bug: https://bugs.gentoo.org/855017
+
+This patch is already merged upstream, see: https://github.com/folkertvanheusden/multitail/pull/10
+
+Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
+
+--- a/globals.c
++++ b/globals.c
+@@ -81,7 +81,7 @@ double heartbeat_t = 0.0;
+ off64_t msf_prev_size = 0;
+
+ dtime_t msf_last_check = 0;
+-dtime_t mt_started;
++time_t mt_started;
+
+ pid_t children_list[MAX_N_SPAWNED_PROCESSES];
+ pid_t tail_proc = 0;   /* process used by checker-proc */
+--- a/selbox.h
++++ b/selbox.h
+@@ -1,4 +1,6 @@
+-int selection_box(void **list, char *needs_mark, int nlines, char type, int what_help, char *heading);
++#include "mt.h"
++
++int selection_box(void **list, char *needs_mark, int nlines, selbox_type_t type, int what_help, char *heading);
+ int select_window(int what_help, char *heading);
+ proginfo * select_subwindow(int f_index, int what_help, char *heading);
+ char * select_file(char *input, int what_help);
diff --git a/app-text/multitail/files/multitail-7.0.0-gentoo.patch b/app-text/multitail/files/multitail-7.0.0-gentoo.patch
new file mode 100644
index 000000000000..5219334abbe0
--- /dev/null
+++ b/app-text/multitail/files/multitail-7.0.0-gentoo.patch
@@ -0,0 +1,32 @@
+Gentoo splits off tinfo from ncurses, so we need to ask pkg-config here what the user has on the system.
+
+Signed-off-by: Pascal Jäger <pascal.jaeger@leimstift.de>
+
+--- a/Makefile
++++ b/Makefile
+@@ -24,10 +24,10 @@ ifeq ($(PLATFORM),Darwin)
+     LDFLAGS+=-lpanel $(NCURSES_LIB) -lutil -lm
+ else
+ ifeq ($(UTF8_SUPPORT),yes)
+-    LDFLAGS+=-lpanelw -lncursesw -lutil -lm
++	LIBS+=$(shell $(PKG_CONFIG) --libs ncursesw panelw) -lutil -lm
+     CPPFLAGS+=-DUTF8_SUPPORT
+ else
+-    LDFLAGS+=-lpanel -lncurses -lutil -lm
++	LIBS+=$(shell $(PKG_CONFIG) --libs ncurses panel) -lutil -lm
+ endif
+ endif
+ 
+@@ -40,10 +40,10 @@ DEPENDS:= $(OBJS:%.o=%.d)
+ all: multitail
+ 
+ multitail: $(OBJS)
+-	$(CC) $(OBJS) $(LDFLAGS) -o multitail
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(OBJS) -o multitail $(LIBS)
+ 
+ ccmultitail: $(OBJS)
+-	ccmalloc --no-wrapper -Wextra $(CC) $(OBJS) $(LDFLAGS) -o ccmultitail
++	ccmalloc --no-wrapper $(CC) $(CFLAGS) $(LDFLAGS) -Wall -W $(OBJS) -o ccmultitail $(LIBS)
+ 
+ install: multitail
+ 	mkdir -p $(DESTDIR)$(PREFIX)/bin
diff --git a/app-text/multitail/multitail-7.0.0.ebuild b/app-text/multitail/multitail-7.0.0.ebuild
new file mode 100644
index 000000000000..63fce453c73e
--- /dev/null
+++ b/app-text/multitail/multitail-7.0.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic optfeature toolchain-funcs
+
+DESCRIPTION="Tail with multiple windows"
+HOMEPAGE="http://www.vanheusden.com/multitail/ https://github.com/folkertvanheusden/multitail/"
+SRC_URI="https://github.com/folkertvanheusden/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug examples unicode"
+
+RDEPEND="sys-libs/ncurses:=[unicode(+)?]"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+  "${FILESDIR}"/${PN}-7.0.0-gentoo.patch
+  "${FILESDIR}"/${PN}-7.0.0-fix-clang16-build.patch
+  "${FILESDIR}"/${PN}-7.0.0-fix-lto-type-mismatch.patch
+)
+
+src_prepare() {
+	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=(
+		-DUTF8_SUPPORT=$(usex unicode)
+	)
+	CMAKE_BUILD_TYPE=$(usex debug Debug)
+
+	cmake_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=6.4.3 || die
+
+	DOCS=( readme.txt thanks.txt )
+	HTML_DOCS=( manual.html )
+	einstalldocs
+
+	if use examples; then
+		docinto examples
+		dodoc conversion-scripts/colors-example.{pl,sh} conversion-scripts/convert-{geoip,simple}.pl
+	fi
+}
+
+pkg_postinst() {
+	optfeature "send a buffer to the X clipboard" x11-misc/xclip
+}