gentoo resync : 18.11.2018

14 files changed, 173 insertions, 89 deletions

diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index a5dc24385260..749dec206c1c 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/aspell-es/Manifest b/app-dicts/aspell-es/Manifest
index eadeb1fa48e2..9007ad59de2d 100644
--- a/app-dicts/aspell-es/Manifest
+++ b/app-dicts/aspell-es/Manifest
@@ -1,3 +1,5 @@
+DIST aspell6-es-1.11-2.tar.bz2 154787 BLAKE2B cc035b4f9c6b12c90b7112ad414ee3f28c00554179e9e88d79ceb06e14edbb891a3d2f7d2b3a70945651ceccecc4250e8e1f187cb75e1f6bdbe653e278a54140 SHA512 5d0159f24d6bff43db682a4beb25e82dd362c205acf7c9e0d728808c0e54a8a566befe26316f384099c72e6c429713f8ad7d2dc66a8f04a15e1d5a9cfe2290d8
 DIST aspell6-es-1.9a-1.tar.bz2 132542 BLAKE2B df33c5c38633573b1616c480c2df4b53bd1b6afc6d749f558c22d56482df9977cc5aa366a0e9a7b5b1bdfc12b92bf4e38957e23b3bf8dca38b0dfe00824ff365 SHA512 7ea228104231a4af395787da41eb14f27b6b864f1512c9ccb72b5f19b4327a0e4ccc37fdc31085b33da83a0b3b45bfe608f0a1361da8297dff2bcd96096f4c06
