gentoo resync : 15.01.2020

175 files changed, 290 insertions, 261 deletions

diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 5a9c868d7e22..3238e831debc 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/myspell-nl/Manifest b/app-dicts/myspell-nl/Manifest
index e6c68f04f06d..9739caefc27b 100644
--- a/app-dicts/myspell-nl/Manifest
+++ b/app-dicts/myspell-nl/Manifest
@@ -1,5 +1,5 @@
 DIST myspell-nl-2.10g.oxt 868845 BLAKE2B cace4a9750e9e7680c48a414065be3897afd29c3f6908c95021e92ebe050784bc7c7379f0a3ff74fc34c6ee6bb1b3499636c77dc60c757520c6d725735a2547a SHA512 070ef6a5d63a2fb9806f7bbbb1459e40097bbcb5c8ab9babb9195844e387847e2295890b149c0a90aba19e4fced7f3d90d338ba976614fc73c5c367bbc9cf4d4
 DIST myspell-nl-2.10g_thes.oxt 1956026 BLAKE2B cc8a79e746def1f6f1026a77890472005f6ad81a1addf1e86936848b07aa1aa31692151e1f7427f792d0c04d1854ff9a6b56abb755cbbc78e0c4dd1e03e378df SHA512 2a13b97ffee1fb98ba29f74595ff9e29a89f294d82efd2da2e89983ff5a21852a1222bee9a4684dd5df621e1dc5621853e1d87cbf0fca311c8eb9e267598eee0
 EBUILD myspell-nl-2.10g-r1.ebuild 1068 BLAKE2B 07b5a5187b01c547b9c440abf07dc640087942e8b3dfbc88e53731a34576d207392fce62869d6412cac2f0cd2df8d3f0f43c10677779d2b3647bf789aff829ba SHA512 9f18303300f7113147bec62b6fb9a851244a9c813b11a7b6ceabd381ec22fbaa65a0fff7a0b33bd38a25afda403ae78011209d58996693625bafd193c47fe8a1
-EBUILD myspell-nl-2.10g-r2.ebuild 1848 BLAKE2B ad15f8890604b8c9c0b56f5b7fa61c65a1d89476ec07c45c42976de5d4e37bd404983115872a9d34198c12feefedc6582ca95939177a2d4829e152189d3b695e SHA512 cdfe793bbec4b8002f0b4f98883be0983f9872d1a204c639fcb3108a6cd5f5fbfc34be5df2a6a252f10b34abfcfce7fd23fa4e544dfca63421b8362a060139ae
+EBUILD myspell-nl-2.10g-r2.ebuild 1837 BLAKE2B 938b0cb74d54a2bb82ecfc01516e24ee01e3eb01056b8ebf5b6e50df090938801a966d988f57c8a3d12e809492631f49150eb6314e17218f6f80e0c498823bdf SHA512 2481537a8bce00597cc9eae99867f064010a87bf11923f10e38fb6dc459d4869939e188dbcaf46508f8bb2672842b1844ddec0559e38438364f3ebf1c56df5ee
 MISC metadata.xml 398 BLAKE2B f047111407075b709cbd357d58cd3446d789614b0a681b143e35f5ccbdd8bf952d343477338d2c20dd3ab5ccdf032451bbb54b1740c7961b8917f913b288798c SHA512 a4952c0811f78c57839110357feb9c82e71b53a47e66c80c7b574c7232ea3ec593f8d7dd8ce6d1015959ff45f4b74d0a9c57947443c916a6a565aa324de94310
