Merge updates from master

10 files changed, 194 insertions, 2 deletions

diff --git a/app-metrics/elasticsearch_exporter/Manifest b/app-metrics/elasticsearch_exporter/Manifest
index 2ce154fb2add..01992dabedde 100644
--- a/app-metrics/elasticsearch_exporter/Manifest
+++ b/app-metrics/elasticsearch_exporter/Manifest
@@ -1,2 +1,4 @@
 DIST elasticsearch_exporter-1.3.0-deps.tar.xz 106387304 BLAKE2B d67e8b746ecf9f05310194485ac99b95768b813a7265b3ec445261d52708551c37bc14718021ee67306c84fedc323f5ef4e87cba043354b3b49c9ba0764e5575 SHA512 0374030189927deb14c8bd34b6472e9be8f7025aea525394a5eca5d6899311296e7eeefb7d05a2b4a75549c4590b9590dd592ab3c0aaf008c311922a01ea81d5
 DIST elasticsearch_exporter-1.3.0.tar.gz 93489 BLAKE2B 33e2dbe9608bd052bc4f31fc2a38774981d96f30fd54465bd2b10d075f0fade29fe6c40d2e32370a38edc41d04b3772100c39f5670c302a0a334e2a7d5ee6463 SHA512 a88ec20cd7f2f9859d2e169f7813b84c3286b65dfc3a625545608416dbee5f96d4e223e7d2ea2f2b788be766ead1abb11b795d3059a628d0c3c56f567eebea00
+DIST elasticsearch_exporter-1.8.0-deps.tar.xz 9361520 BLAKE2B 67b89d1dd7d2fb3751cb8f64f55b851dfbebe0629f1efc90428145783d80b2e815ef6c317acb6920da366ba68ed3b8079311addea020e3ed0342b1e20177f294 SHA512 40050c678f4bd71d1c6bc23947d47434d23838f127476649a0bc533cf2a5db3f9195bf31b1f197b9ee80347be4de9cfa92cbe7ebee478780d25d3bd66267ac56
+DIST elasticsearch_exporter-1.8.0.tar.gz 111232 BLAKE2B 50a32a27492a7c21f5bd0f5022087566733fbc1a477011cfd19a7be7601fe01ec0c993a5c71ca32bd7e09ba28e00f45be4f546ab95cf78207b8542e41de681e9 SHA512 d9c0e582b566f1cdd025da2fda812b458c96f14db9f05a4e82238ddc581c5b30d4685e8f5d40e41c0c919b66e7af810ba01b649cd34537cf8d2995bd4b49045c
diff --git a/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.8.0.ebuild b/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.8.0.ebuild
new file mode 100644
index 000000000000..dfb7077974a5
--- /dev/null
+++ b/app-metrics/elasticsearch_exporter/elasticsearch_exporter-1.8.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+GIT_COMMIT=fd25030ff5
+
+MY_PV=${PV/_/}
+DESCRIPTION="Elasticsearch stats exporter for Prometheus"
+HOMEPAGE="https://github.com/justwatchcom/elasticsearch_exporter"
+SRC_URI="https://github.com/justwatchcom/elasticsearch_exporter/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="acct-group/elasticsearch_exporter
+	acct-user/elasticsearch_exporter"
+	RDEPEND="${DEPEND}"
+BDEPEND="dev-util/promu"
+
+src_prepare() {
+	default
+	sed -i -e "/-s$/d" -e "s/{{.Revision}}/${GIT_COMMIT}/" .promu.yml || die
+}
+
+src_compile() {
+	promu build --prefix bin || die
+}
+
+src_test() {
+	emake test-flags= test
+}
+
+src_install() {
+	dobin bin/elasticsearch_exporter
+	dodoc {README,CHANGELOG}.md
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	keepdir /var/log/elasticsearch_exporter
+	fowners ${PN}:${PN} /var/log/elasticsearch_exporter
+}
diff --git a/app-shells/atuin/atuin-18.4.0.ebuild b/app-shells/atuin/atuin-18.4.0.ebuild
index 23dba724e34c..3da812b0055c 100644
--- a/app-shells/atuin/atuin-18.4.0.ebuild
+++ b/app-shells/atuin/atuin-18.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -518,7 +518,7 @@ LICENSE="MIT"
 # - openssl for ring crate
 LICENSE+=" Apache-2.0 BSD Boost-1.0 ISC MIT MPL-2.0 Unicode-DFS-2016 openssl"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv"
