9 files changed, 111 insertions, 10 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 6dee0257a780..91745f3501d3 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/discount/Manifest b/app-text/discount/Manifest
index 8731499a2623..da4563a8db2e 100644
--- a/app-text/discount/Manifest
+++ b/app-text/discount/Manifest
@@ -1,5 +1,7 @@
 DIST discount-2.2.7b.tar.bz2 102685 BLAKE2B 1af4d47248e4a65ea1517b03d0b1a0b15eb79bdb7d1f00779515e2a1113b2a923f5d9e5d0a93d63cfc6c7257f11d3825d9baa55c7f2252fe3d2513785ab67ae3 SHA512 d68ffb85ae3e6d6ce8a2e506609bd4cb042617e350d113dd632a1ed81adb0b076df75ca4e70e97d43f3a3a2907555a9f28087a3762f41806289c526af3c55806
-DIST discount-3.0.0a_p20230126.tar.gz 140311 BLAKE2B 26858c25506dfd68f20d988ca425c0153887bae9574fa3b90b36bc97d90d78e58a4e43cc08ec4a91382015ec7f9e605eb743e98353a8029adcfad5ffb63c948e SHA512 888fc6fd530d1ae970d9b376243f2628113bce847855cfb595a174f7cb6f1bdb55939f686cc65b3b6e3ed4aa1a9b54db77c2c842e4b045ffb69304eb39a15899
+DIST discount-2.2.7c.tar.gz 133282 BLAKE2B 3258cfa34d58ef5944ae5282f6df061b8183bccc1ca7f9f3a39b3c001a8b86a4deb86b80d109d937e334b2773e5065a0f6c212ac7a79317ce2ae665778a023e2 SHA512 2a959fb24d7291b3a8c6d659b5c904b8c2f8b6d9b0666e998ca5313533cc25898b9c2114f7922272f3bc6b9bfe4bc486fe08c620b4cb2a2282624e128dc92781
+DIST discount-3.0.0a.tar.gz 140250 BLAKE2B 1e89f9c58c4d90157a9ccd925b89f098538c93191937e86eeefd32810e937feb78b6eeab96aead029fc35e4bf6699a40f67bdceb3c2d70fdc645fcd14091a3e7 SHA512 d86bfc6d3e11131622046418a1f54bd9dfa5f1233e510189cd2c89dc857da31e88ffbe6670cc506ca8b9763e8fb74ed215f1018f83e25767c77acb8a7c296b8a
 EBUILD discount-2.2.7b.ebuild 1652 BLAKE2B a55d28855b085b98046b7a5fc96c2444b6b6bd3ff788d52d4f0295c583da5aa4e69c9c1f2e48c08db88d2d16bb41f8a9311327dd5e61f746eaa5ad211d2d9d09 SHA512 76a08e533fbe813ae67e9214afa28be89fefba084ed5ad6476ba18c21bb4f88ced2b5a8c3f1813b003cb54c924363e6243e20f189e4fb7f1bbb1a90ae80ae0c1
-EBUILD discount-3.0.0a_p20230126.ebuild 1750 BLAKE2B 6da10ab18e0137972c0cfbf664b6144efc817d3269af089b7be89e01565ef04161e6a1a0bf5cb486dd68bcc3667d567faf29070f417977af740d3a033fce71ba SHA512 16f159317d3c96daa0bbdbff7eb1c9a1389e371dc4050dda0734fa13b20d51804a8d86b36367d8be4e76de63caa54a3f20056194114715d20866fe78aa2f0148
+EBUILD discount-2.2.7c.ebuild 1667 BLAKE2B b3edb96a39e67ad127bc2adf1327b4209d349649deee6f1c3846bde033e83de1283a3a30e46f919aedf41f28729634c64c9cec18dfe45c9b01f4f5c8ff3e29af SHA512 3dc83001bc31556bea852484a1f282f01fe0e29701b173895da2ecb0a37c780ab8a9f2a0bd133e996699c69a0c7e3bd84f17f7acfdd9a16fc81399e98078f9d6
+EBUILD discount-3.0.0a.ebuild 1667 BLAKE2B bafdb06df50ca341f6f40c8c0567c4a2032587546da1a286ed84a439d3ad98689494f84e478b0649034018b864ab6043a7e7e91b1c39f4c4f008d91cc4ceb7ee SHA512 844df1f7aba5a69316bb9e93da213869840c8bb1d0357f20d5499381800cfec8882d643759769799d1a58b92d22050eb5f5e0f053dd0d55607a9df4dc710ef6c
 MISC metadata.xml 322 BLAKE2B 579c1b4246170535bd97f123753663f46b753605fb7c90fe7ccb840fa2cd68264ad3b8c88641188e09d4b1ffba3db4658a510b39de48a99248c9bd356e941de0 SHA512 1ea9b286478e3b2aa48988c63fc275916eba1dabf1d589d14bf3ef1b8c266d0d6c8729076b5a4c89579de816289a82d32ad28e6a1b5b89902f57870f9da89c57
