gentoo resync : 18.11.2019

4 files changed, 73 insertions, 2 deletions

diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 9d32a6120fd3..2d53101a1142 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 e9784aa6c10e..e6c68f04f06d 100644
--- a/app-dicts/myspell-nl/Manifest
+++ b/app-dicts/myspell-nl/Manifest
@@ -1,4 +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
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
+EBUILD myspell-nl-2.10g-r2.ebuild 1848 BLAKE2B ad15f8890604b8c9c0b56f5b7fa61c65a1d89476ec07c45c42976de5d4e37bd404983115872a9d34198c12feefedc6582ca95939177a2d4829e152189d3b695e SHA512 cdfe793bbec4b8002f0b4f98883be0983f9872d1a204c639fcb3108a6cd5f5fbfc34be5df2a6a252f10b34abfcfce7fd23fa4e544dfca63421b8362a060139ae
+MISC metadata.xml 398 BLAKE2B f047111407075b709cbd357d58cd3446d789614b0a681b143e35f5ccbdd8bf952d343477338d2c20dd3ab5ccdf032451bbb54b1740c7961b8917f913b288798c SHA512 a4952c0811f78c57839110357feb9c82e71b53a47e66c80c7b574c7232ea3ec593f8d7dd8ce6d1015959ff45f4b74d0a9c57947443c916a6a565aa324de94310
diff --git a/app-dicts/myspell-nl/metadata.xml b/app-dicts/myspell-nl/metadata.xml
index 6f49eba8f496..0c4f24fb0663 100644
--- a/app-dicts/myspell-nl/metadata.xml
+++ b/app-dicts/myspell-nl/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>wimmuskee@gmail.com</email>
+        <name>Wim Muskee</name>
+    </maintainer>
+    <maintainer type="project">
+        <email>proxy-maint@gentoo.org</email>
+        <name>Proxy Maintainers</name>
+    </maintainer>
 </pkgmetadata>
diff --git a/app-dicts/myspell-nl/myspell-nl-2.10g-r2.ebuild b/app-dicts/myspell-nl/myspell-nl-2.10g-r2.ebuild
new file mode 100644
index 000000000000..2663c798ffb0
--- /dev/null
+++ b/app-dicts/myspell-nl/myspell-nl-2.10g-r2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MYSPELL_DICT=(
+	"nl.aff"
+	"nl.dic"
+)
+
+MYSPELL_HYPH=(
+	"hyph_nl.dic"
+)
+
+MYSPELL_THES=(
+	"th_nl_v2.dat"
+	"th_nl_v2.idx"
+)
+
+inherit myspell-r2
+
+DESCRIPTION="Dutch dictionaries for myspell/hunspell"
+HOMEPAGE="https://www.opentaal.org"
+# Thesarus is not versioned at all, I suppose we could bump it with each dict
+# release, or when people say that the download uri checksum changed.
+SRC_URI="
+	https://www.opentaal.org/bestanden/license_result/20-woordenlijst-v-${PV//./}-voor-openofficeorg-3?bid=20&agree=1 -> ${P}.oxt
+	https://data.opentaal.org/opentaalbank/thesaurus/download/thes_nl.oxt -> ${P}_thes.oxt
+"
+
+LICENSE="BSD-2 CC-BY-3.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+
+src_prepare() {
+	default
+
+	# rename terroritory specific to just language, bug #607080
+	mv nl_NL.aff nl.aff || die
+	mv nl_NL.dic nl.dic || die
+	mv hyph_nl_NL.dic hyph_nl.dic || die
+
+	# remove dutch translated license so it aint installed
+	rm licentie* || die
+}
+
+src_install() {
+	myspell-r2_src_install
+
+	# make language_territory locale format symlinks to base language files, bug #699660
+	dosym ../hunspell/nl.aff /usr/share/myspell/nl_NL.aff
+	dosym ../hunspell/nl.dic /usr/share/myspell/nl_NL.dic
+	dosym ../hyphen/hyph_nl.dic /usr/share/myspell/hyph_nl_NL.dic
+	dosym ../mythes/th_nl_v2.dat /usr/share/myspell/th_nl_NL_v2.dat
+	dosym ../mythes/th_nl_v2.idx /usr/share/myspell/th_nl_NL_v2.idx
+
+	# Belgium
+	dosym ../hunspell/nl.aff /usr/share/myspell/nl_BE.aff
+	dosym ../hunspell/nl.dic /usr/share/myspell/nl_BE.dic
+	dosym ../hyphen/hyph_nl.dic /usr/share/myspell/hyph_nl_BE.dic
+	dosym ../mythes/th_nl_v2.dat /usr/share/myspell/th_nl_BE_v2.dat
+	dosym ../mythes/th_nl_v2.idx /usr/share/myspell/th_nl_BE_v2.idx
+}