10 files changed, 132 insertions, 615 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index bad4cab867d2..8128306b9056 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index ab785a6b719e..525ea65d298a 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,3 +1,5 @@
 DIST iso-codes-v4.12.0.tar.gz 14977180 BLAKE2B 23590e9a4f246a0879e68c521ae7f72f4dd8d41ef85e7b6efaa4e4a29b7bf2e45d5e200ae14523e4ef8d3d4c8f45e783d4231a2a1c679be1898aa04528da30d3 SHA512 d0cdac626728e4de7c5bb2f8edd968a29380d49ba2b43ebe3820756591e46d4301859da7961ec9fc9e6832e18a9a0d5562ec02dd3d8a52bec7f7cbfc3190869e
+DIST iso-codes-v4.13.0.tar.gz 14990054 BLAKE2B e9e9a166675c09ecfe62da92608e91d4d6aeb53306e6162ea432bba418d074ef54cf510071aae6407bdc1fe59c295e52e2c7862e0d5b8962f467834c117f4912 SHA512 fd180b8462eb1ee2fd49bc144fd8b1b866067512a5deec3f580689641c596f623a11f0384e8c05cb48de520e1ce7c0270a649ef37542ba51f93e244b45bc5bba
 EBUILD iso-codes-4.12.0.ebuild 2650 BLAKE2B 488a6d6160722ee9b5e597bbf314ee420874b3fca46e7745f93383268da95c4680bcdb2024ce18e1f7380f103a5435f7431c75619c9d018180fdb97189a05bbe SHA512 ba0a30ce7ae5cbcb12b11ca0a1671c1f065c4d871db44c420716a20167f2cdb3fd4933b9405b9839177a456d28a56118bb29e16023b28b8e7bd4ca7ae74492a6
+EBUILD iso-codes-4.13.0.ebuild 2657 BLAKE2B 4e06e84be6ae2dcce8d5210bdbec62703fc218b5e59d4ff6abf6cdf58be9c2b724e09c5a21ee37dcd3a6c9c24c8c0fc13ec3983883a61193bc3f9e5eb81ee96a SHA512 cc47b6c8dcc2fd86d204d8fbd1b6afac492a8729d0de4e27337fb7036e57d01c07d7c5683ad1618779a22880d7af41532f65903547b7b00ee2c51df903ca95f3
 MISC metadata.xml 481 BLAKE2B e19ee7de8b2de3aa09f97bb7eb4247ba2979614d768c0dd92a8cc131269e46a560baa1c0ea8fcceb49073efb1b890cd54d939c16ac7412413983a19083f05337 SHA512 f1e20f870fabd59d97ca612c3db3443a6a1544de3b03f12fe0c9c44a1740b06bf38c394b489738e60b22fa0797379d24c0ec8371efa067873910ba39fe30f194
