2021-04-25 16:35:20 UTC

29 files changed, 115 insertions, 74 deletions

diff --git a/metadata/md5-cache/app-dicts/sword-ASV-1.3 b/metadata/md5-cache/app-dicts/sword-ASV-2.0
index 1ca6d7e1d359..3cb2e3f0200e 100644
--- a/metadata/md5-cache/app-dicts/sword-ASV-1.3
+++ b/metadata/md5-cache/app-dicts/sword-ASV-2.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=install
 DESCRIPTION=American Standard Version (1901)
 EAPI=7
 HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ASV
+INHERIT=sword-module
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=public-domain
-RDEPEND=app-text/sword
+RDEPEND=>=app-text/sword-1.5.9
 SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ASV.zip -> ASV-1.3.zip
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ASV.zip -> ASV-2.0.zip
 _eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
-_md5_=e51e779ec67c51e7326f6361649c3d6d
+_md5_=ad678bf03400476e699ec07c54801ab4
diff --git a/metadata/md5-cache/app-dicts/sword-AraSVD-2.0 b/metadata/md5-cache/app-dicts/sword-AraSVD-2.1
index 694b007801fe..6b5fd32d3c1d 100644
--- a/metadata/md5-cache/app-dicts/sword-AraSVD-2.0
+++ b/metadata/md5-cache/app-dicts/sword-AraSVD-2.1
@@ -3,10 +3,11 @@ DEFINED_PHASES=install
 DESCRIPTION=Smith and van Dyck's al-Kitab al-Muqaddas (Arabic Bible)
 EAPI=7
 HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=AraSVD
+INHERIT=sword-module
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=free-noncomm
 RDEPEND=>=app-text/sword-1.5.9
 SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/AraSVD.zip -> AraSVD-2.0.zip
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/AraSVD.zip -> AraSVD-2.1.zip
 _eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
-_md5_=a0de24403608487bf14642f0a9585634
+_md5_=28b574c8a4a4a4ce3d2d33cd5a0e2e58
diff --git a/metadata/md5-cache/app-dicts/sword-Byz-2.4 b/metadata/md5-cache/app-dicts/sword-Byz-3.0
index 015996995d9d..b05229bccf0d 100644
--- a/metadata/md5-cache/app-dicts/sword-Byz-2.4
+++ b/metadata/md5-cache/app-dicts/sword-Byz-3.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=install
 DESCRIPTION=The New Testament in Original Greek: Byzantine Textform 2005
 EAPI=7
 HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Byz
+INHERIT=sword-module
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=CC-BY-NC-SA-4.0
-RDEPEND=>=app-text/sword-1.7.2
+RDEPEND=>=app-text/sword-1.5.9
 SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Byz.zip -> Byz-2.4.zip
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Byz.zip -> Byz-3.0.zip
 _eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
-_md5_=022699c5695e79ef37f33fd4a8d44611
+_md5_=aa3c69be1e51906b71337dc1879da4e7
diff --git a/metadata/md5-cache/app-dicts/sword-Che1860-1.2 b/metadata/md5-cache/app-dicts/sword-Che1860-2.0
index 0250fe28ff09..04ff98ae8b03 100644
--- a/metadata/md5-cache/app-dicts/sword-Che1860-1.2
+++ b/metadata/md5-cache/app-dicts/sword-Che1860-2.0
@@ -1,12 +1,13 @@
 BDEPEND=app-arch/unzip
 DEFINED_PHASES=install
-DESCRIPTION=Cherokee New Testament (1860)
+DESCRIPTION=Cherokee New Testament (1860) with Sequoyah transliterated forms
 EAPI=7
 HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Che1860
+INHERIT=sword-module
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=public-domain
 RDEPEND=>=app-text/sword-1.5.9
 SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Che1860.zip -> Che1860-1.2.zip
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Che1860.zip -> Che1860-2.0.zip
 _eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
