gentoo auto-resync : 07:08:2024 - 12:37:20

5 files changed, 27 insertions, 86 deletions

diff --git a/app-admin/lnav/Manifest b/app-admin/lnav/Manifest
index 642a03d956fd..2ccb1dd1a540 100644
--- a/app-admin/lnav/Manifest
+++ b/app-admin/lnav/Manifest
@@ -1,7 +1,5 @@
 AUX lnav-0.11.0-disable-tests.patch 1784 BLAKE2B e4c0184793b19eff53dea12a81f0e8c7fab6fee44a77304f268365cdec0fa13fb916b35e25fb032a992147338a8028ffb799d9cd14db147f2396f5d54c74173c SHA512 e4c3ddee7c0747196a4ec5cdd409f1c088e06938762677d05757113ff8c8a1834a8ee2d132befef4fa84f4e34633d1d9a64d39f06e423f2a262e79ac121ea202
-AUX lnav-0.11.1-0001-Fix-build-with-GCC-13-add-missing-cstdint-include.patch 668 BLAKE2B 1c02dd2bb64bd42b8c3483732b0a2e282c82ad08fe02e704be6393d36783d56c429c99fbd03d938e747b790a75f80d4ca795a5e489054c6bb8c3494c8de062ba SHA512 30a8e13e22a5282cacc3d47e1f2c88c54361b93953bacfd4fc3f481b5e9ed1fa21fe75943c0573bdcd92bed73f96097d494dec9093d9b312c066ad7b813b0ba5
-DIST lnav-0.11.1.tar.gz 10268167 BLAKE2B d490c6798685e80021437e1771742dee59c3b5109a43591581f4ddc15528c5b616ab915418fa78b7cf13a82bce582baf0516b5b2339f5fa32054359c21908852 SHA512 6c7d2b603ee04bb2cee16bf28b0161ebe7bf3ec838bed765f9852f79ee1ff8a56691dcaa66998e0ef58f16f16274bf93c7f2eb8f2e58264faf284bcfd25818ef
+AUX lnav-0.11.2-gcc15.patch 828 BLAKE2B cf35084fb316c25848f6aecf0f4dd81999bfa5a059a10374f23e99912e9a4ca17ad3d0a0c3f057e49f0d22f59b99817b4f9a8f9c51b9cf4bab9e7ac5b38f9131 SHA512 3a404e50a5a83be380d85053a1dddf9e105f8deeb1f02fccdb8ac1106a022855b2cb6f187898add48351836e73a5f504f1de61ba628e3ded2b944e96a87fa6a3
 DIST lnav-0.11.2.tar.gz 12379373 BLAKE2B 513e10f44d3770fb0135ad7fd035d07b35d2a44b2745acf700de0bf82ef428eb1549f9fd389ae4d6e3e268378a980f59f164479390a2a3faea16555941d3c9ca SHA512 a48c81e075923a5e1cdb051dd18329ff417f628518c8273fc19d0787226414668e1c29645edf20a46173fdf65a2b8978517948317fdc8b45c772fdc82cb82154
-EBUILD lnav-0.11.1-r2.ebuild 1141 BLAKE2B 7ddf30143ece50dbe6240ece60967a7c4b92857705a4298f2dcbe576ea4ff39a35b63494681b42d9487941191808a2e74ba93624265e2eb50f1eaebbe2c3dbff SHA512 efae32a37544629390a1db703129c3ff6cde22e7d3d3c7514923fa058b602bb15d6c1f6f46d6435da928186e849c87a9fdc615918d54d559511a9add73316214
-EBUILD lnav-0.11.2.ebuild 1052 BLAKE2B 5d5913e668d23ffa162024256d09b54f107bc8cc12562c57a1eea66a4b2b4b3327da0158b043a8ea342c0ce5b8f491cf3aa9178278e51ede12c03e861738df62 SHA512 91e506ef385658eb35c408f5bdedd9a09b857253435fa88dde51e18fb2c5e370f997d79a8f5eae7bf13b04753e6ae1f537aea617497d3ad95bca8fd2fd165cdf
+EBUILD lnav-0.11.2.ebuild 1092 BLAKE2B bf4dca533be335dd45270ab122f7fc61b14bd8dc3f5ac1b495f748bceb05d999ed8ca5aa8631155a3b9c7a2b5ad2040e872523417ad8e92c3d220bfbc96546c3 SHA512 f2eacb13deac2a02e8cea8e6cf1dcb4f61bd479d1e3b78eb95ebd0e28fdabaeb15f19c1d1d083639dda9f8744b264cdfd0f8d5f708109b8ecf0c83ccff3a970a
 MISC metadata.xml 612 BLAKE2B afc47732dba3190cacef50c032d297ed71ca1c30db8c0b01c97ca12ec9f580cc9a9eaa672d2eada43a60f143992c10aee06ba62ff48bd0719cae6939ebd15db0 SHA512 aa14a62218dbfc8cb67eb67bd3b51f3efafce2a03ae27ba5ee2171613c6f1a6e41a06ee7129b5da2e7e194ed0ca9e6b48637f9ee106fe9ca31fdaf9113abea52
