[gentoo-commits] repo/gentoo:master commit in: media-gfx/xpaint/

[Joonas Niilola]

commit:     7ed60d149b153d1c6eefe8e4235f7c4e11b7c84e
Author:     Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com>
AuthorDate: Tue Mar 30 16:46:05 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> 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 <ceamac.paragon <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20165
Signed-off-by: Joonas Niilola <juippis <AT> 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() {