gentoo resync : 28.04.2021

3 files changed, 2 insertions, 58 deletions

diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest
index c847e04a1a55..79d76f1a7ff0 100644
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@@ -1,5 +1,3 @@
-DIST gspell-1.8.3.tar.xz 421468 BLAKE2B 70a8c0649a9f1f0d5e1bbc170734c6ce7aeb4875ed1cca52c4c582688c56553ad2363b9fed732c504f3ff6bc33d994fc4ba12cd3754e4f3b602be2a2015144df SHA512 4116231fdfb416e70ee34c73e0ecf81f0071e81ad477135e3c1e270534dfe4be20c7f45e316e13d33c79944d282ed3223251122983a0f3199ea57c3431a24c1d
 DIST gspell-1.8.4.tar.xz 424356 BLAKE2B 031787c4f5c3f3cfe21d5f74ec72117818da43313c5e6dffb79581ca07033aede2ecf236ffdf2197938d62727c5bd3913d1362e02be7109b0d498304949e1d44 SHA512 adb481590442d81040151746c7747791d76248b1b35af1702dc5389efbd2e0c6bdda070b8e84384d22f4922b5a382ac2c6519e425f417ec85c8efbe22dc38c82
-EBUILD gspell-1.8.3.ebuild 1477 BLAKE2B 6ad6e2c4522506edbd658ba763a3620fb5b7b7f7ea88d4268b0312b38bd6d6774cc208808953a9035b11e9d6dc5c8ca99f7adeb8f53e82255dfe53eac93bd752 SHA512 3b57665e5aadbe512253792b41b1f688b23653a56da2b90ef5370bc33781682937670e719b69c9eed89d7924abbc9d23ad4b3f4535a2cbac3baeb01ebee223fd
-EBUILD gspell-1.8.4.ebuild 1479 BLAKE2B ef21a34dc5b1de6892f81db4985828dbcf8c4790f8847887a9317e7dddaaa02905efb8e8bb5518c1f18a2fa75d0b1fc1c942a77d5fbea847234b56df1bacbdca SHA512 3c468218f7655c14be37e05d6702133ffabdda48c15366b9bdde42440c97f557548068580def6938a180aa6cfecc521f737a4df58428fc6b7580c03449e48124
+EBUILD gspell-1.8.4.ebuild 1477 BLAKE2B 1f646c4fbff986066b6ac3304082a6fd724dbec71bcec313d17039c2d0849f9ef7ee1679c633d8dc98b38dfe12db10358f76a1d5bd93bdff34ceaa6714fc4e36 SHA512 464249fffd2f300ccccd0f59443010b132328bec054863760a097816a100588a83af5df29162351c2ce37315ceb9d3ecc034d1501245b0441a404811b98d82df
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/gspell/gspell-1.8.3.ebuild b/app-text/gspell/gspell-1.8.3.ebuild
deleted file mode 100644
index fcd271945a62..000000000000
--- a/app-text/gspell/gspell-1.8.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala virtualx
-
-DESCRIPTION="Spell check library for GTK+ applications"
-HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/2" # subslot = libgspell-1 soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="+introspection +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	app-text/iso-codes
-	>=app-text/enchant-2.1.3:2
-	>=dev-libs/glib-2.44:2
-	>=x11-libs/gtk+-3.20:3[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.25
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-	test? ( app-text/enchant:2[hunspell]
-		|| (  app-dicts/myspell-en[l10n_en(+)] app-dicts/myspell-en[l10n_en-US(+)] ) )
-"
-# Tests require a en_US dictionary and fail with deprecated enchant aspell backend:
-# So enchant[hunspell] + myspell-en ensure they pass (hunspell is ordered before aspell),
-# however a different backend like hspell or nuspell + their en_US dict might be fine too,
-# but we don't support them at this time (2020-04-12) in enchant:2
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/app-text/gspell/gspell-1.8.4.ebuild b/app-text/gspell/gspell-1.8.4.ebuild
index 64919831d8ba..8c255e7c8d2c 100644
--- a/app-text/gspell/gspell-1.8.4.ebuild
+++ b/app-text/gspell/gspell-1.8.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/2" # subslot = libgspell-1 soname version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="+introspection +vala"
 REQUIRED_USE="vala? ( introspection )"