[gentoo-commits] repo/gentoo:master commit in: net-misc/spice-gtk/

[Ben Kohler]

commit:     93fd19e645c7bc2484cac4c24bb36e244a13ee01
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 30 15:32:13 2020 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed Dec 30 15:32:36 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93fd19e6

net-misc/spice-gtk: handle python deps & remove -Werror

Simple sed to remove Werror for now, it is already removed in upstream
git so this fix can be removed for next release.

Closes: https://bugs.gentoo.org/744841
Closes: https://bugs.gentoo.org/718556
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 ...ce-gtk-9999.ebuild => spice-gtk-0.38-r1.ebuild} | 25 +++++++++++++++++-----
 net-misc/spice-gtk/spice-gtk-9999.ebuild           | 16 +++++++++++++-
 2 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild b/net-misc/spice-gtk/spice-gtk-0.38-r1.ebuild
similarity index 81%
copy from net-misc/spice-gtk/spice-gtk-9999.ebuild
copy to net-misc/spice-gtk/spice-gtk-0.38-r1.ebuild
index e262e6bf9e8..0102b373e37 100644
--- a/net-misc/spice-gtk/spice-gtk-9999.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-0.38-r1.ebuild
@@ -6,15 +6,17 @@ EAPI=7
 VALA_MIN_API_VERSION="0.14"
 VALA_USE_DEPEND="vapigen"
 
-inherit desktop eutils git-r3 meson readme.gentoo-r1 vala xdg-utils
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit desktop eutils meson python-any-r1 readme.gentoo-r1 vala xdg-utils
 
 DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
 HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-gtk.git"
-KEYWORDS=""
+SRC_URI="https://www.spice-space.org/download/gtk/${P}.tar.xz"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+gtk3 +introspection libressl lz4 mjpeg policykit pulseaudio sasl smartcard usbredir vala webdav"
 
 # TODO:
@@ -64,7 +66,7 @@ RDEPEND="${RDEPEND}
 	x86? ( x11-libs/libva:= )
 "
 DEPEND="${RDEPEND}
-	~app-emulation/spice-protocol-9999
+	>=app-emulation/spice-protocol-0.14.1
 	dev-perl/Text-CSV
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.14
@@ -74,9 +76,22 @@ DEPEND="${RDEPEND}
 	vala? ( $(vala_depend) )
 "
 
+BDEPEND="
+	$(python_gen_any_dep '
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/pyparsing[${PYTHON_USEDEP}]
+	')
+"
+
+python_check_deps() {
+	has_version "dev-python/six[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/pyparsing[${PYTHON_USEDEP}]"
+}
+
 src_prepare() {
 	default
-
+	sed -i -e "/^                              '-Werror',/d" \
+		subprojects/spice-common/meson.build || die
 	use vala && vala_src_prepare
 }
 

diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild b/net-misc/spice-gtk/spice-gtk-9999.ebuild
index e262e6bf9e8..c507c8b5b36 100644
--- a/net-misc/spice-gtk/spice-gtk-9999.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-9999.ebuild
@@ -6,7 +6,9 @@ EAPI=7
 VALA_MIN_API_VERSION="0.14"
 VALA_USE_DEPEND="vapigen"
 
-inherit desktop eutils git-r3 meson readme.gentoo-r1 vala xdg-utils
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit desktop eutils git-r3 meson python-any-r1 readme.gentoo-r1 vala xdg-utils
 
 DESCRIPTION="Set of GObject and Gtk objects for connecting to Spice servers and a client GUI"
 HOMEPAGE="https://www.spice-space.org https://cgit.freedesktop.org/spice/spice-gtk/"
@@ -74,6 +76,18 @@ DEPEND="${RDEPEND}
 	vala? ( $(vala_depend) )
 "
 
+BDEPEND="
+	$(python_gen_any_dep '
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/pyparsing[${PYTHON_USEDEP}]
+	')
+"
+
+python_check_deps() {
+	has_version "dev-python/six[${PYTHON_USEDEP}]" &&
+	has_version "dev-python/pyparsing[${PYTHON_USEDEP}]"
+}
+
 src_prepare() {
 	default