gentoo resync : 17.06.2021

15 files changed, 70 insertions, 12 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 6e54228cd8d4..cb956c968055 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/dictd/Manifest b/app-text/dictd/Manifest
index fc235cef3e0c..5168f2094f9f 100644
--- a/app-text/dictd/Manifest
+++ b/app-text/dictd/Manifest
@@ -1,12 +1,12 @@
 AUX 1.10.11/colorit.conf 848 BLAKE2B 2fd40b7c18973f3374d2e0b733939d9e8cc2fb4b834f9b4c2a14a98133657db795eaf2e37284c8bc849fd392d1db6a221a786f3299ea1ad86f874e370841b981 SHA512 d836de8a5a409bcbc3e6ee71e3b8fab20229b9937cb909f061cd8d2fd8cb841870d42ce9c4501c441a7825c642be76a7da3c242e9831b1caa30fa5b26e173813
 AUX 1.10.11/dict.conf 243 BLAKE2B 707e17e8373ded07ff36a304a17e33d22544a2b497118b649710cfeb2dcdfcb206990852606ec1392e7018d5e5c475ef823b741438fc22207f25fd7647bc02c7 SHA512 22fbfd3bf8c4f88801aab848e160f46bf17757086ffe8fe7a4cdb78f983e88f6c923cac8714f78d31ab311957aa860731f663324b742febd0a5039085672aeb5
 AUX 1.10.11/dictd.conf 781 BLAKE2B 1cb0a3548125923d2fabfa296863135472b93ca6c34cd4b2d8eebf7f9c0d6e7df9ec652eed4f3a2ee138834ada12a58cdc315d0607cd2bba05315a6dac6db6bf SHA512 60c7ade9e3c160c69b87405962b0e92f6beb3941fecdbbb90c2343f1db1cc800bd26f1a670435641859e6bc864aa8ace58749c07dd106c3afd7eea81601445c3
-AUX 1.10.11/dictd.confd 207 BLAKE2B f7d9815d41490f85a977d3dcfa9dc7330e48b76102f4cf90c18204f780287c7681ba9c7a4dc4e04d9007d18e89f2dbe6c29595ea9f685bb6a14c774f2485a85f SHA512 16e31e250bce84cfa25d5d187f736053773889afd248248fac61aac115df2938fbe6f30049c143f2c290b60652947125763adaffdfcd71260853d574c0434348
-AUX 1.10.11/dictd.initd 1982 BLAKE2B ea63cda1512c1e65a463193cb17a2610053909aebdfb5c572720572f9aa77a00adb632d22a8e775bd0fd8c397331b2f79dda43c214d44d0166b374a9f5dcdc7e SHA512 7b8907dbc9f40f81b8431e691506142954643e6539ca6bb486f629fb929f60da8a7e52066e46374478f805dc1b6e84931f3b4a6a2f8f7d34f56a8664c5f4a0ab
+AUX 1.10.11/dictd.confd 209 BLAKE2B 01680317f1f8635660d5ffdf7fef24eba29a5a93c011afb15b6176407aaee3ee3f11cdd72a33c9c46384cea909d7e94a7322843d585f56d8e48276a00ac64216 SHA512 97944c9603efcbbf8b754e2b641bbdd837b85f186263e6225b949598a2c56863697faef77cca8789c8be155545bc5699b11fce5bfb2c3cd6594f1f34d9d36104
+AUX 1.10.11/dictd.initd 1984 BLAKE2B caae914f98ea3e8d6e6df9de8e72c70b39c1340f85f15332e2b7acdbcf6c4711f7b05eb84b2323020afdd182120607b8f6bff4fddfa163d58aa22ba520a1bf97 SHA512 33a9ba8729b6c7f40f9d5cdd04892ef3b19e2b5c8f7506b9ba229d87eceafa3ab755549644a03a83122acf969b138e05d380f27e2a65ab6d54e62e143101b3cc
 AUX 1.10.11/site.info 235 BLAKE2B 423c81fc16eafaa8d0a0f04eb478fb390ef075638b3ffd6ddcae0a6f8685758ff741c52585d76fa56713893931376845b68fa33dcb90191268bf81301c686b00 SHA512 62e63fd9c0b939647381831fa82762f324059c440111918791abbb03f03459d1411065d30f71c8b30da666f84e720960e3f49977a17c849aae4d6c5845e38a5f
 AUX dictd-1.10.11-colorit-nopp-fix.patch 244 BLAKE2B d93eddba872d67b2b5ce0ab9e4dbbcd2271f484d91e23bfba9e8f287669f5323006b3209b41ca9a0926e672c66d867db5f048b5b3fcf314ed29b1d7617b65eec SHA512 f7e8e84bd6132e19e778066b6adcd34ffb17e009d3f6abd9177a6aa5ad0c2c7e8afc03f5cadc18b6ec509a3118ccf3b515f971330f45baed36534b65415f8ca7
 AUX dictd-1.12.0-build.patch 643 BLAKE2B e7f9ffbe56a15278a95537791af88a1866452742af218bac5e8a336c735d232775fafdd7338e7eb20cee2bf1ff45b4369d9c7932a6004d8733172732cdf2a6d4 SHA512 577a85b765a3a7e8e8510ea36567541073a79cd2f99a8efed69ee1fb1e7d32a864d872fe358c0692be56af0c94ea241cb4effb9623371f0eb8492d8c4d223433
 AUX dictd.service 181 BLAKE2B bf79654496f9ee30ca1c44a3c771927cd7bbf5bd7e97379cbd4d65c14ce3f8e4b90c4c50c706545b282e8260e0eed14469f42c9072e0c2be943979dfa88acf2c SHA512 e09f48b746977bfc118fe448bd41c33c6ad61fd94b42ce343ea087b858624498306d958203ec5e219dbdf94d54f8eb5a1feb7c48ad3b3ebc2eb1e9d3594828b9
 DIST dictd-1.13.0.tar.gz 395455 BLAKE2B 222ce7eee03083ee23066f43330cce0cda3041d2ee4a0d54b2e9f2ea18a77ec83f91fbb766bdad645bdcaeed0674361ba600a393e4cb6c42bab6be94098991f0 SHA512 86871aaf34a182d1d7aac1a1282d4a75f2d7c112c762e92f303924c324f665dae75c51e7ca91e3cc1dde2053ad8e2d1fd50a76934a5f84ff70975aa858e26439
