gentoo auto-resync : 28:03:2023 - 09:49:10

6 files changed, 73 insertions, 75 deletions

diff --git a/app-text/kramdown-rfc/Manifest b/app-text/kramdown-rfc/Manifest
index 3b38010e0c50..123932c09a2a 100644
--- a/app-text/kramdown-rfc/Manifest
+++ b/app-text/kramdown-rfc/Manifest
@@ -1,9 +1,7 @@
-DIST kramdown-rfc2629-1.6.17.gem 55808 BLAKE2B 7b3d8359eab9dc9ac9a2beeba74c541a75a9d92418f8f2f16798fb893a45c8347d4c51f11eb9d3032adae71324c5c67a0dcd809c8be06acd831a3615759f3b55 SHA512 e2284db908fa1ef5aa9b36ff6868b11d87a7e6622dce3c540878661eae837b378ed913af12df35d86b5cc8c233ae55e3ad981471390717b2ead3fcd0f3ca781e
+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
 DIST kramdown-rfc2629-1.6.18.gem 55808 BLAKE2B 536906e3f54d202808a06e8e86f4f431b3d30349056644c30fea7e9e57b5586d0a97f9e7e2a1511ddc68a33bf6115c94edc20d98057d333384840871fba00a9d SHA512 911a7a898567f5e085a788d8fbf135d8323af9d2e587ab302a43719f5a7abc820604c2d36eb6ac569dd999e7d08a3ee7a058eeb41c156ec1e295ce3ce9ed194c
-DIST kramdown-rfc2629-1.6.21.gem 56320 BLAKE2B 80946169b6041d4f8011a93dc9c8fba82ef32a117d11fd9002704bf80a68caab21991edf9e74440e90853e2bcc41f13cd37256b15c8775d6cdf2b1a60ddf3d90 SHA512 3c5ad31d302a0b6ea87b2380aa95a2d1410b50fc6708623ec691e4dfe1dac71b27c5a79aae9f275ffeca577049eb615bdbe03481d5cb6036ca46ed5b8404355c
-DIST kramdown-rfc2629-1.6.22.gem 56320 BLAKE2B 8871ae9c854dc3de3f954863ce7631f6a18e8a501850ca068373edf9e3a794b7f7ead729b357eacfed9a58152153fb87dd746d4602ea998e1770d8dec34ec990 SHA512 bc080b9ce477a199621b6f57164ffcf59c7d941e1daeaf1496446152c31c5e959a7fb218b2ddda74d1df241bb8df8d9516b069dfae265b10629d346e0d5f3b00
-EBUILD kramdown-rfc-1.6.17.ebuild 800 BLAKE2B 9872e769c58aa2155179542b6783310fe36607407eb709bb5c63519f8d1084f6f82c5cb1fdf8714adb9375e115bf0896ea47fbfe1d8fa1d08bff5889a134a36b SHA512 0b8725030e26ea1113ed58d4ab58d0ac0dd991f1e8de4c625d06ca58debd4143b83473f08e1f4ebe70ef66308a6f961c83c6349a2b3a68b981f026d851179d37
+DIST kramdown-rfc2629-1.6.27.gem 57344 BLAKE2B e43d46a02e804268ebf5697fde7948c1c1e90f2cb33f0aa66c93c629e6f68f7932ecf02cd7169c93d06f21ee77e9c98b2717c6c18629fc78d2532098ef4e4f5f SHA512 7ad473bf9221f8369afaa6374751d77931f12e7af3500576da7567cc4e36844349de412626e735432dea098d71d155cb1fd1d87f9e3ea053bebd3be84da81c17
 EBUILD kramdown-rfc-1.6.18.ebuild 800 BLAKE2B ea9bcf2e7e2ec8debd807480a9f386de671579aa2c135bf0206f02cf4880f9eb6d3ad3b2ab63215a690764fd4c3dd590a4b288892602df7570c9ba10f8ff1878 SHA512 ad014063225227f2e343bc66132a67c58443ccd05ec29a9f4842bb1b7469b899320af3f33f53eae47c7c6e62641df91a5b1bd9c4866db40592c29b8f959fa33b