+EBUILD aspell-es-1.11_p2.ebuild 441 BLAKE2B 5907e75cdfec71f6e94f83053828ade27131d65defd7cb6f0ded7444ac3170b1f0f617135a589a040079aa5e02f51c1d4ae46451bef6603a2807ec59db2fb9a2 SHA512 74fc72af32d96ebe8b21aa796fe138f8d71036fa5e74d50137c033ff5e825785d4b9b39ea2112e6b72484a5e613b2aa09f67d362b6f26c95e8c8119f49ec2c54
 EBUILD aspell-es-1.9a.ebuild 432 BLAKE2B 27a68be2a7669a73a58845728a48bed6912e9478840cbfa1b8855a3231a25515a3e4672df5f7092a4e94169c504261cd3fb0f55e26ec86bdad38b425dcc81c55 SHA512 e5cfd21d6da9b2dcd1f8f00baf31caeaaa05c48ec5b1045c903aff98459b990d62b603108332dc8aea0a82f01096e218ec7e46168a95909c80b17f31121d4806
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+MISC metadata.xml 383 BLAKE2B fc5887f858a28f6028f855b82b42bf708cda98cddea47a27a7532ce46a25385ea267d1bb02dfa77f6b83ce5bb8679e2d8e46ea31a6541e91da9185ed4c842d33 SHA512 eb033213ad8991813d7e7e3ab325e7b2ab864d3048ec2eda19a84c085d4c83f2b7038bade40ec89c5998510f9c04b5a2c800f582dfe3e4d9f3d10d0d54d4b318
diff --git a/app-dicts/aspell-es/aspell-es-1.11_p2.ebuild b/app-dicts/aspell-es/aspell-es-1.11_p2.ebuild
new file mode 100644
index 000000000000..9e0fb3067314
--- /dev/null
+++ b/app-dicts/aspell-es/aspell-es-1.11_p2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+ASPELL_LANG="Spanish"
+ASPELL_VERSION=6
+
+inherit aspell-dict-r1
+
+MY_P=aspell6-es-${PV/_p/-}
+SRC_URI="mirror://gnu/aspell/dict/${ASPELL_SPELLANG}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
diff --git a/app-dicts/aspell-es/metadata.xml b/app-dicts/aspell-es/metadata.xml
index 6f49eba8f496..76c38de3001d 100644
--- a/app-dicts/aspell-es/metadata.xml
+++ b/app-dicts/aspell-es/metadata.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>pabloorduna98@gmail.com</email>
+		<name>Pablo Orduna</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers Project</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/myspell-de/Manifest b/app-dicts/myspell-de/Manifest
index e99add437135..1fbec64cdd01 100644
--- a/app-dicts/myspell-de/Manifest
+++ b/app-dicts/myspell-de/Manifest
@@ -1,5 +1,9 @@
+DIST dict-de_AT-frami_2017-01-12.oxt 9238814 BLAKE2B 441105b907bd47dbe7d45e30a8a2711206432aba90d3c986e1706f96b8b0617047fcdde1b5bc4bc67ad659b782721c05c83931d6d5ba7105566715f4c2b566bd SHA512 e3364d6fb5dc7d6995c75631bf913db0afc03570fa20ae2480b98aa41afa4d3ae1ff9b0b5e1f64c097366b346e151d85159b9d574087a2ab7f8230284d4aa655
+DIST dict-de_CH-frami_2017-01-12.oxt 9225630 BLAKE2B 7edc2349a7dff64c314881f305216c1d010f601bb99f7a2341b9dbc2c73979d6c219509ce5513e6134a2b18157461664cbef98e219797a423794bfe65741b5c7 SHA512 3f3e725e522f1fb9571f22108ae8d9a199071327b38c3a82d046a2737e5e5a34a4def52bc3d168979ccd0b800750c98af704fcac43735134b67d4dba8bd9f278
+DIST dict-de_DE-frami_2017-01-12.oxt 9238776 BLAKE2B 47ac0b5115aa6d4c5151d039e1285de1681feee879fdf734caa365b030b02f02c705201208f0ef0f99df718dbedcbea2eef0d2b0492c03e7fb3f2853c20dcc80 SHA512 f44d30c875335f52674ea91557c716eb2c9917e7bd170372c8994d8d58e948ef2b68f004d93f175173ffad4a17a1920c69eaffe915668e0c4dc5fee7f8abcc6e
 DIST dict-de_at-frami_2015-12-28.oxt 8110628 BLAKE2B 13652ee81381d766c151ed53889d0f5e1aed0fcc34c19edf2ff84e25d1d303cf95a3b1fbe3ffe6617991f497fbe46e2ce1305c2ef8109afb58677289b5832ae9 SHA512 2d4188174fb3f7cb2ca175d54342395980497183c0c6ea233217491226b19a0f19f806935e0eb3798229db89fd3ebf93cb5b210ba326dcb1cc8b862c48aecd02
 DIST dict-de_ch-frami_2015-12-28.oxt 8101312 BLAKE2B fd2da123f768b1ac1d66524272570fee0c237028d736100a5fb742418173120c54b8d3ee9e138b07699dc72372661e671bd8cf27eca7cefb0f39c84e49f286db SHA512 b62ad082fbef3785b5cd29bb530a4f5367771af6237d10a9ee922f0deaff0ccdd7c0a9cd93a9218444b07bf278efdb18f497660513af4b8862998ab3bb434f5a
 DIST dict-de_de-frami_2015-12-28.oxt 8110832 BLAKE2B 5bf8014e4c21f3d35296a13a9413caa0f2535cf7de39a774b4a16eef4ddb543b7d80e8fc5ac871f46442304e13cf7472b2d9188d2cc7173cca3b6dde582730ee SHA512 242cfa3f9f8046badbd56560d05cc47a2b0bc89b263f9141443b3401981e91a1124d1c2f76ae77ea017b02a34567cf4c160c31e2250f90d095a74b92dd3d636a
 EBUILD myspell-de-2015.12.28.ebuild 1394 BLAKE2B 5757368238631bfe9b4489cfd557c6e5a1d9f6b3056c93369852ce568f4852d87e6e9faebec68362fdabd993a850252d728d013ce5044dac3bfc005b036a626e SHA512 c32532ca35a03f2debb9dd05e5911651648827e65e47f1cefd1b8e94096613f9e1d1f390761d613c6c07b078bd1dda399de95bf2d86bfc6486ae7f446346d322
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD myspell-de-2017.01.12.ebuild 1468 BLAKE2B 2457bdb261b2993d68dce45ad9430367bdc37b61d74d1d65db03cdafaed1a492694fcedde6cf38304996e898292624558ae0ed7da9b3476a7a9642a62a44c13a SHA512 364ae2d3d129f926c5f6c987e12d38eae2c0131e3ba112fb95fc2bf8d5925b3d542e2da63eae8cb1b3817ab6afca23d14136c1eefcc9cef5401d35c99a39c45b
+MISC metadata.xml 733 BLAKE2B 3fb6dae837e40035e2c2db3b49772a7ae7d4d48acf91feef11cb099d7af5900e081e72264709394d0371715755c3944867c43fdca080a7a54f87f38b83bbd2df SHA512 946f116da1ba091533fdc8837586692566f522d5d12e778aa149619b71003c754338bbf8b4e4e126c625e240339823272be96f2270082820d07786ff5ab35024
diff --git a/app-dicts/myspell-de/metadata.xml b/app-dicts/myspell-de/metadata.xml
index 6f49eba8f496..bb9838dbd6cd 100644
--- a/app-dicts/myspell-de/metadata.xml
+++ b/app-dicts/myspell-de/metadata.xml
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>cb-gentoo@guya.de</email>
+		<name>Christian Buchinger</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription lang="en">
+		German "frami" standard dictionary with spell check, hyphenation patterns and
+		thesaurus. It includes the complete word list of Björn Jacke's igerman98 and
+		additional numerous supplements by Franz Michael Baumann according to the
+		reform of 2006. Includes localizations for Austria, Switzerland and Germany.
+	</longdescription>
 </pkgmetadata>