+KEYWORDS="amd64 ~arm64 ~riscv"
 IUSE="+client +daemon server test +sync"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="
diff --git a/app-text/kramdown-rfc/Manifest b/app-text/kramdown-rfc/Manifest
index 45600a7fb30c..40b79443faba 100644
--- a/app-text/kramdown-rfc/Manifest
+++ b/app-text/kramdown-rfc/Manifest
@@ -1,2 +1,3 @@
 DIST kramdown-rfc2629-1.6.39.gem 62464 BLAKE2B 4063bab5ef8081c5a2aba3d881990d9ea4e6dd5ce01bf85e0ce6bc63b0fc6c1e8e9be413b00588c5e6e473ee26dfb6060aa8767ce6b4053c1b8750f79182e540 SHA512 bdfc611895f734a28e65b8d6b750fec387bb504d35feb8c6bbf4dbaf83b19b65fb61187e9b5e58ec64dbe72cbc9cc6efa78a349752340634ef2dc565bb096589
 DIST kramdown-rfc2629-1.7.19.gem 68096 BLAKE2B ee33d7703e7b02fdf4435bd1f4570434a8f305fc685a163181e2f2106a2d0dc9dad620441797cb5276d84a445ca511d0d09a027c5c8465ca3c996e08a946bb8c SHA512 2c0b9ec5a7b6b06b0d5761e497b96b6ef9a0e9609c20998d7e213616101e96701fecee0bf5702a17b0c17812ec756dbaa455d28268ca139c8c8da913d9d5838c
