gentoo resync : 25.04.2020

2 files changed, 19 insertions, 19 deletions

diff --git a/media-video/gaupol/Manifest b/media-video/gaupol/Manifest
index 65b4c0d20192..943a886c5abd 100644
--- a/media-video/gaupol/Manifest
+++ b/media-video/gaupol/Manifest
@@ -1,8 +1,8 @@
 AUX gaupol-1.7-fix-tests.patch 5986 BLAKE2B f161262ad64c0a5fe02119522353b0348ecd96e66a52fcb5a3c1b9994098e1e1b647783ad47f7856f80e556ac4f8047693e0498bc8876f236730b56714883dbe SHA512 77dcd602e5e31886a5cbdb01fc58ed8aea216d16eaaf5a136e59a6b2fb0b0484cafb521ccefec5424edd7834cd36fa1e435477055a0c43bef7959aad7168eb26
-DIST gaupol-1.5.tar.gz 537279 BLAKE2B 1ba8644b49832ee80e61bf304b7978275064acbe2e5e733a991b280f947c4064f0d4f385055e580bd3aa2d9ee2291d64fd1ee4bd8a1ba4f8eaaaaf9a137085ff SHA512 48f3eda460c2fb3e4bdaf52c42645599f0d5ce8eae05f7a2a9c608192a27a8b86b83830584216dc73105968f544aeab30e171b2c176d9a3f5047e93510413b85
 DIST gaupol-1.6.tar.gz 540186 BLAKE2B 4e7a2e0c01be2ac88c0ae5948d3002005c72418ef21835195daf6b0c5b71d970006b0f76fa78a1ec7337d1f9366436c44eb336e0a56d8cbb7eac905e09d4c81a SHA512 e0f258b579a34644e54456978df9c5a6f72aa019b6de79918fe6892bb59d2316c3fc093f2f49c60d6eef74832fa2a9a9e102bb1d25f64f3143fd29d3cb4966e5
 DIST gaupol-1.7.tar.gz 524231 BLAKE2B 5f1c07a6d633fba53361ad4d9e1cdbc3236614a444bb387378c9e1ec6b358796eb7477168caace4b6101e0e6e0b83f10a2d3052acb5e0b0ab69e75f2b24db7fa SHA512 b0fa7f5216f47075aefddd58ab3aa1186265b5d70f8b4e7f7e252a1cc05bd1c4838c2af8efb4da39c0196f63dc3a64ff2269a458e2d95072606b59b4b8cada1b
-EBUILD gaupol-1.5.ebuild 1413 BLAKE2B f708ce550de1a86dea464daf9b0e854b6d822a1931a552a79c8580a9593440fd7aaac0538b718ef5e0ff20c4e1cee594a37eeba95cbb18dfc291b97dec4e3889 SHA512 7a9b28c986850c7b62fcbc0266f41c3fcb130c8227d4b3c9000d7691e60b11040362d5e1e9658218176af42e5ef2ca20a4b223efa8a0c24e6843c3ddcb705b2d
+DIST gaupol-1.8.tar.gz 558627 BLAKE2B a7243310b97fe7187311585762faaff512364ca043630eb43c1ee99c55fa5400e14698e391b410b67f70f1bc7a741adb0737868d7b40c868bb4c6badacd14fb1 SHA512 a6b65316b5750a4d636b39b75393b0b2f2c44d978f1fc8cc3bd2cd2d2bcf9ba68d0161afb41bdca5b381ec39e5a2e06440f4f4676f344019966b297c4112e691
 EBUILD gaupol-1.6.ebuild 1416 BLAKE2B 8d155661f768683a2adcae10f6adfaa3ab44f4c0375e286942cade5c21eb72acbab1cd38695ab4e24b6f888a72a6a906600e73f6b9de2616de371280c726807d SHA512 2e954922a83060040a3b71422703d71801cec11b0883aaeeb3f38923e749d91a2def47ccd7c1efd20ccf12085eca5d4163bea27b31682f657f48a4ba918c95e4
 EBUILD gaupol-1.7.ebuild 1585 BLAKE2B 35ec5e82c552ce47683019f57409a27851fa5c5a3ab12e9983ec9bff0d68e2a3a7a1154d71f3e4f1d93251bb1d5e46513341d4a143022f6c867dd742a20e0b05 SHA512 38839496e3327a5f18e348cce0f67b0f72913c52962ef56c4b07c13228d4fe5c699275b26670b7bee69f781580bcb1daed10daf4171c2cd96b5662c47971271c
+EBUILD gaupol-1.8.ebuild 1542 BLAKE2B 1694a3f5c40bad998c39bd35adfcfbcc87033df71e8138cc8d046fab5983112f28d9a3b8459a1c6cda170d4a2779438a46ecc066c2bd751df311c155d9e31c0f SHA512 58bb1283f59e101f7f9455f54aafde064eddef2821843d75f5043b43182d75910daf0b3ca3f727cdb13187a8e35f47215d9501cc0fe275d68a71f25629662203
 MISC metadata.xml 508 BLAKE2B 979a43569103cfe36a47d56ed16c15b7775d0a36d031d488ac064152b8d59115dc656e28a5eced25da13d9a3925be24114a760862bf043b88a89c70b8dc053e8 SHA512 1af2a5a287075a0668850c229a5c9dcbef51bbe64467516e37b870459266021d528435dbd5274e0d5abf7cf0fe2d4b8fb08f6cc470418c3b64e4da6b93dcc147
diff --git a/media-video/gaupol/gaupol-1.5.ebuild b/media-video/gaupol/gaupol-1.8.ebuild
index a06376d939e2..9fa5bf5a0ca1 100644
--- a/media-video/gaupol/gaupol-1.5.ebuild
+++ b/media-video/gaupol/gaupol-1.8.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit distutils-r1 gnome2-utils virtualx xdg-utils
+inherit distutils-r1 virtualx xdg-utils
 
 DESCRIPTION="A subtitle editor for text-based subtitles"
 HOMEPAGE="https://otsaloma.io/gaupol/"
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/otsaloma/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="spell test"
 RESTRICT="!test? ( test )"
 
@@ -22,16 +22,15 @@ RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	x11-libs/gtk+:3[introspection]
-	spell? (
-		app-text/gtkspell:3
-		>=dev-python/pyenchant-1.4[${PYTHON_USEDEP}]
-	)
+	spell? ( app-text/gspell[introspection] )
 "
 DEPEND="
 	sys-devel/gettext
 	test? (
 		${RDEPEND}
-		dev-python/pyenchant[${PYTHON_USEDEP}]
+		app-dicts/myspell-en
+		app-text/enchant[hunspell]
+		app-text/gspell[introspection]
 		dev-python/pytest[${PYTHON_USEDEP}]
 	)
 "
@@ -44,20 +43,21 @@ python_test() {
 
 pkg_postinst() {
 	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "Previewing support needs MPV, MPlayer or VLC."
-
+		elog "Previewing support requires MPV, MPlayer or VLC."
 		if use spell; then
-			elog "Additionally, spell-checking requires a dictionary, any of"
-			elog "Aspell/Pspell, Ispell, MySpell, Uspell, Hspell or AppleSpell."
+			elog ""
+			elog "Spell-checking requires a dictionary, any of app-dicts/myspell-*"
+			elog "or app-text/aspell with the appropriate L10N variable."
+			elog ""
+			elog "Additionally, make sure that app-text/enchant has the correct flags enabled:"
+			elog "USE=hunspell for myspell dictionaries and USE=aspell for aspell dictionaries."
 		fi
 	fi
 }
 
 pkg_postrm() {
 	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 }