diff --git a/app-text/iso-codes/iso-codes-4.13.0.ebuild b/app-text/iso-codes/iso-codes-4.13.0.ebuild
new file mode 100644
index 000000000000..2cb3270120b4
--- /dev/null
+++ b/app-text/iso-codes/iso-codes-4.13.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+PLOCALES="ab ace ach af ak am an ar as ast ay az ba bar be bg bi bn bn_BD bn_IN br bs byn ca ce ch chr ckb crh cs csb cv cy da de dv dz ee el en eo es et eu fa ff fi fil fo fr frp fur fy ga gez gl gn gu gv ha haw he hi hr ht hu hy ia id io is it iu ja jam ka kab ki kk kl km kmr kn ko kok kv kw ky lo lt lv mai mhr mi mk ml mn mo mr ms mt my na nah nb nb_NO ne nl nn nso nv oc or pa pa_PK pap pi pl ps pt pt_BR ro ru rw sc sd si sk sl so son sq sr sr@latin sv sw ta te tg th ti tig tk tl tr tt tt@iqtelif tzm ug uk ur uz ve vi wa wal wo xh yo zh_CN zh_HK zh_Hans zh_Hant zh_TW zu"
+
+inherit python-any-r1
+
+DESCRIPTION="ISO language, territory, currency, script codes and their translations"
+HOMEPAGE="https://salsa.debian.org/iso-codes-team/iso-codes"
+SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+
+BDEPEND="${PYTHON_DEPS}
+	sys-devel/gettext
+"
+S="${WORKDIR}/${PN}-v${PV}"
+
+# This ebuild does not install any binaries.
+RESTRICT="binchecks strip"
+
+DOCS=( CHANGELOG.md README.md )
+
+# plocale_find_changes doesn't support multiple directories,
+# so need to do the update scan ourselves.
+check_existing_locales() {
+	local std loc all_locales=()
+
+	ebegin "Looking for new locales"
+	for std in "${all_stds[@]}"; do
+		pushd "${std}" >/dev/null || die
+		for loc in *.po; do
+			all_locales+=( "${loc%.po}" )
+		done
+		popd >/dev/null
+	done
+
+	all_locales=$(echo $(printf '%s\n' "${all_locales[@]}" | LC_COLLATE=C sort -u))
+	if [[ ${PLOCALES} != "${all_locales}" ]]; then
+		eend 1
+		eerror "There are changes in locales! This ebuild should be updated to:"
+		eerror "PLOCALES=\"${all_locales}\""
+		die "Update PLOCALES in the ebuild"
+	else
+		eend 0
+	fi
+}
+
+src_prepare() {
+	default
+
+	local std loc mylinguas
+	local all_stds=( iso_15924 iso_3166-{1,2,3} iso_4217 iso_639-{2,3,5} )
+
+	check_existing_locales
+
+	# Modify the Makefiles so they only install requested locales.
+	for std in "${all_stds[@]}"; do
+		einfo "Preparing ${std} ..."
+		pushd "${std}" >/dev/null || die
+		mylinguas=()
+		for loc in *.po; do
+			if has ${loc%.po} ${LINGUAS-${loc%.po}}; then
+				mylinguas+=( "${loc}" )
+			fi
+		done
+
+		sed \
+			-e "/^pofiles =/s:=.*:= ${mylinguas[*]}:" \
+			-e "/^mofiles =/s:=.*:= ${mylinguas[*]/%.po/.mo}:" \
+			-i Makefile.am Makefile.in || die "sed in ${std} folder failed"
+		popd >/dev/null
+	done
+}
diff --git a/app-text/sword-modules/Manifest b/app-text/sword-modules/Manifest
deleted file mode 100644
index cc53be8d36af..000000000000
--- a/app-text/sword-modules/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD sword-modules-2.6.ebuild 12435 BLAKE2B 6dc6e6606090cbeb21e2596d79a5771459546af588746488b96138ebd48ff32228e4cd376b20b82aca262d64c438e5da0acd66a2fa4768f11313faae28eb9dfb SHA512 d2df9cc2c82a626ac9dce71afa050150b5e18dc47f0feff07577bb7011228c0202a2ee624403ce7685d3f063a6f61bf0eb861b438d63892bcfec340a90d54a0c
-MISC metadata.xml 386 BLAKE2B 29f6b56f1f9fe4d2334c284eb34d7eacb138e0bb6ff17c7f6f6135128717b79d14de832d94b8182fe3f7d5f2c35328abbe57a548d7708f78b4bfdd0e98d07620 SHA512 13ded949617bf697e0e3ab2891ae29f4b6fbb0b283295b13512d42bfb166eef6122eef10f616dd77f5ea82860027bbf67078968d0d4d9dc416f9dfbc62c3c1f3
diff --git a/app-text/sword-modules/metadata.xml b/app-text/sword-modules/metadata.xml
deleted file mode 100644
index 0f90da8d9af7..000000000000
--- a/app-text/sword-modules/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>marecki@gentoo.org</email>
-		<name>Marek Szuba</name>
-	</maintainer>
-	<stabilize-allarches/>
-	<use>
-		<flag name="esoteric">Install modules with no linguistic content, in unknown languages etc.</flag>
-	</use>
-</pkgmetadata>
diff --git a/app-text/sword-modules/sword-modules-2.6.ebuild b/app-text/sword-modules/sword-modules-2.6.ebuild
deleted file mode 100644
index 85a4aa416131..000000000000
--- a/app-text/sword-modules/sword-modules-2.6.ebuild
+++ /dev/null
@@ -1,583 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="All the unlocked modules for app-text/sword, grouped by language"
-HOMEPAGE="https://www.crosswire.org/sword/modules/"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="~amd64 ~loong ~ppc ~riscv ~x86"
-
-LANGS=" af ar az be bea bg br ceb ch chr ckb cop cs cu cy da de el en eo es et eu fa fi fr ga gd gez got grc gv he hi hr ht hu hy it ja kek kk km ko kpg ktu la ln lt lv mg mi ml mn my nb nd nl nn pl pon pot ppk prs pt rmq ro ru sl sml sn so sq sr sv sw syr th tl tlh tr tsg ug uk ur vi vls zh"
-IUSE="esoteric ${LANGS// / l10n_}"
-
-RDEPEND="
-	|| ( app-dicts/sword-Eusebian_num app-dicts/sword-Eusebian_vs )
-	app-dicts/sword-Personal
-	esoteric? (
-		app-dicts/sword-Phaistos
-		app-dicts/sword-Sentiment
-	)
-	l10n_af? (
-		app-dicts/sword-Afr1953
-	)
-	l10n_ar? (
-		app-dicts/sword-AraNAV
-		app-dicts/sword-AraSVD
-		app-dicts/sword-alzat
-	)
-	l10n_az? (
-		app-dicts/sword-Azeri
-		app-dicts/sword-NorthernAzeri
-	)
-	l10n_be? (
-		app-dicts/sword-Bela
-	)
-	l10n_bea? (
-		app-dicts/sword-BeaMRK
-	)
-	l10n_bg? (
-		app-dicts/sword-BulCarigradNT
-		app-dicts/sword-BulVeren
-	)
-	l10n_br? (
-		app-dicts/sword-BretonNT
-		app-dicts/sword-br_en
-	)
-	l10n_ceb? (
-		app-dicts/sword-CebPinadayag
-	)
-	l10n_ch? (
-		app-dicts/sword-Chamorro
-	)
-	l10n_chr? (
-		app-dicts/sword-Che1860
-	)
-	l10n_ckb? (
-		app-dicts/sword-Sorani
-	)
-	l10n_cop? (
-		app-dicts/sword-CopNT
-		app-dicts/sword-CopSahBible2
-		app-dicts/sword-CopSahHorner
-		app-dicts/sword-CopSahidicMSS
-		app-dicts/sword-CopSahidica
-		app-dicts/sword-SahidicBible
-	)
-	l10n_cs? (
-		app-dicts/sword-CzeB21
-		app-dicts/sword-CzeBKR
-		app-dicts/sword-CzeCEP
-		app-dicts/sword-CzeCSP
-	)
-	l10n_cu? (
-		app-dicts/sword-CSlElizabeth
-	)
-	l10n_cy? (
-		app-dicts/sword-WelBeiblNet
-	)
-	l10n_da? (
-		app-dicts/sword-DaNT1819
-		app-dicts/sword-DaOT1871NT1907
-		app-dicts/sword-DaOT1931NT1907
-	)
-	l10n_de? (
-		app-dicts/sword-GerAlbrecht
-		app-dicts/sword-GerAugustinus
-		app-dicts/sword-GerBoLut
-		app-dicts/sword-GerElb1871
-		app-dicts/sword-GerElb1905
-		app-dicts/sword-GerGruenewald
-		app-dicts/sword-GerKingComm
-		app-dicts/sword-GerLeoNA28
-		app-dicts/sword-GerLeoRP18
-		app-dicts/sword-GerLutherpredigten
-		app-dicts/sword-GerMenge
-		app-dicts/sword-GerNeUe
-		app-dicts/sword-GerOffBiSt
-		app-dicts/sword-GerReinhardt
-		app-dicts/sword-GerSch
-		app-dicts/sword-GerTafel
-		app-dicts/sword-GerTextbibel
-		app-dicts/sword-GerZurcher
-		app-dicts/sword-MAK
-		app-dicts/sword-Rieger
-	)
-	l10n_el? (
-		app-dicts/sword-GreVamvas
-	)
-	l10n_en? (
-		app-dicts/sword-2BabDict
-		app-dicts/sword-AB
-		app-dicts/sword-ABP
-		app-dicts/sword-ABS_Essay_GoodSam_SWB
-		app-dicts/sword-ACV
-		app-dicts/sword-AKJV
-		app-dicts/sword-ASV
-		app-dicts/sword-Abbott
-		app-dicts/sword-AbbottSmith
-		app-dicts/sword-AbbottSmithStrongs
-		app-dicts/sword-AmTract
-		app-dicts/sword-Anderson
-		app-dicts/sword-BBE
-		app-dicts/sword-BDBGlosses_Strongs
-		app-dicts/sword-BWE
-		app-dicts/sword-BaptistConfession1646
-		app-dicts/sword-BaptistConfession1689
-		app-dicts/sword-Barnes
-		app-dicts/sword-Burkitt
-		app-dicts/sword-CBC
-		app-dicts/sword-CPDV
-		app-dicts/sword-Catena
-		app-dicts/sword-Cawdrey
-		app-dicts/sword-Clarke
-		app-dicts/sword-Common
-		app-dicts/sword-Concord
-		app-dicts/sword-DBD
-		app-dicts/sword-DRC
-		app-dicts/sword-DTN
-		app-dicts/sword-Daily
-		app-dicts/sword-Darby
-		app-dicts/sword-DarkNightOfTheSoul
-		app-dicts/sword-Diaglott
-		app-dicts/sword-Dodson
-		app-dicts/sword-EMBReality
-		app-dicts/sword-EMTV
-		app-dicts/sword-Easton
-		app-dicts/sword-Etheridge
-		app-dicts/sword-Family
-		app-dicts/sword-Finney
-		app-dicts/sword-Geneva
-		app-dicts/sword-Geneva1599
-		app-dicts/sword-Godbey
-		app-dicts/sword-GodsWord
-		app-dicts/sword-Heretics
-		app-dicts/sword-Hitchcock
-		app-dicts/sword-ISBE
-		app-dicts/sword-ISV
-		app-dicts/sword-Imitation
-		app-dicts/sword-Institutes
-		app-dicts/sword-JCRHoliness
-		app-dicts/sword-JEAffections
-		app-dicts/sword-JESermons
-		app-dicts/sword-JFB
-		app-dicts/sword-JOChrist
-		app-dicts/sword-JOCommGod
-		app-dicts/sword-JOGlory
-		app-dicts/sword-JOMortSin
-		app-dicts/sword-JPS
-		app-dicts/sword-JST
-		app-dicts/sword-Josephus
-		app-dicts/sword-Jubilee2000
-		app-dicts/sword-KD
-		app-dicts/sword-KJV
-		app-dicts/sword-KJVA
-		app-dicts/sword-KJVPCE
-		app-dicts/sword-KingComm
-		app-dicts/sword-LEB
-		app-dicts/sword-LITV
-		app-dicts/sword-LO
-		app-dicts/sword-LawGospel
-		app-dicts/sword-Leeser
-		app-dicts/sword-Lightfoot
-		app-dicts/sword-Luther
-		app-dicts/sword-MHC
-		app-dicts/sword-MHCC
-		app-dicts/sword-MKJV
-		app-dicts/sword-MLStrong
-		app-dicts/sword-MollColossians
-		app-dicts/sword-Montgomery
-		app-dicts/sword-Murdock
-		app-dicts/sword-NETfree
-		app-dicts/sword-NETnotesfree
-		app-dicts/sword-NETtext
-		app-dicts/sword-NHEB
-		app-dicts/sword-NHEBJE
-		app-dicts/sword-NHEBME
-		app-dicts/sword-Nave
-		app-dicts/sword-Noyes
-		app-dicts/sword-OEB
-		app-dicts/sword-OEBcth
-		app-dicts/sword-OSHM
-		app-dicts/sword-OrthJBC
-		app-dicts/sword-Orthodoxy
-		app-dicts/sword-PNT
-		app-dicts/sword-Packard
-		app-dicts/sword-Passion
-		app-dicts/sword-Pilgrim
-		app-dicts/sword-Practice
-		app-dicts/sword-QuotingPassages
-		app-dicts/sword-RKJNT
-		app-dicts/sword-RNKJV
-		app-dicts/sword-RWP
-		app-dicts/sword-RWebster
-		app-dicts/sword-RecVer
-		app-dicts/sword-Robinson
-		app-dicts/sword-Rotherham
-		app-dicts/sword-SAOA
-		app-dicts/sword-SME
-		app-dicts/sword-SPE
-		app-dicts/sword-Scofield
-		app-dicts/sword-Smith
-		app-dicts/sword-Spurious
-		app-dicts/sword-StrongsGreek
-		app-dicts/sword-StrongsHebrew
-		app-dicts/sword-TCR
-		app-dicts/sword-TDavid
-		app-dicts/sword-TFG
-		app-dicts/sword-TSK
-		app-dicts/sword-Torrey
-		app-dicts/sword-Twenty
-		app-dicts/sword-Tyndale
-		app-dicts/sword-UKJV
-		app-dicts/sword-Webster
-		app-dicts/sword-Webster1806
-		app-dicts/sword-Webster1913
-		app-dicts/sword-Wesley
-		app-dicts/sword-Westminster
-		app-dicts/sword-Westminster21
-		app-dicts/sword-Weymouth
-		app-dicts/sword-Worsley
-		app-dicts/sword-Wycliffe
-		app-dicts/sword-YLT
-	)
-	l10n_eo? (
-		app-dicts/sword-Esperanto
-	)
-	l10n_es? (
-		app-dicts/sword-SpaPlatense
-		app-dicts/sword-SpaRV
-		app-dicts/sword-SpaRV1865
-		app-dicts/sword-SpaRV1909
-		app-dicts/sword-SpaRVG
-		app-dicts/sword-SpaTDP
-		app-dicts/sword-SpaVNT
-	)
-	l10n_et? (
-		app-dicts/sword-Est
-	)
-	l10n_eu? (
-		app-dicts/sword-BasHautin
-		app-dicts/sword-en_eu
-	)
-	l10n_fa? (
-		app-dicts/sword-FarHezareNoh
-		app-dicts/sword-FarOPV
-		app-dicts/sword-FarTPV
-	)
-	l10n_fi? (
-		app-dicts/sword-FinBiblia
-		app-dicts/sword-FinPR
-		app-dicts/sword-FinPR92
-		app-dicts/sword-FinRK
-		app-dicts/sword-FinSTLK2017
-	)
-	l10n_fr? (
-		app-dicts/sword-FreAug
-		app-dicts/sword-FreBBB
-		app-dicts/sword-FreBDM1707
-		app-dicts/sword-FreBDM1744
-		app-dicts/sword-FreBailly
-		app-dicts/sword-FreCJE
-		app-dicts/sword-FreChry
-		app-dicts/sword-FreCrampon
-		app-dicts/sword-FreDAW
-		app-dicts/sword-FreGBM
-		app-dicts/sword-FreGeneve1669
-		app-dicts/sword-FreJND
-		app-dicts/sword-FreKhan
-		app-dicts/sword-FreLSN1872
-		app-dicts/sword-FreLXX
-		app-dicts/sword-FreOltramare1874
-		app-dicts/sword-FrePGR
-		app-dicts/sword-FrePilgrim
-		app-dicts/sword-FreSegond1910
-		app-dicts/sword-FreStapfer1889
-		app-dicts/sword-FreSynodale1921
-	)
-	l10n_ga? (
-		app-dicts/sword-IriODomhnuill
-	)
-	l10n_gd? (
-		app-dicts/sword-ScotsGaelic
-	)
-	l10n_gez? (
-		app-dicts/sword-Geez
-	)
-	l10n_got? (
-		app-dicts/sword-Wulfila
-	)
-	l10n_grc? (
-		app-dicts/sword-ABPGRK
-		app-dicts/sword-Antoniades
-		app-dicts/sword-Byz
-		app-dicts/sword-Elzevir
-		app-dicts/sword-GreekHebrew
-		app-dicts/sword-LXX
-		app-dicts/sword-MorphGNT
-		app-dicts/sword-Nestle1904
-		app-dicts/sword-OxfordTR
-		app-dicts/sword-SBLGNT
-		app-dicts/sword-SBLGNTApp
-		app-dicts/sword-TNT
-		app-dicts/sword-TR
-		app-dicts/sword-Tisch
-		app-dicts/sword-VarApp
-		app-dicts/sword-WHNU
-		app-dicts/sword-f35
-	)
-	l10n_gv? (
-		app-dicts/sword-ManxGaelic
-	)
-	l10n_he? (
-		app-dicts/sword-Aleppo
-		app-dicts/sword-HebDelitzsch
-		app-dicts/sword-HebModern
-		app-dicts/sword-HebrewGreek
-		app-dicts/sword-MapM
-		app-dicts/sword-OSHB
-		app-dicts/sword-SP
-		app-dicts/sword-SPDSS
-		app-dicts/sword-SPMT
-		app-dicts/sword-SPVar
-		app-dicts/sword-WLC
-	)
-	l10n_hi? (
-		app-dicts/sword-HinERV
-	)
-	l10n_hr? (
-		app-dicts/sword-CroSaric
-	)
-	l10n_ht? (
-		app-dicts/sword-Haitian
-	)
-	l10n_hu? (
-		app-dicts/sword-HunIMIT
-		app-dicts/sword-HunKNB
-		app-dicts/sword-HunKar
-		app-dicts/sword-HunRUF
-		app-dicts/sword-HunUj
-	)
-	l10n_hy? (
-		app-dicts/sword-ArmEastern
-		app-dicts/sword-ArmWestern
-	)
-	l10n_it? (
-		app-dicts/sword-ItDizGreco
-		app-dicts/sword-ItNomiBibbia
-		app-dicts/sword-ItaDio
-		app-dicts/sword-ItaRive
-	)
-	l10n_ja? (
-		app-dicts/sword-JapBungo
-		app-dicts/sword-JapDenmo
-		app-dicts/sword-JapKougo
-		app-dicts/sword-JapMeiji
-		app-dicts/sword-JapRaguet
-	)
-	l10n_kek? (
-		app-dicts/sword-Kekchi
-	)
-	l10n_kk? (
-		app-dicts/sword-Kaz
-	)
-	l10n_km? (
-		app-dicts/sword-KhmerNT
-	)
-	l10n_ko? (
-		app-dicts/sword-KorHKJV
-		app-dicts/sword-KorRV
-	)
-	l10n_kpg? (
-		app-dicts/sword-Kapingamarangi
-	)
-	l10n_ktu? (
-		app-dicts/sword-KtuVB
-	)
-	l10n_la? (
-		app-dicts/sword-VulgClementine
-		app-dicts/sword-VulgConte
-		app-dicts/sword-VulgGlossa
-		app-dicts/sword-VulgHetzenauer
-		app-dicts/sword-VulgSistine
-		app-dicts/sword-Vulgate
-		app-dicts/sword-Vulgate_HebPs
-		app-dicts/sword-la_en
-	)
-	l10n_ln? (
-		app-dicts/sword-LinVB
-	)
-	l10n_lt? (
-		app-dicts/sword-LtKBB
-	)
-	l10n_lv? (
-		app-dicts/sword-Latvian
-		app-dicts/sword-LvGluck8
-	)
-	l10n_mg? (
-		app-dicts/sword-Mg1865
-	)
-	l10n_mi? (
-		app-dicts/sword-Maori
-	)
-	l10n_ml? (
-		app-dicts/sword-Mal1910
-	)
-	l10n_mn? (
-		app-dicts/sword-MonKJV
-	)
-	l10n_my? (
-		app-dicts/sword-BurCBCM
-		app-dicts/sword-BurJudson
-	)
-	l10n_nb? (
-		app-dicts/sword-NorBroed
-		app-dicts/sword-Norsk
-	)
-	l10n_nd? (
-		app-dicts/sword-Ndebele
-	)
-	l10n_nl? (
-		app-dicts/sword-DutKant
-		app-dicts/sword-DutKingComm
-		app-dicts/sword-DutSVV
-		app-dicts/sword-DutSVVA
-		app-dicts/sword-NlCanisius1939
-	)
-	l10n_nn? (
-		app-dicts/sword-NorSMB
-	)
-	l10n_pl? (
-		app-dicts/sword-PolGdanska
-		app-dicts/sword-PolUGdanska
-	)
-	l10n_pon? (
-		app-dicts/sword-PohnOld
-		app-dicts/sword-Pohnpeian
-	)
-	l10n_pot? (
-		app-dicts/sword-PotLykins
-	)
-	l10n_ppk? (
-		app-dicts/sword-Uma
-	)
-	l10n_prs? (
-		app-dicts/sword-Dari
-	)
-	l10n_pt? (
-		app-dicts/sword-PorAR
-		app-dicts/sword-PorAlmeida1911
-		app-dicts/sword-PorBLivre
-		app-dicts/sword-PorBLivreTR
-		app-dicts/sword-PorCap
-		app-dicts/sword-PorIBP
-	)
-	l10n_rmq? (
-		app-dicts/sword-Calo
-	)
-	l10n_ro? (
-		app-dicts/sword-RomCor
-	)
-	l10n_ru? (
-		app-dicts/sword-RusCARS
-		app-dicts/sword-RusCARSA
-		app-dicts/sword-RusCARSADICT
-		app-dicts/sword-RusCARSDict
-		app-dicts/sword-RusCARST
-		app-dicts/sword-RusCARSTDICT
-		app-dicts/sword-RusMakarij
-		app-dicts/sword-RusSynodal
-		app-dicts/sword-RusSynodalLIO
-		app-dicts/sword-RusVZh
-	)
-	l10n_sl? (
-		app-dicts/sword-SloKJV
-		app-dicts/sword-SloOjacano
-		app-dicts/sword-SloStritar
-	)
-	l10n_sml? (
-		app-dicts/sword-sml_BL_2008
-	)
-	l10n_sn? (
-		app-dicts/sword-Shona
-	)
-	l10n_so? (
-		app-dicts/sword-SomKQA
-	)
-	l10n_sq? (
-		app-dicts/sword-Alb
-	)
-	l10n_sr? (
-		app-dicts/sword-SrKDEkavski
-		app-dicts/sword-SrKDIjekav
-	)
-	l10n_sv? (
-		app-dicts/sword-Swe1917
-		app-dicts/sword-Swe1917Of
-		app-dicts/sword-SweFolk1998
-		app-dicts/sword-SweKarlXII
-		app-dicts/sword-SweKarlXII1873
-	)
-	l10n_sw? (
-		app-dicts/sword-Swahili
-	)
-	l10n_syr? (
-		app-dicts/sword-Peshitta
-	)
-	l10n_th? (
-		app-dicts/sword-ThaiKJV
-	)
-	l10n_tl? (
-		app-dicts/sword-TagAngBiblia
-		app-dicts/sword-Tagalog
-	)
-	l10n_tlh? (
-		app-dicts/sword-KLV
-		app-dicts/sword-KLVen_iklingon
-		app-dicts/sword-KLViklingon_en
-	)
-	l10n_tr? (
-		app-dicts/sword-TurHADI
-		app-dicts/sword-TurNTB
-	)
-	l10n_tsg? (
-		app-dicts/sword-Tausug
-	)
-	l10n_ug? (
-		app-dicts/sword-UyCyr
-	)
-	l10n_uk? (
-		app-dicts/sword-UkrKulish
-		app-dicts/sword-Ukrainian
-	)
-	l10n_ur? (
-		app-dicts/sword-UrduGeo
-		app-dicts/sword-UrduGeoDeva
-		app-dicts/sword-UrduGeoRoman
-	)
-	l10n_vi? (
-		app-dicts/sword-FVDPVietAnh
-		app-dicts/sword-VieRobinson
-		app-dicts/sword-VieStrongsGreek
-		app-dicts/sword-Viet
-		app-dicts/sword-VietLCCMN
-		app-dicts/sword-VietLCCMNCT
-		app-dicts/sword-VietNVB
-	)
-	l10n_vls? (
-		app-dicts/sword-vlsJoNT
-	)
-	l10n_zh? (
-		app-dicts/sword-ChiNCVs
-		app-dicts/sword-ChiNCVt
-		app-dicts/sword-ChiSB
-		app-dicts/sword-ChiUn
-		app-dicts/sword-ChiUnL
-		app-dicts/sword-ChiUns
-		app-dicts/sword-ZhEnglish
-		app-dicts/sword-ZhHanzi
-		app-dicts/sword-ZhPinyin
-	)
-"
diff --git a/app-text/zathura-cb/Manifest b/app-text/zathura-cb/Manifest
index a00dceafdffa..d4cd2aa60686 100644
--- a/app-text/zathura-cb/Manifest
+++ b/app-text/zathura-cb/Manifest
@@ -1,4 +1,6 @@
+DIST zathura-cb-0.1.10.tar.xz 6300 BLAKE2B d541fb78f5ee52a22e58bb885103560bd544a9725cfe210f6b343e97429163a90dd0e9533e6c807134386e6f347bdd17cfc506ffe16642819eae4d1fd27c3b6e SHA512 b85894d052fda45933582299e8c3406413bcb47ed451d81f5906d7bfef94b169c59a57db8b37273c838381ffc7ba55205d714d2e2ec3b597371578a77e131029
 DIST zathura-cb-0.1.9.tar.xz 5848 BLAKE2B 665efbc8dc83585dc3a55a31d92b8ebdb92eba955aa8f5f74b7e055c096046ce4b1f02e2d2b06e73fe3351c1c113bfae298eade9a6ee34beec68c4d39b335da5 SHA512 5c45f112a077af53caec6fbdfc46ffdf20e9f923d97b69395e327cf05e131b3cd2db617d5650bc0cace0935719d8e68645230d7de9ddc1a8d4fbc01ede0f72cc
