gentoo auto-resync : 25:06:2023 - 19:30:41

7 files changed, 77 insertions, 6 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 8e9b2315172d..f49350ab5b95 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/kramdown-rfc/Manifest b/app-text/kramdown-rfc/Manifest
index 138ced9ea98b..4c8e4272b44b 100644
--- a/app-text/kramdown-rfc/Manifest
+++ b/app-text/kramdown-rfc/Manifest
@@ -1,5 +1,8 @@
 AUX kramdown-rfc-1.6.27-Drop-dependency-on-certified.patch 1181 BLAKE2B 88aca52367e43430d32cd9fec446d058336df581e6f1826c21b2ce0a0b56146e5e823c64c67a93c475d434be8f11dccf06087e8482ca5a58f3e756692bd20e95 SHA512 9ad85ee55c73fa1c5aef81fd9453f339730e2f96ab36b4888d425e6a3898aaac9fdba7ff09744ddab77a46ba5de5f609a1fdd3731e51fbaaba25c8885c138562
 AUX kramdown-rfc-1.6.27-Remove-bin-echars.patch 1709 BLAKE2B 204a01a8115e87c14e4afd2d13e6c9901e00e57b8f41e278bc1f9a8893bd434a4fde25f91a59cfd62df46d6439b44e033066f092c353b4a73f187b8a337f3202 SHA512 f5469729f74187dc10120f5c8bd3ba9fa7d9d4437bc13ea341671a937e65398d923d1c0ae17ae383c39fda1b5be8fd94d45b63a17fa22d1ed347f023eb380c4d
+AUX kramdown-rfc-1.6.35-Remove-bin-echars.patch 1838 BLAKE2B f069feb771975e6db63c433662416e31434c4b72d1ab6142afde73ca1e16fb7435aafcdf7a82650cfebe1edfbb851e2017b3d723694a24527065edffb5921e08 SHA512 9cbbc54067278196c1e8044f839536307e268272d855b787f82b0af585ad327975013671ea67cb6ce6882cdaeeb13499fa965a30608a3c9634a285d554fdf097
 DIST kramdown-rfc2629-1.6.27.gem 57344 BLAKE2B e43d46a02e804268ebf5697fde7948c1c1e90f2cb33f0aa66c93c629e6f68f7932ecf02cd7169c93d06f21ee77e9c98b2717c6c18629fc78d2532098ef4e4f5f SHA512 7ad473bf9221f8369afaa6374751d77931f12e7af3500576da7567cc4e36844349de412626e735432dea098d71d155cb1fd1d87f9e3ea053bebd3be84da81c17
+DIST kramdown-rfc2629-1.6.35.gem 60928 BLAKE2B 91438fb8d58f59da8d69f7065478ae66e80a9a5958c5e87ab4c342e1abf0f3ee38c411b05d9e8d24d1f06093426a9db4552fda4914907ec7bd4dfd45668e9e71 SHA512 88d24c5c8a236733422dc3b863376c9007d4ea5e68977f4ebc5dcff51782995ab169c790d5a89fa4ae53966e92d1142fe5bf3135cd56e02eeecf0abd2290b098
 EBUILD kramdown-rfc-1.6.27.ebuild 1123 BLAKE2B 9e5db4ebaa8998a55191cc9277810833386e5abbe917c677cfe917a85bea18b622566b918e5a460d67c913e82bd2f61801e7ea58d2ac3c374e9d7aa790a07cee SHA512 e4cad1711739db2485daa6f634474bbaf25ce0d4fee8c70dcc3e0e3ef7036af17bcb67b4c0ec65ea5042134599e0be7ca6210316c3d891b2a1907703966a365c
+EBUILD kramdown-rfc-1.6.35.ebuild 1124 BLAKE2B 5f766d0bc384d55e6d6c9e92d44c206d2bc4c72d5f1a5f9d3cb612f1aaa5f2205e493e59b6c0d60ef506267f21eed5b52a22de99c6ddaf793e15d14f9a2ced1c SHA512 a363354ca02e9ed9d64fa6bb4a81847b18b60c3e8faba8860f5c4780bc6506a0a4cbe94be5b1b449c2fbaa5e1e97a4473a7b5905282d42b1ac65870a03627d7c
 MISC metadata.xml 329 BLAKE2B 9185c25e51c2e8b627f4b429b3b9de5c751e05fe6d78831704f32811ec9962e7f05f057c6c8e68bbcf58b95b7f791357cc3ae4598f49e3e073063994bcd30e95 SHA512 8638caf7ae842a1cffccea4795d4769ec20a56107721b5a401bf430151c682332adee04fb1bc551d1ce4de875572a356b1f4bce0dad435c4c7bc4f91c686b9ff