diff --git a/app-dicts/myspell-de/myspell-de-2017.01.12.ebuild b/app-dicts/myspell-de/myspell-de-2017.01.12.ebuild
new file mode 100644
index 000000000000..2c8b8196168f
--- /dev/null
+++ b/app-dicts/myspell-de/myspell-de-2017.01.12.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MYSPELL_DICT=(
+	"de_AT.aff"
+	"de_AT.dic"
+	"de_DE.aff"
+	"de_DE.dic"
+	"de_CH.aff"
+	"de_CH.dic"
+)
+
+MYSPELL_HYPH=(
+	"hyph_de_AT.dic"
+	"hyph_de_DE.dic"
+	"hyph_de_CH.dic"
+)
+
+MYSPELL_THES=(
+	"th_de_AT_v2.dat"
+	"th_de_AT_v2.idx"
+	"th_de_DE_v2.dat"
+	"th_de_DE_v2.idx"
+	"th_de_CH_v2.dat"
+	"th_de_CH_v2.idx"
+)
+
+inherit myspell-r2
+
+MY_PV=$(ver_rs 1- -)	# YYYY-MM-DD
+
+DESCRIPTION="German (AT,CH,DE) dictionaries for myspell/hunspell"
+HOMEPAGE="
+	https://extensions.libreoffice.org/extensions/german-de-at-frami-dictionaries
+	https://extensions.libreoffice.org/extensions/german-de-ch-frami-dictionaries
+	https://extensions.libreoffice.org/extensions/german-de-de-frami-dictionaries
+"
+SRC_URI="
+	https://extensions.libreoffice.org/extensions/german-de-at-frami-dictionaries/$(ver_rs 1 -)/@@download/file/dict-de_AT-frami_${MY_PV}.oxt
+	https://extensions.libreoffice.org/extensions/german-de-ch-frami-dictionaries/$(ver_rs 1 -)/@@download/file/dict-de_CH-frami_${MY_PV}.oxt
+	https://extensions.libreoffice.org/extensions/german-de-de-frami-dictionaries/${MY_PV}/@@download/file/dict-de_DE-frami_${MY_PV}.oxt
+"
+
+LICENSE="GPL-3 GPL-2 LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+
+src_prepare() {
+	# fixing file names
+	for i in *_frami.*; do
+		mv "${i}" "${i/_frami}" || die
+	done
+
+	default
+}
diff --git a/app-dicts/myspell-el/Manifest b/app-dicts/myspell-el/Manifest
index 5adcaba6e5d4..978d17a062d2 100644
--- a/app-dicts/myspell-el/Manifest
+++ b/app-dicts/myspell-el/Manifest
@@ -1,4 +1,4 @@
 DIST el_GR-0.9.zip 2120747 BLAKE2B 5fe5030227b3f65bf04a7ecf055c5159120badae250ef8c718836e6115238b12391f82a656767313338ece98bce91e099d6f12f7e9e9f2f202dbdd6a14bfb6ba SHA512 8eb9d951bab3caf09f53e7ee98ff155ade8d9198533264ebdd53b413e38d9b84e5101938c1abb3e220e0764c98186fb2f5480be50e98e7effb7bcc8c961eaa49
 DIST hyph_el.zip 2224 BLAKE2B eb5c5ba1b856a9edc5bb78b583af442ccdacc3d7270b1e1d61081382b195fcc3637ef83a4e35eff79146a21360353145128adabfb494976a6998f1dbccfd062d SHA512 259a1ad3b4f38cf6aa67027cd3354488b298375450ed99b07e4ea8d355e90211caabfc40ce71af73e5d354348541bf8a486aecced23f75a4fe9abb8f6c2ac3c3
