gentoo resync : 16.09.2020

3 files changed, 9 insertions, 140 deletions

diff --git a/media-video/gaupol/Manifest b/media-video/gaupol/Manifest
index 132a835adc36..fb485a9dda72 100644
--- a/media-video/gaupol/Manifest
+++ b/media-video/gaupol/Manifest
@@ -1,7 +1,5 @@
-AUX gaupol-1.7-fix-tests.patch 5986 BLAKE2B f161262ad64c0a5fe02119522353b0348ecd96e66a52fcb5a3c1b9994098e1e1b647783ad47f7856f80e556ac4f8047693e0498bc8876f236730b56714883dbe SHA512 77dcd602e5e31886a5cbdb01fc58ed8aea216d16eaaf5a136e59a6b2fb0b0484cafb521ccefec5424edd7834cd36fa1e435477055a0c43bef7959aad7168eb26
 AUX gaupol-1.8-fix-audio-tracks-order.patch 6462 BLAKE2B 96e09112adf27ece07b65eee4b69d7dd1813c3b882afe790b8e35237e8e3c996809a0e71c00ce64f3c7cd0efbaf325933473f52439db31ba60869035c5a59feb SHA512 f7c001f698650c8c757818d44624201888aefe0d65689ee0fd357d85d45bd712a9f09b57e833a503c5b639ec430a6df2eebf02a40bed03a091abcd0da0bfae69
-DIST gaupol-1.7.tar.gz 524231 BLAKE2B 5f1c07a6d633fba53361ad4d9e1cdbc3236614a444bb387378c9e1ec6b358796eb7477168caace4b6101e0e6e0b83f10a2d3052acb5e0b0ab69e75f2b24db7fa SHA512 b0fa7f5216f47075aefddd58ab3aa1186265b5d70f8b4e7f7e252a1cc05bd1c4838c2af8efb4da39c0196f63dc3a64ff2269a458e2d95072606b59b4b8cada1b
 DIST gaupol-1.8.tar.gz 558627 BLAKE2B a7243310b97fe7187311585762faaff512364ca043630eb43c1ee99c55fa5400e14698e391b410b67f70f1bc7a741adb0737868d7b40c868bb4c6badacd14fb1 SHA512 a6b65316b5750a4d636b39b75393b0b2f2c44d978f1fc8cc3bd2cd2d2bcf9ba68d0161afb41bdca5b381ec39e5a2e06440f4f4676f344019966b297c4112e691
-EBUILD gaupol-1.7.ebuild 1585 BLAKE2B 35ec5e82c552ce47683019f57409a27851fa5c5a3ab12e9983ec9bff0d68e2a3a7a1154d71f3e4f1d93251bb1d5e46513341d4a143022f6c867dd742a20e0b05 SHA512 38839496e3327a5f18e348cce0f67b0f72913c52962ef56c4b07c13228d4fe5c699275b26670b7bee69f781580bcb1daed10daf4171c2cd96b5662c47971271c
 EBUILD gaupol-1.8-r1.ebuild 1702 BLAKE2B 42721f492e72e06660ece7a89656dbd2b599c88cec606d138c1d46efe3fcfcb9fea45d27489278de92f51690d7b79bcadac7947c22a6a50f4f910b4d34270944 SHA512 3b8e5fa0be5d0c1eab7b4140bb364c053a10f346662ce8e08c8eb2babd207f7976d9385587aedecf3632bf5f26798463fadeb7dc2100f0b00a2da6fdf1775b40
+EBUILD gaupol-1.8-r2.ebuild 1736 BLAKE2B 08bff30c8af0c03cd06a0e5444c763d32a0d25cf1d7dcaf00359352a56f8cf1e0f59bf53221f65efec87023beb950618f6275944e938eaf0c50171e0f809e688 SHA512 bb1fb647bd51aea88c84009340bdd53f781acc0e1b096bf6b533013d121da1ac09584068101cdbb256fd32f9e2bde2d10c2effaad71946d2165010aa77ae4b8c
 MISC metadata.xml 508 BLAKE2B 979a43569103cfe36a47d56ed16c15b7775d0a36d031d488ac064152b8d59115dc656e28a5eced25da13d9a3925be24114a760862bf043b88a89c70b8dc053e8 SHA512 1af2a5a287075a0668850c229a5c9dcbef51bbe64467516e37b870459266021d528435dbd5274e0d5abf7cf0fe2d4b8fb08f6cc470418c3b64e4da6b93dcc147
