gentoo resync : 18.11.2018

5 files changed, 66 insertions, 83 deletions

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
+}