-EBUILD dictd-1.13.0-r2.ebuild 2893 BLAKE2B 841fe1e4349ca30a3a09109e89f84fe4555a8b6e7cb6968a2a8f296bb602c3b3d17b41661b95e726b4aae407e06b800434ee3884414edc484a6efb172ddb4394 SHA512 949c4a2975dac8aa94819c5cedfd860a673a709905a61650412f62474f8619519d7d63fe6afb01179c5f1c8e889bb1bb49080f0bdb3b54c519e6494a10360052
+EBUILD dictd-1.13.0-r3.ebuild 3155 BLAKE2B c14c1d13b358462504a48b7f9c011182f1f2b708cf4cdd3425ddff02c38983dc5b29f978ac0026f78fee5c6fd035330c6f43b7932cbc10b47013899dd2ae162d SHA512 001813b5ac6ee289a8f8459e13226405e0fe31ddc36a30f9f638b2b5a03fa5e21b90e40aeb95e063e61cf1f3d9e9e51efef827986888ba42a3cc8499115775c4
 MISC metadata.xml 484 BLAKE2B 8513944c0eaf7007a75c571dd29ad9e408db17a8e68f39424f361d19e488fa644a8467db234692bed15fd2d2425676c09f7187751b507a69967dcd598f9ab30e SHA512 b404b831fbea2146daf29f4bc81af88c5e226134950fa1eff68823bdf0b00208328936983d1e9c8c51e3420a27c0eca99e83d1178451b8e5df265b8623d3385e
diff --git a/app-text/dictd/dictd-1.13.0-r2.ebuild b/app-text/dictd/dictd-1.13.0-r3.ebuild
index fc78189e59d0..342d7ec8462a 100644
--- a/app-text/dictd/dictd-1.13.0-r2.ebuild
+++ b/app-text/dictd/dictd-1.13.0-r3.ebuild
@@ -113,3 +113,11 @@ src_install() {
 
 	readme.gentoo_create_doc
 }