-_md5_=15c9d6f7964e1159450ddef3d6a56282
+_md5_=04c9f2b25835a75888590a6a51152e51
diff --git a/metadata/md5-cache/app-dicts/sword-ChiNCVs-1.0 b/metadata/md5-cache/app-dicts/sword-ChiNCVs-1.1
index 4490f4e6abe4..79f0bdf280aa 100644
--- a/metadata/md5-cache/app-dicts/sword-ChiNCVs-1.0
+++ b/metadata/md5-cache/app-dicts/sword-ChiNCVs-1.1
@@ -3,10 +3,11 @@ DEFINED_PHASES=install
 DESCRIPTION=New Chinese Version of the Bible, simplified script
 EAPI=7
 HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ChiNCVs
+INHERIT=sword-module
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.6
+RDEPEND=>=app-text/sword-1.6.0
 SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ChiNCVs.zip -> ChiNCVs-1.0.zip
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ChiNCVs.zip -> ChiNCVs-1.1.zip
 _eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
-_md5_=101c38a2678a7a7fa86ed289b6fd0120
+_md5_=450b847733591e7d0446aef5d6a6b1b1
diff --git a/metadata/md5-cache/app-dicts/sword-ChiNCVt-1.0 b/metadata/md5-cache/app-dicts/sword-ChiNCVt-1.1
index de292368a581..eb129337c8fd 100644
--- a/metadata/md5-cache/app-dicts/sword-ChiNCVt-1.0
+++ b/metadata/md5-cache/app-dicts/sword-ChiNCVt-1.1
@@ -3,10 +3,11 @@ DEFINED_PHASES=install
 DESCRIPTION=New Chinese Version of the Bible, traditional script
 EAPI=7
 HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ChiNCVt
+INHERIT=sword-module
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.6
+RDEPEND=>=app-text/sword-1.5.9
 SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ChiNCVt.zip -> ChiNCVt-1.0.zip
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ChiNCVt.zip -> ChiNCVt-1.1.zip
 _eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
-_md5_=d6793bafdec7a010e5330ff2f6eaa8dd
+_md5_=3e31fd450e6e0274801b4cf1be8d5b22
diff --git a/metadata/md5-cache/app-dicts/sword-ChiUn-2.6 b/metadata/md5-cache/app-dicts/sword-ChiUn-3.0
index efe6dffd0223..f7b7e5b5c6aa 100644
--- a/metadata/md5-cache/app-dicts/sword-ChiUn-2.6
+++ b/metadata/md5-cache/app-dicts/sword-ChiUn-3.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=install
 DESCRIPTION=Chinese Union Version of the Bible, traditional script
 EAPI=7
 HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ChiUn
+INHERIT=sword-module
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
+RDEPEND=>=app-text/sword-1.6.0
 SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ChiUn.zip -> ChiUn-2.6.zip
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ChiUn.zip -> ChiUn-3.0.zip
 _eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
-_md5_=ec297edad2ea4a9b25fecbc7fce7048d
+_md5_=720680a41136d75f3301edd4783ff439
diff --git a/metadata/md5-cache/app-dicts/sword-ChiUns-2.5.2 b/metadata/md5-cache/app-dicts/sword-ChiUns-3.0
index 70107c26b31e..1f3d9f626dca 100644
--- a/metadata/md5-cache/app-dicts/sword-ChiUns-2.5.2
+++ b/metadata/md5-cache/app-dicts/sword-ChiUns-3.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=install
 DESCRIPTION=Chinese Union Version of the Bible, simplified script
 EAPI=7
 HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=ChiUns
+INHERIT=sword-module
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=public-domain
 RDEPEND=>=app-text/sword-1.6.0
 SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ChiUns.zip -> ChiUns-2.5.2.zip
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/ChiUns.zip -> ChiUns-3.0.zip
 _eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
-_md5_=fadcb9d7d9cc7ec8d7e2bca05baad558
+_md5_=40805f9fef089fcd17d3588871de7a11
diff --git a/metadata/md5-cache/app-dicts/sword-Darby-1.1 b/metadata/md5-cache/app-dicts/sword-Darby-2.0
index f8a655920a33..749261cf4c91 100644
--- a/metadata/md5-cache/app-dicts/sword-Darby-1.1
+++ b/metadata/md5-cache/app-dicts/sword-Darby-2.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=install
 DESCRIPTION=Darby Bible (1889)
 EAPI=7
 HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Darby