diff --git a/app-dicts/myspell-nl/myspell-nl-2.10g-r2.ebuild b/app-dicts/myspell-nl/myspell-nl-2.10g-r2.ebuild
index 2663c798ffb0..e928e29f19c2 100644
--- a/app-dicts/myspell-nl/myspell-nl-2.10g-r2.ebuild
+++ b/app-dicts/myspell-nl/myspell-nl-2.10g-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,7 +30,7 @@ SRC_URI="
 
 LICENSE="BSD-2 CC-BY-3.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86"
 
 src_prepare() {
 	default
diff --git a/app-dicts/sword-ab/Manifest b/app-dicts/sword-ab/Manifest
index 7b3a86603e07..4ffdbc30aaac 100644
--- a/app-dicts/sword-ab/Manifest
+++ b/app-dicts/sword-ab/Manifest
@@ -1,3 +1,3 @@
 DIST AB-1.3.zip 1203602 BLAKE2B 632fcb2ebd5385ad1f6b5c172d209c02ad50fbc2b9416bf663adeaf05638cd7a3701221c279b3a9d372dcf9924d6a1c7fdaab5a3c006c6fae2fe93cf5b74c5b9 SHA512 3c8c3485c4648f8c46f264d5e28ee1bbecf7654a1c1f146518ae82051ded56928eabc0578f8ab9cd45becfd89e5d4497be545187a00b6dac6de5eb45e8b540ab
-EBUILD sword-ab-1.3.ebuild 307 BLAKE2B 796299a11f120e4504b10723a8b50f1cdbc3bfaf2e093f83211e53d054405d2e4200c547189589b439b2ab15fccf49154df52ddb5c5ee188f7fe800cf950fb77 SHA512 59387d3ef0cf50fcbc2c945ba357f83e6349ee00bf4be4bf96fd70b3fdadc802c5d486fa563fd4708712cf3196c205ca55d895dc9b3bb59efe1255d0f69b5ef5
+EBUILD sword-ab-1.3.ebuild 341 BLAKE2B ccb254281e33f736b2abb55787e1f9472d602db03585e808e0fbbb8061f032479ceef49ce7831d097577835059d460a81097bc8db3a96c1c891017ce3388a8e7 SHA512 e54867a271843567eec895dd6ce78ed9f9469535bf992ad3adc378dbe7fd0e7289a0555135c18f8dd1f04e9bc2a0345746a4f7cefcf617458a81e22af12203fe
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-ab/sword-ab-1.3.ebuild b/app-dicts/sword-ab/sword-ab-1.3.ebuild
index fcff491ac783..2619df7c58fd 100644
--- a/app-dicts/sword-ab/sword-ab-1.3.ebuild
+++ b/app-dicts/sword-ab/sword-ab-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,5 +9,6 @@ inherit sword-module
 
 DESCRIPTION="The Apostle's Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=AB"
-LICENSE="freedist"
+LICENSE="all-rights-reserved"
 KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="mirror bindist"
diff --git a/app-dicts/sword-abs_essay_goodsam_swb/Manifest b/app-dicts/sword-abs_essay_goodsam_swb/Manifest
index 67fa244a18a1..cad14723a18d 100644
--- a/app-dicts/sword-abs_essay_goodsam_swb/Manifest
+++ b/app-dicts/sword-abs_essay_goodsam_swb/Manifest
@@ -1,3 +1,3 @@
 DIST ABS_Essay_GoodSam_SWB-1.0.zip 9496 BLAKE2B 467ea43797c3aec9f7130b26bca1e3a7ec354c0dcafc66f6bdc34bd1f3a02b22f2acf954ae5a4e71bb19418d26766ddd401f073ec461a092404178317b7b195f SHA512 02489c6202b07da34ed6c503d8753f72f98e6d267d793f2506ae1d607223d5d1309d24c2c3d634cfdd8ab70611bd57323330aa103c956975309d8ab96851ae80
-EBUILD sword-abs_essay_goodsam_swb-1.0.ebuild 406 BLAKE2B 8f525e197b57f2f1fae889fc2e1f6a549efc757d6d3a31d7c9fb937da7315dc9dbc047efd256bfca75f9b1149c4daadc11d8bc545a12b18e9289146bc85183d8 SHA512 7d3660f69a879f635225d38c651664bbc966a5e48bc92315d1ade13cab5564a816566622ae25f8c37dbcb12ebe85e9f26e9c6af20f9e8697fbf6e52870f41e81
+EBUILD sword-abs_essay_goodsam_swb-1.0.ebuild 435 BLAKE2B 63bb5f17d943d0eb63aee57a8c37abf06061211462f915ce3c600b299189bb70e90d2d0a9939431e541e5662c3315c99803c9935422b51513d93d8537288d922 SHA512 3185fed875133c067acc7538b6d2f6a59f1f6d0151e0da5ad295178d6539c9add7325af32b17ae6fca22ca834b97ef29eba3677fb8e17ce4b59301dd36adfff4
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-abs_essay_goodsam_swb/sword-abs_essay_goodsam_swb-1.0.ebuild b/app-dicts/sword-abs_essay_goodsam_swb/sword-abs_essay_goodsam_swb-1.0.ebuild
index 08d777173a61..cd8eb7f1dc2f 100644
--- a/app-dicts/sword-abs_essay_goodsam_swb/sword-abs_essay_goodsam_swb-1.0.ebuild
+++ b/app-dicts/sword-abs_essay_goodsam_swb/sword-abs_essay_goodsam_swb-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,5 +9,6 @@ inherit sword-module
 
 DESCRIPTION="Essays on The Good Samaritan: Violence on the Road, Social World of Bandits"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ABS_Essay_GoodSam_SWB"
-LICENSE="public-domain"
+LICENSE="all-rights-reserved"
 KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="mirror bindist"
diff --git a/app-dicts/sword-afr1953/Manifest b/app-dicts/sword-afr1953/Manifest
index af030238808b..d3d56538db4c 100644
--- a/app-dicts/sword-afr1953/Manifest
+++ b/app-dicts/sword-afr1953/Manifest
@@ -1,3 +1,3 @@
 DIST Afr1953-1.2.zip 1447644 BLAKE2B fd740c4cb374c4a60fffc2ce478823a0d716d5db94bb3a14c0fa99367b9316ebd0402b64e40f70d0acff94e0fe7d36e851f348940ca8d2222d2e52ea1de6268c SHA512 fa41822db6a05728d676fbe6bf5d0a81ba3863ac07aaf1c5dd535df025783cb5d6ce8f32924027110dedf41f16e7dfaea5004f49936ede472697645b87caffb3
-EBUILD sword-afr1953-1.2.ebuild 312 BLAKE2B 439f15e16b07d41390fd62a1e621b63cad282d15628b7d644bcd56e862a8a4da282c4427d512852cc00689c10fa003e61d81a06e3cf1fea6ef309fa5f833c7fb SHA512 6aba821939ecd2b32ae5846e324a5b69c14962b546f719a01a003b39b5670207e6f9f8730fda0ec24329b00232151446f2115b4f4d61af2b985e607558fca66c
+EBUILD sword-afr1953-1.2.ebuild 313 BLAKE2B cf4f37f6949f5a3a1d8b5c02f6d528f0afd2090f5a5a64f9df94fc994a32c7d71089b6c4009fe9dda3439b7047484d6e67d4840844c3b4d973457ddcc163ba97 SHA512 0482d4f50da03c59a3b44e5db6e5dfdb51ad3e662096e9679c84fc97bb7d770fec04fe51c89f22a2e62495f0b78ede99367e24e815737c87ea14a9b91fb4c0c6
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-afr1953/sword-afr1953-1.2.ebuild b/app-dicts/sword-afr1953/sword-afr1953-1.2.ebuild
index 18d7a7ec2840..0fc35f656720 100644
--- a/app-dicts/sword-afr1953/sword-afr1953-1.2.ebuild
+++ b/app-dicts/sword-afr1953/sword-afr1953-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Afrikaans Bybel"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Afr1953"
-LICENSE="freedist"
+LICENSE="free-noncomm"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-alb/Manifest b/app-dicts/sword-alb/Manifest
index b5d97950d8dc..aa52943d19d9 100644
--- a/app-dicts/sword-alb/Manifest
+++ b/app-dicts/sword-alb/Manifest
@@ -1,3 +1,3 @@
 DIST Alb-1.2.zip 1544025 BLAKE2B ea32989c2b6ee560891a248327bca8ba01d2db772cab085574a95c894c7c9c0eae8ba5d6b5917fce0a9c24e32fe5c0b87096a4219a0eebf8152976b7da4d130e SHA512 49cb89bf807cdacc006e66089be9ec74746f007c2143d3efe44d34b1d9d56bf8f2657f1fff1cef512430ca7fbf2fddadb5346b666756b54fcdd871b550915977
-EBUILD sword-alb-1.2.ebuild 303 BLAKE2B 1f3ce3abd6a638d4fd3bc21555a924e1f870e5f572244c03eaef9829d7751c28d80bd4e1fd26d394ea49b9218687d01afabdee3670346d051688e3af545fcb31 SHA512 52e57632a23cea4fd8026760a3bf0d198a929f591976c56fbfa79973ed71b3c8c72e62f5a59d76a73bad3d8eb3387b5b7983f6c94482cb938b6f92f924a1a8e2
+EBUILD sword-alb-1.2.ebuild 305 BLAKE2B 0ba0c42f624f492fb9fcdb598706ed86207766300477ed827bcc2f871832e7dff50037e1b9271d85f140b49ca18ccfe218c7a1c665e456d332e4774545c831b4 SHA512 117c4b69d112ca42dba006ec3bdb8c29ce063f2ad1c9a5fcb9442e70209d0b52360f5dded16c45f2b8644e6467f62429dd93dad460e0bdf083cede79d7cfb3c1
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-alb/sword-alb-1.2.ebuild b/app-dicts/sword-alb/sword-alb-1.2.ebuild
index 682e7eb5863a..a4bdbe50aa2a 100644
--- a/app-dicts/sword-alb/sword-alb-1.2.ebuild
+++ b/app-dicts/sword-alb/sword-alb-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Albanian Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Alb"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-aleppo/Manifest b/app-dicts/sword-aleppo/Manifest
index 361b27d65e28..c3a0796bbdea 100644
--- a/app-dicts/sword-aleppo/Manifest
+++ b/app-dicts/sword-aleppo/Manifest
@@ -1,3 +1,3 @@
 DIST Aleppo-1.1.zip 868170 BLAKE2B 133eb51afd1c7038e6d08969106fb1cff3b0210cd7470bc7c3b03593f2a561025db9af3259c94fae078429df0188763f3f0349c9a0d31473e8743cbb7f6cc491 SHA512 566cd9d7e533cd6653f39f2965c1750c9096db98ef9dbb151882f0f60396d60cd3f01e60f84a6c5b25d6af34f7d7d255cc6dfd9bb53223a542dd7d71704c9b08
-EBUILD sword-aleppo-1.1.ebuild 307 BLAKE2B 5e5b8ea696f92c0c0f1611abe1ae656ba6738e85e80f54e0039b3183803f916ab6f0e103d79aa1cc8411ebca266f5d9f7d6c333d2b4e7af8e0ec7d5fd3dc98f1 SHA512 156b928fe69a084d4af869f5d39d8ab2217696da5e4831aad964aff8293df60a714f6047cadb2f67baae0195c5478516b806edfeb5e810c39ff68f5d989ae5d4
+EBUILD sword-aleppo-1.1.ebuild 309 BLAKE2B a78b81894af2311b36f2199304bb6ad5bb290eb8ee46149e6dd1f5b0d0e6ba709f0f65858e41d29579cd3be1d23b480cd8dcca7e1f7184d7435b141e8924bf0f SHA512 863391b335725f70c0af3f9ec81129712345f361dfb1c59612783689c7d84010d9cc27a32870f50f500b7d86b6d80ced5df1c47f1d1461b41cb23a312a4cc532
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-aleppo/sword-aleppo-1.1.ebuild b/app-dicts/sword-aleppo/sword-aleppo-1.1.ebuild
index b831a369a3ce..2210400efb72 100644
--- a/app-dicts/sword-aleppo/sword-aleppo-1.1.ebuild
+++ b/app-dicts/sword-aleppo/sword-aleppo-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Aleppo Codex"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Aleppo"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-arasvd/Manifest b/app-dicts/sword-arasvd/Manifest
index 7bc7fcbb744c..9d586e45e79d 100644
--- a/app-dicts/sword-arasvd/Manifest
+++ b/app-dicts/sword-arasvd/Manifest
@@ -1,3 +1,3 @@
 DIST AraSVD-1.1.zip 1306354 BLAKE2B 571e38b2003243be7c72d9acee84bc550f87e21fa2c8e131596557774f2d2fe842ec695d778cf771507d83749f0a6cab7f0f8e9515429749076b8ef07816ef66 SHA512 928371a99b7d543a512b3adb3af70788ccdfddb174fd0a3267a0e724623658c3c04b15ef9e91389c5b9d21e0f34b1f1584234390a7bc74c90ee14625b711d250
-EBUILD sword-arasvd-1.1.ebuild 351 BLAKE2B 71a7a3d2d5e59052704af4dad7892edc410bb4fce34a82c614b4e0eb513faa6991f6259b26eca3dfc146b28380a3064239593b7d5192ba00950f2dd015495163 SHA512 b07d8c3e8f51297f8266fe44a9d52c24b24d07c8ee0cb39fe6119afb8b8d231565248d417f9f64cc13e30bbca31c2490fdec5692fe937bc8c112d26d52a28d09
+EBUILD sword-arasvd-1.1.ebuild 353 BLAKE2B cb76a1a504029229824d15f57a5278db4e87d747b19d95b415c2f652105108eefe5045dd6d63ffd92290d06c3f1644d440141f8f5e93e90dd0c1692fe8f61da0 SHA512 d2b1f68f0dfc48df7a96b1783be69abe4ee299406037e9ecfc73cdfe809efe268c661bf4c4277379b2aa0bca0d5694350c3fc10fe7bc96c1155beea3e80a56c2
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-arasvd/sword-arasvd-1.1.ebuild b/app-dicts/sword-arasvd/sword-arasvd-1.1.ebuild
index 73384df53c40..17bfb2defb7c 100644
--- a/app-dicts/sword-arasvd/sword-arasvd-1.1.ebuild
+++ b/app-dicts/sword-arasvd/sword-arasvd-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Smith and van Dyck's al-Kitab al-Muqaddas (Arabic Bible)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=AraSVD"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-armeastern/Manifest b/app-dicts/sword-armeastern/Manifest
index 74680ce2e9fe..2c0a7763658f 100644
--- a/app-dicts/sword-armeastern/Manifest
+++ b/app-dicts/sword-armeastern/Manifest
@@ -1,3 +1,3 @@
 DIST ArmEastern-1.1.zip 334965 BLAKE2B b193bfa9f3f3472f1fd390c3aba61f7299d5d1dcc1a70eb5f88b4eae3bff68adca7302cfb1834c6fb8b95086e38651faa512f085201ad56f486e2cc71738ab4a SHA512 fb481aae1c58e5a4327afdac3f8134678f4e55488dfafa2976d2f77960c742bc371d86575a3d14ce703dae65523392d854baf1c48f186b8dad22e4e6088db860
-EBUILD sword-armeastern-1.1.ebuild 325 BLAKE2B 50f21f7b6a8f242c89bf12dc25805c912a706a5e37a67cf1c5f6d9fa72f1f6d039b744fe1487111a37e295d708b9e0ada78a2a75d98b6fb0f7ad0dcf3a60c90b SHA512 48a295698564799c271961b0d32fd28d117987e7ef37ee8539e62e88508b8d6d50da004a57e7502f672b9f14074ec5439ca52ab2d1275e544e6d9f80e0f0b54c
+EBUILD sword-armeastern-1.1.ebuild 327 BLAKE2B bf8bba231150a57dc45bd71e3634c33f2d4a4fb3584be139de3b1b5914b6f133903a1de496b69ffdab5a0eb2333c484342e09fed5e2a0462b025f23f09b1e6f0 SHA512 70ec310bbdc93d92923c71d7bb27865ada6a9e816c16764003e0f2e67387b9fbfcb51a4f0c572be998cda74efa393200d422cb4de3b952ba5fcb0b079ace5333
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-armeastern/sword-armeastern-1.1.ebuild b/app-dicts/sword-armeastern/sword-armeastern-1.1.ebuild
index 1394c2c1ec58..93b6911d84f6 100644
--- a/app-dicts/sword-armeastern/sword-armeastern-1.1.ebuild
+++ b/app-dicts/sword-armeastern/sword-armeastern-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Eastern Armenian Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ArmEastern"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-armwestern/Manifest b/app-dicts/sword-armwestern/Manifest
index ce2656f34747..d5714975110c 100644
--- a/app-dicts/sword-armwestern/Manifest
+++ b/app-dicts/sword-armwestern/Manifest
@@ -1,3 +1,3 @@
 DIST ArmWestern-1.1.zip 428727 BLAKE2B c10066c0da1692b2b009f3b2e28c2445cbc949edb8c8c46c732a916118e5373f4070ec042b9c6db3911db2856d4b431fb15893dfc22fdc565d3a6c08259b984a SHA512 85fc4ba42c10da39103096afde9226ea206e52e69510ef3643acf54721233724c04e8185e32bd9663f62a33c8f1b70dc2a6d123f63f0679604aa58122db1fe46
-EBUILD sword-armwestern-1.1.ebuild 327 BLAKE2B c58376bd6dd9f22d8fcce16ba7db98f4825474a7ad81b9c830e175325bbb2ca8368fd2e26bbbcc1de8f8e1cfc435d44a8fecc40e4cedd8de00723858e63d38b0 SHA512 5f309d968f84be74b62c1eb90d9661c3c140a942bc18d5f28d8e45a5557a3337ecdcaea11841788062aca9858e9325de0452cb2cb1c687eae0c88191c3d2845d
+EBUILD sword-armwestern-1.1.ebuild 329 BLAKE2B c61dd8e1750dbcf6fb6953a2c9894fb0fd47177dd4edcfe13dadf3dc8a77abe43afc4031e87901bbc433674a112ed19255c578a0cd28bba732a4a59fddc653d7 SHA512 2f8d6a1672ace42878450cb55ee25310e588f929ad88d7ff27cca1eae2dcc8d66262b3130a5ad0db3f950844de726dda4024a2281d8e33356ce32e451694629c
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-armwestern/sword-armwestern-1.1.ebuild b/app-dicts/sword-armwestern/sword-armwestern-1.1.ebuild
index f9a0f4584e0e..e17793e7c200 100644
--- a/app-dicts/sword-armwestern/sword-armwestern-1.1.ebuild
+++ b/app-dicts/sword-armwestern/sword-armwestern-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="1853 Western Armenian NT"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ArmWestern"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-bashautin/Manifest b/app-dicts/sword-bashautin/Manifest
index 31a858aef85e..d22da24678a5 100644
--- a/app-dicts/sword-bashautin/Manifest
+++ b/app-dicts/sword-bashautin/Manifest
@@ -1,3 +1,3 @@
 DIST BasHautin-1.5.zip 426714 BLAKE2B 8248a2e8ed16f8eda784a590584bb1516bfcc4f24172b2cdf05a5464efd46f064cc5469dd01f5b879c39d9f534d190b82edc64f77c6204e402b0372057497cd0 SHA512 a0266465dfc0c945398075cea549fd17601ee8d38f4d319b035c6a8425e1222c4e6cca46ccc52d6769c368eb4aaa592cea4ba2b60279e2ebeb64c8f4b834e5ff
-EBUILD sword-bashautin-1.5.ebuild 333 BLAKE2B 476196efa2f0ab6c52f4805fcf4c755f7168a90e35d0a72fe6e90ce3d65a828f7f5768852314bd30d17ff7d14b5bc3203a93bf991c0a0ef7806808df400ac1e2 SHA512 b3e9b8f526af455ff990137a0169cf15fa29af268e6228ef9c22f6836a4dbb20d2da5c845ec201c55d99abe7dd7c3fb1e0097cebea780c2b7fc550c236d08787
+EBUILD sword-bashautin-1.5.ebuild 335 BLAKE2B 210dc70bbb245b42531000d47ba7a330b2dbc82138b13511984503877fbd1f1947b1b884072edd47b768bfa3d574f078bbb525053aca3d427c831b3a17f47bb8 SHA512 af6477932d3da76737ff12e57451e933b430f72f2d6f73b218e7924fd52417c51d920f4d6da9a723f5325dce1a5a1cc3c2e5d8a4f0e9cbf4856d1f492b785591
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-bashautin/sword-bashautin-1.5.ebuild b/app-dicts/sword-bashautin/sword-bashautin-1.5.ebuild
index dcf45e264a85..69af9776269a 100644
--- a/app-dicts/sword-bashautin/sword-bashautin-1.5.ebuild
+++ b/app-dicts/sword-bashautin/sword-bashautin-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="1571 Navarro-Labourdin Basque NT"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=BasHautin"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-br_en/Manifest b/app-dicts/sword-br_en/Manifest
index 32c32f43b6f9..19784949f2b6 100644
--- a/app-dicts/sword-br_en/Manifest
+++ b/app-dicts/sword-br_en/Manifest
@@ -1,3 +1,3 @@
 DIST br_en-1.1.zip 7001 BLAKE2B 12221b0721a6130f064775da5349fca06a07f0177e29a446759d9e6f19b6f0c5718b2dd8b96ae798d03b38f84c35178b0422497b3e8417050332d3e60f5d66fc SHA512 8f0ae9d5a34c081bea90517fd6754e219ce5368fe2afcb6ed33040aff815042c8cd53d536eb4edea38ed0444de7f8fded9fe5f43036a1dd0149ef8258255ac8c
-EBUILD sword-br_en-1.1.ebuild 324 BLAKE2B 926bdb30546a009352b644108ec710d412f1322e76eb5ce563a497057853a1d279781be40e002601af61281807f82e4ac2758b411c5b07fa8e41f6329cda199e SHA512 ab061d3cfe0f5e1e4d4e7ce2bf41b4f5cdb327c5ae8e6ec092589b76464d12680a923c5b737269acd5143abd09bbe20dde3e2b3dd4cff9e18786a45541b7198a
+EBUILD sword-br_en-1.1.ebuild 353 BLAKE2B b8f7829679a722dca3a22f192194e01ad031722599560d995e4ad954d3a84d68eb54f5444f29bb96d3e4e1286036ab8395905e7538b7f8973685c2e4a0810bf8 SHA512 b71c6ecdc7fa6498110418b3cf2a488630f7eb3a5d86aa6522110a0319e6b6ba7e3126a810f28da4c684b5d8a957b4968cd8b6038dabaa165d85cefb3c5311d9
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-br_en/sword-br_en-1.1.ebuild b/app-dicts/sword-br_en/sword-br_en-1.1.ebuild
index 72e29c7ab56b..8d41d1088610 100644
--- a/app-dicts/sword-br_en/sword-br_en-1.1.ebuild
+++ b/app-dicts/sword-br_en/sword-br_en-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,6 @@ inherit sword-module
 
 DESCRIPTION="Breton to English Glossary"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=br_en"
-LICENSE="public-domain"
+LICENSE="all-rights-reserved"
 KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="mirror bindist"
diff --git a/app-dicts/sword-bulcarigradnt/Manifest b/app-dicts/sword-bulcarigradnt/Manifest
index 2b816f11bcd2..b713f7e01992 100644
--- a/app-dicts/sword-bulcarigradnt/Manifest
+++ b/app-dicts/sword-bulcarigradnt/Manifest
@@ -1,3 +1,3 @@
 DIST BulCarigradNT-1.0.zip 455451 BLAKE2B 48d2dda299b34cd3fd9e7c46b764776c8d5e2049811cf341a2279fe55a234f07ec41ac4e0bb21e31646c5f4801fda655845c2fccc44faa13219050dff2fc99db SHA512 78aceed97c425d4dc10ac13c4f1a7fbc4d3bddc63dcc56a35b0be50e455637bb330cfdf723bb353cbeb0988bef73c6bc982712154091d553cc66473834e1939a
-EBUILD sword-bulcarigradnt-1.0.ebuild 372 BLAKE2B 10b2796c20f9a81327656f7f725778f85ceed5e90f002a58a1b2e78d2b7add87269052a18e3ee54338c8c66a3ba20fea232aeca900fc2465a5585e81fc45f790 SHA512 01382a71bdf48c59735a68d64eb64d7789d8e0a8b9ebe4544747eee2831a135a65682378c833255293c74a4c4f646c96e17e994e726cab68b952ff1160583fac
+EBUILD sword-bulcarigradnt-1.0.ebuild 406 BLAKE2B c1645e98dd7b9832fa1fbcc3a3821f1aa1f44d44dd98ca0701266bda9d800090348f4f8bae94a412c2f1e52cfa515f00fa22d8f3ee30e307ad616e8bad9af024 SHA512 44c99cc664db5bfa73110932645ede8e60983114fc85c917b22eb99ace66103a7465dc11298c8989db08a6b4df73dde1dc52ec377a51a0702daba8e51c2902fc
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-bulcarigradnt/sword-bulcarigradnt-1.0.ebuild b/app-dicts/sword-bulcarigradnt/sword-bulcarigradnt-1.0.ebuild
index ce80da32ab32..5a1eedc52400 100644
--- a/app-dicts/sword-bulcarigradnt/sword-bulcarigradnt-1.0.ebuild
+++ b/app-dicts/sword-bulcarigradnt/sword-bulcarigradnt-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,6 @@ inherit sword-module
 
 DESCRIPTION="Bulgarian New Testament from 1914, known as 'Tsarigrad Edition'"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=BulCarigradNT"
-LICENSE="freedist"
+LICENSE="all-rights-reserved"
 KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="mirror bindist"
diff --git a/app-dicts/sword-bulveren/Manifest b/app-dicts/sword-bulveren/Manifest
index b166398a0e43..cc0ec5df25ac 100644
--- a/app-dicts/sword-bulveren/Manifest
+++ b/app-dicts/sword-bulveren/Manifest
@@ -1,3 +1,3 @@
 DIST BulVeren-1.0.zip 1827256 BLAKE2B c376e621ae066f3e29ffbfb1f9645e7e6ddd45b915cc38a4bd453f9200915bff4703fa2e3e8d241a0bd10441c9411bedeea6c9fb2c64ca4cc657c3d36ece850c SHA512 87f7499a27c155e9e4717849d26cf394ccb1f19943e8d7c8ba224ed8a3681a773bb38e6bfab7912138d451126f02626b46ea2265d810ca459110557aecf9518f
-EBUILD sword-bulveren-1.0.ebuild 325 BLAKE2B 244e9524e121442e02b22af9bf3d02c467a4aefd141077c9a181e656640e285ce70a879beabf3fdb47b9facda78f108acb7a732560db14de64972b7c7b45ffd4 SHA512 6bb1627449853b2412e5287a72495949a6bf148c9547435883922c6f0dbfe7e5a12ad2a2864290fafa207a3447f3b277831b1371d21d3b4c660bd20be6100c28
+EBUILD sword-bulveren-1.0.ebuild 326 BLAKE2B 1d7cf562d82776fab255f3b105ee18c7497ae5f154ba37ffdcf07ffd06b72a187b3068c2bc22f379eabd4f62f8c460a73acf27ed2d24f9cd65735ea84845a3c8 SHA512 13b05d2496b42b02a28f905722e3551f80e0a65e8d94f504f2348c8bbcfd7dc77227491f7966e19a311d3b61c9c7449d8a8995c773de2228f6b30585f2ad75cd
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-bulveren/sword-bulveren-1.0.ebuild b/app-dicts/sword-bulveren/sword-bulveren-1.0.ebuild
index 60bde39dc185..aab37d09b6f1 100644
--- a/app-dicts/sword-bulveren/sword-bulveren-1.0.ebuild
+++ b/app-dicts/sword-bulveren/sword-bulveren-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Veren's Contemporary Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=BulVeren"
-LICENSE="freedist"
+LICENSE="free-noncomm"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-burjudson/Manifest b/app-dicts/sword-burjudson/Manifest
index e3daf4ea4979..d1546fed9ad1 100644
--- a/app-dicts/sword-burjudson/Manifest
+++ b/app-dicts/sword-burjudson/Manifest
@@ -1,3 +1,3 @@
 DIST BurJudson-1.1.zip 1990168 BLAKE2B f2073a2bdf41df690c5224a25ce8d2ce86bc1a896b5355de8bb1a7486bb0f06c807e23ebf04da16ff734c1a0f4a31e214740b4e3ce5fff31f6253dc0df7b7ca3 SHA512 49e3d9fcf0d12ed5923f81c4fd5d6e0c34b066d992ac9944617fb8dfc734e493f78a60d18966b86557b9477c5d5d5fde17699b5b1bcc8d0ed8dfad20677fdcae
-EBUILD sword-burjudson-1.1.ebuild 326 BLAKE2B 06d21786a8487077876c19d8bd976470a84f294179c9668a7f7172a22b9a867e6c0ab8d25d7b4d662f48447d1be438b192c2747aad3c281a4963394f544da5a4 SHA512 710365a01473fdd8c1d1dfcb16b973284ffca29e191b431e504f51edbae0acd1dfba1cf586f3b0f9017018e0e03fa5149b5f531c033ca395da92b481fd4102ba
+EBUILD sword-burjudson-1.1.ebuild 328 BLAKE2B f1f269c3e30f902322847f9095d072915676cfd088bfd5569ceb3ea8c4d049be4dd2d5f1a83312a787522f1d24b8823683dabad133a8be19cfa09ae4d6c3b2df SHA512 30df7f18d58ae4bbd565179ecbb027d73341b9f8d041f89509d82afac565588bca9684bf58ed339e660a6dc1a418efe6eb55b2bd76ceb958ee33452e8db2bc20
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-burjudson/sword-burjudson-1.1.ebuild b/app-dicts/sword-burjudson/sword-burjudson-1.1.ebuild
index c54a383e1a5c..73d515c65a72 100644
--- a/app-dicts/sword-burjudson/sword-burjudson-1.1.ebuild
+++ b/app-dicts/sword-burjudson/sword-burjudson-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="1835 Judson Burmese Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=BurJudson"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-bwe/Manifest b/app-dicts/sword-bwe/Manifest
index a696cdc6e6a4..d317caa6d7aa 100644
--- a/app-dicts/sword-bwe/Manifest
+++ b/app-dicts/sword-bwe/Manifest
@@ -1,3 +1,3 @@
 DIST BWE-1.0.zip 368050 BLAKE2B 81e7509e137186dac9680f6a8801baf25439484342f0932b47138991155bc3393c852526047c336c93362d4a5af998b7fdbb402929c95a2a2a1a91fe716cc70b SHA512 80b1122b837e8d987378ceed402b145ab859d979fba25e6017d414a1f3f6ad20562d903a676c5883b0465518b7ab4813aa7a0b546a32ee30590d82d68e78f2ff
-EBUILD sword-bwe-1.0.ebuild 315 BLAKE2B beb5800b5381b6b436b62bba822bf0ae92df59ba72dace347541b2750b56b1d97efa828a517874b02f76c9a32e1186b23cb89ae94049556a75a8ba33f4532b23 SHA512 e7fd43aacbd75a5d2770b145a4a85936d218603c10307d0ef5f419feb8d6bf48db4f87b497fd21e71e41ab1d83e1867bd54a681e283fc8e59a742985284c391f
+EBUILD sword-bwe-1.0.ebuild 349 BLAKE2B 1c04371ed768f0947f1e24a1a9f520de2d43ee69ef1442c661190240669f951d2af0eaa09176e3f3cb4d2cc03f5695292d1631d2ae9a08af4746ab96efb477ce SHA512 6b2493b7b3363978af20e101248e4e14733695b8024e2c89f715324397dfd0a19679362120a79b7a7d4b47e3141aa9917c97c6b1aeb6830324072a79fe2a0cce
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-bwe/sword-bwe-1.0.ebuild b/app-dicts/sword-bwe/sword-bwe-1.0.ebuild
index 6031c51b42e4..b82abf1d835d 100644
--- a/app-dicts/sword-bwe/sword-bwe-1.0.ebuild
+++ b/app-dicts/sword-bwe/sword-bwe-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,6 @@ inherit sword-module
 
 DESCRIPTION="Bible in Worldwide English"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=BWE"
-LICENSE="freedist"
+LICENSE="all-rights-reserved"
 KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="mirror bindist"
diff --git a/app-dicts/sword-byz/Manifest b/app-dicts/sword-byz/Manifest
index bcbab35c4936..e5e5f732a5ba 100644
--- a/app-dicts/sword-byz/Manifest
+++ b/app-dicts/sword-byz/Manifest
@@ -1,3 +1,3 @@
 DIST Byz-1.10.zip 1263944 BLAKE2B ba0985666992db19bdac5d7960686d6ffd06fdc37d1444b5949e073e45d25dcf1f99ede807a9f5e9ed02fde7d412a9f06835557d8ca7a2097f83df5cdd5a082c SHA512 e47ed94aa465932191903f8199ab119ca6075807cf2c693c04cfecf27b2b128d3f757c57929151e16f8e014ffcb8ef303702642b8863100fd49e6a54120a3727
-EBUILD sword-byz-1.10.ebuild 319 BLAKE2B faef8a41a9eb571c3d2fa23b0dc64aa177ca5230c42504729f3ef2b01d39b4d2f260044ae6a93716b3cac88332f3f8e338a8a437f37208166b9c3d2e6e517a15 SHA512 232f19978e08039b208b82e359e973ab807ff4d5511dc34a08b77097c044e0fafaf9e28d360ffcea18dcf1c782b688ff5f26ef965e2bdc8adbab3bc9e3c08c16
+EBUILD sword-byz-1.10.ebuild 321 BLAKE2B 8c51463e36cf595a1db4b9f09560bca8fc97af32a892bd4426b0a1c261e8e9791145649d09fc5194a70bc0c0e0d5d70623c9c00be2e676eacc6d80501c62bb63 SHA512 b324384c8e8e6c03286536e2b6423023ec75cb4f431324422e9853bf1bcd8aff3f5955e41d8a2ef20c1ba89e3424003de1168e0110c998120844dc06a269a092
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-byz/sword-byz-1.10.ebuild b/app-dicts/sword-byz/sword-byz-1.10.ebuild
index e55491eef143..33dafb8b91eb 100644
--- a/app-dicts/sword-byz/sword-byz-1.10.ebuild
+++ b/app-dicts/sword-byz/sword-byz-1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Byzantine/Majority Text (2000)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Byz"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-chincvs/Manifest b/app-dicts/sword-chincvs/Manifest
index 107cf1910a52..275dbf27f74d 100644
--- a/app-dicts/sword-chincvs/Manifest
+++ b/app-dicts/sword-chincvs/Manifest
@@ -1,3 +1,3 @@
 DIST ChiNCVs-1.0.zip 1481069 BLAKE2B d42704b900f65aa805a49218b3cd27cbca4e72ce1885f5cad2f139542e0dea6d7671670e419baff054aa84f6a268d1e1f7dc44744619de604d2516b7af2584c7 SHA512 1cdeaaea9cb475ac73f5e6104f2baed09a3e7c003bd8e471f025eaab98dea30400cdb1619bb51db1c7065a192dcbe86fe99cda8145c9ff770f321273f24d4d2f
-EBUILD sword-chincvs-1.0.ebuild 327 BLAKE2B 7b6be482602e1b6d292d2b8ef8fc4c977bf72a2d6ac4550578afbba2f41cc92783d7e3cf96229d38af0bf594cddfe5390e124e9bc88ca16ece577a6f7e72a55b SHA512 e0bd60964496d3dcd4ad61c33c35f410287171730db34740248b0b1305ada0c950d096b57ca38457735dcd4367ba4a2184c92c6a2965dac5ea430493fa4b22ee
+EBUILD sword-chincvs-1.0.ebuild 361 BLAKE2B 6ef1a67a36872264fa9429a8fdfb7e465250addaa17c76cada354a964d64b7381406f2f15dde85049031deacd162921be2b01fbecddd5f6caf4cd481a4250d02 SHA512 920a2baab4bc6a09dade4cc1e68fabfd388ad9c6c33aa0958c2c189b4b80f370b65feafeb28dc1d17b2dfe2963fafbcb0b5a0176d5c349a7e7f8728f1b626656
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-chincvs/sword-chincvs-1.0.ebuild b/app-dicts/sword-chincvs/sword-chincvs-1.0.ebuild
index f144682881b1..94001ea724af 100644
--- a/app-dicts/sword-chincvs/sword-chincvs-1.0.ebuild
+++ b/app-dicts/sword-chincvs/sword-chincvs-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,6 @@ inherit sword-module
 
 DESCRIPTION="New Chinese Version Simplified"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ChiNCVs"
-LICENSE="freedist"
+LICENSE="all-rights-reserved"
 KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="mirror bindist"
diff --git a/app-dicts/sword-chincvt/Manifest b/app-dicts/sword-chincvt/Manifest
index 60cf7d8743c9..5c28d9207a03 100644
--- a/app-dicts/sword-chincvt/Manifest
+++ b/app-dicts/sword-chincvt/Manifest
@@ -1,3 +1,3 @@
 DIST ChiNCVt-1.0.zip 1481302 BLAKE2B 3e1c1892a38ca0ddfc4aed197993bc48d2c49e43bf59903f9e0a1780f0a22d3d12ef368a3987c940f389a0af83f4a3d2b760842ecd1c9e19acf78e18f5727121 SHA512 32e320c251e36b9cda9fa9a698d9de146ea0696e4d5bf6f9ed49239e59129aec92318bfa02b9d70112488bc6a2a0a6901cb68c329cb39021daee78f82318cf69
-EBUILD sword-chincvt-1.0.ebuild 328 BLAKE2B 8208c84a657e566b9483534812191f786440a73c9169b9d02cc9033f37ee3aaa7ec2f901c0a4186f5fb0ae2ff1f1ce2551b7f13c5084e520a9c1f7508dbdb7d1 SHA512 7ede46058ddf0a8df54bfcb2ac801fa9f3ebd9250ca55bf09722802f997a75ea736ec250e58e2cfc3f737172a8c61acc9037e48471bad6e33b5e3350b4d356d2
+EBUILD sword-chincvt-1.0.ebuild 362 BLAKE2B 81854afa9468d18a614e85a04b4240624a73434fb3358ab596f1c2fdcfa713d127c31053fb390f533ee2f0c399504832bb0ab681a96c24457bb5401bb07d56f2 SHA512 fdade557b4fc5de2bc5bd3cb53c761e5b23ad1c0ecf32d3b870855ceab028850709a1852fb29cd46c836c32979b16a64cfea5d44e01c5fae3f81106f8438350c
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-chincvt/sword-chincvt-1.0.ebuild b/app-dicts/sword-chincvt/sword-chincvt-1.0.ebuild
index 3a7ecbd96d09..e29cceffe4b9 100644
--- a/app-dicts/sword-chincvt/sword-chincvt-1.0.ebuild
+++ b/app-dicts/sword-chincvt/sword-chincvt-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,6 @@ inherit sword-module
 
 DESCRIPTION="New Chinese Version Traditional"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ChiNCVt"
-LICENSE="freedist"
+LICENSE="all-rights-reserved"
 KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="mirror bindist"
diff --git a/app-dicts/sword-chiun/Manifest b/app-dicts/sword-chiun/Manifest
index 04e647c075f8..872d4712cfbc 100644
--- a/app-dicts/sword-chiun/Manifest
+++ b/app-dicts/sword-chiun/Manifest
@@ -1,3 +1,3 @@
 DIST ChiUn-2.0.zip 2244478 BLAKE2B 09fa738e82b8b3845a830cc1798be749a05490bbe3b3e3936d073f15089e5b0c6b9568c56b03b3878ba2458109f5d38ecc0de40fd78dad2cd86d797467fca16d SHA512 ab8f0b04eda087b8589ef1ccd3c843ccd66ba4f96faa31e71b129ac010e3aedcf12bab387d2dce991c88ee78f11b5ca5525c6f458ea15bee48f12059926dbd7e
-EBUILD sword-chiun-2.0.ebuild 326 BLAKE2B cbe2eb97ffdb8e376191feb50cb7d7f1f618f70556344e3f50a2b9ca220887858b63a6861720d2702208673e05a4f7a2d518261fbd9c677caa9a3c8d0ab5bca1 SHA512 b1d63ff1bf3ee541cddbf45cddb82ec523b440aaa4a3efad2eadaf22f9b93cd721800282b236246612b663986aae739be4eb89857bd656b34169c271a513c09c
+EBUILD sword-chiun-2.0.ebuild 360 BLAKE2B e4bf386b2c64102dcd845ad18ab971acd4b426981bdbb420c2c9a5b81a707800a459279ba4715b4a0a818963f1d37f19b831e37e61530760acc1f332b22db979 SHA512 d814c6938954149b2321cc71473749d7c38544d7684f98060a08c69cd6a484419cad657627b28bae6d840e4c5c89ba59e796d91cf0a7536cc6273aa240ff59c4
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-chiun/sword-chiun-2.0.ebuild b/app-dicts/sword-chiun/sword-chiun-2.0.ebuild
index 29e2a57f353f..cd9e0a2b9d19 100644
--- a/app-dicts/sword-chiun/sword-chiun-2.0.ebuild
+++ b/app-dicts/sword-chiun/sword-chiun-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,6 @@ inherit sword-module
 
 DESCRIPTION="Chinese Union Version Traditional"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ChiUn"
-LICENSE="freedist"
+LICENSE="all-rights-reserved"
 KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="mirror bindist"
diff --git a/app-dicts/sword-chiuns/Manifest b/app-dicts/sword-chiuns/Manifest
index 6e6c3606b587..6cc84dc54582 100644
--- a/app-dicts/sword-chiuns/Manifest
+++ b/app-dicts/sword-chiuns/Manifest
@@ -1,3 +1,3 @@
 DIST ChiUns-2.0.zip 2241348 BLAKE2B fb9133899c38d552185a492f081f99d959082359020419e8e6292e6d9f9930678363790e3aa23bb474ca6044a2fbf522e9f3e5ea253bcab1d8cd509f34786e45 SHA512 ed11e0006ca6aed353a4691d1ba37885db4953dbc5593a9d41159136a3e55711e1da65536d3b9e9718b0c661b46fb058f4eaf1419168d3b6bfa0d716564192d0
-EBUILD sword-chiuns-2.0.ebuild 327 BLAKE2B a11f5ce9a151ea09f517168dbee8355bcc60566604f6e329fc7ebbba4e7012f30e0158c49a4c149313ea4dcc101ae0882ba7dcb322d9f7e33dc2d2b5b1f77c0d SHA512 123d66b21e0da6e939865d35bbe5a21c27542de6183bc6aebff896deab180b8c2aae09815112f081741c564be0d5d0fe3c0f239e1e1511a94ac7a41c5f24a5dc
+EBUILD sword-chiuns-2.0.ebuild 361 BLAKE2B 3c45646254c5730055f014769636db6e21b107d64458cd9eb54b610291765f38787919ed9ae7b2a94157f5bbdebe62972e968f470d74efe5d9e69d4542bb49bd SHA512 4d077b6499de32cbc4796095a8e3c61eb073f717311cf28457de08210bd4ff516ca419654ce7aae7ad9a8118ac83a4b133a979f6d79f3e43db14fa5cd8ddf27f
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-chiuns/sword-chiuns-2.0.ebuild b/app-dicts/sword-chiuns/sword-chiuns-2.0.ebuild
index da469e99212a..f683df7b37ff 100644
--- a/app-dicts/sword-chiuns/sword-chiuns-2.0.ebuild
+++ b/app-dicts/sword-chiuns/sword-chiuns-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,6 @@ inherit sword-module
 
 DESCRIPTION="Chinese Union Version Simplified"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ChiUns"
-LICENSE="freedist"
+LICENSE="all-rights-reserved"
 KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="mirror bindist"
diff --git a/app-dicts/sword-cro/Manifest b/app-dicts/sword-cro/Manifest
index 773e17f60900..e8123bd1a088 100644
--- a/app-dicts/sword-cro/Manifest
+++ b/app-dicts/sword-cro/Manifest
@@ -1,3 +1,3 @@
 DIST Cro-1.0.zip 1466438 BLAKE2B 09b11d4369474f55bad69ef40fee11b902995f8d08af21cf1ec03c79045e5070ecc9f2e03d9fd68573490d64b191c70b3aece05f16f449c1d88c2185903b0b07 SHA512 7814ad640be617451aeaaac04441d3231fab27b6298e86e4fbd1e99f70a4be95419ab89dd5fde283969ea2c91192e2051eedb5d5191fc35425df0cd072e0a5da
-EBUILD sword-cro-1.0.ebuild 303 BLAKE2B 74f7e0762137a641a1f78bdeaa13b8f514483589bd15d3e1d9f0f1c34f08a66470482e2653804819dac0d43dd28a6a47868cbb1949e830233fa245e8dd32cee3 SHA512 3a282bedf4694507d4a02caf235900a6691e93a1039831f11bffc178a466b62c9028afa19e04e8723129b5841e91b7fcbda8ac72122a3b4d75ce5fd6d0089928
+EBUILD sword-cro-1.0.ebuild 305 BLAKE2B f3b4854e81af7bf7f9b58e41f7fb1662c0e05252859699d7d2159e10989444a4d8363a62c03a93fc251cba230f5a15b30cb9bd4d2855c2c9d83ecca6eeba4f7c SHA512 0475c9313f6f57a82be36e594251db665310959a47cbe43b1b06e5c81406aab165d8074002445b875ad913eed1e754752d1dca0ac9e13a39cef094d7d314528f
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-cro/sword-cro-1.0.ebuild b/app-dicts/sword-cro/sword-cro-1.0.ebuild
index 2b8bc97a28f0..fe14a1e2edd1 100644
--- a/app-dicts/sword-cro/sword-cro-1.0.ebuild
+++ b/app-dicts/sword-cro/sword-cro-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Croatian Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Cro"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-czebkr/Manifest b/app-dicts/sword-czebkr/Manifest
index 112390c2891e..52393e1cd9a7 100644
--- a/app-dicts/sword-czebkr/Manifest
+++ b/app-dicts/sword-czebkr/Manifest
@@ -1,3 +1,3 @@
 DIST CzeBKR-1.1.zip 1534887 BLAKE2B d701614bab254e2d162569f060ba8ff24a15c8a9a8fb34c8c165186d8f88064ac29246fc5b13ef7b816a7d0e2d6fc54c27404bd7c1830e544a5fecad80c2c3a3 SHA512 b2b2b4ba6643c59a81e2491b277d10034d53864c258bfad78b03fb9a90f1f89e5fab62b36cb7441e09ecb046eaa9678823bace2f48b959bf6388b9ff0c684b88
-EBUILD sword-czebkr-1.1.ebuild 315 BLAKE2B 1a364030ee675d1da62f894c4bef99728facb62dc71016bf0cc1e7c438f7c52cd74a1854af6f87670d10b3da2bf9e9207a3b2c10abfeb01deb390687712b3741 SHA512 1649a0b65edb0ea731e1d33f5bd75eb56fa20dc3c5f8d924c535fc373b8a05dfeabd314546fdeb67858f1248aca6c8314289cc876c11549e4f509d8c0acffd3c
+EBUILD sword-czebkr-1.1.ebuild 317 BLAKE2B 6faaeed8ce34447a7d78c25288a042bf9f3b575495cd31de76cc9cd5c5627b5f500f7d92e07687ba7d358ca9e671542f807a11412dfaf2b225c41ac0a28e9fbe SHA512 a1bd128b4c03d3b6c0253f5e13eda595e18aa333db350f8bef1f33ab21a1d20ccae95d98c6678d7a73b48c16890931dbdc02be8cf41aa8bcce4aa95b897e91cc
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-czebkr/sword-czebkr-1.1.ebuild b/app-dicts/sword-czebkr/sword-czebkr-1.1.ebuild
index a6be6b57f90d..b00a5cc9a577 100644
--- a/app-dicts/sword-czebkr/sword-czebkr-1.1.ebuild
+++ b/app-dicts/sword-czebkr/sword-czebkr-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Czech Bible Kralicka"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=CzeBKR"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-czecep/Manifest b/app-dicts/sword-czecep/Manifest
index 1322ec45d7aa..7f301103fbe9 100644
--- a/app-dicts/sword-czecep/Manifest
+++ b/app-dicts/sword-czecep/Manifest
@@ -1,3 +1,3 @@
 DIST CzeCEP-1.4.zip 1519391 BLAKE2B 57815835904c9108c8eab0a607d7f97f004e2a83f70433240579c52e3d2ea74ab5f496f183ba2426c690a59159762848b5962ceaecfdf503e25646a7dd4d8d56 SHA512 7ff886d15050bb79c5832f863ffb6e39850b107aedaa0ce0826dba41df393c0c86eedcb632f60b905f14929826dd27606c98eb638a2f57332e331d9563afbf1b
-EBUILD sword-czecep-1.4.ebuild 325 BLAKE2B 6cecf143302afbfc6c63cdf10b5f8437bcd56de013aa7e0d9915ef33d92963addcdc815d20ce1a078aeb248bf58c3fa98fccd208737b33b667bc849e04dceeb9 SHA512 9e75731326cf41a77f29a90e8f9246a202bc6de48fd36803965c6e798cb3b605bad88cb7299ccf9f3605ec2ddcb0ab6b2d32733f5040bdfb2dc8174c12717690
+EBUILD sword-czecep-1.4.ebuild 359 BLAKE2B 78f1c13bc78f066f4180310fdecb6d6eb92b7e67769555a3c8cb1dc810439c39ec9970aab6ba19753f0d493c1c7c8745dce19a9184848564cd5d8a07381cd366 SHA512 755b7a831f146f4ea25b4f7b21950b6647f4c18c9db39612e7f3c369add22f1d97a97bc5e7a4e0611fd9f4d2a8813c14c2bc172e53ead921a3b3c7f6d010d88b
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-czecep/sword-czecep-1.4.ebuild b/app-dicts/sword-czecep/sword-czecep-1.4.ebuild
index f2d268e7e721..f1ed64f5c97b 100644
--- a/app-dicts/sword-czecep/sword-czecep-1.4.ebuild
+++ b/app-dicts/sword-czecep/sword-czecep-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,6 @@ inherit sword-module
 
 DESCRIPTION="Czech Ekumenicky Cesky preklad"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=CzeCEP"
-LICENSE="freedist"
+LICENSE="all-rights-reserved"
 KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="mirror bindist"
diff --git a/app-dicts/sword-czekms/Manifest b/app-dicts/sword-czekms/Manifest
index da0ce0c9fe72..66bf764686f3 100644
--- a/app-dicts/sword-czekms/Manifest
+++ b/app-dicts/sword-czekms/Manifest
@@ -1,3 +1,3 @@
 DIST CzeKMS-1.4.zip 376709 BLAKE2B bf3f3e145f7843c20f3eec8b5ee857031d256f791f4e7acbba5f225f9e4eef93a5841a61ba68ee732c141f7747c50fb2615ec5cafac95a14a185076e4869ccfc SHA512 506389690981378474a2de660fc2aa204d0f24200aacb740f53acf77fad1fdbd5f9f1b0e1ea119a4c4969382d2e12bf7f6f05353c9dff047c0cbaf40102c247c
-EBUILD sword-czekms-1.4.ebuild 325 BLAKE2B c92ce94d11b539cc8119bb16c44467e9126b5c440eea1b657ec383028962741441bbe75a2803a4baab31b9e27b2774e14442ae697b2891c7854bb5ba2e42701c SHA512 6f155a943211955e018da7783c4e9e13c103acc706ab667629a1d89ba6cd059f635af3eaafa1dc73873665967927724e21669541e045d4b9c23d996212d4f67f
+EBUILD sword-czekms-1.4.ebuild 359 BLAKE2B 7c730dbfb23776cba867ff6564310fad9e0d7c21517afcd92831a87a24de200461dc9729189edb03572d78426e340be9183268fa22dfa088fa75d30441024485 SHA512 17dbce72dfad618f5e46d8fe0c5e9bbcd691f08aa5816be2a7236fbec580267c3a71bcde6e15cd8a0a0e12a61e44ee67813cbb02b83d2c0bd6c8897a890d9c87
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-czekms/sword-czekms-1.4.ebuild b/app-dicts/sword-czekms/sword-czekms-1.4.ebuild
index 84ebaa6e531f..3c238233d63d 100644
--- a/app-dicts/sword-czekms/sword-czekms-1.4.ebuild
+++ b/app-dicts/sword-czekms/sword-czekms-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,6 @@ inherit sword-module
 
 DESCRIPTION="Czech Preklad KMS Nova smlouva"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=CzeKMS"
-LICENSE="freedist"
+LICENSE="all-rights-reserved"
 KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="mirror bindist"
diff --git a/app-dicts/sword-czenkb/Manifest b/app-dicts/sword-czenkb/Manifest
index 54dcaf720419..894b220c271b 100644
--- a/app-dicts/sword-czenkb/Manifest
+++ b/app-dicts/sword-czenkb/Manifest
@@ -1,3 +1,3 @@
 DIST CzeNKB-1.1.zip 385230 BLAKE2B bbe2557734a66a9c67a92636ed49a15a25a6e1700b7339ecf2234457351275f40e632efa6e38cbe267afbd29ee93c4f4a0fe74bebad61e68b9c81b6af3ed29f3 SHA512 1015d1f71e15174c15c7e485c314f00b8a3d24ac25a268c33d24287b1ef32f240403bc6bacba646018c377e1aea9e2901725c96fdc27cd820946ba5e36b37ec4
-EBUILD sword-czenkb-1.1.ebuild 320 BLAKE2B 6df3f01e8ea5e24cd621ac8ebd2708f8e799396f7d4961930067e48afda3393c2516418689ef9c761c972b9f277c7591b846f62ab227d415025bf21499b0348d SHA512 2e559ba4f10afb10b7ec9281e1977940ced2f6257cc4bcac3aaa12144f42703cb3006619d3a2d6561df91569664cca627085da9c081c8d3f217e207e72216de1
+EBUILD sword-czenkb-1.1.ebuild 354 BLAKE2B ea205e0bbf6877be9563d87a93a986ca7418e17f3b09d3655aadb9c114864a6db82ebc79bdaebce272e991d629bbecf60e26667ebfaf23a6756018da26dc19de SHA512 8ebb67ad95c390232e7cebf5575df1aa76b418a9ca864f20997d60bdaf0a6abe5822fa13ee7e0a7355b7d6ad818c9438ef59492e70fd693a4737fc8cb9661b5b
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-czenkb/sword-czenkb-1.1.ebuild b/app-dicts/sword-czenkb/sword-czenkb-1.1.ebuild
index d6c8a9d58ec3..44ae993d6fa1 100644
--- a/app-dicts/sword-czenkb/sword-czenkb-1.1.ebuild
+++ b/app-dicts/sword-czenkb/sword-czenkb-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,6 @@ inherit sword-module
 
 DESCRIPTION="Czech Nova kralicka Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=CzeNKB"
-LICENSE="freedist"
+LICENSE="all-rights-reserved"
 KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="mirror bindist"
diff --git a/app-dicts/sword-dan/Manifest b/app-dicts/sword-dan/Manifest
index 1ee4e4aecab6..92bc2dbde93d 100644
--- a/app-dicts/sword-dan/Manifest
+++ b/app-dicts/sword-dan/Manifest
@@ -1,3 +1,3 @@
 DIST Dan-2.1.zip 1396887 BLAKE2B 374aaf90a3eee5d0a5c00c5e894421caadf5488bca04c171beb87f4ed51d7833da3e7c3ea0cc0b67696b5c31305d4425fed8b06c55d5ad475a0855a1aa323544 SHA512 e9b3553e4dc0aa4d668b005eb0dbca08a435a2775c5449d2e54e60f44abac3ebfb54de8eca9dee77c740d545e2d732f6b2044d297a384d8538ba53ed4cd24c83
-EBUILD sword-dan-2.1.ebuild 306 BLAKE2B 21b865f5a39275894978a197b64f98daf26651a580e97933d5ffe7c200d843044fd07f454a8cf07e686a60ae7cf3a7596d4ad44789d843d0a41f8cfc89bc314c SHA512 8b2394e119182fa3924496a38431c88cb7cd211c2638fa40ce286105db01154002ff2cde19bcca0a53d87787fa6e298960c49b15bc6a1d99d3ad30ea34852846
+EBUILD sword-dan-2.1.ebuild 302 BLAKE2B c8e909dcf052cac6c01ae981765a7929015b249d5ab74d089025fccc70c7cb610d94e374b895f430b89b1c9ea7e7703b10085f244d976e59d16366b7eafe6775 SHA512 55a12037637a284dfff494b7f3c9fab7a405eb5aeef04828274fa649552289a49459876fd30502bb3b0c638cdd0c1c0019e7948f8c17e7ad17923d012f2049a9
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-dan/sword-dan-2.1.ebuild b/app-dicts/sword-dan/sword-dan-2.1.ebuild
index 1508a4a76be0..65fbc448294b 100644
--- a/app-dicts/sword-dan/sword-dan-2.1.ebuild
+++ b/app-dicts/sword-dan/sword-dan-2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Danske Bibel"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Dan"
-LICENSE="public-domain"
+LICENSE="free-noncomm"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-dbd/Manifest b/app-dicts/sword-dbd/Manifest
index 8c021beb727a..8e081a396f39 100644
--- a/app-dicts/sword-dbd/Manifest
+++ b/app-dicts/sword-dbd/Manifest
@@ -1,3 +1,3 @@
 DIST DBD-1.1.zip 356984 BLAKE2B f1720bb96f39d26175423bf7103a09ceae994567ddd3552a24b7c622806d15e05f0754fc29faac76fb5545d12a8cae9241ffb749051a953ee1494f2a9764868d SHA512 c190e7b3d0ac13b72107f0f4a177d38a4cda3fe6b9c62dbc9ecbce68d711e7ffb61a805ba8c77cf9fbe917d54da1e73e1a9174970b0848b79e05a8d299d000a9
-EBUILD sword-dbd-1.1.ebuild 323 BLAKE2B fcee72b529b0dec550852e022d66cb9d06bd526a05493a5ac12ffc1992c62c1cf6df521abf86c0d4a0887ba32c1c61f5ad94216a37b73d927deeae4e71a4b8f9 SHA512 492109f526e3092f5bc9f65187388259c4612a3badef5c467497079b7d8654ce1df206177105a1f97fbf20abb4815f0bc322ced73f6813227ea3c756493637a0
+EBUILD sword-dbd-1.1.ebuild 357 BLAKE2B 8cba99c874df2b13516266860fd96b0c0626dd12c37a196302fd682108029d50d5f258e9187cfedc3aeb295379f86025fda240e9da69c67a8a6a80aa532678a2 SHA512 68dd0de926ca2dbefab140f046f4fa09b68f390bc6808ee4b386f4d5c21d85883660793a385cb22ae6130dd08bc4620ccb59cfdb383feb075db4824af72fb6a6
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-dbd/sword-dbd-1.1.ebuild b/app-dicts/sword-dbd/sword-dbd-1.1.ebuild
index 354fc2002eab..61e1569bc230 100644
--- a/app-dicts/sword-dbd/sword-dbd-1.1.ebuild
+++ b/app-dicts/sword-dbd/sword-dbd-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,6 @@ inherit sword-module
 
 DESCRIPTION="Day By Day By Grace - Bob Hoekstra"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=DBD"
-LICENSE="freedist"
+LICENSE="all-rights-reserved"
 KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="mirror bindist"
diff --git a/app-dicts/sword-drc/Manifest b/app-dicts/sword-drc/Manifest
index 309bfd673e26..5474fc653e1e 100644
--- a/app-dicts/sword-drc/Manifest
+++ b/app-dicts/sword-drc/Manifest
@@ -1,3 +1,3 @@
 DIST DRC-1.1.zip 1424819 BLAKE2B 43f0e506e83f43cbc46420538810ba4844491558147cc4654b2fc1f5eb95faaa99d47d666fe6e6a9f2b77548c3ca8846d17d941f2661670e032738e258f2a3c0 SHA512 61c5ac8b30a9ef57f46129e91854f69203e06b38fdbeab22c020ac00b7024a27143af27ec33f9d23b68d6e824747784995bf929d389728b7fca7e5f87da81bf7
-EBUILD sword-drc-1.1.ebuild 327 BLAKE2B 35e3294e64dcd70ebeefb91174eb7bfaf55c6541a95e826fcaa03319ac2930137e4f9855d5db654f2730c7e269550679ddc3f7a6de3698f9f95870836c1bb2de SHA512 fa8ac827b962c43f6e7fe7a0910514590a0030ec012be5006b71c26a2d83bb2b29e53849fc08045d5d278df6e60671c5e355ef7cef3c6ab3f4d3bde18aade3eb
+EBUILD sword-drc-1.1.ebuild 329 BLAKE2B 2a7aea11e7b9e405e0f4527d7e6049f1f3b9dac866ffb9968ea7c641ce5a3ccba08ee411b8beb1336c0e23877ba0b165c43974735ba1712597a6404f60dc0fdd SHA512 581974519c087a962aea54c2c9dca1d2c78439af89cdd5c87d7515ac9644dae80f1178bf2ca466df342c203628d7c90538bdadc7bcc342a98acf69a634e395d4
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-drc/sword-drc-1.1.ebuild b/app-dicts/sword-drc/sword-drc-1.1.ebuild
index 48959b13e77d..71fafbb9a31e 100644
--- a/app-dicts/sword-drc/sword-drc-1.1.ebuild
+++ b/app-dicts/sword-drc/sword-drc-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Douay-Rheims Bible, Challoner Revision"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=DRC"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-dutsvv/Manifest b/app-dicts/sword-dutsvv/Manifest
index 4d8a6c4f0ba8..287cd8c11457 100644
--- a/app-dicts/sword-dutsvv/Manifest
+++ b/app-dicts/sword-dutsvv/Manifest
@@ -1,3 +1,3 @@
 DIST DutSVV-1.5.zip 1534052 BLAKE2B 35721a18962cda6b91627be29946ebb34751cf73b8825213c77c213e7e54c95b4c2b72a4a72dc0c83773fd0ba1abc8dfc7f112244c8f2ecec5cce63baf38ee20 SHA512 d974f707b30b35fb18b31146298a631a88103267bc75a584e93d3cf27879ace97c4229717e95fed9a382e49efe1434028f417fa614ec0a8c8ca8fe8d72bf5388
-EBUILD sword-dutsvv-1.5.ebuild 316 BLAKE2B 36f7e8d05d77d4529f11a62ed3d4266504da6a9d6779a145570e7e14717a3fd0064a0f8194e1e955a5d6b2b735ab4adaa5fe7a35fb1b44dd1acc987e36892652 SHA512 7ab830e68358e0dcb2edaff011c8e7b3d8b69c95cfcfd56a5ac534f24195755958ea39768fa008379cebcda6718414e612af34acc5159e3731d335b0855e21ec
+EBUILD sword-dutsvv-1.5.ebuild 318 BLAKE2B e8a7910bf45b54cc90eaf4a021c52535fcdec9ec906a3fe22666bd4183e1b67a294b422a1dc15d92cba4252d8060f449a7d7b96cf84ee9ab75cdafcd09067e8b SHA512 c2a10f0a8248a664061cd33125acc542239f73269b04d02c13ecea1e4807da14d1b2e8e7866870baad9a60d8edb39f0914dcddc244e8ae2c94ea1d9e87e8e8b4
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-dutsvv/sword-dutsvv-1.5.ebuild b/app-dicts/sword-dutsvv/sword-dutsvv-1.5.ebuild
index 9ca5d3a56cab..3af6796d3e11 100644
--- a/app-dicts/sword-dutsvv/sword-dutsvv-1.5.ebuild
+++ b/app-dicts/sword-dutsvv/sword-dutsvv-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Dutch Statenvertaling"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=DutSVV"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-emtv/Manifest b/app-dicts/sword-emtv/Manifest
index cfc428320928..7ac0b788521b 100644
--- a/app-dicts/sword-emtv/Manifest
+++ b/app-dicts/sword-emtv/Manifest
@@ -1,3 +1,3 @@
 DIST EMTV-1.3.zip 486673 BLAKE2B ab6a4395cbfe344c650a6be7dd1e4c57e60867095520d081778e95eeb89e91a025fa16a5b20d05271528edb096d14f0d8bb46d167a28fe7564c65cb314fa58cc SHA512 ce8e0557f526b6ed383105e19fb101fb96919ddf97061542bccca92605ab8e5538223dd72301e82c3429846715be2dfe1e03b47f9218d7ca576f3109358010e4
-EBUILD sword-emtv-1.3.ebuild 320 BLAKE2B 3690eae858435bf9a530946fc42f841aaebdee8f901b3dba22a9576c4c3c8d6692c971a8e6625acb55c7708167c98e9b67fa800545299e7b9b3690d808f46d3b SHA512 de84dedc992a786c2dbcf45e020e74d7819e9b190a6dcaaec15a40384aa02b1e1a079ed2390b5d448853fab5a4d05732eb3c6ec188e027c6372f63ea84ee606e
+EBUILD sword-emtv-1.3.ebuild 354 BLAKE2B 5960a2f25d2e5b2939b3f57feb970340c63b70ea157ad474361de4597d74ff45c42df5e1776ee418da027f8c880cdadd5aef37cb3e59e8650cfce045af175b68 SHA512 31b8bb83d8d59796b45375c9352630a07d89753bd7c946f34cb84a231e5ff66e277b14f025871141482fb48d99804422c6d7e5acd36e2db88d6a52f5da82c2bb
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-emtv/sword-emtv-1.3.ebuild b/app-dicts/sword-emtv/sword-emtv-1.3.ebuild
index 1d7ec772d66e..578748f3747d 100644
--- a/app-dicts/sword-emtv/sword-emtv-1.3.ebuild
+++ b/app-dicts/sword-emtv/sword-emtv-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,6 @@ inherit sword-module
 
 DESCRIPTION="English Majority Text Version"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=EMTV"
-LICENSE="freedist"
+LICENSE="all-rights-reserved"
 KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="mirror bindist"
diff --git a/app-dicts/sword-esperanto/Manifest b/app-dicts/sword-esperanto/Manifest
index c3a4ddfa81b1..166465c45e6a 100644
--- a/app-dicts/sword-esperanto/Manifest
+++ b/app-dicts/sword-esperanto/Manifest
@@ -1,3 +1,3 @@
 DIST Esperanto-1.6.zip 1391055 BLAKE2B e8871451bd2b67fca767ffcdfadac43aa2c568a5b05868b3c7078163bbcd1c0e808c261d291c561b7730f8762bd83b8ceba2ad497af781fe3c1326de0e1e766e SHA512 783e864df719e251b62c4f4a21f3baa9255f71d59dec8dee3074848ac33f93a0c26ee34f53af4c382978340ec32d6ee180d3403c11ce8682176b4820916cbd06
-EBUILD sword-esperanto-1.6.ebuild 316 BLAKE2B 7a81195745aedfff55829fc0974dc3667b2160f5c4754741e3e1f8048002cd21140ddfe9561f237f6fd60739d1b4bda7c052553502f0347ff2fa5a4d6a729016 SHA512 c3f08da60c44d86612fd0dd6e6311d06517bb7ae52414290aa77b69298991d7dd6548d6a05547eddabb8e991a1bd437a55206f2af7f252f42bb05e2263b0ff77
+EBUILD sword-esperanto-1.6.ebuild 318 BLAKE2B a7fe73a07259ea9d831b8c3297d83d85a0d1d7f36c859a24c63f53f3943856ee0036ae35a6db5c85c8152bac7013a18e8f65ea189bb59f36dd09afcc60a5ccaf SHA512 441378653e22d6d2929304c31c46dac80806eb728e40a784914b0c46671a685cddd1e1bccaa5f47aaa89349b1bda92f950b14f37e3643424b7b8f205015e4536
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-esperanto/sword-esperanto-1.6.ebuild b/app-dicts/sword-esperanto/sword-esperanto-1.6.ebuild
index e9e4fb058d26..eec79bc9d254 100644
--- a/app-dicts/sword-esperanto/sword-esperanto-1.6.ebuild
+++ b/app-dicts/sword-esperanto/sword-esperanto-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Esperanto Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Esperanto"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-est/Manifest b/app-dicts/sword-est/Manifest
index cd5416833d9b..722b35a0eb32 100644
--- a/app-dicts/sword-est/Manifest
+++ b/app-dicts/sword-est/Manifest
@@ -1,3 +1,3 @@
 DIST Est-1.1.zip 432871 BLAKE2B d23b6d61a67881ede7edf14637016073b8f0f3e8e1fe72a4fc8cd7833d66ab59865bad77ba7c55130da88f0cf0907b075a611bea9364964ef0361ca4bc33b252 SHA512 17c54578124884d143609098c641fb07b82937cb74515e4afe14c6e5006532406f84bc84c541c1d596d714127ff35074930491b0a8900f27ec9d9f848f14f4f9
-EBUILD sword-est-1.1.ebuild 303 BLAKE2B d658e3f47508ee4b06d42e4a84d018fc872ec0d4afe69047303d9038652d135f597a203c13004f1b08c24d8900bbf3f417a94d7dd10dd423c8ddf40dd3331734 SHA512 f98c5a7160fd654bcbc6a4cfb3a885212b3772f2192e346d02967400fb1a209ca2b08f569e4b93dabddf757329ebf96533b971da4c3adc4f223866c00ff31c21
+EBUILD sword-est-1.1.ebuild 337 BLAKE2B 2a168048d14c246c70f535925b13abf695d98a84153ceba80b912ce63f0f213e677f2e384acde277d6bdc85e2dae16a15ea229eef6dea6abb80fe6dceda6762a SHA512 8ce6f5a429ca1da65baea52dc92eddaa424406111d685cf7ae6b56abc1c7068d8e282c2f60163bb61f863d8107ee64e0ceda90ce9e79445dcef7d9bebd5ec01e
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-est/sword-est-1.1.ebuild b/app-dicts/sword-est/sword-est-1.1.ebuild
index 177ff743d65b..73103a1ae372 100644
--- a/app-dicts/sword-est/sword-est-1.1.ebuild
+++ b/app-dicts/sword-est/sword-est-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,6 @@ inherit sword-module
 
 DESCRIPTION="Estonian Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Est"
-LICENSE="freedist"
+LICENSE="all-rights-reserved"
 KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="mirror bindist"
diff --git a/app-dicts/sword-family/Manifest b/app-dicts/sword-family/Manifest
index ea875e156f5e..73d9182f0e49 100644
--- a/app-dicts/sword-family/Manifest
+++ b/app-dicts/sword-family/Manifest
@@ -1,3 +1,3 @@
 DIST Family-1.1.zip 561669 BLAKE2B 46d1a6b028ae3299ef500eab80850dd05153772bcd55789ce8641178dc5e80c99197cabf0127a3c4bc0552f072911c3498f13a28e3a75d343b99b6d700a7552b SHA512 d6de98ddd7c2c79f0eebc0828bb2bd4115e47c6a06eba1b5c1cf55ff4074c7296fa7cb00361bea8c99fe820f3af7fceeab6340cb3ee58c7fd1cf897a448dbc78
-EBUILD sword-family-1.1.ebuild 313 BLAKE2B a3665000397ebee343aefaf147a1f686358dbf7a179cfe898f263bdaa99c9af39f36fe4ec2fd5149548914cfb2526ab91cd46829f80efdb90d74bf7ffd6e06fb SHA512 7340e66de9cab483e8fd2ab36d2c5b53328c17dbae90b5b563dfc1be355fe4d5bc73dcbb6264d5690d0438d38918c141a95f4fd7a945b0a262db36d7b3b62f84
+EBUILD sword-family-1.1.ebuild 347 BLAKE2B d7faa311cb75680b034c8819bd82505d7491a26e5be7d8a9aeb91a19ce156bb97e6726d735e08c117eb459af6422d240f86b59e931a912bd7794a3fe2412bcd4 SHA512 d686370f26dc491317834cd42e4c335799c96d7858f18405f6a92933c8f8867f63308d3f0950a2237c22835240dcd38d3a43404da6bfad9ac8e322409c51ff37
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-family/sword-family-1.1.ebuild b/app-dicts/sword-family/sword-family-1.1.ebuild
index 06b114d6d48b..381f6975e450 100644
--- a/app-dicts/sword-family/sword-family-1.1.ebuild
+++ b/app-dicts/sword-family/sword-family-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,6 @@ inherit sword-module
 
 DESCRIPTION="Family Bible Notes"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Family"
-LICENSE="freedist"
+LICENSE="all-rights-reserved"
 KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="mirror bindist"
diff --git a/app-dicts/sword-farsiopv/Manifest b/app-dicts/sword-farsiopv/Manifest
index 09259906a8b1..83140fe718c1 100644
--- a/app-dicts/sword-farsiopv/Manifest
+++ b/app-dicts/sword-farsiopv/Manifest
@@ -1,3 +1,3 @@
 DIST FarsiOPV-1.0.zip 1592646 BLAKE2B 38a667f4b2a97594dade22939f78106e8e1f32f13f7be7deb788a8529bbdda9db46b69e1a568d8ffd96f5cf4a3155a0370f5be9c9fdd10a53196c79b2badfa5f SHA512 41c84bbff9bb0959963d1701dfd8a8f8420d9525cb1ca2bca793145ee8db0fcacd72b6eb1a50849d2a8e712de108c4d065638a64c0f458cb4463f2f6779fbfc4
-EBUILD sword-farsiopv-1.0.ebuild 339 BLAKE2B 84559c4582545587087b23c58751abfca3bf34ca964c1e5fbcf53281e9e8213447e41e47f9646ce3cdfc1696b7e480d72bcaba9ef768e761c8d94fa1815cf38e SHA512 17ab8b6e0a6ae4bf53f3781c9861140b5f49bc1ea77e32a946a270041771ba1de896ac97e2e4b16bd9b5d46ebc1f3f40db565d7355a5341aa063a21e5fad71a4
+EBUILD sword-farsiopv-1.0.ebuild 340 BLAKE2B 4eb07d81c52c8edc7364d4696fb890fb5a10bb5740bc1ca774c6751fc78fda0aa36f3696314f63ab488c815cbb2358d7bb04113ba7a9012eee14fd0399f7fa17 SHA512 b057d7d21ab9d0d7d39b5d64ef1fbda9b598da09985551c9fa1c1143277a022c5803a304b642a741811152bee4610c3477c06eca32238c81b699237aa4bc7faa
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-farsiopv/sword-farsiopv-1.0.ebuild b/app-dicts/sword-farsiopv/sword-farsiopv-1.0.ebuild
index 18b99133b75a..a418e4dee40e 100644
--- a/app-dicts/sword-farsiopv/sword-farsiopv-1.0.ebuild
+++ b/app-dicts/sword-farsiopv/sword-farsiopv-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Persian Holy Bible (Tarjumeh-ye Ghadeem)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=FarsiOPV"
-LICENSE="freedist"
+LICENSE="free-noncomm"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-finpr92/Manifest b/app-dicts/sword-finpr92/Manifest
index fade73526bec..a7efe9c532dc 100644
--- a/app-dicts/sword-finpr92/Manifest
+++ b/app-dicts/sword-finpr92/Manifest
@@ -1,3 +1,3 @@
 DIST FinPR92-1.1.zip 1581196 BLAKE2B aa698c5e387d95b10f07fa4b2e47d1bac4f7d8572e227e1042eea08238cbf78cd11b7af9c240456ea5f3b97f9e93a42c543be758df415c8454221c8d053114fa SHA512 9287599c769b7133c9217f17402e51a5b6ef34615bcba79e56e8415ec65a26761594f2ed6eb14dc486a1a7c129bf720d39a6c7a4f792f01d1dc1edb1c85fda9f
-EBUILD sword-finpr92-1.1.ebuild 325 BLAKE2B bf903f11b331a4d1ceae62a80d89c7adf03f760128389a2732cf5f797e3d950360ee0ed75f7024c53d04dcb4504852cafe8a95658730d22e032c2f710c2f0a38 SHA512 4264b5a5ed247f27d0329309d95e4eab1b619eb5572c530aa1145ee01cdf9bc5fbe9965735f1d371ad9b64b4ff519e5b8cb9e1a8040c359fd3edd34544a30292
+EBUILD sword-finpr92-1.1.ebuild 359 BLAKE2B cded06ea5f058b1c548b5e9b1ef31f76638821191c8f6613bc07bb374e6ff3128ddf7da784d942ce209da4e2b6500814fd410a6e782fcac48b6bc7808b3f3a59 SHA512 c17d96d3520b4845105e3158d7a4619fe782e07c87ea36002b1bb9969e7ff6854c3d4fed6f1ba4aa19b650727ff6bc1f766f415dc75f95d296c8e680c74b621e
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-finpr92/sword-finpr92-1.1.ebuild b/app-dicts/sword-finpr92/sword-finpr92-1.1.ebuild
index acf9e22023fd..a86da57b41d0 100644
--- a/app-dicts/sword-finpr92/sword-finpr92-1.1.ebuild
+++ b/app-dicts/sword-finpr92/sword-finpr92-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,6 @@ inherit sword-module
 
 DESCRIPTION="Finnish Pyh, Raamattu (1992)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=FinPR92"
-LICENSE="freedist"
+LICENSE="all-rights-reserved"
 KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="mirror bindist"
diff --git a/app-dicts/sword-frebbb/Manifest b/app-dicts/sword-frebbb/Manifest
index bc86a217ad99..7cfff91972f4 100644
--- a/app-dicts/sword-frebbb/Manifest
+++ b/app-dicts/sword-frebbb/Manifest
@@ -1,3 +1,3 @@
 DIST FreBBB-1.1.zip 1535395 BLAKE2B 8a9a9d1b60488064e862c58bbd393c2faed1ac3e65f59512fe76fcb8ff7024550575b7d1b429975ec5fcea719231423907cfda2f41765e6429c63f8036cdc42f SHA512 d97227362dad68a40006b07e717abc3aaffdded14bdd950f17ffc42abb20bf6645e2e6e1adb92b372d62edc4218c43ccecdb16c221c60d29a5490d55c29e0066
-EBUILD sword-frebbb-1.1.ebuild 327 BLAKE2B 90ed621a092c3d7c596425a1b01feffdc2e91e30464f644edaf32f264bed709ec7d5bd986c6efe8f8ad84098018cf62ca399f03a9d8fb37d561b8c5f6fcb5066 SHA512 e70de41d1a266bb690ea2b3630c64a836264170b85e0c7c047882048556c485041938d5b156b01397b6f5884cf158a24ecf42f861f1eb3bad26a016d224f6937
+EBUILD sword-frebbb-1.1.ebuild 328 BLAKE2B 4c96370652a69f04697b5ace60469251836f1de24962c0ab97b665e0bf6de5258a1f66aa3efa11a219b8a425634a7dc149391dfdabb26d58602d37368fcd2aeb SHA512 84b3e47d1d5d6c0fe8210b32028c180b34846162b7baa647fbe5799a513ecb82c58a55e767a1633fd43469078f5d2ae652719cc5f06aab3075699bbed36c2cda
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-frebbb/sword-frebbb-1.1.ebuild b/app-dicts/sword-frebbb/sword-frebbb-1.1.ebuild
index b41d189b94ce..b5cee0c56c12 100644
--- a/app-dicts/sword-frebbb/sword-frebbb-1.1.ebuild
+++ b/app-dicts/sword-frebbb/sword-frebbb-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="French Bible Bovet Bonnet (1900)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=FreBBB"
-LICENSE="freedist"
+LICENSE="free-noncomm"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-frecrampon/Manifest b/app-dicts/sword-frecrampon/Manifest
index 18fdb08bbba0..44e74fade2cc 100644
--- a/app-dicts/sword-frecrampon/Manifest
+++ b/app-dicts/sword-frecrampon/Manifest
@@ -1,3 +1,3 @@
 DIST FreCrampon-1.1.zip 1572977 BLAKE2B 81d710ba5404bc52306c25d714bc7dafce8f8d5d1f71e67a886f1a2322962c6dc3e4b13e62e198637622bafa163e1ca29c033a5d12374ab5ad7ca3d2d7165dfc SHA512 41853b727ed3807527135c83b3f1b9c0e7284cd74cf4bb7841d30712eac4405063b98c1d92cf31d97998982ac5a7b659e77e65d150e31bf017b3290be1e9f20a
-EBUILD sword-frecrampon-1.1.ebuild 333 BLAKE2B 610fc9cab27cf927aaf07e20d55c4a87c1a10e0be9168d0368841ca85a0a979bb8be6c608d1bff8920a0f1a210dbc2bf8d0197945f9dd5bb4e5458618de61213 SHA512 eec84d7ad28e4b707360b56b109f6f23f83cd017270336a321ebf6f7c822feaa418a5ab745cb790846b2bf90b8d413dad86adddf551722257866045ed992851d
+EBUILD sword-frecrampon-1.1.ebuild 335 BLAKE2B 2c53ad57a104ef6480c38cd4afac01479040d0091a27fe4464bb6dd13cb6b0cf08af2c5f8dd197dcb2b79c897ef018665b555eccc4cfb61e0e0349286234ae26 SHA512 b5d9477f9471adc2a259a2805b197ab95485c5922cb7d5549f1030eeb8a1148f6d1290f30af61b70fa7cfd62b1ed18445b50b1f1d11c50b847465565987f7ac8
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-frecrampon/sword-frecrampon-1.1.ebuild b/app-dicts/sword-frecrampon/sword-frecrampon-1.1.ebuild
index 7ba5657b775b..914458d7c2af 100644
--- a/app-dicts/sword-frecrampon/sword-frecrampon-1.1.ebuild
+++ b/app-dicts/sword-frecrampon/sword-frecrampon-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="La Bible Augustin Crampon 1923"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=FreCrampon"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-frecrl/Manifest b/app-dicts/sword-frecrl/Manifest
index 42106c21bed4..30614ddffd8c 100644
--- a/app-dicts/sword-frecrl/Manifest
+++ b/app-dicts/sword-frecrl/Manifest
@@ -1,3 +1,3 @@
 DIST FreCrl-1.2.zip 1464601 BLAKE2B 884967a2a870392f6a225bd1625354a2e4d10004d7b5986be54a102d30af797676be6f080a612caa4b1b804bd724429569ed4b11e07a24411a71ef15e068e66b SHA512 3d792c230dbbf21193b7b8b908bdcd5194c487f10450de220360461b73ab0bf85c2a4b05df89f43bc25ca0adb14386c2b8308c7937b99c8cb27d2d231e113dbb
-EBUILD sword-frecrl-1.2.ebuild 324 BLAKE2B a9b652bf51c77a577a4f4eeff33e14c04cf7e81a27894f72a45344eae6d0856cf369a11d97691ca6770359426c7f7bf3f8ba03ee4bb3749576f11d930ff928ec SHA512 6d7d731ae42259bcc34475e0f9c6abdfb4a7e84f03ddd1fd93b61a8297c41947ce29cd23211b5a0691c2ff9aee636e8e39cc9a7bd37ea3b4db0f7fbfd49342bc
+EBUILD sword-frecrl-1.2.ebuild 358 BLAKE2B 1e4abfa1ad5b8eef8acea1a0637e53dc8ad76db51d17ae964662a73244e6c4799383026c9d76271d797deb499495984ac653357d30f5581f44e7111237161514 SHA512 b72d78295a5a15770ad586f85dd3d079969fc8121ebefb8e296087b4b69a658ec6e7d87f85ad457f6d6eb60ee77636186c35e84d067a85c232b8e80ac9886572
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-frecrl/sword-frecrl-1.2.ebuild b/app-dicts/sword-frecrl/sword-frecrl-1.2.ebuild
index 12959e436b73..429ff9d6ee42 100644
--- a/app-dicts/sword-frecrl/sword-frecrl-1.2.ebuild
+++ b/app-dicts/sword-frecrl/sword-frecrl-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,6 @@ inherit sword-module
 
 DESCRIPTION="French Haitian Creole Version"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=FreCrl"
-LICENSE="freedist"
+LICENSE="all-rights-reserved"
 KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="mirror bindist"
diff --git a/app-dicts/sword-frelsg/Manifest b/app-dicts/sword-frelsg/Manifest
index 5a8734702b1f..a057ac7a72ba 100644
--- a/app-dicts/sword-frelsg/Manifest
+++ b/app-dicts/sword-frelsg/Manifest
@@ -1,3 +1,3 @@
 DIST FreLSG-1.3.zip 2317480 BLAKE2B 7aec1088410e12ea7627c045079765bb76b01c2f56237c24c59a3156a69a63f765d4caaa9a021f57ac886bf0dbfd4dca9c27ee9f2d76ec8bf0a69b93bbd0427a SHA512 3ace5e302caf20a91c3f0e1565a97f44e0a440f28d23b8f5fee2af8623094b17a52f8e5bf083c40f418aa65fb5c1464eedaea40a965f7b243780730c2ba2fba7
-EBUILD sword-frelsg-1.3.ebuild 321 BLAKE2B 5450cf22645f254683318fb962235b8c4da584dbedda543d1b656ef886c9d7a8770217ab40e2fe2400455db3608f91f69e81fc78be3c0577eb68e25bc04a9a87 SHA512 10349811d473309e2830a4a4f71aa897c7f5557e46ff9a11b960a0db003f05b1bc796593c7dc77168371e3e9616a68b7a21ffcdf8867be6860225cdbe5e93f57
+EBUILD sword-frelsg-1.3.ebuild 323 BLAKE2B b95b24459858f96d54c602dfbfddea17c6ef02da997c810efdd4119e23d2f2d5bb1bddce949391ce06a1ba903a332e88fb040968d1dd9512e63fa64ff7cbc6de SHA512 7b08a3dfb142938009805a048ddf622e7e8ae2be947ad3a342133d347744156d2f549507e4f06c3a31b1b5a0e151440475a665b13e3ab1acbec10fd49ea3dcb4
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-frelsg/sword-frelsg-1.3.ebuild b/app-dicts/sword-frelsg/sword-frelsg-1.3.ebuild
index 447856987481..9d13887da90e 100644
--- a/app-dicts/sword-frelsg/sword-frelsg-1.3.ebuild
+++ b/app-dicts/sword-frelsg/sword-frelsg-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="French Louis Segond (1910)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=FreLSG"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-fremartin/Manifest b/app-dicts/sword-fremartin/Manifest
index 3b3297cd90ee..0c9320bf602b 100644
--- a/app-dicts/sword-fremartin/Manifest
+++ b/app-dicts/sword-fremartin/Manifest
@@ -1,3 +1,3 @@
 DIST FreMartin-1.2.zip 1665126 BLAKE2B 75a71ccb6d0ede290a77dbb17b99546e3ce6bf825e0592293fae553fbf01edfd7c38705a1ee63ee60823aa1b8ac8e2670522c2d520e594de12cc184a454fe7dd SHA512 76a53edf0cce3976eb56fbee4c60e33ec53c7b4cd71c582e62d81b503d419188b804774c957c54f637b7c551e584dc611c0e123f66f51476328c8d5be3591f1a
-EBUILD sword-fremartin-1.2.ebuild 327 BLAKE2B a4da671242d564a6ff534132adc323fc15eb380d01c771a45564f23c5fbf82f38383f912d069d3a9f44c403c6494ea4b9d964fe363b6dd15b83bfd62a0e5a796 SHA512 8ef7694d941204e6f5a4912d8a645c3975d0fc0496a07abf011457bbeec6629d0b5bcfe4c6b5406b13bc62321cf1c4f28b28bcd3827e2c2cc6072f3975e8361d
+EBUILD sword-fremartin-1.2.ebuild 329 BLAKE2B 29277f8c20ac503fdc77623f81ab777f7011f8b6d392578ca53db077ad30335e9a22d22d30e9965a5c330d3bd4be2831bb01086f80b6290c2eba5d541672f8e6 SHA512 5c72d1c34f060343097b8762f6a034d32b151b3bf33b33b9ea9cf3f0c7cb3cfb9cf04acf3f5421be3d4218d6ad8e48e45a2dc5491d196ac41333bdeaf8a2bf1d
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-fremartin/sword-fremartin-1.2.ebuild b/app-dicts/sword-fremartin/sword-fremartin-1.2.ebuild
index 9128c370da9a..99fc1911d964 100644
--- a/app-dicts/sword-fremartin/sword-fremartin-1.2.ebuild
+++ b/app-dicts/sword-fremartin/sword-fremartin-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="French Bible Martin (1744)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=FreMartin"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-fresegond/Manifest b/app-dicts/sword-fresegond/Manifest
index f38d412d1b30..673fde956512 100644
--- a/app-dicts/sword-fresegond/Manifest
+++ b/app-dicts/sword-fresegond/Manifest
@@ -1,3 +1,3 @@
 DIST FreSegond-1.6.zip 1501591 BLAKE2B 89b7654daa8bae515d5ab79cd5f5363ff81433210e8db05abb5014e1c0fff094ac34ea5da50ac183182d7ef7e472abd2edfc16507df903a4e4800e5e8cbae0f0 SHA512 9e9eced08926b8d4abe44c5dba0d5d664c4b7581dddf1c6f650319935b28f7993bf4c3cf4a8532fd376d75db463b3275a04869a108e4a9d68a7b30a2ad5c6cc5
-EBUILD sword-fresegond-1.6.ebuild 341 BLAKE2B fe55b3fbf60cf2867eea565048a75443710e077edfd1e3fc0b5fe78b4b1b1c6f71923b92916da772c33ce6f50fa49f41eb84a70d544633376f01dd8b5d9bbe10 SHA512 22ba9a6b3557662b4c9c8effdb0b5d5f3cf95f7c65e0027b14d35ecb72191309e341733817c9e613d7f3a0bef93b682d034655e2cb1ceb595c8f7b33b8e82702
+EBUILD sword-fresegond-1.6.ebuild 343 BLAKE2B c13cd9d348707003cfc9b6f89c074dc88c2798090e00b2cf2d627b009583928ff1eafdc916c6a6a2edef056c9f27b3bc6eec9dbfcbd95374d51542da74846947 SHA512 53b53d433f09b73d21a37f182db44b8108c85a11d4fa9fdd692a557ededb3a764977912a0182deb4fac00ca949fa9b5f6c8c1642447539778cc47da890c4ea49
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-fresegond/sword-fresegond-1.6.ebuild b/app-dicts/sword-fresegond/sword-fresegond-1.6.ebuild
index b0aca87bff33..00f3ed95db59 100644
--- a/app-dicts/sword-fresegond/sword-fresegond-1.6.ebuild
+++ b/app-dicts/sword-fresegond/sword-fresegond-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="French Traduction de Louis Segond (1910)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=FreSegond"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-geneva/Manifest b/app-dicts/sword-geneva/Manifest
index db2fc814f947..835da7fdb747 100644
--- a/app-dicts/sword-geneva/Manifest
+++ b/app-dicts/sword-geneva/Manifest
@@ -1,3 +1,3 @@
 DIST Geneva-1.1.zip 1680206 BLAKE2B 1f4ab1f61b12a4fe9f7382be9445799e292f89cf61252688c79d5d09227927317f21cb6d722a63de51cdca32126522cd24a32727939410207de9b9a76b6c2110 SHA512 9bcc2760f6e7a620a6b625f7a01166510daed7bb0b5ec9cddb534f4d2c8b4cc95e15543e725346ca43b66d3e032be72da43dfdc078c8c7579e4f58dd66aaafd9
-EBUILD sword-geneva-1.1.ebuild 325 BLAKE2B 25ec26c79224fa8fae2430dd056dcf31a6cef5aabcb4cac4b539f2ec188c5fb4331b7e8af7ccca7684789b43c1eb02e2620d30a46c9a714fc61aa8f6bf4c679b SHA512 a504f7b41278ea014e60f3eaaf3f1a4ec8fd2e71513408315fed14ac11e5ef0b573d8f297f00f7b973e4aa774eeab9de1b2f87a06d884377d7a2e9cb33800ac8
+EBUILD sword-geneva-1.1.ebuild 327 BLAKE2B e5703d5e0b8ec3f5093ba18c42abe59908587764c00b011f2e9a6511ca536df37fd5bdb9212eb673a25acba89d1e05ba350aa271e2fda04e95b1a515c86c4390 SHA512 9ac83b8d686ee66692e1847ebdfc1de658858eac64c84deb4a70f8aa77672f8ca0e9ef3105bd8c8806d567a7959bd047457182a1d134b2a265625f2577bcec86
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-geneva/sword-geneva-1.1.ebuild b/app-dicts/sword-geneva/sword-geneva-1.1.ebuild
index 81f93f79ebe3..6e285ae676ad 100644
--- a/app-dicts/sword-geneva/sword-geneva-1.1.ebuild
+++ b/app-dicts/sword-geneva/sword-geneva-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Geneva Bible Translation Notes"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Geneva"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-geneva1599/Manifest b/app-dicts/sword-geneva1599/Manifest
index 60f3351c5f4e..156b68c3aa30 100644
--- a/app-dicts/sword-geneva1599/Manifest
+++ b/app-dicts/sword-geneva1599/Manifest
@@ -1,3 +1,3 @@
 DIST Geneva1599-1.1.zip 1449107 BLAKE2B fb316611c5b8af0f702615197d3532a463930331b27d581f28b4863b92be65961542ea06b004a968fa066bfc60a28f5d84108fc5cb9cd21e5df92256f044132a SHA512 d89e8616ff06c9f6c1c39ecb7542568e9b3bcdc3c7de1aa38a6ea53a3eb87a9279b1a05f6804c2f3f00e5b47e68be6b01a8a768eac52b21f3c5a99fefe3ab8d5
-EBUILD sword-geneva1599-1.1.ebuild 322 BLAKE2B 3682f389629990ae202c899857a1450382d52faba40586766c544fa8b9a84205b51fd27e4d65a5f7cf255315504ad2b6d3ec60cb98898f9292c64b57c4b669b6 SHA512 97f6cbe54847255aca2108a1d2e49586468941d8ef2ecf8bf314d080c503eafbc5051307258b58412631c370ffb198f2e4627667ca3d5c45d92b47ae30344544
+EBUILD sword-geneva1599-1.1.ebuild 324 BLAKE2B e3f7ad3dd4df25c783634317e19799fafd233af8a5f114dda054c2d6a64e4f0162132f834c2afd05f539edad0c3aaeb26b82a55d3fc14583db6502378e5aa15b SHA512 d67451b8ff84657225b17ffe4bba48fc00a18f54c567d92496187cdf77889f427f0b1640a6c5dd7b448f0af70c77f831893b46a4244d6df138e12f0e3cf27b2c
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-geneva1599/sword-geneva1599-1.1.ebuild b/app-dicts/sword-geneva1599/sword-geneva1599-1.1.ebuild
index 151f395df085..2bfe1ab9eaba 100644
--- a/app-dicts/sword-geneva1599/sword-geneva1599-1.1.ebuild
+++ b/app-dicts/sword-geneva1599/sword-geneva1599-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Geneva Bible (1599)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Geneva1599"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-gerelb1871/Manifest b/app-dicts/sword-gerelb1871/Manifest
index fbdc2ea1ae6e..d97641421c7e 100644
--- a/app-dicts/sword-gerelb1871/Manifest
+++ b/app-dicts/sword-gerelb1871/Manifest
@@ -1,3 +1,3 @@
 DIST GerElb1871-1.1.zip 1733446 BLAKE2B 19f682151450fd65cee999aa2c9cc5f9a66fb4923755c11bab819dbf1ef11aa4d969f2c233020892bd8e8f3ba9a645eed88d70f0db40bc5a5f1651992b6d2260 SHA512 293d97bebf074de8cfad1b1cc0d62c47d29378b07c91ece870ab6a0c235a8c36572324d181a014c0b1ce46d56f67935bb17724a5ac4e9b7cf95aa0219a411d1c
-EBUILD sword-gerelb1871-1.1.ebuild 328 BLAKE2B 20e0e5645387b849cd93a94ea3c1c04cd4c4b0432e03dc64e6d11e02f77873a7163c9320bb48a306075f12ef7d58d894e61f43ca4c933a86ec80fb96dc10646f SHA512 c7547e47c5193dcba85f793cf439dee3d80512f3d40370dbf0fa0dbdcfd0bcd89bf237a6c1ebf77ebd8291ab7dc1664b3009d2f4e97b3a426ca83e3c2c83bd81
+EBUILD sword-gerelb1871-1.1.ebuild 330 BLAKE2B c040a45faecb34df28e7ddd313165f6bd3e3805518ba180820d1b635ef52d488b7663d341b616aae69b082176634666ac4e86baef24d8ee24c492fe7f24b8dcb SHA512 00dee335a40cebed2bbd5e775b29ae90aa4af53f3432bd4cb9cb5bac9fbeb2f1fca81199d3c8d9f67b9403fa7986081ea18aa21cdb86531063120bdb06c5def3
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-gerelb1871/sword-gerelb1871-1.1.ebuild b/app-dicts/sword-gerelb1871/sword-gerelb1871-1.1.ebuild
index e8aabd8428c7..48b2556ccacc 100644
--- a/app-dicts/sword-gerelb1871/sword-gerelb1871-1.1.ebuild
+++ b/app-dicts/sword-gerelb1871/sword-gerelb1871-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="German Elberfelder (1871)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=GerElb1871"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-gerelb1905/Manifest b/app-dicts/sword-gerelb1905/Manifest
index 1c8ec7658147..2adb7a11c089 100644
--- a/app-dicts/sword-gerelb1905/Manifest
+++ b/app-dicts/sword-gerelb1905/Manifest
@@ -1,3 +1,3 @@
 DIST GerElb1905-1.5.zip 1538434 BLAKE2B a4ade05700e585e284eba30b7f57e79247b4db3ffe41fb10e5601d75a98a3a0ada8c53b823364a76d4095250a3e9331e9bb378f816e11f1d519930ff4b1fa7e0 SHA512 da125670e2429a773b56ebd128a5daad6a101f7d5d9065c84e0e64ee96b0ea358807a047bb27aeae650dfba315bb5006492db8ce940c1b1afbefe2e4fc8e0820
-EBUILD sword-gerelb1905-1.5.ebuild 347 BLAKE2B 4073e2ec18b3b68383367857aa0775790579e4efe57be939dff05fe0b082e034ed32d0afa65db5a2d6443be926b4ca239a4eda7f02e20e4b2144fcc4c02aa7a4 SHA512 27ad1058bb530630cb815645b74b429c9656b6e42804fa881cfcb96f63c63da98c7e222a85db5c139e960eb32eb40193c4e7f0dcab44d7c02d8dc497f4219270
+EBUILD sword-gerelb1905-1.5.ebuild 349 BLAKE2B ea62677f7805bc5b7ce23fe8edc9219f2575b30d871b95a1fd4e46c46269a5e3e49349fac5296c29c9189636ec88fbc907aa2423e25b2b82676eadc76ff07a48 SHA512 2cd12bcfd57b140b9b5ba8749b486f7b580a2840f521709324ecbf385904bddad76ad7180a49a36161a95d8d2dccecac06516b65da0f103d240fb333a0ab7e3f
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-gerelb1905/sword-gerelb1905-1.5.ebuild b/app-dicts/sword-gerelb1905/sword-gerelb1905-1.5.ebuild
index e39d27af2aeb..8206d713bb26 100644
--- a/app-dicts/sword-gerelb1905/sword-gerelb1905-1.5.ebuild
+++ b/app-dicts/sword-gerelb1905/sword-gerelb1905-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="German Darby Unrevidierte Elberfelder (1905)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=GerElb1905"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-gersch/Manifest b/app-dicts/sword-gersch/Manifest
index 69c6a61d9129..07b465e9acdf 100644
--- a/app-dicts/sword-gersch/Manifest
+++ b/app-dicts/sword-gersch/Manifest
@@ -1,3 +1,3 @@
 DIST GerSch-1.1.zip 1573735 BLAKE2B d94aea6674c5c4cd7c59803b14c547abe6fd3c877b8cd2e71460b0358068a1516691f80ab783b9d3bad67a2b426ea169eeab1f7b3a92eacd5f82d453c0154b3e SHA512 483647dc8c7b2d691cc18ff58de6709894e04b50a6d9971bf8c2e5924677a73cd0fd4b7131793b9530cbeef6fb7e4456e1161d6861a1e500f9734c3f2160c396
-EBUILD sword-gersch-1.1.ebuild 325 BLAKE2B 1a5eb9d6176b3e737712033f42932978b39ef6674253ff9ea43a5409f031521930a6628f5344b35b1daaa5466b82b189a34357d278294c3b5bd179e37606bfc9 SHA512 c3515972472f03b60b3a4dd159983aa19ccd84fc708584f8eadcda1667b2cd33a578b254e19f6de2dccd176de6438671a8f4b71e0ba0905f6cfb18703f2d24b5
+EBUILD sword-gersch-1.1.ebuild 326 BLAKE2B 13dde9b5431371f3f2e3b0db174744af52984f6cdcb14d4ab11bdc2e53a369c22c502a3ef100117a3298d890abdfdfebe1b1ccd15df849d3327f06d2ba481b8b SHA512 d178f0cf4ce5eec80b37dfe578a3337d361acbb23a1c87626b24d83400d0dec31e9c3694c253b1bf90190fa4019989e58d3fe91a5c90c94a0dc20fefb2f3c93b
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-gersch/sword-gersch-1.1.ebuild b/app-dicts/sword-gersch/sword-gersch-1.1.ebuild
index 4ab8a15ed1e4..499e97064263 100644
--- a/app-dicts/sword-gersch/sword-gersch-1.1.ebuild
+++ b/app-dicts/sword-gersch/sword-gersch-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="German Schlachter Bibel (1951)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=GerSch"
-LICENSE="freedist"
+LICENSE="free-noncomm"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-hebmodern/Manifest b/app-dicts/sword-hebmodern/Manifest
index 3819c318280d..cced2a9ad139 100644
--- a/app-dicts/sword-hebmodern/Manifest
+++ b/app-dicts/sword-hebmodern/Manifest
@@ -1,3 +1,3 @@
 DIST HebModern-1.1.zip 1118288 BLAKE2B e25af40c06afb973336aa9b31f2afa5d94d4281d1cf4dee78b125a70f924c56d388b7e05947100347f7cdb8a5b82f46270773a4a172a6e5c2f8ec2bc9c9b2c81 SHA512 84449dcab4c27e7757f79e71e2097acf62ed60e4df0ed0a3a6561b069e9ed5214dcb8040b4b79d79a1b01b6bdc33b44ad5055f520383e2eb38dfa25fefb73e9c
-EBUILD sword-hebmodern-1.1.ebuild 324 BLAKE2B d48e7570610123004a8fcfd472064b8b9c1cb1bbf312048cd05cbcaa7af6f0b814a32db262d4e7975cd4b55a5f412f62d04d4f3836e4cbe586eec88cedf153bb SHA512 4e6c2a194d1f60b6f72aabed9a717f114f615cd757badd03d1b007bc85ac762e78be19374769e81344d0101bfc8918480b5b66859db78ccb511ab8aa70fecc9a
+EBUILD sword-hebmodern-1.1.ebuild 354 BLAKE2B 1c782305cb0d747c3dbc6224ff32ee523623e6f4da39e98bc655c5019bead1b45f9fbc8f34b0df3bbd8fe7ddb98fbb55921d94d8f8eec2b8c5899e19ee485114 SHA512 d72edcff37524846a57644722ed52ecaca788c594961f12f79b8d157bf47cfdd14e9d03d401111aac706e3fc91ab04cebb5e5fb716cea2a2ca8c0b421de30c5b
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-hebmodern/sword-hebmodern-1.1.ebuild b/app-dicts/sword-hebmodern/sword-hebmodern-1.1.ebuild
index 04ea33d6a943..27f63614be55 100644
--- a/app-dicts/sword-hebmodern/sword-hebmodern-1.1.ebuild
+++ b/app-dicts/sword-hebmodern/sword-hebmodern-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,6 @@ inherit sword-module
 
 DESCRIPTION="Modern Hebrew Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=HebModern"
-LICENSE="free-noncomm"
+LICENSE="all-rights-reserved"
 KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="mirror bindist"
diff --git a/app-dicts/sword-hunkar/Manifest b/app-dicts/sword-hunkar/Manifest
index 3706679cd9e9..386882a4131c 100644
--- a/app-dicts/sword-hunkar/Manifest
+++ b/app-dicts/sword-hunkar/Manifest
@@ -1,3 +1,3 @@
 DIST HunKar-1.7.zip 1632910 BLAKE2B a868a63d84cccbdc4cb6ee2acd448a7331765005ad3e229310140fb37b0763b7fb08278c37bb47120443145cf31498bf44615059b50a34800d90fef439ba91cb SHA512 f4cc7adf551f650ac50153a6070770917945c20f97e8ce5f13acdd3ecbd3effc1c522a79792a6915101cc8c8ae4e91c62c68fbeb793a7787b89aff6b75e6203e
-EBUILD sword-hunkar-1.7.ebuild 311 BLAKE2B a8601c1403d02bf6e46ee9d81f2cee2c6fefb31105174b8945bbd441e4fefa7a7b57515096062fbede993eaefe07181c7c046c93608c6a421bf919608b603538 SHA512 71b24481eb8bdcc9cecee16a6df10ee4d240f6b6a9f184d2dbe48e4a46dae8d0c7bdc12bfc8839f789822903ce56fd282b3fdac18355c365dfe5e628620ced33
+EBUILD sword-hunkar-1.7.ebuild 313 BLAKE2B 2609d066d6ded8dfdd60a0495cd8a7821f9076fd906de20a492b5183622432489505d1dff02ad403412b41b14640c74fe8385cc35c56a5137a3ba5a4c465bbb0 SHA512 0408982c6d33695f2f9fe1e0bb987d66da5e31fe9c72d4ca592dd2c730345ead98e9423630cd0d412fe27985247ee2762344fbeecb83d9340a4ee076ae1246a7
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-hunkar/sword-hunkar-1.7.ebuild b/app-dicts/sword-hunkar/sword-hunkar-1.7.ebuild
index 0ccea24217ef..808d0a661db2 100644
--- a/app-dicts/sword-hunkar/sword-hunkar-1.7.ebuild
+++ b/app-dicts/sword-hunkar/sword-hunkar-1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Hungarian Karoli"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=HunKar"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-hunuj/Manifest b/app-dicts/sword-hunuj/Manifest
index 703bb2c9693e..3461af0d2938 100644
--- a/app-dicts/sword-hunuj/Manifest
+++ b/app-dicts/sword-hunuj/Manifest
@@ -1,3 +1,3 @@
 DIST HunUj-1.2.zip 1775652 BLAKE2B 3f53a68b3fca71bed309a2cfd244f24d82f39ec24418872f92252166adb56f4a0195bd5cd1b0d8b95b9bd8d6b24fb6f1e7b58da39d097a01c8ca3e60936e23fb SHA512 87c51f9b275c078a30c84caa03643c24c9d7e42590626f2ee94b8e791adca7a618adff925322aba2abe263384257bade86ee8fb19373feafd11b4fbd6c9ec897
-EBUILD sword-hunuj-1.2.ebuild 345 BLAKE2B 342549ffc903818d74bc684c2e7483e7735b27e551fc567bc1fc88a3e377a2e739fd6b2bd01f5a1f7c7ded65e9c1b18e481530c6ea4c1cd4e24c6315e0914007 SHA512 90e4d519b99a714e56875c6b7e95c63efddaeccd33bb29a260b88727ccfcc02915b38cfc960cbbac8e8083b62b233579006931b818121513fbde5604c9ede798
+EBUILD sword-hunuj-1.2.ebuild 379 BLAKE2B c1bd05a123e9b2c4b189444ee507285af59c49b571395c982558410492c1145b401d9ab7608fa0529d0be6a256a18cd4d412a73e63bb0365e22b486a2c3dc3db SHA512 7acaf7e782a7bd98dd52e4073a8774d12f40974267fae21e61cdd5734f8580abab759945aff74ec29f11f6e99e2a9893356edf2ef5c2e0eb7e3deca6f9316719
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-hunuj/sword-hunuj-1.2.ebuild b/app-dicts/sword-hunuj/sword-hunuj-1.2.ebuild
index c78d7d14cf8f..1b26a866046e 100644
--- a/app-dicts/sword-hunuj/sword-hunuj-1.2.ebuild
+++ b/app-dicts/sword-hunuj/sword-hunuj-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,6 @@ inherit sword-module
 
 DESCRIPTION="New Translation Bible of the Hungarian Bible Society"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=HunUj"
-LICENSE="freedist"
+LICENSE="all-rights-reserved"
 KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="mirror bindist"
diff --git a/app-dicts/sword-icelandic/Manifest b/app-dicts/sword-icelandic/Manifest
index 68ddfb3104e6..6e1c3e3363cd 100644
--- a/app-dicts/sword-icelandic/Manifest
+++ b/app-dicts/sword-icelandic/Manifest
@@ -1,3 +1,3 @@
 DIST Icelandic-1.1.zip 1513390 BLAKE2B 7c64a6b120af6d2c14acf604bf014671d4dc65e11d2cd0882c1ce8169d280369a551d80b5c217ac76a76c58dbb82b1d5769aa6f7d681fe3df35f3d3cff87bcf7 SHA512 db973262bd6e98a7a32a674f9424dca1389c6f57d7e5917b2ea2cb8e9eda4f026ac6290c0e2ade8ec803350249723d492400eed1491885bbcf10bbb32f7e209f
-EBUILD sword-icelandic-1.1.ebuild 316 BLAKE2B 372f1941763bf8b48bb58556c1fdf484f1873f1d88d90c8cdffd3b2cfe2ae5514771828c9b57ee33fdc1259eb4f5f9a306f61b117b6b703d0113217dae78273e SHA512 187455558e1ef178662ce9f33225580902070d50611b8ee0c48a06be1adb8641075e45011097ca75a9062880324bb1719177278bd1489c5912451a93e3276512
+EBUILD sword-icelandic-1.1.ebuild 350 BLAKE2B 453ae1aa4fe5db829f00883d71fe827b529b266cffa17c77a945f7dc4cdf4a6e47173b5116346b20bf4366dc7f5d15195db77a52c5ad512ff7da89584f67f6ac SHA512 8cc642985b3b82d6d331f7e58c1a287bb359eec26b2da4a46358e4a5db18d52838e1422b8952a830f8fcf9bfbf504063e3640e0194928293a0cf29375f8cc0f0
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-icelandic/sword-icelandic-1.1.ebuild b/app-dicts/sword-icelandic/sword-icelandic-1.1.ebuild
index 1d5a35c0972e..156b7d7b531c 100644
--- a/app-dicts/sword-icelandic/sword-icelandic-1.1.ebuild
+++ b/app-dicts/sword-icelandic/sword-icelandic-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,6 @@ inherit sword-module
 
 DESCRIPTION="Icelandic Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Icelandic"
-LICENSE="freedist"
+LICENSE="all-rights-reserved"
 KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="mirror bindist"
diff --git a/app-dicts/sword-itadio/Manifest b/app-dicts/sword-itadio/Manifest
index 8fe3caf19153..a9eba943030c 100644
--- a/app-dicts/sword-itadio/Manifest
+++ b/app-dicts/sword-itadio/Manifest
@@ -1,3 +1,3 @@
 DIST ItaDio-1.0.zip 1530887 BLAKE2B caef079a979f10dcefc5b3b63f4d3c2455dbcf89241b6afd8186306120f30ed9da51212739d765b98c354038b115be15e3074f6960927762f89a7b5d2cea0868 SHA512 7e2338fa743cd98437015bbd0c52df27999bc70563d7b923b2d23eb60e6f18baa5e272170838662c4f4c20c0d6bb97e4eef4f2460bbedd400ba4be1467ce59a8
-EBUILD sword-itadio-1.0.ebuild 331 BLAKE2B 3f1288bb326f151d0a4da3bafff74ba75c5372c43618432e24ca921f62b32fa7bbb9a8358edced1a4d9b6a27536874f126ebc74162c183d4e35048ae6ef4843b SHA512 065e933dcbc5e6e975735aaf051f39319f38cc96e6c8a0c5803e4a0cb64dc2a5ebcbc89150f6b58970ede4c2d1deabdd698071c9b29a87cb0119e328d8ee6366
+EBUILD sword-itadio-1.0.ebuild 333 BLAKE2B 3efba353fb205af364a78659a83536f169343fb7fdfa44c4befda3112ad8880a55f1c67edf7a57b47ac237351dec1e7543e08596f7fcdfe855bbfe2b259b24ae SHA512 4ab7780f67f1832f1549e634e4aca9dd7c3cfdcce50015c2413db059cbf02824ef9a4e6b3e936277f83ae454fe7a5f01b93afe4866c525e9fc3bcc5816c330d6
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-itadio/sword-itadio-1.0.ebuild b/app-dicts/sword-itadio/sword-itadio-1.0.ebuild
index 0b42bbddc98c..02a88c0711a6 100644
--- a/app-dicts/sword-itadio/sword-itadio-1.0.ebuild
+++ b/app-dicts/sword-itadio/sword-itadio-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Italian Giovanni Diodati Bibbia 1649"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ItaDio"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-itarive/Manifest b/app-dicts/sword-itarive/Manifest
index 88a1d92ea02d..07ebe24998e5 100644
--- a/app-dicts/sword-itarive/Manifest
+++ b/app-dicts/sword-itarive/Manifest
@@ -1,3 +1,3 @@
 DIST ItaRive-1.0.zip 1528624 BLAKE2B a1dabd9a299b89b2b4bbc1449a807de407610b50c893abf8ae6945322171b23b1247557735f54f281dc7b6dd4a2589a6a492f2dc5c98f9eec35931ae04e2f197 SHA512 8dbbd97f4a35ec5493dc335ff280ae18054c539d5fe30096b857dd61ab566768f945176c013d57658851826d3874ae944fde111d4c9e89c875dfc55dbd569dc6
-EBUILD sword-itarive-1.0.ebuild 327 BLAKE2B d0b2a68eed87393daa609d4bb15865c331900e0af3ea53b03dcb54f90435613f829709a52bbf9071f20fd3c7fe3f9f0f95732967a451b20757e79aa71adbf380 SHA512 c711516f67fb625aeda86a73b8b910514bdaae070859980a10a81f435220452d2c3ea310b0d557f2bc3ff23cae761f35dbe21ef97e7fe11d3140224f1d048ff9
+EBUILD sword-itarive-1.0.ebuild 329 BLAKE2B 6d1793c39cff0dad1bdf2fc45c661eea8fbcf1b875a467b4457fd008e9ffd2b68c024e1d89a31d005b9713cd139e98fa71cfd53b2ee338efe238c0d9586a463a SHA512 996f564ec005379601036017c141ceea2a35866b8021e352b8ae453cdee29b280a572d83b70873440ab51d5e28771d6a909143db43a005adeb44a6bc8af6b2da
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-itarive/sword-itarive-1.0.ebuild b/app-dicts/sword-itarive/sword-itarive-1.0.ebuild
index 98542cb9e49e..e87b9f4b02e4 100644
--- a/app-dicts/sword-itarive/sword-itarive-1.0.ebuild
+++ b/app-dicts/sword-itarive/sword-itarive-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Italian Riveduta Bibbia (1927)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ItaRive"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-kekchi/Manifest b/app-dicts/sword-kekchi/Manifest
index f3f5e55c81ab..7316cde3b0d4 100644
--- a/app-dicts/sword-kekchi/Manifest
+++ b/app-dicts/sword-kekchi/Manifest
@@ -1,3 +1,3 @@
 DIST Kekchi-1.5.zip 1676116 BLAKE2B b15c9b40738e306d06837b07823e5bf95bc7355fdeb858af2c6b4aa89c1b474fb40b9c58c14688b1bff90176a03fc0a781a3112fcc3b049f4216115e20911ed9 SHA512 e45f32509e478b9ab2c71cd0abd532784c879608f83602eef548e93d4af868e598ff342fbe4a53100991050fefb06ac570a1389f0849cb27dbbedc957241573f
-EBUILD sword-kekchi-1.5.ebuild 311 BLAKE2B aaee011d14c965f4fa31f6e3aeaaf8c894c2f0f4ff97250bf16b33fb66f9a59fc99c2d82016455d6ac23e3ae563b61ac150fb51f0f03e66b0384e00e98050138 SHA512 dd565b97ec362c3ec21e84f1b27a6d9acd922e4e25df562f81b90d71c1f276eeacad31a9bec8e7d8c42ae595fbfedd4cc8f14bddcd0880ed532e1e0b5a7b08c6
+EBUILD sword-kekchi-1.5.ebuild 341 BLAKE2B 241ee7e058f2c7acb16f2892a47d494132ae6fee7efd0cfd0f214abe6e2393d279ee2136174382edfa8727045db4a6c7e109e74367b774dd2598e8bd7f12b8fa SHA512 2cad8f8e74d09a345e444f8cd6e894c8ae19a1d805c7f4596b1af34c86ffe0708339405e1b7affe3344b3080ad1ffc87b0215f2c8a3ad3982a6dbae05ddd2cbb
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-kekchi/sword-kekchi-1.5.ebuild b/app-dicts/sword-kekchi/sword-kekchi-1.5.ebuild
index 601bb0d80f9d..7757fb7556b6 100644
--- a/app-dicts/sword-kekchi/sword-kekchi-1.5.ebuild
+++ b/app-dicts/sword-kekchi/sword-kekchi-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,6 @@ inherit sword-module
 
 DESCRIPTION="Kekchi Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Kekchi"
-LICENSE="free-noncomm"
+LICENSE="all-rights-reserved"
 KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="mirror bindist"
diff --git a/app-dicts/sword-korean/Manifest b/app-dicts/sword-korean/Manifest
index b6274caea582..fee3e8d1e9f7 100644
--- a/app-dicts/sword-korean/Manifest
+++ b/app-dicts/sword-korean/Manifest
@@ -1,3 +1,3 @@
 DIST Korean-1.1.zip 1431342 BLAKE2B beb4eca2d2cbfd95aae113c939003acb835f82689c9a0cbd0732a77ae1e6e3d96cebe540b8ba8f89415d7ee7b6caf64d5e6ae66bec030ce3b566b282f4ac8409 SHA512 5f6eb7459743d37165efdd5c6e042c02fdbb5fa041cb95b748312f5e19045a085ac3439329f4975847e3f93fb3118ca4a49706d9d57166780c3ee19596b73d71
-EBUILD sword-korean-1.1.ebuild 307 BLAKE2B 539f4015d7cedae852ced727175c69a54b685eb2d95234889f82d366ebffc1ac0b67d2748abda522bd509aabed0edbb833a470be22ed5a66b5656d0d35e7be1f SHA512 72eeec87f205320fb7cfe71a442b7b0cd997f836e0bbd91585597818c702e11f13f9d36a4ee671e5564789b077b9c0e9d5a0634dfefe018898ab94af4ac28859
+EBUILD sword-korean-1.1.ebuild 341 BLAKE2B c171b6d8c4b3bd18a1fcd4ef88d5b4a04669cf06be7cd6c61d0e80c511e6487eec2610fa0f69b2513ed2be194bd3951561724b3b918f66dcec453a8be3fb189e SHA512 161325c404d3e84a7c02397438145af7d6a8b5125e18d2a6a14565256b64f0dabe17f6bfc1070365746832a14fd25d8a38c185a983781c59147c36d6e52315fe
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-korean/sword-korean-1.1.ebuild b/app-dicts/sword-korean/sword-korean-1.1.ebuild
index 229851915e2a..66777561f5c2 100644
--- a/app-dicts/sword-korean/sword-korean-1.1.ebuild
+++ b/app-dicts/sword-korean/sword-korean-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,6 @@ inherit sword-module
 
 DESCRIPTION="Korean Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Korean"
-LICENSE="freedist"
+LICENSE="all-rights-reserved"
 KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="mirror bindist"
diff --git a/app-dicts/sword-la_en/Manifest b/app-dicts/sword-la_en/Manifest
index 683c435f94ee..a7b10d525dd1 100644
--- a/app-dicts/sword-la_en/Manifest
+++ b/app-dicts/sword-la_en/Manifest
@@ -1,3 +1,3 @@
 DIST la_en-1.1.zip 104195 BLAKE2B c279d01378d08dbac2f9b588a8bdd7b066eb29090ade3080f79ae4563f97f28166cd7c5f6ad5b735771d1e350b4447c2ce5f747cfc5faf9a7bcb3d490dc588ed SHA512 ebb6345983a533264890b908b22d54b72d1d490f0b37329d1bb202231e3542a848177c78a0c4a1cf06a523a6cdb5cc08fee386901187726419ea7a127c468830
-EBUILD sword-la_en-1.1.ebuild 323 BLAKE2B e18d857ed736e79524838e54ff0b5ab9c38ef8a1f385603084f7fc23374619a16d6abe9d97099f8c9ce858737f7882d61b6f643dedc9d5d50f9f13f5d39e4d3a SHA512 5458a4ace0502cf0fca4c7a6f900dcdfa655b7fb119c1ba22edbf96173bfbe6b9ea80a9a73b9b335b0cd8637a55dffd2f4b0e0370f2da03bebb3452fd4ecc8d8
+EBUILD sword-la_en-1.1.ebuild 352 BLAKE2B b0ad0474dba5ded5346da4f71c4f8566b3d1f77f40606be3636e37ea8a87b86c3f8dbc1335ba4a8a7c9b5af9878acca455e2d4448ecfd72ace29c190549a3a24 SHA512 f55255544fca5634408897330b5e7ca40c86cc35b0a6ee7ca4116301291321ae59c2a2b7b5d5ee706ac4dfc767352afbd9fa7f3b2d823fdd381f91028d2564ac
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-la_en/sword-la_en-1.1.ebuild b/app-dicts/sword-la_en/sword-la_en-1.1.ebuild
index 67522d242ca0..70695cbc6c24 100644
--- a/app-dicts/sword-la_en/sword-la_en-1.1.ebuild
+++ b/app-dicts/sword-la_en/sword-la_en-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,6 @@ inherit sword-module
 
 DESCRIPTION="Latin to English Glossary"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=la_en"
-LICENSE="public-domain"
+LICENSE="all-rights-reserved"
 KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="mirror bindist"
diff --git a/app-dicts/sword-latvian/Manifest b/app-dicts/sword-latvian/Manifest
index 6652cc787cb1..6201461ec973 100644
--- a/app-dicts/sword-latvian/Manifest
+++ b/app-dicts/sword-latvian/Manifest
@@ -1,3 +1,3 @@
 DIST Latvian-1.1.zip 348255 BLAKE2B 6ef050e9b1ba9e6079b1ffb1397063557f62f5921454b38c2a8eb774c86212ae215e0e32db26ccf282b47901fd0eb2d4abd455a11f642d59a8dcfee9710d8989 SHA512 bf2246661bd30c378bfece88127bc83328ad549a3e3f183574f19a408a11d0a3b115b47f3f274057d88d207eea4e76c8c8101014715b891b88a4304bd573121f
-EBUILD sword-latvian-1.1.ebuild 318 BLAKE2B 35feb17de0086c76ecd35ed0392cd21870c2b4c679471996f5945ba9977cb13c377e13539320e4229f3d08b4eaea65ee77f05e1db77c17b93a04829b7e4e1a29 SHA512 5140706dd89d7c20a81d0bc3b9b9967801d771fa71a24b8f54e084271aef7f7dc68aaad6a4e74f679ec34631d8a6a0498d774962cb32fd5c6235ee52e1edd076
+EBUILD sword-latvian-1.1.ebuild 352 BLAKE2B 0596a76c1348b9f1d1df333e55b8ffdea12e02840af7f9cc69a7528ee65010b90f989d883aeed57fad008613004a8dc10bab32cedcf6761b3c51f8ababad29e8 SHA512 55cd5e7fc925ec9c5d75767941a4fce67666e617f3ecdc4af9af81435a1f2c89bbe26f7afe3b876c43be808d67b862a06a0f13b110ab3380cc535096cc6c493d
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-latvian/sword-latvian-1.1.ebuild b/app-dicts/sword-latvian/sword-latvian-1.1.ebuild
index 2b9332d80c6e..1151ae5ae9c7 100644
--- a/app-dicts/sword-latvian/sword-latvian-1.1.ebuild
+++ b/app-dicts/sword-latvian/sword-latvian-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,6 @@ inherit sword-module
 
 DESCRIPTION="Latvian New Testament"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Latvian"
-LICENSE="freedist"
+LICENSE="all-rights-reserved"
 KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="mirror bindist"
diff --git a/app-dicts/sword-litv/Manifest b/app-dicts/sword-litv/Manifest
index 5f106fead6e0..301ba6a6b7ae 100644
--- a/app-dicts/sword-litv/Manifest
+++ b/app-dicts/sword-litv/Manifest
@@ -1,3 +1,3 @@
 DIST LITV-1.3.zip 1435344 BLAKE2B c60241f414a5cc9b747029d65dd79fae0634cf616f5a0af5d0213b9ba171b5677870bf52b4a529b3d59c1193783551f465efd72ff22cee35005e0f59d92fb943 SHA512 9aea030c96277bc591dac7bb45230c2ea006dbd241b2ada7be086a350ab0c5de8face5153c99d46ed35ecb00956f327cb1c7db0ed6f6d4c8ae0334085e6974b2
-EBUILD sword-litv-1.3.ebuild 318 BLAKE2B e59812e2f43506e2a4709d18dfb03ae08aa744306e7b9cdf9fe4f6c104f3a0c80804ddb745895d362db42adce2edd33c5b723012ddb584049e3a3e5cf4ae5cce SHA512 e99985681f9a82a3a9a573533b5bd4a5a42f758ea10ae5a14b1c2fa1916c4ca0e6756f37aa621472731cda9214ad2c20cab777cd0790f24c76c84a7783ba6450
+EBUILD sword-litv-1.3.ebuild 319 BLAKE2B 6a198f460e4707af95e0803bf14df569e1de35b15e05b6fb932189c98b566d8b8c8a453366e5473c1fbe90a0bb8bfe919f4331765925d67410cdef23123460f4 SHA512 eb8591b34f44e8dad2c7313bc4db895c921178ae1a37791fc22492a1c52531cd8fe274cdb00379f8bed536d2a34e5fda1c98b909a90aa42b1922db81d6d8e9e9
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-litv/sword-litv-1.3.ebuild b/app-dicts/sword-litv/sword-litv-1.3.ebuild
index 4f150b5f3c1b..e55eaece9d3f 100644
--- a/app-dicts/sword-litv/sword-litv-1.3.ebuild
+++ b/app-dicts/sword-litv/sword-litv-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Green's Literal Translation"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=LITV"
-LICENSE="freedist"
+LICENSE="free-noncomm"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-manxgaelic/Manifest b/app-dicts/sword-manxgaelic/Manifest
index 1eb46a066d00..ac72f875c8dd 100644
--- a/app-dicts/sword-manxgaelic/Manifest
+++ b/app-dicts/sword-manxgaelic/Manifest
@@ -1,3 +1,3 @@
 DIST ManxGaelic-1.1.zip 152306 BLAKE2B d38d790aa31e6d7f936c409d232bf0009bdb45c6e2a4dcc8dc0f15365e00adc56dfb3aab047b28bcfe1f2b9f525ebcc45c7c9229ed917e17b359e30ee9fcb80a SHA512 1d164c71bb04c57ec9347552904f46863d1596f56819217fbe20aa1a359d386224d02ddf4867fb412b932ab6ec2841f77b623f4bd6fd74f8a4b95ea0e108413b
-EBUILD sword-manxgaelic-1.1.ebuild 333 BLAKE2B 10f4ba0dc7773146705c31bed72bb65fb4e37ac091aeeb977836e3f1a9a382b02e2c86b05b8f6fbdc16b7442d94b79313170618f291ee35225859df775d59b34 SHA512 f4e4f8a8c0ea5df30aa6b017a57952fabc2fff8b51872f578fb66a70fe2619bc960981ca6dbb649baf6ee8552f36f19d77edfb2e704ecbf74c92c407eebe5cb7
+EBUILD sword-manxgaelic-1.1.ebuild 335 BLAKE2B 79d47d38263661d06bc9c2cb1092f06610e61559e91b893968e86644438c2dff38b418dc38aab55c93fb4693c5e35f0b43337267d827c76b60b23c6ab03bccbc SHA512 71e56f0ad205856d98311fa713c92b4f2f5dd76ac06339da55bbaf72f87ccc4c8d4f045f03c435d70a0b3382787c7e4c541710dcf05e9d70fe6510761b3faca7
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-manxgaelic/sword-manxgaelic-1.1.ebuild b/app-dicts/sword-manxgaelic/sword-manxgaelic-1.1.ebuild
index 63f7dcf4c2e5..e2c7db5ea5e0 100644
--- a/app-dicts/sword-manxgaelic/sword-manxgaelic-1.1.ebuild
+++ b/app-dicts/sword-manxgaelic/sword-manxgaelic-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Manx Gaelic Scripture Portions"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ManxGaelic"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-maori/Manifest b/app-dicts/sword-maori/Manifest
index 7752ebdf0981..cc43be13a7aa 100644
--- a/app-dicts/sword-maori/Manifest
+++ b/app-dicts/sword-maori/Manifest
@@ -1,3 +1,3 @@
 DIST Maori-1.1.zip 1397366 BLAKE2B da8e3f0cdbb27d2e83558cad74b73c352bf518e4f01ff10dd6c1a58ca2efc2697d5ae2898ff0161dd38bb1f0a9e1bcde0ee411f81a5de3a53fbf205a7400e38d SHA512 366d56a8742262111abcce59b20862428c67269ad0af8acd38d0a847271a220cabb177949dd1df60942c2b606d0011f0340f12aa6489a3d6d12b641d71db1bc5
-EBUILD sword-maori-1.1.ebuild 304 BLAKE2B fe76db4c928e7dc313d24dc91d5d127ebf68a4dbda081ab4219c7bf019cb821990201052ded1d75dba138e405c1bb96a893084704f56b03a4e4455d4887de37c SHA512 e1e7006667bde2384be06f8fead3a21ad309fc16ce6cd75f50de3c560a098cd7ab0c892d65d5bb8cfcdcc9d166f9e8fa32e160d89b37ca011980e8e1674b986d
+EBUILD sword-maori-1.1.ebuild 338 BLAKE2B 59683cf6d28d41450ace1c3558984e0b53f154604b0ff7b3d119b90ad71186e2ce3393d46f21a945acc71fe138d4b58b3186e69ac7fdf70cd2acfa6361c0dced SHA512 7749461f98adcdea731d61e624022948569ef739dcc76e5b44797f390bc67802ecc9b173aa17032ecf2a8785997c2ab71c75077dd7c03f5df4ce52801bc30054
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-maori/sword-maori-1.1.ebuild b/app-dicts/sword-maori/sword-maori-1.1.ebuild
index e0b26bc3a293..5d2df30dfdf3 100644
--- a/app-dicts/sword-maori/sword-maori-1.1.ebuild
+++ b/app-dicts/sword-maori/sword-maori-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,6 @@ inherit sword-module
 
 DESCRIPTION="Maori Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Maori"
-LICENSE="freedist"
+LICENSE="all-rights-reserved"
 KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="mirror bindist"
diff --git a/app-dicts/sword-mkjv/Manifest b/app-dicts/sword-mkjv/Manifest
index eac53a4e962c..29eb65966b5c 100644
--- a/app-dicts/sword-mkjv/Manifest
+++ b/app-dicts/sword-mkjv/Manifest
@@ -1,3 +1,3 @@
 DIST MKJV-1.3.zip 1429038 BLAKE2B 50b781f6d6cf9a792eb353c8022a454a3da3cfe0e14facc4fda53f6e4b619f0f07e341258bcd258f9b3291ea7e67542f23c82ff1b9b08950272b80bf41f2b5d5 SHA512 2a6efa4f270cb783e122a73f1c66795237edd73da030b00654ae2e4ad43dc11ed4b9c59fbc0f64a9c3528bbc5f87ecdab207b24406a77714c7fd642e9e0613b4
-EBUILD sword-mkjv-1.3.ebuild 324 BLAKE2B e5d651f2de04ebd8b61592328e376aa0d0dfb82f534864ac2dc4c7f86931d8546592b5b0e9fb6f924a94ec9f6ad756fe80fa1c1c5f86360ab7c0d396ffd650c2 SHA512 e0bc6cddeb94c8ea5c8bf993f25efd115b97dc446d887ac02c350ee9c70ba5c4388fc537ee92da19c68a8380a4cc8e67e72751b55dd6c41a2c1add0dd5d3aafd
+EBUILD sword-mkjv-1.3.ebuild 325 BLAKE2B ebabfc84115286a0d5eb5407126ea64ba2f332427d06da28b41d13cf43da362650533db29f672392556b6da081e62124da59508c394e7f03f2faa8261c721e63 SHA512 135013d859da74231214bde7b41a87f102b26c4de2dfb96d46e639318a5bde68dd485061cab50ce1ac6080836c6396f40d2c72a01473605145368f886e5b7bd5
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-mkjv/sword-mkjv-1.3.ebuild b/app-dicts/sword-mkjv/sword-mkjv-1.3.ebuild
index 983ef93197b0..fbc685b327af 100644
--- a/app-dicts/sword-mkjv/sword-mkjv-1.3.ebuild
+++ b/app-dicts/sword-mkjv/sword-mkjv-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Green's Modern King James Version"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=MKJV"
-LICENSE="freedist"
+LICENSE="free-noncomm"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-montgomery/Manifest b/app-dicts/sword-montgomery/Manifest
index f0763a39a705..2f426ad7058d 100644
--- a/app-dicts/sword-montgomery/Manifest
+++ b/app-dicts/sword-montgomery/Manifest
@@ -1,3 +1,3 @@
 DIST Montgomery-1.3.zip 385461 BLAKE2B 945090c8a527c97aee35b05c2c640ab85f1a44f3f77bbba75e6fd091c256185e77c02fbeb27c502ccb07ce3124d3210c2acf6b1dc9eab64ec21e39bdb17c281d SHA512 29b434a1904c37d80b4d7f9da23f0fdc680b77341753bb35a3ad3e0c687683f1ee6cb2516b56761cec61366a606847784aa6336df6cff2e930b36726427f1b43
-EBUILD sword-montgomery-1.3.ebuild 327 BLAKE2B 6d549f320c873e386b6b97b317ccc20eb0e02fc370987b6cf324fbad1179924e3848f0812875d314f6b26b0c8eb253294da5c20c7a34438ec2e3cdfa9bada309 SHA512 a0626e2d07effac3f7e4055050b07aebfa21ce862f79d2327718d5518932605152c49d6e41b63d575e265dc602d16d50455ea89ee9e4c4655b1ae50c69f663ce
+EBUILD sword-montgomery-1.3.ebuild 329 BLAKE2B 2ef4fd08a025b8b8406a1f9c7cf1dd8d9c18c4b85a2c00efa3ed83b0157d6e7b0564c5a4fb451b84515ba3e6cefb53caa0e041f696177e7e1d9cf245a315d4cb SHA512 842d053a55ff64a0650be37d554a2f5a3c8d726b259a9ee5b1c5ba641164b6bfd0d817e4f298601c75429cb9ae87f474d27ffd64600395f368a033a18dbfdc96
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-montgomery/sword-montgomery-1.3.ebuild b/app-dicts/sword-montgomery/sword-montgomery-1.3.ebuild
index b33ad2e6481c..ceb8fe02cff0 100644
--- a/app-dicts/sword-montgomery/sword-montgomery-1.3.ebuild
+++ b/app-dicts/sword-montgomery/sword-montgomery-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Montgomery New Testament"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Montgomery"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-murdock/Manifest b/app-dicts/sword-murdock/Manifest
index bfb22dc3a11c..1de82abd791f 100644
--- a/app-dicts/sword-murdock/Manifest
+++ b/app-dicts/sword-murdock/Manifest
@@ -1,3 +1,3 @@
 DIST Murdock-1.2.zip 396395 BLAKE2B 9b14f7879a1754f1addb1e85024a873a084d560a2179e21124d59cd8ae5eb16fdb972241fd3c2eb786c3c17e81a9a64d6605459c96c631f5092c1d23ca3fb21c SHA512 a6d06a5157c6ebcb0b3d7689e76b5d04765a602f334b937d65260a4ed89cd92b316f0d792071a574364a501b55a449f9bb1af123abd05a49f2af7d87dddc5d02
-EBUILD sword-murdock-1.2.ebuild 347 BLAKE2B e8ec8b2275b8e5182477f8bb7091d383fefb72610bb8c0d3e6d2b9f32bf330193bd6367432bda458f33978e39d5e674a1495623eac6a223d5fdaf3cba364030e SHA512 2510fb06a765e9ff4031cee68f72b2bc3cce99e2dd2afec67317abed59f27622d3b59363a51d632b4faa9dd995fa4166a824a0d1c45be1234c705e7e13465776
+EBUILD sword-murdock-1.2.ebuild 349 BLAKE2B 48fcbce2bbf31e2869bc401f11b829c9383157eb8fbab773783421a0481154e4d67062aec08025f3ea9a7217742e7af263fa8606e242a6589c834226161ce348 SHA512 f8e969601b1a848e680bf8a4726e8640f27c46a8681da5d02d2f4f86e3b2e38739a45faa48b9073bb062e8e5c00b0f1b4b24664d5e95026cf3609963a9fa07df
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-murdock/sword-murdock-1.2.ebuild b/app-dicts/sword-murdock/sword-murdock-1.2.ebuild
index 6982de32947b..bed134135426 100644
--- a/app-dicts/sword-murdock/sword-murdock-1.2.ebuild
+++ b/app-dicts/sword-murdock/sword-murdock-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="James Murdock's Translation of the Syriac Peshitta"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Murdock"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-rnkjv/Manifest b/app-dicts/sword-rnkjv/Manifest
index 1c967f4d0e02..ddf017f6a127 100644
--- a/app-dicts/sword-rnkjv/Manifest
+++ b/app-dicts/sword-rnkjv/Manifest
@@ -1,3 +1,3 @@
 DIST RNKJV-1.5.zip 1471699 BLAKE2B 24490b0e82393cbe7daef77cf23f3327ee5dac9372f2126324a18df9373357e09dc827f63bc763dfad0dabacbe9dd70976b84b00c7acd7ee5f5e52afa9209c4e SHA512 7d160f0cef81770083ebfc573f2c41ba54fb3b07b944336a7e69bbef848e84678c115f0790ddb3a91a216906a371d6b7069d1470fe30039e9b94ef6c59dad6d7
-EBUILD sword-rnkjv-1.5.ebuild 325 BLAKE2B 2b4489241dc4b6cb757007ff0316c1806d0744bca935e9eab37964144e0d5a1bf6443ed61fb5ceda3874df5545ad5b701c10bb2c89a12117dbb8da509bbc62c3 SHA512 6bddb21c73b65d2ea1ada1106b5cf436ad6b5975bcec2ccc60bec5b9033377ca5a8852ca135beb2c0d0f1f5c7b849e2e557c360a5b77f8825b8de41855376dce
+EBUILD sword-rnkjv-1.5.ebuild 327 BLAKE2B a08518d075ec15597a351fb358f84c582ae62e6ff0cca5605bcd3d69ff0f7efa233ab40632066c46917d079d05199bf0ba847f739f38dcf304ed86ae16aade5f SHA512 4cc6e4c72cc3be3122257518dd35b662adfe8229034abe2cb5f70f0601d832769f84fe8896777179c4e3c6e353b969a0fe0df3f8e9a80c9a5ed193631b557c8e
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-rnkjv/sword-rnkjv-1.5.ebuild b/app-dicts/sword-rnkjv/sword-rnkjv-1.5.ebuild
index 1493098729c0..9183529e3734 100644
--- a/app-dicts/sword-rnkjv/sword-rnkjv-1.5.ebuild
+++ b/app-dicts/sword-rnkjv/sword-rnkjv-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Restored Name King James Version"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=RNKJV"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-robinson/Manifest b/app-dicts/sword-robinson/Manifest
index 63927e0b0eab..ce2dfeb34a0b 100644
--- a/app-dicts/sword-robinson/Manifest
+++ b/app-dicts/sword-robinson/Manifest
@@ -1,3 +1,3 @@
 DIST Robinson-2.0.zip 31613 BLAKE2B 422a0d2a38628130e09441c18ea0b1f33cf0249a19d8073dc17dbce70e449cdc664d2808057ce5da6448ce2a62b23a720ba32c9ce423e191367e0b19adfe71d7 SHA512 c9921b605b5c429a7ded38141620874bae5a222f8aa7b0afd5c1b4000b66d0a5010c18a87c2a8d450dfc8f0e27360f47a8670e78633f8aa7fdbe698c4e5a991d
-EBUILD sword-robinson-2.0.ebuild 343 BLAKE2B 7eebc235717644c663921956ff03311eb10e34f6e7a3088c884e4bf205f21c74ffa04130446cf771c4f5014a8975fb6155ec5350dd8492d68c4d00fbc25dc162 SHA512 2715134f0e7e6ee6242fd414241fce5197572b900f07efca970ffb59a1f840183ae763a09287ffdcb2908e935bf995df44bb42fe8e8de6bc332e626fa2a5faed
+EBUILD sword-robinson-2.0.ebuild 339 BLAKE2B 79ef72cec207ecfecf35adabc6ac61fbb306c2fd0cb1bd468bc04d7770a1e9198438b7595406b7019e2711036295ed1255ffb6a65a28e02a5663fc65d80c3e65 SHA512 c8575c7b8a4b722d3b9c1c97af296ec04f0fb1e4ef474d46e80fc9b52b76fb3a179eaac3c4722837ea2e42f06ba652e0dcbdf70ea84e4a31eeddf9e210df9dad
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-robinson/sword-robinson-2.0.ebuild b/app-dicts/sword-robinson/sword-robinson-2.0.ebuild
index dbcd04594a1f..0d88231bf074 100644
--- a/app-dicts/sword-robinson/sword-robinson-2.0.ebuild
+++ b/app-dicts/sword-robinson/sword-robinson-2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Robinson's Morphological Analysis Codes"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Robinson"
-LICENSE="public-domain"
+LICENSE="CC-BY-SA-3.0"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-romcor/Manifest b/app-dicts/sword-romcor/Manifest
index 47442d5a42c2..b72e82ee0bde 100644
--- a/app-dicts/sword-romcor/Manifest
+++ b/app-dicts/sword-romcor/Manifest
@@ -1,3 +1,3 @@
 DIST RomCor-1.2.zip 1515933 BLAKE2B f4f7f375b2f597c050cad704de22d875b8979e4047d2225ef3dcf186a907d628a5256c3dafb53042c783f938ce8acd69a7b5f19b36ad1f17592e35d2ed303136 SHA512 fec3b7b3d5c2be28544a3a599a826417ad549ca7ee21fce5870566cc20c00b0445f9d4f9024ca1c0886de382cc63066cb3f53f9d9e388ed6e1f1013070f2a4a5
-EBUILD sword-romcor-1.2.ebuild 322 BLAKE2B 91252e8c778b4072b0be948988f3e50fb31f7c56f96d9ea0da41b0e8e51484534fe80df513695410271ca1726c2d181f252b97aed32ec8736693015d8fff3a4c SHA512 74546b993d1c28ff9ccaec648335671df21be536336387adc167dbb44d1fe40bab5b5443252dfc9991c257a412299a1aa59cd20149a99c1abd6fbdffeda2bad9
+EBUILD sword-romcor-1.2.ebuild 356 BLAKE2B a07b2fa6da23912a0c81eafa503739de767ae4788d2b044297b6d2898f3a07b32df4e2940dbcfcfa2a5eb8d420d4752cf9c3d36b06dc4815955b2501523537e8 SHA512 c56b5113e807996f22c2b26d6404f6ea0bc71778b47b29f5d4c5eece78cb7b44767fe1f6562848a8d001a678cda8eba3270d6d10d4857ae5d41adebcb058bdec
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-romcor/sword-romcor-1.2.ebuild b/app-dicts/sword-romcor/sword-romcor-1.2.ebuild
index 2970f04a208c..d523d19ff3d7 100644
--- a/app-dicts/sword-romcor/sword-romcor-1.2.ebuild
+++ b/app-dicts/sword-romcor/sword-romcor-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,6 @@ inherit sword-module
 
 DESCRIPTION="Romanian Cornilescu Version"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=RomCor"
-LICENSE="freedist"
+LICENSE="all-rights-reserved"
 KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="mirror bindist"
diff --git a/app-dicts/sword-rst/Manifest b/app-dicts/sword-rst/Manifest
index 4670016f58b1..a2be7270bfd7 100644
--- a/app-dicts/sword-rst/Manifest
+++ b/app-dicts/sword-rst/Manifest
@@ -1,3 +1,3 @@
 DIST RST-1.6.zip 5813471 BLAKE2B 498c36b5551829e359dc25c6ef2b2e1296bf23f2375bd8f602750d8a5e063b7fb883b206de70624d0614794882afcbc702404d9ae779c89f322346f06bd2601e SHA512 0d66eee67f2a4fe3db06ded456a6e97812de349546b33821708f93a1072a85ed19b3e2792a5daba3dd38d2bb17246abb8b9ac1b0154e68afbd52fb049bf80385
-EBUILD sword-rst-1.6.ebuild 316 BLAKE2B 373e52138f62a5b089b234aa8ed98dd78035f94ad70cdbcf3b0f9be268cea9a4b2bc7ed04c5092e6c2d81f591adb8d3e6f7b1f029351efea35a3e99e67c61cb9 SHA512 515b54790cac62e0e1aeac5c21cd8e60e700177f9c24cf4a220c932dd851efa20dc149749bb506de26e8e3aacb003b6e7477fdbee8fa746588bfc28993f96833
+EBUILD sword-rst-1.6.ebuild 318 BLAKE2B b3c7a45d055314fdee074557d3519b147344abb801e345d38e5529f2d205bd6ce013157028ada2e7a5cdd37d967f2427de0ed94f69502d53cf40d5a8b05d8f62 SHA512 e75f174916bd9e5dfb8f1fcfbcd83c75bdc92d53a9f99658df1afbc9cae6328232232a5589b219e0a5e47699d916d180e7dc751372a2d5b57b24e8de0c393b5a
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-rst/sword-rst-1.6.ebuild b/app-dicts/sword-rst/sword-rst-1.6.ebuild
index b0d3c1cb25a8..f0d9260e18bb 100644
--- a/app-dicts/sword-rst/sword-rst-1.6.ebuild
+++ b/app-dicts/sword-rst/sword-rst-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Russian Synodal Translation"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=RST"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-rusmakarij/Manifest b/app-dicts/sword-rusmakarij/Manifest
index e7bf4deab488..5ac3d629357e 100644
--- a/app-dicts/sword-rusmakarij/Manifest
+++ b/app-dicts/sword-rusmakarij/Manifest
@@ -1,3 +1,3 @@
 DIST RusMakarij-1.1.zip 308240 BLAKE2B e3b4a6aebec982e27d7da3af7d378cfbe3657e8796eedcc6c4551e425fef647acf284d86b227c1c3cda7df8728025d188793d9432101b60a434fde3195419c3c SHA512 88446e27cf2a8a4533a55692a0bdf4b8560be8124190a85f39a460b09927f8150ff773ea81c3429528f8012f6369ab8e4de4f1cabc2a9836f2a3376d9288e000
-EBUILD sword-rusmakarij-1.1.ebuild 337 BLAKE2B c64a6052aa921bcd50e4b6aa85b73fbac660b4ac33e86628e6da3a0a0180dd47337180a6f8f7fcb40d2f6c2d83e6db0ede25ba3c3668424fd4caa8fc6254dc6a SHA512 a74806e2c489c71287f841f519e19f43aeff5adf16e30ad9fb0ac8c72775c249d3cae060ae41801c80f0a2a8544383bcd6416086c4300a312a6523789dbce60e
+EBUILD sword-rusmakarij-1.1.ebuild 339 BLAKE2B 07bea42333111f0c0d39e0b4f20ebff841bc7dbd63855427677efc532d34f83557a2c1d2d81eb566555771729538e48f2b86872fb55eec8e045fb967eb0f6e95 SHA512 5af1cba875a37003715f2a4d0103320bb0f6e3158084fa65893c7ae1c106c2a7a3143551597782dbc3e720273a9b1f05c88345d89294c5a531d71fdfbde12a6e
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-rusmakarij/sword-rusmakarij-1.1.ebuild b/app-dicts/sword-rusmakarij/sword-rusmakarij-1.1.ebuild
index bad6452585a8..c05b877b451d 100644
--- a/app-dicts/sword-rusmakarij/sword-rusmakarij-1.1.ebuild
+++ b/app-dicts/sword-rusmakarij/sword-rusmakarij-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="The Pentateuch of Moses in Russian"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=RusMakarij"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-rwebster/Manifest b/app-dicts/sword-rwebster/Manifest
index be157046810c..84d9138faa3b 100644
--- a/app-dicts/sword-rwebster/Manifest
+++ b/app-dicts/sword-rwebster/Manifest
@@ -1,3 +1,3 @@
 DIST RWebster-1.3.zip 2317707 BLAKE2B 904a6cc65e283c5f29c1e078050748a78cd06cf1c4f5617413aa2f9ea72cefb2b67359d187969855c70853fa9ae81bc7ca434a7784cb73f1855e4f8df655d879 SHA512 21686879638c7bb577c561eb14be30d3decf794996b5ffe2925cf1b0c66d7a6cb775dd08e307f6815b54ff8147e49c8f3fee32b18bb446486c6cc3d636025495
-EBUILD sword-rwebster-1.3.ebuild 329 BLAKE2B c566e918949e6b5cb4324dde5e3c44e3f508918e7d731fd165ce1d6679169ce7c115b96c67cd650351955c20588292890d4634aecde2fc5c475359fd74370f80 SHA512 c03c0611e2644418b1a83e31024071abbfe5c2c5111ef76c7d829e0b6b193d1fbcefab647af805f1b2ae90c16e20426adcc233d22b985d887bb37c96a254fd93
+EBUILD sword-rwebster-1.3.ebuild 331 BLAKE2B 2906c124d7b868afaa679071f761177be7bbc536f582a6cab64c8c4a9bde42814f167d163bfb06bef08ceae7a2ca1510b4037ab24895f06a51b59275ba09f6a2 SHA512 60bda3d7151fe4880d63b9a0b709ff0a62475df7696fd473f63faab00d149fbbdadd367dc477f0b91c5025c1496c6d182ba233ebc704c180c9230305eb7a77a5
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-rwebster/sword-rwebster-1.3.ebuild b/app-dicts/sword-rwebster/sword-rwebster-1.3.ebuild
index 074fe30f5a98..befd575dc15e 100644
--- a/app-dicts/sword-rwebster/sword-rwebster-1.3.ebuild
+++ b/app-dicts/sword-rwebster/sword-rwebster-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Revised Webster Version (1833)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=RWebster"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-rwp/Manifest b/app-dicts/sword-rwp/Manifest
index c75c0581bf9a..53b4cff2ed89 100644
--- a/app-dicts/sword-rwp/Manifest
+++ b/app-dicts/sword-rwp/Manifest
@@ -1,3 +1,3 @@
 DIST RWP-1.9.zip 2728649 BLAKE2B fb56c04304799784f55a71a11ee3dde448eaaa7c6294c13d4c3043ca156ba34326913f90b329801de70ebc715cccc01b74d064db0d6cc34d19f70f6ba9864bf3 SHA512 b3e8cbc5fb01e98776bac4c0ee7744eede1c7a1a9a41dfc72f53b55c3169b729f065e317107fb7e8ef4a2bc2b79c0fabeff1adb1b89150fd12f7d5ae22d7cc7b
-EBUILD sword-rwp-1.9.ebuild 332 BLAKE2B 0a81407f0f6dd05bd34e10d629ebfea12a6b888bada64cbe2ba58634f69c7fbacb28c28aaea1d9000956ef34b8cdc2340f616203fd24d03ecd28a618209a39f5 SHA512 c0da71b17de77f770027586a62748833018fb1267871d69b98aca9a38e938cc68d8c31b04dc7bfbb4ea47b12b26fa1b0a4bc1b7f2f735875709cf28fe62f38c7
+EBUILD sword-rwp-1.9.ebuild 316 BLAKE2B 3dd512462befd19fa513bbd32f2af149b8b5a681aa9b4061ffee979a41c737e253dde9a7314d778c466b34cbab6153e79d2a7a226632eae59fa8dfcffc8f2d3b SHA512 1f48698fd31e95cc38a9597142444f18e7a720333918a19913349d62a40635b8d5e4f30feab9270a26fdac326fbd6bdea5d6d048135b9121948bed1b86adce9f
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-rwp/sword-rwp-1.9.ebuild b/app-dicts/sword-rwp/sword-rwp-1.9.ebuild
index ef61772f9b4b..29db2eace60e 100644
--- a/app-dicts/sword-rwp/sword-rwp-1.9.ebuild
+++ b/app-dicts/sword-rwp/sword-rwp-1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Robertson's Word Pictures"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=RWP"
-LICENSE="public-domain free-noncomm"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-scotsgaelic/Manifest b/app-dicts/sword-scotsgaelic/Manifest
index e5db8b3ca9d6..11e6be891913 100644
--- a/app-dicts/sword-scotsgaelic/Manifest
+++ b/app-dicts/sword-scotsgaelic/Manifest
@@ -1,3 +1,3 @@
 DIST ScotsGaelic-1.2.zip 34708 BLAKE2B 654e551cc009a703418ec0c7668d3ecd7d94ed2b1100338b0da8475a6a32e177f91c122e7e14d6048121868cb411febb68cfccccd9cbf4538e1cd7b1bb29cf6f SHA512 2b0114b9e98352f11ac0672e334bde5dbfe5441cfcf62f07b806674043270084ca72d582b4e2ad95b4f287d16c71a1fb0603e1e313ef8e37f2237e5fd10c4295
-EBUILD sword-scotsgaelic-1.2.ebuild 332 BLAKE2B 3a6e9ab475c5ad3d5f3cebd59e534567d7141fb07339587d8f98d2cf1b0201f1a3c2c19a69684f1bda235c642dc823a7bd4f598bcd8f0fc9d59bcaa9349e0084 SHA512 9b3b1224f07eeaf466798a3046cb800aac3550c171270638e2624288e9e332e809a51dd8df696db1cd148205b79c19f072e8dccceff3c32ec4f7308c2fb4d449
+EBUILD sword-scotsgaelic-1.2.ebuild 334 BLAKE2B d1a38a7b895ef40b7d6306c014048da700a616460fbd3a54d9ac15a955c02f2183e35904147bc1c8078d65dcb66f093a1c9064dcf58cef810d6df45a78409294 SHA512 d0522e25e3f6dcdd6c6201e4029c2913e01c3d9c7382439e92ab2e68d5517bc95cd3e99bddf3ac13d9365064dc5a49b7573c2fcb4cc0dc84e6690a809c743980
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-scotsgaelic/sword-scotsgaelic-1.2.ebuild b/app-dicts/sword-scotsgaelic/sword-scotsgaelic-1.2.ebuild
index 16301fa7d4d0..f5b1b05fb24e 100644
--- a/app-dicts/sword-scotsgaelic/sword-scotsgaelic-1.2.ebuild
+++ b/app-dicts/sword-scotsgaelic/sword-scotsgaelic-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Scots Gaelic Gospel of Mark"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=ScotsGaelic"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-sparv/Manifest b/app-dicts/sword-sparv/Manifest
index 876ff491e6eb..4135fe63d085 100644
--- a/app-dicts/sword-sparv/Manifest
+++ b/app-dicts/sword-sparv/Manifest
@@ -1,3 +1,3 @@
 DIST SpaRV-1.5.zip 1469089 BLAKE2B baec9ee474723ff6ff8c9ae7c8c31c6dcd7d6e055f149a93d9cb73bd0d469e2ac31c7c2290a3fccea317679d6263a900d5a4a487f1a06d32e5da84cbf0451f2c SHA512 99fbd0021e1e3a335068f786631bd173d7bc8f21430f7f04bba08e27f9734e0cbbedbcc7c6971368d0e009f1e2fd82536201fce686f9e4bb77d1e44fb3caad1c
-EBUILD sword-sparv-1.5.ebuild 313 BLAKE2B 52a3a5e0e2a33f3387f6e30f723ab8aa514872194b00e47d2dd59a74f46896b25270342c8c3328999d1494ab25998b8756bc127c8e165c1bdda0624769cb3dd8 SHA512 95a0228abf26f70bf12d6a3e2a74655cd6bd9f2cba1b0a875f8975999b9b70a87cc9e9ae3073485a0474b61edc96ca7e8e16d75a1771ba47fa7f8a26c1036172
+EBUILD sword-sparv-1.5.ebuild 315 BLAKE2B 5c184207a965282d1fa2614cf3ccfd2af6fe4d2f6714433bd65c6c4a54c984196da6b40198ac4d796b373a5bc92565361377806870d689fa4e23bc9a94659e89 SHA512 f9f6a68ace6f7af38d311fda62097b39b838cd39d693e75003c9fe0df6320ea027fbb663ffaf4919a25575108537b3d905783321cfca6e44eeec2188c0d74173
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-sparv/sword-sparv-1.5.ebuild b/app-dicts/sword-sparv/sword-sparv-1.5.ebuild
index c0aa849ab1b4..ea821dbd2098 100644
--- a/app-dicts/sword-sparv/sword-sparv-1.5.ebuild
+++ b/app-dicts/sword-sparv/sword-sparv-1.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Spanish Reina-Valera"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaRV"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-spasev/Manifest b/app-dicts/sword-spasev/Manifest
index 85e680700125..4590b9f4481b 100644
--- a/app-dicts/sword-spasev/Manifest
+++ b/app-dicts/sword-spasev/Manifest
@@ -1,3 +1,3 @@
 DIST SpaSEV-1.1.zip 1449569 BLAKE2B 2be47bbdd3f95ea4b18f26dc06a9234ca55e17655c3424ae81345301f3a15d074ac322c87e33e5eac62a96e80aba3b0e018979979d92e15f3f5916cbe865a857 SHA512 e2669082909ce00550928dee3be01655efb5830c42741cf9d4611096d0c4a575ccca6a4beac6b474fba7ed5b3676aaf0d166ceaad3af1e0633aa0183008a6d92
-EBUILD sword-spasev-1.1.ebuild 345 BLAKE2B 3040f340b9ca9b92141145288e68f21cbf7887e8db685dcab27b45ed71bc5ca53bad5075546e2e3f090df92659458700992a8ce148a1d12dda8b27665dc77778 SHA512 f94f97ceebde08b98c42f3b1f2a1eca742aea0aa3179ee3022cd8d0dc0921f4d4cddff8a9935295ad0879d1c9d90ece7f6718e8908695cd79cca1b0130552e2c
+EBUILD sword-spasev-1.1.ebuild 347 BLAKE2B 05154d6475304b2f54c9b31abf0e8a52de3472d5aaef7929d73154ad7628b7bf00c7b42eb576fbb46e91e9e4402c3696ea4c9f5c721f6bdd991d7bf61cc76943 SHA512 e9cedb5504f5b53b5d6e2b6936c2ba271151f2f3b2d4323c3fd562c29374dd968af5cb49acda87f1ebfdf6149d9a430703f125f4d5b078ee246a9718ac8446ec
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-spasev/sword-spasev-1.1.ebuild b/app-dicts/sword-spasev/sword-spasev-1.1.ebuild
index 53197692a33e..684f241e01f6 100644
--- a/app-dicts/sword-spasev/sword-spasev-1.1.ebuild
+++ b/app-dicts/sword-spasev/sword-spasev-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Spanish Sagradas Escrituras Version Antigua (1569)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaSEV"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-spavnt/Manifest b/app-dicts/sword-spavnt/Manifest
index fe6f2222ff09..16fac94c620d 100644
--- a/app-dicts/sword-spavnt/Manifest
+++ b/app-dicts/sword-spavnt/Manifest
@@ -1,3 +1,3 @@
 DIST SpaVNT-1.2.zip 367883 BLAKE2B 1efcfee3c84064b0c73e428650051c973cc45dd0663f185305a05151e41b14f8b3483a91521ce77919aeb7b71c17a6490045b8e31447ff4032a10f228805df4f SHA512 5dc5449963060216dac25bcd947ee50b3141e512e608868f427ef09001e82b5bd55a457e494a29e38cf73580ab2e188cf674fe4a4a26b4308be092c7faf2cd24
-EBUILD sword-spavnt-1.2.ebuild 330 BLAKE2B ebf900ceb47968b84eee5a8072959f4a5fd82c624d9ea98496af1e5e0763fabdd2b65490bc05799c843fc08b11faedaa4254d73cc1e58d6928dff421d28dbd19 SHA512 c5b44c04aad6ea1b4948bfc85643426b7967b977cd81f4df87a551f41503c007af54c400bea4ce77816ce52880d8d9ccf12eb35231cf66c11664b8151b400164
+EBUILD sword-spavnt-1.2.ebuild 332 BLAKE2B 35177a563a57b75e0d13a86ab853ffc89951339ec2069e0cf155c998e39f151fa8c5d00a9a41c4695cab2b869f25ea79a23433e61ba83e110ac66d9d9d426aa9 SHA512 4074bfd379b7a1e93fa39e18e661784006628f306e52a550f4e2c2c8ed2b28dd30c5ed90c574ebad875e169ec2e47a3389f994d6dde05716180ea9a3e99de1ab
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-spavnt/sword-spavnt-1.2.ebuild b/app-dicts/sword-spavnt/sword-spavnt-1.2.ebuild
index 2c770c22ef0f..c422bd512e75 100644
--- a/app-dicts/sword-spavnt/sword-spavnt-1.2.ebuild
+++ b/app-dicts/sword-spavnt/sword-spavnt-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Spanish Valera New Testament (1858)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=SpaVNT"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-strongsgreek/Manifest b/app-dicts/sword-strongsgreek/Manifest
index d8f555ec162f..75dfece8a86c 100644
--- a/app-dicts/sword-strongsgreek/Manifest
+++ b/app-dicts/sword-strongsgreek/Manifest
@@ -1,3 +1,3 @@
 DIST StrongsGreek-1.2.zip 356388 BLAKE2B ff7947f2aaebc9bb925c9a2ac07950db39d34399fec5fded4ca8f726492b20d30d68e767fe70fa0e89662d76377f289c9a956203b984ce5c6b90b9b7710335d1 SHA512 0a8451f70d9cfed8fcec8ada100274d07080de448c9d7593fbacf3c3f12c471865213555a8678918730d32ca7d93ec5bcd86923c68e384bf1bdd43a88c87e545
-EBUILD sword-strongsgreek-1.2.ebuild 338 BLAKE2B 41dc37ddb868229f079c5a9cb558ab0039fad29b9d05fe59aad78d2e63e0f3b6364f30c5d59373cb0b53b4defbab23e776173972be1bb0c3b53f8cfb7087b5dc SHA512 dcb9fc54e71a045593afbf2e7b08986a255522d2d83418ae9b56ec75a619511973e3c1729ce959126dd292123bce5cc5cab6b7d1b95ba3ec9e92e2db959267d0
+EBUILD sword-strongsgreek-1.2.ebuild 340 BLAKE2B 6b99afc866d09ab13130e9cfc8bf0fb3055d04b89ab068c90faa184464940f53d124f96e65c946e4bd4cfa4645f53de2abd520c5af798a7f39da9e4e655ccc28 SHA512 5ac6667b4a3bd05b6db94e336d91ae73b20a3096e033335a363c20abc29f361269e848fc9046f2a4aae5da525ca833a2c7b293be8c5fbc2c9aaeb54ef6800ff5
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-strongsgreek/sword-strongsgreek-1.2.ebuild b/app-dicts/sword-strongsgreek/sword-strongsgreek-1.2.ebuild
index 808583a6639e..a2d28ffefc29 100644
--- a/app-dicts/sword-strongsgreek/sword-strongsgreek-1.2.ebuild
+++ b/app-dicts/sword-strongsgreek/sword-strongsgreek-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Strong's Greek Bible Dictionary"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=StrongsGreek"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-tr/Manifest b/app-dicts/sword-tr/Manifest
index 810e087d3ad1..b15f4afbfb72 100644
--- a/app-dicts/sword-tr/Manifest
+++ b/app-dicts/sword-tr/Manifest
@@ -1,3 +1,3 @@
 DIST TR-1.2.zip 1273411 BLAKE2B 6e1705522b53d76ef35f45e7e6159342138f34e9c855da64bc4add705a67aac7431035f93f7717d437214b4c9418b4516c2d9fbf347eafd9f0e03e3a5f12f0f8 SHA512 0bae1092a1afadd2a3d7d65cd1d981be4bcca4e6e4e3f6323a9abd337e006d65893a9735e013a906c63a94473ca4028eeecfe26b16942d4fb1a128c8540684f1
-EBUILD sword-tr-1.2.ebuild 314 BLAKE2B 0b2623b53dd128730c8a58425ba92e7765f7c6f8e17919547b68e26af67dc8de29dd1d1683603fb1fdfa8d13da736ff7144e59da9aa883655e0207b3c9978b5d SHA512 78559e72812a58c000ce9ea5b4f25fc595101eaac65986aa8b6d4ed7e7fd7d0505a62cf792ef772bd096d0f1408579b010a5e9c002afd8627a1377be17b5a163
+EBUILD sword-tr-1.2.ebuild 316 BLAKE2B 3798158b664e2dbc6cb15c586137069513dc74cc66c156cc7190a6dda6b3a2ab005756a42931a162d575c0a4509f6155af1741b3b66e7361a10e73a6ff4a4424 SHA512 4fb2494117d689d2d976f5b82204aea9fe2c2c8d07a32794e3fd76427808cf1b4f4e5886d4aba35801225e902dbeba058e4f043a5b05b5bbeded1c1e046eb553
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-tr/sword-tr-1.2.ebuild b/app-dicts/sword-tr/sword-tr-1.2.ebuild
index 85d55016ae2e..f0840cf95eba 100644
--- a/app-dicts/sword-tr/sword-tr-1.2.ebuild
+++ b/app-dicts/sword-tr/sword-tr-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Textus Receptus (1550/1894)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=TR"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-twenty/Manifest b/app-dicts/sword-twenty/Manifest
index 892f49a05434..0a42ef356828 100644
--- a/app-dicts/sword-twenty/Manifest
+++ b/app-dicts/sword-twenty/Manifest
@@ -1,3 +1,3 @@
 DIST Twenty-1.1.zip 395147 BLAKE2B 7b5b798b4d9daf398530b7b791e1b04303d0e75be41ef19477567c02836151b1f76afb7cd12a701c85d0123f4ae854443b6599635fa0a37d44ba600d9de38779 SHA512 5a2449facec4426a60ea6ecfd87328930306e87e6221b0363128ede632e820629fc8aaa28c56e6f82c74a86ef23c47126709fc68ce9ccc1ea6f12e160ebe81bc
-EBUILD sword-twenty-1.1.ebuild 326 BLAKE2B 66db9496478970c127c9813d979d97dedf9b691f7a309d5138819ddac9f5fb4e46e6c308aa95eef76c211f51e6c50554491c27bf2c5cb0abd7a5ad265fff9558 SHA512 2802a0c36e5bf8bbe1d04c7bdda2a84709b9c7ffabe553f893dcb1faa4cf049ae897b3ae4a9a57a1746b53124a7333ad88d7cd740251bc42e5fbee86ee9c0e8d
+EBUILD sword-twenty-1.1.ebuild 328 BLAKE2B 69b30716e26b737b98ec66dbe593850ed6ab2c5bd860cc4eea89699f6c18967119d40658627a598b05f3014765a438b4cae740a72dc5d9443367aaaaf819205c SHA512 ff2d642c4e996618f89318bdcfd03c63abaa1d42e3bf5cec739d7470e246ab0257d42ea50ef752d0ca56adfecc550d35102e70d8eb9875c7ab00877d958bddcf
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-twenty/sword-twenty-1.1.ebuild b/app-dicts/sword-twenty/sword-twenty-1.1.ebuild
index 54fdb9f9a4c4..bb04b1b40658 100644
--- a/app-dicts/sword-twenty/sword-twenty-1.1.ebuild
+++ b/app-dicts/sword-twenty/sword-twenty-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Twentieth Century New Testament"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Twenty"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-tyndale/Manifest b/app-dicts/sword-tyndale/Manifest
index dc594e6713d4..bcfbf242b882 100644
--- a/app-dicts/sword-tyndale/Manifest
+++ b/app-dicts/sword-tyndale/Manifest
@@ -1,3 +1,3 @@
 DIST Tyndale-1.0.zip 351631 BLAKE2B e0565795f757ee9b963c545ec206806ff1596da95a2b1ba08974745aa456acebf21c50af924c06f7e177f459d6f1b07124f9943a132a4193a76a0da2e0779e99 SHA512 9318a0997e3199f1b74f26521209e591ea945af1ac3c0652df18688186b990fddc55812807275b2ee55f42a867f9b7593032191fbdbbfce8b663bd75de1a08e4
-EBUILD sword-tyndale-1.0.ebuild 330 BLAKE2B da109a46c18cdcf28fcb7d5358c7e761cecc642c8026310f7b762cd34e9562ba9ded35bf63847f9addbc298162b28bc9534ee52be706ad1a51e360f1a0dcadd8 SHA512 85c623b610cdaf429b77fc96d9d280301605b059a547e8ac6d5f1e17a00a957afe0df30dde2f1116145e9f50349a56303816683dcb38a8074c22c852e8f816f4
+EBUILD sword-tyndale-1.0.ebuild 332 BLAKE2B 75bc13aa07f391a6af7ec5023a2bd521b9d8285f287276566d5c632d328c5d286fb0532608e68012a2d6adb2b76d94c128b0a74207a074ee5698eb96e01edeff SHA512 4fc7a7621ee0eadfeb88898e05d3b7ce45027cae06097d56f52bbf6dbb6b48e3ad1b325c9da1e3c0f509e403290cb89e3a87f141124cd9b02133c12188c579ce
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-tyndale/sword-tyndale-1.0.ebuild b/app-dicts/sword-tyndale/sword-tyndale-1.0.ebuild
index 1597ebd90e14..e7e48e24652c 100644
--- a/app-dicts/sword-tyndale/sword-tyndale-1.0.ebuild
+++ b/app-dicts/sword-tyndale/sword-tyndale-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="William Tyndale Bible (1525/1530)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Tyndale"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-ukjv/Manifest b/app-dicts/sword-ukjv/Manifest
index ef7b4b61de0a..7a369ea2b6c2 100644
--- a/app-dicts/sword-ukjv/Manifest
+++ b/app-dicts/sword-ukjv/Manifest
@@ -1,3 +1,3 @@
 DIST UKJV-1.1.zip 1584221 BLAKE2B cd9dd0cef2416ca4a871807d71de5096f9fecb42cfdfd228f09ec1fd05f7c193cd972e67f6c5d3bc8b981d082c88aaa3d535ccf3c82045127c574896a2a2fc14 SHA512 1869a1b165d187bf0f1a11dd1ee032553576dcb7cd0f13707e6aa1956e0b9122b404751cded28be5d4a23c62420bdafeeb0c4af7426f5142a74246f28337614e
-EBUILD sword-ukjv-1.1.ebuild 317 BLAKE2B 7034a207f56da424dda2ebdc70d3a0212fb3258219bfac3f45a83526d7a9bbe59eb4e2f5f6e368a0d46d7b45dc7b030410e0293de0d1c0eaa0a76c35ac408518 SHA512 a2143548c79466784d2ec728bb2f699246a6fae3f1c36dc47af67edb7eba7feef5de4ec8196d135d842c2139a00d411bc1b0db112052259ee917c465c6baf558
+EBUILD sword-ukjv-1.1.ebuild 319 BLAKE2B 7a66fdd2cdcd1ed0d8e3f076f792f020bb3b16b00d7eb22701dcabff64961f96487c200029df15213e268822ba01ca28612c7a150132d500b2f3460aba6b8c8d SHA512 f35090a61e55d2c1f5e05216ecf40808bb128c30169dc94883d6568e5a807e96da422d67165ac4ed7aceeac8dd1aea80f3462f378c4ba9b977bd833439ddf8b5
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-ukjv/sword-ukjv-1.1.ebuild b/app-dicts/sword-ukjv/sword-ukjv-1.1.ebuild
index b58f000261b3..99b40e59c9f8 100644
--- a/app-dicts/sword-ukjv/sword-ukjv-1.1.ebuild
+++ b/app-dicts/sword-ukjv/sword-ukjv-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Updated King James Version"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=UKJV"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-umgreek/Manifest b/app-dicts/sword-umgreek/Manifest
index 7cb020e802d7..3f2f403f1d23 100644
--- a/app-dicts/sword-umgreek/Manifest
+++ b/app-dicts/sword-umgreek/Manifest
@@ -1,3 +1,3 @@
 DIST UMGreek-1.6.zip 1783059 BLAKE2B 1ee00187b3fffe640638106759bc99d648f9001d7938e872a30a2c7d90a12e87b1e9fff13b631e4a153821c7f32fd412d54de147978ac54f10be80908b5d63fa SHA512 29b400bb59fa17710c7fd302568c31692e46b099276f0aa53b0636daa0819cc4a8e50db99c5cbbb09290cea8ffde2f7a95d0ccf12c6c7646f898260e4c8f2047
-EBUILD sword-umgreek-1.6.ebuild 325 BLAKE2B 1b3ca0e91ebb75d3d4ca9145accf73a074d771d0305a1a6d1dfab5eb236c4af79c9247cd5e386abd86aef9021803122b0a5bd896fcffa163d910bc88d95ba0f0 SHA512 77be6c4e961a863bc779477477e7bdcf89c2fa279fc56ffb6fe1b89ef8f2262c33d8ef5a05008dd05db0e2152c11e99a97ee09d484bbad20d31cacd6eb14187a
+EBUILD sword-umgreek-1.6.ebuild 359 BLAKE2B 4242c1998797519f59ad8f7af85230a3699c4d3f48c3dac37addcf64660f5a56d72181fc1e8a3317c278d288abd94cbe419db35c0677c76d8f62a3eaabe6f19e SHA512 ae436253ce444037d507b28d9a8911308d2e2ce5fff3636b06a496a4b86462604ae6193bacfe3ab6de849f8ab556f836efff5650b2c94ba8475a2eada4e25f46
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-umgreek/sword-umgreek-1.6.ebuild b/app-dicts/sword-umgreek/sword-umgreek-1.6.ebuild
index 84736cab38ef..72b32a281a9b 100644
--- a/app-dicts/sword-umgreek/sword-umgreek-1.6.ebuild
+++ b/app-dicts/sword-umgreek/sword-umgreek-1.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,6 @@ inherit sword-module
 
 DESCRIPTION="Unaccented Modern Greek Text"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=UMGreek"
-LICENSE="freedist"
+LICENSE="all-rights-reserved"
 KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="mirror bindist"
diff --git a/app-dicts/sword-vulgate/Manifest b/app-dicts/sword-vulgate/Manifest
index 23e0d7bfb2cd..7005a0623b51 100644
--- a/app-dicts/sword-vulgate/Manifest
+++ b/app-dicts/sword-vulgate/Manifest
@@ -1,3 +1,3 @@
 DIST Vulgate-1.1.zip 1316533 BLAKE2B 9290df97a3a324bf05201e447765ca798c89928b9eabe6082fece09992090fd0d1ba18725228c2143326d87c80063aa8e761677ef1d6bb7dd9ad3da93ec14a7e SHA512 d4c51461ac09c4902c395c7f37fd45532dc071b7df787a0e1a7142d7d783abe50b25423ae867f4ad2665d15397e74bfb56b5d395be3f28f9dd5647f4eac6df09
-EBUILD sword-vulgate-1.1.ebuild 310 BLAKE2B 4aea16709f6fc552efbe4f9635f4950ae35cf1c555307602f9d5b8e4d1457716f1d1bd92c6bef62c644e6dd8b4ec930b6499a4ccd3acaf11baeb919889a76da9 SHA512 1ca12f45d9dce4af26039218863f8705e4f90354b7e6b1b3fddb5b599508fc30f5d7d3ab5a9c66fde4dd33ce3e7942d24363977d579c759d1653ee3beb654ac1
+EBUILD sword-vulgate-1.1.ebuild 312 BLAKE2B 3ceb91c8c63e2f1a9716fae87c40af6c5a8b15252a3b082fdef7379526c1c04c60ec3f998cf7358e732a4fc23398be58c473618702f78857764b1996a2d4295b SHA512 4fa7de1f8dae59c77c9831c6fcf2966f68489d4f0384ae4bf85a2b9d9301512760513e2dd52e322dd80bad49baa1b98285ebe5431dac4232ff031731c0cedcd4
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-vulgate/sword-vulgate-1.1.ebuild b/app-dicts/sword-vulgate/sword-vulgate-1.1.ebuild
index 60b8b2f643cb..0da76421e20a 100644
--- a/app-dicts/sword-vulgate/sword-vulgate-1.1.ebuild
+++ b/app-dicts/sword-vulgate/sword-vulgate-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Latin Vulgate"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Vulgate"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-vulgate_hebps/Manifest b/app-dicts/sword-vulgate_hebps/Manifest
index 444b42dc4b3f..11695feabd80 100644
--- a/app-dicts/sword-vulgate_hebps/Manifest
+++ b/app-dicts/sword-vulgate_hebps/Manifest
@@ -1,3 +1,3 @@
 DIST Vulgate_HebPs-1.1.zip 79573 BLAKE2B ae7b4f8a83fa632b3054024b2e10b0b167837f312389e98738f6193525f09d64445cfabc280e0c21a1f8c65d9bc331ba05954193e9426e61d73ece2319d3a523 SHA512 3b07164f867d26baac1aac311371206abfeaac17f8e680456eec6be0cf458c1172e1d31a7b2a17dceb4c44bfdad183fd2a9b46aec61488cf28f78ce0f97073de
-EBUILD sword-vulgate_hebps-1.1.ebuild 341 BLAKE2B e80c81e7279970e922b5f1ceeb982a82a8336317ca9d5767d07833fae6e552c398201e89d014c3bbb911c60360ba73648a9f7bc3d51d59922cd1883988adbfe3 SHA512 a46bac8b925bd9dddaeb3ad25e776c0dcdba1324e58a0d433c9bcbdffa4cace9eb77050470e036bd75c7dabe928986f2ceba716c64f99829896ee3536e565f5e
+EBUILD sword-vulgate_hebps-1.1.ebuild 343 BLAKE2B 219ba3e5159e24e0bcd9f9654b96d192f0abb0cfd01fa2bcd57d42b3c4e656ed9e3d2f85b29b31f44b59249bc46b36d4c09125ebe8c8df65b76028456151a806 SHA512 2196cbc8710b7143594a56a807d1673f628051a76da1558d23dcfcb4956654482075532de1703382d85427d8b82e51c9a7c1031395561d11a25a78a0f038885d
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-vulgate_hebps/sword-vulgate_hebps-1.1.ebuild b/app-dicts/sword-vulgate_hebps/sword-vulgate_hebps-1.1.ebuild
index 6ad997ddd0c4..d1e8f6ec16eb 100644
--- a/app-dicts/sword-vulgate_hebps/sword-vulgate_hebps-1.1.ebuild
+++ b/app-dicts/sword-vulgate_hebps/sword-vulgate_hebps-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Latin Vulgate Psalms from Hebrew"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Vulgate_HebPs"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-whnu/Manifest b/app-dicts/sword-whnu/Manifest
index adea441be5bf..0ccfd8d5f78f 100644
--- a/app-dicts/sword-whnu/Manifest
+++ b/app-dicts/sword-whnu/Manifest
@@ -1,3 +1,3 @@
 DIST WHNU-1.10.zip 1281295 BLAKE2B 46e097d1c5de75565f1af3291bf47c8deb915da8338a56ef302dfa53c62780886e595210309b349da1e849301065836d7f737c23570794b8c67898b49b9e9ffc SHA512 c241ef99837c0e09e9b5192b134b2d61bc2fa6bbe8dd06661ec56fc7a9bc236adffe4fdad894db966884296f254858d92dc7b0bfcede19d902becf54dc1a6949
-EBUILD sword-whnu-1.10.ebuild 335 BLAKE2B d7447ebbf7a4d96b125ea7a29feb895d70350da27cdaa386435c7599bad23bae98bf9aae465318dde1ceae6114a0685f8d2c8c27a912f65fa65fce7aad860191 SHA512 85525e6d8a6ee6f1cc7c7b5c9acdd205a4e166dfc354864feebc93ad39f64d50953ee5e423ee60d275d56bcf3fb80845b7846e448b4430c8e12026ca7a6b5f89
+EBUILD sword-whnu-1.10.ebuild 337 BLAKE2B 03f8a2f9c3fecb24e1c4a9433b4a6728a29759ff86c29716d94e5946f51add014faa9728659fb9c78cf2e351cbd54843d92358e5ec02b02a8da72a8f7e302e54 SHA512 5ae5c553853da524a63ff3a86d3f82c14601c8ce58c9e2c844884f949ee068958bd39de08630134f4a977c26b2e8a86d548f30ad890b2402ddeb016392a747f5
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-whnu/sword-whnu-1.10.ebuild b/app-dicts/sword-whnu/sword-whnu-1.10.ebuild
index f983efead6b0..04adf18877f8 100644
--- a/app-dicts/sword-whnu/sword-whnu-1.10.ebuild
+++ b/app-dicts/sword-whnu/sword-whnu-1.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Westcott-Hort with NA27/UBS4 variants (1881)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=WHNU"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-wlc/Manifest b/app-dicts/sword-wlc/Manifest
index 8c643cb904e8..f177cc16f055 100644
--- a/app-dicts/sword-wlc/Manifest
+++ b/app-dicts/sword-wlc/Manifest
@@ -1,3 +1,3 @@
 DIST WLC-1.4.zip 2017282 BLAKE2B faccf4c8cacdbe60fe8bbfbef254ff2b5e5469c78b0390d6a6f1d2b1b45ec171d1dfc6055aae200c811d384c8683abc2f33d663cc40bb42510ae31d23c3df75e SHA512 71c45b2d5d30fb50ceda827464fe5d50350827b37b23b439341f61895f759de86edd1d77ffa26fc6e3acf0cf7759e7ae28645c360a2b14deeb9442e51aa9184a
-EBUILD sword-wlc-1.4.ebuild 316 BLAKE2B 188f1256e39fd5ef1333db8b2a2f21f79f6a711b284db42d2579240d5031e3b21c6c26b8cdb999723fb42eee038dab57e90f2e9365ae62cb2a821a6c5172abcd SHA512 9d2150021ce9ef1d58457fb94e25cce63c4a4be4ab092a94276f6b388fd79e6ac253f3d3537936831f38d408db9b54ed62e52f6111b92f1a6161da5618cbb9aa
+EBUILD sword-wlc-1.4.ebuild 318 BLAKE2B 1ca11b237b43ff3ea9e445aead68fe2f2a9a45caa62917a3b4d5f40615e3acdf7ab71350a397a73dc24f91afa4efa239f1fc14814b844d9ebf247892e47e57b8 SHA512 0fc193ccde003815172a6994581ee2cda221fb55104734cfff4bbb569ebdd0eb461e28af670070ce819555f711649e966510ca55fd181630271d3c2ffba77de2
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-wlc/sword-wlc-1.4.ebuild b/app-dicts/sword-wlc/sword-wlc-1.4.ebuild
index f5a24d3d1a55..6e571793d6de 100644
--- a/app-dicts/sword-wlc/sword-wlc-1.4.ebuild
+++ b/app-dicts/sword-wlc/sword-wlc-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Westminster Leningrad Codex"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=WLC"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-wulfila/Manifest b/app-dicts/sword-wulfila/Manifest
index 8617a0d8f915..5916f0868704 100644
--- a/app-dicts/sword-wulfila/Manifest
+++ b/app-dicts/sword-wulfila/Manifest
@@ -1,3 +1,3 @@
 DIST Wulfila-1.0.zip 238923 BLAKE2B 3c496bc16881ecd1164678bc6cf4bcbc8bc2185af1cea961138e01fead350d31e076047d846d0b1ef23971ae934cc2f292c69bf454e0254fe41321817f5d553f SHA512 fcec30f54bdd95c77d2737f270909354fc1500196dd05d6a8aa02bf4b1b6ba61eef946ebbe523b90b1d5fb2c77ddd6f9b1e101949b7050bc4068cd9e2a9f8067
-EBUILD sword-wulfila-1.0.ebuild 324 BLAKE2B ff7bd5273aa522a9d26257da4d5767b1f7c52b885547167ac9e7d3842ed02f571263cb5269f91bc151f2b3e63b7850f3c63f75961f7a377ac9006f551f44e81f SHA512 1562181d2d9b6b7afece2ad1067244b80a89d6879bdef1b18a290ea0bbedbbdf8d841ab9293c2623873efba74a981933a76d862ddabb2618a5d177aa4831d961
+EBUILD sword-wulfila-1.0.ebuild 326 BLAKE2B fd777ad9066182870075e55d22b43b6404c22f11dfecb51c5a24022959c61573885b75e9455306c0eea24f31c83ed83b00c85c04e6a518e0f6d679564d8f7b0f SHA512 717e4ec7c21a0926e4309c892ca80266b9b61c54b3353880da3128f7e45c45baa03014ff0848566ef5737f60dcfa9a4cddea87ed068a70f6e9f5cbd6f9618e2d
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-wulfila/sword-wulfila-1.0.ebuild b/app-dicts/sword-wulfila/sword-wulfila-1.0.ebuild
index 918421ec8833..857eb3f761ef 100644
--- a/app-dicts/sword-wulfila/sword-wulfila-1.0.ebuild
+++ b/app-dicts/sword-wulfila/sword-wulfila-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Bishop Wulfila Gothic Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Wulfila"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-wycliffe/Manifest b/app-dicts/sword-wycliffe/Manifest
index a9125188498d..0e8eb5432c70 100644
--- a/app-dicts/sword-wycliffe/Manifest
+++ b/app-dicts/sword-wycliffe/Manifest
@@ -1,3 +1,3 @@
 DIST Wycliffe-1.0.zip 421695 BLAKE2B d73da0fdef44c07265361d595a9c5d1464a3e3cc63d8857347f4aebd93b8d8ef73b9472af3b56ff9aa45ff250342556cfac82501085d31955880dad655faf70a SHA512 b67518357da85f64822f0ebd9a70a1f8a59363701d26ac808e3c745ec40eb3fb092848acad41ef2757d3de27ad06815ebd2a865ae991e563f07283e41e7fc9c4
-EBUILD sword-wycliffe-1.0.ebuild 325 BLAKE2B 17749b1ee6b73edd0c29a8b8453762ea5531f03aa14cf6bfeb4b2426a7c8fc88b1e1651d7e76b637a006d7dd7cb6d9d23a766479325e5cf568ab37271778f689 SHA512 61a96f0887035473e0313c258aa49aabe9f49fb4cb9101f72439c32fa861fc27e4216befbc65cd66820db353a858723180b960db2b2c8715aae1e43c64a4ecfc
+EBUILD sword-wycliffe-1.0.ebuild 327 BLAKE2B a82e0242b27c4bc78a0da6fe326a9cda539eb547083937bd8f9b6ba3cc0cd7dbc29b7122e103797009451395c5aef11bcc85e94371f6653880e21a11851a4f34 SHA512 7e4c41d622b312f845783849b4b0411f8cf66427703016fb9fba58c2883293632a08041ee5c2782f4f39ff4a9c06a26b964f17f88e93e40d03a88a091ecc78d3
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-wycliffe/sword-wycliffe-1.0.ebuild b/app-dicts/sword-wycliffe/sword-wycliffe-1.0.ebuild
index 62ead1fb0502..ee10b1f30a12 100644
--- a/app-dicts/sword-wycliffe/sword-wycliffe-1.0.ebuild
+++ b/app-dicts/sword-wycliffe/sword-wycliffe-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="John Wycliffe Bible (1395)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Wycliffe"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/app-dicts/sword-xhosa/Manifest b/app-dicts/sword-xhosa/Manifest
index 9f70e7095c8a..77a6310aa17b 100644
--- a/app-dicts/sword-xhosa/Manifest
+++ b/app-dicts/sword-xhosa/Manifest
@@ -1,3 +1,3 @@
 DIST Xhosa-1.1.zip 1428206 BLAKE2B 33820e755e4696bdba0972254ec6d2cea0c86bc7b9b52f0c5cfa180d217f328f07e42cc7e0c0be815c4bb5589108995574af9b0d3ea8dcfcf4a1493e5defb183 SHA512 3e3e0264417009e08751cee3e5d48292365b74e1af4c0a611d54b7e20a15d4d2fbf2d31ae56d49b135c5684d67fabf7d5e6e2948315df97fa07dae70c621a785
-EBUILD sword-xhosa-1.1.ebuild 309 BLAKE2B ecf1fdf2499c269a1e2c109e8f4fe20dd59d0044d2bb9f91a36a8312539f214ecb61b7af548ed5625b99e81fe7abf0d535d658bda5ee582c03ba3d8827caf67a SHA512 a9113b9ad09b3fb6720fe4c363cb8348d7f4b5a1f584b256cbd05bd11a5f7269b1d7ac51e8496001ad6aed615a2bf36a863ed6fe2d97b4b4b3b3e46820645a56
+EBUILD sword-xhosa-1.1.ebuild 338 BLAKE2B ed9f3c462d91f653d944d05af9f9096eb31d967c3667422ea5263c6a09ad1015194a3209545ee9f47021a812c010a91a5cbbe6ba1cb626d8e2f2eccf69fc9269 SHA512 e964b7f75006d90fbb7a34963abd61d5e8c439027505d2eeb44bbe4b43fe91a1e49466fd8b9b90fd1f6cfdddf17a4e8c04a26cd97bfd7da2eb738ba5b536080d
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-xhosa/sword-xhosa-1.1.ebuild b/app-dicts/sword-xhosa/sword-xhosa-1.1.ebuild
index 8d5d459b1abd..d23d54cfab00 100644
--- a/app-dicts/sword-xhosa/sword-xhosa-1.1.ebuild
+++ b/app-dicts/sword-xhosa/sword-xhosa-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,6 @@ inherit sword-module
 
 DESCRIPTION="Xhosa Bible"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=Xhosa"
-LICENSE="public-domain"
+LICENSE="all-rights-reserved"
 KEYWORDS="~amd64 ~ppc ~x86"
+RESTRICT="mirror bindist"
diff --git a/app-dicts/sword-ylt/Manifest b/app-dicts/sword-ylt/Manifest
index ac847d738a3c..4bbd1b949d36 100644
--- a/app-dicts/sword-ylt/Manifest
+++ b/app-dicts/sword-ylt/Manifest
@@ -1,3 +1,3 @@
 DIST YLT-1.1.zip 1430863 BLAKE2B e2d6c04c8e83f84f2f0f89599237a958abb09b9a117852b0e92c9d685de26ff61d3416f81ed857e104712cee81d5b20676bad124778d5a8a7f0cc8f63b62032a SHA512 6ff2b321082eb9112df8978e80b68baafc63209d2d6b13432f0b221fedfac5d8c50b6f15261e41b0e3f04634cc286574efec81cae1a5ae0c116f30b8fba9b47e
-EBUILD sword-ylt-1.1.ebuild 323 BLAKE2B 7e85244ce3ff26cd5fbb105f8d463c9bcaee5f55ba9cb8078ebfd54f40616720650b3975faa0021daf3c0ff49cb1cc7668ad3ff109b1d0bcd1546620f55d0120 SHA512 d43ff31b1e670383ad744ea0957177c71930c3f36ae01ee5dcab53e2211e13e8dc12dc83cd774d45e4a3aa885a5b6f70deea6abdfd99356bf1df1c801f665636
+EBUILD sword-ylt-1.1.ebuild 325 BLAKE2B a62c413453fbfbcd0cc0007b6da1d87f4d0ff5bc08a857604f07f191943563c44b02e7aca8e18ec39b6a9e61e3704ca07373cea20aa21d7f34cbf63cecb4a44d SHA512 7103d68f9370f5dccae6573e9d945592c7e9b006fcfceaa3f92d28d324f6fab49f32ec29383256855235d384898b38190bbce25777e5a1cadf5e16523c47042d
 MISC metadata.xml 240 BLAKE2B bfe6770a939e72828b89878dd08075701514124ccb83e93eca0649d0d2339e041ae451d37c5de89372beda5f9a48ef0a89d56a01d864dfe30dff9bf3a4bde935 SHA512 2feecbfe86feb5cbd6cb8b08e60d9ab94b9fdb1683e6a401970226b5317567d66a2038b4c7b0ed86905044a50e7cdf69e885cd17e4148bfc66e437a0847642a4
diff --git a/app-dicts/sword-ylt/sword-ylt-1.1.ebuild b/app-dicts/sword-ylt/sword-ylt-1.1.ebuild
index 4e91ee65f3a5..f9f9199db040 100644
--- a/app-dicts/sword-ylt/sword-ylt-1.1.ebuild
+++ b/app-dicts/sword-ylt/sword-ylt-1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,5 +8,5 @@ inherit sword-module
 
 DESCRIPTION="Young's Literal Translation (1898)"
 HOMEPAGE="http://crosswire.org/sword/modules/ModInfo.jsp?modName=YLT"
-LICENSE="freedist"
+LICENSE="public-domain"
 KEYWORDS="~amd64 ~ppc ~x86"