-EBUILD myspell-el-0.9.ebuild 593 BLAKE2B 384fdfa5d260c1e94442d236c65c566bdf451ea61d9b66d08bb70c799d75316d867e1672cccc5061d4f11f8d2894813cd9fbac0007e7182194936e18846cefcd SHA512 cef32f05855413721108900eafe3da63f2b576e87c9058bf246bde04b7a4648e6340cc6948d29134e31e27bf261d95c37c6e040f089deca31b0eb6c490146b83
+EBUILD myspell-el-0.9.ebuild 592 BLAKE2B 792a7ad8770ff110c644da6020740479960bcba2daf081927795e8b66e8cb26ae972bc38b9efa574ead7056edf87d7772031ac7b0cf9cb982ecc84a36a8d8398 SHA512 5b599714a3f94056ec4b6fe2e26d2d72a93a5bc7a9822e80fd6064e1c36422b897f6b94004ef17b842b05879e0596a1023b3d25590b7b3a79df29a7349d69a5c
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/app-dicts/myspell-el/myspell-el-0.9.ebuild b/app-dicts/myspell-el/myspell-el-0.9.ebuild
index 62286feda3d5..35d827d71f07 100644
--- a/app-dicts/myspell-el/myspell-el-0.9.ebuild
+++ b/app-dicts/myspell-el/myspell-el-0.9.ebuild
@@ -23,5 +23,5 @@ SRC_URI="http://elspell.math.upatras.gr/files/ooffice/el_GR-${PV}.zip http://els
 
 LICENSE="GPL-2 LGPL-2.1 MPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
diff --git a/app-dicts/myspell-en/Manifest b/app-dicts/myspell-en/Manifest
index 76006043b2ec..aebab8d508d1 100644
--- a/app-dicts/myspell-en/Manifest
+++ b/app-dicts/myspell-en/Manifest
@@ -1,7 +1,5 @@
-DIST dict-en-20160901.oxt 6025820 BLAKE2B b4b698d63e31c478ec15eea8fa90afba6fafebb90c88618094ab3535af0effb5777e9be313f8a72a460ac32379c699308a791a79ad977d326d9161857a793dc8 SHA512 f52b1fe8c32c6f7dad389d43f52356ecc989365113593513c61a36ad6fed03c6eab7e08c9a07b281c1a30bdf6dbe2d201bc2ed83c6b1fce1006e16de969a30b0
 DIST dict-en-20170101.oxt 5960816 BLAKE2B 65505ed6e8323f28377728ac29e550cf151688517b83209b055966be4e7e14465aacc1d1677d22bc005089d7623e78e63bf91dcdffcde3a790532dba87b54615 SHA512 fae05d3e4bdc9bbd5dda6eb2c0de2f5d0860973e75fe0931bcb0d0e0a5015fb6042beec7f811bee0011f519d13d0f3b52b09fbd906a75340bf311177885ccc1d