+INHERIT=sword-module
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=public-domain
-RDEPEND=app-text/sword
+RDEPEND=>=app-text/sword-1.5.9
 SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Darby.zip -> Darby-1.1.zip
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Darby.zip -> Darby-2.0.zip
 _eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
-_md5_=9e19fae5c6f22a4c7744f789f5f24241
+_md5_=7eead802bad9f6f52e838a1af4cb1967
diff --git a/metadata/md5-cache/app-dicts/sword-FreBDM1744-1.2.1 b/metadata/md5-cache/app-dicts/sword-FreBDM1744-2.0
index a1e69bf57df4..a573b410d52b 100644
--- a/metadata/md5-cache/app-dicts/sword-FreBDM1744-1.2.1
+++ b/metadata/md5-cache/app-dicts/sword-FreBDM1744-2.0
@@ -1,12 +1,13 @@
 BDEPEND=app-arch/unzip
 DEFINED_PHASES=install
-DESCRIPTION=French Bible Martin (1744)
+DESCRIPTION=Bible David Martin (1744)
 EAPI=7
 HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreBDM1744
+INHERIT=sword-module
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.9
+RDEPEND=>=app-text/sword-1.8.0
 SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FreBDM1744.zip -> FreBDM1744-1.2.1.zip
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FreBDM1744.zip -> FreBDM1744-2.0.zip
 _eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
-_md5_=44b8348851cb3976d32ad569afe9304d
+_md5_=cff7e418e1377e3d37b82d8c772e77d9
diff --git a/metadata/md5-cache/app-dicts/sword-FreDAW-1.2 b/metadata/md5-cache/app-dicts/sword-FreDAW-1.2.1
index 4648abbeb252..00a871079072 100644
--- a/metadata/md5-cache/app-dicts/sword-FreDAW-1.2
+++ b/metadata/md5-cache/app-dicts/sword-FreDAW-1.2.1
@@ -3,10 +3,11 @@ DEFINED_PHASES=install
 DESCRIPTION=Dictionnaire encyclopédique de la Bible A. Westphal (1932)
 EAPI=7
 HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=FreDAW
+INHERIT=sword-module
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=crosswire free-noncomm
 RDEPEND=>=app-text/sword-1.5.9
 SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FreDAW.zip -> FreDAW-1.2.zip
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/FreDAW.zip -> FreDAW-1.2.1.zip
 _eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
-_md5_=6b39e8f1545dacc689d55688e5a3b0c9
+_md5_=ad3e67ad136eff0d81d8c6a0e8fa39ce
diff --git a/metadata/md5-cache/app-dicts/sword-GerElb1905-1.5 b/metadata/md5-cache/app-dicts/sword-GerElb1905-1.6
index 6c16c1ffde50..f1f155fd424e 100644
--- a/metadata/md5-cache/app-dicts/sword-GerElb1905-1.5
+++ b/metadata/md5-cache/app-dicts/sword-GerElb1905-1.6
@@ -3,10 +3,11 @@ DEFINED_PHASES=install
 DESCRIPTION=German Darby Unrevidierte Elberfelder (1905)
 EAPI=7
 HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=GerElb1905
+INHERIT=sword-module
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=public-domain
-RDEPEND=app-text/sword
+RDEPEND=>=app-text/sword-1.6.0
 SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerElb1905.zip -> GerElb1905-1.5.zip
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/GerElb1905.zip -> GerElb1905-1.6.zip
 _eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
-_md5_=c16c0396f4cc255c40e39a235b883efd
+_md5_=a93bc30ff746c4f06a5cd0d2e888ff30
diff --git a/metadata/md5-cache/app-dicts/sword-HinERV-1.1 b/metadata/md5-cache/app-dicts/sword-HinERV-2.0
index d56a575eef3c..4f5677ca3698 100644
--- a/metadata/md5-cache/app-dicts/sword-HinERV-1.1
+++ b/metadata/md5-cache/app-dicts/sword-HinERV-2.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=install
 DESCRIPTION=Holy Bible: Easy-to-Read Version (Hindi ERV)
 EAPI=7
 HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=HinERV
