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 40FD815808C for ; Wed, 23 Feb 2022 04:05:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9DF77E0997; Wed, 23 Feb 2022 04:05:24 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id D468DE0992 for ; Wed, 23 Feb 2022 04:05:23 +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 D9CCB342F37 for ; Wed, 23 Feb 2022 04:05:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 377D02F5 for ; Wed, 23 Feb 2022 04:05:21 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1645588572.09978a4d6fbfd46071119b15a167db69edc541a8.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: gui-apps/grim/ X-VCS-Repository: repo/gentoo X-VCS-Files: gui-apps/grim/grim-1.4.0-r1.ebuild gui-apps/grim/grim-1.4.0.ebuild gui-apps/grim/grim-9999.ebuild X-VCS-Directories: gui-apps/grim/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 09978a4d6fbfd46071119b15a167db69edc541a8 X-VCS-Branch: master Date: Wed, 23 Feb 2022 04:05:21 +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: 0cbe052c-9785-4d19-b2ab-05a1dc10c035 X-Archives-Hash: 1707f013b8cce8b3cc9b07e766021645 commit: 09978a4d6fbfd46071119b15a167db69edc541a8 Author: Alfred Wingate protonmail com> AuthorDate: Sat Feb 19 11:58:10 2022 +0000 Commit: Sam James gentoo org> CommitDate: Wed Feb 23 03:56:12 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09978a4d gui-apps/grim: update dependencies and install completions manually * Disable bash-completions switch and instead install bash completions with bash-completion-r1 eclass. * This serves to avoid the build system requiring app-shells/bash-completion or having to go out of your way to remove this requirement from the build system itself. * Install fish completions manually with doins. * These changes are included in a new revision of 1.4.0 and in 9999. * Also update EAPI to 8 and update dependencies. Closes: https://bugs.gentoo.org/833595 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Alfred Wingate protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/24273 Signed-off-by: Sam James gentoo.org> .../{grim-1.4.0.ebuild => grim-1.4.0-r1.ebuild} | 28 ++++++++++++---------- gui-apps/grim/grim-9999.ebuild | 28 +++++++++++++--------- 2 files changed, 33 insertions(+), 23 deletions(-) diff --git a/gui-apps/grim/grim-1.4.0.ebuild b/gui-apps/grim/grim-1.4.0-r1.ebuild similarity index 65% rename from gui-apps/grim/grim-1.4.0.ebuild rename to gui-apps/grim/grim-1.4.0-r1.ebuild index 3b5657ccc9d2..66522ea185c3 100644 --- a/gui-apps/grim/grim-1.4.0.ebuild +++ b/gui-apps/grim/grim-1.4.0-r1.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit meson +inherit bash-completion-r1 meson DESCRIPTION="Grab images from a Wayland compositor" HOMEPAGE="https://github.com/emersion/grim" @@ -23,24 +23,28 @@ IUSE="+man jpeg" DEPEND=" >=dev-libs/wayland-protocols-1.14 dev-libs/wayland - jpeg? ( virtual/jpeg ) - x11-libs/cairo" + media-libs/libpng + x11-libs/pixman + jpeg? ( virtual/jpeg )" RDEPEND="${DEPEND}" - -if [[ ${PV} == 9999 ]]; then - BDEPEND+="man? ( ~app-text/scdoc-9999 )" -else - BDEPEND+="man? ( app-text/scdoc )" -fi +BDEPEND="man? ( app-text/scdoc )" src_configure() { local emesonargs=( $(meson_feature jpeg) $(meson_feature man man-pages) + "-Dbash-completions=false" + "-Dfish-completions=false" "-Dwerror=false" - "-Dfish-completions=true" - "-Dbash-completions=true" ) meson_src_configure } + +src_install() { + meson_src_install + + newbashcomp contrib/completions/bash/grim.bash grim + insinto /usr/share/fish/vendor_completions.d/ + doins contrib/completions/grim.fish +} diff --git a/gui-apps/grim/grim-9999.ebuild b/gui-apps/grim/grim-9999.ebuild index ca7406fc07a3..66522ea185c3 100644 --- a/gui-apps/grim/grim-9999.ebuild +++ b/gui-apps/grim/grim-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -inherit meson +inherit bash-completion-r1 meson DESCRIPTION="Grab images from a Wayland compositor" HOMEPAGE="https://github.com/emersion/grim" @@ -23,22 +23,28 @@ IUSE="+man jpeg" DEPEND=" >=dev-libs/wayland-protocols-1.14 dev-libs/wayland - jpeg? ( virtual/jpeg ) - x11-libs/cairo" + media-libs/libpng + x11-libs/pixman + jpeg? ( virtual/jpeg )" RDEPEND="${DEPEND}" - -if [[ ${PV} == 9999 ]]; then - BDEPEND+="man? ( ~app-text/scdoc-9999 )" -else - BDEPEND+="man? ( app-text/scdoc )" -fi +BDEPEND="man? ( app-text/scdoc )" src_configure() { local emesonargs=( $(meson_feature jpeg) $(meson_feature man man-pages) + "-Dbash-completions=false" + "-Dfish-completions=false" "-Dwerror=false" ) meson_src_configure } + +src_install() { + meson_src_install + + newbashcomp contrib/completions/bash/grim.bash grim + insinto /usr/share/fish/vendor_completions.d/ + doins contrib/completions/grim.fish +}