commit:     22db54299a37db23d231fa809fcca6a2f20d39aa
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 29 19:50:24 2019 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Mon Jul 29 19:56:47 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22db5429

net-misc/spice-gtk: update live ebuild

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>

 net-misc/spice-gtk/spice-gtk-9999.ebuild | 60 +++++++++++++++-----------------
 1 file changed, 29 insertions(+), 31 deletions(-)

diff --git a/net-misc/spice-gtk/spice-gtk-9999.ebuild 
b/net-misc/spice-gtk/spice-gtk-9999.ebuild
index d0de04e3000..c4e0bd6c740 100644
--- a/net-misc/spice-gtk/spice-gtk-9999.ebuild
+++ b/net-misc/spice-gtk/spice-gtk-9999.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 GCONF_DEBUG="no"
 WANT_AUTOMAKE="1.12"
 VALA_MIN_API_VERSION="0.14"
@@ -16,43 +17,34 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice-gtk.git";
 KEYWORDS=""
-IUSE="dbus gstaudio gstvideo +gtk3 +introspection lz4 mjpeg policykit 
pulseaudio sasl smartcard static-libs usbredir vala webdav libressl"
-
-REQUIRED_USE="?? ( pulseaudio gstaudio )"
+IUSE="+gtk3 +introspection lz4 mjpeg policykit pulseaudio sasl smartcard 
static-libs usbredir vala webdav libressl"
 
 # TODO:
 # * check if sys-freebsd/freebsd-lib (from virtual/acl) provides acl/libacl.h
 # * use external pnp.ids as soon as that means not pulling in gnome-desktop
 RDEPEND="
-       !libressl? ( dev-libs/openssl:0= )
-       libressl? ( dev-libs/libressl:0= )
-       pulseaudio? ( media-sound/pulseaudio[glib] )
-       gstvideo? (
-               media-libs/gstreamer:1.0
-               media-libs/gst-plugins-base:1.0
-               media-libs/gst-plugins-good:1.0
-               )
-       gstaudio? (
-               media-libs/gstreamer:1.0
-               media-libs/gst-plugins-base:1.0
-               media-libs/gst-plugins-good:1.0
-               )
-       >=x11-libs/pixman-0.17.7
-       media-libs/opus
-       gtk3? ( x11-libs/gtk+:3[introspection?] )
        >=dev-libs/glib-2.46:2
-       >=x11-libs/cairo-1.2
-       virtual/jpeg:0=
+       dev-libs/json-glib:0=
+       media-libs/gst-plugins-base:1.0
+       media-libs/gst-plugins-good:1.0
+       media-libs/gstreamer:1.0
+       media-libs/opus
        sys-libs/zlib
+       virtual/jpeg:0=
+       >=x11-libs/cairo-1.2
+       >=x11-libs/pixman-0.17.7
+       gtk3? ( x11-libs/gtk+:3[introspection?] )
        introspection? ( dev-libs/gobject-introspection )
+       !libressl? ( dev-libs/openssl:0= )
+       libressl? ( dev-libs/libressl:0= )
        lz4? ( app-arch/lz4 )
+       pulseaudio? ( media-sound/pulseaudio[glib] )
        sasl? ( dev-libs/cyrus-sasl )
        smartcard? ( app-emulation/qemu[smartcard] )
        usbredir? (
                sys-apps/hwids
                >=sys-apps/usbredir-0.4.2
                virtual/libusb:1
-               virtual/libgudev:=
                policykit? (
                        sys-apps/acl
                        >=sys-auth/polkit-0.110-r1
@@ -62,6 +54,15 @@ RDEPEND="
                net-libs/phodav:2.0
                >=net-libs/libsoup-2.49.91 )
 "
+# TODO: spice-gtk has an automagic dependency on x11-libs/libva without a
+# configure knob. The package is relatively lightweight so we just depend
+# on it unconditionally for now. It would be cleaner to transform this into
+# a USE="vaapi" conditional and patch the buildsystem...
+RDEPEND="${RDEPEND}
+       amd64? ( x11-libs/libva:= )
+       arm64? ( x11-libs/libva:= )
+       x86? ( x11-libs/libva:= )
+"
 DEPEND="${RDEPEND}
        ~app-emulation/spice-protocol-9999
        dev-perl/Text-CSV
@@ -95,22 +96,19 @@ src_configure() {
 
        local myconf
        myconf="
-               $(use_enable static-libs static)
+               $(use_with gtk3 gtk 3.0)
                $(use_enable introspection)
+               $(use_enable mjpeg builtin-mjpeg)
+               $(use_enable policykit polkit)
+               $(use_enable pulseaudio pulse)
                $(use_with sasl)
                $(use_enable smartcard)
+               $(use_enable static-libs static)
                $(use_enable usbredir)
-               $(use_with usbredir usb-ids-path /usr/share/misc/usb.ids)
                $(use_with usbredir usb-acl-helper-dir /usr/libexec)
-               $(use_with gtk3 gtk 3.0)
-               $(use_enable policykit polkit)
-               $(use_enable pulseaudio pulse)
-               $(use_enable gstaudio)
-               $(use_enable gstvideo)
-               $(use_enable mjpeg builtin-mjpeg)
+               $(use_with usbredir usb-ids-path /usr/share/misc/usb.ids)
                $(use_enable vala)
                $(use_enable webdav)
-               $(use_enable dbus)
                --disable-celt051
                --disable-gtk-doc
                --disable-maintainer-mode

Reply via email to