diff --git a/app-text/discount/discount-2.2.7c.ebuild b/app-text/discount/discount-2.2.7c.ebuild
new file mode 100644
index 000000000000..6472ea525508
--- /dev/null
+++ b/app-text/discount/discount-2.2.7c.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="A Markdown-to HTML translator written in C"
+HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/discount/"
+SRC_URI="https://github.com/Orc/discount/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/2.2.7"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="minimal test"
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	default
+
+	# for QA, we remove the Makefile’s usage of install -s.
+	# Drop ldconfig invocation.
+	# Force “librarian.sh” to respect LDFLAGS ($FLAGS should have CFLAGS
+	# at that point).
+	sed -i \
+		-e '/INSTALL_PROGRAM/s,\$_strip ,,' \
+		-e 's/\(LDCONFIG=\).*/\1:/' \
+		-e 's/\(.\)\$FLAGS/& \1$LDFLAGS/' \
+		configure.inc || die "sed configure.inc failed"
+}
+
+src_configure() {
+	local configure_call=(
+		./configure.sh
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--prefix="${EPREFIX}/usr"
+		--mandir="${EPREFIX}/usr/share/man"
+		--shared
+		--pkg-config
+		$(usex minimal '' --enable-all-features)
+		# Enable deterministic HTML generation behavior. Otherwise, will
+		# actually call rand() as part of its serialization code...
+		--debian-glitch
+	)
+	einfo "Running ${configure_call[@]}"
+	CC="$(tc-getCC)" AR="$(tc-getAR)" \
+	"${configure_call[@]}" || die
+}
+
+src_compile() {
+	emake libmarkdown
+	emake
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		$(usex minimal install install.everything) \
+		SAMPLE_PFX="${PN}-"
+}
+
+pkg_postinst() {
+	if ! use minimal; then
+		elog 'Sample binaries with overly-generic names have been'
+		elog "prefixed with \"${PN}-\"."
+	fi
+}
diff --git a/app-text/discount/discount-3.0.0a_p20230126.ebuild b/app-text/discount/discount-3.0.0a.ebuild
index 511c1685a741..4da7a0c94b27 100644
--- a/app-text/discount/discount-3.0.0a_p20230126.ebuild
+++ b/app-text/discount/discount-3.0.0a.ebuild
@@ -2,13 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-COMMIT=5d13c2828da3567210b370bfd8555fdcf01d70bd
 
 inherit toolchain-funcs
 
 DESCRIPTION="A Markdown-to HTML translator written in C"
 HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/discount/"
-SRC_URI="https://github.com/Orc/discount/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/Orc/discount/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/3.0.0"
@@ -16,8 +15,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="minimal test"
 RESTRICT="!test? ( test )"
 