+INHERIT=sword-module
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=crosswire
-RDEPEND=>=app-text/sword-1.5.9
+RDEPEND=>=app-text/sword-1.6.0
 SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/HinERV.zip -> HinERV-1.1.zip
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/HinERV.zip -> HinERV-2.0.zip
 _eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
-_md5_=ed0c9b9dc24d2df17ebd800e146f56dd
+_md5_=eef4f15841b5901e9ed008d7d49c3f03
diff --git a/metadata/md5-cache/app-dicts/sword-JFB-2.2 b/metadata/md5-cache/app-dicts/sword-JFB-3.0
index 2496f7245aae..355268ed4530 100644
--- a/metadata/md5-cache/app-dicts/sword-JFB-2.2
+++ b/metadata/md5-cache/app-dicts/sword-JFB-3.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=install
 DESCRIPTION=Jamieson Fausset Brown Bible Commentary
 EAPI=7
 HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=JFB
+INHERIT=sword-module
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=public-domain
-RDEPEND=app-text/sword
+RDEPEND=>=app-text/sword-1.5.9
 SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/JFB.zip -> JFB-2.2.zip
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/JFB.zip -> JFB-3.0.zip
 _eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
-_md5_=0c276658a920fdae055270d768e0a862
+_md5_=8b78320ab9ac4053ed33019464716113
diff --git a/metadata/md5-cache/app-dicts/sword-KJV-2.10.2 b/metadata/md5-cache/app-dicts/sword-KJV-2.10.2
new file mode 100644
index 000000000000..0548fcb4a358
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/sword-KJV-2.10.2
@@ -0,0 +1,13 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install
+DESCRIPTION=King James Version (1769) with Strongs Numbers and Morphology
+EAPI=7
+HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=KJV
+INHERIT=sword-module
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=freedist
+RDEPEND=>=app-text/sword-1.7.0
+SLOT=0
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/KJV.zip -> KJV-2.10.2.zip
+_eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
+_md5_=217ad61b35b435acad55c15083ab3cd2
diff --git a/metadata/md5-cache/app-dicts/sword-KtuVb-3.1 b/metadata/md5-cache/app-dicts/sword-KtuVb-3.1.1
index 3b1117bec174..53291889a4e9 100644
--- a/metadata/md5-cache/app-dicts/sword-KtuVb-3.1
+++ b/metadata/md5-cache/app-dicts/sword-KtuVb-3.1.1
@@ -3,10 +3,11 @@ DEFINED_PHASES=install
 DESCRIPTION=Masonama ya Santu par le Père Widart et l’équipe de Verbum Bible Kinshasa
 EAPI=7
 HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=KtuVb
+INHERIT=sword-module
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=crosswire
 RDEPEND=>=app-text/sword-1.6.2
 SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/KtuVb.zip -> KtuVb-3.1.zip
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/KtuVb.zip -> KtuVb-3.1.1.zip
 _eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
-_md5_=f5c99fea3e4537d903f946d11adcf202
+_md5_=ab0132eb26d4ab6ee66b8504797abbbb
diff --git a/metadata/md5-cache/app-dicts/sword-LEB-2.7 b/metadata/md5-cache/app-dicts/sword-LEB-3.0
index 68c469089910..47f19068b8b1 100644
--- a/metadata/md5-cache/app-dicts/sword-LEB-2.7
+++ b/metadata/md5-cache/app-dicts/sword-LEB-3.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=install
 DESCRIPTION=The Lexham English Bible
 EAPI=7
 HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=LEB
+INHERIT=sword-module
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=free-noncomm
 RDEPEND=>=app-text/sword-1.5.9
 SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/LEB.zip -> LEB-2.7.zip
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/LEB.zip -> LEB-3.0.zip
 _eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
