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 B43B915814C for ; Sun, 17 Sep 2023 21:42:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EB6D42BC019; Sun, 17 Sep 2023 21:42:01 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CEE782BC019 for ; Sun, 17 Sep 2023 21:42:01 +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 C2726335C7E for ; Sun, 17 Sep 2023 21:42:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 23D5611CC for ; Sun, 17 Sep 2023 21:41:59 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1694986851.a1ade7f83f9e8facf1150cf5996e4f7e4a68cf7a.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/graphlcd-base/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/graphlcd-base/graphlcd-base-2.0.3-r3.ebuild X-VCS-Directories: app-misc/graphlcd-base/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: a1ade7f83f9e8facf1150cf5996e4f7e4a68cf7a X-VCS-Branch: master Date: Sun, 17 Sep 2023 21:41:59 +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: 673e5639-c93b-4e14-9456-537c7db882b4 X-Archives-Hash: c2c8d332a6bcc7074729888d2a536bec commit: a1ade7f83f9e8facf1150cf5996e4f7e4a68cf7a Author: Conrad Kostecki gentoo org> AuthorDate: Sun Sep 17 21:17:15 2023 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Sun Sep 17 21:40:51 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1ade7f8 app-misc/graphlcd-base: unify *magick usage Closes: https://bugs.gentoo.org/914234 Signed-off-by: Conrad Kostecki gentoo.org> app-misc/graphlcd-base/graphlcd-base-2.0.3-r3.ebuild | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/app-misc/graphlcd-base/graphlcd-base-2.0.3-r3.ebuild b/app-misc/graphlcd-base/graphlcd-base-2.0.3-r3.ebuild index df811179a910..785f2ca47f73 100644 --- a/app-misc/graphlcd-base/graphlcd-base-2.0.3-r3.ebuild +++ b/app-misc/graphlcd-base/graphlcd-base-2.0.3-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -13,15 +13,16 @@ KEYWORDS="amd64 x86" SLOT="0" LICENSE="GPL-2" IUSE="fontconfig freetype graphicsmagick imagemagick lcd_devices_ax206dpf lcd_devices_picolcd_256x64 lcd_devices_vnc" -REQUIRED_USE="?? ( graphicsmagick imagemagick )" RDEPEND=" dev-libs/libhid net-libs/libvncserver freetype? ( media-libs/freetype:2= ) fontconfig? ( media-libs/fontconfig:1.0= ) - graphicsmagick? ( media-gfx/graphicsmagick:0/1.3[cxx] ) - imagemagick? ( media-gfx/imagemagick:= ) + imagemagick? ( + !graphicsmagick? ( media-gfx/imagemagick:= ) + graphicsmagick? ( media-gfx/graphicsmagick:0/1.3[cxx] ) + ) lcd_devices_ax206dpf? ( virtual/libusb:0 ) lcd_devices_picolcd_256x64? ( virtual/libusb:0 ) " @@ -71,11 +72,13 @@ src_configure() { if ! use fontconfig; then sed -e "50s:HAVE:#HAVE:" -i Make.config || die fi - if use graphicsmagick; then - sed -e "57s:#::" -i Make.config || die - fi + if use imagemagick; then - sed -e "56s:#::" -i Make.config || die + if use graphicsmagick; then + sed -e "57s:#::" -i Make.config || die + else + sed -e "56s:#::" -i Make.config || die + fi fi }