gentoo resync : 17.06.2021

4 files changed, 13 insertions, 5 deletions

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."