Merge updates from master

7 files changed, 182 insertions, 69 deletions

diff --git a/games-emulation/pcsx2/pcsx2-1.6.0.ebuild b/games-emulation/pcsx2/pcsx2-1.6.0.ebuild
index e6691265aa25..b264a1d56a5b 100644
--- a/games-emulation/pcsx2/pcsx2-1.6.0.ebuild
+++ b/games-emulation/pcsx2/pcsx2-1.6.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 MY_PV="${PV/_/-}"
 
-inherit cmake multilib toolchain-funcs wxwidgets
+inherit cmake flag-o-matic multilib toolchain-funcs wxwidgets
 
 DESCRIPTION="A PlayStation 2 emulator"
 HOMEPAGE="https://www.pcsx2.net"
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 85ff7e5fe0f7..3de99b803123 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake git-r3 multilib toolchain-funcs wxwidgets
+inherit cmake flag-o-matic git-r3 multilib toolchain-funcs wxwidgets
 
 DESCRIPTION="A PlayStation 2 emulator"
 HOMEPAGE="https://www.pcsx2.net"
diff --git a/media-video/gaupol/Manifest b/media-video/gaupol/Manifest
index b718802f7238..697e55adb204 100644
--- a/media-video/gaupol/Manifest
+++ b/media-video/gaupol/Manifest
@@ -1,3 +1,2 @@
-DIST gaupol-1.6.tar.gz 540186 BLAKE2B 4e7a2e0c01be2ac88c0ae5948d3002005c72418ef21835195daf6b0c5b71d970006b0f76fa78a1ec7337d1f9366436c44eb336e0a56d8cbb7eac905e09d4c81a SHA512 e0f258b579a34644e54456978df9c5a6f72aa019b6de79918fe6892bb59d2316c3fc093f2f49c60d6eef74832fa2a9a9e102bb1d25f64f3143fd29d3cb4966e5
 DIST gaupol-1.7.tar.gz 524231 BLAKE2B 5f1c07a6d633fba53361ad4d9e1cdbc3236614a444bb387378c9e1ec6b358796eb7477168caace4b6101e0e6e0b83f10a2d3052acb5e0b0ab69e75f2b24db7fa SHA512 b0fa7f5216f47075aefddd58ab3aa1186265b5d70f8b4e7f7e252a1cc05bd1c4838c2af8efb4da39c0196f63dc3a64ff2269a458e2d95072606b59b4b8cada1b
 DIST gaupol-1.8.tar.gz 558627 BLAKE2B a7243310b97fe7187311585762faaff512364ca043630eb43c1ee99c55fa5400e14698e391b410b67f70f1bc7a741adb0737868d7b40c868bb4c6badacd14fb1 SHA512 a6b65316b5750a4d636b39b75393b0b2f2c44d978f1fc8cc3bd2cd2d2bcf9ba68d0161afb41bdca5b381ec39e5a2e06440f4f4676f344019966b297c4112e691