-S="${WORKDIR}/${PN}-${COMMIT}"
-
 src_prepare() {
 	default
 
diff --git a/app-text/foliate/Manifest b/app-text/foliate/Manifest
index c4d6ed33e5e1..b1f0f84fd765 100644
--- a/app-text/foliate/Manifest
+++ b/app-text/foliate/Manifest
@@ -1,3 +1,3 @@
 DIST foliate-2.6.4.tar.gz 4824560 BLAKE2B fd109d76a7cd0cfbff3fb7273b232a7c749922c5e4d782ed4b7dcb63e914a7cc0bd6e7623a509c3117e45ead5c1d7538c57f322742e4e826b88bddc6182abdf1 SHA512 af58efa2c33451617dbf7327b56551557d762ac80f1b489d5da1c5a46ebbfe329052149deb8b2f4c7729a7fd46deccd5500fd96c0a662b731c871c1ad8061cd3
-EBUILD foliate-2.6.4-r1.ebuild 1209 BLAKE2B 003e9d975328851c66d26c1cbf2b9e75be627ef7642e5df7ac1bca8ef9dd10a702b13cf545c65b50316b17f52db71e02fdab4ed88db9cfc145fb13ac07e1252b SHA512 032a72c8657e6c04bd92570163740e7fcc0a82122bc0f886d919fccfc07dbae33dbb6519ed43212b2a82b634c055b90e2b8cf8896e5bb24c2e112ff40ca38814
+EBUILD foliate-2.6.4-r2.ebuild 1209 BLAKE2B bfca831829a675d16b39a27a3a1449431cdb206b7609625df542e7c50d57c682065456e75cdee11126d8c4fbf1ae275b616349792bdfd5c332fa574c3e825285 SHA512 b9f37500296ac30323f85e8d42038438c4f5dc9cc11f6250548d3923a21d96c71e6917b02259a5de62a6585b02b1d46eca2bdbea7d03577b8de5c7fc789e4ffc
 MISC metadata.xml 607 BLAKE2B ab5cffaca496e55fe6c7cce465104fe2c0010d4ef6110c816575944d7f48ae94d834ac61430e1c722daca0ceb739fdb4e2ad35b2afef010675726aea967d2ea2 SHA512 7e1d53bcd78408d6ef3803871d131beced46b118555d7daf0ccc0abf6233d3892568ca3264f1b123f20524d56600cb162c53057fb38a0811571a98ca0051573b
diff --git a/app-text/foliate/foliate-2.6.4-r1.ebuild b/app-text/foliate/foliate-2.6.4-r2.ebuild
index c312e1cf5ca6..55777f866399 100644
--- a/app-text/foliate/foliate-2.6.4-r1.ebuild
+++ b/app-text/foliate/foliate-2.6.4-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 PLOCALES="cs de es eu fr id ie it ko nb nl nn pt_BR ru sv tr uk zh_CN zh_TW"
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 inherit meson python-any-r1 plocale xdg gnome2-utils
 SRC_URI="https://github.com/johnfactotum/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 DESCRIPTION="gtk ebook reader built with gjs"
diff --git a/app-text/kramdown-rfc/Manifest b/app-text/kramdown-rfc/Manifest
index ea6137b0288f..3b38010e0c50 100644
--- a/app-text/kramdown-rfc/Manifest
+++ b/app-text/kramdown-rfc/Manifest
@@ -1,7 +1,9 @@
 DIST kramdown-rfc2629-1.6.17.gem 55808 BLAKE2B 7b3d8359eab9dc9ac9a2beeba74c541a75a9d92418f8f2f16798fb893a45c8347d4c51f11eb9d3032adae71324c5c67a0dcd809c8be06acd831a3615759f3b55 SHA512 e2284db908fa1ef5aa9b36ff6868b11d87a7e6622dce3c540878661eae837b378ed913af12df35d86b5cc8c233ae55e3ad981471390717b2ead3fcd0f3ca781e
 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
-EBUILD kramdown-rfc-1.6.18.ebuild 801 BLAKE2B 2f869d5764d422b78b5fecc1a783fd7dc9ae25bdd7f316b6c802219c0691e6ff421bb0e38435e29af05fa6faf9b063250f5e4c642e66c572e3dde6e62fda5b7c SHA512 67fbe46e9df881089c67da95271ed39223ed97973da4c2221658b7b831192adf07d32978279a6ab89fad77a4cce702444b164d0f5a3015a54ffa1aee356e3ed7
+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
 MISC metadata.xml 329 BLAKE2B 9185c25e51c2e8b627f4b429b3b9de5c751e05fe6d78831704f32811ec9962e7f05f057c6c8e68bbcf58b95b7f791357cc3ae4598f49e3e073063994bcd30e95 SHA512 8638caf7ae842a1cffccea4795d4769ec20a56107721b5a401bf430151c682332adee04fb1bc551d1ce4de875572a356b1f4bce0dad435c4c7bc4f91c686b9ff
diff --git a/app-text/kramdown-rfc/kramdown-rfc-1.6.18.ebuild b/app-text/kramdown-rfc/kramdown-rfc-1.6.18.ebuild
index f1767b5f8329..554ab06bc4c8 100644
--- a/app-text/kramdown-rfc/kramdown-rfc-1.6.18.ebuild
+++ b/app-text/kramdown-rfc/kramdown-rfc-1.6.18.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://github.com/cabo/kramdown-rfc"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 ruby_add_rdepend "
 	>=dev-ruby/certified-1.0.0
diff --git a/app-text/kramdown-rfc/kramdown-rfc-1.6.22.ebuild b/app-text/kramdown-rfc/kramdown-rfc-1.6.22.ebuild
new file mode 100644
index 000000000000..f1767b5f8329
--- /dev/null
+++ b/app-text/kramdown-rfc/kramdown-rfc-1.6.22.ebuild
@@ -0,0 +1,33 @@
+# 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
+}