-_md5_=8687885cfe059103e77e0f6eee051313
+_md5_=cd12459054fafc6b093b06ff7a3e4775
diff --git a/metadata/md5-cache/app-dicts/sword-LinVB-1.0 b/metadata/md5-cache/app-dicts/sword-LinVB-1.0.1
index e85ea06b528a..7b33b78a915d 100644
--- a/metadata/md5-cache/app-dicts/sword-LinVB-1.0
+++ b/metadata/md5-cache/app-dicts/sword-LinVB-1.0.1
@@ -3,10 +3,11 @@ DEFINED_PHASES=install
 DESCRIPTION=Liloba lya Nzambe, édition Verbum Bible
 EAPI=7
 HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=LinVB
+INHERIT=sword-module
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=crosswire
 RDEPEND=>=app-text/sword-1.6.2
 SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/LinVB.zip -> LinVB-1.0.zip
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/LinVB.zip -> LinVB-1.0.1.zip
 _eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
-_md5_=051e3519837177121a278bb705c5a252
+_md5_=97f82ea3fb8810e52808c6eb64299e66
diff --git a/metadata/md5-cache/app-dicts/sword-MHCC-1.1 b/metadata/md5-cache/app-dicts/sword-MHCC-2.0
index 564cea4482a5..c6478a6a4b35 100644
--- a/metadata/md5-cache/app-dicts/sword-MHCC-1.1
+++ b/metadata/md5-cache/app-dicts/sword-MHCC-2.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=install
 DESCRIPTION=Matthew Henry's Concise Commentary on the Whole Bible
 EAPI=7
 HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=MHCC
+INHERIT=sword-module
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=public-domain
-RDEPEND=app-text/sword
+RDEPEND=>=app-text/sword-1.5.9
 SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/MHCC.zip -> MHCC-1.1.zip
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/MHCC.zip -> MHCC-2.0.zip
 _eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
-_md5_=34fb57afd6db4196b8d7fc20c8e2348b
+_md5_=8d6fe6531328a831f15b6a3c24385d1a
diff --git a/metadata/md5-cache/app-dicts/sword-Mg1865-1.1.1 b/metadata/md5-cache/app-dicts/sword-Mg1865-2.0
index 1534f0998feb..042a36d4eea8 100644
--- a/metadata/md5-cache/app-dicts/sword-Mg1865-1.1.1
+++ b/metadata/md5-cache/app-dicts/sword-Mg1865-2.0
@@ -1,12 +1,13 @@
 BDEPEND=app-arch/unzip
 DEFINED_PHASES=install
-DESCRIPTION=Malagasy Bible (1865)
+DESCRIPTION=Baiboly Malagasy (1865)
 EAPI=7
 HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Mg1865
+INHERIT=sword-module
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.5.1a
+RDEPEND=>=app-text/sword-1.6.1
 SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Mg1865.zip -> Mg1865-1.1.1.zip
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Mg1865.zip -> Mg1865-2.0.zip
 _eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
-_md5_=f3aaf8e1c19aad296c5b05358102f4e7
+_md5_=255abe85de4ce206a3536daaf4375a28
diff --git a/metadata/md5-cache/app-dicts/sword-Nave-2.0 b/metadata/md5-cache/app-dicts/sword-Nave-3.0
index e6291542192c..fa68af0410d1 100644
--- a/metadata/md5-cache/app-dicts/sword-Nave-2.0
+++ b/metadata/md5-cache/app-dicts/sword-Nave-3.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=install
 DESCRIPTION=Nave's Topical Bible
 EAPI=7
 HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Nave
+INHERIT=sword-module
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=public-domain
 RDEPEND=>=app-text/sword-1.5.1a
 SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Nave.zip -> Nave-2.0.zip
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Nave.zip -> Nave-3.0.zip
 _eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
-_md5_=58306a30cb3aaf5e7e26255c0dfc2db3
+_md5_=fed1f090073ef721aa88ee90787384ad
diff --git a/metadata/md5-cache/app-dicts/sword-OSHB-1.4 b/metadata/md5-cache/app-dicts/sword-OSHB-2.1.2
index 10f55404fca8..43528d4fc7f8 100644
--- a/metadata/md5-cache/app-dicts/sword-OSHB-1.4
+++ b/metadata/md5-cache/app-dicts/sword-OSHB-2.1.2
@@ -3,10 +3,11 @@ DEFINED_PHASES=install
 DESCRIPTION=Open Scriptures Hebrew Bible
 EAPI=7
 HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=OSHB