+DIST kramdown-rfc2629-1.7.22.gem 69120 BLAKE2B b75ed143db8667e41f592a26c7e62f5e27114693b40e13c836cc47c01f537ffa431ae766102fdd24bd9c338bfb5e2a389297f91c9830677bc956fda4b7438420 SHA512 553f4be33df687a045d3a8450a24c62de4c0e12e4a4dfd796897bf07be6c4c0ac73746f63698beefa06990fef84d3c407f641294326e4b4ae7d965e3a0262a1d
diff --git a/app-text/kramdown-rfc/files/kramdown-rfc-1.7.22-remove-bin-echars.patch b/app-text/kramdown-rfc/files/kramdown-rfc-1.7.22-remove-bin-echars.patch
new file mode 100644
index 000000000000..89c9b60a6f00
--- /dev/null
+++ b/app-text/kramdown-rfc/files/kramdown-rfc-1.7.22-remove-bin-echars.patch
@@ -0,0 +1,43 @@
+From c8a037975c71cd0c99896c69b07d72d63f07797b Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Thu, 17 Oct 2024 09:37:45 +0200
+Subject: [PATCH] Remove bin/echars
+
+---
+ kramdown-rfc2629.gemspec | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/kramdown-rfc2629.gemspec b/kramdown-rfc2629.gemspec
+index 5d148d5adbba..f9e306bb3502 100644
+--- a/kramdown-rfc2629.gemspec
++++ b/kramdown-rfc2629.gemspec
+@@ -8,16 +8,12 @@ spec = Gem::Specification.new do |s|
+   s.add_dependency('kramdown-parser-gfm', '~> 1.1')
+   s.add_dependency('certified', '~> 1.0')
+   s.add_dependency('json_pure', '~> 2.0')
+-  s.add_dependency('unicode-name', '~> 1.0')
+-  s.add_dependency('unicode-blocks', '~> 1.0')
+-  s.add_dependency('unicode-scripts', '~> 1.0')
+   s.add_dependency('net-http-persistent', '~> 4.0')
+-  s.add_dependency('differ', '~> 0.1')
+   s.add_dependency('base64', '>= 0.1')
+   s.files = Dir['lib/**/*.rb'] +
+             %w(README.md LICENSE kramdown-rfc2629.gemspec
+                bin/kdrfc bin/kramdown-rfc bin/kramdown-rfc2629
+-               bin/doilit bin/echars bin/kramdown-rfc-extract-markdown
++               bin/doilit bin/kramdown-rfc-extract-markdown
+                bin/kramdown-rfc-extract-sourcecode
+                bin/kramdown-rfc-extract-figures-tables
+                bin/kramdown-rfc-lsr data/kramdown-rfc2629.erb
+@@ -27,7 +23,7 @@ spec = Gem::Specification.new do |s|
+                bin/de-gfm
+                bin/kramdown-rfc-clean-svg-ids)
+   s.require_path = 'lib'
+-  s.executables = ['kramdown-rfc', 'kramdown-rfc2629', 'doilit', 'echars',
++  s.executables = ['kramdown-rfc', 'kramdown-rfc2629', 'doilit',
+                    'kramdown-rfc-extract-markdown',
+                    'kramdown-rfc-extract-sourcecode',
+                    'kramdown-rfc-extract-figures-tables',
+-- 
+2.45.3
+
diff --git a/app-text/kramdown-rfc/kramdown-rfc-1.7.22.ebuild b/app-text/kramdown-rfc/kramdown-rfc-1.7.22.ebuild
new file mode 100644
index 000000000000..e9ed10d0d662
--- /dev/null
+++ b/app-text/kramdown-rfc/kramdown-rfc-1.7.22.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+# The software got renamed from kramdown-rfc2629 to kramdown-rfc,
+# however the gem coordinate is still kramdown-rfc2629.
+RUBY_FAKEGEM_NAME="${PN}2629"
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+# Explicitly use the gemspec file over the metadata file of the gem, as
+# the latter contains dependencies that we patched out.
+RUBY_FAKEGEM_GEMSPEC="${RUBY_FAKEGEM_NAME}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An XML2RFC (RFC799x) backend for Thomas Leitner's kramdown markdown parser"
+HOMEPAGE="https://github.com/cabo/kramdown-rfc"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.27-Drop-dependency-on-certified.patch
+	"${FILESDIR}"/${PN}-1.7.22-remove-bin-echars.patch
+)
+
+ruby_add_rdepend "
+	>=dev-ruby/json-2.0.0
+	>=dev-ruby/kramdown-2.4.0
+	>=dev-ruby/kramdown-parser-gfm-1.1.0
+	>=dev-ruby/net-http-persistent-4.0
+"
+
+all_ruby_prepare() {
+	sed -i 's/json_pure/json/' "${RUBY_FAKEGEM_GEMSPEC}" || die
+}
diff --git a/app-text/kramdown-rfc/metadata.xml b/app-text/kramdown-rfc/metadata.xml
index c84d9ca8a5a3..8adfd54148e5 100644
--- a/app-text/kramdown-rfc/metadata.xml
+++ b/app-text/kramdown-rfc/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type='github'>cabo/kramdown-rfc</remote-id>
+		<bugs-to>https://github.com/cabo/kramdown-rfc/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/xml2rfc/Manifest b/app-text/xml2rfc/Manifest
index 491c94d2ea1f..7a3f093bd67a 100644
--- a/app-text/xml2rfc/Manifest
+++ b/app-text/xml2rfc/Manifest
@@ -1,3 +1,4 @@
 DIST xml2rfc-3.18.0.gh.tar.gz 2856552 BLAKE2B b2397d10c770694e8eb354220803f89525e64638fd1043c2672ce0849be72a397ab6f2bff03f689721f00e63ac034ec7b7aec20cf93b759f42a415ab66293908 SHA512 afd88bad84c6f5b734dd091e34ec41bff63fcf38f3bfab777818954dec31363300e13dd745b602e2c145fbe0df0be4e69918ddc71aac276bf0833ad4563c19f1
 DIST xml2rfc-3.23.2.gh.tar.gz 2814581 BLAKE2B 25a27c90eff5260e41bf2503bc6959b1acfce494f4bd8f077b0664f776d524ca0572977443f1c839978062573356b6eae67d5efe4253c54168ade6fb34ce6c52 SHA512 443678d70d5d2f86e255f29aa6092d5db571be8f3a54a0b36f5d23e0b46fb426fb2a0b1cfecf2307b2cdbbba40113cd1944d1e70ef1e460a6c9596ba5e9a8bd4
 DIST xml2rfc-3.24.0.gh.tar.gz 2838316 BLAKE2B 3c6cfe36f041125b7ba2ef5f75f8fb8312f0d21d57e567905d47f9661cdc0bf2733e0f17441453fe85c2afa66bcf1fbb7a11a66b61201e717d5d3c5a5b73a449 SHA512 e89ed354f40304cc13f99e4e2b53abbf226b06b17bb47be677f7d1433de36ee957ea49a81dbe8b6c0d9310c602d71f9fb4650588cdd799076ade286463b6b3fb
+DIST xml2rfc-3.26.0.gh.tar.gz 2839215 BLAKE2B b175e85fc82090d15176977d1af1e4968ff8d1c5a17fc5c07bffff7e20fdc1b5c28328fe75d77ed124da7d836422e5bf68614f9bfaa9f6a45fd7bc734e0acda2 SHA512 3ac5aa2e0acbef01a54160e448dfbf2e9f09aae582fddf0677008f6af666ecf263d504a969fb60e3d3dbc593fd10171e1487daf47a2bc35e1ee9942acff19599
diff --git a/app-text/xml2rfc/metadata.xml b/app-text/xml2rfc/metadata.xml
index bc2b5035b11b..0616885f9bff 100644
--- a/app-text/xml2rfc/metadata.xml
+++ b/app-text/xml2rfc/metadata.xml
@@ -8,5 +8,7 @@
 	<upstream>
 		<remote-id type="pypi">xml2rfc</remote-id>
 		<remote-id type="github">ietf-tools/xml2rfc</remote-id>
+		<changelog>https://github.com/ietf-tools/xml2rfc/releases</changelog>
+		<bugs-to>https://github.com/ietf-tools/xml2rfc/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/app-text/xml2rfc/xml2rfc-3.26.0.ebuild b/app-text/xml2rfc/xml2rfc-3.26.0.ebuild
new file mode 100644
index 000000000000..4e27e42a9e83
--- /dev/null
+++ b/app-text/xml2rfc/xml2rfc-3.26.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..13} )
+
+inherit distutils-r1
+
+DESCRIPTION="Generates RFCs and IETF drafts from document source in XML"
+HOMEPAGE="
+	https://ietf-tools.github.io/xml2rfc/
+	https://github.com/ietf-tools/xml2rfc/
+	https://pypi.org/project/xml2rfc/
+"
+SRC_URI="
+	https://github.com/ietf-tools/xml2rfc/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/platformdirs-3.6.0[${PYTHON_USEDEP}]
+	dev-python/configargparse[${PYTHON_USEDEP}]
+	dev-python/intervaltree[${PYTHON_USEDEP}]
+	>=dev-python/google-i18n-address-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-3.1.2[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	>=dev-python/markupsafe-2.1.1[${PYTHON_USEDEP}]
+	dev-python/pycountry[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/pypdf-3.2.1[${PYTHON_USEDEP}]
+		dev-python/decorator[${PYTHON_USEDEP}]
+		dev-python/dict2xml[${PYTHON_USEDEP}]
+		dev-python/weasyprint[${PYTHON_USEDEP}]
+		media-fonts/noto[cjk]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	default
+	# Disable broken PdfWriterTests.
+	sed -i 's/ PdfWriterTests(unittest.TestCase):/ PdfWriterTests:/' test.py || die
+}