gentoo resync : 22.10.2018

5 files changed, 49 insertions, 2 deletions

diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index b7549c7f8179..bd614775bb95 100644
--- a/app-dicts/Manifest.gz
+++ b/app-dicts/Manifest.gz
diff --git a/app-dicts/gnome-dictionary/Manifest b/app-dicts/gnome-dictionary/Manifest
index 35962b0f8a7e..be4a208e1f57 100644
--- a/app-dicts/gnome-dictionary/Manifest
+++ b/app-dicts/gnome-dictionary/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-dictionary-3.24.1.tar.xz 880500 BLAKE2B f730276612d2578e7b25121b49be9639cf7a9fc67bda9687285f6d3873d3b825301246447d968b24ed29240a1b0e7fc48d63c8454e704b799eebdf340f5f6da2 SHA512 b3ee838888a97e914add58dd4b61fa096b9488aab360815f2e7b674e7a57b237849a1ccaf107c1e94968e534b24ee24d827c42a3a1b0dfd8c5ef25eeb90456d3
-EBUILD gnome-dictionary-3.24.1.ebuild 1032 BLAKE2B 226863b951121fe5190d892b087237493ce32c83869bb7402026afba37de83c09fa3e0d6b016374194f0a412be7a7dda402af4520ac485d1c6ebcacb3a0fed35 SHA512 0650e59d1c2cdaf26f2c2617b886e80a9118fbb2337c3a1acef5445e0f64327ed87939739821fdbf21fde6c2f594a868a88e12e71a7a7e4bc49a8a7a1068f39d
+EBUILD gnome-dictionary-3.24.1.ebuild 1050 BLAKE2B fa0f6f433e2785c838646926ec43398039e61b501eb70323b745ff471f59c2e29b2240ea9dd608f79eda1530e1676b2b454dee92f41e88e6b9b841792fd64144 SHA512 609a5a40b89a226fe75d14c7e9ed939c45a1b499aedaa977e69cdd7d41da318be31d2fc6de01a1d3cd8b89d315d318c94c852e7027f8a2833000787a7b8e51ec
 MISC metadata.xml 316 BLAKE2B 61e50cf64e718dff6380a8840d59f5679e8f084efadcda41cfb45af74177d1121af1db7485fe57690090b0d1deaceaf9d53733fe39447827643c1785b4c68f3d SHA512 c46d3611dc1954a3229a98892c23aa1ebbc74c572dc5562660fce3390cfb74252515ee3a3048418c855c8165a5cea8e5df1fc10c94f81915eac400d7c58850aa
diff --git a/app-dicts/gnome-dictionary/gnome-dictionary-3.24.1.ebuild b/app-dicts/gnome-dictionary/gnome-dictionary-3.24.1.ebuild
index 21f7fccae549..06730a6ae42f 100644
--- a/app-dicts/gnome-dictionary/gnome-dictionary-3.24.1.ebuild
+++ b/app-dicts/gnome-dictionary/gnome-dictionary-3.24.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,6 +26,7 @@ RDEPEND="${COMMON_DEPEND}
 # ${PN} was part of gnome-utils before 3.4
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/gtk-doc-am-1.15
+	dev-util/glib-utils
 	>=dev-util/intltool-0.40
 	dev-util/itstool
 	>=sys-devel/gettext-0.17
diff --git a/app-dicts/myspell-nl/Manifest b/app-dicts/myspell-nl/Manifest
index 61ca00a27b55..058edef70be5 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 1100 BLAKE2B 0f75b0f3683ac5e4309f8fe2e1d319b554684eab7c2ffa265f18d04349bbdf1476bf69f3ad116e451dd2e025f771d91cbc40b185cf5e24640333281adefe21a9 SHA512 124c2bcbb7bf88f2a216649371f64a296d7dfffb4aca9167283d1b495812f96e2d82ae30aaf1607b54ad837bfd74d67de14aae632fd7430840ec750c9719c715
 EBUILD myspell-nl-2.10g.ebuild 1093 BLAKE2B d37ef2480a0b9ca3ce3d64132f5ff46b43f13a216449093ab1fe793e3f79b44723e3342be7a9ce49e9e06a125569a9c83021fed395e0532f73750ba49cf175b3 SHA512 5de3e7c0283484b48cee4f775d1ed19774eb0177c32096c42a98e4b55618316c556a9154eaf66806a5a8a3a12a94ce9a62ea312e1417a8c6ad88c3f23bfdeaec
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-dicts/myspell-nl/myspell-nl-2.10g-r1.ebuild b/app-dicts/myspell-nl/myspell-nl-2.10g-r1.ebuild
new file mode 100644
index 000000000000..896c93bf5d55
--- /dev/null
+++ b/app-dicts/myspell-nl/myspell-nl-2.10g-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 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 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+src_prepare() {
+	default
+	# Fix regions, 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 -rf licentie* || die
+}