-DIST dict-en-20170501.oxt 5964856 BLAKE2B 71a19b8c5215dde7d2779a259310bb3b098c0e6493000e77e7c0433efbf5faf03e8a4eae85ba500142f72838a6b0b9dba173c0025c1568d367d7093548ac0a1a SHA512 df8b2f15903d650b5fe9499dd278d2831f98aba421e83d38e7807e42c3c2304fc7921f12663589a7195de6d298be6103e3f7a58b15755512bd1db0e4c4f7c5d5
-EBUILD myspell-en-20160901.ebuild 945 BLAKE2B b60c638db7d9e4d789fabc017c769d375e12bde8949a0711b23ca4dbe51a7798b0e737e645155c70280306dbc4e703975850ecddb02fb51f4ffebaa40357158f SHA512 79eccaa71b8e4133fbfd974caa61678d232fcb1fb7047d07e2d8887485ab1b0679eeef5ebd3307dbf70ccaf92b593e15defb76dec41f65818e14dfbe05746a93
+DIST dict-en-20181101.oxt 6052772 BLAKE2B 46825cb406406a3d64e8495f047ae81d6b693e6ff5cd89152a9c829a80d7be1920dfb3572a84aedb2e8f8e5c767aa49ed7e71ab330aca83b3936133699f1098a SHA512 1f351b97c4fc907c5751a35b6665b6d91b1157b6a952a378f565989249b1900395f08f0204407a21b0bcb999fe695c14707c4744f5da32d521ee8d75f73c89f9
 EBUILD myspell-en-20170101.ebuild 930 BLAKE2B 05df7aead57950f6ce4e9894664cf1f6f440aa7a6e42022e69c2b37a8fa390fe5611e53ad00a8c0530a7967ede6c59d6f090e73a06c527271d06f03f53bb95c5 SHA512 c064e21034ae2c29a988aa09d7b8561a4ae710ef604d4c08b62cbf5ccf582e124d990ae6d7fd33282740f403990d461424cfe0637b36adb3558643ce3660fb47