diff --git a/media-video/gaupol/files/gaupol-1.7-fix-tests.patch b/media-video/gaupol/files/gaupol-1.7-fix-tests.patch
deleted file mode 100644
index d8a90669de9f..000000000000
--- a/media-video/gaupol/files/gaupol-1.7-fix-tests.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-commit 7778eda0e6e4280fb43aa78721561e43d3e866eb
-Author: Osmo Salomaa <otsaloma@iki.fi>
-Date:   Sun Aug 4 21:19:20 2019 +0300
-
-    Accept any en* language for spell-check tests
-
-diff --git a/aeidon/agents/test/test_text.py b/aeidon/agents/test/test_text.py
-index bf6c4ac1..a2261595 100644
---- a/aeidon/agents/test/test_text.py
-+++ b/aeidon/agents/test/test_text.py
-@@ -78,14 +78,16 @@ class TestTextAgent(aeidon.TestCase):
-         for subtitle in self.project.subtitles:
-             subtitle.main_text = subtitle.main_text.replace("a", " a")
-             subtitle.main_text = subtitle.main_text.replace("e", "e ")
-+        language = self.get_spell_check_language("en")
-         self.project.spell_check_join_words(indices=None,
-                                             doc=aeidon.documents.MAIN,
--                                            language="en")
-+                                            language=language)
- 
-     def test_spell_check_split_words(self):
-         for subtitle in self.project.subtitles:
-             subtitle.main_text = subtitle.main_text.replace("s ", "s")
-             subtitle.main_text = subtitle.main_text.replace("y ", "y")
-+        language = self.get_spell_check_language("en")
-         self.project.spell_check_split_words(indices=None,
-                                              doc=aeidon.documents.MAIN,
--                                             language="en")
-+                                             language=language)
-diff --git a/aeidon/test/test_spell.py b/aeidon/test/test_spell.py
-index 66369e0e..ff94f150 100644
---- a/aeidon/test/test_spell.py
-+++ b/aeidon/test/test_spell.py
-@@ -21,7 +21,8 @@ import aeidon
- class TestSpellChecker(aeidon.TestCase):
- 
-     def setup_method(self, method):
--        self.checker = aeidon.SpellChecker("en")
-+        language = self.get_spell_check_language("en")
-+        self.checker = aeidon.SpellChecker(language)
- 
-     def test_add_replacement(self):
-         self.checker.add_replacement("abc", "xyz")
-@@ -50,7 +51,8 @@ class TestSpellChecker(aeidon.TestCase):
- class TestSpellCheckNavigator(aeidon.TestCase):
- 
-     def setup_method(self, method):
--        self.navigator = aeidon.SpellCheckNavigator("en")
-+        language = language = self.get_spell_check_language("en")
-+        self.navigator = aeidon.SpellCheckNavigator(language)
-         self.navigator.text = "She knows the fighting\ntechniques of Panzer Kunst."
- 
-     def test_ignore(self):
-diff --git a/aeidon/unittest.py b/aeidon/unittest.py
-index 8c384806..d80c5a22 100644
---- a/aeidon/unittest.py
-+++ b/aeidon/unittest.py
-@@ -50,6 +50,15 @@ class TestCase:
-         with open(path, "r", encoding="ascii") as f:
-             return f.read().strip()
- 
-+    def get_spell_check_language(self, language):
-+        """Return spell-check language to use in unit tests."""
-+        # Allow any close-enough variant as different systems will have
-+        # different spell-check engines and dictionaries installed.
-+        for candidate in aeidon.SpellChecker.list_languages():
-+            if candidate.startswith(language):
-+                return candidate
-+        raise Exception("Spell-check dictionary {}* not found".format(language))
-+
-     def new_microdvd_file(self):
-         """Return path to a new temporary MicroDVD file."""
-         return self.new_temp_file(aeidon.formats.MICRODVD)
-diff --git a/gaupol/agents/test/test_tools.py b/gaupol/agents/test/test_tools.py
-index a9fbdf8f..e1547476 100644
---- a/gaupol/agents/test/test_tools.py
-+++ b/gaupol/agents/test/test_tools.py
-@@ -36,7 +36,8 @@ class TestToolsAgent(gaupol.TestCase):
- 
-     @patch("gaupol.util.flash_dialog", OK)
-     def test__on_check_spelling_activate(self):
--        gaupol.conf.spell_check.language = "en"
-+        language = self.get_spell_check_language("en")
-+        gaupol.conf.spell_check.language = language
-         self.application.get_action("check-spelling").activate()
- 
-     @patch("gaupol.util.flash_dialog", OK)
-diff --git a/gaupol/dialogs/test/test_spell_check.py b/gaupol/dialogs/test/test_spell_check.py
-index cbe7d61a..d74860fb 100644
---- a/gaupol/dialogs/test/test_spell_check.py
-+++ b/gaupol/dialogs/test/test_spell_check.py
-@@ -32,7 +32,8 @@ class TestSpellCheckDialog(gaupol.TestCase):
-         aeidon.SpellChecker.add_to_personal = aeidon.SpellChecker.add_to_session
-         aeidon.SpellChecker.read_replacements = lambda *args: None
-         aeidon.SpellChecker.write_replacements = lambda *args: None
--        gaupol.conf.spell_check.language = "en"
-+        language = self.get_spell_check_language("en")
-+        gaupol.conf.spell_check.language = language
-         self.application = self.new_application()
-         for page in self.application.pages:
-             for subtitle in page.project.subtitles:
-diff --git a/gaupol/test/test_spell.py b/gaupol/test/test_spell.py
-index 72b74e33..5018abab 100644
---- a/gaupol/test/test_spell.py
-+++ b/gaupol/test/test_spell.py
-@@ -37,4 +37,5 @@ class TestSpellChecker(aeidon.TestCase):
-         Gtk.main()
- 
-     def setup_method(self, method):
--        self.checker = gaupol.SpellChecker("en")
-+        language = self.get_spell_check_language("en")
-+        self.checker = gaupol.SpellChecker(language)
-
-commit 340b3bf6bb7cfdf5be9e973f25f5a616ef504702
-Author: Osmo Salomaa <otsaloma@iki.fi>
-Date:   Mon Aug 5 02:31:32 2019 +0300
-
-    Set spell-check language for assistant test
-
-diff --git a/gaupol/test/test_assistants.py b/gaupol/test/test_assistants.py
-index 6969b273..4d6dfdcb 100644
---- a/gaupol/test/test_assistants.py
-+++ b/gaupol/test/test_assistants.py
-@@ -109,6 +109,8 @@ class TestJoinSplitWordsPage(_TestBuilderPage):
- 
-     @patch("gaupol.util.flash_dialog", OK)
-     def test_correct_texts(self):
-+        language = self.get_spell_check_language("en")
-+        gaupol.conf.spell_check.language = language
-         self.page.correct_texts(self.project,
-                                 None,
-                                 aeidon.documents.MAIN)
diff --git a/media-video/gaupol/gaupol-1.7.ebuild b/media-video/gaupol/gaupol-1.8-r2.ebuild
index 25b70f293bfa..e08179fb61d3 100644
--- a/media-video/gaupol/gaupol-1.7.ebuild
+++ b/media-video/gaupol/gaupol-1.8-r2.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 virtualx xdg-utils
 
@@ -13,7 +14,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 )"
 
@@ -24,7 +25,7 @@ RDEPEND="
 	x11-libs/gtk+:3[introspection]
 	spell? ( app-text/gspell[introspection] )
 "
-DEPEND="
+BDEPEND="
 	sys-devel/gettext
 	test? (
 		${RDEPEND}
@@ -37,7 +38,7 @@ DEPEND="
 
 DOCS=( AUTHORS.md NEWS.md TODO.md README.md README.aeidon.md )
 
-PATCHES=( "${FILESDIR}/${P}-fix-tests.patch" )
+PATCHES=( "${FILESDIR}/${P}-fix-audio-tracks-order.patch" )
 
 python_test() {
 	virtx pytest -vv
@@ -47,7 +48,9 @@ pkg_postinst() {
 	xdg_desktop_database_update
 	xdg_icon_cache_update
 	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "Previewing support requires MPV, MPlayer or VLC."
+		elog "The integrated video player requires media-plugins/gst-plugins-gtk."
+		elog ""
+		elog "External video previewing support requires MPV, MPlayer or VLC."
 		if use spell; then
 			elog ""
 			elog "Spell-checking requires a dictionary, any of app-dicts/myspell-*"