+
+pkg_postinst() {
+	if has_version sys-apps/systemd; then
+		ewarn "The default location for dicts has changed! If you've modified your"
+		ewarn "systemd units locally to point into /usr/lib/dict, please update it"
+		ewarn "to point at /usr/share/dict now."
+	fi
+}
diff --git a/app-text/dictd/files/1.10.11/dictd.confd b/app-text/dictd/files/1.10.11/dictd.confd
index 06eb94973bfa..4ceb5f02f30d 100644
--- a/app-text/dictd/files/1.10.11/dictd.confd
+++ b/app-text/dictd/files/1.10.11/dictd.confd
@@ -2,4 +2,4 @@
 # --locale switch to DICTD_OPTS, e. g. "--locale=en_US.utf8"
 DICTD_OPTS="-s "
 DICTDCONF=/etc/dict/dictd.conf
-DLIBDIR=/usr/lib/dict
+DLIBDIR=/usr/share/dict
diff --git a/app-text/dictd/files/1.10.11/dictd.initd b/app-text/dictd/files/1.10.11/dictd.initd
index ca4474043bcf..385461ae08fb 100644
--- a/app-text/dictd/files/1.10.11/dictd.initd
+++ b/app-text/dictd/files/1.10.11/dictd.initd
@@ -12,7 +12,7 @@ prepconfig() {
 	fi
 
 	# if no dictionaries, skip startup.
-	# The new way of doing this is to scan /usr/lib/dict and tweek the conf
+	# The new way of doing this is to scan /usr/share/dict and tweek the conf
 	einfo "Scanning for dictionaries..."
 	if [ ! -d "${DLIBDIR}" ]; then
 		eerror "${DLIBDIR} doesn't exist, no dictionaries found."
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index 7e2554343659..2ecc39c30b35 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -1,6 +1,6 @@
 DIST djvu-3.5.27.zip 3567522 BLAKE2B c074468a2fedf097b9b8fea4c449f26b61bffb31d10114081554e59256a23315ecffc203b5223468ca0c3338118b53aba65eee4cb5e7ad5c8d55470e90f43843 SHA512 dc1cd1bce2fb6245946f9409b3a3826ef2dc77a20be079c929b17508c3d967a0b5d8acd61bad00357e46a845f7f97717a043db9ffd1fe23e9a09441b7d21cbd6
 DIST djvulibre-3.5.28.tar.gz 3701161 BLAKE2B 74681f00d5f116ab08ccadb6c6f536f5d23f1fafdfae1239add6d800c0446298e65cd5dad293e28aa4d309dc93eaeec9036a7144f6fa42ff1104a4b945ca6bce SHA512 db3b8a5b56d700e911be32057f721a2a597e6f52e6fade203ad75ad76ab2d8facff2e474fd18beea703ccd5fa6425352e619a8fda40e69add1724dbee26050c6
 EBUILD djvu-3.5.27-r2.ebuild 1656 BLAKE2B c198997bd2b46f796e5ce31812830be1073d02fe4d716d5cd7e9d04c01b3bc792134e0f715f330f73e5e73e083206fda8211269eb9cfcda83e85221572fa0ef8 SHA512 774cae08ce0940d27e2bb4961509e005fe134bf2eeb59aa3b60dd98aca1786acc4bd6b6d438d8f936424eaa17a3bc174b77f89dbccee4908c23c3aebe2005e0b
-EBUILD djvu-3.5.28-r1.ebuild 1532 BLAKE2B da59eabf654f375a9a053abf8535275019789e2140a46f0410e3802126fe1edb91487625eccd0fd43c340cc56a9778d117017bd2d285680691f702ee9dfe4022 SHA512 9e79d5806181fe89cc0b0393b716c2556391e4ce319f21c7d0296fa0beefc3eada4276156c672a2ddaefcb1b06e8a5c2644a93366304a90bc1a0af34d43d2d9d
+EBUILD djvu-3.5.28-r1.ebuild 1531 BLAKE2B 6b2ae33511569b26e445bf7c9dbefd9ba78c4d76053434d1c5df4307a178fc61203a1900d5b634ecc97bbd546af02cbaccf570337919a637e75fe98828080187 SHA512 ed6ff9beae540995641e1c02229770857640e09a0fe1e7e3a3257e4788ccba8666374b0c77fe65da86309fb820d9241bdcc8bfa4ad3c8b311594a8fd7c2b6257
 EBUILD djvu-3.5.28.ebuild 1460 BLAKE2B 0676c99f9d5a56f052ee72787096fbcf109e4bf18783ec5e0f3d8604af04b4e927916951ec5c0936f73f42a6e65a4eb66f98148ac99921c1682f57cd15b22e2c SHA512 c90c9f93d60fc510a6da17027d3f85b9b15867e1c83359ba3c34c87c71083a6d3602eec24731dd8c9fc36117a271691bfb405366a5c43830c7796310b4b9cf3d
 MISC metadata.xml 948 BLAKE2B 1d15a217967f10397d747f2cc0844ea76d4f876ed0ee8cb56733b74a3b92f023e3eeff11bfcb4265766c14dad4b1e35a18f7d2fdd7442068bf82c4a8302690db SHA512 e5cfa3a2b2077a3f0dbfcc99165fb678e8c8759724790d520f1bed670fed5e753a47207bbbcd7d2ff2d55def5b34bf32201771918c9e7a16583d91553ac75e42
diff --git a/app-text/djvu/djvu-3.5.28-r1.ebuild b/app-text/djvu/djvu-3.5.28-r1.ebuild
index 01871d1ae5ce..413ce4e6843b 100644
--- a/app-text/djvu/djvu-3.5.28-r1.ebuild
+++ b/app-text/djvu/djvu-3.5.28-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${MY_P%%.3}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="debug doc jpeg tiff xml"
 
 RDEPEND="jpeg? ( virtual/jpeg:0 )
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index afb1478c3342..094541d4040c 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -1,6 +1,8 @@
 AUX enchant-1.6.0-hunspell150_fix.patch 577 BLAKE2B dc57f0fd5a90ba36abe174949060b20c709f920aa7ef29e1560f4a194d744064f59ae7c812cc27debe30c1082a9f76d3eac8723f850803c5eb06c213fe39e91d SHA512 893620f45a1dd7956aef9f3517186a9226c00e6b85df4770d6ea388fc08854e7884143fe3c7a064c7ec4f8353a9b9571d0c07da22df5c6ee41fc4c6bbce5874f
 DIST enchant-1.6.1.tar.gz 642124 BLAKE2B d41aa9b313e7fe8b0887728b55f3c5218e270c7359b4edcdc8d9180af68687230bcc9f7d1abb9f85ac673478530e5674366c9bc7d08b983e7226725b2cdd73d3 SHA512 26c62dfa89ee40150db502651a2f876fba00569b7015f205dae27a029557effacff335bbe36124dbe6686537da2305bcab02592179d03e95fdf9741d54b98036
 DIST enchant-2.2.15.tar.gz 990693 BLAKE2B 09d380fc90cf8404345e88fb4e676f92e795b43e1caa5f21e52c6f3037268b1959e9cd1adf04b08e05fce78dbbcfd3163795e8d2079c484c530065566a0307f2 SHA512 e29b3a85d993af28044a86dd23a3ca74c7d50b4218e542c380053a3eaf70c3ea2406feb3361ba8e793bac586c252330bb20fb56c65f3a0a54f63f103cc0abb35
+DIST enchant-2.3.0.tar.gz 986837 BLAKE2B 57859d41d1e605ba5b89a264e3b6f53bab7a2f060c2b306a1ac51c55925d5b30a5d40fd121be7d3df22395cc11ad4808e63627f7e0f5ae9f3c1d2f2939dc2f68 SHA512 ed25d74176aefe4ab3b1754ea09356d04c844f8e7a50441d331fcf6a0fefbedaffa21df7296b7947ab1fcd44844c1d8567d39d67ebc4381ce8766577c0269d43
 EBUILD enchant-1.6.1-r1.ebuild 1618 BLAKE2B 339676eff2871a9abd5bf85a3509924677ec5d9939e49416d4d09b71d4d228b45e81f8ac6b207c449c8ca837aab0d8d63add052598a0ce9430873bf0ea3df250 SHA512 eedb24e76290dffa83a68a565e2f5dc10544360a62617bea107a4270d13b5a6dbb19418a245c84923ad3dd5d6e77dda2338f14bee2b3a17ddeff1b7c2414ad2c
 EBUILD enchant-2.2.15-r1.ebuild 1234 BLAKE2B 581181d56ebf49b2d414dbbc9b5b10978b00995af9c1351fde61323c7a82037f7d1ad9bf04e45fab52d493724d77c1b722d363c5dd83e7be9bf61d674c8f0bd3 SHA512 ffd97fbf9221420bce5cac19b147c65f945ee5c612728f7e400a9172fad1b62aae24ddcf811a6ea12fe9bdef9fb73fc1bef41d50a11c012db75352e253d48c91
+EBUILD enchant-2.3.0.ebuild 1241 BLAKE2B be853d1f72faf5dca852318b15cf3c61c5b0b2938a76863df67602dbc244a58d651c080e5f367a8e6ad226367808de6415b931781a2507a5d0440c27de635f1b SHA512 3f4176267b8e7cbd0278bacccafc89c4ee3210947db628a4dc919c418541f47ba46685c31eb5378b978205c30de406c424507dadaa01ca7a506844fcc1b054a1
 MISC metadata.xml 536 BLAKE2B 5f66bf0da00c6cfd8d6e22b9644486d0df8cf81cf5875768572965f60927edbe4d46ed2502659bcb71431c715129d1d7da051f9320b3f2834905a0cac3c2556b SHA512 920c2056608571d6a2e52d0c52b995b664c95aa53c8f8cb51129b059c32180d977ab3c840ef7fb59af3dec5f984f3e1488de26cf3ba4d93c2eb81c08e6688d5b
diff --git a/app-text/enchant/enchant-2.3.0.ebuild b/app-text/enchant/enchant-2.3.0.ebuild
new file mode 100644
index 000000000000..1c7845af2065
--- /dev/null
+++ b/app-text/enchant/enchant-2.3.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Spellchecker wrapping library"
+HOMEPAGE="https://abiword.github.io/enchant/"
+SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+IUSE="aspell +hunspell test voikko"
+REQUIRED_USE="|| ( hunspell aspell )"
+
+RDEPEND="
+	>=dev-libs/glib-2.6:2
+	aspell? ( app-text/aspell )
+	hunspell? ( >=app-text/hunspell-1.2.1:0= )
+	voikko? ( dev-libs/libvoikko )"
+DEPEND="${RDEPEND}
+	test? ( >=dev-libs/unittest++-2.0.0-r2 )"
+BDEPEND="virtual/pkgconfig"
+
+RESTRICT="test" # Tests fail
+
+src_configure() {
+	# TODO: Add app-text/nuspell support
+	econf \
+		--datadir="${EPREFIX}"/usr/share/enchant-2 \
+		--disable-static \
+		$(use_enable test relocatable) \
+		$(use_with aspell) \
+		$(use_with hunspell) \
+		$(use_with voikko) \
+		--without-nuspell \
+		--without-hspell \
+		--without-applespell \
+		--without-zemberek \
+		--with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index 2b441cdd3363..166a4f2e552c 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -4,5 +4,5 @@ DIST highlight-3.60.tar.bz2 1412486 BLAKE2B 3651a44c7e492ce02de04d21ed2e25afb40e
 DIST highlight-4.1.tar.bz2 1469115 BLAKE2B 9ee4c61ea5ebdfd04c2bb341838cc66a755d5deb6dfb5d863d22dbb86be9b5d08999f22bb184053126bdaf8858777eb2ac504fed8998dc51bd6e1cd64f911ad8 SHA512 6e3ba72b2109f1b33fcebd1a426a8d4b3e12ee224b8a2069e7aab1391473594ccf9b35303bca5ca1339d2ce42bc6db2d16c1da7b1cdd451f5fabe672ca388731
 EBUILD highlight-3.57-r100.ebuild 2403 BLAKE2B d79cb8210548b2d9f1f0ef73a78604cda2d30b380c4b0746a3d86ff80dff0f2a28d55e2e4353339c23920d55dc4826a1410e465505d56a80ab02c5def18f6651 SHA512 5e8133de9a08bf33f473a94c4aea907f997d4b12c60da43886af556cf77efd632df445909f272b15f8fd7094e99f32d92352bc5ed1cbfc6291163e3291c54c05
 EBUILD highlight-3.60.ebuild 2403 BLAKE2B d79cb8210548b2d9f1f0ef73a78604cda2d30b380c4b0746a3d86ff80dff0f2a28d55e2e4353339c23920d55dc4826a1410e465505d56a80ab02c5def18f6651 SHA512 5e8133de9a08bf33f473a94c4aea907f997d4b12c60da43886af556cf77efd632df445909f272b15f8fd7094e99f32d92352bc5ed1cbfc6291163e3291c54c05
-EBUILD highlight-4.1.ebuild 2404 BLAKE2B 6fbfa8a99cb1f37104a3b865dba125bcf356240a6c55772ab7e69997fbc6a0ca57ca77238149ec3497b5fb194354f3787ff61622190eca6a03e93132a41b0092 SHA512 171cde8c66962d09b4be1f28c5409e680a535d3ec2b67dd12d0c99d90f9f04f4225b90ea97dd4788cf7fe4868ebdc4bcaedcef65ee8e10995d73b0e6b466e821
+EBUILD highlight-4.1.ebuild 2403 BLAKE2B d79cb8210548b2d9f1f0ef73a78604cda2d30b380c4b0746a3d86ff80dff0f2a28d55e2e4353339c23920d55dc4826a1410e465505d56a80ab02c5def18f6651 SHA512 5e8133de9a08bf33f473a94c4aea907f997d4b12c60da43886af556cf77efd632df445909f272b15f8fd7094e99f32d92352bc5ed1cbfc6291163e3291c54c05
 MISC metadata.xml 330 BLAKE2B 3e7c157a3d1763cb2b5c6c65a9259c03ac3863056d55ddb6eddbb76e66f98bcd11f87a04ddae616657f88e0a6b1f7bab0d028b97c8b0091ab8daa9e8fb5bc70a SHA512 3b6739ebce190bd586ad2e1657460b3540ae5056f2f90fdeb68121da3215e32dc382a1e965038968ec23f0c46d4626231f1e261aa7aca184dc8e08d80a82a681
diff --git a/app-text/highlight/highlight-4.1.ebuild b/app-text/highlight/highlight-4.1.ebuild
index 7cfbb9f2be8b..30e6ae8553b7 100644
--- a/app-text/highlight/highlight-4.1.ebuild
+++ b/app-text/highlight/highlight-4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples qt5"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 685d19a0c2da..cbc4df55a033 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -5,7 +5,7 @@ DIST poppler-21.02.0.tar.xz 1684496 BLAKE2B f62399a70baa0af36abd9bf7f5bc69003fcd
 DIST poppler-21.05.0.tar.xz 1700632 BLAKE2B 5e277f3d9d6fafbd39b395d7730182ec028c0ccdbb59e0b9d6ea93e079eb6dc8ff6e46a2b378ec4502055e8748973d353e1f947d734cdee4c5abb9f1bb6dba2c SHA512 428f63a85fc8a227efebcd64ca7e89fec487fea07c93f9dd990fae343532547bcfec29a3288dd9ffce698cf994ccc2ce5055e4fa677ebceb216c1caaa3e0cdae
 DIST poppler-21.06.1.tar.xz 1708344 BLAKE2B 424888e16c72e9ad37fcb0aa3ecc7bef8c6150f3ca51b205407f9db51a5800bf76c703ad7a7e642e5ce60edc0ab3506d29bd18c8424425da7d4270bb2adb3025 SHA512 6e447d09421b7729d83a59a24deaaaea15103240cac0eaf41ddcdd64ac2c8f08a6902b95d56bbbcfd9e229054bd0a4f1769ea05c7e20691bc8f995e3f959f0e9
 EBUILD poppler-21.02.0.ebuild 3248 BLAKE2B 6eea98c0df7d157fedf39f8ed52f1305542f888b19c8a5adf741bd85df6fc7d5724c8ec03ad88ee9bec30bda82aa30e3fca370d407a6234a4f97aa5d4b3f76ce SHA512 2657dd6d87197953c09ab1ed4852f07e33475e1ceeadea0dcd0627f771500f13057eee927b8341286ba25820c4f2ce6b3f8d6b00d0b75510b27b3b9740585375
-EBUILD poppler-21.05.0.ebuild 3276 BLAKE2B 6daa0fcd6bec129e982958fa3e48c418e2a47049aa8bfa0562c765ff7334efccb81adc2fe3cc2f84a7a4eb6d4ef49b5755a11d35a5cc2b9939f3e351424f557f SHA512 00e06cef9ee44d3d404dd353c6e6d6b7bf3926361e481b2d277c64c8239a606be69d21b177784b703f145ee49828993a329e5ea9159079ff1b021c74edad3d01
+EBUILD poppler-21.05.0.ebuild 3275 BLAKE2B 68c1ae9c653cc9f1ef2ec69f31729ba20d76ab5ee7eac8e19091e38f1eddb9d73714a69c0cda3df1abf9736d4dc1599f5754421da76b2b1adaaf729cb8d619e4 SHA512 e23de4db062620e849b62a511221b7871b0f1e927189c6e7424271f0eac7945a5af929ad12a604ee43fe7e00c2c49d2c99b9e74d955ca8ba64506fbaf473fc65
 EBUILD poppler-21.06.1.ebuild 3403 BLAKE2B e1106d45017fba96cddeb85854b32545dd729616fae234775c1c07080b1e939d8d47f6a86b30d2b670fd67afc6430ee12074f92204b47ca7412cb6be8c8c410d SHA512 4a038a9d3c52dc9bcecde3cd70b282fa371409b0ce78845552a1f08adbcc30ff7fca261d50a431180630befc21783f029ffd318e8e15f93146459a20052d6268
 EBUILD poppler-9999.ebuild 3403 BLAKE2B e1106d45017fba96cddeb85854b32545dd729616fae234775c1c07080b1e939d8d47f6a86b30d2b670fd67afc6430ee12074f92204b47ca7412cb6be8c8c410d SHA512 4a038a9d3c52dc9bcecde3cd70b282fa371409b0ce78845552a1f08adbcc30ff7fca261d50a431180630befc21783f029ffd318e8e15f93146459a20052d6268
 MISC metadata.xml 1094 BLAKE2B 661b20d0ca935bc2d7c91a395f1a541085bab7139858f50c5a8adf04b3d8c8ce97b80153ac9be3a6a92d5ee008505617f305fa1b37e94ecdd77f524f56b28a62 SHA512 51bbcede699a7f4f3d70bbbf18080ae17054daa48de147bc9756614a84225e71d1bb9b7dab918f54661e001cdd33f5a00c5b55e292d8a99e7ed66b82798a9b69
diff --git a/app-text/poppler/poppler-21.05.0.ebuild b/app-text/poppler/poppler-21.05.0.ebuild
index d238d22ee04e..845b1a76e59e 100644
--- a/app-text/poppler/poppler-21.05.0.ebuild
+++ b/app-text/poppler/poppler-21.05.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/110"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/sword-modules/Manifest b/app-text/sword-modules/Manifest
index a594c5d0aa1c..8c2f740fccd0 100644
--- a/app-text/sword-modules/Manifest
+++ b/app-text/sword-modules/Manifest
@@ -1,2 +1,2 @@
-EBUILD sword-modules-2.3.ebuild 12269 BLAKE2B 6cbe97bae4d10bf412b1153045fca55b3ec0e0bcf7015ca73fc06a71f3dce57e9d185407ef087bba95fc6b3ec9657adeee48beae6c5925c2da5964b49e1378ce SHA512 19172f0c228a54bafc26e5d36a80d4ef02e910b1a78931d503b854baa12bced22598042d2fd34e6cb28dc72cd1f370a880bf8fd3b43968ce9a9c7e382fcdb5a7
+EBUILD sword-modules-2.4.ebuild 12296 BLAKE2B a5dba995350760d1b2b6fa40ba23906ab5c56a0ea46a93519ebbeb6d9d89acba79d4f447c473f0217ed2d85b9b5d2cb65138493f1191c36f245dfc6384378512 SHA512 7707037bed3b30636bd9a050be95452f3e466da3c09d764a40df048afbc172ba94eff0a3a773a29a4fb61476ea249b74cd77cac31766af9659c8872b3c5129bf
 MISC metadata.xml 385 BLAKE2B 58e3a018c64e0068b39c728415f94cf05afe3c63e4ecb340ef47e6ecad5a3c8aa0776b6390acfa6eef8775e5065d5a65c3ea8ebc07219a0a990be36e3bf305f3 SHA512 a305a1265342a3674f5bc0f2b5adb788732ccc78c5e05cbdb116fb4a556ae099d8394c10572e5e01e3dae70bf9b4eb982079bf130b4567f4aadb55d3e76bbc1a
diff --git a/app-text/sword-modules/sword-modules-2.3.ebuild b/app-text/sword-modules/sword-modules-2.4.ebuild
index a010666f5900..63f79eb5b4df 100644
--- a/app-text/sword-modules/sword-modules-2.3.ebuild
+++ b/app-text/sword-modules/sword-modules-2.4.ebuild
@@ -174,6 +174,7 @@ RDEPEND="
 		app-dicts/sword-KJV
 		app-dicts/sword-KJVA
 		app-dicts/sword-KJVPCE
+		app-dicts/sword-KingComm
 		app-dicts/sword-LEB
 		app-dicts/sword-LITV
 		app-dicts/sword-LO