+EBUILD zathura-cb-0.1.10.ebuild 754 BLAKE2B 9ec95c5954bfccafdbcd282ef8532734b5c7617a079f5fb857e7ec6c2e6dd60c9fa94e4ebb13be203362d0113d52c1e5ae36644853b8a0eb63351b10d0263d70 SHA512 c3efb1e47eee5d760a14a229c781b5c149249129cdaae5da9fda28919c509f7cebf7995abfd76081ae632a275d080d0e8d740106421a83de7ce491133b6a0a5a
 EBUILD zathura-cb-0.1.9.ebuild 890 BLAKE2B deb04a042f3a225e5dd84d88268b71eb3ea6d379371dfcec2a710613112d93db5008f1af033a5c921cf39b90c3eab0cad618507355fbe8d87e9c6500feb0d7ef SHA512 c05e31dadcdbf15021e44cd2d6cf03321679e9f91f0a74940d5b98ca5e0529201ab2004f26f2a7a6c0b1ea13a821a5f97b4dbc165437261ad5996d360a86da14
-EBUILD zathura-cb-9999.ebuild 893 BLAKE2B 10d8d81684467fc0676cec24e554fbd204b9d58ce6df85d2ce9873d193a8aa89bc349afea4457546c11e02207b6e4a2bf1dff76c1202bf7f2284fd25850223d0 SHA512 284c23d10550e71915600ab7a7d6f491d2e97334ee7c0d51fe1f690a5c992f427202c0eb0de443be45695b03a11dafa331bef59b5c7c79cddcadea560f7303b7
-MISC metadata.xml 583 BLAKE2B ca246e0a76aa83c55397bb48f58b196e816b11fa1c873a49b21ebee38512566d377b23ea926377ae8a08325d8494e49a12aad7caa2b8a3a19a1342ab2f8178ce SHA512 81c6f5d849fd80dd4b226db01e97f34ce8ae6affafd6b680ae31130484859983f1f1c7eaa5abaec9ca9c225fe7a7b3ecd0481f44fc9861b8c488e3c0aba24166
+EBUILD zathura-cb-9999.ebuild 754 BLAKE2B 9ec95c5954bfccafdbcd282ef8532734b5c7617a079f5fb857e7ec6c2e6dd60c9fa94e4ebb13be203362d0113d52c1e5ae36644853b8a0eb63351b10d0263d70 SHA512 c3efb1e47eee5d760a14a229c781b5c149249129cdaae5da9fda28919c509f7cebf7995abfd76081ae632a275d080d0e8d740106421a83de7ce491133b6a0a5a
+MISC metadata.xml 778 BLAKE2B 79a2c9cd2014b9e945d25384ef6faf7fa5a6685a15dc08874bb454add7cb515d6e0efc13ddb801698151c97f8fde3f8ff787b7230871ef3ffc4a138facccb666 SHA512 5461b530d3b11ad32cd25234bcbe5a352d45b7856c75949f8e3fd16981ee5dfd194eaed09e0af7e0d97ae6f0164bbdc7b1582f395aa0f95ec08012a202ab9ac0
diff --git a/app-text/zathura-cb/metadata.xml b/app-text/zathura-cb/metadata.xml
index e0e23d23393f..2905913bb5c1 100644
--- a/app-text/zathura-cb/metadata.xml
+++ b/app-text/zathura-cb/metadata.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person" proxied="yes">
+		<email>nrk@disroot.org</email>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<maintainer status="active">
 		<email>mlq@pwmt.org</email>