diff --git a/app-text/kramdown-rfc/files/kramdown-rfc-1.6.35-Remove-bin-echars.patch b/app-text/kramdown-rfc/files/kramdown-rfc-1.6.35-Remove-bin-echars.patch
new file mode 100644
index 000000000000..089ca1f4dea3
--- /dev/null
+++ b/app-text/kramdown-rfc/files/kramdown-rfc-1.6.35-Remove-bin-echars.patch
@@ -0,0 +1,27 @@
+From 4e64df2e00dec244fe1f44233553e1936004b98d Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Sun, 25 Jun 2023 17:32:52 +0200
+Subject: [PATCH] Remove bin/echars
+
+--- a/kramdown-rfc2629.gemspec
++++ b/kramdown-rfc2629.gemspec
+@@ -8,14 +8,10 @@ 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.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/kramdown-rfc-extract-sourcecode data/kramdown-rfc2629.erb data/encoding-fallbacks.txt data/math.json bin/kramdown-rfc-cache-subseries-bibxml bin/kramdown-rfc-autolink-iref-cleanup bin/de-gfm bin/kramdown-rfc-clean-svg-ids)
++  s.files = Dir['lib/**/*.rb'] + %w(README.md LICENSE kramdown-rfc2629.gemspec bin/kdrfc bin/kramdown-rfc bin/kramdown-rfc2629 bin/doilit bin/kramdown-rfc-extract-markdown bin/kramdown-rfc-extract-sourcecode data/kramdown-rfc2629.erb data/encoding-fallbacks.txt data/math.json bin/kramdown-rfc-cache-subseries-bibxml bin/kramdown-rfc-autolink-iref-cleanup 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',
+                    'kdrfc', 'kramdown-rfc-cache-i-d-bibxml',
+-- 
+2.39.3
+
diff --git a/app-text/kramdown-rfc/kramdown-rfc-1.6.35.ebuild b/app-text/kramdown-rfc/kramdown-rfc-1.6.35.ebuild
new file mode 100644
index 000000000000..ff1033582610
--- /dev/null
+++ b/app-text/kramdown-rfc/kramdown-rfc-1.6.35.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31"
+
+# 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.6.35-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/xml2rfc/Manifest b/app-text/xml2rfc/Manifest
index 117d20bc5cd5..fc57167c79c8 100644
--- a/app-text/xml2rfc/Manifest
+++ b/app-text/xml2rfc/Manifest
@@ -1,8 +1,8 @@
 AUX xml2rfc-Remove-broken-test.patch 3455 BLAKE2B a5faf688b52a7dc34a99e096a56433103e01f28f8c4b4cf75b4816683b1e7fcd60131d2170f5fdf65fc1c4621099694de682e5b017d6d045bc795bf3f8ecbd31 SHA512 9f54ef323f7f89f89b847fc00731115d2ee8302b7352c43549176cbdcafd79edd8a91dcf2e329e690833bb19f0f6ed0fd8ca5ee22e92299df54b505f2af0aaa7
 DIST xml2rfc-3.16.0.gh.tar.gz 2859379 BLAKE2B 537815a648b9f5ed59b37a82a29ee092b7e2ad3d10c191a08c752a43d3aed0b81270a855b3a3ee1df935a1d14192715e62f82fe15c2de98eddf329ac554a4ba5 SHA512 893a71bd33c6971103188e624b91d1370f8324bb2316a542fa9496c02368875582b57336e57abd8753e207d80a5aed508c15407ea734056f91002dde9aafdad2
-DIST xml2rfc-3.17.0.gh.tar.gz 2856289 BLAKE2B b48d83118c0bfc1044b703d22a5d1b132e3c9f07da91592ef416013fc3cd8a55ef9e9dc51c3e7725d560c0ccde76120e590fd19e1f36f5bbbe4c73f5d4683f4d SHA512 61dadf2d8308cfade6210af62a54b638a02f44ba586ecd73c8929813c7a7013da933d8ff72f4a1107665da9a952e7fa188cf5cc71c928207b056c4f36f46679d
 DIST xml2rfc-3.17.1.gh.tar.gz 2856471 BLAKE2B 81c0ba0788e6a7e5211186f87d06bf76622fae57557e62bfe3a9fbb9c3aa31de0e1e99302b28b81d4e7280a2f29704389c6a0936b20b0aee219576eff9bfc803 SHA512 d502afc37e350dfd4c578d160e3942c3a33ebf45941db1478cd8e88b3f00470ab457a44667dd0eb955a270e31ae528a73d3625f1a61aabb166705b3d367df62a
+DIST xml2rfc-3.17.4.gh.tar.gz 2858770 BLAKE2B b29b8a102668a5aa943a32b28a9d1669e2a6b0af03085a550c21a08e5bfb5ff3ee8979b03a3d7ae8e820ac8bf60455682914fd06a882e17183ca51aaf1dedf86 SHA512 3fc620eed12fc2a7f6015df8b6a5b1aa422cd8c26807e01d75498aee9257faad1bca68606f77598fb040a8dae074e35ffa0e2994a1ae8d59ee27d25fc6a755e5
 EBUILD xml2rfc-3.16.0.ebuild 1454 BLAKE2B 6a30e22f22a50951b2eece3aab0cef0b95e054b7b7c230dd885a194ddfbe14b71a7cd822128273f2b1aa8c4a256d568472fbfcde531e4382d4edfc80aadd5089 SHA512 3ae5deb47dd25b989667ffb3c979f1bf57aea577e6f49558c81eef4ff609bc26491f89fa0615541f14063a840456c02c3df36f89966c4d42e42db02aad61ab54
-EBUILD xml2rfc-3.17.0.ebuild 1442 BLAKE2B 857be57312e579e430486341314ba4b6eaf53c9a2559129beec606003372269e76a7c13b4a8f6898b68aca55cd06488a27c4ab6470b93165e956e0595c30fc80 SHA512 758bdf0b8d96cb4a8d32f5a6203668bfe236cf4cd22b2be9105346800f29bed880a85027c9e1d87d16b16a67e5a913fa87285a130906ea2e5acdd72d6967b5cf
-EBUILD xml2rfc-3.17.1.ebuild 1442 BLAKE2B 857be57312e579e430486341314ba4b6eaf53c9a2559129beec606003372269e76a7c13b4a8f6898b68aca55cd06488a27c4ab6470b93165e956e0595c30fc80 SHA512 758bdf0b8d96cb4a8d32f5a6203668bfe236cf4cd22b2be9105346800f29bed880a85027c9e1d87d16b16a67e5a913fa87285a130906ea2e5acdd72d6967b5cf
+EBUILD xml2rfc-3.17.1.ebuild 1441 BLAKE2B 9ddcc426bce06b6f16130f9ad07386e245b1fb5edd563727a0a40190998b74965b35279b5b3db3ea09f0f31a0b4b3d883152951b95dba22adfbf333fc6a61cdb SHA512 ab21a0dbbaaae09f66e1d91308ada52e64faa9c9029a474c8ae5c158d253b55a6a1570d6ccbd0e72ad4c9f28b048c8884597dd9e7701281534918dda6e471118
+EBUILD xml2rfc-3.17.4.ebuild 1463 BLAKE2B 4feb72cc205dbc2ca958be8120ec71dae362802d0eea03add1f74762489c8b1ccb1306f9a06cd645d83cf5f9ca40cea6fe34ba78c8cc7075f4d72c6c16a1a6f9 SHA512 904e255b62c97f9b9b6151e182f7dc8a7fbe45d619932a31a6f5439346da919f3f1c6648e5fe4da89a2d15b38b943ea285b60ecaff950dc1304df4d60d9e4e32
 MISC metadata.xml 374 BLAKE2B 3514fd485c7ca895f1b9f4a809ed97bb55396c1abd6a52ae6602e61b836fac3a0fbcbeec7dcb0789a6510cabb9920a33bfae4dfeb9bfba86ad9d02fbf917a720 SHA512 0e4697e08615993939416355b5d112f5f6ab1aad0bc74a3e33f6d3e7d0178ddf9b5fba70aa50fc6babed1ca27d89d1b0bff53223c1a55e636e82b6c617860cb9
diff --git a/app-text/xml2rfc/xml2rfc-3.17.1.ebuild b/app-text/xml2rfc/xml2rfc-3.17.1.ebuild
index 495e49666d19..c6054229ef12 100644
--- a/app-text/xml2rfc/xml2rfc-3.17.1.ebuild
+++ b/app-text/xml2rfc/xml2rfc-3.17.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/ietf-tools/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 RESTRICT="!test? ( test )"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 BDEPEND="
 	test? (
diff --git a/app-text/xml2rfc/xml2rfc-3.17.0.ebuild b/app-text/xml2rfc/xml2rfc-3.17.4.ebuild
index 495e49666d19..3b8c97ef1ad8 100644
--- a/app-text/xml2rfc/xml2rfc-3.17.0.ebuild
+++ b/app-text/xml2rfc/xml2rfc-3.17.4.ebuild
@@ -28,10 +28,10 @@ BDEPEND="
 "
 
 RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-3.6.0[${PYTHON_USEDEP}]
 	dev-python/ConfigArgParse[${PYTHON_USEDEP}]
 	dev-python/intervaltree[${PYTHON_USEDEP}]
-	dev-python/google-i18n-address[${PYTHON_USEDEP}]
+	>=dev-python/google-i18n-address-3.0.0[${PYTHON_USEDEP}]
 	>=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
 	>=dev-python/jinja-3.1.2[${PYTHON_USEDEP}]
 	dev-python/lxml[${PYTHON_USEDEP}]