gentoo auto-resync : 17:06:2024 - 00:09:46

3 files changed, 35 insertions, 7 deletions

diff --git a/www-apps/klaus/Manifest b/www-apps/klaus/Manifest
index db29365b784f..d5ff23627c84 100644
--- a/www-apps/klaus/Manifest
+++ b/www-apps/klaus/Manifest
@@ -1,5 +1,6 @@
-DIST klaus-2.0.2.tar.gz 43030 BLAKE2B ba3a1d07d92ab02e43a31f9e720e26bafc744c2867b8bd6cf300d6e2fdcbcb560a426e8cf55bd6d8c11d23775ae5beddb8fd3ee89c3b0f21302bb463cc2571f3 SHA512 87aa4943d4e918c7ac9c269c095b8381b9e367ed68a50fb70bd75e02ec723c379d0ceaa2da9d5b81484b4c308941283dd2fb58046ba18e0950611c51b2337edd
+AUX klaus-3.0.0-fix-cli.py 841 BLAKE2B 81729cbcf579e7b04fb05c9c4de6d2873b318a2d3a057aa2d3dac4bb04da1ead126133cc4d2bbb8c3442344c7a19db689928f785f0bf1a95c4dd7f3b84c88941 SHA512 9104003c18739d9a64e01d01774d0061577f9466785d837746f3f1e6f9a3e4edffcfda7d2ea84e9317aa00366b5fe90313fd1b034019021ad79df1082d94f876
 DIST klaus-2.0.3.tar.gz 46961 BLAKE2B 29d84ccf829853f091f8bc944e4bf0ec119e1a2dcf67c7d82561a0924cc60634ec67580b6d9103fe33e7a4f40dc909d9dd04f1765441b9dbfd2638adad91df48 SHA512 81bb1ecd01555bb3e49b4fa482e8bfc679b9754047508201467640bab25e56e3f109339efa419f00b05d99d27138a16ab5fb7c3578792992e343653eb175fc1e
-EBUILD klaus-2.0.2.ebuild 816 BLAKE2B 75ab1ffb5ebfb2372c0f9fc9fe0bc7154f70b6819a1eac7fc6880c0fae9053f9c3634bbc97117e9456248079f02ea81b9d25911effc54cdf87b6a294b11aec7e SHA512 7d65bc3e4cd682d354af75efbf3d9a93b322d494a0bc15c51c145777981b34d679fd15af7cb6c4b5fae232e607e28e9a8242a14462f4aea1bb11299cfa757e4e
+DIST klaus-3.0.0.tar.gz 47126 BLAKE2B ebbd2292dda20f869d69775aa38aaf9e5238079e4ec16a85838cae823ffb7c8135bbf77c30ac2d0ae050d49b7f2ac9c1feba5585b4f62b0fa8e9db656299166c SHA512 4495e4e7e2cecffd1f768eca1e7f8811b98e88c35650f18a4c06be39244302b09955b41cb7fa89545db157b00a2cae2d9a404d6ff26cf166f133fda06ca36d08
 EBUILD klaus-2.0.3.ebuild 826 BLAKE2B 9a51a149860e6061db49a8341ebe5c5da84c2c85cc90ba2a3170540e70c40d7df706b5f8308b0cca12d8dd1fee7935b51929d2af2f0da0bed972d8d234e20142 SHA512 c5ad72350c03572c8883432d1c9ead12404f2728af49206204cab8330d7ec62529abb888d7cec409a9d754ef1bd8b1d900696a80d45938f24e2a80d5ca6d4869
+EBUILD klaus-3.0.0.ebuild 876 BLAKE2B fb21bb8a780d6980c9e02191151b93b641600c5309bbd453764296fa2f6781aace37fb28a1a20e804489d217070446d1cb225f97ed334d62a9a88b15ad17de78 SHA512 0c9a18bbdfad19068899c3be6d55b195665d3c609cfd85f5ddd66f7ebc62cd8ba010e8d06d17af05892564cd42bd072a28f0b09088b8631820d078ccffc795db
 MISC metadata.xml 597 BLAKE2B 12bb4e1e95e23344ca93d0f2159e76b470ae03825b36ff2f6b6cfa14a28a2bd56a838a62fce2b5f6bca3abba36584ba81b5902d96a1bff51e57b53155056edf0 SHA512 02f5b4d5f30a6898c5b12cbba5e094cc6975a1ab03dea528905dfabd7405ba69142dd8473d9506000de60adaff09550c66d6840c31fea9c266f1b7ae954b299e
diff --git a/www-apps/klaus/files/klaus-3.0.0-fix-cli.py b/www-apps/klaus/files/klaus-3.0.0-fix-cli.py
new file mode 100644
index 000000000000..672cfeeb198b
--- /dev/null
+++ b/www-apps/klaus/files/klaus-3.0.0-fix-cli.py
@@ -0,0 +1,22 @@
+https://github.com/jonashaag/klaus/pull/333
+
+From a7f0a5511c4ee25e82ea704b90482c24f16f5bff Mon Sep 17 00:00:00 2001
+From: Louis Sautier <sautier.louis@gmail.com>
+Date: Sun, 16 Jun 2024 15:23:35 +0200
+Subject: [PATCH] cli: fix startup with --ctags, fixes #330
+
+It had been broken by 36a6d2c617f1120.
+--- a/klaus/cli.py
++++ b/klaus/cli.py
+@@ -102,9 +102,9 @@ def main():
+         args.site_name = "%s:%d" % (args.host, args.port)
+ 
+     if args.ctags != "none":
+-        from klaus.ctagsutils import check_have_exuberant_ctags
++        from klaus.ctagsutils import check_have_compatible_ctags
+ 
+-        if not check_have_exuberant_ctags():
++        if not check_have_compatible_ctags():
+             print(
+                 "ERROR: Exuberant ctags not installed (or 'ctags' binary isn't *Exuberant* ctags)",
+                 file=sys.stderr,
diff --git a/www-apps/klaus/klaus-2.0.2.ebuild b/www-apps/klaus/klaus-3.0.0.ebuild
index efb3a9b4ff62..6b91c9c1c5d4 100644
--- a/www-apps/klaus/klaus-2.0.2.ebuild
+++ b/www-apps/klaus/klaus-3.0.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit distutils-r1 pypi
 
@@ -16,17 +16,22 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="ctags"
 
+# Tests can only be run from a git repository so they are not included in
+# source distributions.
+RESTRICT="test"
+
 RDEPEND="
 	>=dev-python/dulwich-0.19.3[${PYTHON_USEDEP}]
 	dev-python/flask[${PYTHON_USEDEP}]
-	dev-python/httpauth[${PYTHON_USEDEP}]
+	>=dev-python/httpauth-0.4[${PYTHON_USEDEP}]
 	dev-python/humanize[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	ctags? ( dev-python/python-ctags3[${PYTHON_USEDEP}] )
 "
 
-# The tests can only be run from a git repository
-# so they are not included in the source distributions
+PATCHES=(
+	"${FILESDIR}/${P}-fix-cli.py"
+)
 
 python_install_all() {
 	distutils-r1_python_install_all