-EBUILD kramdown-rfc-1.6.21.ebuild 801 BLAKE2B 2f869d5764d422b78b5fecc1a783fd7dc9ae25bdd7f316b6c802219c0691e6ff421bb0e38435e29af05fa6faf9b063250f5e4c642e66c572e3dde6e62fda5b7c SHA512 67fbe46e9df881089c67da95271ed39223ed97973da4c2221658b7b831192adf07d32978279a6ab89fad77a4cce702444b164d0f5a3015a54ffa1aee356e3ed7
-EBUILD kramdown-rfc-1.6.22.ebuild 801 BLAKE2B 2f869d5764d422b78b5fecc1a783fd7dc9ae25bdd7f316b6c802219c0691e6ff421bb0e38435e29af05fa6faf9b063250f5e4c642e66c572e3dde6e62fda5b7c SHA512 67fbe46e9df881089c67da95271ed39223ed97973da4c2221658b7b831192adf07d32978279a6ab89fad77a4cce702444b164d0f5a3015a54ffa1aee356e3ed7
+EBUILD kramdown-rfc-1.6.27.ebuild 1124 BLAKE2B 63da6e08f57a3d0cbf8993d96038212599b0a4fb5283db8e96bc567a634fa1dd9cf5bbbf296b6228973e8ee010d60bd07a22fc2eb84e621546841c49b3e8d58a SHA512 86597cd2b8c6b6461ad0dbfdf710aa848ecfc5ba2a77a445865b912b1b5094da94b209fae2cad853dfbd60f7cd1c8e734c1cc82f60dff4590f233d9690bee81d
 MISC metadata.xml 329 BLAKE2B 9185c25e51c2e8b627f4b429b3b9de5c751e05fe6d78831704f32811ec9962e7f05f057c6c8e68bbcf58b95b7f791357cc3ae4598f49e3e073063994bcd30e95 SHA512 8638caf7ae842a1cffccea4795d4769ec20a56107721b5a401bf430151c682332adee04fb1bc551d1ce4de875572a356b1f4bce0dad435c4c7bc4f91c686b9ff
