From e23a08d0c97a0cc415aaa165da840b056f93c997 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 8 Oct 2021 23:06:07 +0100 Subject: gentoo resync : 08.10.2021 --- app-admin/lnav/Manifest | 2 + .../files/lnav-0.10.0-use-system-doctest.patch | 73 ++++++++++++++++++++++ app-admin/lnav/lnav-0.10.0-r2.ebuild | 62 ++++++++++++++++++ 3 files changed, 137 insertions(+) create mode 100644 app-admin/lnav/files/lnav-0.10.0-use-system-doctest.patch create mode 100644 app-admin/lnav/lnav-0.10.0-r2.ebuild (limited to 'app-admin/lnav') diff --git a/app-admin/lnav/Manifest b/app-admin/lnav/Manifest index ad6e446a178a..68513df00ca8 100644 --- a/app-admin/lnav/Manifest +++ b/app-admin/lnav/Manifest @@ -1,5 +1,6 @@ AUX lnav-0.10.0-disable-remote-tests.patch 3986 BLAKE2B 62dcbb23d92a86caefdbd718d76a9c624d5d71249c60bb104dc0ce9db00c521fd99868e0ad7924d18a7895f437455a8af2ae36316d7d3271c08419b3b89012d3 SHA512 b956427959500ea80ca647c85530cd7a5c2db8368d5ed387e4c7153ba536d5840db0e627c17c911d51ce511f7db07377f51b868ae011cce2db55b0e1a4c99b98 AUX lnav-0.10.0-disable-tests.patch 915 BLAKE2B 5a96465a1870d670af76c28b46c31ce725e82d98da89ed3912d08c3051161dbd2d384234b3567fd605959d9a3fbd6960275b17474a1db5dfa0de1673dc53a273 SHA512 30d0a832ebe38db0c904d2032523ea904f4ea4636dace68c2a1e5d33029c14b97fe54cf3278d6db88fb89c61a49e3606eef96966b846c1a118e482495e8a5970 +AUX lnav-0.10.0-use-system-doctest.patch 2167 BLAKE2B 6f573b41e49f2408bc2f63e998fca555145a5444af297e01540488943c761d1ab9fe025d0c2877b6f8f73ffe64ad37719670e3825f774df26b50a7bb5adac573 SHA512 70b9a139bb60d57ac5341c5d015072efab203f45c3ca9d81ea68fa413ba56bbed381c92c1bbd042591e825aefabc95eb5698b8fb5fbd74ea0bf564bd02cae64c AUX lnav-0.8.4-disable-tests.patch 385 BLAKE2B b00a7e4af717a567bf9a7bbecc77500afc22ccab48caaa3781a3d786f4487bcedc59db06b01bfbdcf7871b08cc3b8841582341bec1d707ccf3c94e180a3e59f6 SHA512 f199ec2e9b9a87b8665705051c2a833b8643b18f4793f00587b27eebf0fd455e3d09cbe40613c4e87db58fb91d1f491893d6d9eae38d81de4bb96452e1fb8489 AUX lnav-0.9.0-bug639332-tinfow.patch 579 BLAKE2B 17707472f4fa764e27d98a1ae426f65a1ad45dacdc34e4c19b608298b7bbc094ddf3c49ded6987ac2c2f145dc58ff9f520a49c44551b277182b76ef13b2fc2fb SHA512 b69da2eac944affd7c70bdf9bcc2be333d5d67d1415e05ebbfd87bff85369ffbe61399b05440637941bdfa4d220ae1ba100342a9e028ee789f3c9f0f1e2dec2c AUX lnav-0.9.0-bug713600_0.patch 896 BLAKE2B 2fbd1d499a615051438bbeaf1a57ee6120f42bc8b99d4fe368f929a19bfcb6e745fe2a6942fe28d4085a9c939110865ec71dd62d52be50b9e1be5105d1f38b95 SHA512 433b60e379c582b25db5a321b91cbf332deb84430149b0a3d31e0cb8ce2c5cce0c6b01b35660e82550259768dcd42eb4758d21d5064739b8f4831029c77692b4 @@ -9,5 +10,6 @@ AUX lnav-0.9.0-bug792582.patch 3148 BLAKE2B 8392a375e0d47996a9e2afd6d34a5c0b38ef DIST lnav-0.10.0.tar.gz 5678120 BLAKE2B d64957e94cc5415e663db8ab5722e6424381aa83a2c9430397baed782b47064ed8f460f27bec6256206cabb43f20eba9318aec1991115b577fcc9c37585dd932 SHA512 d07f4e594b9b905453f4c0ac54db2612e3bed533b47f4fd5b6b0da4e27a2d3bb611cbdf9801c12b6edae045c58881ff1f458f144981fe3d8a41f8d113e847efd DIST lnav-0.9.0.tar.gz 1094734 BLAKE2B 79d6b035d9fc1efba618dbbd0924dbac2c8a2b3316849164c8c1a3782c7e8b85f12ade02a973d0c4fabff64b38e26fd579f1931aeafb05396ece7e75608cfc5d SHA512 4f03c83003b262c6aa1d1e87d61b4a3ae8f1ccd33a2df1b451f263d3925791d3b46285bbe276d89733a2bd464be9029e7100ce12fdfe3e009a089f250e601151 EBUILD lnav-0.10.0-r1.ebuild 868 BLAKE2B 21f7e1abdb467c1dcbeae316d3d8f96fe844ad9ff9dd13ae2208ef4e81688664e71918217ca0010c88082a536807dfe7dfa540ada306cb46f6a6e9c134ea49bf SHA512 b01777e82754e0300582edd9037ccd1c478b97ccf51f1fa51756bb305d0cad62a0b29fc0a3df5d001eb13c6a86738413677a6ef23df794997be6ec0aaedbb29d +EBUILD lnav-0.10.0-r2.ebuild 1869 BLAKE2B 258ea8166f16e92c9f5673b25beaa9d10d61a0e8189e8cacace55995879f7895162c8696d60ac50d241ebcde70955b883e9ee7bc7b62fa44efdd664e9f8b1037 SHA512 b3f853d1b5e9636760a9c754c88d0c50c722c41d4e4b043f45e0b14b2372c161a40397354cb845296d8591adb6a76d21b0801528e33b7ef9b3e000b58d2948d8 EBUILD lnav-0.9.0-r3.ebuild 1129 BLAKE2B 28295e39ddfdb4fb151132c61e0928dd9ab53853206d6f1cd4bd378d45ca07826eb8fa7c64efeb44d6cd1c8af252d050e36eabffff3bd9232b6825ba977b627c SHA512 2801635eebd830873063750792af5b4d441166432bb064cecb562f9f5cd27ef2249574dade33e53c066e3b044f0cf00831d9246e2dab350ed9c0a57d8e298e6b MISC metadata.xml 781 BLAKE2B 6c7ff3da9a9dc1a5369ca51771ac4f11185426296f806e674a67a95a341ee5b466261387913ccc96e1d9c1b10c3719ae52f529f24004f5a464cb3f6d884e9fdd SHA512 b928e1a51306e3e48dfb27a50b240f2d855380988b6bbd4650cc04583b73385cf052f947cbd7ed089efa4e1131d23503f4c3fe539c20c724dd29c6e43195a48f diff --git a/app-admin/lnav/files/lnav-0.10.0-use-system-doctest.patch b/app-admin/lnav/files/lnav-0.10.0-use-system-doctest.patch new file mode 100644 index 000000000000..09fe364487bf --- /dev/null +++ b/app-admin/lnav/files/lnav-0.10.0-use-system-doctest.patch @@ -0,0 +1,73 @@ +From 85515b2c196f2e361e93c158201f74177dc4ae37 Mon Sep 17 00:00:00 2001 +From: Randy Barlow +Date: Sat, 18 Sep 2021 21:56:19 -0400 +Subject: [PATCH] Provide a configure flag to use the system doctest + +This will allow distributions to more easily maintain +incompatibilies between doctest and the rest of their software. + +Fixes #912 + +Signed-off-by: Randy Barlow +--- + configure.ac | 21 + + src/Makefile.am | 4 + + src/doctest.hh | 5502 +-------------------------------------- + src/doctest_vendored.hh | 5464 ++++++++++++++++++++++++++++++++++++++ + 4 files changed, 5527 insertions(+), 5464 deletions(-) + create mode 100644 src/doctest_vendored.hh + +diff --git a/configure.ac b/configure.ac +index f2127def..33746d1e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -153,6 +153,27 @@ AS_IF([test "x$enable_simd" = "xyes"], [ + ]) + + ++AC_ARG_WITH([system_doctest], ++ AS_HELP_STRING( ++ [--with-system-doctest], ++ [Use the system provided doctest library rather than the bundled one] ++ ), ++ [], [] ++) ++ ++AS_IF([test "x$with_system_doctest" = "xyes"], [ ++ AC_CHECK_HEADERS(doctest/doctest.h) ++ AS_IF([test "x$ac_cv_header_doctest_doctest_h" != "xyes"], [ ++ AC_MSG_ERROR([system doctest not found])dnl ++ ]) ++ AC_DEFINE([DOCTEST_HEADER], ["doctest/doctest.h"], [doctest include path]) ++]) ++AS_IF([test "x$with_system_doctest" != "xyes"], [ ++ AC_DEFINE([DOCTEST_HEADER], ["doctest_vendored.hh"], [doctest include path]) ++ AS_VAR_SET(doctest_vendored_h, "doctest_vendored.hh") ++ AC_SUBST(doctest_vendored_h) ++]) ++ + + LNAV_WITH_JEMALLOC + +diff --git a/src/Makefile.am b/src/Makefile.am +index 9be9168e..8dc0cd94 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -151,6 +151,9 @@ dist_noinst_DATA = \ + $(FORMAT_FILES) \ + xterm-palette.json + ++EXTRA_HEADERS = \ ++ doctest_vendored.hh ++ + noinst_HEADERS = \ + all_logs_vtab.hh \ + ansi_scrubber.hh \ +@@ -174,6 +177,7 @@ noinst_HEADERS = \ + db_sub_source.hh \ + doc_status_source.hh \ + doctest.hh \ ++ $(doctest_vendored_h) \ + elem_to_json.hh \ + environ_vtab.hh \ + field_overlay_source.hh \ diff --git a/app-admin/lnav/lnav-0.10.0-r2.ebuild b/app-admin/lnav/lnav-0.10.0-r2.ebuild new file mode 100644 index 000000000000..e3da36aee5c5 --- /dev/null +++ b/app-admin/lnav/lnav-0.10.0-r2.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +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="unicode test" +RESTRICT="!test? ( test )" + +RDEPEND=" + app-arch/bzip2:0= + app-arch/libarchive:= + test? ( dev-cpp/doctest ) + >=dev-db/sqlite-3.9.0 + dev-libs/libpcre[cxx] + >=net-misc/curl-7.23.0 + sys-libs/ncurses:=[unicode(+)?] + sys-libs/readline:0= + sys-libs/zlib:0=" +DEPEND="${RDEPEND}" + +DOCS=( AUTHORS NEWS README ) +PATCHES=( + "${FILESDIR}"/${PN}-0.10.0-disable-tests.patch + "${FILESDIR}"/${PN}-0.10.0-disable-remote-tests.patch + # This allows us to use the --with-system-doctest configure flag, and should not be needed in + # the next release of lnav. See https://github.com/tstack/lnav/pull/915 + # This patch isn't completely identical to the one in PR #915 because that patch was too large + # for repoman's tastes. See the comment in src_prepare() for how I applied the rest of this + # patch with rm and a heredoc. + # https://bugs.gentoo.org/812353 + "${FILESDIR}"/${PN}-0.10.0-use-system-doctest.patch +) + +src_prepare() { + # repoman didn't like having a ~500 kiB patch file, so I'm just manually removing the doctest we + # don't want (the bundled one) and putting the one we do want here. + # We won't need this once we get rid of lnav-0.10.0-use-system-doctest.patch + cat < src/doctest.hh +#include "config.h" +#include DOCTEST_HEADER +EOF + # We won't need this once we get rid of lnav-0.10.0-use-system-doctest.patch + touch src/doctest_vendored.hh + default + eautoreconf +} + +src_configure() { + econf \ + --disable-static \ + $(use_with test system-doctest) \ + $(use_with unicode ncursesw) +} -- cgit v1.2.3