+INHERIT=sword-module
 KEYWORDS=~amd64 ~ppc ~x86
-LICENSE=public-domain
+LICENSE=CC-BY-4.0
 RDEPEND=>=app-text/sword-1.6.0
 SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/OSHB.zip -> OSHB-1.4.zip
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/OSHB.zip -> OSHB-2.1.2.zip
 _eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
-_md5_=4be5a644574a3f7dbe0c6d47334055ea
+_md5_=c8a69cf4fb782f3f7ab9c31e037eb6d6
diff --git a/metadata/md5-cache/app-dicts/sword-RusSynodal-1.8.1 b/metadata/md5-cache/app-dicts/sword-RusSynodal-1.9
index 5f6646ac9d32..39a5881cf696 100644
--- a/metadata/md5-cache/app-dicts/sword-RusSynodal-1.8.1
+++ b/metadata/md5-cache/app-dicts/sword-RusSynodal-1.9
@@ -3,10 +3,11 @@ DEFINED_PHASES=install
 DESCRIPTION=1876 Russian Synodal Bible
 EAPI=7
 HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=RusSynodal
+INHERIT=sword-module
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=public-domain
-RDEPEND=>=app-text/sword-1.6.2
+RDEPEND=>=app-text/sword-1.6.1
 SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/RusSynodal.zip -> RusSynodal-1.8.1.zip
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/RusSynodal.zip -> RusSynodal-1.9.zip
 _eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
-_md5_=78ef3478f8be6846a0d3f2ea7408ee8c
+_md5_=12a33612304cf3466ec371e04ecd1c05
diff --git a/metadata/md5-cache/app-dicts/sword-SloKJV-12.0 b/metadata/md5-cache/app-dicts/sword-SloKJV-15.0
index 74fc0b579faf..56e947c175ff 100644
--- a/metadata/md5-cache/app-dicts/sword-SloKJV-12.0
+++ b/metadata/md5-cache/app-dicts/sword-SloKJV-15.0
@@ -3,10 +3,11 @@ DEFINED_PHASES=install
 DESCRIPTION=Slovenian translation of Holy Bible King James Version (1769)
 EAPI=7
 HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=SloKJV
+INHERIT=sword-module
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=CC-BY-NC-ND-4.0
 RDEPEND=>=app-text/sword-1.5.9
 SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SloKJV.zip -> SloKJV-12.0.zip
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/SloKJV.zip -> SloKJV-15.0.zip
 _eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
-_md5_=a31b3c50e029b3b384fdf766243bfab4
+_md5_=9f5a44aaf6c8000803d05e1385a5a907
diff --git a/metadata/md5-cache/app-dicts/sword-UrduGeo-1.6 b/metadata/md5-cache/app-dicts/sword-UrduGeo-1.9
index f2da12d42cf9..9fab52d75db3 100644
--- a/metadata/md5-cache/app-dicts/sword-UrduGeo-1.6
+++ b/metadata/md5-cache/app-dicts/sword-UrduGeo-1.9
@@ -3,10 +3,11 @@ DEFINED_PHASES=install
 DESCRIPTION=Urdu Geo Version (UGV) of the Bible, Urdu script
 EAPI=7
 HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=UrduGeo
+INHERIT=sword-module
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=crosswire
 RDEPEND=>=app-text/sword-1.6.0
 SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/UrduGeo.zip -> UrduGeo-1.6.zip
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/UrduGeo.zip -> UrduGeo-1.9.zip
 _eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
-_md5_=7792f717471ee9f30c74c06c00a9d9cc
+_md5_=e23c37d8b5c9fbabcb47cbd9afc760d2
diff --git a/metadata/md5-cache/app-dicts/sword-UrduGeoDeva-1.7 b/metadata/md5-cache/app-dicts/sword-UrduGeoDeva-1.8
index 633e97a80175..3ddb080f4370 100644
--- a/metadata/md5-cache/app-dicts/sword-UrduGeoDeva-1.7
+++ b/metadata/md5-cache/app-dicts/sword-UrduGeoDeva-1.8
@@ -3,10 +3,11 @@ DEFINED_PHASES=install
 DESCRIPTION=Urdu Geo Version (UGV) Bible, Devanagari script
 EAPI=7
 HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=UrduGeoDeva