-EBUILD myspell-en-20170501.ebuild 940 BLAKE2B 2e0e5145cff1187cd6d58fa80193dbf6314cd9cdd1e39b155f208eb2a910db0db9365c28977a233e839e8a7671c390c1868030ea5e9ffd58c41a2930e7b62999 SHA512 9698197f6c1ebed54609164e299e68374d3267b4748534274d46b8bcaf529564706bd59ce25b0f68a296216617856fe5f45d8c56731a2239d04c1d032ce4bb95
-MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
+EBUILD myspell-en-20181101.ebuild 1500 BLAKE2B 75022e84c8c83aa82e7da8250d9c92000ffa706fd5b5a11a6531230e1c620f68aeb2d1c6ca94468b78b5e707824215ccfeac1840c64b40ad06d6f528b52c933a SHA512 a60392b59c172dcb92fb3c102dfcb145840fb5b1c582698cbf0c82f468c315e12ec00bdbf0484b53529e98af9ae910843e8aa3d6dace29aeec98fdebae6af81d
+MISC metadata.xml 367 BLAKE2B ba1f5365b9b1585d0ed0513fd8a7f3aef4cbdcced1257cdb3e0cd167845f04cc248160164f367f0268c4388ebbc618a85bc248355be0cdcfd3bb827875bf6cdb SHA512 b6022494b82fa7956d3f6320d170fff6433ccfb601c9107cb5f9a0a8419d3bfde4c2dc3eded7f0e6a8503ffb142d144d8cf983dd73cc7bdebeb9ab687efdd9e2
diff --git a/app-dicts/myspell-en/metadata.xml b/app-dicts/myspell-en/metadata.xml
index 097975e3adc2..d8d2eab72daf 100644
--- a/app-dicts/myspell-en/metadata.xml
+++ b/app-dicts/myspell-en/metadata.xml
@@ -1,4 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>onigino@protonmail.com</email>
+		<name>Gino McCarty</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-dicts/myspell-en/myspell-en-20160901.ebuild b/app-dicts/myspell-en/myspell-en-20160901.ebuild
deleted file mode 100644
index 7fc9b1cc89f6..000000000000
--- a/app-dicts/myspell-en/myspell-en-20160901.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV="${PV:0:4}.${PV:4:2}.${PV:6:2}"
-
-MYSPELL_DICT=(
-	"en_AU.aff"
-	"en_AU.dic"
-	"en_CA.aff"
-	"en_CA.dic"
-	"en_GB.aff"
-	"en_GB.dic"
-	"en_US.aff"
-	"en_US.dic"
-	"en_ZA.aff"
-	"en_ZA.dic"
-)
-
-MYSPELL_HYPH=(
-	"hyph_en_GB.dic"
-)
-
-MYSPELL_THES=(
-	"th_en_US_v2.dat"
-	"th_en_US_v2.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="English dictionaries for myspell/hunspell"
-HOMEPAGE="https://extensions.libreoffice.org/extensions/english-dictionaries"
-SRC_URI="https://extensions.libreoffice.org/extensions/english-dictionaries/${MY_PV}/@@download/file/dict-en.oxt -> dict-en-${PV}.oxt"
-
-LICENSE="GPL-2 LGPL-2.1 Princeton myspell-en_CA-KevinAtkinson"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
diff --git a/app-dicts/myspell-en/myspell-en-20170501.ebuild b/app-dicts/myspell-en/myspell-en-20170501.ebuild
deleted file mode 100644
index 8a91e263b3ae..000000000000
--- a/app-dicts/myspell-en/myspell-en-20170501.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV="${PV:0:4}-${PV:4:2}.${PV:6:2}"
-
-MYSPELL_DICT=(
-	"en_AU.aff"
-	"en_AU.dic"
-	"en_CA.aff"
-	"en_CA.dic"
-	"en_GB.aff"
-	"en_GB.dic"
-	"en_US.aff"
-	"en_US.dic"
-	"en_ZA.aff"
-	"en_ZA.dic"
-)
-
-MYSPELL_HYPH=(
-	"hyph_en_GB.dic"
-)
-
-MYSPELL_THES=(
-	"th_en_US_v2.dat"
-	"th_en_US_v2.idx"
-)
-
-inherit myspell-r2
-
-DESCRIPTION="English dictionaries for myspell/hunspell"
-HOMEPAGE="https://extensions.libreoffice.org/extensions/english-dictionaries"
-SRC_URI="https://extensions.libreoffice.org/extensions/english-dictionaries/${MY_PV}/@@download/file/dict-en-${PV}.oxt"
-
-LICENSE="GPL-2 LGPL-2.1 Princeton myspell-en_CA-KevinAtkinson"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
diff --git a/app-dicts/myspell-en/myspell-en-20181101.ebuild b/app-dicts/myspell-en/myspell-en-20181101.ebuild
new file mode 100644
index 000000000000..932b93b49c69
--- /dev/null
+++ b/app-dicts/myspell-en/myspell-en-20181101.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PV="${PV:0:4}-${PV:4:2}.${PV:6:2}"
+
+inherit myspell-r2
+
+DESCRIPTION="English dictionaries for myspell/hunspell"
+HOMEPAGE="https://extensions.libreoffice.org/extensions/english-dictionaries"
+SRC_URI="https://extensions.libreoffice.org/extensions/english-dictionaries/${MY_PV}/@@download/file/dict-en-${PV}.oxt"
+
+LICENSE="BSD MIT LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+PLOCALES=( "en" "en-AU" "en-CA" "en-GB" "en-US" "en-ZA" )
+IUSE+="${PLOCALES[@]/#/l10n_}"
+REQUIRED_USE="|| ( ${IUSE[@]} )"
+
+src_prepare() {
+	if use l10n_en-GB || use l10n_en; then
+		MYSPELL_HYPH=( "hyph_en_GB.dic" )
+	fi
+	if use l10n_en-US || use l10n_en; then
+		MYSPELL_THES=(
+			"th_en_US_v2.dat"
+			"th_en_US_v2.idx"
+		)
+	fi
+
+	MYSPELL_DICT=( )
+	for lang in "${PLOCALES[@]}"; do
+		if [[ "${lang}" == "en" ]]; then
+			continue
+		fi
+		local mylinguas="${lang//-/_}"
+		if use "l10n_${lang}" || use l10n_en; then
+			MYSPELL_DICT+=( "${mylinguas}.aff" "${mylinguas}.dic" )
+		else
+			rm "README_${mylinguas}.txt" || die
+			if [[ ${lang} == "en-US" ]]; then
+				rm "README_hyph_en_US.txt" || die
+			fi
+			if [[ ${lang} == "en-GB" ]]; then
+				rm "README_hyph_en_GB.txt" || die
+				rm "README_en_GB_thes.txt" || die
+			fi
+		fi
+	done
+
+	default
+}