diff --git a/app-text/zathura-cb/zathura-cb-0.1.10.ebuild b/app-text/zathura-cb/zathura-cb-0.1.10.ebuild
new file mode 100644
index 000000000000..fa6f6f40d74b
--- /dev/null
+++ b/app-text/zathura-cb/zathura-cb-0.1.10.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-cb.git"
+	EGIT_BRANCH="develop"
+else
+	KEYWORDS="~amd64 ~arm ~riscv ~x86"
+	SRC_URI="https://pwmt.org/projects/zathura-cb/download/${P}.tar.xz"
+fi
+
+DESCRIPTION="Comic book plug-in for zathura with 7zip, rar, tar and zip support"
+HOMEPAGE="https://pwmt.org/projects/zathura-cb/"
+
+LICENSE="ZLIB"
+SLOT="0"
+
+RDEPEND="app-arch/libarchive:=
+	>=app-text/zathura-0.3.9
+	dev-libs/girara
+	dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2[jpeg]
+	x11-libs/gtk+:3"
+
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+
+BDEPEND="virtual/pkgconfig"
diff --git a/app-text/zathura-cb/zathura-cb-9999.ebuild b/app-text/zathura-cb/zathura-cb-9999.ebuild
index 3686e39e9456..fa6f6f40d74b 100644
--- a/app-text/zathura-cb/zathura-cb-9999.ebuild
+++ b/app-text/zathura-cb/zathura-cb-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit meson xdg-utils optfeature
+inherit meson xdg
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -20,24 +20,15 @@ HOMEPAGE="https://pwmt.org/projects/zathura-cb/"
 LICENSE="ZLIB"
 SLOT="0"
 
-DEPEND="app-arch/libarchive:=
+RDEPEND="app-arch/libarchive:=
 	>=app-text/zathura-0.3.9
 	dev-libs/girara
 	dev-libs/glib:2
 	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
+	x11-libs/gdk-pixbuf:2[jpeg]
 	x11-libs/gtk+:3"
 
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
 
 BDEPEND="virtual/pkgconfig"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	optfeature "jpeg support" x11-libs/gdk-pixbuf[jpeg]
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}