From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E8F1515808B for ; Mon, 7 Feb 2022 19:03:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 271C02BC00C; Mon, 7 Feb 2022 19:03:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 02B622BC004 for ; Mon, 7 Feb 2022 19:03:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 04A2D342A5F for ; Mon, 7 Feb 2022 19:03:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 66E502CE for ; Mon, 7 Feb 2022 19:03:30 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1644260570.78acc0d39deff3accd9d72a9b2b4fe07de2efb11.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/grilo-plugins/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-plugins/grilo-plugins/grilo-plugins-0.3.14.ebuild X-VCS-Directories: media-plugins/grilo-plugins/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 78acc0d39deff3accd9d72a9b2b4fe07de2efb11 X-VCS-Branch: master Date: Mon, 7 Feb 2022 19:03:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 09f53132-b6cb-4e04-a72e-79ddc633c4a2 X-Archives-Hash: a39a072592f1c083f381ea7acad1442f commit: 78acc0d39deff3accd9d72a9b2b4fe07de2efb11 Author: Matt Turner gentoo org> AuthorDate: Mon Feb 7 18:40:06 2022 +0000 Commit: Matt Turner gentoo org> CommitDate: Mon Feb 7 19:02:50 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78acc0d3 media-plugins/grilo-plugins: Fix enabling gnome-online-accounts Closes: https://bugs.gentoo.org/832777 Signed-off-by: Matt Turner gentoo.org> media-plugins/grilo-plugins/grilo-plugins-0.3.14.ebuild | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/media-plugins/grilo-plugins/grilo-plugins-0.3.14.ebuild b/media-plugins/grilo-plugins/grilo-plugins-0.3.14.ebuild index 226ee065aaa4..293cd7957771 100644 --- a/media-plugins/grilo-plugins/grilo-plugins-0.3.14.ebuild +++ b/media-plugins/grilo-plugins/grilo-plugins-0.3.14.ebuild @@ -63,6 +63,14 @@ BDEPEND=" lua? ( dev-util/gperf ) " +pkg_pretend() { + if use gnome-online-accounts; then + if ! use flickr && ! use lua; then + ewarn "Ignoring USE=gnome-online-accounts USE does not contain flickr or lua" + fi + fi +} + pkg_setup() { use lua && lua-single_pkg_setup } @@ -101,8 +109,12 @@ src_configure() { -Denable-tracker=no -Denable-tracker3=$(usex tracker yes no) -Denable-youtube=$(usex youtube yes no) - $(meson_feature gnome-online-accounts goa) -Dhelp=no ) + if use flickr || use lua; then + emesonargs+=($(meson_feature gnome-online-accounts goa)) + else + emesonargs+=(-Dgoa=disabled) + fi meson_src_configure }