app-text/klogg: add 22.06.0.1289, drop 20.12

Signed-off-by: Anton Filimonov <anton.filimonov@gmail.com>

4 files changed, 71 insertions, 58 deletions

diff --git a/app-text/klogg/Manifest b/app-text/klogg/Manifest
index 14e1c4545..80f9e1624 100644
--- a/app-text/klogg/Manifest
+++ b/app-text/klogg/Manifest
@@ -1 +1,2 @@
-DIST klogg-20.12.tar.gz 14640631 BLAKE2B 94693d3117343b3a4632aa0a1ef8492b9a895bb5e4567c358966d4defe379e5b50367b59d1e74d8beb5d9c105e760b1e618e78ab60806ed829ead44ccee02363 SHA512 c2fabe2d983ad2626d2fe92c91fc2a944d4eb3a10c627ea877a498814fdebe957ac55665623dee2ea30591ed6ce9e70d708073d007d60769c65a2e84714e8c62
+DIST klogg-22.06.0.1289.deps.tar.gz 144508849 BLAKE2B b25c6660251ebe8240bcf9c6344baa1eaafea61abcbfb5bdaf4cd40caac601d5c48ddeb3a42d46f41dd7a71d8b883d5f27621c05cd03b64c297f9c8836c005e2 SHA512 7745902134f67731ebf98aec4e9cb8ae224851d9920aa81546a33e4a4994d2fdd3d56fcda21b71ade5dcbf1a5dfda2e556be09b162f2e4afe5058e40cfe8af83
+DIST klogg-22.06.0.1289.tar.gz 26092443 BLAKE2B b2bca0a30c6ddcdcecda2ce5a1342169522cdea0333eab7cafdf2d3db5b1ec2353d25bc7181e26a3df0a5263e0acd17f58124c13edc3dc6400e71c21eccfd9c9 SHA512 6e60632a859a4edbfb66a6c02abe1917c5d5254bc835870a6d63bf2893ac8860bd618403c29a1f0ee469a540fc92c3b18f0d6691fcb09b11d3aedbc7e9cb09f6
diff --git a/app-text/klogg/klogg-20.12.ebuild b/app-text/klogg/klogg-20.12.ebuild
deleted file mode 100644
index 779c8be98..000000000
--- a/app-text/klogg/klogg-20.12.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg cmake
-
-DESCRIPTION="A GUI application to browse and search through long and complex log files"
-HOMEPAGE="https://klogg.filimonov.dev"
-SRC_URI="https://github.com/variar/klogg/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="+sentry lto test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtxml:5
-	dev-qt/qtconcurrent:5
-"
-RDEPEND="
-	${DEPEND}
-	x11-themes/hicolor-icon-theme
-"
-BDEPEND="
-	test? ( dev-qt/qttest:5 )
-"
-
-QA_PREBUILT="usr/bin/klogg_minidump_dump"
-
-src_prepare() {
-	sed -e 's|share/doc/klogg|${CMAKE_INSTALL_DOCDIR}|' -i "${S}/CMakeLists.txt" || die "sed CMAKE_INSTALL_DOCDIR"
-	sed -e 's|TBB_INSTALL_LIBRARY_DIR lib|TBB_INSTALL_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR}|' -i "${S}/3rdparty/tbb/CMakeLists.txt" || die "sed TBB_INSTALL_LIBRARY_DIR"
-	cmake_src_prepare
-}
-
-src_configure() {
-	export KLOGG_VERSION=${PV}.0.813
-	local mycmakeargs=(
-		-DDISABLE_WERROR=ON
-		-DKLOGG_USE_SENTRY=$(usex sentry)
-		-DBUILD_TESTS=$(usex test)
-		-DUSE_LTO=$(usex lto)
-		-DWARNINGS_AS_ERRORS=OFF
-	)
-
-	cmake_src_configure
-}
diff --git a/app-text/klogg/klogg-22.06.0.1289.ebuild b/app-text/klogg/klogg-22.06.0.1289.ebuild
new file mode 100644
index 000000000..75401e6df
--- /dev/null
+++ b/app-text/klogg/klogg-22.06.0.1289.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit xdg cmake
+
+DESCRIPTION="A GUI application to browse and search through long and complex log files"
+HOMEPAGE="https://klogg.filimonov.dev"
+MAJOR_VERSION=22.06
+SRC_URI="
+	https://github.com/variar/klogg/archive/refs/tags/v${MAJOR_VERSION}.tar.gz -> ${P}.tar.gz
+	https://github.com/variar/klogg/releases/download/v${MAJOR_VERSION}/${P}.deps.tar.gz
+	"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="lto test kde"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtxml:5
+	dev-qt/qtconcurrent:5
+	>=dev-libs/hyperscan-5.4.0
+	>=dev-libs/xxhash-0.8.0
+	>=app-i18n/uchardet-0.0.7
+	>=dev-cpp/tbb-2021.5
+	kde? ( kde-frameworks/karchive:5 )
+"
+RDEPEND="
+	${DEPEND}
+	x11-themes/hicolor-icon-theme
+"
+BDEPEND="
+	>=dev-cpp/robin-hood-hashing-3.11.5
+	test? ( dev-qt/qttest:5 >=dev-cpp/catch-2.13.8 )
+"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	mv ${WORKDIR}/${PN}-${MAJOR_VERSION} ${WORKDIR}/${P}
+
+	unpack ${P}.deps.tar.gz
+}
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+src_configure() {
+	export KLOGG_VERSION=${PV}
+	local mycmakeargs=(
+		-DCPM_SOURCE_CACHE=${WORKDIR}/cpm_cache
+		-DCPM_USE_LOCAL_PACKAGES=ON
+		-DWARNINGS_AS_ERRORS=OFF
+		-DKLOGG_USE_LTO=$(usex lto)
+		-DKLOGG_BUILD_TESTS=$(usex test)
+		-DKLOGG_USE_MIMALLOC=OFF
+		-DKLOGG_USE_SENTRY=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/app-text/klogg/metadata.xml b/app-text/klogg/metadata.xml
index 425aa46ec..d099eb33a 100644
--- a/app-text/klogg/metadata.xml
+++ b/app-text/klogg/metadata.xml
@@ -9,9 +9,6 @@
         <remote-id type="github">variar/klogg</remote-id>
     </upstream>
     <use>
-        <flag name="sentry">
-            Enable crash reporting using sentry.io.
-        </flag>
         <flag name="lto">
             Build with link time optimization (LTO).
         </flag>