diff --git a/app-text/kramdown-rfc/files/kramdown-rfc-1.6.27-Drop-dependency-on-certified.patch b/app-text/kramdown-rfc/files/kramdown-rfc-1.6.27-Drop-dependency-on-certified.patch
new file mode 100644
index 000000000000..65a5fbed234f
--- /dev/null
+++ b/app-text/kramdown-rfc/files/kramdown-rfc-1.6.27-Drop-dependency-on-certified.patch
@@ -0,0 +1,31 @@
+From 8e7bd5a8b95e06568af75f3268529434ea989b2b Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Mon, 27 Mar 2023 11:18:37 +0200
+Subject: [PATCH] Drop dependency on certified
+
+--- a/kramdown-rfc2629.gemspec
++++ b/kramdown-rfc2629.gemspec
+@@ -6,7 +6,6 @@ spec = Gem::Specification.new do |s|
+ "kramdown" markdown parser.  Mostly useful for RFC writers.}
+   s.add_dependency('kramdown', '~> 2.4.0')
+   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')
+--- a/lib/kramdown-rfc/command.rb
++++ b/lib/kramdown-rfc/command.rb
+@@ -134,9 +134,7 @@ def do_the_tls_dance
+       warn "** Configuration problem with OpenSSL certificate store."
+       warn "**   You may want to examine #{OpenSSL::X509::DEFAULT_CERT_FILE}"
+       warn "**    and #{OpenSSL::X509::DEFAULT_CERT_DIR}."
+-      warn "**   Activating suboptimal workaround."
+-      warn "**   Occasionally run `certified-update` to maintain that workaround."
+-      require 'certified'
++      exit 1
+     end
+   end
+ end
+-- 
+2.39.2
+
diff --git a/app-text/kramdown-rfc/files/kramdown-rfc-1.6.27-Remove-bin-echars.patch b/app-text/kramdown-rfc/files/kramdown-rfc-1.6.27-Remove-bin-echars.patch
new file mode 100644
index 000000000000..a708c2845c8b
--- /dev/null
+++ b/app-text/kramdown-rfc/files/kramdown-rfc-1.6.27-Remove-bin-echars.patch
@@ -0,0 +1,27 @@
+From fb735bb60e3bbfc14a9b38fe57c0cdfef48e15ab Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@geekplace.eu>
+Date: Mon, 27 Mar 2023 11:26:09 +0200
+Subject: [PATCH] Remove bin/echars
+
+--- a/kramdown-rfc2629.gemspec
++++ b/kramdown-rfc2629.gemspec
+@@ -7,14 +7,10 @@ spec = Gem::Specification.new do |s|
+   s.add_dependency('kramdown', '~> 2.4.0')
+   s.add_dependency('kramdown-parser-gfm', '~> 1.1')
+   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 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)
++  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 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)
+   s.require_path = 'lib'
+-  s.executables = ['kramdown-rfc', 'kramdown-rfc2629', 'doilit', 'echars',
++  s.executables = ['kramdown-rfc', 'kramdown-rfc2629', 'doilit',
+                    'kramdown-rfc-extract-markdown',
+                    'kdrfc', 'kramdown-rfc-cache-i-d-bibxml',
+                    'kramdown-rfc-cache-subseries-bibxml',
+-- 
+2.39.2
+
diff --git a/app-text/kramdown-rfc/kramdown-rfc-1.6.17.ebuild b/app-text/kramdown-rfc/kramdown-rfc-1.6.17.ebuild
deleted file mode 100644
index 3156d56315c1..000000000000
--- a/app-text/kramdown-rfc/kramdown-rfc-1.6.17.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-# 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"
-
-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"
-
-ruby_add_rdepend "
-	>=dev-ruby/certified-1.0.0
-	>=dev-ruby/json-2.0.0
-	>=dev-ruby/kramdown-2.4.0
-	>=dev-ruby/kramdown-parser-gfm-1.1.0
-"
-
-all_ruby_prepare() {
-	sed -i 's/json_pure/json/' ../metadata || die
-}
diff --git a/app-text/kramdown-rfc/kramdown-rfc-1.6.22.ebuild b/app-text/kramdown-rfc/kramdown-rfc-1.6.22.ebuild
deleted file mode 100644
index f1767b5f8329..000000000000
--- a/app-text/kramdown-rfc/kramdown-rfc-1.6.22.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby26 ruby27"
-
-# 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"
-
-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"
-
-ruby_add_rdepend "
-	>=dev-ruby/certified-1.0.0
-	>=dev-ruby/json-2.0.0
-	>=dev-ruby/kramdown-2.4.0
-	>=dev-ruby/kramdown-parser-gfm-1.1.0
-"
-
-all_ruby_prepare() {
-	sed -i 's/json_pure/json/' ../metadata || die
-}
diff --git a/app-text/kramdown-rfc/kramdown-rfc-1.6.21.ebuild b/app-text/kramdown-rfc/kramdown-rfc-1.6.27.ebuild
index f1767b5f8329..1a51309bea51 100644
--- a/app-text/kramdown-rfc/kramdown-rfc-1.6.21.ebuild
+++ b/app-text/kramdown-rfc/kramdown-rfc-1.6.27.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby30"
 
 # The software got renamed from kramdown-rfc2629 to kramdown-rfc,
 # however the gem coordinate is still kramdown-rfc2629.
@@ -11,6 +11,9 @@ 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
 
@@ -21,13 +24,18 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.27-Drop-dependency-on-certified.patch
+	"${FILESDIR}"/${PN}-1.6.27-Remove-bin-echars.patch
+)
+
 ruby_add_rdepend "
-	>=dev-ruby/certified-1.0.0
 	>=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/' ../metadata || die
+	sed -i 's/json_pure/json/' "${RUBY_FAKEGEM_GEMSPEC}" || die
 }