gentoo Easter resync : 12.04.2020

4 files changed, 50 insertions, 4 deletions

diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index 6081a0a06876..6e156fa55ff0 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -1,6 +1,8 @@
 AUX enchant-1.6.0-hunspell150_fix.patch 577 BLAKE2B dc57f0fd5a90ba36abe174949060b20c709f920aa7ef29e1560f4a194d744064f59ae7c812cc27debe30c1082a9f76d3eac8723f850803c5eb06c213fe39e91d SHA512 893620f45a1dd7956aef9f3517186a9226c00e6b85df4770d6ea388fc08854e7884143fe3c7a064c7ec4f8353a9b9571d0c07da22df5c6ee41fc4c6bbce5874f
 DIST enchant-1.6.1.tar.gz 642124 BLAKE2B d41aa9b313e7fe8b0887728b55f3c5218e270c7359b4edcdc8d9180af68687230bcc9f7d1abb9f85ac673478530e5674366c9bc7d08b983e7226725b2cdd73d3 SHA512 26c62dfa89ee40150db502651a2f876fba00569b7015f205dae27a029557effacff335bbe36124dbe6686537da2305bcab02592179d03e95fdf9741d54b98036
 DIST enchant-2.2.7.tar.gz 951995 BLAKE2B 32232a0a8e5003dcc056b6916f95274f357ac2ab69a08fde806da12487f63eba273a57049250fc75699fb545e98e25b95dcaf00c67af2ceabe779b8798f24a5a SHA512 696455cf782b3186d19988ed59ca3cc6030a431d44ef3828039590afb08fd282a79ce6246a342e6bf7a0bf3bf63d4822d841ba01394da9f9e4394a491b2373b6
-EBUILD enchant-1.6.1-r1.ebuild 1632 BLAKE2B 7d509e133720a79986abceed4bf8dd987241c3835f418301d1b1bfbafc1a6570f6f76ed34ba1d4d29a13f4a17814c6b289aea5477cef148f2f10daa747614f3e SHA512 caa9000d7b4874b10aad0f8c9c3f1159a5fb6a15e00228eacf5edb14818155a91a575150d6cdc735909b99ff2d07960bbe3f87223c7d333d65bbc0a02d89ccba
-EBUILD enchant-2.2.7.ebuild 1126 BLAKE2B 74c99075bd8fce858a940032ab50edbf0bc31074546cf285c4886bdc8848ef976732e094da7aec7384c41965a6d60cc90a2166363b72e8ea01c3b2f1f730351e SHA512 e55212fde8c27c9c6227db789b27e02795ee6b2d7eaf7c0b1e98aabe612e3e1ad42e9da495dd75bb9b7cac797ad54a0397bfe0f8810b3870c334a6abf9c3afa1
+DIST enchant-2.2.8.tar.gz 976715 BLAKE2B 50a96c69b6f6575db0a8d6f30420db4b273901a9a0261ae606d81d96b044ece03078a2549f34972fef47a36f0b85c27af90c90c2f2efab2fb258e17621d927af SHA512 4bfa771af0deab3d0ca5523abab1fdb14cb596747dba7cf887e8cd812601015f52502cbd3df68247f102bba259cb281414e9ccde83b8bdd3c8cc83c2fcbc9090
+EBUILD enchant-1.6.1-r1.ebuild 1629 BLAKE2B adf64823d275f228a0056b7ef888bd399f9e7d0ab0d487ab3316272a0d04e944472a60a90dd16f545b55d742f5dcfff0f05200763ff11492ca576423a59d0e03 SHA512 2f132714843ceccfcbbdbcdeb4a5d24c66635dfeca4f95f676046dc9f0313bd1bf8ff6b62ed5f1ee666649e519dd67b2a3f9b15854e050ddd0dbedd003530edb
+EBUILD enchant-2.2.7.ebuild 1122 BLAKE2B 5286a3e3888a4d2563d9848da9b680649745008d011c548757bc074cb1d7b13f3e60da29f41bc100ee133ab077ddca3bf62389706406dbcd4369da9103007513 SHA512 caaea9e5f1691653addfa29bc85a23c91db0f028cfb27f77ce67009a45e9f3d645f14998125a24d1038ce16488765a58435fa9206697f97a02f56037f02cf189
+EBUILD enchant-2.2.8.ebuild 1182 BLAKE2B 6746db605efd7b96bf22f4c63069cde9a72ed59fcec2b5f5ef54222ea4c25db06b588680c2cbf91fcdfe6b64dfa03038ed574ed3e29811ec05a832cc4bba0e44 SHA512 4413bd8ca42167914dbc33680f03729d9d9d7a28644e55b332084d84cf5b1b908c574b2df0168a81255da5746af896683e36997f887def06e491f72f20744614
 MISC metadata.xml 446 BLAKE2B 46f91a78cb6d8ae11b77da0f640e07fd3842e4ed162d0037b9620132f8ae9ac81e4b6353371d2350abd634bc693e8d64c8d94a5496cb28931863ce7a246ab209 SHA512 9e1bdbc66c53f055c8730a6ff7a833e2597f648067087e268495a3337e51fb3d806fbed698a69ac59599100eba90401679f6141c71dd9298030f4771230429ea
diff --git a/app-text/enchant/enchant-1.6.1-r1.ebuild b/app-text/enchant/enchant-1.6.1-r1.ebuild
index 284ca6473b82..38c1d56a3d42 100644
--- a/app-text/enchant/enchant-1.6.1-r1.ebuild
+++ b/app-text/enchant/enchant-1.6.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/${PN}-${MY_PV}/${P
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="aspell +hunspell static-libs test"
 RESTRICT="!test? ( test )"
diff --git a/app-text/enchant/enchant-2.2.7.ebuild b/app-text/enchant/enchant-2.2.7.ebuild
index e9756f02d23e..ffa052358fa9 100644
--- a/app-text/enchant/enchant-2.2.7.ebuild
+++ b/app-text/enchant/enchant-2.2.7.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="aspell +hunspell"
 REQUIRED_USE="|| ( hunspell aspell )"
diff --git a/app-text/enchant/enchant-2.2.8.ebuild b/app-text/enchant/enchant-2.2.8.ebuild
new file mode 100644
index 000000000000..d4c6ef72a6e5
--- /dev/null
+++ b/app-text/enchant/enchant-2.2.8.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Spellchecker wrapping library"
+HOMEPAGE="https://abiword.github.io/enchant/"
+SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+
+IUSE="aspell +hunspell"
+REQUIRED_USE="|| ( hunspell aspell )"
+
+# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
+RDEPEND="
+	>=dev-libs/glib-2.6:2
+	aspell? ( app-text/aspell )
+	hunspell? ( >=app-text/hunspell-1.2.1:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+#	test? ( dev-libs/unittest++ )
+RESTRICT="test"
+
+src_configure() {
+	# TODO: Add app-text/nuspell support
+	econf \
+		--datadir="${EPREFIX}"/usr/share/enchant-2 \
+		--disable-static \
+		$(use_with aspell) \
+		$(use_with hunspell) \
+		--without-hspell \
+		--without-nuspell \
+		--without-voikko \
+		--with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}