+INHERIT=sword-module
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=crosswire
 RDEPEND=>=app-text/sword-1.6.0
 SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/UrduGeoDeva.zip -> UrduGeoDeva-1.7.zip
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/UrduGeoDeva.zip -> UrduGeoDeva-1.8.zip
 _eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
-_md5_=92de941fc4b78ece413b1fbe2ffb4bb0
+_md5_=415447598f00638e70cc1ff6dff22bdd
diff --git a/metadata/md5-cache/app-dicts/sword-UrduGeoRoman-1.1 b/metadata/md5-cache/app-dicts/sword-UrduGeoRoman-1.2
index c69b1a1995fb..bd07832870c9 100644
--- a/metadata/md5-cache/app-dicts/sword-UrduGeoRoman-1.1
+++ b/metadata/md5-cache/app-dicts/sword-UrduGeoRoman-1.2
@@ -3,10 +3,11 @@ DEFINED_PHASES=install
 DESCRIPTION=Urdu Geo Version (UGV) of the Bible, Latin script
 EAPI=7
 HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=UrduGeoRoman
+INHERIT=sword-module
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=crosswire
 RDEPEND=>=app-text/sword-1.6.0
 SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/UrduGeoRoman.zip -> UrduGeoRoman-1.1.zip
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/UrduGeoRoman.zip -> UrduGeoRoman-1.2.zip
 _eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
-_md5_=a473bc7e3d2afc537597baf03b2d2e53
+_md5_=6fee6cc500aac6bd82040dfdbe81c1fd
diff --git a/metadata/md5-cache/app-dicts/sword-Vulgate-1.1 b/metadata/md5-cache/app-dicts/sword-Vulgate-2.1
index 9d884e0455ec..b7a48506f043 100644
--- a/metadata/md5-cache/app-dicts/sword-Vulgate-1.1
+++ b/metadata/md5-cache/app-dicts/sword-Vulgate-2.1
@@ -3,10 +3,11 @@ DEFINED_PHASES=install
 DESCRIPTION=Latin Vulgate
 EAPI=7
 HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=Vulgate
+INHERIT=sword-module
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=public-domain
-RDEPEND=app-text/sword
+RDEPEND=>=app-text/sword-1.6.1
 SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Vulgate.zip -> Vulgate-1.1.zip
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/Vulgate.zip -> Vulgate-2.1.zip
 _eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
-_md5_=380e6484bffae7ff396856d5b6bc1278
+_md5_=bbc3449d7ae0f0fbea63fc97d8a98c82
diff --git a/metadata/md5-cache/app-dicts/sword-WelBeiblNet-2.5.1 b/metadata/md5-cache/app-dicts/sword-WelBeiblNet-3.0.1
index 849cf3274e17..a64a290d5872 100644
--- a/metadata/md5-cache/app-dicts/sword-WelBeiblNet-2.5.1
+++ b/metadata/md5-cache/app-dicts/sword-WelBeiblNet-3.0.1
@@ -3,10 +3,11 @@ DEFINED_PHASES=install
 DESCRIPTION=beibl.net translation of the Bible into colloquial Welsh by Arfon Jones
 EAPI=7
 HOMEPAGE=https://crosswire.org/sword/modules/ModInfo.jsp?modName=WelBeiblNet
+INHERIT=sword-module
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=crosswire
 RDEPEND=>=app-text/sword-1.6.0
 SLOT=0
-SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/WelBeiblNet.zip -> WelBeiblNet-2.5.1.zip
+SRC_URI=https://crosswire.org/ftpmirror/pub/sword/packages/rawzip/WelBeiblNet.zip -> WelBeiblNet-3.0.1.zip
 _eclasses_=sword-module	d2a109c71affd5956a1566704d9bda47
-_md5_=8076c7a0804e1ba3ed423e029154ef5b
+_md5_=f9331c8e7bd219d2fda740ddee73139d