diff --git a/app-admin/lnav/files/lnav-0.11.1-0001-Fix-build-with-GCC-13-add-missing-cstdint-include.patch b/app-admin/lnav/files/lnav-0.11.1-0001-Fix-build-with-GCC-13-add-missing-cstdint-include.patch
deleted file mode 100644
index 0dffeeb9bdbb..000000000000
--- a/app-admin/lnav/files/lnav-0.11.1-0001-Fix-build-with-GCC-13-add-missing-cstdint-include.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-https://github.com/tstack/lnav/pull/1112
-
-From e25d3e3c69fcf57bbaec2333846b9a43c4d1fc90 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sat, 21 Jan 2023 18:11:20 +0000
-Subject: [PATCH] Fix build with GCC 13 (add missing <cstdint> include)
-
-GCC 13 (as usual for new compiler releases) shuffles around some
-internal includes and so <cstdint> is no longer transitively included.
-
-Explicitly include <cstdint> for uint32_t.
-
-Signed-off-by: Sam James <sam@gentoo.org>
---- a/src/base/lnav_log.hh
-+++ b/src/base/lnav_log.hh
-@@ -32,6 +32,7 @@
- #ifndef lnav_log_hh
- #define lnav_log_hh
- 
-+#include <cstdint>
- #include <string>
- 
- #include <stdio.h>
--- 
-2.39.1
-
diff --git a/app-admin/lnav/files/lnav-0.11.2-gcc15.patch b/app-admin/lnav/files/lnav-0.11.2-gcc15.patch
new file mode 100644
index 000000000000..0b9574dde24e
--- /dev/null
+++ b/app-admin/lnav/files/lnav-0.11.2-gcc15.patch
@@ -0,0 +1,23 @@
+https://github.com/tstack/lnav/pull/1285
+https://github.com/tstack/lnav/commit/ce97375280877f80e3dcebd20c21be44b13d8199
+
+From ce97375280877f80e3dcebd20c21be44b13d8199 Mon Sep 17 00:00:00 2001
+From: David Seifert <soap@gentoo.org>
+Date: Sun, 21 Jul 2024 19:38:41 +0200
+Subject: [PATCH] [build] fix for GCC 15 two-phase lookup
+
+* GCC 15 is more aggressive about checking dependent names
+
+Bug: https://bugs.gentoo.org/936409
+--- a/src/vtab_module.hh
++++ b/src/vtab_module.hh
+@@ -582,7 +582,7 @@ struct vtab_module : public vtab_module_base {
+     struct vtab {
+         explicit vtab(sqlite3* db, T& impl) : v_db(db), v_impl(impl) {}
+ 
+-        explicit operator sqlite3_vtab*() { return &this->base; }
++        explicit operator sqlite3_vtab*() { return &this->v_base; }
+ 
+         sqlite3_vtab v_base{};
+         sqlite3* v_db;
+
diff --git a/app-admin/lnav/lnav-0.11.1-r2.ebuild b/app-admin/lnav/lnav-0.11.1-r2.ebuild
deleted file mode 100644
index 18fee38a20e9..000000000000
--- a/app-admin/lnav/lnav-0.11.1-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic
-
-DESCRIPTION="A curses-based tool for viewing and analyzing log files"
-HOMEPAGE="https://lnav.org"
-SRC_URI="https://github.com/tstack/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="pcap test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-arch/bzip2:0=
-	app-arch/libarchive:=
-	>=dev-db/sqlite-3.9.0
-	dev-libs/libpcre2
-	>=net-misc/curl-7.23.0
-	sys-libs/ncurses:=
-	sys-libs/readline:=
-	sys-libs/zlib:=
-	pcap? ( net-analyzer/wireshark[tshark] )"
-# The tests use ssh-keygen and use dsa and rsa keys (which is why ssl is required)
-DEPEND="${RDEPEND}
-	test? (
-		virtual/openssh[ssl]
-		dev-cpp/doctest
-	)"
-
-DOCS=( AUTHORS NEWS.md README )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.11.0-disable-tests.patch
-	"${FILESDIR}"/${PN}-0.11.1-0001-Fix-build-with-GCC-13-add-missing-cstdint-include.patch
-)
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	filter-lto
-
-	econf \
-		--disable-static \
-		--with-ncurses \
-		$(use_with test system-doctest)
-}
diff --git a/app-admin/lnav/lnav-0.11.2.ebuild b/app-admin/lnav/lnav-0.11.2.ebuild
index 1545017c774c..40c8357e90c0 100644
--- a/app-admin/lnav/lnav-0.11.2.ebuild
+++ b/app-admin/lnav/lnav-0.11.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -36,6 +36,7 @@ DOCS=( AUTHORS NEWS.md README )
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.11.0-disable-tests.patch
+	"${FILESDIR}"/${PN}-0.11.2-gcc15.patch
 )
 
 src_prepare() {