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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 747EE1382C5 for ; Sat, 10 Apr 2021 08:31:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9E627E083B; Sat, 10 Apr 2021 08:31:42 +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 891A8E083B for ; Sat, 10 Apr 2021 08:31:42 +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 34722335DAC for ; Sat, 10 Apr 2021 08:31:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6ECAC640 for ; Sat, 10 Apr 2021 08:31:39 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1618043491.7ed60d149b153d1c6eefe8e4235f7c4e11b7c84e.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/xpaint/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/xpaint/xpaint-3.1.3.ebuild X-VCS-Directories: media-gfx/xpaint/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 7ed60d149b153d1c6eefe8e4235f7c4e11b7c84e X-VCS-Branch: master Date: Sat, 10 Apr 2021 08:31:39 +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: 6fea6575-6177-42f6-8894-04d90c47ea2e X-Archives-Hash: 6069a5d5ac6adb4cc187045d30739d40 commit: 7ed60d149b153d1c6eefe8e4235f7c4e11b7c84e Author: Viorel Munteanu gmail com> AuthorDate: Tue Mar 30 16:46:05 2021 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Sat Apr 10 08:31:31 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ed60d14 media-gfx/xpaint: remove dependency on `x11-misc/imake` Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Viorel Munteanu gmail.com> Closes: https://github.com/gentoo/gentoo/pull/20165 Signed-off-by: Joonas Niilola gentoo.org> media-gfx/xpaint/xpaint-3.1.3.ebuild | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/media-gfx/xpaint/xpaint-3.1.3.ebuild b/media-gfx/xpaint/xpaint-3.1.3.ebuild index df08e4c0d85..6c62608de44 100644 --- a/media-gfx/xpaint/xpaint-3.1.3.ebuild +++ b/media-gfx/xpaint/xpaint-3.1.3.ebuild @@ -41,7 +41,6 @@ BDEPEND=" sys-devel/bison sys-devel/flex virtual/pkgconfig - x11-misc/imake " PATCHES=( @@ -56,12 +55,6 @@ src_prepare() { } src_configure() { - # regenerate resources in app-defaults - # Local.xawdefs is missing and imake was complaining about it, so use it to redefine SHAREDIR - echo "SHAREDIR = \"${EPREFIX}\"/usr/share/xpaint" > Local.xawdefs || die - xmkmf || die - mv Makefile Makefile.resources || die - econf \ $(use_enable tiff) \ --disable-libdvipgm \ @@ -77,6 +70,9 @@ src_compile() { emake substads emake xpaint.1 + # regenerate resources in app-defaults + rm XPaint.ad || die + default emake \ WITH_PGF="$(usex pgf "yes" "no")" \ @@ -84,9 +80,6 @@ src_compile() { CXX="$(tc-getCXX)" \ includedir="${EPREFIX}"/usr/include \ -C util - - # regenerate resources in app-defaults - (rm XPaint.ad && emake -f Makefile.resources XPaint.ad) || die } src_install() {