From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1156257-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 56671138350
	for <garchives@archives.gentoo.org>; Fri, 27 Mar 2020 09:31:00 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 6AEEDE0E83;
	Fri, 27 Mar 2020 09:30:59 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 413BBE0E83
	for <gentoo-commits@lists.gentoo.org>; Fri, 27 Mar 2020 09:30:59 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id BE61834F974
	for <gentoo-commits@lists.gentoo.org>; Fri, 27 Mar 2020 09:30:57 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id C8B1013A
	for <gentoo-commits@lists.gentoo.org>; Fri, 27 Mar 2020 09:30:55 +0000 (UTC)
From: "James Le Cuirot" <chewi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" <chewi@gentoo.org>
Message-ID: <1585301409.f509f29f7dd4c469c086883090af58d92fa115c1.chewi@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/spice/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-emulation/spice/spice-9999.ebuild
X-VCS-Directories: app-emulation/spice/
X-VCS-Committer: chewi
X-VCS-Committer-Name: James Le Cuirot
X-VCS-Revision: f509f29f7dd4c469c086883090af58d92fa115c1
X-VCS-Branch: master
Date: Fri, 27 Mar 2020 09:30:55 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 0f491b53-64ae-4037-b1a8-02f79ef35e9d
X-Archives-Hash: 09797970391ce9a45601bb9f36a75b2c

commit:     f509f29f7dd4c469c086883090af58d92fa115c1
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 27 09:30:09 2020 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Mar 27 09:30:09 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f509f29f

app-emulation/spice: Various 9999 updates and fixes

This includes adding the opus USE flag, dropping the celt option,
fixing static library handling, and disabling the tests.

Package-Manager: Portage-2.3.96, Repoman-2.3.20
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 app-emulation/spice/spice-9999.ebuild | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/app-emulation/spice/spice-9999.ebuild b/app-emulation/spice/spice-9999.ebuild
index 6390d08a37a..b2b42811ca6 100644
--- a/app-emulation/spice/spice-9999.ebuild
+++ b/app-emulation/spice/spice-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 PYTHON_COMPAT=( python{3_6,3_7} )
 
-inherit eutils git-r3 meson python-any-r1 readme.gentoo-r1 xdg-utils
+inherit git-r3 meson python-any-r1 readme.gentoo-r1 xdg-utils
 
 DESCRIPTION="SPICE server"
 HOMEPAGE="https://www.spice-space.org/"
@@ -14,19 +14,19 @@ EGIT_REPO_URI="https://anongit.freedesktop.org/git/spice/spice.git"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="libressl lz4 sasl smartcard gstreamer"
+IUSE="gstreamer libressl lz4 opus sasl smartcard static-libs"
 
 # the libspice-server only uses the headers of libcacard
 RDEPEND="
 	dev-lang/orc
 	>=dev-libs/glib-2.22:2
-	media-libs/opus
 	sys-libs/zlib
 	virtual/jpeg:0=
 	>=x11-libs/pixman-0.17.7
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
 	lz4? ( app-arch/lz4:0= )
+	opus? ( media-libs/opus )
 	smartcard? ( >=app-emulation/libcacard-0.1.2 )
 	sasl? ( dev-libs/cyrus-sasl )
 	gstreamer? (
@@ -43,6 +43,12 @@ BDEPEND="${PYTHON_DEPS}
 		dev-python/six[${PYTHON_USEDEP}]
 	')"
 
+DOCS=(
+	AUTHORS
+	CHANGELOG.md
+	README
+)
+
 python_check_deps() {
 	has_version -b ">=dev-python/pyparsing-1.5.6-r2[${PYTHON_USEDEP}]"
 	has_version -b "dev-python/six[${PYTHON_USEDEP}]"
@@ -56,16 +62,19 @@ src_configure() {
 	# Prevent sandbox violations, bug #586560
 	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
 	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
-	addpredict /dev
+	use gstreamer && addpredict /dev
 
 	xdg_environment_reset
 
 	local emesonargs=(
+		-Ddefault_library=$(usex static-libs both shared)
+		-Dgstreamer=$(usex gstreamer 1.0 no)
 		$(meson_use lz4)
 		$(meson_use sasl)
+		$(meson_feature opus)
 		$(meson_feature smartcard)
-		-Dgstreamer=$(usex gstreamer "1.0" "no")
-		-Dcelt051=disabled
+		-Dmanual=false
+		-Dtests=false
 	)
 	meson_src_configure
 }
@@ -74,13 +83,14 @@ src_compile() {
 	# Prevent sandbox violations, bug #586560
 	# https://bugzilla.gnome.org/show_bug.cgi?id=744134
 	# https://bugzilla.gnome.org/show_bug.cgi?id=744135
-	addpredict /dev
+	use gstreamer && addpredict /dev
 
 	meson_src_compile
 }
 
 src_install() {
 	meson_src_install
+	einstalldocs
 	readme.gentoo_create_doc
 }