diff --git a/media-video/gaupol/files/gaupol-1.8-fix-audio-tracks-order.patch b/media-video/gaupol/files/gaupol-1.8-fix-audio-tracks-order.patch
new file mode 100644
index 000000000000..3f554c4ef335
--- /dev/null
+++ b/media-video/gaupol/files/gaupol-1.8-fix-audio-tracks-order.patch
@@ -0,0 +1,174 @@
+From e26cfcfe002c87a39eac63bbaa5ad0d4d69c95a4 Mon Sep 17 00:00:00 2001
+From: Quentin Gliosca <quentin.gliosca@gmail.com>
+Date: Tue, 12 May 2020 16:48:31 +0200
+Subject: [PATCH 1/3] Fix the order of languages in audio track selection
+
+Fix #129
+---
+ gaupol/player.py | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/gaupol/player.py b/gaupol/player.py
+index 836abea2..c266e0b9 100644
+--- a/gaupol/player.py
++++ b/gaupol/player.py
+@@ -118,7 +118,8 @@ def _ensure_default_segment(self):
+ 
+     def get_audio_languages(self):
+         """Return a sequence of audio languages or ``None``."""
+-        return tuple(x.get_language() for x in self._info.get_audio_streams())
++        return tuple(self._playbin.emit("get-audio-tags", i).get_string("language-code")[1]
++                     for i in range(self._playbin.props.n_audio))
+ 
+     def get_duration(self, mode=None):
+         """Return duration of video stream or ``None``."""
+@@ -356,6 +357,10 @@ def set_uri(self, uri):
+             dialog.add_button(_("_OK"), Gtk.ResponseType.OK)
+             dialog.set_default_response(Gtk.ResponseType.OK)
+             gaupol.util.flash_dialog(dialog)
++        else:
++            # Make stream tags available from _playbin
++            self._playbin.set_state(Gst.State.PAUSED)
++            self._playbin.get_state(Gst.CLOCK_TIME_NONE)
+ 
+     def stop(self):
+         """Stop."""
+
+From 9ace4fefe5d246c5588538a715a185c796e218ef Mon Sep 17 00:00:00 2001
+From: Quentin Gliosca <quentin.gliosca@gmail.com>
+Date: Tue, 12 May 2020 17:27:35 +0200
+Subject: [PATCH 2/3] Improve names of audio tracks in menu
+
+---
+ gaupol/agents/video.py | 18 ++++++++++++++----
+ gaupol/player.py       | 20 ++++++++++++++++----
+ 2 files changed, 30 insertions(+), 8 deletions(-)
+
+diff --git a/gaupol/agents/video.py b/gaupol/agents/video.py
+index d434255a..0f6b935c 100644
+--- a/gaupol/agents/video.py
++++ b/gaupol/agents/video.py
+@@ -27,7 +27,11 @@
+ from gi.repository import Gtk
+ 
+ with aeidon.util.silent(Exception):
++    from gi import require_version
++    require_version('GstTag', '1.0')
+     from gi.repository import Gst
++    from gi.repository import GstTag
++
+ 
+ 
+ class VideoAgent(aeidon.Delegate):
+@@ -348,11 +352,17 @@ def _update_languages_menu(self):
+         """Update the audio language selection menu."""
+         menu = self.get_menubar_section("audio-languages-placeholder")
+         menu.remove_all()
+-        languages = self.player.get_audio_languages()
+-        for i, language in enumerate(languages):
+-            language = language or _("Undefined")
++        tracks = self.player.get_audio_infos()
++        for i, track in enumerate(tracks):
++            title = track.title or "{} {}".format(_("Track"), i + 1)
++            lang = None
++            if track.language_code is not None:
++                lang = GstTag.tag_get_language_name(track.language_code)
++            if lang is None:
++                lang = track.language_name
++            name = title if lang is None else "{} - [{}]".format(title, lang.title())
+             action = "win.set-audio-language::{:d}".format(i)
+-            menu.append(language, action)
++            menu.append(name, action)
+             if i == self.player.audio_track:
+                 action = self.get_action("set-audio-language")
+                 action.set_state(str(i))
+diff --git a/gaupol/player.py b/gaupol/player.py
+index c266e0b9..ee1e96dc 100644
+--- a/gaupol/player.py
++++ b/gaupol/player.py
+@@ -21,6 +21,7 @@
+ import gaupol
+ import time
+ 
++from collections import namedtuple
+ from aeidon.i18n   import _
+ from gi.repository import GLib
+ from gi.repository import Gtk
+@@ -56,6 +57,8 @@ class VideoPlayer(aeidon.Observable):
+ 
+     signals = ("state-changed",)
+ 
++    TrackInfo = namedtuple("TrackInfo", ["title", "language_code", "language_name"])
++
+     def __init__(self):
+         """Initialize a :class:`VideoPlayer` instance."""
+         aeidon.Observable.__init__(self)
+@@ -116,10 +119,19 @@ def _ensure_default_segment(self):
+         self._playbin.seek_simple(Gst.Format.TIME, seek_flags, pos)
+         self._in_default_segment = True
+ 
+-    def get_audio_languages(self):
+-        """Return a sequence of audio languages or ``None``."""
+-        return tuple(self._playbin.emit("get-audio-tags", i).get_string("language-code")[1]
+-                     for i in range(self._playbin.props.n_audio))
++    def get_audio_infos(self):
++        """Return a sequence of audio track infos."""
++        return tuple(
++            self._make_track_infos(self._playbin.emit("get-audio-tags", i))
++            for i in range(self._playbin.props.n_audio)
++        )
++
++    def _make_track_infos(self, tags):
++        return self.TrackInfo(
++            tags.get_string("title")[1],
++            tags.get_string("language-code")[1],
++            tags.get_string("language-name")[1]
++        )
+ 
+     def get_duration(self, mode=None):
+         """Return duration of video stream or ``None``."""
+
+From f50b4e54dc9aa84fc1b3eb403d680b8a0be77dc3 Mon Sep 17 00:00:00 2001
+From: Quentin Gliosca <quentin.gliosca@gmail.com>
+Date: Wed, 13 May 2020 07:29:27 +0200
+Subject: [PATCH 3/3] Cosmetic changes
+
+---
+ gaupol/__init__.py     | 1 +
+ gaupol/agents/video.py | 4 +---
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/gaupol/__init__.py b/gaupol/__init__.py
+index f7a9663d..fc02287b 100644
+--- a/gaupol/__init__.py
++++ b/gaupol/__init__.py
+@@ -44,6 +44,7 @@
+     "Gst": "1.0",
+     "GstPbutils": "1.0",
+     "GstVideo": "1.0",
++    "GstTag": "1.0",
+ }.items():
+     with aeidon.util.silent(Exception):
+         gi.require_version(module, version)
+diff --git a/gaupol/agents/video.py b/gaupol/agents/video.py
+index 0f6b935c..3c9e3113 100644
+--- a/gaupol/agents/video.py
++++ b/gaupol/agents/video.py
+@@ -27,8 +27,6 @@
+ from gi.repository import Gtk
+ 
+ with aeidon.util.silent(Exception):
+-    from gi import require_version
+-    require_version('GstTag', '1.0')
+     from gi.repository import Gst
+     from gi.repository import GstTag
+ 
+@@ -354,7 +352,7 @@ def _update_languages_menu(self):
+         menu.remove_all()
+         tracks = self.player.get_audio_infos()
+         for i, track in enumerate(tracks):
+-            title = track.title or "{} {}".format(_("Track"), i + 1)
++            title = track.title or _("Track {:d}").format(i + 1)
+             lang = None
+             if track.language_code is not None:
+                 lang = GstTag.tag_get_language_name(track.language_code)
diff --git a/media-video/gaupol/gaupol-1.6.ebuild b/media-video/gaupol/gaupol-1.6.ebuild
deleted file mode 100644
index 359bb2291dc2..000000000000
--- a/media-video/gaupol/gaupol-1.6.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1 gnome2-utils virtualx xdg-utils
-
-DESCRIPTION="A subtitle editor for text-based subtitles"
-HOMEPAGE="https://otsaloma.io/gaupol/"
-SRC_URI="https://github.com/otsaloma/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="spell test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-text/iso-codes
-	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}]
-	)
-"
-DEPEND="
-	sys-devel/gettext
-	test? (
-		${RDEPEND}
-		dev-python/pyenchant[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( AUTHORS.md NEWS.md TODO.md README.md README.aeidon.md )
-
-python_test() {
-	virtx pytest -vv
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "Previewing support needs 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."
-		fi
-	fi
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/media-video/gaupol/gaupol-1.8.ebuild b/media-video/gaupol/gaupol-1.8-r1.ebuild
index 9fa5bf5a0ca1..33dec788257c 100644
--- a/media-video/gaupol/gaupol-1.8.ebuild
+++ b/media-video/gaupol/gaupol-1.8-r1.ebuild
@@ -37,6 +37,8 @@ DEPEND="
 
 DOCS=( AUTHORS.md NEWS.md TODO.md README.md README.aeidon.md )
 
+PATCHES=( "${FILESDIR}/${P}-fix-audio-tracks-order.patch" )
+
 python_test() {
 	virtx pytest -vv
 }
@@ -45,7 +47,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-*"
diff --git a/x11-themes/qtcurve/qtcurve-9999.ebuild b/x11-themes/qtcurve/qtcurve-9999.ebuild
index 00dbf4d0047a..09458a9e5a49 100644
--- a/x11-themes/qtcurve/qtcurve-9999.ebuild
+++ b/x11-themes/qtcurve/qtcurve-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -38,7 +38,6 @@ DEPEND="
 		kde-frameworks/kconfig:5
 		kde-frameworks/kconfigwidgets:5
 		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kdelibs4support:5
 		kde-frameworks/kguiaddons:5
 		kde-frameworks/ki18n:5
 		kde-frameworks/kiconthemes:5